diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index 389bcda90d..eb77167ce8 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -1,14 +1,14 @@
 #!/bin/sh
 #
 # Pre-commit hook that runs Spotless check on the Java SDK when Java source
-# files are staged. Only triggers if changes exist under java/src/.
+# files are staged. Only triggers if changes exist under java/sdk/src/.
 #
 # To install this hook, run from the repository root:
 #   git config core.hooksPath .githooks
 #
 
-# Only run Spotless if staged changes include Java source files under java/src/
-if ! git diff --cached --name-only | grep -q '^java/src/'; then
+# Only run Spotless if staged changes include Java source files under java/sdk/src/
+if ! git diff --cached --name-only | grep -q '^java/sdk/src/'; then
     exit 0
 fi
 
diff --git a/.github/actions/java-test-report/action.yml b/.github/actions/java-test-report/action.yml
index e826628a07..4ea110cb13 100644
--- a/.github/actions/java-test-report/action.yml
+++ b/.github/actions/java-test-report/action.yml
@@ -4,15 +4,15 @@ inputs:
   report-path:
     description: "Path to the test report XML files (glob pattern)"
     required: false
-    default: "java/target/{surefire-reports*,failsafe-reports}/TEST-*.xml"
+    default: "java/sdk/target/{surefire-reports*,failsafe-reports}/TEST-*.xml"
   jacoco-path:
     description: "Path to the JaCoCo XML report"
     required: false
-    default: "java/target/site/jacoco-coverage/jacoco.xml"
+    default: "java/sdk/target/site/jacoco-coverage/jacoco.xml"
   jacoco-csv-path:
     description: "Path to the JaCoCo CSV report"
     required: false
-    default: "java/target/site/jacoco-coverage/jacoco.csv"
+    default: "java/sdk/target/site/jacoco-coverage/jacoco.csv"
   check-name:
     description: "Name for the check run"
     required: false
@@ -126,7 +126,8 @@ runs:
             if [ -n "$covered" ] && [ -n "$missed" ]; then
               local total=$((covered + missed))
               if [ "$total" -gt 0 ]; then
-                echo "scale=1; $covered * 100 / $total" | bc
+                awk -v covered="$covered" -v total="$total" \
+                  'BEGIN { printf "%.1f\n", covered * 100 / total }'
               else
                 echo "0"
               fi
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 79fa9522c9..a9bc22d0ec 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -11,7 +11,7 @@
 
 - Top-level: `README.md` (architecture + quick start)
 - Language entry points: `nodejs/src/client.ts`, `python/README.md`, `go/README.md`, `dotnet/README.md`
-- Java: `java/README.md`, `java/pom.xml`
+- Java: `java/README.md`, `java/pom.xml`, `java/sdk/pom.xml`, `java/copilot-native/pom.xml`
 - Test harness & E2E: `test/harness/*`, Python harness wrapper `python/e2e/testharness/proxy.py`
 - Schemas & type generation: `nodejs/scripts/generate-session-types.ts`
 - Session snapshots used by E2E: `test/snapshots/` (used by the replay proxy)
@@ -39,7 +39,7 @@
 - E2E runs against a local **replaying CAPI proxy** (see `test/harness/server.ts`). Most language E2E harnesses spawn that server automatically (see `python/e2e/testharness/proxy.py`).
 - Tests rely on YAML snapshot exchanges under `test/snapshots/` — to add test scenarios, add or edit the appropriate YAML files and update tests.
 - The harness prints `Listening: http://...` — tests parse this URL to configure CLI or proxy.
-- Java E2E tests use `E2ETestContext` which manages a `CapiProxy` (Node.js replaying proxy). The harness is cloned during Maven's `generate-test-resources` phase to `java/target/copilot-sdk/`.
+- Java E2E tests use `E2ETestContext` which manages a `CapiProxy` (Node.js replaying proxy). The harness is cloned during Maven's `generate-test-resources` phase to `java/sdk/target/copilot-sdk/`.
 - Java test method names are converted to lowercase snake_case for snapshot filenames (avoids case collisions on macOS/Windows).
 
 ## Project-specific conventions & patterns ✅
@@ -61,13 +61,13 @@
 
 ## Where to add new code or tests 🧭
 
-- SDK code: `nodejs/src`, `python/copilot`, `go`, `dotnet/src`, `rust/src`, `java/src/main/java`
-- Unit tests: `nodejs/test`, `python/*`, `go/*`, `dotnet/test`, `rust/tests`, `java/src/test/java`
-- E2E tests: `*/e2e/` folders that use the shared replay proxy and `test/snapshots/`, `java/src/test/java/**/e2e/`
-- Generated types: update schema in `@github/copilot` then run `cd nodejs && npm run generate:session-types` and commit generated files in `src/generated` or language generated location. Java generated types: `java/src/generated/java`
+- SDK code: `nodejs/src`, `python/copilot`, `go`, `dotnet/src`, `rust/src`, `java/sdk/src/main/java`
+- Unit tests: `nodejs/test`, `python/*`, `go/*`, `dotnet/test`, `rust/tests`, `java/sdk/src/test/java`
+- E2E tests: `*/e2e/` folders that use the shared replay proxy and `test/snapshots/`, `java/sdk/src/test/java/**/e2e/`
+- Generated types: update schema in `@github/copilot` then run `cd nodejs && npm run generate:session-types` and commit generated files in `src/generated` or language generated location. Java generated types: `java/sdk/src/generated/java`
 
 ## Boundaries — files you must NOT hand-edit ⛔
 
-- `java/src/generated/java/` — auto-generated by `scripts/codegen/java.ts`; regenerate with `cd java && mvn generate-sources -Pcodegen`.
+- `java/sdk/src/generated/java/` — auto-generated by `scripts/codegen/java.ts`; regenerate with `cd java && mvn generate-sources -Pcodegen`.
 - `nodejs/src/generated/` — auto-generated by `npm run generate:session-types`.
 - `test/snapshots/` — authoritative test fixtures; add/edit YAML here to change E2E behavior, but don't delete without understanding downstream impact.
diff --git a/.github/skills/new-java-e2e-test-yaml-and-test/SKILL.md b/.github/skills/new-java-e2e-test-yaml-and-test/SKILL.md
index 060228d553..d034b20377 100644
--- a/.github/skills/new-java-e2e-test-yaml-and-test/SKILL.md
+++ b/.github/skills/new-java-e2e-test-yaml-and-test/SKILL.md
@@ -54,7 +54,7 @@ conversations:
 
 ### Step 3: Create the Java IT test class
 
-Place it in `java/src/test/java/com/github/copilot/` with an `IT` suffix
+Place it in `java/sdk/src/test/java/com/github/copilot/` with an `IT` suffix
 (e.g., `MyFeatureIT.java`). The failsafe plugin picks up `*IT.java` files.
 
 **Template:**
@@ -141,12 +141,12 @@ mvn clean verify
 
 | What | Where |
 |------|-------|
-| Test context (manages proxy, workDir, CLI) | `java/src/test/java/com/github/copilot/E2ETestContext.java` |
-| Java proxy wrapper | `java/src/test/java/com/github/copilot/CapiProxy.java` |
+| Test context (manages proxy, workDir, CLI) | `java/sdk/src/test/java/com/github/copilot/E2ETestContext.java` |
+| Java proxy wrapper | `java/sdk/src/test/java/com/github/copilot/CapiProxy.java` |
 | Replay proxy (TypeScript) | `test/harness/replayingCapiProxy.ts` |
 | Proxy server entry point | `test/harness/server.ts` |
 | Snapshot files | `test/snapshots/<category>/<name>.yaml` |
-| Existing IT tests for reference | `java/src/test/java/com/github/copilot/*IT.java` |
+| Existing IT tests for reference | `java/sdk/src/test/java/com/github/copilot/*IT.java` |
 
 ## How the Proxy Matches Requests
 
diff --git a/.github/workflows/codegen-check.yml b/.github/workflows/codegen-check.yml
index 78927f1600..f37a71e45e 100644
--- a/.github/workflows/codegen-check.yml
+++ b/.github/workflows/codegen-check.yml
@@ -15,7 +15,7 @@ on:
       - 'go/rpc/**'
       - 'rust/src/generated/**'
       - 'sdk-protocol-version.json'
-      - 'java/src/main/java/com/github/copilot/SdkProtocolVersion.java'
+      - 'java/sdk/src/main/java/com/github/copilot/SdkProtocolVersion.java'
       - '.github/workflows/codegen-check.yml'
   workflow_dispatch:
 
@@ -84,7 +84,7 @@ jobs:
       - name: Verify Java protocol version matches
         run: |
           EXPECTED=$(jq -r '.version' sdk-protocol-version.json)
-          ACTUAL=$(grep -oP 'LATEST\(\K[0-9]+' java/src/main/java/com/github/copilot/SdkProtocolVersion.java)
+          ACTUAL=$(grep -oP 'LATEST\(\K[0-9]+' java/sdk/src/main/java/com/github/copilot/SdkProtocolVersion.java)
           if [ "$EXPECTED" != "$ACTUAL" ]; then
             echo "::error::Java SDK protocol version ($ACTUAL) does not match sdk-protocol-version.json ($EXPECTED). Java manages its own SdkProtocolVersion.java via java/scripts/codegen/. Update it to match."
             exit 1
diff --git a/.github/workflows/docs-validation.yml b/.github/workflows/docs-validation.yml
index 4f53b71e4c..dff02f0d26 100644
--- a/.github/workflows/docs-validation.yml
+++ b/.github/workflows/docs-validation.yml
@@ -9,8 +9,9 @@ on:
       - 'python/copilot/**'
       - 'go/**/*.go'
       - 'dotnet/src/**'
-      - 'java/src/**'
+      - 'java/sdk/src/**'
       - 'java/pom.xml'
+      - 'java/sdk/pom.xml'
       - 'scripts/docs-validation/**'
       - '.github/workflows/docs-validation.yml'
   workflow_dispatch:
diff --git a/.github/workflows/dotnet-sdk-tests.yml b/.github/workflows/dotnet-sdk-tests.yml
index fa2e2dc757..4695cae7f2 100644
--- a/.github/workflows/dotnet-sdk-tests.yml
+++ b/.github/workflows/dotnet-sdk-tests.yml
@@ -32,6 +32,23 @@ jobs:
           - os: windows-latest
             transport: default
             shard: full
+          # TODO(cli-1.0.81-2): CLI 1.0.81-5 still stops completing in-process
+          # CAPI model turns, causing repeated per-test timeouts until the
+          # 30-minute job limit. Stdio CAPI and in-process BYOK remain enabled.
+          - os: ubuntu-latest
+            transport: inprocess
+          - os: macos-latest
+            transport: inprocess
+          # The macOS default/capi host runs the whole suite on the smallest
+          # runner in the matrix (3 vCPU / 7 GB vs ubuntu's 4 / 16). Since the
+          # 1.0.81-2 bump it stopped finishing: the job ran 50+ minutes until
+          # the runner lost communication with the server, and a runner that
+          # dies that way uploads no logs at all, so the failure could not be
+          # diagnosed from CI output. Split it across isolated hosts so one
+          # poisoned runtime cannot consume the entire job without diagnostics.
+          - os: macos-latest
+            transport: default
+            shard: full
         include:
           # Keep xUnit serial within each process, but split the slow Windows
           # default-transport suite across two isolated test hosts. Keep both
@@ -45,6 +62,22 @@ jobs:
             transport: default
             backend: capi
             shard: "2"
+          - os: macos-latest
+            transport: default
+            backend: capi
+            shard: "1"
+          - os: macos-latest
+            transport: default
+            backend: capi
+            shard: "2a"
+          - os: macos-latest
+            transport: default
+            backend: capi
+            shard: "2b"
+          - os: macos-latest
+            transport: default
+            backend: capi
+            shard: "2c"
           - os: ubuntu-latest
             transport: inprocess
             backend: anthropic-messages
@@ -61,6 +94,10 @@ jobs:
             shard: full
             test-filter: "FullyQualifiedName~GitHub.Copilot.Test.E2E&E2EBackend!=SelfConfiguredBackend&E2EBackend!=CapiOnly"
     runs-on: ${{ matrix.os }}
+    # A hung test used to run until the runner died (~50 min) and the dying
+    # runner never uploaded its logs, so the failures were undiagnosable.
+    # Every healthy cell finishes well under 15 min.
+    timeout-minutes: 30
     defaults:
       run:
         shell: bash
@@ -113,17 +150,35 @@ jobs:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
           DOTNET_TEST_SHARD: ${{ matrix.shard }}
         run: |
-          args=(--no-build -v n)
+          # --blame-hang names the offending test instead of letting it wedge
+          # the runner. No single test legitimately runs for 10 minutes; the
+          # whole suite normally finishes in about five.
+          args=(--no-build -v n --blame-hang --blame-hang-timeout 10m --blame-hang-dump-type none)
 
           filter="$DOTNET_TEST_FILTER"
           if [[ "$DOTNET_TEST_SHARD" != "full" ]]; then
-            if [[ "$DOTNET_TEST_SHARD" == "1" ]]; then
-              initials=(A C D H I J K L N Q S U W Y)
-              shard_filter="FullyQualifiedName~GitHub.Copilot.Test.ConnectionToken"
-            else
-              initials=(B E F G M O P R T V X Z)
-              shard_filter=""
-            fi
+            case "$DOTNET_TEST_SHARD" in
+              1)
+                initials=(A C D H I J K L N Q S U W Y)
+                shard_filter="FullyQualifiedName~GitHub.Copilot.Test.ConnectionToken"
+                ;;
+              2)
+                initials=(B E F G M O P R T V X Z)
+                shard_filter=""
+                ;;
+              2a)
+                initials=(B E F G)
+                shard_filter=""
+                ;;
+              2b)
+                initials=(M O P R)
+                shard_filter=""
+                ;;
+              2c)
+                initials=(T V X Z)
+                shard_filter=""
+                ;;
+            esac
 
             for namespace in E2E Unit; do
               for initial in "${initials[@]}"; do
diff --git a/.github/workflows/java-adapt-handwritten-code-to-accept-upgrade-changes.lock.yml b/.github/workflows/java-adapt-handwritten-code-to-accept-upgrade-changes.lock.yml
index de924a01ae..e94e0775c0 100644
--- a/.github/workflows/java-adapt-handwritten-code-to-accept-upgrade-changes.lock.yml
+++ b/.github/workflows/java-adapt-handwritten-code-to-accept-upgrade-changes.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"a5f19a89f89b0693f86ca89ea90e3a633fe19c17bf4d27214fa9124429cdc156","body_hash":"41bc10df4ac9179064417476fbb39fef7423d0998dc0beb7bad42e9eb7ab0494","compiler_version":"v0.83.1","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.73"}}
+# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"a5f19a89f89b0693f86ca89ea90e3a633fe19c17bf4d27214fa9124429cdc156","body_hash":"8db09798070cbcba22c42c50a316ae45c8e8c650eeb23c556b44fde8d519550a","compiler_version":"v0.83.1","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.73"}}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_CI_TRIGGER_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/cache/restore","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/cache/save","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/checkout","sha":"9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0","version":"v7"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"373c709c69115d41ff229c7e5df9f8788daa9553","version":"v9"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"820762786026740c76f36085b0efc47a31fe5020","version":"v7.0.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"8bdba8075360648fe6802302a5b4e016361dc6ac","version":"v0.83.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.27.38","digest":"sha256:cb928eb62d9139a013c2d278dab19af232d35a2d83dca71a3d98eb431f786243","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.27.38@sha256:cb928eb62d9139a013c2d278dab19af232d35a2d83dca71a3d98eb431f786243"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.38","digest":"sha256:cd6145620d96acee46e1ede25180a13aa36002467e663db0caa453a8bc8eb60c","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.38@sha256:cd6145620d96acee46e1ede25180a13aa36002467e663db0caa453a8bc8eb60c"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.27.38","digest":"sha256:6c19094d95aad5f9f128ad5e583f0f2b894b158aa66c3b86dd9bcc90970a2917","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.27.38@sha256:6c19094d95aad5f9f128ad5e583f0f2b894b158aa66c3b86dd9bcc90970a2917"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.4.3","digest":"sha256:3c744710ea275cd5ee65db92a1099e0d980754bd9fafda9ce67704c67004dc83","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.4.3@sha256:3c744710ea275cd5ee65db92a1099e0d980754bd9fafda9ce67704c67004dc83"},{"image":"ghcr.io/github/gh-aw-node","digest":"sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b","pinned_image":"ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b"},{"image":"ghcr.io/github/github-mcp-server:v1.6.0","digest":"sha256:2b0c48b070f61e9d3969269ead600f62d00fb237b60ac849ef3d166ee7de9ad3","pinned_image":"ghcr.io/github/github-mcp-server:v1.6.0@sha256:2b0c48b070f61e9d3969269ead600f62d00fb237b60ac849ef3d166ee7de9ad3"}]}
 # This file was automatically generated by gh-aw (v0.83.1). DO NOT EDIT. To debug this workflow, load the skill at https://github.com/github/gh-aw/blob/main/debug.md
 #
diff --git a/.github/workflows/java-adapt-handwritten-code-to-accept-upgrade-changes.md b/.github/workflows/java-adapt-handwritten-code-to-accept-upgrade-changes.md
index b1623ff78a..dd1bfe2bbc 100644
--- a/.github/workflows/java-adapt-handwritten-code-to-accept-upgrade-changes.md
+++ b/.github/workflows/java-adapt-handwritten-code-to-accept-upgrade-changes.md
@@ -51,17 +51,17 @@ You are an automation agent that fixes handwritten Java SDK source and test code
 
 - The branch `${{ inputs.branch }}` already has:
   - Updated `java/scripts/codegen/package.json` with the new version
-  - Regenerated `java/src/generated/java/` code that compiles successfully
+  - Regenerated `java/sdk/src/generated/java/` code that compiles successfully
   - Updated the Java POM CLI/version pin property
 - Your job is ONLY to fix **handwritten** code, NOT generated code.
 
 ## Boundaries
 
-- ❌ Do NOT edit anything under `java/src/generated/java/`
+- ❌ Do NOT edit anything under `java/sdk/src/generated/java/`
 - ❌ Do NOT edit `java/scripts/codegen/java.ts`
-- ❌ Do NOT create or modify tests in the `com.github.copilot.generated` test package (`java/src/test/java/com/github/copilot/sdk/generated/`)
-- ✅ DO edit `java/src/main/java/com/github/copilot/sdk/**`
-- ✅ DO edit `java/src/test/java/com/github/copilot/sdk/**` (excluding the `generated` subpackage)
+- ❌ Do NOT create or modify tests in the `com.github.copilot.generated` test package (`java/sdk/src/test/java/com/github/copilot/sdk/generated/`)
+- ✅ DO edit `java/sdk/src/main/java/com/github/copilot/sdk/**`
+- ✅ DO edit `java/sdk/src/test/java/com/github/copilot/sdk/**` (excluding the `generated` subpackage)
 - ✅ DO add new test methods or test classes if new user-facing API surface is introduced
 
 ## Instructions
@@ -146,7 +146,7 @@ mvn verify -Dskip.test.harness=true
 If this passes, commit and push:
 
 ```bash
-git add java/src/main/java java/src/test/java
+git add java/sdk/src/main/java java/sdk/src/test/java
 git commit -m "Fix handwritten Java code for @github/copilot schema changes
 
 Adapt constructor calls, enum references, and test assertions to match
diff --git a/.github/workflows/java-codegen-check.yml b/.github/workflows/java-codegen-check.yml
index e1c11cd6da..f2f4527966 100644
--- a/.github/workflows/java-codegen-check.yml
+++ b/.github/workflows/java-codegen-check.yml
@@ -6,12 +6,12 @@ on:
       - main
     paths:
       - 'java/scripts/codegen/**'
-      - 'java/src/generated/**'
+      - 'java/sdk/src/generated/**'
       - '.github/workflows/java-codegen-check.yml'
   pull_request:
     paths:
       - 'java/scripts/codegen/**'
-      - 'java/src/generated/**'
+      - 'java/sdk/src/generated/**'
       - '.github/workflows/java-codegen-check.yml'
   workflow_dispatch:
 
diff --git a/.github/workflows/java-codegen-fix.lock.yml b/.github/workflows/java-codegen-fix.lock.yml
index 08005d7f7c..1d8d28c439 100644
--- a/.github/workflows/java-codegen-fix.lock.yml
+++ b/.github/workflows/java-codegen-fix.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"b0390c9ab9beb0d7e106314299e89e486269ab7f64d8489d5021132d79aa6b9b","body_hash":"fe41f8fe1c12cb585cfaefdd755f58d2a84410d9d819cd706a3192ce052e2545","compiler_version":"v0.83.1","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.73"}}
+# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"b0390c9ab9beb0d7e106314299e89e486269ab7f64d8489d5021132d79aa6b9b","body_hash":"63d6ce13a5131b158ddffb10a469aa59e0fdc2278eec4d8de7f6763e0b6f2ea2","compiler_version":"v0.83.1","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.73"}}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_CI_TRIGGER_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/cache/restore","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/cache/save","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/checkout","sha":"9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0","version":"v7"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"373c709c69115d41ff229c7e5df9f8788daa9553","version":"v9"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"820762786026740c76f36085b0efc47a31fe5020","version":"v7.0.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"8bdba8075360648fe6802302a5b4e016361dc6ac","version":"v0.83.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.27.38","digest":"sha256:cb928eb62d9139a013c2d278dab19af232d35a2d83dca71a3d98eb431f786243","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.27.38@sha256:cb928eb62d9139a013c2d278dab19af232d35a2d83dca71a3d98eb431f786243"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.38","digest":"sha256:cd6145620d96acee46e1ede25180a13aa36002467e663db0caa453a8bc8eb60c","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.38@sha256:cd6145620d96acee46e1ede25180a13aa36002467e663db0caa453a8bc8eb60c"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.27.38","digest":"sha256:6c19094d95aad5f9f128ad5e583f0f2b894b158aa66c3b86dd9bcc90970a2917","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.27.38@sha256:6c19094d95aad5f9f128ad5e583f0f2b894b158aa66c3b86dd9bcc90970a2917"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.4.3","digest":"sha256:3c744710ea275cd5ee65db92a1099e0d980754bd9fafda9ce67704c67004dc83","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.4.3@sha256:3c744710ea275cd5ee65db92a1099e0d980754bd9fafda9ce67704c67004dc83"},{"image":"ghcr.io/github/gh-aw-node","digest":"sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b","pinned_image":"ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b"},{"image":"ghcr.io/github/github-mcp-server:v1.6.0","digest":"sha256:2b0c48b070f61e9d3969269ead600f62d00fb237b60ac849ef3d166ee7de9ad3","pinned_image":"ghcr.io/github/github-mcp-server:v1.6.0@sha256:2b0c48b070f61e9d3969269ead600f62d00fb237b60ac849ef3d166ee7de9ad3"}]}
 # This file was automatically generated by gh-aw (v0.83.1). DO NOT EDIT. To debug this workflow, load the skill at https://github.com/github/gh-aw/blob/main/debug.md
 #
diff --git a/.github/workflows/java-codegen-fix.md b/.github/workflows/java-codegen-fix.md
index 1fe465f4c5..b1dcb1f636 100644
--- a/.github/workflows/java-codegen-fix.md
+++ b/.github/workflows/java-codegen-fix.md
@@ -54,7 +54,7 @@ You are an automation agent that fixes Java compilation and test failures caused
 
 A Dependabot PR bumped the `@github/copilot` npm dependency in `java/scripts/codegen/package.json`. The `java-codegen-check` workflow ran the code generator (`java/scripts/codegen/java.ts`) against the new schemas and `mvn verify` subsequently failed. Your job is to fix **both** the code generator script (if needed) and the handwritten SDK/test source code so the build passes.
 
-**❌❌❌ YOU MUST NEVER EDIT any of the java source code in `java/src/generated/` directly.** ✅✅Rather, the way to affect changes in these files is to change the code generator script and re-generate the classes in `java/src/generated`.
+**❌❌❌ YOU MUST NEVER EDIT any of the java source code in `java/sdk/src/generated/` directly.** ✅✅Rather, the way to affect changes in these files is to change the code generator script and re-generate the classes in `java/sdk/src/generated`.
 
 The branch to fix is: `${{ inputs.branch }}`
 The PR number is: `${{ inputs.pr_number }}`
@@ -66,7 +66,7 @@ ${{ inputs.error_summary }}
 
 ## Architecture overview
 
-The code generator (`java/scripts/codegen/java.ts`) reads JSON schemas from `node_modules/@github/copilot/schemas/` and produces Java source files under `java/src/generated/java/`. These generated types are consumed by handwritten code in `java/src/main/java/` (primarily `CopilotSession.java`) and tested by handwritten tests in `java/src/test/java/`.
+The code generator (`java/scripts/codegen/java.ts`) reads JSON schemas from `node_modules/@github/copilot/schemas/` and produces Java source files under `java/sdk/src/generated/java/`. These generated types are consumed by handwritten code in `java/sdk/src/main/java/` (primarily `CopilotSession.java`) and tested by handwritten tests in `java/sdk/src/test/java/`.
 
 When `@github/copilot` is bumped, the schemas may change in ways the code generator does not yet handle. Common schema changes include:
 
@@ -126,7 +126,7 @@ Before making fixes, determine whether the failure is caused by:
 - New schemas exist but no corresponding Java types were generated
 
 **(B) Handwritten code referencing old generated type names/shapes.** Signs:
-- Compilation errors in `java/src/main/java/` or `java/src/test/java/` referencing types that no longer exist
+- Compilation errors in `java/sdk/src/main/java/` or `java/sdk/src/test/java/` referencing types that no longer exist
 - Test data using old JSON field names
 
 Often **both** (A) and (B) apply: the codegen needs fixing first, then handwritten code needs updating.
@@ -162,7 +162,7 @@ If the diagnosis shows the code generator does not handle the new schema format:
 
 4. **Verify the generated output** looks reasonable:
    ```bash
-   git diff --stat java/src/generated/java/
+   git diff --stat java/sdk/src/generated/java/
    ```
 
 **You may ONLY modify `java/scripts/codegen/java.ts`.** Do not modify `package.json`, `package-lock.json`, or any other file under `java/scripts/codegen/`.
@@ -179,12 +179,12 @@ For each attempt:
 2. **Read the generated types** to understand what changed. Check the generated files that the handwritten code references:
    ```bash
    # Example: check what a generated type looks like now
-   cat java/src/generated/java/com/github/copilot/generated/rpc/<TypeName>.java
+   cat java/sdk/src/generated/java/com/github/copilot/generated/rpc/<TypeName>.java
    ```
 
 3. **Fix the affected source files.** You may modify files under:
-   - `java/src/main/java/` — handwritten SDK source code
-   - `java/src/test/java/` — handwritten test code
+   - `java/sdk/src/main/java/` — handwritten SDK source code
+   - `java/sdk/src/test/java/` — handwritten test code
 
    Common fixes:
    - Update type references from old nested types to new standalone types (e.g. `SessionMcpListResultServersItem` → `McpServer`)
@@ -236,12 +236,12 @@ Do **NOT** push broken code.
 
 ## Important constraints
 
-- **NEVER** hand-edit files under `java/src/generated/java/` — these are auto-generated. They are updated by running `cd java/scripts/codegen && npx tsx java.ts`.
-- **NEVER** modify `java/pom.xml` — build config is not in scope
+- **NEVER** hand-edit files under `java/sdk/src/generated/java/` — these are auto-generated. They are updated by running `cd java/scripts/codegen && npx tsx java.ts`.
+- **NEVER** modify `java/sdk/pom.xml` — build config is not in scope
 - **NEVER** modify `java/scripts/codegen/package.json` or `java/scripts/codegen/package-lock.json` — dependency versions are not in scope
 - **NEVER** modify files under `.github/` — workflow files are not in scope
 - You **MAY** modify `java/scripts/codegen/java.ts` to fix the code generator
-- You **MAY** modify files under `java/src/main/java/` and `java/src/test/java/` to fix handwritten code
+- You **MAY** modify files under `java/sdk/src/main/java/` and `java/sdk/src/test/java/` to fix handwritten code
 - Always run `cd java && mvn spotless:apply` before committing to ensure code formatting
 - Maximum 3 fix attempts before reporting failure via `noop`
 - Only push if `mvn verify` passes
\ No newline at end of file
diff --git a/.github/workflows/java-publish-maven.yml b/.github/workflows/java-publish-maven.yml
index e293d91271..51c50d979c 100644
--- a/.github/workflows/java-publish-maven.yml
+++ b/.github/workflows/java-publish-maven.yml
@@ -1,9 +1,6 @@
 name: "Java Publish to Maven Central"
 
 env:
-  # Disable Husky Git hooks in CI to prevent local development hooks
-  # (e.g., pre-commit formatting checks) from running during automated
-  # workflows that perform git commits and pushes.
   HUSKY: 0
 
 on:
@@ -37,6 +34,10 @@ on:
         type: boolean
         required: false
         default: false
+    outputs:
+      mavenPublished:
+        description: "Whether the Java package was published to Maven Central"
+        value: ${{ jobs.deploy-maven.outputs.published }}
     secrets:
       JAVA_RELEASE_TOKEN:
         required: true
@@ -52,8 +53,7 @@ on:
         required: true
 
 permissions:
-  contents: write
-  id-token: write
+  contents: read
 
 concurrency:
   group: publish-maven
@@ -66,11 +66,6 @@ jobs:
     steps:
       - name: Verify JAVA_RELEASE_TOKEN can push to repository
         run: |
-          # JAVA_RELEASE_TOKEN is used by actions/checkout and for:
-          #   - git push origin main (doc updates)
-          #   - mvn release:prepare -DpushChanges=true (release commits + tags)
-          #   - git revert + push (rollback on failure)
-          # It must have push (contents:write) permission on this repo.
           PUSH=$(gh api repos/${{ github.repository }} --jq '.permissions.push // false')
           if [ "$PUSH" != "true" ]; then
             echo "::error::JAVA_RELEASE_TOKEN lacks push permission on ${{ github.repository }}. It is required for pushing release commits and tags to main."
@@ -80,49 +75,24 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.JAVA_RELEASE_TOKEN }}
 
-      - name: Verify JAVA_RELEASE_GITHUB_TOKEN can trigger workflows
-        run: |
-          # JAVA_RELEASE_GITHUB_TOKEN is used for:
-          #   - gh workflow run release-changelog.lock.yml (requires actions:write)
-          # Check the token's OAuth scopes for 'workflow' (classic PAT) or
-          # attempt a workflow dispatch with a non-existent ref to verify write access
-          # (fine-grained PAT — these don't expose scopes via X-OAuth-Scopes).
-          SCOPES=$(gh api -i user 2>&1 | grep -i '^x-oauth-scopes:' | tr '[:upper:]' '[:lower:]' || true)
-          if echo "$SCOPES" | grep -q 'workflow'; then
-            echo "JAVA_RELEASE_GITHUB_TOKEN has 'workflow' scope (classic PAT)"
-          elif [ -z "$SCOPES" ]; then
-            # Fine-grained PAT: no X-OAuth-Scopes header returned.
-            # Attempt a workflow dispatch against a non-existent ref. If the token
-            # has actions:write, the API returns 422 (validation failed on ref).
-            # If it lacks the permission, the API returns 403.
-            HTTP_CODE=$(gh api -X POST \
-              "repos/${{ github.repository }}/actions/workflows/release-changelog.lock.yml/dispatches" \
-              -f ref="preflight-check-nonexistent-ref" \
-              -f 'inputs[tag]=preflight-check' \
-              --silent -i 2>&1 | head -1 | grep -oE '[0-9]{3}' || echo "000")
-            if [ "$HTTP_CODE" = "403" ] || [ "$HTTP_CODE" = "000" ]; then
-              echo "::error::JAVA_RELEASE_GITHUB_TOKEN lacks actions:write permission on ${{ github.repository }}. It cannot trigger the changelog generation workflow."
-              exit 1
-            fi
-            # 422 = has write access but ref doesn't exist (expected), 204 would mean it dispatched (shouldn't happen with fake ref)
-            echo "JAVA_RELEASE_GITHUB_TOKEN actions:write access OK (fine-grained PAT, dispatch returned HTTP ${HTTP_CODE})"
-          else
-            echo "::error::JAVA_RELEASE_GITHUB_TOKEN lacks 'workflow' scope. Found scopes: ${SCOPES}. It needs this scope to trigger changelog generation via gh workflow run."
-            exit 1
-          fi
-        env:
-          GITHUB_TOKEN: ${{ secrets.JAVA_RELEASE_GITHUB_TOKEN }}
-
-  publish-maven:
-    name: Publish Java SDK to Maven Central
+  prepare-release:
+    name: Prepare Java release
     needs: preflight
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     defaults:
       run:
         shell: bash
         working-directory: ./java
     outputs:
-      version: ${{ steps.versions.outputs.release_version }}
+      release_version: ${{ steps.versions.outputs.release_version }}
+      development_version: ${{ steps.versions.outputs.development_version }}
+      release_tag: ${{ steps.release-identity.outputs.release_tag }}
+      tag_commit: ${{ steps.release-identity.outputs.tag_commit }}
+      pre_prepare_commit: ${{ steps.pre-prepare.outputs.pre_prepare_commit }}
+      post_prepare_commit: ${{ steps.release-identity.outputs.post_prepare_commit }}
+      docs_commit: ${{ steps.update-docs.outputs.docs_commit_sha }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -136,88 +106,66 @@ jobs:
 
       - uses: ./.github/actions/setup-copilot
 
-      - name: Set up JDK 25
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           java-version: "25"
           distribution: "microsoft"
           cache: "maven"
-          server-id: central
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.JAVA_GPG_SECRET_KEY }}
-          gpg-passphrase: JAVA_GPG_PASSPHRASE
 
       - name: Determine versions
         id: versions
-        working-directory: ./java
         run: |
           CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "Current pom.xml version: $CURRENT_VERSION"
 
-          # Determine release version
           if [ -n "${{ inputs.releaseVersion }}" ]; then
             RELEASE_VERSION="${{ inputs.releaseVersion }}"
           else
-            # Remove -SNAPSHOT suffix if present
             RELEASE_VERSION="${CURRENT_VERSION%-SNAPSHOT}"
           fi
           echo "Release version: $RELEASE_VERSION"
 
-          # Determine next development version
           if [ -n "${{ inputs.developmentVersion }}" ]; then
             DEV_VERSION="${{ inputs.developmentVersion }}"
             if [[ "$DEV_VERSION" != *-SNAPSHOT ]]; then
-              echo "::error::developmentVersion '${DEV_VERSION}' must end with '-SNAPSHOT' (e.g., '${DEV_VERSION}-SNAPSHOT'). The maven-release-plugin requires the next development version to be a snapshot."
+              echo "::error::developmentVersion '${DEV_VERSION}' must end with '-SNAPSHOT'."
               exit 1
             fi
           else
-            # Split version: supports "0.1.32", "0.1.32-preview.0", "0.1.32-java.0", and "0.1.32-java-preview.0" formats
-            # Validate RELEASE_VERSION format explicitly to provide clear errors
             if ! echo "$RELEASE_VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-(preview|(beta-)?java(-preview)?)\.[0-9]+)?$'; then
-              echo "Error: RELEASE_VERSION '$RELEASE_VERSION' is invalid. Expected format: M.M.P, M.M.P-preview.N, M.M.P-java.N, M.M.P-java-preview.N, M.M.P-beta-java.N, or M.M.P-beta-java-preview.N (e.g., 1.2.3, 1.2.3-preview.0, 1.2.3-java.0, 1.2.3-java-preview.0, 1.2.3-beta-java.0, or 1.2.3-beta-java-preview.0)." >&2
+              echo "Error: RELEASE_VERSION '$RELEASE_VERSION' is invalid." >&2
               exit 1
             fi
-            # Extract the base M.M.P portion (before any qualifier)
             BASE_VERSION=$(echo "$RELEASE_VERSION" | grep -oE '^[0-9]+\.[0-9]+\.[0-9]+')
             QUALIFIER=$(echo "$RELEASE_VERSION" | sed "s|^${BASE_VERSION}||")
             IFS='.' read -r MAJOR MINOR PATCH <<< "$BASE_VERSION"
-            NEXT_PATCH=$((PATCH + 1))
-            DEV_VERSION="${MAJOR}.${MINOR}.${NEXT_PATCH}${QUALIFIER}-SNAPSHOT"
+            DEV_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))${QUALIFIER}-SNAPSHOT"
           fi
-          echo "Next development version: $DEV_VERSION"
-
-          echo "release_version=$RELEASE_VERSION" >> $GITHUB_OUTPUT
-          echo "dev_version=$DEV_VERSION" >> $GITHUB_OUTPUT
 
-          echo "### Version Summary" >> $GITHUB_STEP_SUMMARY
-          echo "- **Release version:** $RELEASE_VERSION" >> $GITHUB_STEP_SUMMARY
-          echo "- **Next development version:** $DEV_VERSION" >> $GITHUB_STEP_SUMMARY
+          echo "release_version=$RELEASE_VERSION" >> "$GITHUB_OUTPUT"
+          echo "development_version=$DEV_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Update documentation with release version
         id: update-docs
-        working-directory: ./java
         run: |
           VERSION="${{ steps.versions.outputs.release_version }}"
-          DEV_VERSION="${{ steps.versions.outputs.dev_version }}"
+          DEV_VERSION="${{ steps.versions.outputs.development_version }}"
           ./scripts/test-update-documentation-versions.sh
-          ./scripts/update-documentation-versions.sh "$VERSION" "$DEV_VERSION" README.md jbang-example.java
-
-          # Commit the documentation changes before release:prepare (requires clean working directory)
-          git add README.md jbang-example.java
+          ./scripts/update-documentation-versions.sh "$VERSION" "$DEV_VERSION" README.md sdk/jbang-example.java
+          git add README.md sdk/jbang-example.java
           git commit -m "docs: update version references to ${VERSION}"
-
-          # Save the commit SHA for potential rollback
-          echo "docs_commit_sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
+          echo "docs_commit_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
           git push origin main
 
+      - name: Record rollback base
+        id: pre-prepare
+        run: echo "pre_prepare_commit=$(git rev-parse HEAD^)" >> "$GITHUB_OUTPUT"
+
       - name: Prepare Release
-        working-directory: ./java
         run: |
           mvn -B release:prepare \
             -DreleaseVersion=${{ steps.versions.outputs.release_version }} \
-            -DdevelopmentVersion=${{ steps.versions.outputs.dev_version }} \
+            -DdevelopmentVersion=${{ steps.versions.outputs.development_version }} \
             -DtagNameFormat=java/v@{project.version} \
             -DpushChanges=true \
             -Darguments="-DskipTests"
@@ -226,33 +174,378 @@ jobs:
           MAVEN_PASSWORD: ${{ secrets.JAVA_MAVEN_CENTRAL_PASSWORD }}
           JAVA_GPG_PASSPHRASE: ${{ secrets.JAVA_GPG_PASSPHRASE }}
 
-      - name: Perform Release and Deploy to Maven Central
+      - name: Record immutable release identity
+        id: release-identity
+        run: |
+          TAG="java/v${{ steps.versions.outputs.release_version }}"
+          TAG_COMMIT=$(git rev-parse "${TAG}^{commit}")
+          POST_PREPARE_COMMIT=$(git rev-parse HEAD)
+          echo "release_tag=$TAG" >> "$GITHUB_OUTPUT"
+          echo "tag_commit=$TAG_COMMIT" >> "$GITHUB_OUTPUT"
+          echo "post_prepare_commit=$POST_PREPARE_COMMIT" >> "$GITHUB_OUTPUT"
+
+  build-linux-arm64-classifier:
+    name: Build Linux ARM64 native classifier
+    needs: prepare-release
+    runs-on: ubuntu-24.04-arm
+    permissions:
+      contents: read
+    defaults:
+      run:
+        shell: bash
         working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ needs.prepare-release.outputs.release_tag }}
+          fetch-depth: 1
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - name: Build and validate linux-arm64 classifier
         run: |
-          mvn -B release:perform \
-            -Dgoals="deploy" \
-            -Darguments="-DskipTests -Prelease"
-        env:
-          MAVEN_USERNAME: ${{ secrets.JAVA_MAVEN_CENTRAL_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.JAVA_MAVEN_CENTRAL_PASSWORD }}
-          JAVA_GPG_PASSPHRASE: ${{ secrets.JAVA_GPG_PASSPHRASE }}
+          set -euo pipefail
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.prepare-release.outputs.tag_commit }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the prepared tag commit."
+            exit 1
+          fi
+          node copilot-native/scripts/validate-native-host.mjs linux-arm64
+          mvn -B -pl copilot-native package -DskipTests -Dcopilot.native.libc=glibc
+          VERSION="${{ needs.prepare-release.outputs.release_version }}"
+          JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION-linux-arm64.jar"
+          PRIMARY_JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION.jar"
+          test -f "$JAR"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier linux-arm64 "$JAR" "$(basename "$JAR")" ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder "$PRIMARY_JAR"
+          MANIFEST="copilot-native/target/linux-arm64-$VERSION.sha256"
+          HASH=$(sha256sum "$JAR" | cut -d ' ' -f 1)
+          printf '%s  %s' "$HASH" "$(basename "$JAR")" > "$MANIFEST"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-native-linux-arm64-release-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ needs.prepare-release.outputs.release_version }}-linux-arm64.jar
+            java/copilot-native/target/linux-arm64-${{ needs.prepare-release.outputs.release_version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
+  build-windows-classifier:
+    name: Build Windows native classifier
+    needs: prepare-release
+    runs-on: windows-latest
+    permissions:
+      contents: read
+    defaults:
+      run:
+        shell: pwsh
+        working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ needs.prepare-release.outputs.release_tag }}
+          fetch-depth: 1
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
 
-      - name: Rollback documentation commit on failure
-        if: failure() && steps.update-docs.outputs.docs_commit_sha != ''
+      - name: Build and validate win32-x64 classifier
+        run: |
+          $sourceCommit = git rev-parse HEAD
+          if ($sourceCommit -ne '${{ needs.prepare-release.outputs.tag_commit }}') {
+            throw "Checked out $sourceCommit instead of the prepared tag commit."
+          }
+          node copilot-native/scripts/validate-native-host.mjs win32-x64
+          mvn -B -pl copilot-native package -DskipTests
+          $version = '${{ needs.prepare-release.outputs.release_version }}'
+          $jar = "copilot-native/target/copilot-sdk-java-runtime-$version-win32-x64.jar"
+          $primaryJar = "copilot-native/target/copilot-sdk-java-runtime-$version.jar"
+          if (-not (Test-Path -LiteralPath $jar -PathType Leaf)) {
+            throw "Expected Windows classifier was not produced: $jar"
+          }
+          node copilot-native/scripts/validate-native-artifact.mjs classifier win32-x64 $jar ([IO.Path]::GetFileName($jar)) ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder $primaryJar
+          $manifest = "copilot-native/target/win32-x64-$version.sha256"
+          $hash = (Get-FileHash -Algorithm SHA256 -LiteralPath $jar).Hash.ToLowerInvariant()
+          "$hash  $([IO.Path]::GetFileName($jar))" | Set-Content -NoNewline -Encoding ascii $manifest
+          node copilot-native/scripts/validate-native-artifact.mjs checksum $jar $manifest ([IO.Path]::GetFileName($jar))
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-native-win32-x64-release-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ needs.prepare-release.outputs.release_version }}-win32-x64.jar
+            java/copilot-native/target/win32-x64-${{ needs.prepare-release.outputs.release_version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
+  build-darwin-classifier:
+    name: Build Darwin native classifier
+    needs: prepare-release
+    runs-on: macos-26
+    permissions:
+      contents: read
+    defaults:
+      run:
+        shell: bash
         working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ needs.prepare-release.outputs.release_tag }}
+          fetch-depth: 1
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - name: Build and validate darwin-arm64 classifier
         run: |
-          echo "Release failed, rolling back documentation commit..."
-          git revert --no-edit ${{ steps.update-docs.outputs.docs_commit_sha }}
-          git push origin main
+          set -euo pipefail
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.prepare-release.outputs.tag_commit }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the prepared tag commit."
+            exit 1
+          fi
+          node copilot-native/scripts/validate-native-host.mjs darwin-arm64
+          mvn -B -pl copilot-native package -DskipTests
+          VERSION="${{ needs.prepare-release.outputs.release_version }}"
+          JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION-darwin-arm64.jar"
+          PRIMARY_JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION.jar"
+          test -f "$JAR"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier darwin-arm64 "$JAR" "$(basename "$JAR")" ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder "$PRIMARY_JAR"
+          MANIFEST="copilot-native/target/darwin-arm64-$VERSION.sha256"
+          HASH=$(shasum -a 256 "$JAR" | cut -d ' ' -f 1)
+          printf '%s  %s' "$HASH" "$(basename "$JAR")" > "$MANIFEST"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-native-darwin-arm64-release-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ needs.prepare-release.outputs.release_version }}-darwin-arm64.jar
+            java/copilot-native/target/darwin-arm64-${{ needs.prepare-release.outputs.release_version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
+  deploy-maven:
+    name: Deploy Java release to Maven Central
+    needs:
+      [
+        prepare-release,
+        build-linux-arm64-classifier,
+        build-windows-classifier,
+        build-darwin-classifier,
+      ]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./java
+    outputs:
+      version: ${{ needs.prepare-release.outputs.release_version }}
+      published: ${{ steps.publish-maven.outcome == 'success' }}
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ needs.prepare-release.outputs.release_tag }}
+          fetch-depth: 1
+          persist-credentials: false
+
+      - uses: ./.github/actions/setup-copilot
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+          server-id: central
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.JAVA_GPG_SECRET_KEY }}
+          gpg-passphrase: JAVA_GPG_PASSPHRASE
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
 
-          # Also run Maven release:rollback to clean up any partial release state
-          mvn -B release:rollback || true
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-linux-arm64-release-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/java-native-linux-arm64
+
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-win32-x64-release-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/java-native-win32-x64
+
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-darwin-arm64-release-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/java-native-darwin-arm64
+
+      - name: Verify immutable source and Linux ARM64 classifier
+        id: linux-arm64-artifact
+        run: |
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.prepare-release.outputs.tag_commit }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the prepared tag commit."
+            exit 1
+          fi
+          VERSION="${{ needs.prepare-release.outputs.release_version }}"
+          ARTIFACT_DIRECTORY="${{ runner.temp }}/java-native-linux-arm64"
+          JAR="$ARTIFACT_DIRECTORY/copilot-sdk-java-runtime-$VERSION-linux-arm64.jar"
+          MANIFEST="$ARTIFACT_DIRECTORY/linux-arm64-$VERSION.sha256"
+          test -f "$JAR"
+          test -f "$MANIFEST"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            classifier linux-arm64 "$JAR" "$(basename "$JAR")" "$GITHUB_WORKSPACE"
+          echo "linux_arm64_jar=$JAR" >> "$GITHUB_OUTPUT"
+          echo "linux_arm64_sha=$(cut -d ' ' -f 1 "$MANIFEST")" >> "$GITHUB_OUTPUT"
+
+      - name: Verify immutable source and Windows classifier
+        id: windows-artifact
+        run: |
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.prepare-release.outputs.tag_commit }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the prepared tag commit."
+            exit 1
+          fi
+          VERSION="${{ needs.prepare-release.outputs.release_version }}"
+          ARTIFACT_DIRECTORY="${{ runner.temp }}/java-native-win32-x64"
+          JAR="$ARTIFACT_DIRECTORY/copilot-sdk-java-runtime-$VERSION-win32-x64.jar"
+          MANIFEST="$ARTIFACT_DIRECTORY/win32-x64-$VERSION.sha256"
+          test -f "$JAR"
+          test -f "$MANIFEST"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            classifier win32-x64 "$JAR" "$(basename "$JAR")" "$GITHUB_WORKSPACE"
+          echo "windows_jar=$JAR" >> "$GITHUB_OUTPUT"
+          echo "windows_sha=$(cut -d ' ' -f 1 "$MANIFEST")" >> "$GITHUB_OUTPUT"
+
+      - name: Verify immutable source and Darwin classifier
+        id: darwin-artifact
+        run: |
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.prepare-release.outputs.tag_commit }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the prepared tag commit."
+            exit 1
+          fi
+          VERSION="${{ needs.prepare-release.outputs.release_version }}"
+          ARTIFACT_DIRECTORY="${{ runner.temp }}/java-native-darwin-arm64"
+          JAR="$ARTIFACT_DIRECTORY/copilot-sdk-java-runtime-$VERSION-darwin-arm64.jar"
+          MANIFEST="$ARTIFACT_DIRECTORY/darwin-arm64-$VERSION.sha256"
+          test -f "$JAR"
+          test -f "$MANIFEST"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            classifier darwin-arm64 "$JAR" "$(basename "$JAR")" "$GITHUB_WORKSPACE"
+          echo "darwin_jar=$JAR" >> "$GITHUB_OUTPUT"
+          echo "darwin_sha=$(cut -d ' ' -f 1 "$MANIFEST")" >> "$GITHUB_OUTPUT"
+
+      - name: Build Linux classifier and deploy complete release
+        id: publish-maven
+        run: |
+          VERSION="${{ needs.prepare-release.outputs.release_version }}"
+          mvn -B deploy -DskipTests -Prelease -Dcopilot.native.libc=glibc \
+            "-Dcopilot.native.external.linux.arm64.classifier.path=${{ steps.linux-arm64-artifact.outputs.linux_arm64_jar }}" \
+            "-Dcopilot.native.external.win32.classifier.path=${{ steps.windows-artifact.outputs.windows_jar }}" \
+            "-Dcopilot.native.external.darwin.classifier.path=${{ steps.darwin-artifact.outputs.darwin_jar }}"
+          LINUX_JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION-linux-x64.jar"
+          test -f "$LINUX_JAR"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier linux-x64 "$LINUX_JAR" "$(basename "$LINUX_JAR")" ..
+          LINUX_SHA=$(sha256sum "$LINUX_JAR" | cut -d ' ' -f 1)
+          GROUP_ID=$(mvn -q -pl copilot-native help:evaluate -Dexpression=project.groupId -DforceStdout)
+          ARTIFACT_ID=$(mvn -q -pl copilot-native help:evaluate -Dexpression=project.artifactId -DforceStdout)
+          POM_VERSION=$(mvn -q -pl copilot-native help:evaluate -Dexpression=project.version -DforceStdout)
+          if [ -z "$GROUP_ID" ] || [ -z "$ARTIFACT_ID" ] || [ "$POM_VERSION" != "$VERSION" ]; then
+            echo "::error::Unexpected copilot-native Maven coordinates: $GROUP_ID:$ARTIFACT_ID:$POM_VERSION (expected version $VERSION)"
+            exit 1
+          fi
+          {
+            echo "### Maven Central Release"
+            echo "- **Version:** $VERSION"
+            echo "- **Source tag:** \`${{ needs.prepare-release.outputs.release_tag }}\`"
+            echo "- **Source commit:** \`${{ needs.prepare-release.outputs.tag_commit }}\`"
+            echo "- **Next development version:** ${{ needs.prepare-release.outputs.development_version }}"
+            echo "- **Repository:** Maven Central"
+            echo ""
+            echo "#### Maven Coordinates"
+            echo ""
+            echo '```xml'
+            echo "<dependency>"
+            echo "    <groupId>$GROUP_ID</groupId>"
+            echo "    <artifactId>$ARTIFACT_ID</artifactId>"
+            echo "    <version>$POM_VERSION</version>"
+            echo "</dependency>"
+            echo '```'
+            echo ""
+            echo "#### Published Native Classifiers"
+            echo ""
+            echo "| Classifier | Build runner | Artifact | SHA-256 | Status |"
+            echo "| --- | --- | --- | --- | --- |"
+            echo "| \`linux-x64\` | \`ubuntu-latest\` | \`$(basename "$LINUX_JAR")\` | \`$LINUX_SHA\` | Published |"
+            echo "| \`linux-arm64\` | \`ubuntu-24.04-arm\` | \`$(basename "${{ steps.linux-arm64-artifact.outputs.linux_arm64_jar }}")\` | \`${{ steps.linux-arm64-artifact.outputs.linux_arm64_sha }}\` | Published |"
+            echo "| \`win32-x64\` | \`windows-latest\` | \`$(basename "${{ steps.windows-artifact.outputs.windows_jar }}")\` | \`${{ steps.windows-artifact.outputs.windows_sha }}\` | Published |"
+            echo "| \`darwin-arm64\` | \`macos-26\` | \`$(basename "${{ steps.darwin-artifact.outputs.darwin_jar }}")\` | \`${{ steps.darwin-artifact.outputs.darwin_sha }}\` | Published |"
+          } >> "$GITHUB_STEP_SUMMARY"
+        env:
+          MAVEN_USERNAME: ${{ secrets.JAVA_MAVEN_CENTRAL_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.JAVA_MAVEN_CENTRAL_PASSWORD }}
+          JAVA_GPG_PASSPHRASE: ${{ secrets.JAVA_GPG_PASSPHRASE }}
 
-  github-release:
-    name: Create GitHub Release
-    needs: [preflight, publish-maven]
-    if: github.ref == 'refs/heads/main'
+  rollback-release:
+    name: Roll back failed Java release preparation
+    needs:
+      [
+        prepare-release,
+        build-linux-arm64-classifier,
+        build-windows-classifier,
+        build-darwin-classifier,
+        deploy-maven,
+      ]
+    if: ${{ failure() && needs.prepare-release.outputs.docs_commit != '' }}
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     defaults:
       run:
         shell: bash
@@ -261,61 +554,127 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
-      - name: Create GitHub Release
+          token: ${{ secrets.JAVA_RELEASE_TOKEN }}
+
+      - name: Safely revert release commits and tag
+        env:
+          DOCS_COMMIT: ${{ needs.prepare-release.outputs.docs_commit }}
+          PREPARE_RESULT: ${{ needs.prepare-release.result }}
+          PRE_PREPARE_COMMIT: ${{ needs.prepare-release.outputs.pre_prepare_commit }}
+          POST_PREPARE_COMMIT: ${{ needs.prepare-release.outputs.post_prepare_commit }}
+          RELEASE_TAG: java/v${{ needs.prepare-release.outputs.release_version }}
+          TAG_COMMIT: ${{ needs.prepare-release.outputs.tag_commit }}
         run: |
-          VERSION="${{ needs.publish-maven.outputs.version }}"
-          GROUP_ID="com.github"
-          ARTIFACT_ID="copilot-sdk-java"
-          CURRENT_TAG="java/v${VERSION}"
-
-          if gh release view "${CURRENT_TAG}" >/dev/null 2>&1; then
-            echo "Release ${CURRENT_TAG} already exists. Skipping creation."
-            exit 0
+          set -euo pipefail
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git fetch origin main --tags
+          MAIN_COMMIT=$(git rev-parse origin/main)
+          echo "Rollback inspection: main=$MAIN_COMMIT docs=$DOCS_COMMIT pre=$PRE_PREPARE_COMMIT post=$POST_PREPARE_COMMIT tag=$RELEASE_TAG"
+
+          unsafe_rollback() {
+            echo "::error::Unsafe rollback state: $*" >&2
+            exit 1
+          }
+
+          if ! git cat-file -e "${PRE_PREPARE_COMMIT}^{commit}"; then
+            unsafe_rollback "Recorded pre-prepare commit does not exist: $PRE_PREPARE_COMMIT"
+          fi
+          if ! git cat-file -e "${DOCS_COMMIT}^{commit}"; then
+            unsafe_rollback "Recorded documentation commit does not exist: $DOCS_COMMIT"
+          fi
+          if ! git merge-base --is-ancestor "$PRE_PREPARE_COMMIT" "$MAIN_COMMIT"; then
+            unsafe_rollback "Recorded pre-prepare commit is not an ancestor of main."
+          fi
+          if [ "$(git rev-parse "${DOCS_COMMIT}^")" != "$PRE_PREPARE_COMMIT" ]; then
+            unsafe_rollback "Documentation commit is not immediately based on the recorded pre-prepare commit."
           fi
 
-          # Generate release notes from template
-          export VERSION GROUP_ID ARTIFACT_ID
-          RELEASE_NOTES=$(envsubst < $GITHUB_WORKSPACE/.github/workflows/java.notes.template)
+          mapfile -t ROLLBACK_COMMITS < <(git rev-list --reverse "$PRE_PREPARE_COMMIT..$MAIN_COMMIT")
+          FIRST_PARENT_COUNT=$(git rev-list --count --first-parent "$PRE_PREPARE_COMMIT..$MAIN_COMMIT")
+          if [ "${#ROLLBACK_COMMITS[@]}" -ne "$FIRST_PARENT_COUNT" ]; then
+            unsafe_rollback "Release range contains merged history."
+          fi
+          if [ "${#ROLLBACK_COMMITS[@]}" -lt 1 ] || [ "${#ROLLBACK_COMMITS[@]}" -gt 3 ]; then
+            unsafe_rollback "Expected one to three release-preparation commits after the recorded base; found ${#ROLLBACK_COMMITS[@]}."
+          fi
+          if [ "${ROLLBACK_COMMITS[0]}" != "$DOCS_COMMIT" ]; then
+            unsafe_rollback "The first commit after the recorded base is not the recorded documentation commit."
+          fi
 
-          # Get the previous tag for generating notes
-          # grep returns exit 1 when no lines match (first release), so
-          # append "|| true" to prevent pipefail from aborting the script.
-          PREV_TAG=$(git tag --list 'java/v*' --sort=-version:refname \
-            | grep -Fxv "${CURRENT_TAG}" \
-            | head -n 1 || true)
+          EXPECTED_PARENT="$PRE_PREPARE_COMMIT"
+          for COMMIT in "${ROLLBACK_COMMITS[@]}"; do
+            if git rev-parse -q --verify "${COMMIT}^2" >/dev/null; then
+              unsafe_rollback "Release range contains merge commit $COMMIT."
+            fi
+            if [ "$(git rev-parse "${COMMIT}^")" != "$EXPECTED_PARENT" ]; then
+              unsafe_rollback "Release range is not a linear continuation of the recorded base."
+            fi
+            EXPECTED_PARENT="$COMMIT"
+          done
 
-          echo "Current tag: ${CURRENT_TAG}"
-          echo "Previous tag: ${PREV_TAG}"
+          RELEASE_VERSION="${RELEASE_TAG#java/v}"
+          if [ "$(git log -1 --format=%s "$DOCS_COMMIT")" != "docs: update version references to $RELEASE_VERSION" ]; then
+            unsafe_rollback "Recorded documentation commit has an unexpected subject."
+          fi
 
-          # Build the gh release command
-          GH_ARGS=("${CURRENT_TAG}")
-          GH_ARGS+=("--title" "GitHub Copilot SDK for Java ${VERSION}")
-          GH_ARGS+=("--notes" "${RELEASE_NOTES}")
-          GH_ARGS+=("--generate-notes")
+          RELEASE_PREPARE_COMMIT=""
+          if [ "${#ROLLBACK_COMMITS[@]}" -ge 2 ]; then
+            RELEASE_PREPARE_COMMIT="${ROLLBACK_COMMITS[1]}"
+            if [ "$(git log -1 --format=%s "$RELEASE_PREPARE_COMMIT")" != "[maven-release-plugin] prepare release $RELEASE_TAG" ]; then
+              unsafe_rollback "Release-version commit has an unexpected subject."
+            fi
+          fi
+          if [ "${#ROLLBACK_COMMITS[@]}" -eq 3 ] && [ "$(git log -1 --format=%s "${ROLLBACK_COMMITS[2]}")" != "[maven-release-plugin] prepare for next development iteration" ]; then
+            unsafe_rollback "Development-version commit has an unexpected subject."
+          fi
 
-          if [ -n "$PREV_TAG" ]; then
-            GH_ARGS+=("--notes-start-tag" "$PREV_TAG")
+          TAG_OBJECT=$(git ls-remote --refs origin "refs/tags/$RELEASE_TAG" | awk '{print $1}')
+          if [ -n "$TAG_OBJECT" ]; then
+            git fetch --no-tags origin "+refs/tags/$RELEASE_TAG:refs/tags/$RELEASE_TAG"
+            REMOTE_TAG_COMMIT=$(git rev-parse "${RELEASE_TAG}^{commit}")
+            if [ -z "$RELEASE_PREPARE_COMMIT" ] || [ "$REMOTE_TAG_COMMIT" != "$RELEASE_PREPARE_COMMIT" ]; then
+              unsafe_rollback "Release tag does not point to the guarded release-version commit."
+            fi
+          elif [ -n "$TAG_COMMIT" ]; then
+            unsafe_rollback "Recorded release tag is absent from the remote."
           fi
 
-          ${{ inputs.prerelease == true && 'GH_ARGS+=("--prerelease")' || '' }}
+          if [ "$PREPARE_RESULT" = "success" ]; then
+            if [ -z "$POST_PREPARE_COMMIT" ] || [ -z "$TAG_COMMIT" ]; then
+              unsafe_rollback "Successful preparation did not record its immutable release identity."
+            fi
+            if [ "$MAIN_COMMIT" != "$POST_PREPARE_COMMIT" ]; then
+              unsafe_rollback "main has advanced beyond the recorded post-prepare commit."
+            fi
+            if [ -z "$TAG_OBJECT" ] || [ "$REMOTE_TAG_COMMIT" != "$TAG_COMMIT" ]; then
+              unsafe_rollback "Remote release tag does not match the recorded tag commit."
+            fi
+          fi
 
-          gh release create "${GH_ARGS[@]}"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Trigger changelog generation
-        run: gh workflow run release-changelog.lock.yml -f tag="java/v${{ needs.publish-maven.outputs.version }}"
-        env:
-          GITHUB_TOKEN: ${{ secrets.JAVA_RELEASE_GITHUB_TOKEN }}
+          git checkout -B release-rollback "$MAIN_COMMIT"
+          git revert --no-edit "$PRE_PREPARE_COMMIT..$MAIN_COMMIT"
+          if [ -n "$TAG_OBJECT" ]; then
+            git push --atomic \
+              "--force-with-lease=refs/heads/main:$MAIN_COMMIT" \
+              "--force-with-lease=refs/tags/$RELEASE_TAG:$TAG_OBJECT" \
+              origin HEAD:refs/heads/main ":refs/tags/$RELEASE_TAG"
+          else
+            git push \
+              "--force-with-lease=refs/heads/main:$MAIN_COMMIT" \
+              origin HEAD:refs/heads/main
+          fi
+          echo "Release preparation rollback completed after guarded history inspection."
 
   deploy-site:
     name: Deploy Documentation Site
-    needs: [preflight, publish-maven, github-release]
-    if: github.ref == 'refs/heads/main'
+    needs: [preflight, deploy-maven]
+    if: github.ref == 'refs/heads/main' && needs.deploy-maven.outputs.published == 'true'
     runs-on: ubuntu-latest
     steps:
       - name: Trigger site deployment on standalone repo
         run: |
-          VERSION="${{ needs.publish-maven.outputs.version }}"
+          VERSION="${{ needs.deploy-maven.outputs.version }}"
           TAG="java/v${VERSION}"
           PUBLISH_AS_LATEST=true
           if [ "${{ inputs.prerelease }}" = "true" ]; then
@@ -327,7 +686,9 @@ jobs:
             -f version="${VERSION}" \
             -f publish_as_latest="${PUBLISH_AS_LATEST}" \
             -f monorepo_tag="${TAG}"
-          echo "### Site Deployment" >> $GITHUB_STEP_SUMMARY
-          echo "Triggered deploy-site.yml on github/copilot-sdk-java for version ${VERSION}" >> $GITHUB_STEP_SUMMARY
+          {
+            echo "### Site Deployment"
+            echo "Triggered deploy-site.yml on github/copilot-sdk-java for version ${VERSION}"
+          } >> "$GITHUB_STEP_SUMMARY"
         env:
           GITHUB_TOKEN: ${{ secrets.JAVA_RELEASE_GITHUB_TOKEN }}
diff --git a/.github/workflows/java-publish-snapshot.yml b/.github/workflows/java-publish-snapshot.yml
index 8c957627ff..3b15c3f0dc 100644
--- a/.github/workflows/java-publish-snapshot.yml
+++ b/.github/workflows/java-publish-snapshot.yml
@@ -16,8 +16,220 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  publish-snapshot:
+  resolve-source:
+    name: Resolve immutable snapshot source
+    runs-on: ubuntu-latest
+    outputs:
+      source_sha: ${{ steps.source.outputs.sha }}
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ github.sha }}
+          fetch-depth: 1
+          persist-credentials: false
+
+      - id: source
+        shell: bash
+        run: |
+          SHA=$(git rev-parse HEAD)
+          echo "sha=$SHA" >> "$GITHUB_OUTPUT"
+
+  build-linux-arm64-classifier:
+    name: Build Linux ARM64 snapshot classifier
+    needs: resolve-source
+    runs-on: ubuntu-24.04-arm
+    permissions:
+      contents: read
+    outputs:
+      version: ${{ steps.build.outputs.version }}
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ github.sha }}
+          fetch-depth: 1
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - name: Build and validate linux-arm64 classifier
+        id: build
+        run: |
+          set -euo pipefail
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.resolve-source.outputs.source_sha }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the resolved snapshot source."
+            exit 1
+          fi
+          node copilot-native/scripts/validate-native-host.mjs linux-arm64
+          mvn -B -pl copilot-native package -DskipTests -Dcopilot.native.libc=glibc
+          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION-linux-arm64.jar"
+          PRIMARY_JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION.jar"
+          test -f "$JAR"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier linux-arm64 "$JAR" "$(basename "$JAR")" ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder "$PRIMARY_JAR"
+          MANIFEST="copilot-native/target/linux-arm64-$VERSION.sha256"
+          HASH=$(sha256sum "$JAR" | cut -d ' ' -f 1)
+          printf '%s  %s' "$HASH" "$(basename "$JAR")" > "$MANIFEST"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-native-linux-arm64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ steps.build.outputs.version }}-linux-arm64.jar
+            java/copilot-native/target/linux-arm64-${{ steps.build.outputs.version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
+  build-windows-classifier:
+    name: Build Windows snapshot classifier
+    needs: resolve-source
+    runs-on: windows-latest
+    permissions:
+      contents: read
+    outputs:
+      version: ${{ steps.build.outputs.version }}
+    defaults:
+      run:
+        shell: pwsh
+        working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ github.sha }}
+          fetch-depth: 1
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - name: Build and validate win32-x64 classifier
+        id: build
+        run: |
+          $sourceCommit = git rev-parse HEAD
+          if ($sourceCommit -ne '${{ needs.resolve-source.outputs.source_sha }}') {
+            throw "Checked out $sourceCommit instead of the resolved snapshot source."
+          }
+          node copilot-native/scripts/validate-native-host.mjs win32-x64
+          mvn -B -pl copilot-native package -DskipTests
+          $version = mvn help:evaluate "-Dexpression=project.version" -q "-DforceStdout"
+          $jar = "copilot-native/target/copilot-sdk-java-runtime-$version-win32-x64.jar"
+          $primaryJar = "copilot-native/target/copilot-sdk-java-runtime-$version.jar"
+          if (-not (Test-Path -LiteralPath $jar -PathType Leaf)) {
+            throw "Expected Windows classifier was not produced: $jar"
+          }
+          node copilot-native/scripts/validate-native-artifact.mjs classifier win32-x64 $jar ([IO.Path]::GetFileName($jar)) ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder $primaryJar
+          $manifest = "copilot-native/target/win32-x64-$version.sha256"
+          $hash = (Get-FileHash -Algorithm SHA256 -LiteralPath $jar).Hash.ToLowerInvariant()
+          "$hash  $([IO.Path]::GetFileName($jar))" | Set-Content -NoNewline -Encoding ascii $manifest
+          node copilot-native/scripts/validate-native-artifact.mjs checksum $jar $manifest ([IO.Path]::GetFileName($jar))
+          "version=$version" | Add-Content $env:GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-native-win32-x64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ steps.build.outputs.version }}-win32-x64.jar
+            java/copilot-native/target/win32-x64-${{ steps.build.outputs.version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
+  build-darwin-classifier:
+    name: Build Darwin snapshot classifier
+    needs: resolve-source
+    runs-on: macos-26
+    permissions:
+      contents: read
+    outputs:
+      version: ${{ steps.build.outputs.version }}
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ github.sha }}
+          fetch-depth: 1
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - name: Build and validate darwin-arm64 classifier
+        id: build
+        run: |
+          set -euo pipefail
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.resolve-source.outputs.source_sha }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the resolved snapshot source."
+            exit 1
+          fi
+          node copilot-native/scripts/validate-native-host.mjs darwin-arm64
+          mvn -B -pl copilot-native package -DskipTests
+          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION-darwin-arm64.jar"
+          PRIMARY_JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION.jar"
+          test -f "$JAR"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier darwin-arm64 "$JAR" "$(basename "$JAR")" ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder "$PRIMARY_JAR"
+          MANIFEST="copilot-native/target/darwin-arm64-$VERSION.sha256"
+          HASH=$(shasum -a 256 "$JAR" | cut -d ' ' -f 1)
+          printf '%s  %s' "$HASH" "$(basename "$JAR")" > "$MANIFEST"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-native-darwin-arm64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ steps.build.outputs.version }}-darwin-arm64.jar
+            java/copilot-native/target/darwin-arm64-${{ steps.build.outputs.version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
+  deploy-snapshot:
     name: Publish SNAPSHOT to Maven Central
+    needs:
+      [
+        resolve-source,
+        build-linux-arm64-classifier,
+        build-windows-classifier,
+        build-darwin-classifier,
+      ]
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -26,12 +238,13 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
-          fetch-depth: 0
+          ref: ${{ github.sha }}
+          fetch-depth: 1
+          persist-credentials: false
 
       - uses: ./.github/actions/setup-copilot
 
-      - name: Set up JDK 25
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           java-version: "25"
           distribution: "microsoft"
@@ -40,22 +253,150 @@ jobs:
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
 
-      - name: Verify version is a SNAPSHOT
-        working-directory: ./java
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-linux-arm64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/java-native-linux-arm64
+
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-win32-x64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/java-native-win32-x64
+
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-darwin-arm64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/java-native-darwin-arm64
+
+      - name: Verify version, source, and Linux ARM64 classifier
+        id: linux-arm64-artifact
         run: |
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.resolve-source.outputs.source_sha }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the resolved snapshot source."
+            exit 1
+          fi
           VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-          echo "Publishing version: $VERSION"
           if [[ "$VERSION" != *"-SNAPSHOT" ]]; then
-            echo "ERROR: This workflow only publishes SNAPSHOT versions. Current version: $VERSION"
+            echo "::error::This workflow only publishes SNAPSHOT versions. Current version: $VERSION"
             exit 1
           fi
-          echo "### Snapshot Publish" >> $GITHUB_STEP_SUMMARY
-          echo "- **Version:** $VERSION" >> $GITHUB_STEP_SUMMARY
-          echo "- **Repository:** Maven Central Snapshots" >> $GITHUB_STEP_SUMMARY
+          if [ "$VERSION" != "${{ needs.build-linux-arm64-classifier.outputs.version }}" ]; then
+            echo "::error::Linux ARM64 classifier version does not match deploy version."
+            exit 1
+          fi
+          ARTIFACT_DIRECTORY="${{ runner.temp }}/java-native-linux-arm64"
+          JAR="$ARTIFACT_DIRECTORY/copilot-sdk-java-runtime-$VERSION-linux-arm64.jar"
+          MANIFEST="$ARTIFACT_DIRECTORY/linux-arm64-$VERSION.sha256"
+          test -f "$JAR"
+          test -f "$MANIFEST"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            classifier linux-arm64 "$JAR" "$(basename "$JAR")" "$GITHUB_WORKSPACE"
+          echo "linux_arm64_jar=$JAR" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "linux_arm64_sha=$(cut -d ' ' -f 1 "$MANIFEST")" >> "$GITHUB_OUTPUT"
 
-      - name: Deploy Snapshot
-        working-directory: ./java
-        run: mvn -B deploy -DskipTests
+      - name: Verify version, source, and Windows classifier
+        id: windows-artifact
+        run: |
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.resolve-source.outputs.source_sha }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the resolved snapshot source."
+            exit 1
+          fi
+          VERSION="${{ steps.linux-arm64-artifact.outputs.version }}"
+          if [ "$VERSION" != "${{ needs.build-windows-classifier.outputs.version }}" ]; then
+            echo "::error::Windows classifier version does not match deploy version."
+            exit 1
+          fi
+          ARTIFACT_DIRECTORY="${{ runner.temp }}/java-native-win32-x64"
+          JAR="$ARTIFACT_DIRECTORY/copilot-sdk-java-runtime-$VERSION-win32-x64.jar"
+          MANIFEST="$ARTIFACT_DIRECTORY/win32-x64-$VERSION.sha256"
+          test -f "$JAR"
+          test -f "$MANIFEST"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            classifier win32-x64 "$JAR" "$(basename "$JAR")" "$GITHUB_WORKSPACE"
+          echo "windows_jar=$JAR" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "windows_sha=$(cut -d ' ' -f 1 "$MANIFEST")" >> "$GITHUB_OUTPUT"
+
+      - name: Verify version, source, and Darwin classifier
+        id: darwin-artifact
+        run: |
+          SOURCE_COMMIT=$(git rev-parse HEAD)
+          if [ "$SOURCE_COMMIT" != "${{ needs.resolve-source.outputs.source_sha }}" ]; then
+            echo "::error::Checked out $SOURCE_COMMIT instead of the resolved snapshot source."
+            exit 1
+          fi
+          VERSION="${{ steps.windows-artifact.outputs.version }}"
+          if [ "$VERSION" != "${{ needs.build-darwin-classifier.outputs.version }}" ]; then
+            echo "::error::Darwin classifier version does not match deploy version."
+            exit 1
+          fi
+          ARTIFACT_DIRECTORY="${{ runner.temp }}/java-native-darwin-arm64"
+          JAR="$ARTIFACT_DIRECTORY/copilot-sdk-java-runtime-$VERSION-darwin-arm64.jar"
+          MANIFEST="$ARTIFACT_DIRECTORY/darwin-arm64-$VERSION.sha256"
+          test -f "$JAR"
+          test -f "$MANIFEST"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          node "$GITHUB_WORKSPACE/java/copilot-native/scripts/validate-native-artifact.mjs" \
+            classifier darwin-arm64 "$JAR" "$(basename "$JAR")" "$GITHUB_WORKSPACE"
+          echo "darwin_jar=$JAR" >> "$GITHUB_OUTPUT"
+          echo "darwin_sha=$(cut -d ' ' -f 1 "$MANIFEST")" >> "$GITHUB_OUTPUT"
+
+      - name: Build Linux classifier and deploy complete snapshot
+        run: |
+          VERSION="${{ steps.windows-artifact.outputs.version }}"
+          mvn -B deploy -DskipTests -Dcopilot.native.libc=glibc \
+            "-Dcopilot.native.external.linux.arm64.classifier.path=${{ steps.linux-arm64-artifact.outputs.linux_arm64_jar }}" \
+            "-Dcopilot.native.external.win32.classifier.path=${{ steps.windows-artifact.outputs.windows_jar }}" \
+            "-Dcopilot.native.external.darwin.classifier.path=${{ steps.darwin-artifact.outputs.darwin_jar }}"
+          LINUX_JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION-linux-x64.jar"
+          test -f "$LINUX_JAR"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier linux-x64 "$LINUX_JAR" "$(basename "$LINUX_JAR")" ..
+          LINUX_SHA=$(sha256sum "$LINUX_JAR" | cut -d ' ' -f 1)
+          GROUP_ID=$(mvn -q -pl copilot-native help:evaluate -Dexpression=project.groupId -DforceStdout)
+          ARTIFACT_ID=$(mvn -q -pl copilot-native help:evaluate -Dexpression=project.artifactId -DforceStdout)
+          POM_VERSION=$(mvn -q -pl copilot-native help:evaluate -Dexpression=project.version -DforceStdout)
+          if [ -z "$GROUP_ID" ] || [ -z "$ARTIFACT_ID" ] || [ "$POM_VERSION" != "$VERSION" ]; then
+            echo "::error::Unexpected copilot-native Maven coordinates: $GROUP_ID:$ARTIFACT_ID:$POM_VERSION (expected version $VERSION)"
+            exit 1
+          fi
+          {
+            echo "### Snapshot Publish"
+            echo "- **Version:** $VERSION"
+            echo "- **Source commit:** \`${{ needs.resolve-source.outputs.source_sha }}\`"
+            echo "- **Repository:** Maven Central Snapshots"
+            echo ""
+            echo "#### Maven Coordinates"
+            echo ""
+            echo '```xml'
+            echo "<dependency>"
+            echo "    <groupId>$GROUP_ID</groupId>"
+            echo "    <artifactId>$ARTIFACT_ID</artifactId>"
+            echo "    <version>$POM_VERSION</version>"
+            echo "</dependency>"
+            echo '```'
+            echo ""
+            echo "#### Published Native Classifiers"
+            echo ""
+            echo "| Classifier | Build runner | Artifact | SHA-256 | Status |"
+            echo "| --- | --- | --- | --- | --- |"
+            echo "| \`linux-x64\` | \`ubuntu-latest\` | \`$(basename "$LINUX_JAR")\` | \`$LINUX_SHA\` | Published |"
+            echo "| \`linux-arm64\` | \`ubuntu-24.04-arm\` | \`$(basename "${{ steps.linux-arm64-artifact.outputs.linux_arm64_jar }}")\` | \`${{ steps.linux-arm64-artifact.outputs.linux_arm64_sha }}\` | Published |"
+            echo "| \`win32-x64\` | \`windows-latest\` | \`$(basename "${{ steps.windows-artifact.outputs.windows_jar }}")\` | \`${{ steps.windows-artifact.outputs.windows_sha }}\` | Published |"
+            echo "| \`darwin-arm64\` | \`macos-26\` | \`$(basename "${{ steps.darwin-artifact.outputs.darwin_jar }}")\` | \`${{ steps.darwin-artifact.outputs.darwin_sha }}\` | Published |"
+          } >> "$GITHUB_STEP_SUMMARY"
         env:
           MAVEN_USERNAME: ${{ secrets.JAVA_MAVEN_CENTRAL_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.JAVA_MAVEN_CENTRAL_PASSWORD }}
diff --git a/.github/workflows/java-sdk-tests.yml b/.github/workflows/java-sdk-tests.yml
index 20083749ec..48fb2174a3 100644
--- a/.github/workflows/java-sdk-tests.yml
+++ b/.github/workflows/java-sdk-tests.yml
@@ -17,6 +17,332 @@ permissions:
   contents: read
 
 jobs:
+  java-sdk-inprocess:
+    name: "Java SDK InProcess Tests (${{ matrix.classifier }})"
+    if: github.event.repository.fork == false
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            classifier: linux-x64
+          - os: ubuntu-24.04-arm
+            classifier: linux-arm64
+            maven-args: -Dcopilot.native.libc=glibc
+          - os: windows-latest
+            classifier: win32-x64
+          - os: macos-26
+            classifier: darwin-arm64
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - name: Validate native host
+        run: node copilot-native/scripts/validate-native-host.mjs ${{ matrix.classifier }}
+
+      - name: Run Java SDK tests (InProcess)
+        env:
+          CI: "true"
+        run: mvn clean verify -Pinprocess ${{ matrix.maven-args }}
+
+      - name: Generate Test Report Summary
+        if: always()
+        uses: ./.github/actions/java-test-report
+        with:
+          title: "Copilot Java SDK :: Test Results InProcess"
+
+      - name: Upload test results on failure
+        if: failure()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-test-results-inprocess-${{ matrix.classifier }}
+          path: |
+            java/sdk/target/surefire-reports/
+            java/sdk/target/surefire-reports-isolated/
+            java/sdk/target/failsafe-reports/
+          retention-days: 7
+
+  java-native-publication-linux-arm64:
+    name: "Java Native Publication Input (linux-arm64)"
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-24.04-arm
+    permissions:
+      contents: read
+    outputs:
+      source_sha: ${{ steps.build.outputs.source_sha }}
+      version: ${{ steps.build.outputs.version }}
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - name: Build and validate linux-arm64 classifier
+        id: build
+        run: |
+          set -euo pipefail
+          node copilot-native/scripts/validate-native-host.mjs linux-arm64
+          mvn -B -pl copilot-native package -DskipTests -Dcopilot.native.libc=glibc
+          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION-linux-arm64.jar"
+          PRIMARY_JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION.jar"
+          test -f "$JAR"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier linux-arm64 "$JAR" "$(basename "$JAR")" ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder "$PRIMARY_JAR"
+          MANIFEST="copilot-native/target/linux-arm64-$VERSION.sha256"
+          HASH=$(sha256sum "$JAR" | cut -d ' ' -f 1)
+          printf '%s  %s' "$HASH" "$(basename "$JAR")" > "$MANIFEST"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          echo "source_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-native-publication-linux-arm64-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ steps.build.outputs.version }}-linux-arm64.jar
+            java/copilot-native/target/linux-arm64-${{ steps.build.outputs.version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
+  java-native-publication-windows:
+    name: "Java Native Publication Input (win32-x64)"
+    if: github.event.repository.fork == false
+    runs-on: windows-latest
+    permissions:
+      contents: read
+    outputs:
+      source_sha: ${{ steps.build.outputs.source_sha }}
+      version: ${{ steps.build.outputs.version }}
+    defaults:
+      run:
+        shell: pwsh
+        working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - name: Build and validate win32-x64 classifier
+        id: build
+        run: |
+          node copilot-native/scripts/validate-native-host.mjs win32-x64
+          mvn -B -pl copilot-native package -DskipTests
+          $version = mvn help:evaluate "-Dexpression=project.version" -q "-DforceStdout"
+          $jar = "copilot-native/target/copilot-sdk-java-runtime-$version-win32-x64.jar"
+          $primaryJar = "copilot-native/target/copilot-sdk-java-runtime-$version.jar"
+          if (-not (Test-Path -LiteralPath $jar -PathType Leaf)) {
+            throw "Expected Windows classifier was not produced: $jar"
+          }
+          node copilot-native/scripts/validate-native-artifact.mjs classifier win32-x64 $jar ([IO.Path]::GetFileName($jar)) ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder $primaryJar
+          $manifest = "copilot-native/target/win32-x64-$version.sha256"
+          $hash = (Get-FileHash -Algorithm SHA256 -LiteralPath $jar).Hash.ToLowerInvariant()
+          "$hash  $([IO.Path]::GetFileName($jar))" | Set-Content -NoNewline -Encoding ascii $manifest
+          node copilot-native/scripts/validate-native-artifact.mjs checksum $jar $manifest ([IO.Path]::GetFileName($jar))
+          echo "source_sha=$(git rev-parse HEAD)" >> $env:GITHUB_OUTPUT
+          echo "version=$version" >> $env:GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-native-publication-win32-x64-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ steps.build.outputs.version }}-win32-x64.jar
+            java/copilot-native/target/win32-x64-${{ steps.build.outputs.version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
+  java-native-publication-darwin:
+    name: "Java Native Publication Input (darwin-arm64)"
+    if: github.event.repository.fork == false
+    runs-on: macos-26
+    permissions:
+      contents: read
+    outputs:
+      source_sha: ${{ steps.build.outputs.source_sha }}
+      version: ${{ steps.build.outputs.version }}
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - name: Build and validate darwin-arm64 classifier
+        id: build
+        run: |
+          set -euo pipefail
+          node copilot-native/scripts/validate-native-host.mjs darwin-arm64
+          mvn -B -pl copilot-native package -DskipTests
+          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION-darwin-arm64.jar"
+          PRIMARY_JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION.jar"
+          test -f "$JAR"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier darwin-arm64 "$JAR" "$(basename "$JAR")" ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder "$PRIMARY_JAR"
+          MANIFEST="copilot-native/target/darwin-arm64-$VERSION.sha256"
+          HASH=$(shasum -a 256 "$JAR" | cut -d ' ' -f 1)
+          printf '%s  %s' "$HASH" "$(basename "$JAR")" > "$MANIFEST"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            checksum "$JAR" "$MANIFEST" "$(basename "$JAR")"
+          echo "source_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: java-native-publication-darwin-arm64-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ steps.build.outputs.version }}-darwin-arm64.jar
+            java/copilot-native/target/darwin-arm64-${{ steps.build.outputs.version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
+  java-native-publication-assembly:
+    name: "Java Native Publication Assembly"
+    if: github.event.repository.fork == false
+    needs:
+      [
+        java-native-publication-linux-arm64,
+        java-native-publication-windows,
+        java-native-publication-darwin,
+      ]
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./java
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ github.sha }}
+          persist-credentials: false
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-publication-linux-arm64-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ github.workspace }}/java/native-publication-input/linux-arm64
+
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-publication-win32-x64-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ github.workspace }}/java/native-publication-input/windows
+
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-publication-darwin-arm64-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ github.workspace }}/java/native-publication-input/darwin
+
+      - name: Verify native inputs and deploy the complete local release
+        run: |
+          set -euo pipefail
+          test "$(git rev-parse HEAD)" = "${{ needs.java-native-publication-linux-arm64.outputs.source_sha }}"
+          test "$(git rev-parse HEAD)" = "${{ needs.java-native-publication-windows.outputs.source_sha }}"
+          test "$(git rev-parse HEAD)" = "${{ needs.java-native-publication-darwin.outputs.source_sha }}"
+          VERSION="${{ needs.java-native-publication-windows.outputs.version }}"
+          test "$VERSION" = "${{ needs.java-native-publication-linux-arm64.outputs.version }}"
+          test "$VERSION" = "${{ needs.java-native-publication-darwin.outputs.version }}"
+          LINUX_ARM64_DIRECTORY="$GITHUB_WORKSPACE/java/native-publication-input/linux-arm64"
+          WINDOWS_DIRECTORY="$GITHUB_WORKSPACE/java/native-publication-input/windows"
+          DARWIN_DIRECTORY="$GITHUB_WORKSPACE/java/native-publication-input/darwin"
+          LINUX_ARM64_JAR="$LINUX_ARM64_DIRECTORY/copilot-sdk-java-runtime-$VERSION-linux-arm64.jar"
+          LINUX_ARM64_MANIFEST="$LINUX_ARM64_DIRECTORY/linux-arm64-$VERSION.sha256"
+          WINDOWS_JAR="$WINDOWS_DIRECTORY/copilot-sdk-java-runtime-$VERSION-win32-x64.jar"
+          WINDOWS_MANIFEST="$WINDOWS_DIRECTORY/win32-x64-$VERSION.sha256"
+          DARWIN_JAR="$DARWIN_DIRECTORY/copilot-sdk-java-runtime-$VERSION-darwin-arm64.jar"
+          DARWIN_MANIFEST="$DARWIN_DIRECTORY/darwin-arm64-$VERSION.sha256"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            checksum "$LINUX_ARM64_JAR" "$LINUX_ARM64_MANIFEST" "$(basename "$LINUX_ARM64_JAR")"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier linux-arm64 "$LINUX_ARM64_JAR" "$(basename "$LINUX_ARM64_JAR")" ..
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            checksum "$WINDOWS_JAR" "$WINDOWS_MANIFEST" "$(basename "$WINDOWS_JAR")"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier win32-x64 "$WINDOWS_JAR" "$(basename "$WINDOWS_JAR")" ..
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            checksum "$DARWIN_JAR" "$DARWIN_MANIFEST" "$(basename "$DARWIN_JAR")"
+          node copilot-native/scripts/validate-native-artifact.mjs \
+            classifier darwin-arm64 "$DARWIN_JAR" "$(basename "$DARWIN_JAR")" ..
+          export GNUPGHOME="$GITHUB_WORKSPACE/java/copilot-native/target/local-publication-gpg"
+          rm -rf "$GNUPGHOME"
+          mkdir -p "$GNUPGHOME"
+          chmod 700 "$GNUPGHOME"
+          gpg --batch --pinentry-mode loopback --passphrase '' \
+            --quick-generate-key 'Copilot SDK local validation <local-validation@example.invalid>' rsa2048 sign 1d
+          LOCAL_REPOSITORY="$GITHUB_WORKSPACE/java/copilot-native/target/local-publication-repository"
+          rm -rf "$LOCAL_REPOSITORY"
+          mvn -B -pl copilot-native deploy -Prelease -DskipTests \
+            -Dcopilot.native.libc=glibc \
+            -Dcopilot.native.test.local.publication=true \
+            "-Dcopilot.native.external.linux.arm64.classifier.path=$LINUX_ARM64_JAR" \
+            "-Dcopilot.native.external.win32.classifier.path=$WINDOWS_JAR" \
+            "-Dcopilot.native.external.darwin.classifier.path=$DARWIN_JAR" \
+            "-Dmaven.repo.local=$LOCAL_REPOSITORY"
+          node copilot-native/scripts/validate-local-publication.mjs \
+            "$LOCAL_REPOSITORY" copilot-sdk-java-runtime "$VERSION" .. --signatures
+
   java-sdk:
     name: "Java SDK Tests (JDK ${{ matrix.test-jdk }})"
     if: github.event.repository.fork == false
@@ -80,7 +406,9 @@ jobs:
         if: matrix.test-jdk == '25'
         env:
           CI: "true"
-        run: mvn verify -Dskip.test.harness=true
+        run: |
+          node copilot-native/scripts/validate-native-host.mjs linux-x64
+          mvn verify -Dskip.test.harness=true -Dcopilot.native.libc=glibc -Dcopilot.native.skip.download=false
 
       - name: Switch to JDK 17
         if: matrix.test-jdk == '17'
@@ -96,7 +424,7 @@ jobs:
         run: |
           echo "Running tests against JDK 25-built classes using JDK 17 runtime..."
           java -version
-          mvn jacoco:prepare-agent@wire-up-coverage-instrumentation antrun:run@print-test-jdk-banner surefire:test failsafe:integration-test failsafe:verify jacoco:report@build-coverage-report-from-tests -Denforcer.skip=true
+          mvn -pl sdk jacoco:prepare-agent@wire-up-coverage-instrumentation antrun:run@print-test-jdk-banner surefire:test failsafe:integration-test failsafe:verify jacoco:report@build-coverage-report-from-tests -Denforcer.skip=true
 
       - name: Upload test results for site generation
         if: success() && github.ref == 'refs/heads/main' && matrix.test-jdk == '25'
@@ -104,9 +432,9 @@ jobs:
         with:
           name: test-results-for-site
           path: |
-            java/target/jacoco-test-results/sdk-tests.exec
-            java/target/surefire-reports/
-            java/target/surefire-reports-isolated/
+            java/sdk/target/jacoco-test-results/sdk-tests.exec
+            java/sdk/target/surefire-reports/
+            java/sdk/target/surefire-reports-isolated/
           retention-days: 1
 
       - name: Generate Test Report Summary
@@ -121,7 +449,7 @@ jobs:
         with:
           name: java-test-results-jdk-${{ matrix.test-jdk }}
           path: |
-            java/target/surefire-reports/
-            java/target/surefire-reports-isolated/
-            java/target/failsafe-reports/
+            java/sdk/target/surefire-reports/
+            java/sdk/target/surefire-reports-isolated/
+            java/sdk/target/failsafe-reports/
           retention-days: 7
diff --git a/.github/workflows/java-smoke-test.yml b/.github/workflows/java-smoke-test.yml
index cffef0a353..e7e9a417d2 100644
--- a/.github/workflows/java-smoke-test.yml
+++ b/.github/workflows/java-smoke-test.yml
@@ -63,7 +63,7 @@ jobs:
           The SDK has already been built and installed into the local Maven repository.
           JDK 17 and Maven are already installed and on PATH.
 
-          Execute the prompt at `src/test/prompts/PROMPT-smoke-test.md` with the following critical overrides:
+          Execute the prompt at `sdk/src/test/prompts/PROMPT-smoke-test.md` with the following critical overrides:
 
           **Critical override — disable SNAPSHOT updates (but allow downloads):** The goal of this workflow is to validate the SDK SNAPSHOT that was just built and installed locally, not any newer SNAPSHOT that might exist in a remote repository. To ensure Maven does not download a newer timestamped SNAPSHOT of the SDK while still allowing it to download any missing plugins or dependencies, you must run the smoke-test Maven build without `-U` and with `--no-snapshot-updates`, so that it uses the locally installed SDK artifact. Use `mvn --no-snapshot-updates clean package` instead of `mvn -U clean package` or `mvn -o clean package`.
 
@@ -136,7 +136,7 @@ jobs:
           The SDK has already been built and installed into the local Maven repository.
           JDK 25 and Maven are already installed and on PATH.
 
-          Execute the prompt at `src/test/prompts/PROMPT-smoke-test.md` with the following critical overrides:
+          Execute the prompt at `sdk/src/test/prompts/PROMPT-smoke-test.md` with the following critical overrides:
 
           **Critical override — disable SNAPSHOT updates (but allow downloads):** The goal of this workflow is to validate the SDK SNAPSHOT that was just built and installed locally, not any newer SNAPSHOT that might exist in a remote repository. To ensure Maven does not download a newer timestamped SNAPSHOT of the SDK while still allowing it to download any missing plugins or dependencies, you must run the smoke-test Maven build without `-U` and with `--no-snapshot-updates`, so that it uses the locally installed SDK artifact. Use `mvn --no-snapshot-updates clean package` instead of `mvn -U clean package` or `mvn -o clean package`.
 
diff --git a/.github/workflows/java.notes.template b/.github/workflows/java.notes.template
deleted file mode 100644
index e209a110b6..0000000000
--- a/.github/workflows/java.notes.template
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- INSTALLATION_SECTION: preserve this section verbatim when updating release notes -->
-<!-- maven_central_url: https://central.sonatype.com/artifact/${GROUP_ID}/${ARTIFACT_ID}/${VERSION} -->
-# Installation
-
-⚠️ **Artifact versioning plan:** Releases of this implementation track releases of the reference implementation. For each release of the reference implementation, there may follow a corresponding release of this implementation with the same number as the reference implementation. Release identifiers of the reference implementation are in the form `vMaj.Min.Micro`. For example v0.1.32. The corresponding maven version for the release will be `Maj.Min.Micro-java.N`, where `Maj`, `Min` and `Micro` are the corresponding numbers for the reference implementation release, and `N` is a monotonically increasing sequence number starting with 0 for each release. See the corresponding architectural decision record for more information in the `docs/adr` directory of the source code.
-
-📦 [View on Maven Central](https://central.sonatype.com/artifact/${GROUP_ID}/${ARTIFACT_ID}/${VERSION})
-
-📖 [Documentation](https://github.github.io/copilot-sdk-java/${VERSION}/) · [Javadoc](https://github.github.io/copilot-sdk-java/${VERSION}/apidocs/index.html)
-<!-- END_INSTALLATION_SECTION -->
-
-## Maven
-```xml
-<dependency>
-    <groupId>${GROUP_ID}</groupId>
-    <artifactId>${ARTIFACT_ID}</artifactId>
-    <version>${VERSION}</version>
-</dependency>
-```
-
-## Gradle (Kotlin DSL)
-```kotlin
-implementation("${GROUP_ID}:${ARTIFACT_ID}:${VERSION}")
-```
-
-## Gradle (Groovy DSL)
-```groovy
-implementation '${GROUP_ID}:${ARTIFACT_ID}:${VERSION}'
-```
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b44fd582a2..98bf236900 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -379,7 +379,8 @@ jobs:
       needs.publish-nodejs.result == 'success' &&
       needs.publish-dotnet.result == 'success' &&
       needs.publish-python.result == 'success' &&
-      needs.publish-rust.result == 'success'
+      needs.publish-rust.result == 'success' &&
+      needs.publish-java.outputs.mavenPublished == 'true'
     runs-on: ubuntu-latest
     permissions:
       actions: write
@@ -434,11 +435,9 @@ jobs:
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Tag Rust SDK and create Rust GitHub Release
-        # Rust gets its own version-scoped GitHub Release with notes
-        # derived from PR titles since the previous Rust tag. The
-        # cross-language `vX.Y.Z` release above still exists; this one
-        # is the canonical reference for Rust users.
+      - name: Tag Rust SDK
+        # Keep a language-scoped source tag for traceability. Rust is
+        # included in the cross-language `vX.Y.Z` GitHub Release.
         if: github.event.inputs.dist-tag == 'latest' || github.event.inputs.dist-tag == 'prerelease'
         run: |
           set -e
@@ -453,26 +452,5 @@ jobs:
           else
             echo "Tag $TAG_NAME already exists, skipping tag push"
           fi
-          # Find the previous Rust tag for note generation. Prefer rust/v*,
-          # fall back to the historical rust-v* tags from the release-plz era.
-          PREV_TAG=$(git tag --list 'rust/v*' --sort=-v:refname | grep -vFx "$TAG_NAME" | head -n1)
-          if [ -z "$PREV_TAG" ]; then
-            PREV_TAG=$(git tag --list 'rust-v*' --sort=-v:refname | head -n1)
-          fi
-          NOTES_FLAG=""
-          if [ -n "$PREV_TAG" ]; then
-            NOTES_FLAG="--notes-start-tag $PREV_TAG"
-            echo "Generating notes from $PREV_TAG..$TAG_NAME"
-          else
-            echo "No previous Rust tag found; generating notes from full history"
-          fi
-          PRERELEASE_FLAG=""
-          if [ "${{ github.event.inputs.dist-tag }}" = "prerelease" ]; then
-            PRERELEASE_FLAG="--prerelease"
-          fi
-          gh release create "$TAG_NAME" \
-            --title "$TAG_NAME" \
-            --generate-notes $NOTES_FLAG $PRERELEASE_FLAG \
-            --target ${{ github.sha }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-changelog.lock.yml b/.github/workflows/release-changelog.lock.yml
index 781f41b22b..23b19d9b82 100644
--- a/.github/workflows/release-changelog.lock.yml
+++ b/.github/workflows/release-changelog.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"9342b428009e6a3b47258c08b78735a89fc72714b73a44b72c4714e310d60006","body_hash":"89e26ed929f440bd6af57d1da92b06dbf1739b4a1d34b9923286919d00f272d1","compiler_version":"v0.83.1","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.73"}}
+# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"a4a0859e0103be270433c7fe1926a346c46271b4b530b2c08fa5d606d0ab75c4","body_hash":"490b25b529910b1b087df624fd59eaef52e142e84b9503ca1cf87631f4c36b53","compiler_version":"v0.83.1","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.73"}}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_CI_TRIGGER_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/cache/restore","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/cache/save","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/checkout","sha":"9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0","version":"v7"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"373c709c69115d41ff229c7e5df9f8788daa9553","version":"v9"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"820762786026740c76f36085b0efc47a31fe5020","version":"v7.0.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"8bdba8075360648fe6802302a5b4e016361dc6ac","version":"v0.83.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.27.38","digest":"sha256:cb928eb62d9139a013c2d278dab19af232d35a2d83dca71a3d98eb431f786243","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.27.38@sha256:cb928eb62d9139a013c2d278dab19af232d35a2d83dca71a3d98eb431f786243"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.38","digest":"sha256:cd6145620d96acee46e1ede25180a13aa36002467e663db0caa453a8bc8eb60c","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.38@sha256:cd6145620d96acee46e1ede25180a13aa36002467e663db0caa453a8bc8eb60c"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.27.38","digest":"sha256:6c19094d95aad5f9f128ad5e583f0f2b894b158aa66c3b86dd9bcc90970a2917","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.27.38@sha256:6c19094d95aad5f9f128ad5e583f0f2b894b158aa66c3b86dd9bcc90970a2917"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.4.3","digest":"sha256:3c744710ea275cd5ee65db92a1099e0d980754bd9fafda9ce67704c67004dc83","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.4.3@sha256:3c744710ea275cd5ee65db92a1099e0d980754bd9fafda9ce67704c67004dc83"},{"image":"ghcr.io/github/gh-aw-node","digest":"sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b","pinned_image":"ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b"},{"image":"ghcr.io/github/github-mcp-server:v1.6.0","digest":"sha256:2b0c48b070f61e9d3969269ead600f62d00fb237b60ac849ef3d166ee7de9ad3","pinned_image":"ghcr.io/github/github-mcp-server:v1.6.0@sha256:2b0c48b070f61e9d3969269ead600f62d00fb237b60ac849ef3d166ee7de9ad3"}]}
 # This file was automatically generated by gh-aw (v0.83.1). DO NOT EDIT. To debug this workflow, load the skill at https://github.com/github/gh-aw/blob/main/debug.md
 #
@@ -62,7 +62,7 @@ on:
         required: false
         type: string
       tag:
-        description: Release tag to generate changelog for (e.g., v0.1.30, <language>/v1.0.0)
+        description: Release tag to generate changelog for (e.g., v1.0.0)
         required: true
         type: string
 
diff --git a/.github/workflows/release-changelog.md b/.github/workflows/release-changelog.md
index 7a682c56dd..c846b0dd32 100644
--- a/.github/workflows/release-changelog.md
+++ b/.github/workflows/release-changelog.md
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: "Release tag to generate changelog for (e.g., v0.1.30, <language>/v1.0.0)"
+        description: "Release tag to generate changelog for (e.g., v1.0.0)"
         required: true
         type: string
 permissions:
@@ -55,9 +55,8 @@ Use the GitHub API to fetch the release corresponding to `${{ github.event.input
 2. The **new version** is the release tag: `${{ github.event.inputs.tag }}`
 3. Fetch the release metadata to determine if this is a **stable** or **prerelease** release.
 4. Determine the **previous version** to diff against:
-   - **Scoped tags**: If the tag has a language prefix (e.g., `java/v1.0.0` or `rust/v0.2.0`), the previous tag must use the **same prefix**. List tags matching that prefix (e.g., `java/v*` or `rust/v*`) sorted by version and pick the one immediately before the current tag. Only compare within the same scope.
-   - **For stable releases**: find the previous **stable** release (skip prereleases). Check `CHANGELOG.md` for the most recent version heading matching this scope (`## [vX.Y.Z](...)` for unscoped, `## [java/vX.Y.Z](...)` for Java, `## [rust/vX.Y.Z](...)` for Rust), or fall back to listing releases via the API. This means stable changelogs include ALL changes since the last stable release, even if some were already mentioned in prerelease notes.
-   - **For prerelease releases**: find the most recent release of **any kind** (stable or prerelease) that precedes this one within the same tag scope. This way prerelease notes only cover what's new since the last release.
+   - **For stable releases**: find the previous **stable** release (skip prereleases). Check `CHANGELOG.md` for the most recent `## [vX.Y.Z](...)` heading, or fall back to listing releases via the API. This means stable changelogs include ALL changes since the last stable release, even if some were already mentioned in prerelease notes.
+   - **For prerelease releases**: find the most recent release of **any kind** (stable or prerelease) that precedes this one. This way prerelease notes only cover what's new since the last release.
 5. If no previous release exists at all, use the first commit in the repo as the starting point.
 6. After identifying the range, verify it by listing the commits in `PREVIOUS_TAG..NEW_TAG`. If the local result still looks suspiciously small or inconsistent, do **not** proceed based on local git alone — use the GitHub tools as the source of truth for the commits and PRs in the release.
 
@@ -68,8 +67,7 @@ Use the GitHub API to fetch the release corresponding to `${{ github.event.input
    - PR number and title
    - The PR author
    - Which SDK(s) were affected (look for prefixes like `[C#]`, `[Python]`, `[Go]`, `[Node]`, `[Java]`, `[Rust]` in the title, or infer from changed files)
-3. **For scoped tags** (e.g., `java/v*`, `rust/v*`): only include changes that touch the corresponding language directory (`java/`, `rust/`). Ignore changes to other languages unless they directly affect the scoped SDK.
-4. Ignore:
+3. Ignore:
    - Dependabot/bot PRs that only bump internal dependencies (like `Update @github/copilot to ...`) unless they bring user-facing changes
    - Merge commits with no meaningful content
    - Preview/prerelease-only changes that were already documented
@@ -81,6 +79,10 @@ Separate the changes into two groups:
 1. **Highlighted features**: Any interesting new feature or significant improvement that deserves its own section with a description and code snippet(s). Read the PR diff and source code to understand the feature well enough to write about it.
 2. **Other changes**: Bug fixes, minor improvements, and smaller features that can be summarized in a single bullet each.
 
+**Format for each highlighted feature** — use an `### Feature:` or `### Fix:` heading, a 1-2 sentence description explaining what it does and why it matters, and at least one short code snippet (max 3 lines). Cover all six SDKs—TypeScript, C#, Go, Python, Java, and Rust—in the combined release notes. Show code examples in the languages whose APIs best illustrate the change, and ensure every user-visible language-specific change appears either as a highlighted feature or under other changes.
+
+**Format for other changes** — use a single `### Other changes` section with a flat bulleted list. Each bullet has a lowercase prefix (`feature:`, `bugfix:`, `improvement:`) and a one-line description linking to the PR. **However, if there are no highlighted features above it, omit the `### Other changes` heading.**
+
 Only include changes that are **user-visible in the published SDK packages**. Skip anything that only affects docs, CI, build tooling, GitHub workflows, test infrastructure, or other internal-only concerns.
 
 Additionally, identify **new contributors** — anyone whose first merged PR to this repo falls within this release range. You can determine this by checking whether the author has any earlier merged PRs in the repository.
@@ -90,11 +92,7 @@ Additionally, identify **new contributors** — anyone whose first merged PR to
 **Skip this step entirely for prerelease releases.**
 
 1. Read the current `CHANGELOG.md` file.
-2. Add the new version entry **at the top** of the file, right after the title/header. Use the **full tag** as the version in the heading — e.g., `## [v0.2.3](...)` for unscoped tags, `## [java/v1.0.0](...)` for Java-scoped tags, `## [rust/v0.2.3](...)` for Rust-scoped tags.
-
-**Format for each highlighted feature** — use an `### Feature:` or `### Fix:` heading, a 1-2 sentence description explaining what it does and why it matters, and at least one short code snippet (max 3 lines). For unscoped releases, focus on **TypeScript** and **C#** as the primary languages; only show Go/Python when giving a list of one-liner equivalents across all languages, or when their usage pattern is meaningfully different. For **scoped releases** (e.g., `java/v*`), show code snippets in the scoped language only (e.g., Java for `java/v*`, Rust for `rust/v*`).
-
-**Format for other changes** — a single `### Other changes` section with a flat bulleted list. Each bullet has a lowercase prefix (`feature:`, `bugfix:`, `improvement:`) and a one-line description linking to the PR. **However, if there are no highlighted features above it, omit the `### Other changes` heading entirely** — just list the bullets directly under the version heading.
+2. Add the new version entry **at the top** of the file, right after the title/header. Use the full tag as the version in the heading, for example `## [v1.0.0](...)`.
 
 3. Use the release's publish date (from the GitHub Release metadata), not today's date. For `workflow_dispatch` runs, fetch the release by tag to get the date.
 4. If there are new contributors, add a `### New contributors` section at the end listing each with a link to their first PR:
@@ -118,11 +116,6 @@ Use the `create-pull-request` output to submit your changes. The PR should:
 
 Use the `update-release` output to replace the auto-generated release notes with your nicely formatted changelog. **Do not include the version heading** (`## [vX.Y.Z](...) (date)`) in the release notes — the release already has a title showing the version. Start directly with the feature sections or other changes list.
 
-**IMPORTANT — Preserving the Installation section:**
-The release body may contain an Installation section delimited by `<!-- INSTALLATION_SECTION -->` and `<!-- END_INSTALLATION_SECTION -->` HTML comments. In the case of Java, this section includes Maven/Gradle dependency snippets and a "View on Maven Central" link. You **MUST** preserve this entire section (from the opening comment through the closing comment, inclusive) exactly as it appears in the existing release body. Place your generated changelog content **after** the Installation section.
-
-**URL reconstruction:** If the Maven Central URL in the Installation section appears corrupted or contains the word "redacted", reconstruct it. Extract the version from the release tag (e.g., `java/v1.0.0` → `1.0.0`), and rebuild the URL as: `https://central.sonatype.com/artifact/com.github/copilot-sdk-java/{VERSION}`. The `<!-- maven_central_url -->` HTML comment in the section contains the intended URL pattern.
-
 ## Example Output
 
 Here is an example of what a changelog entry should look like, based on real commits from this repo. **Follow this style exactly.**
@@ -154,6 +147,8 @@ While `session.rpc.models.setModel()` already worked, there is now a convenience
 - C#: `session.SetModel("gpt-4o")`
 - Python: `session.set_model("gpt-4o")`
 - Go: `session.SetModel("gpt-4o")`
+- Java: `session.setModel("gpt-4o").get()`
+- Rust: `session.set_model("gpt-4o", None).await?`
 
 ### Other changes
 
@@ -171,7 +166,7 @@ While `session.rpc.models.setModel()` already worked, there is now a convenience
 **Key rules visible in the example:**
 
 - Highlighted features get their own `### Feature:` heading, a short description, and code snippets
-- Code snippets are TypeScript and C# primarily; Go/Python only when listing one-liner equivalents or when meaningfully different
+- Code snippets use whichever of TypeScript, C#, Go, Python, Java, and Rust best illustrate the change; list all affected languages when showing equivalents
 - The `### Other changes` section is a flat bulleted list with lowercase `bugfix:` / `feature:` / `improvement:` prefixes
 - PR numbers are linked inline, not at the end with author attribution (keep it clean)
 
diff --git a/.github/workflows/sdk-consistency-review.lock.yml b/.github/workflows/sdk-consistency-review.lock.yml
index 3c1756644d..bc33be9ad1 100644
--- a/.github/workflows/sdk-consistency-review.lock.yml
+++ b/.github/workflows/sdk-consistency-review.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"fb73d13f101fc375308576a64180f63934cc9e8306cb6ef6303f1b9788d9df28","body_hash":"478a74e14ae52b64cd38c57a44953fad4d8003a2414912a19de8f0f4a354a92f","compiler_version":"v0.83.1","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.73"}}
+# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"fb73d13f101fc375308576a64180f63934cc9e8306cb6ef6303f1b9788d9df28","body_hash":"cc60c817de34cdb662ae4c091203c67a5ef240ca0165b0cd26a842f03b22614f","compiler_version":"v0.83.1","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.73"}}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/cache/restore","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/cache/save","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/checkout","sha":"9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0","version":"v7"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"373c709c69115d41ff229c7e5df9f8788daa9553","version":"v9"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"820762786026740c76f36085b0efc47a31fe5020","version":"v7.0.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"8bdba8075360648fe6802302a5b4e016361dc6ac","version":"v0.83.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.27.38","digest":"sha256:cb928eb62d9139a013c2d278dab19af232d35a2d83dca71a3d98eb431f786243","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.27.38@sha256:cb928eb62d9139a013c2d278dab19af232d35a2d83dca71a3d98eb431f786243"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.38","digest":"sha256:cd6145620d96acee46e1ede25180a13aa36002467e663db0caa453a8bc8eb60c","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.38@sha256:cd6145620d96acee46e1ede25180a13aa36002467e663db0caa453a8bc8eb60c"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.27.38","digest":"sha256:6c19094d95aad5f9f128ad5e583f0f2b894b158aa66c3b86dd9bcc90970a2917","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.27.38@sha256:6c19094d95aad5f9f128ad5e583f0f2b894b158aa66c3b86dd9bcc90970a2917"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.4.3","digest":"sha256:3c744710ea275cd5ee65db92a1099e0d980754bd9fafda9ce67704c67004dc83","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.4.3@sha256:3c744710ea275cd5ee65db92a1099e0d980754bd9fafda9ce67704c67004dc83"},{"image":"ghcr.io/github/gh-aw-node","digest":"sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b","pinned_image":"ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b"},{"image":"ghcr.io/github/github-mcp-server:v1.6.0","digest":"sha256:2b0c48b070f61e9d3969269ead600f62d00fb237b60ac849ef3d166ee7de9ad3","pinned_image":"ghcr.io/github/github-mcp-server:v1.6.0@sha256:2b0c48b070f61e9d3969269ead600f62d00fb237b60ac849ef3d166ee7de9ad3"}],"has_pull_request":true}
 # This file was automatically generated by gh-aw (v0.83.1). DO NOT EDIT. To debug this workflow, load the skill at https://github.com/github/gh-aw/blob/main/debug.md
 #
diff --git a/.github/workflows/sdk-consistency-review.md b/.github/workflows/sdk-consistency-review.md
index 8a4ff106a0..550d9349d0 100644
--- a/.github/workflows/sdk-consistency-review.md
+++ b/.github/workflows/sdk-consistency-review.md
@@ -74,7 +74,7 @@ When a pull request modifies any SDK client code, review it to ensure:
 - **Python**: `python/copilot/`
 - **Go**: `go/`
 - **.NET**: `dotnet/src/`
-- **Java**: `java/src/main/java/`
+- **Java**: `java/sdk/src/main/java/`
 - **Rust**: `rust/src/`
 
 ## Review Process
diff --git a/.github/workflows/update-copilot-dependency.yml b/.github/workflows/update-copilot-dependency.yml
index b1a668a7cb..9646366ad5 100644
--- a/.github/workflows/update-copilot-dependency.yml
+++ b/.github/workflows/update-copilot-dependency.yml
@@ -192,11 +192,11 @@ jobs:
              - Enum value additions/renames in generated types
              - New event types requiring handler registration
              - Removed or renamed generated types
-          3. **Fix handwritten source** (`java/src/main/java/com/github/copilot/sdk/`):
+          3. **Fix handwritten source** (`java/sdk/src/main/java/com/github/copilot/sdk/`):
              - Update call sites passing positional constructor args to include new fields (typically `null` for optional new fields).
              - Update switch/if-else over enum values to handle new cases.
              - Register handlers for new event types in `CopilotSession.java` if applicable.
-          4. **Fix handwritten tests** (`java/src/test/java/com/github/copilot/sdk/`):
+          4. **Fix handwritten tests** (`java/sdk/src/test/java/com/github/copilot/sdk/`):
              - Same constructor/enum fixes as above.
              - Add new test methods for new functionality if the change adds user-facing API surface.
           5. **Validate**: `cd java && mvn clean test-compile jar:jar && mvn verify -Dskip.test.harness=true`
diff --git a/.gitignore b/.gitignore
index 4aff9be11d..c1e9833769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,10 @@ docs/.validation/
 *.csproj.lscache
 
 # Java
-java/target
+java/**/target/
 java/smoke-test
 java/.classpath
 java/.project
 java/.settings
 java/scripts/codegen/node_modules/
+.flattened-pom.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41bf05e171..d695ed6fb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,66 @@ All notable changes to the Copilot SDK are documented in this file.
 This changelog is automatically generated by an AI agent when stable releases are published.
 See [GitHub Releases](https://github.com/github/copilot-sdk/releases) for the full list.
 
+## [Unreleased]
+
+### Feature: rotating session-scoped GitHub credentials
+
+All six SDKs can now acquire short-lived GitHub credentials through a session-scoped callback. The SDK registers the callback before session create or resume, maps `initial` and `refresh` requests to the owning session, and removes registrations on rollback, replacement, session close, and client close. Static per-session `gitHubToken` credentials remain supported and are mutually exclusive with the callback.
+
+Token responses use the shared tagged token/cancelled shape and require `expiresIn`, expressed as the positive number of seconds remaining when the callback completes. See [github/copilot-agent-runtime#16381](https://github.com/github/copilot-agent-runtime/pull/16381) for the runtime credential-authority implementation.
+
+Initial acquisition occurs during create or resume; cancellation, callback errors, and invalid credentials reject that operation instead of falling back to ambient authentication. Idle sessions refresh only before their next credential-consuming operation.
+
+### Feature: extensions can request sensitive environment variables
+
+Copilot CLI extensions can now ask for named sensitive environment variables when they join a session. `joinSession()` accepts a `requestedEnvironmentVariables` option listing the variable names the extension needs. The CLI shows a permission prompt naming the extension and the exact variables requested. On approval, only those variables reach that extension and their values are written into the extension process's `process.env` before `joinSession()` resolves. On denial, `joinSession()` rejects, the extension does not load, and its tools never reach the model.
+
+An approval is remembered against the exact set of names the user saw, so an extension that later asks for one more variable prompts again. Names that are unset, or that the CLI does not filter from extensions, are not prompted for. This is the client half of the feature; it requires a Copilot CLI that supports extension environment access, and older CLIs ignore the request and grant nothing.
+
+```ts
+import { joinSession } from "@github/copilot-sdk/extension";
+
+const session = await joinSession({
+    requestedEnvironmentVariables: ["GITHUB_TOKEN"],
+});
+const token = process.env.GITHUB_TOKEN;
+```
+
+### Feature: host-injected managed settings permissions
+
+Session create and resume accept a new optional `managedSettings` option that injects an enterprise permissions policy at session startup, alongside the existing `enableManagedSettings` self-fetch flag. The current contract is permissions-only: `disableBypassPermissionsMode` (the literal `"disable"`), plus `deny`, `ask`, and `allow` rule lists. The layer composes restrictively with any server- or device-level managed settings (deny/ask are unioned, every present allow list must admit a tool, and `disableBypassPermissionsMode` is deny-wins).
+
+This layer is startup-only and is not persisted with the session, so it must be re-supplied on resume to remain in effect; omitting it on resume clears the previously injected layer. It can be combined with `enableManagedSettings`. Host injection requires Copilot CLI `1.0.79-5` or later and does not require an SDK protocol version bump.
+
+The generated session-event types also expose truthful injected-policy provenance: `session.managed_settings_resolved` can report `source` as `client` or `mixed`, with optional `clientManaged` metadata.
+
+```ts
+const session = await client.createSession({
+    managedSettings: {
+        permissions: {
+            disableBypassPermissionsMode: "disable",
+            deny: ["shell(rm*)"],
+            ask: ["write"],
+        },
+    },
+});
+```
+
+```cs
+var session = await client.CreateSessionAsync(new SessionConfig
+{
+    ManagedSettings = new ManagedSettings
+    {
+        Permissions = new ManagedSettingsPermissions
+        {
+            DisableBypassPermissionsMode = DisableBypassPermissionsMode.Disable,
+            Deny = ["shell(rm*)"],
+            Ask = ["write"],
+        },
+    },
+});
+```
+
 ## [v1.0.7](https://github.com/github/copilot-sdk/releases/tag/v1.0.7) (2026-07-16)
 
 ### Feature: in-process (FFI) transport
diff --git a/docs/auth/authenticate.md b/docs/auth/authenticate.md
index d54c954517..a7582b5510 100644
--- a/docs/auth/authenticate.md
+++ b/docs/auth/authenticate.md
@@ -7,7 +7,7 @@ The GitHub Copilot SDK supports multiple authentication methods to fit different
 | Method | Use Case | Copilot Subscription Required |
 |--------|----------|-------------------------------|
 | [GitHub Signed-in User](#github-signed-in-user) | Interactive apps where users sign in with GitHub | Yes |
-| [OAuth GitHub App](#oauth-github-app) | Apps acting on behalf of users via OAuth | Yes |
+| [GitHub OAuth App](#github-oauth-app) | Apps acting on behalf of users via OAuth | Yes |
 | [Environment Variables](#environment-variables) | CI/CD, automation, server-to-server | Yes |
 | [Server-to-server authentication](./server-to-server-tokens.md) | Organization-attributed automation and direct organization billing | No user subscription; organization policy required |
 | [BYOK (Bring Your Own Key)](./byok.md) | Using your own API keys (Microsoft Foundry, OpenAI, and more) | No |
@@ -24,26 +24,13 @@ This is the default authentication method when running the Copilot CLI interacti
 **SDK Configuration:**
 
 <details open>
-<summary><strong>Node.js / TypeScript</strong></summary>
+<summary><strong>.NET</strong></summary>
 
-```typescript
-import { CopilotClient } from "@github/copilot-sdk";
+```csharp
+using GitHub.Copilot;
 
 // Default: uses logged-in user credentials
-const client = new CopilotClient();
-```
-
-</details>
-
-<details>
-<summary><strong>Python</strong></summary>
-
-```python
-from copilot import CopilotClient
-
-# Default: uses logged-in user credentials
-client = CopilotClient()
-await client.start()
+await using CopilotClient client = new();
 ```
 
 </details>
@@ -75,26 +62,51 @@ client := copilot.NewClient(nil)
 </details>
 
 <details>
-<summary><strong>.NET</strong></summary>
+<summary><strong>Java</strong></summary>
 
-```csharp
-using GitHub.Copilot;
+```java
+import com.github.copilot.CopilotClient;
 
 // Default: uses logged-in user credentials
-await using var client = new CopilotClient();
+var client = new CopilotClient();
+client.start().get();
 ```
 
 </details>
 
 <details>
-<summary><strong>Java</strong></summary>
+<summary><strong>Python</strong></summary>
 
-```java
-import com.github.copilot.CopilotClient;
+```python
+from copilot import CopilotClient
+
+# Default: uses logged-in user credentials
+client = CopilotClient()
+await client.start()
+```
+
+</details>
+
+<details>
+<summary><strong>Rust</strong></summary>
+
+```rust
+use github_copilot_sdk::{Client, ClientOptions};
 
 // Default: uses logged-in user credentials
-var client = new CopilotClient();
-client.start().get();
+let client = Client::start(ClientOptions::default()).await?;
+```
+
+</details>
+
+<details>
+<summary><strong>TypeScript</strong></summary>
+
+```typescript
+import { CopilotClient } from "@github/copilot-sdk";
+
+// Default: uses logged-in user credentials
+const client = new CopilotClient();
 ```
 
 </details>
@@ -104,42 +116,41 @@ client.start().get();
 * Development and testing environments
 * Any scenario where a user can sign in interactively
 
-## OAuth GitHub App
+## GitHub OAuth App
 
 Use an OAuth GitHub App to authenticate users through your application and pass their credentials to the SDK. This enables your application to make Copilot API requests on behalf of users who authorize your app.
 
 **How it works:**
 1. User authorizes your OAuth GitHub App
 1. Your app receives a user access token (`gho_` or `ghu_` prefix)
-1. Pass the token to the SDK via `gitHubToken` option
+1. Pass the token to the SDK through its client configuration
 
 **SDK Configuration:**
 
 <details open>
-<summary><strong>Node.js / TypeScript</strong></summary>
+<summary><strong>.NET</strong></summary>
 
-```typescript
-import { CopilotClient } from "@github/copilot-sdk";
+<!-- docs-validate: hidden -->
+```csharp
+using GitHub.Copilot;
 
-const client = new CopilotClient({
-    gitHubToken: userAccessToken,  // Token from OAuth flow
-    useLoggedInUser: false,        // Don't use stored CLI credentials
+var userAccessToken = "token";
+await using CopilotClient client = new(new CopilotClientOptions
+{
+    GitHubToken = userAccessToken,
+    UseLoggedInUser = false,
 });
 ```
+<!-- /docs-validate: hidden -->
 
-</details>
-
-<details>
-<summary><strong>Python</strong></summary>
-
-```python
-from copilot import CopilotClient
+```csharp
+using GitHub.Copilot;
 
-client = CopilotClient({
-    "github_token": user_access_token,  # Token from OAuth flow
-    "use_logged_in_user": False,        # Don't use stored CLI credentials
-})
-await client.start()
+await using var client = new CopilotClient(new CopilotClientOptions
+{
+    GitHubToken = userAccessToken,     // Token from OAuth flow
+    UseLoggedInUser = false,           // Don't use stored CLI credentials
+});
 ```
 
 </details>
@@ -168,41 +179,13 @@ func main() {
 import copilot "github.com/github/copilot-sdk/go"
 
 client := copilot.NewClient(&copilot.ClientOptions{
-    GitHubToken:     userAccessToken,   // Token from OAuth flow
-    UseLoggedInUser: copilot.Bool(false), // Don't use stored CLI credentials
+    GitHubToken:       userAccessToken,      // Token from OAuth flow
+    UseLoggedInUser:   copilot.Bool(false),  // Don't use stored CLI credentials
 })
 ```
 
 </details>
 
-<details>
-<summary><strong>.NET</strong></summary>
-
-<!-- docs-validate: hidden -->
-```csharp
-using GitHub.Copilot;
-
-var userAccessToken = "token";
-await using var client = new CopilotClient(new CopilotClientOptions
-{
-    GitHubToken = userAccessToken,
-    UseLoggedInUser = false,
-});
-```
-<!-- /docs-validate: hidden -->
-
-```csharp
-using GitHub.Copilot;
-
-await using var client = new CopilotClient(new CopilotClientOptions
-{
-    GitHubToken = userAccessToken,     // Token from OAuth flow
-    UseLoggedInUser = false,           // Don't use stored CLI credentials
-});
-```
-
-</details>
-
 <details>
 <summary><strong>Java</strong></summary>
 
@@ -220,6 +203,50 @@ client.start().get();
 
 </details>
 
+<details>
+<summary><strong>Python</strong></summary>
+
+```python
+from copilot import CopilotClient
+
+client = CopilotClient({
+    "github_token": user_access_token,  # Token from OAuth flow
+    "use_logged_in_user": False,        # Don't use stored CLI credentials
+})
+await client.start()
+```
+
+</details>
+
+<details>
+<summary><strong>Rust</strong></summary>
+
+```rust
+use github_copilot_sdk::{Client, ClientOptions};
+
+let client = Client::start(
+    ClientOptions::default()
+        .with_github_token(user_access_token)
+        .with_use_logged_in_user(false),
+).await?;
+```
+
+</details>
+
+<details>
+<summary><strong>TypeScript</strong></summary>
+
+```typescript
+import { CopilotClient } from "@github/copilot-sdk";
+
+const client = new CopilotClient({
+    gitHubToken: userAccessToken,  // Token from OAuth flow
+    useLoggedInUser: false,        // Don't use stored CLI credentials
+});
+```
+
+</details>
+
 **Supported token types:**
 * `gho_` - OAuth user access tokens
 * `ghu_` - GitHub App user access tokens
@@ -233,6 +260,133 @@ client.start().get();
 * SaaS applications building on top of Copilot
 * Any multi-user application where you need to make requests on behalf of different users
 
+For more information, see [GitHub OAuth](../setup/github-oauth.md).
+
+## Rotating session-scoped GitHub tokens
+
+For multi-user services and integrations, set a token provider on each session instead of storing one long-lived token. The runtime calls the provider for the effective GitHub host and identifies the request as `initial` or `refresh`. The session ID is absent only when a cloud session has not received its ID yet.
+
+Return a tagged token result or an explicit cancellation. Every token result must include `expiresIn`: the positive number of seconds remaining when the callback completes. Production GitHub tokens typically last eight hours, so `8 * 60 * 60` is a common value. Do not set both the static per-session token and the provider.
+
+<details open>
+<summary><strong>TypeScript</strong></summary>
+
+<!-- docs-validate: skip -->
+```typescript
+const session = await client.createSession({
+    gitHubTokenProvider: async ({ host, sessionId, reason }) => {
+        const token = await acquireGitHubToken({ host, sessionId, reason });
+        return {
+            kind: "token",
+            accessToken: token.value,
+            expiresIn: token.secondsRemaining,
+        };
+    },
+});
+```
+
+</details>
+<details>
+<summary><strong>Python</strong></summary>
+
+<!-- docs-validate: skip -->
+```python
+async def provide_github_token(args):
+    token = await acquire_github_token(
+        host=args["host"],
+        session_id=args["session_id"],
+        reason=args["reason"],
+    )
+    return {
+        "kind": "token",
+        "accessToken": token.value,
+        "expiresIn": token.seconds_remaining,
+    }
+
+
+session = await client.create_session(github_token_provider=provide_github_token)
+```
+
+</details>
+<details>
+<summary><strong>Go</strong></summary>
+
+<!-- docs-validate: skip -->
+```go
+session, err := client.CreateSession(ctx, &copilot.SessionConfig{
+	GitHubTokenProvider: func(args copilot.GitHubTokenProviderArgs) (*copilot.GitHubTokenProviderResult, error) {
+		token, secondsRemaining, err := acquireGitHubToken(args.Host, args.SessionID, args.Reason)
+		if err != nil {
+			return nil, err
+		}
+		return copilot.GitHubTokenResult(&copilot.GitHubToken{
+			AccessToken: token,
+			ExpiresIn:   secondsRemaining,
+		}), nil
+	},
+})
+```
+
+</details>
+<details>
+<summary><strong>.NET</strong></summary>
+
+<!-- docs-validate: skip -->
+```csharp
+await using var session = await client.CreateSessionAsync(new SessionConfig
+{
+    GitHubTokenProvider = async args =>
+    {
+        var token = await AcquireGitHubTokenAsync(args.Host, args.SessionId, args.Reason);
+        return GitHubTokenProviderResult.FromToken(new GitHubToken
+        {
+            AccessToken = token.Value,
+            ExpiresIn = token.SecondsRemaining,
+        });
+    },
+});
+```
+
+</details>
+<details>
+<summary><strong>Java</strong></summary>
+
+<!-- docs-validate: skip -->
+```java
+var session = client.createSession(new SessionConfig()
+    .setGitHubTokenProvider(args ->
+        acquireGitHubToken(args.host(), args.sessionId(), args.reason())
+            .thenApply(token -> GitHubTokenProviderResult.token(
+                token.value(), token.secondsRemaining())))
+    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+).get();
+```
+
+</details>
+<details>
+<summary><strong>Rust</strong></summary>
+
+<!-- docs-validate: skip -->
+```rust
+let provider = Arc::new(|args: GitHubTokenProviderArgs| async move {
+    let token = acquire_github_token(&args.host, args.session_id.as_ref(), args.reason).await?;
+    Ok(GitHubTokenProviderResult::Token(GitHubToken::new(
+        token.value,
+        token.seconds_remaining,
+    )))
+});
+
+let session = client
+    .create_session(SessionConfig::default().with_github_token_provider(provider))
+    .await?;
+```
+
+</details>
+
+The runtime performs the `initial` acquisition as part of session creation or resume. A cancelled acquisition, provider error, invalid response, or token without a stable account identity rejects the create or resume operation. The runtime does not fall back to ambient authentication.
+
+After the session is established, the runtime performs async preflight before each credential-consuming operation. It requests a `refresh` when the current token has one hour or less remaining. Idle sessions are not refreshed until their next credential-consuming operation. The runtime does not use background timers, rejection-driven replay, 401/403 challenge propagation, or upscope for this callback.
+
 ## Environment variables
 
 For automation, CI/CD pipelines, and server-to-server scenarios, you can authenticate using environment variables.
@@ -253,13 +407,52 @@ For organization-attributed automation that should not use a user's personal acc
 No code changes needed—the SDK automatically detects environment variables:
 
 <details open>
-<summary><strong>Node.js / TypeScript</strong></summary>
+<summary><strong>.NET</strong></summary>
 
-```typescript
-import { CopilotClient } from "@github/copilot-sdk";
+```csharp
+using GitHub.Copilot;
 
 // Token is read from environment variable automatically
-const client = new CopilotClient();
+await using CopilotClient client = new();
+```
+
+</details>
+
+<details>
+<summary><strong>Go</strong></summary>
+
+<!-- docs-validate: hidden -->
+```go
+package main
+
+import copilot "github.com/github/copilot-sdk/go"
+
+func main() {
+	// Token is read from environment variable automatically
+	client := copilot.NewClient(nil)
+	_ = client
+}
+```
+<!-- /docs-validate: hidden -->
+
+```go
+import copilot "github.com/github/copilot-sdk/go"
+
+// Token is read from environment variable automatically
+client := copilot.NewClient(nil)
+```
+
+</details>
+
+<details>
+<summary><strong>Java</strong></summary>
+
+```java
+import com.github.copilot.CopilotClient;
+
+// Token is read from environment variable automatically
+var client = new CopilotClient();
+client.start().get();
 ```
 
 </details>
@@ -277,6 +470,30 @@ await client.start()
 
 </details>
 
+<details>
+<summary><strong>Rust</strong></summary>
+
+```rust
+use github_copilot_sdk::{Client, ClientOptions};
+
+// Token is read from environment variable automatically
+let client = Client::start(ClientOptions::default()).await?;
+```
+
+</details>
+
+<details>
+<summary><strong>TypeScript</strong></summary>
+
+```typescript
+import { CopilotClient } from "@github/copilot-sdk";
+
+// Token is read from environment variable automatically
+const client = new CopilotClient();
+```
+
+</details>
+
 **When to use:**
 * CI/CD pipelines (GitHub Actions, Jenkins, and more)
 * Automated testing
@@ -313,40 +530,20 @@ For multi-user server mode, pass a per-session `gitHubToken` so each session run
 
 ## Disabling auto-login
 
-To prevent the SDK from automatically using stored credentials or `gh` CLI auth, use the `useLoggedInUser: false` option:
+To prevent the SDK from automatically using stored credentials or `gh` CLI auth, configure it to disable logged-in-user fallback:
 
 <details open>
-<summary><strong>Node.js / TypeScript</strong></summary>
+<summary><strong>.NET</strong></summary>
 
-```typescript
-const client = new CopilotClient({
-    useLoggedInUser: false,  // Only use explicit tokens
+```csharp
+await using var client = new CopilotClient(new CopilotClientOptions
+{
+    UseLoggedInUser = false,  // Only use explicit tokens
 });
 ```
 
 </details>
 
-<details>
-<summary><strong>Python</strong></summary>
-
-<!-- docs-validate: hidden -->
-```python
-from copilot import CopilotClient
-
-client = CopilotClient({
-    "use_logged_in_user": False,
-})
-```
-<!-- /docs-validate: hidden -->
-
-```python
-client = CopilotClient({
-    "use_logged_in_user": False,  # Only use explicit tokens
-})
-```
-
-</details>
-
 <details>
 <summary><strong>Go</strong></summary>
 
@@ -373,18 +570,6 @@ client := copilot.NewClient(&copilot.ClientOptions{
 
 </details>
 
-<details>
-<summary><strong>.NET</strong></summary>
-
-```csharp
-await using var client = new CopilotClient(new CopilotClientOptions
-{
-    UseLoggedInUser = false,  // Only use explicit tokens
-});
-```
-
-</details>
-
 <details>
 <summary><strong>Java</strong></summary>
 
@@ -400,6 +585,51 @@ client.start().get();
 
 </details>
 
+<details>
+<summary><strong>Python</strong></summary>
+
+<!-- docs-validate: hidden -->
+```python
+from copilot import CopilotClient
+
+client = CopilotClient({
+    "use_logged_in_user": False,
+})
+```
+<!-- /docs-validate: hidden -->
+
+```python
+client = CopilotClient({
+    "use_logged_in_user": False,  # Only use explicit tokens
+})
+```
+
+</details>
+
+<details>
+<summary><strong>Rust</strong></summary>
+
+```rust
+use github_copilot_sdk::{Client, ClientOptions};
+
+let client = Client::start(
+    ClientOptions::default().with_use_logged_in_user(false),
+).await?;
+```
+
+</details>
+
+<details>
+<summary><strong>TypeScript</strong></summary>
+
+```typescript
+const client = new CopilotClient({
+    useLoggedInUser: false,  // Only use explicit tokens
+});
+```
+
+</details>
+
 ## Next steps
 
 * [BYOK Documentation](./byok.md) - Learn how to use your own API keys
diff --git a/docs/developer-docs/secrets.md b/docs/developer-docs/secrets.md
index 15788bbe56..573f4f22e1 100644
--- a/docs/developer-docs/secrets.md
+++ b/docs/developer-docs/secrets.md
@@ -50,7 +50,7 @@ These secrets are used by the Java SDK Maven Central publishing workflow (`java-
 * **`JAVA_RELEASE_TOKEN`**: GitHub token with **push** permission on the repository. Used by the release workflow for `actions/checkout`, pushing release commits and tags to `main`, and running `mvn release:prepare -DpushChanges=true`.
   * Workflows: `java-publish-maven.yml`
 
-* **`JAVA_RELEASE_GITHUB_TOKEN`**: GitHub token with **workflow dispatch** (actions:write) permission on this repository and `github/copilot-sdk-java`. Used to trigger the `release-changelog.lock.yml` workflow and the documentation site deployment after a release is published.
+* **`JAVA_RELEASE_GITHUB_TOKEN`**: GitHub token with **workflow dispatch** (actions:write) permission on `github/copilot-sdk-java`. Used to trigger the documentation site deployment after a release is published.
   * Workflows: `java-publish-maven.yml`
 
 ## Rust publishing secret
diff --git a/docs/features/README.md b/docs/features/README.md
index 9f3b937c97..f97140b784 100644
--- a/docs/features/README.md
+++ b/docs/features/README.md
@@ -21,6 +21,7 @@ These guides cover the capabilities you can add to your Copilot SDK application.
 | [Streaming Events](./streaming-events.md) | Subscribe to real-time session events (40+ event types) |
 | [Usage and Billing](./usage-and-billing.md) | Read token counts, context-window utilization, AI credit cost, and account quota |
 | [Steering & Queueing](./steering-and-queueing.md) | Control message delivery—immediate steering vs. sequential queueing |
+| [Context Clearing](./context-management.md) | Replace conversation context safely with terminal tools |
 | [Session Persistence](./session-persistence.md) | Resume sessions across restarts, manage session storage |
 | [Remote Sessions](./remote-sessions.md) | Share locally hosted sessions to GitHub web and mobile via Mission Control |
 | [Cloud Sessions](./cloud-sessions.md) | Run sessions on GitHub-hosted compute through Mission Control |
diff --git a/docs/features/context-management.md b/docs/features/context-management.md
new file mode 100644
index 0000000000..6472b046aa
--- /dev/null
+++ b/docs/features/context-management.md
@@ -0,0 +1,57 @@
+# Context clearing and terminal tools
+
+Use `session.history.clearContext` when a host needs to replace the current conversation context without replacing the session. Typical uses include handoffs and host-managed context lifecycle policies.
+
+Context clearing is different from creating a new session: it preserves the session identity, system and developer messages, configuration, and event log while removing the model-facing conversation.
+
+> [!IMPORTANT]
+> `clearContext` is a tool-handler primitive. The runtime rejects calls made without a tool call in flight, calls with an empty seed prompt, and calls on remote sessions.
+
+## Define a context-clearing tool
+
+A successful context-clearing tool should be terminal. Otherwise, the agent loop may make another model call against the newly cleared window before starting the seeded turn.
+
+```typescript
+import { approveAll, CopilotClient, defineTool } from "@github/copilot-sdk";
+import type { CopilotSession } from "@github/copilot-sdk";
+import { z } from "zod";
+
+const client = new CopilotClient();
+let session: CopilotSession;
+
+session = await client.createSession({
+  onPermissionRequest: approveAll,
+  tools: [
+    defineTool("clear_context", {
+      description: "Clear the conversation and start a fresh context window",
+      parameters: z.object({ prompt: z.string() }),
+      isTerminal: true,
+      defer: "never",
+      handler: async ({ prompt }) => {
+        const { messagesCleared } =
+          await session.rpc.history.clearContext({ prompt });
+        return `Cleared ${messagesCleared} messages.`;
+      },
+    }),
+  ],
+});
+```
+
+The required `prompt` becomes the first user message in the fresh context. A successful clear emits `session.context_cleared` with the number of removed messages and the initial message.
+
+## Terminal-tool behavior
+
+`isTerminal` ends the current agent turn only when the tool succeeds. A failure, denial, rejection, timeout, or input-validation error remains visible to the model so it can recover or retry.
+
+The option follows each language's naming conventions:
+
+| SDK | Tool option |
+|---|---|
+| Node.js | `isTerminal` |
+| Python | `is_terminal` |
+| Go | `IsTerminal` |
+| .NET | `CopilotToolOptions.IsTerminal` |
+| Java | `ToolDefinition.isTerminal(true)` or `@CopilotTool(isTerminal = true)` |
+| Rust | `with_is_terminal(true)` |
+
+Use terminality only for tools whose successful completion should end the turn. Ordinary tools should leave it unset.
diff --git a/docs/features/mcp.md b/docs/features/mcp.md
index 6f715bd2ed..caac633275 100644
--- a/docs/features/mcp.md
+++ b/docs/features/mcp.md
@@ -154,6 +154,35 @@ await using var session = await client.CreateSessionAsync(new SessionConfig
 });
 ```
 
+## Disabling configured servers per session
+
+Set `disabledMcpServers` to exact MCP server names that must not run in a session.
+The setting is scoped to the individual create or resume request; it does not
+modify global MCP settings or the server configuration.
+
+```typescript
+const session = await client.createSession({
+    mcpServers: {
+        filesystem: { type: "local", command: "npx", args: ["-y", "@modelcontextprotocol/server-filesystem", "."] },
+        github: { type: "http", url: "https://api.githubcopilot.com/mcp/" },
+    },
+    disabledMcpServers: ["github"],
+});
+```
+
+| SDK | Configuration property |
+| --- | --- |
+| Node.js | `disabledMcpServers` |
+| Python | `disabled_mcp_servers` |
+| Go | `DisabledMCPServers` |
+| .NET | `DisabledMcpServers` |
+| Java | `setDisabledMcpServers(...)` |
+| Rust | `with_disabled_mcp_servers(...)` |
+
+On session creation and a **cold** resume, disabled servers are not started and
+the runtime does not initiate their authentication. A resident resume cannot
+undo a server that the runtime has already spawned. Names are matched exactly.
+
 ## Tool configuration
 
 You can control which tools are available to an MCP server using the `tools` field.
diff --git a/docs/features/plugin-directories.md b/docs/features/plugin-directories.md
index ccd95df95a..4af11d9a7e 100644
--- a/docs/features/plugin-directories.md
+++ b/docs/features/plugin-directories.md
@@ -240,6 +240,41 @@ let client = Client::start(
 
 > The example above uses an stdio runtime connection — the default when the SDK bundles the CLI. If you connect to an external runtime via a URL (`forUri` / `ForUri`), pass `--plugin-dir` to the long-running CLI server when you start it; the SDK does not forward `--plugin-dir` to runtimes it didn't spawn.
 
+## Trusted host-bundled plugin directories
+
+Applications that ship their own trusted plugins can register them as a client startup option. The SDK sends the complete ordered set after connecting and verifying the protocol, before `start` returns or any session can be created. Paths must be absolute; leaving the option unset or empty makes no RPC call.
+
+<!-- docs-validate: hidden -->
+```typescript
+import { CopilotClient } from "@github/copilot-sdk";
+
+async function main() {
+  const client = new CopilotClient({
+    builtinPluginDirectories: [
+      "/opt/my-app/copilot-plugins/core",
+      "/opt/my-app/copilot-plugins/github",
+    ],
+  });
+  await client.start();
+}
+
+main();
+```
+<!-- /docs-validate: hidden -->
+
+The equivalent option in each SDK is:
+
+| SDK | Startup option |
+|---|---|
+| Node.js / TypeScript | `builtinPluginDirectories: string[]` |
+| Python | `builtin_plugin_directories=[...]` |
+| Go | `BuiltinPluginDirectories: []string{...}` |
+| .NET | `BuiltinPluginDirectories = [...]` |
+| Java | `.setBuiltinPluginDirectories(List.of(Path.of(...)))` |
+| Rust | `.with_builtin_plugin_directories([...])` |
+
+This is a trust boundary for plugins bundled and controlled by the host application. It is distinct from `--plugin-dir`, which is a CLI process launch argument for explicitly loading ordinary plugin directories. The startup option also works when connecting to an existing runtime because it is sent over JSON-RPC rather than forwarded as a process argument.
+
 ## What a plugin can contribute
 
 Loading a plugin directory makes its extensions visible to every session created by the client. The runtime merges plugin-provided extensions with anything you register inline:
diff --git a/docs/features/skills.md b/docs/features/skills.md
index 5b8388162a..d76196429e 100644
--- a/docs/features/skills.md
+++ b/docs/features/skills.md
@@ -351,6 +351,22 @@ The markdown body contains the instructions that are injected into the session c
 | .NET | `SkillDirectories` | `List<string>` | Directories to load skills from |
 | .NET | `DisabledSkills` | `List<string>` | Skills to disable |
 
+### Built-in skills and `mode: "empty"`
+
+The runtime ships with a set of bundled **built-in** skills that are eligible by
+default. When you run the client in `mode: "empty"` (the recommended baseline for
+[multi-tenant servers](../setup/multi-tenancy.md)), the SDK excludes every
+runtime-bundled built-in skill: it sends an empty `includedBuiltinSkills` list on
+the post-create and post-resume options patch, alongside the empty
+`installedPlugins` list.
+
+This exclusion is the default, not a permanent restriction. To allow selected
+runtime-bundled skills, set `includedBuiltinSkills` (or the language-specific
+casing) to their names. You can also opt into your **own** custom skills under
+`mode: "empty"`—enable skills and pass your own `skillDirectories`—and those
+remain fully usable, including a custom skill that shares a name with a built-in.
+Under `mode: "copilot-cli"` the field is omitted unless you set the option.
+
 ## Best practices
 
 1. **Organize by domain** - Group related skills together (e.g., `skills/security/`, `skills/testing/`)
diff --git a/docs/setup/bundled-cli.md b/docs/setup/bundled-cli.md
index f067de8fde..9d9c80c35b 100644
--- a/docs/setup/bundled-cli.md
+++ b/docs/setup/bundled-cli.md
@@ -39,6 +39,9 @@ flowchart TB
 
 ## Quick start
 
+> [!NOTE]
+> Each SDK has a minimum language runtime requirement—see the Prerequisites section of the [Node.js](../../nodejs/README.md#prerequisites), [Python](../../python/README.md#prerequisites), [Go](../../go/README.md#prerequisites), [Rust](../../rust/README.md#prerequisites), [Java](../../java/README.md#prerequisites), or [.NET](../../dotnet/README.md#prerequisites) README—since an unsupported runtime (e.g. Python below the stated floor) can cause `pip`/package managers to silently resolve an outdated SDK release instead of reporting a version conflict.
+
 <details open>
 <summary><strong>Node.js / TypeScript</strong></summary>
 
diff --git a/docs/setup/multi-tenancy.md b/docs/setup/multi-tenancy.md
index 2f82dde0bf..ebbafe4fb0 100644
--- a/docs/setup/multi-tenancy.md
+++ b/docs/setup/multi-tenancy.md
@@ -24,7 +24,9 @@ This guide is a sister to [Scaling and multi-tenancy](./scaling.md). Use that gu
 | `baseDirectory` | Isolating `COPILOT_HOME` per runtime instance | Ignored when connecting to an existing runtime. |
 | `sessionFs` | Routing session filesystem storage off local disk | Pair with per-session filesystem providers. |
 | `RuntimeConnection.forUri(url)` | Sharing one already-running runtime | Language names vary; see samples below. |
-| Per-session `gitHubToken` | Scoping auth to the requesting user | Prefer this over a single shared user token. |
+| Per-session GitHub token or provider | Scoping auth to the requesting user | Prefer a rotating provider for short-lived credentials; use a static `gitHubToken` only when rotation is unnecessary. |
+
+For callback-backed credentials, see [Rotating session-scoped GitHub tokens](../auth/authenticate.md#rotating-session-scoped-github-tokens). Each session owns its provider registration, so concurrent sessions can use different GitHub hosts and accounts without sharing callback state.
 
 ### `mode: "empty"`
 
@@ -396,10 +398,13 @@ Session-level isolation means the runtime keeps user-specific model and state in
 | Session state | Per session ID under `COPILOT_HOME/session-state/{sessionId}`. |
 | GitHub identity | Per-session when `gitHubToken` is set on the session. |
 | Tools | Explicit in `mode: "empty"`; ambient in `mode: "copilot-cli"`. |
+| Skills | In `mode: "empty"` no runtime-bundled built-in skills are eligible by default; callers can allow selected built-ins or opt into their own custom skills. Ambient in `mode: "copilot-cli"`. |
 | Host filesystem | Shared by the runtime process if host tools are available. |
 
 `mode: "empty"` is what makes shared runtime patterns viable: no ambient OS tools are exposed unless your application registers or allows them. With `mode: "copilot-cli"`, OS filesystem access is shared through the host process, so do not use that mode for multi-user server mode.
 
+Under `mode: "empty"` the SDK excludes every runtime-bundled built-in skill by default (it sends an empty `includedBuiltinSkills` list on the post-create/post-resume options patch, alongside the empty `installedPlugins` list). Set `includedBuiltinSkills` (or the language-specific casing) to explicitly allow selected built-ins, just as `availableTools` allows selected runtime-bundled tools. A caller can also opt into its **own** custom skills—for example by enabling skills and pointing at its own skill directories—and those remain usable.
+
 Session state is stored under `COPILOT_HOME/session-state/{sessionId}` unless you route it through `sessionFs`. Use unique session IDs that include your own tenant or user boundary, and enforce access control before resuming or deleting sessions.
 
 ## Pattern comparison
diff --git a/docs/troubleshooting/compatibility.md b/docs/troubleshooting/compatibility.md
index 795c0f5fd4..da8bf0daae 100644
--- a/docs/troubleshooting/compatibility.md
+++ b/docs/troubleshooting/compatibility.md
@@ -77,7 +77,7 @@ The Copilot SDK communicates with the CLI via JSON-RPC protocol. Features must b
 | System message | `systemMessage` config | Append or replace |
 | Custom provider | `provider` config | BYOK support |
 | Infinite sessions | `infiniteSessions` config | Auto-compaction |
-| Permission handler | `onPermissionRequest` | Approve/deny requests |
+| Permission handler | `onPermissionRequest` | Approve/deny requests; optionally attach a `decisionContext` for auto-approval telemetry |
 | User input handler | `onUserInputRequest` | Handle ask_user |
 | Skills | `skillDirectories` config | Custom skills |
 | Disabled skills | `disabledSkills` config | Disable specific skills |
@@ -89,6 +89,7 @@ The Copilot SDK communicates with the CLI via JSON-RPC protocol. Features must b
 | Agent management | `session.rpc.agent.*` | List, select, deselect, get current agent |
 | Fleet mode | `session.rpc.fleet.start()` | Parallel sub-agent execution; see [Fleet mode](../features/fleet-mode.md) |
 | Manual compaction | `session.rpc.history.compact()` | Trigger compaction on demand |
+| Context clearing | `session.rpc.history.clearContext()` | Replace conversation context from a terminal tool |
 | History truncation | `session.rpc.history.truncate()` | Remove events from a point onward |
 | Session forking | `server.rpc.sessions.fork()` | Fork a session at a point in history |
 
diff --git a/dotnet/README.md b/dotnet/README.md
index 6efd6e094c..461ff0cf94 100644
--- a/dotnet/README.md
+++ b/dotnet/README.md
@@ -133,6 +133,7 @@ Create a new conversation session.
 - `InfiniteSessions` - Configure automatic context compaction (see below)
 - `WorkingDirectory` - Working directory for the session. When not set, the runtime uses its own process working directory.
 - `EnableSessionStore` - Enables the cross-session store for search and retrieval across sessions. When unset in `CopilotClientMode.CopilotCli`, the runtime default applies (enabled). In `CopilotClientMode.Empty`, defaults to disabled.
+- `GitHubTokenProvider` - Acquires session-scoped GitHub tokens on demand. Return `GitHubTokenProviderResult.FromToken` with a positive `ExpiresIn` value (production GitHub tokens typically use `8 * 60 * 60` seconds), or `GitHubTokenProviderResult.Cancel()`. Cannot be combined with `GitHubToken`.
 - `OnPermissionRequest` - Optional handler called before each tool execution to approve or deny it. When omitted, permission requests are emitted as events and left pending for manual resolution. `PermissionHandler.ApproveAll` approves requests when managed settings are disabled and throws when `EnableManagedSettings` is true. Custom handlers can inspect `ManagedApprovalRequired` for human-facing confirmation logic. See [Permission Handling](#permission-handling) section.
 - `OnUserInputRequest` - Handler for user input requests from the agent (enables ask_user tool). See [User Input Requests](#user-input-requests) section.
 - `Hooks` - Hook handlers for session lifecycle events. See [Session Hooks](#session-hooks) section.
@@ -144,6 +145,24 @@ Resume an existing session. Returns the session with `WorkspacePath` populated i
 **ResumeSessionConfig:**
 
 - `OnPermissionRequest` - Optional handler called before each tool execution to approve or deny it. See [Permission Handling](#permission-handling) section.
+- `GitHubTokenProvider` - Replaces the session-scoped token provider when resuming. Cannot be combined with `GitHubToken`.
+
+```csharp
+await using var session = await client.CreateSessionAsync(new SessionConfig
+{
+    GitHubTokenProvider = async args =>
+    {
+        var token = await AcquireTokenAsync(args.Host);
+        return GitHubTokenProviderResult.FromToken(new GitHubToken
+        {
+            AccessToken = token,
+            ExpiresIn = 8 * 60 * 60
+        });
+    }
+});
+```
+
+Initial acquisition runs during session creation or resume. Cancellation, provider errors, and invalid token responses reject that operation instead of falling back to ambient authentication. Idle sessions refresh only before their next credential-consuming operation; there is no background refresh timer.
 
 ##### `PingAsync(string? message = null): Task<PingResponse>`
 
diff --git a/dotnet/src/Client.cs b/dotnet/src/Client.cs
index 4e271598eb..f2da0a48f7 100644
--- a/dotnet/src/Client.cs
+++ b/dotnet/src/Client.cs
@@ -70,12 +70,14 @@ public sealed partial class CopilotClient : IDisposable, IAsyncDisposable
     /// <see cref="CopilotClient"/> that has not been explicitly disposed or removed.
     /// </remarks>
     internal readonly ConcurrentDictionary<string, CopilotSession> _sessions = new();
+    private readonly ConcurrentDictionary<string, Func<GitHubTokenProviderArgs, Task<GitHubTokenProviderResult>>> _gitHubTokenProviders = new();
 
     private readonly CopilotClientOptions _options;
     private readonly RuntimeConnection _connection;
     private readonly ILogger _logger;
     private readonly int? _optionsPort;
     private readonly string? _optionsHost;
+    private readonly string[] _builtinPluginDirectories;
     private readonly Func<CancellationToken, Task<IList<ModelInfo>>>? _onListModels;
     private readonly List<LifecycleSubscription> _lifecycleHandlers = [];
 
@@ -90,8 +92,7 @@ public sealed partial class CopilotClient : IDisposable, IAsyncDisposable
 
     /// <summary>
     /// Client-global RPC handlers (e.g. the LLM inference provider adapter),
-    /// built once at construction when the corresponding option is configured and
-    /// registered on every connection. Null when no client-global API is enabled.
+    /// built once at construction and registered on every connection.
     /// </summary>
     private readonly ClientGlobalApiHandlers? _clientGlobalApis;
 
@@ -138,6 +139,14 @@ public CopilotClient(CopilotClientOptions? options = null)
     {
         _options = options ?? new();
         _connection = _options.Connection ?? ResolveDefaultConnection(_options);
+        _builtinPluginDirectories = _options.BuiltinPluginDirectories?.ToArray() ?? [];
+        foreach (var path in _builtinPluginDirectories.Where(path => !IsFullyQualifiedPath(path)))
+        {
+            throw new ArgumentException(
+                $"{nameof(CopilotClientOptions)}.{nameof(CopilotClientOptions.BuiltinPluginDirectories)} " +
+                $"must contain only absolute paths: {path}",
+                nameof(options));
+        }
 
         switch (_connection)
         {
@@ -317,6 +326,26 @@ private static Uri ParseRuntimeUrl(string url)
         return new Uri(url);
     }
 
+    private static bool IsFullyQualifiedPath(string path)
+    {
+        if (string.IsNullOrEmpty(path) || !Path.IsPathRooted(path))
+        {
+            return false;
+        }
+#if NETSTANDARD2_0
+        if (Path.DirectorySeparatorChar != '\\')
+        {
+            return true;
+        }
+
+        bool IsSeparator(char value) => value == '\\' || value == '/';
+        return (path.Length >= 3 && path[1] == ':' && IsSeparator(path[2]))
+            || (path.Length >= 2 && IsSeparator(path[0]) && IsSeparator(path[1]));
+#else
+        return Path.IsPathFullyQualified(path);
+#endif
+    }
+
     /// <summary>
     /// Starts the Copilot client and connects to the server.
     /// </summary>
@@ -423,6 +452,13 @@ async Task<Connection> StartCoreAsync(CancellationToken ct)
                     "CopilotClient.StartAsync protocol verification complete. Elapsed={Elapsed}",
                     startTimestamp);
 
+                if (_builtinPluginDirectories.Length > 0)
+                {
+                    var request = new BuiltinPluginDirectoriesRequest(_builtinPluginDirectories);
+                    await InvokeRpcAsync<JsonElement>(
+                        connection.Rpc, "plugins.builtin.set", [request], null, ct);
+                }
+
                 var sessionFsTimestamp = Stopwatch.GetTimestamp();
                 await ConfigureSessionFsAsync(ct);
                 if (_options.SessionFs is not null)
@@ -505,6 +541,7 @@ public async Task StopAsync()
         }
 
         _sessions.Clear();
+        ClearGitHubTokenProviders();
 
         await CleanupConnectionAsync(errors, gracefulRuntimeShutdown: true);
 
@@ -536,6 +573,7 @@ public async Task StopAsync()
     public async Task ForceStopAsync()
     {
         _sessions.Clear();
+        ClearGitHubTokenProviders();
 
         var errors = new List<Exception>();
         await CleanupConnectionAsync(errors, gracefulRuntimeShutdown: false);
@@ -785,7 +823,7 @@ private CopilotSession InitializeSession(
         session.RegisterTools(config.Tools ?? []);
         session.RegisterPermissionHandler(
             config.OnPermissionRequest,
-            config.EnableManagedSettings is true);
+            config.EnableManagedSettings is true || config.ManagedSettings is not null);
         session.RegisterMcpAuthHandler(config.OnMcpAuthRequest);
         session.RegisterCommands(config.Commands);
         session.RegisterElicitationHandler(config.OnElicitationRequest);
@@ -994,8 +1032,9 @@ private void ApplyConfigDefaultsForMode(SessionConfigBase config)
     /// patch for the current mode. In empty mode this defaults the four
     /// overridable feature flags to safe values (caller values from
     /// <paramref name="config"/> win); <c>installedPlugins=[]</c> is
-    /// unconditional under empty mode so apps that need plugins must switch
-    /// modes. In copilot-cli mode only explicitly-set fields are forwarded.
+    /// unconditional under empty mode. <c>includedBuiltinSkills</c> defaults to
+    /// an empty list, but callers can explicitly allow selected runtime-bundled
+    /// skills. In copilot-cli mode only explicitly-set fields are forwarded.
     /// </summary>
     private async Task UpdateSessionOptionsForModeAsync(CopilotSession session, SessionConfigBase config, CancellationToken cancellationToken)
     {
@@ -1005,6 +1044,7 @@ private async Task UpdateSessionOptionsForModeAsync(CopilotSession session, Sess
         bool? coauthorEnabled = null;
         bool? manageScheduleEnabled = null;
         IList<SessionInstalledPlugin>? installedPlugins = null;
+        IList<string>? includedBuiltinSkills = null;
 
         if (_options.Mode == CopilotClientMode.Empty)
         {
@@ -1013,6 +1053,7 @@ private async Task UpdateSessionOptionsForModeAsync(CopilotSession session, Sess
             coauthorEnabled = config.CoauthorEnabled ?? false;
             manageScheduleEnabled = config.ManageScheduleEnabled ?? false;
             installedPlugins = [];
+            includedBuiltinSkills = config.IncludedBuiltinSkills ?? [];
             hasAnyPatch = true;
         }
         else
@@ -1021,6 +1062,7 @@ private async Task UpdateSessionOptionsForModeAsync(CopilotSession session, Sess
             if (config.CustomAgentsLocalOnly is not null) { customAgentsLocalOnly = config.CustomAgentsLocalOnly; hasAnyPatch = true; }
             if (config.CoauthorEnabled is not null) { coauthorEnabled = config.CoauthorEnabled; hasAnyPatch = true; }
             if (config.ManageScheduleEnabled is not null) { manageScheduleEnabled = config.ManageScheduleEnabled; hasAnyPatch = true; }
+            if (config.IncludedBuiltinSkills is not null) { includedBuiltinSkills = config.IncludedBuiltinSkills; hasAnyPatch = true; }
         }
 
         if (!hasAnyPatch) return;
@@ -1034,6 +1076,7 @@ await session.Rpc.Options.UpdateAsync(
                 coauthorEnabled: coauthorEnabled,
                 manageScheduleEnabled: manageScheduleEnabled,
                 installedPlugins: installedPlugins,
+                includedBuiltinSkills: includedBuiltinSkills,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
 #pragma warning restore GHCP001
         }
@@ -1083,6 +1126,7 @@ await session.Rpc.Options.UpdateAsync(
     public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(config);
+        ValidateGitHubTokenConfig(config);
 
         var connection = await EnsureConnectedAsync(cancellationToken);
         var totalTimestamp = Stopwatch.GetTimestamp();
@@ -1117,19 +1161,22 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
             ? null
             : (string.IsNullOrEmpty(config.SessionId) ? Guid.NewGuid().ToString() : config.SessionId);
 
+        var registrationId = RegisterGitHubTokenProvider(config.GitHubTokenProvider);
+        var registrationTransferred = false;
         CopilotSession? session = null;
-        if (localSessionId != null)
-        {
-            session = InitializeSession(
-                localSessionId,
-                connection.Rpc,
-                config,
-                transformCallbacks,
-                hasHooks,
-                "CopilotClient.CreateSessionAsync");
-        }
         try
         {
+            if (localSessionId != null)
+            {
+                session = InitializeSession(
+                    localSessionId,
+                    connection.Rpc,
+                    config,
+                    transformCallbacks,
+                    hasHooks,
+                    "CopilotClient.CreateSessionAsync");
+            }
+
             var (traceparent, tracestate) = TelemetryHelpers.GetTraceContext();
 
             var request = new CreateSessionRequest(
@@ -1141,6 +1188,7 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
                 config.ContextTier,
                 config.Tools?.Select(ToolDefinition.FromAIFunction).ToList(),
                 config.EnableCitations,
+                config.EnableFileChangeTracking,
                 wireSystemMessage,
                 toolFilter.AvailableTools,
                 toolFilter.ExcludedTools,
@@ -1178,17 +1226,19 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
                 config.DisabledSkills,
                 config.InfiniteSessions,
                 config.SessionLimits,
-                Commands: config.Commands?.Select(c => new CommandWireDefinition(c.Name, c.Description)).ToList(),
+                Commands: config.Commands?.Select(c => new CommandWireDefinition(c.Name, c.Description ?? string.Empty)).ToList(),
                 RequestElicitation: config.OnElicitationRequest != null,
                 RequestMcpApps: config.EnableMcpApps ? true : null,
                 Traceparent: traceparent,
                 Tracestate: tracestate,
                 ModelCapabilities: config.ModelCapabilities,
                 GitHubToken: config.GitHubToken,
+                GitHubTokenProviderRegistrationId: registrationId,
                 RemoteSession: config.RemoteSession,
                 Cloud: config.Cloud,
                 InstructionDirectories: config.InstructionDirectories,
                 PluginDirectories: config.PluginDirectories,
+                DisabledMcpServers: config.DisabledMcpServers,
                 LargeOutput: config.LargeOutput,
                 ToolSearch: config.ToolSearch,
                 Memory: config.Memory,
@@ -1204,6 +1254,7 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
                 ExpAssignments: config.ExpAssignments,
                 EnableManagedSettings: config.EnableManagedSettings,
                 GitHubMcpToolConfig: config.GitHubMcpToolConfig,
+                ManagedSettings: config.ManagedSettings,
                 EnableGitHubTelemetryForwarding: _options.OnGitHubTelemetry != null ? true : null,
                 AdditionalDirectories: config.AdditionalDirectories);
 
@@ -1262,6 +1313,11 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
             session.SetOpenCanvases(response.OpenCanvases);
 
             await UpdateSessionOptionsForModeAsync(session, config, cancellationToken).ConfigureAwait(false);
+            if (registrationId is not null)
+            {
+                session.SetGitHubTokenProviderRegistration(registrationId);
+                registrationTransferred = true;
+            }
         }
         catch (Exception ex)
         {
@@ -1277,6 +1333,13 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
 
             throw;
         }
+        finally
+        {
+            if (!registrationTransferred && registrationId is not null)
+            {
+                UnregisterGitHubTokenProvider(registrationId);
+            }
+        }
 
         LoggingHelpers.LogTiming(_logger, LogLevel.Debug, null,
             "CopilotClient.CreateSessionAsync complete. Elapsed={Elapsed}, SessionId={SessionId}",
@@ -1314,6 +1377,7 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
     {
         ArgumentNullException.ThrowIfNull(sessionId);
         ArgumentNullException.ThrowIfNull(config);
+        ValidateGitHubTokenConfig(config);
 
         var connection = await EnsureConnectedAsync(cancellationToken);
         var totalTimestamp = Stopwatch.GetTimestamp();
@@ -1336,17 +1400,21 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
 
         var (wireSystemMessage, transformCallbacks) = ExtractTransformCallbacks(config.SystemMessage);
 
-        // Create and register the session before issuing the RPC so that
-        // events emitted by the CLI (e.g. session.start) are not dropped.
-        var session = InitializeSession(
-            sessionId,
-            connection.Rpc,
-            config,
-            transformCallbacks,
-            hasHooks,
-            "CopilotClient.ResumeSessionAsync");
+        var registrationId = RegisterGitHubTokenProvider(config.GitHubTokenProvider);
+        var registrationTransferred = false;
+        CopilotSession? session = null;
         try
         {
+            // Create and register the session before issuing the RPC so that
+            // events emitted by the CLI (e.g. session.start) are not dropped.
+            session = InitializeSession(
+                sessionId,
+                connection.Rpc,
+                config,
+                transformCallbacks,
+                hasHooks,
+                "CopilotClient.ResumeSessionAsync");
+
             var (traceparent, tracestate) = TelemetryHelpers.GetTraceContext();
 
             var request = new ResumeSessionRequest(
@@ -1358,6 +1426,7 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
                 config.ContextTier,
                 config.Tools?.Select(ToolDefinition.FromAIFunction).ToList(),
                 config.EnableCitations,
+                config.EnableFileChangeTracking,
                 wireSystemMessage,
                 toolFilter.AvailableTools,
                 toolFilter.ExcludedTools,
@@ -1396,17 +1465,19 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
                 config.DisabledSkills,
                 config.InfiniteSessions,
                 config.SessionLimits,
-                Commands: config.Commands?.Select(c => new CommandWireDefinition(c.Name, c.Description)).ToList(),
+                Commands: config.Commands?.Select(c => new CommandWireDefinition(c.Name, c.Description ?? string.Empty)).ToList(),
                 RequestElicitation: config.OnElicitationRequest != null,
                 RequestMcpApps: config.EnableMcpApps ? true : null,
                 Traceparent: traceparent,
                 Tracestate: tracestate,
                 ModelCapabilities: config.ModelCapabilities,
                 GitHubToken: config.GitHubToken,
+                GitHubTokenProviderRegistrationId: registrationId,
                 RemoteSession: config.RemoteSession,
                 ContinuePendingWork: config.ContinuePendingWork,
                 InstructionDirectories: config.InstructionDirectories,
                 PluginDirectories: config.PluginDirectories,
+                DisabledMcpServers: config.DisabledMcpServers,
                 LargeOutput: config.LargeOutput,
                 ToolSearch: config.ToolSearch,
                 Memory: config.Memory,
@@ -1423,6 +1494,7 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
                 ExpAssignments: config.ExpAssignments,
                 EnableManagedSettings: config.EnableManagedSettings,
                 GitHubMcpToolConfig: config.GitHubMcpToolConfig,
+                ManagedSettings: config.ManagedSettings,
                 EnableGitHubTelemetryForwarding: _options.OnGitHubTelemetry != null ? true : null,
                 AdditionalDirectories: config.AdditionalDirectories);
 
@@ -1444,10 +1516,15 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
             }
 
             await UpdateSessionOptionsForModeAsync(session, config, cancellationToken).ConfigureAwait(false);
+            if (registrationId is not null)
+            {
+                session.SetGitHubTokenProviderRegistration(registrationId);
+                registrationTransferred = true;
+            }
         }
         catch (Exception ex)
         {
-            session.RemoveFromClient();
+            session?.RemoveFromClient();
             if (ex is not OperationCanceledException)
             {
                 LoggingHelpers.LogTiming(_logger, LogLevel.Warning, ex,
@@ -1457,12 +1534,19 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
             }
             throw;
         }
+        finally
+        {
+            if (!registrationTransferred && registrationId is not null)
+            {
+                UnregisterGitHubTokenProvider(registrationId);
+            }
+        }
 
         LoggingHelpers.LogTiming(_logger, LogLevel.Debug, null,
             "CopilotClient.ResumeSessionAsync complete. Elapsed={Elapsed}, SessionId={SessionId}",
             totalTimestamp,
             sessionId);
-        return session;
+        return session!;
     }
 
     /// <summary>
@@ -1622,7 +1706,10 @@ public async Task DeleteSessionAsync(string sessionId, CancellationToken cancell
             throw new InvalidOperationException($"Failed to delete session {sessionId}: {response.Error}");
         }
 
-        RemoveSession(sessionId);
+        if (_sessions.TryRemove(sessionId, out var session))
+        {
+            session.ReleaseGitHubTokenProviderRegistration();
+        }
     }
 
     /// <summary>
@@ -1904,25 +1991,94 @@ await Rpc.SessionFs.SetProviderAsync(
     /// <summary>
     /// Builds the client-global RPC handler bag at construction time. Registers
     /// the LLM inference provider adapter and/or the GitHub telemetry adapter
-    /// depending on which options are configured; returns null when no
-    /// client-global API is configured so the registration is skipped entirely.
+    /// depending on which options are configured. The GitHub token dispatcher is
+    /// always registered because providers are configured per session.
     /// </summary>
     private ClientGlobalApiHandlers? BuildClientGlobalApis()
     {
         var handler = _options.RequestHandler;
         var onGitHubTelemetry = _options.OnGitHubTelemetry;
-        if (handler is null && onGitHubTelemetry is null)
-        {
-            return null;
-        }
-
         return new ClientGlobalApiHandlers
         {
             LlmInference = handler is null ? null : new LlmInferenceAdapter(handler, () => _serverRpc),
             GitHubTelemetry = onGitHubTelemetry is null ? null : new GitHubTelemetryAdapter(onGitHubTelemetry, _logger),
+            GitHubToken = new GitHubTokenAdapter(this),
         };
     }
 
+    private static void ValidateGitHubTokenConfig(SessionConfigBase config)
+    {
+        if (config.GitHubToken is not null && config.GitHubTokenProvider is not null)
+        {
+            throw new ArgumentException(
+                $"{nameof(SessionConfigBase.GitHubToken)} and {nameof(SessionConfigBase.GitHubTokenProvider)} cannot be used together.",
+                nameof(config));
+        }
+    }
+
+    private string? RegisterGitHubTokenProvider(
+        Func<GitHubTokenProviderArgs, Task<GitHubTokenProviderResult>>? provider)
+    {
+        if (provider is null)
+        {
+            return null;
+        }
+
+        var registrationId = Guid.NewGuid().ToString();
+        if (!_gitHubTokenProviders.TryAdd(registrationId, provider))
+        {
+            throw new InvalidOperationException("Failed to register GitHub token provider.");
+        }
+        return registrationId;
+    }
+
+    internal void UnregisterGitHubTokenProvider(string registrationId)
+        => _gitHubTokenProviders.TryRemove(registrationId, out _);
+
+    private void ClearGitHubTokenProviders() => _gitHubTokenProviders.Clear();
+
+    private sealed class GitHubTokenAdapter(CopilotClient client) : IGitHubTokenHandler
+    {
+        public async Task<GitHubTokenAcquireResult> GetTokenAsync(
+            GitHubTokenAcquireRequest request,
+            CancellationToken cancellationToken = default)
+        {
+            if (!client._gitHubTokenProviders.TryGetValue(request.RegistrationId, out var provider))
+            {
+                throw new InvalidOperationException(
+                    $"Unknown GitHub token provider registration ID '{request.RegistrationId}'.");
+            }
+
+            var reason = request.Reason == GitHubTokenAcquireReason.Initial
+                ? GitHubTokenRequestReason.Initial
+                : request.Reason == GitHubTokenAcquireReason.Refresh
+                    ? GitHubTokenRequestReason.Refresh
+                    : throw new InvalidOperationException($"Unknown GitHub token request reason '{request.Reason}'.");
+            var result = await provider(new GitHubTokenProviderArgs
+            {
+                Host = request.Host,
+                SessionId = request.SessionId,
+                Reason = reason,
+            }).ConfigureAwait(false);
+
+            if (result is { Cancelled: true })
+            {
+                return new GitHubTokenAcquireResultCancelled();
+            }
+            if (result?.Token is not { } token)
+            {
+                throw new InvalidOperationException(
+                    "GitHub token provider returned neither a token nor cancellation.");
+            }
+            return new GitHubTokenAcquireResultToken
+            {
+                AccessToken = token.AccessToken,
+                TokenType = token.TokenType,
+                ExpiresIn = token.ExpiresIn,
+            };
+        }
+    }
+
     /// <summary>
     /// Tells the runtime to route its outbound model-layer requests through this
     /// client's LLM inference provider. No-op when interception is not configured.
@@ -2500,11 +2656,6 @@ private void RegisterSession(CopilotSession session)
         }
     }
 
-    private void RemoveSession(string sessionId)
-    {
-        _sessions.TryRemove(sessionId, out _);
-    }
-
     /// <summary>
     /// Disposes the <see cref="CopilotClient"/> synchronously.
     /// </summary>
@@ -2715,6 +2866,7 @@ internal record CreateSessionRequest(
         ContextTier? ContextTier,
         IList<ToolDefinition>? Tools,
         bool? EnableCitations,
+        bool? EnableFileChangeTracking,
         SystemMessageConfig? SystemMessage,
         IList<string>? AvailableTools,
         IList<string>? ExcludedTools,
@@ -2759,10 +2911,12 @@ internal record CreateSessionRequest(
         string? Tracestate = null,
         ModelCapabilitiesOverride? ModelCapabilities = null,
         string? GitHubToken = null,
+        [property: JsonPropertyName("gitHubTokenProviderRegistrationId")] string? GitHubTokenProviderRegistrationId = null,
         RemoteSessionMode? RemoteSession = null,
         CloudSessionOptions? Cloud = null,
         IList<string>? InstructionDirectories = null,
         IList<string>? PluginDirectories = null,
+        [property: JsonPropertyName("disabledMcpServers")] IList<string>? DisabledMcpServers = null,
         LargeToolOutputConfig? LargeOutput = null,
         ToolSearchConfig? ToolSearch = null,
         MemoryConfiguration? Memory = null,
@@ -2778,6 +2932,7 @@ internal record CreateSessionRequest(
         OptionsUpdateToolFilterPrecedence? ToolFilterPrecedence = null,
         [property: JsonPropertyName("expAssignments")] CopilotExpAssignmentResponse? ExpAssignments = null,
         [property: JsonPropertyName("enableManagedSettings")] bool? EnableManagedSettings = null,
+        [property: JsonPropertyName("managedSettings")] ManagedSettings? ManagedSettings = null,
         bool? EnableGitHubTelemetryForwarding = null,
         [property: JsonPropertyName("githubMcpToolConfig")] GitHubMcpToolConfig? GitHubMcpToolConfig = null,
         IList<string>? AdditionalDirectories = null);
@@ -2790,7 +2945,8 @@ internal record ToolDefinition(
         bool? OverridesBuiltInTool = null,
         bool? SkipPermission = null,
         CopilotToolDefer? Defer = null,
-        IDictionary<string, JsonNode?>? Metadata = null)
+        IDictionary<string, JsonNode?>? Metadata = null,
+        bool? IsTerminal = null)
     {
         public static ToolDefinition FromAIFunction(AIFunctionDeclaration function)
         {
@@ -2798,11 +2954,13 @@ public static ToolDefinition FromAIFunction(AIFunctionDeclaration function)
             var skipPerm = function.AdditionalProperties.TryGetValue(CopilotTool.SkipPermissionKey, out var skipVal) && skipVal is true;
             var defer = function.AdditionalProperties.TryGetValue(CopilotTool.DeferKey, out var deferVal) && deferVal is CopilotToolDefer d ? d : (CopilotToolDefer?)null;
             var metadata = function.AdditionalProperties.TryGetValue(CopilotTool.MetadataKey, out var metaVal) && metaVal is IDictionary<string, JsonNode?> m ? m : null;
+            var isTerminal = function.AdditionalProperties.TryGetValue(CopilotTool.IsTerminalKey, out var terminalVal) && terminalVal is true;
             return new ToolDefinition(function.Name, function.Description, function.JsonSchema,
                 overrides ? true : null,
                 skipPerm ? true : null,
                 defer,
-                metadata);
+                metadata,
+                isTerminal ? true : null);
         }
     }
 
@@ -2823,6 +2981,7 @@ internal record ResumeSessionRequest(
         ContextTier? ContextTier,
         IList<ToolDefinition>? Tools,
         bool? EnableCitations,
+        bool? EnableFileChangeTracking,
         SystemMessageConfig? SystemMessage,
         IList<string>? AvailableTools,
         IList<string>? ExcludedTools,
@@ -2868,10 +3027,12 @@ internal record ResumeSessionRequest(
         string? Tracestate = null,
         ModelCapabilitiesOverride? ModelCapabilities = null,
         string? GitHubToken = null,
+        [property: JsonPropertyName("gitHubTokenProviderRegistrationId")] string? GitHubTokenProviderRegistrationId = null,
         RemoteSessionMode? RemoteSession = null,
         bool? ContinuePendingWork = null,
         IList<string>? InstructionDirectories = null,
         IList<string>? PluginDirectories = null,
+        [property: JsonPropertyName("disabledMcpServers")] IList<string>? DisabledMcpServers = null,
         LargeToolOutputConfig? LargeOutput = null,
         ToolSearchConfig? ToolSearch = null,
         MemoryConfiguration? Memory = null,
@@ -2888,6 +3049,7 @@ internal record ResumeSessionRequest(
         OptionsUpdateToolFilterPrecedence? ToolFilterPrecedence = null,
         [property: JsonPropertyName("expAssignments")] CopilotExpAssignmentResponse? ExpAssignments = null,
         [property: JsonPropertyName("enableManagedSettings")] bool? EnableManagedSettings = null,
+        [property: JsonPropertyName("managedSettings")] ManagedSettings? ManagedSettings = null,
         bool? EnableGitHubTelemetryForwarding = null,
         [property: JsonPropertyName("githubMcpToolConfig")] GitHubMcpToolConfig? GitHubMcpToolConfig = null,
         IList<string>? AdditionalDirectories = null);
@@ -2903,7 +3065,7 @@ internal record ResumeSessionResponse(
 
     internal record CommandWireDefinition(
         string Name,
-        string? Description);
+        string Description);
 
     internal record GetLastSessionIdResponse(
         string? SessionId);
@@ -2931,6 +3093,9 @@ internal record ConnectHandshakeRequest(
         string? Token,
         [property: JsonPropertyName("enableGitHubTelemetryForwarding")] bool? EnableGitHubTelemetryForwarding = null);
 
+    internal record BuiltinPluginDirectoriesRequest(
+        string[] Paths);
+
     internal record SetForegroundSessionRequest(
         string SessionId);
 
@@ -2966,6 +3131,7 @@ internal record HooksInvokeResponse(
     [JsonSerializable(typeof(GetSessionMetadataRequest))]
     [JsonSerializable(typeof(GetSessionMetadataResponse))]
     [JsonSerializable(typeof(ConnectHandshakeRequest))]
+    [JsonSerializable(typeof(BuiltinPluginDirectoriesRequest))]
     [JsonSerializable(typeof(McpOAuthTokenStorageMode))]
     [JsonSerializable(typeof(EmbeddingCacheStorageMode))]
     [JsonSerializable(typeof(ModelCapabilitiesOverride))]
diff --git a/dotnet/src/CopilotTool.cs b/dotnet/src/CopilotTool.cs
index e22296bccd..ca62ccc5d7 100644
--- a/dotnet/src/CopilotTool.cs
+++ b/dotnet/src/CopilotTool.cs
@@ -18,6 +18,9 @@ public static class CopilotTool
     /// <summary>The key used in <see cref="AITool.AdditionalProperties"/> to indicate that a tool can execute without a permission prompt.</summary>
     internal const string SkipPermissionKey = "skip_permission";
 
+    /// <summary>The key used in <see cref="AITool.AdditionalProperties"/> to indicate that a successful call to the tool ends the agent turn.</summary>
+    internal const string IsTerminalKey = "is_terminal";
+
     /// <summary>The key used in <see cref="AITool.AdditionalProperties"/> to carry the tool's <see cref="CopilotToolDefer"/> deferral mode.</summary>
     internal const string DeferKey = "defer";
 
@@ -91,7 +94,7 @@ static void ApplyToolInvocationBinding(AIFunctionFactoryOptions factoryOptions)
 
         static void ApplyToolOptions(AIFunctionFactoryOptions factoryOptions, CopilotToolOptions? toolOptions)
         {
-            if (toolOptions is not null && (toolOptions.OverridesBuiltInTool || toolOptions.SkipPermission || toolOptions.Defer is not null || toolOptions.Metadata is not null))
+            if (toolOptions is not null && (toolOptions.OverridesBuiltInTool || toolOptions.SkipPermission || toolOptions.IsTerminal || toolOptions.Defer is not null || toolOptions.Metadata is not null))
             {
                 Dictionary<string, object?> additionalProperties = new(StringComparer.Ordinal);
                 if (factoryOptions.AdditionalProperties is not null)
@@ -112,6 +115,11 @@ static void ApplyToolOptions(AIFunctionFactoryOptions factoryOptions, CopilotToo
                     additionalProperties[SkipPermissionKey] = true;
                 }
 
+                if (toolOptions.IsTerminal)
+                {
+                    additionalProperties[IsTerminalKey] = true;
+                }
+
                 if (toolOptions.Defer is { } defer)
                 {
                     additionalProperties[DeferKey] = defer;
@@ -152,6 +160,16 @@ public sealed class CopilotToolOptions
     /// </remarks>
     public bool SkipPermission { get; set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether a successful call to this tool ends the agent turn.
+    /// </summary>
+    /// <remarks>
+    /// When true, the runtime's tool phase halts after a successful call instead of feeding the result back to the
+    /// model for another round. A failed call leaves the loop running so the model can read the error and retry.
+    /// The resulting <see cref="AIFunction"/> includes "is_terminal": true in its <see cref="AITool.AdditionalProperties"/>.
+    /// </remarks>
+    public bool IsTerminal { get; set; }
+
     /// <summary>
     /// Gets or sets a value controlling whether this tool may be deferred (loaded lazily via tool search) rather than always pre-loaded.
     /// </summary>
diff --git a/dotnet/src/Generated/Rpc.cs b/dotnet/src/Generated/Rpc.cs
index 32778850b8..ba8b844d83 100644
--- a/dotnet/src/Generated/Rpc.cs
+++ b/dotnet/src/Generated/Rpc.cs
@@ -61,10 +61,35 @@ internal sealed class ConnectResult
     public string Version { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for the `server.connect` handshake: an optional connection token and optional connection-level opt-ins (e.g. GitHub telemetry forwarding).</summary>
+/// <summary>Identity of the integrating host, declared once on the `server.connect` handshake so telemetry from this connection is attributed to a single, consistent surface. All fields are optional; omit them to keep the default attribution.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ConnectClientInfo
+{
+    /// <summary>Name of the host editor, e.g. `"vscode"`.</summary>
+    [JsonPropertyName("editorName")]
+    public string? EditorName { get; set; }
+
+    /// <summary>Version of the host editor, e.g. `"1.124.2"`. Ignored unless it looks like a version string.</summary>
+    [JsonPropertyName("editorVersion")]
+    public string? EditorVersion { get; set; }
+
+    /// <summary>Name of the Copilot extension within the host, e.g. `"copilot-chat"`.</summary>
+    [JsonPropertyName("extensionName")]
+    public string? ExtensionName { get; set; }
+
+    /// <summary>Version of the Copilot extension within the host, e.g. `"0.54.0"`. Ignored unless it looks like a version string.</summary>
+    [JsonPropertyName("extensionVersion")]
+    public string? ExtensionVersion { get; set; }
+}
+
+/// <summary>Connection-level opt-ins for the `server.connect` handshake. Transport authentication is consumed by the native protocol boundary before dispatch.</summary>
 [Experimental(Diagnostics.Experimental)]
 internal sealed class ConnectRequest
 {
+    /// <summary>Identity of the integrating host. Optional; omit it to keep the default attribution.</summary>
+    [JsonPropertyName("clientInfo")]
+    public ConnectClientInfo? ClientInfo { get; set; }
+
     /// <summary>Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the runtime forwards every internal telemetry event it emits — across all sessions, plus sessionless events — to this connection over the `gitHubTelemetry.event` notification. Regular events are also written to the runtime's normal GitHub/CTS path (dual-write); host-only compatibility events are forward-only and intentionally skip that path. Intended for first-party hosts that re-emit the events into their own telemetry stores. Both unrestricted and restricted events are forwarded, each tagged with a `restricted` discriminator; a backstop drops restricted events when restricted telemetry is disabled — using the process-global gate for ordinary events and an explicit session-scoped decision for host-only events.</summary>
     [JsonPropertyName("enableGitHubTelemetryForwarding")]
     public bool? EnableGitHubTelemetryForwarding { get; set; }
@@ -111,6 +136,10 @@ public sealed class ModelBillingTokenPricesLongContext
     [JsonPropertyName("cacheReadPrice")]
     public double? CacheReadPrice { get; set; }
 
+    /// <summary>AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.</summary>
+    [JsonPropertyName("cacheWrite1hPrice")]
+    public double? CacheWrite1hPrice { get; set; }
+
     /// <summary>AI Credits cost per billing batch of cache-write (cache creation) tokens.</summary>
     [JsonPropertyName("cacheWritePrice")]
     public double? CacheWritePrice { get; set; }
@@ -156,6 +185,10 @@ public sealed class ModelBillingTokenPrices
     [JsonPropertyName("cacheReadPrice")]
     public double? CacheReadPrice { get; set; }
 
+    /// <summary>AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.</summary>
+    [JsonPropertyName("cacheWrite1hPrice")]
+    public double? CacheWrite1hPrice { get; set; }
+
     /// <summary>AI Credits cost per billing batch of cache-write (cache creation) tokens.</summary>
     [JsonPropertyName("cacheWritePrice")]
     public double? CacheWritePrice { get; set; }
@@ -274,6 +307,19 @@ public sealed class ModelCapabilities
     public ModelCapabilitiesSupports? Supports { get; set; }
 }
 
+/// <summary>A service-published message about a model, carrying a stable machine-readable code alongside human-readable text.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ModelMessage
+{
+    /// <summary>Stable machine-readable identifier for the message, such as `client_version_deprecated`. Hosts can key custom presentation off this; unrecognized codes should fall back to displaying `message`.</summary>
+    [JsonPropertyName("code")]
+    public string Code { get; set; } = string.Empty;
+
+    /// <summary>Human-readable message text intended for display to the user.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+}
+
 /// <summary>Policy state (if applicable).</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed class ModelPolicy
@@ -287,6 +333,15 @@ public sealed class ModelPolicy
     public string? Terms { get; set; }
 }
 
+/// <summary>Service-published warning text that hosts should display when presenting a model.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ModelWarningText
+{
+    /// <summary>Data-retention warning for the model. The text may contain Markdown links and should be rendered as Markdown when supported.</summary>
+    [JsonPropertyName("dataRetention")]
+    public string? DataRetention { get; set; }
+}
+
 /// <summary>Copilot model metadata, including identifier, display name, capabilities, policy, billing, reasoning efforts, and picker categories.</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed class Model
@@ -299,10 +354,18 @@ public sealed class Model
     [JsonPropertyName("capabilities")]
     public ModelCapabilities Capabilities { get => field ??= new(); set; }
 
+    /// <summary>Default reasoning effort level (only present if model supports reasoning effort).</summary>
+    [JsonPropertyName("defaultReasoningEffort")]
+    public string? DefaultReasoningEffort { get; set; }
+
     /// <summary>Model identifier (e.g., "claude-sonnet-4.5").</summary>
     [JsonPropertyName("id")]
     public string Id { get; set; } = string.Empty;
 
+    /// <summary>Informational notices the service published for this model, such as an upcoming change or a recommended alternative. Present only when the service published at least one notice. Hosts should surface these without implying anything is wrong with the model.</summary>
+    [JsonPropertyName("infoMessages")]
+    public IList<ModelMessage>? InfoMessages { get; set; }
+
     /// <summary>Model capability category for grouping in the model picker.</summary>
     [JsonPropertyName("modelPickerCategory")]
     public ModelPickerCategory? ModelPickerCategory { get; set; }
@@ -319,9 +382,21 @@ public sealed class Model
     [JsonPropertyName("policy")]
     public ModelPolicy? Policy { get; set; }
 
+    /// <summary>Context-window tiers this model offers, when the provider advertises them independently of tiered token pricing. Copilot models carry their tiers in `billing.tokenPrices`; a provider that has no pricing to publish (an agent host reached over AHP, for example) declares them here instead, so the model picker can still offer the tier toggle.</summary>
+    [JsonPropertyName("supportedContextTiers")]
+    public IList<string>? SupportedContextTiers { get; set; }
+
     /// <summary>Supported reasoning effort levels (only present if model supports reasoning effort).</summary>
     [JsonPropertyName("supportedReasoningEfforts")]
     public IList<string>? SupportedReasoningEfforts { get; set; }
+
+    /// <summary>Warnings the service published for this model, such as a deprecated client version. Present only when the service published at least one warning. The model remains usable; hosts should surface these as advisory rather than blocking.</summary>
+    [JsonPropertyName("warningMessages")]
+    public IList<ModelMessage>? WarningMessages { get; set; }
+
+    /// <summary>Warning text the service requires hosts to surface for this model. Present only when the service published at least one warning.</summary>
+    [JsonPropertyName("warningText")]
+    public ModelWarningText? WarningText { get; set; }
 }
 
 /// <summary>List of Copilot models available to the resolved user, including capabilities and billing metadata.</summary>
@@ -337,16 +412,20 @@ public sealed class ModelList
 [Experimental(Diagnostics.Experimental)]
 internal sealed class ModelsListRequest
 {
-    /// <summary>GitHub token for per-user model listing. When provided, resolves this token to determine the user's Copilot plan and available models instead of using the global auth.</summary>
+    /// <summary>GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account.</summary>
     [JsonPropertyName("gitHubToken")]
     public string? GitHubToken { get; set; }
+
+    /// <summary>Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used.</summary>
+    [JsonPropertyName("selectionId")]
+    public string? SelectionId { get; set; }
 }
 
 /// <summary>A well-known model in the runtime's built-in catalog.</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed class BuiltInModelCatalogEntry
 {
-    /// <summary>Well-known runtime model ID suitable for `ProviderConfig.modelId` or `ProviderModelConfig.modelId`. This is not necessarily the provider-facing deployment or model name and does not indicate CAPI entitlement or provider availability.</summary>
+    /// <summary>Well-known runtime model ID suitable for provider or provider-model metadata. This is not necessarily the provider-facing deployment or model name and does not indicate CAPI entitlement or provider availability.</summary>
     [JsonPropertyName("id")]
     public string Id { get; set; } = string.Empty;
 }
@@ -453,12 +532,16 @@ public sealed class AccountGetQuotaResult
 [Experimental(Diagnostics.Experimental)]
 internal sealed class AccountGetQuotaRequest
 {
-    /// <summary>GitHub token for per-user quota lookup. When provided, resolves this token to determine the user's quota instead of using the global auth.</summary>
+    /// <summary>GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account.</summary>
     [JsonPropertyName("gitHubToken")]
     public string? GitHubToken { get; set; }
+
+    /// <summary>Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used.</summary>
+    [JsonPropertyName("selectionId")]
+    public string? SelectionId { get; set; }
 }
 
-/// <summary>Initial authentication info for the session.</summary>
+/// <summary>Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
 [JsonPolymorphic(
@@ -467,6 +550,7 @@ internal sealed class AccountGetQuotaRequest
 [JsonDerivedType(typeof(AuthInfoHmac), "hmac")]
 [JsonDerivedType(typeof(AuthInfoEnv), "env")]
 [JsonDerivedType(typeof(AuthInfoToken), "token")]
+[JsonDerivedType(typeof(AuthInfoTokenProvider), "token-provider")]
 [JsonDerivedType(typeof(AuthInfoCopilotApiToken), "copilot-api-token")]
 [JsonDerivedType(typeof(AuthInfoUser), "user")]
 [JsonDerivedType(typeof(AuthInfoGhCli), "gh-cli")]
@@ -483,23 +567,23 @@ public partial class AuthInfo
 [Experimental(Diagnostics.Experimental)]
 public sealed class CopilotUserResponseEndpoints
 {
-    /// <summary>Gets or sets the <c>api</c> value.</summary>
+    /// <summary>Copilot API endpoint URL.</summary>
     [JsonPropertyName("api")]
     public string? Api { get; set; }
 
-    /// <summary>Gets or sets the <c>exp</c> value.</summary>
+    /// <summary>Experimental-service endpoint URL.</summary>
     [JsonPropertyName("exp")]
     public string? Exp { get; set; }
 
-    /// <summary>Gets or sets the <c>origin-tracker</c> value.</summary>
+    /// <summary>Origin-tracker endpoint URL.</summary>
     [JsonPropertyName("origin-tracker")]
     public string? OriginTracker { get; set; }
 
-    /// <summary>Gets or sets the <c>proxy</c> value.</summary>
+    /// <summary>Copilot proxy endpoint URL.</summary>
     [JsonPropertyName("proxy")]
     public string? Proxy { get; set; }
 
-    /// <summary>Gets or sets the <c>telemetry</c> value.</summary>
+    /// <summary>Copilot telemetry endpoint URL.</summary>
     [JsonPropertyName("telemetry")]
     public string? Telemetry { get; set; }
 }
@@ -507,11 +591,11 @@ public sealed class CopilotUserResponseEndpoints
 /// <summary>RPC data type for CopilotUserResponseOrganizationListItem operations.</summary>
 public sealed class CopilotUserResponseOrganizationListItem
 {
-    /// <summary>Gets or sets the <c>login</c> value.</summary>
+    /// <summary>GitHub login of the organization.</summary>
     [JsonPropertyName("login")]
     public string? Login { get; set; }
 
-    /// <summary>Gets or sets the <c>name</c> value.</summary>
+    /// <summary>Display name of the organization.</summary>
     [JsonPropertyName("name")]
     public string? Name { get; set; }
 }
@@ -801,7 +885,7 @@ public sealed class CopilotUserResponse
     public bool? TokenBasedBilling { get; set; }
 }
 
-/// <summary>Authentication-info variant for GitHub-internal HMAC auth, carrying the public GitHub host and HMAC secret.</summary>
+/// <summary>Authentication-info input variant for GitHub-internal HMAC auth, carrying the public GitHub host and HMAC secret.</summary>
 /// <remarks>The <c>hmac</c> variant of <see cref="AuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
 public partial class AuthInfoHmac : AuthInfo
@@ -824,7 +908,7 @@ public partial class AuthInfoHmac : AuthInfo
     public required string Host { get; set; }
 }
 
-/// <summary>Authentication-info variant for a token sourced from an environment variable, with host, optional login, token, and env var name.</summary>
+/// <summary>Authentication-info input variant for a token sourced from an environment variable, with host, optional login, token, and env var name.</summary>
 /// <remarks>The <c>env</c> variant of <see cref="AuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
 public partial class AuthInfoEnv : AuthInfo
@@ -856,7 +940,7 @@ public partial class AuthInfoEnv : AuthInfo
     public required string Token { get; set; }
 }
 
-/// <summary>Authentication-info variant for SDK-configured token authentication, carrying host and the secret token value.</summary>
+/// <summary>Authentication-info input variant for SDK-configured token authentication, carrying host and the secret token value.</summary>
 /// <remarks>The <c>token</c> variant of <see cref="AuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
 public partial class AuthInfoToken : AuthInfo
@@ -874,11 +958,39 @@ public partial class AuthInfoToken : AuthInfo
     [JsonPropertyName("host")]
     public required string Host { get; set; }
 
+    /// <summary>Opaque native GitHub credential registration backing this token identity, when applicable.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("registrationId")]
+    public string? RegistrationId { get; set; }
+
     /// <summary>The token value itself. Treat as a secret.</summary>
     [JsonPropertyName("token")]
     public required string Token { get; set; }
 }
 
+/// <summary>Authentication-info variant backed by an SDK GitHub token callback. It carries routing metadata but never a plaintext token.</summary>
+/// <remarks>The <c>token-provider</c> variant of <see cref="AuthInfo"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class AuthInfoTokenProvider : AuthInfo
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "token-provider";
+
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
+
+    /// <summary>Opaque SDK callback registration identifier.</summary>
+    [JsonPropertyName("registrationId")]
+    public required string RegistrationId { get; set; }
+}
+
 /// <summary>Authentication-info variant for direct Copilot API token auth sourced from environment variables, with public GitHub host.</summary>
 /// <remarks>The <c>copilot-api-token</c> variant of <see cref="AuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
@@ -921,7 +1033,7 @@ public partial class AuthInfoUser : AuthInfo
     public required string Login { get; set; }
 }
 
-/// <summary>Authentication-info variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.</summary>
+/// <summary>Authentication-info input variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.</summary>
 /// <remarks>The <c>gh-cli</c> variant of <see cref="AuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
 public partial class AuthInfoGhCli : AuthInfo
@@ -948,7 +1060,7 @@ public partial class AuthInfoGhCli : AuthInfo
     public required string Token { get; set; }
 }
 
-/// <summary>Authentication-info variant for API-key authentication to a non-GitHub LLM provider, carrying the secret `apiKey` and host.</summary>
+/// <summary>Authentication-info input variant for API-key authentication to a non-GitHub LLM provider, carrying the secret `apiKey` and host.</summary>
 /// <remarks>The <c>api-key</c> variant of <see cref="AuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
 public partial class AuthInfoApiKey : AuthInfo
@@ -984,7 +1096,7 @@ public sealed class AccountGetCurrentAuthResult
     public AuthInfo? AuthInfo { get; set; }
 }
 
-/// <summary>Authenticated account entry returned by `account.getAllUsers`, with auth info and an optional associated token.</summary>
+/// <summary>Authenticated account entry returned by `account.getAllUsers`.</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed class AccountAllUsers
 {
@@ -992,6 +1104,10 @@ public sealed class AccountAllUsers
     [JsonPropertyName("authInfo")]
     public AuthInfo AuthInfo { get => field ??= new(); set; }
 
+    /// <summary>Opaque identifier accepted by account and model selection APIs.</summary>
+    [JsonPropertyName("selectionId")]
+    public string? SelectionId { get; set; }
+
     /// <summary>Associated token, if available.</summary>
     [JsonPropertyName("token")]
     public string? Token { get; set; }
@@ -1006,7 +1122,7 @@ public sealed class AccountLoginResult
     public bool StoredInVault { get; set; }
 }
 
-/// <summary>Credentials to store after successful authentication.</summary>
+/// <summary>Credentials to validate and store. Omit login to resolve the authenticated user from the token.</summary>
 [Experimental(Diagnostics.Experimental)]
 internal sealed class AccountLoginRequest
 {
@@ -1014,9 +1130,9 @@ internal sealed class AccountLoginRequest
     [JsonPropertyName("host")]
     public string Host { get; set; } = string.Empty;
 
-    /// <summary>User login/username.</summary>
+    /// <summary>User login/username. When omitted, the runtime validates the token and resolves the login from GitHub.</summary>
     [JsonPropertyName("login")]
-    public string Login { get; set; } = string.Empty;
+    public string? Login { get; set; }
 
     /// <summary>GitHub authentication token.</summary>
     [JsonPropertyName("token")]
@@ -1038,7 +1154,11 @@ internal sealed class AccountLogoutRequest
 {
     /// <summary>Authentication information for the user to log out.</summary>
     [JsonPropertyName("authInfo")]
-    public AuthInfo AuthInfo { get => field ??= new(); set; }
+    public AuthInfo? AuthInfo { get; set; }
+
+    /// <summary>Opaque account identifier returned by `account.getAllUsers`.</summary>
+    [JsonPropertyName("selectionId")]
+    public string? SelectionId { get; set; }
 }
 
 /// <summary>Confirmation that the secret values were registered.</summary>
@@ -1109,10399 +1229,16644 @@ internal sealed class McpDiscoverRequest
     public string? WorkingDirectory { get; set; }
 }
 
-/// <summary>User-configured MCP servers, keyed by server name.</summary>
+/// <summary>Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpConfigList
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpPlanInstallResultPlanned), "planned")]
+[JsonDerivedType(typeof(McpPlanInstallResultNegotiationRefused), "negotiation-refused")]
+[JsonDerivedType(typeof(McpPlanInstallResultHandleRejected), "handle-rejected")]
+[JsonDerivedType(typeof(McpPlanInstallResultInvalidRequest), "invalid-request")]
+[JsonDerivedType(typeof(McpPlanInstallResultAuthenticationRequired), "authentication-required")]
+[JsonDerivedType(typeof(McpPlanInstallResultPolicyRejected), "policy-rejected")]
+[JsonDerivedType(typeof(McpPlanInstallResultNetworkFailure), "network-failure")]
+[JsonDerivedType(typeof(McpPlanInstallResultUnsafeRetrieval), "unsafe-retrieval")]
+[JsonDerivedType(typeof(McpPlanInstallResultMalformedCard), "malformed-card")]
+[JsonDerivedType(typeof(McpPlanInstallResultContractViolation), "contract-violation")]
+[JsonDerivedType(typeof(McpPlanInstallResultUnavailableTransport), "unavailable-transport")]
+[JsonDerivedType(typeof(McpPlanInstallResultNotInstallable), "not-installable")]
+[JsonDerivedType(typeof(McpPlanInstallResultUnavailable), "unavailable")]
+public partial class McpPlanInstallResult
 {
-    /// <summary>All MCP servers from user config, keyed by name.</summary>
-    [JsonPropertyName("servers")]
-    public IDictionary<string, JsonElement> Servers { get => field ??= new Dictionary<string, JsonElement>(); set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>MCP server name and configuration to add to user configuration.</summary>
+
+/// <summary>The protocol version and capability set the runtime actually honoured for a successful catalog operation.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpConfigAddRequest
+public sealed class CatalogNegotiatedContract
 {
-    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
-    [JsonPropertyName("config")]
-    public JsonElement Config { get; set; }
+    /// <summary>Wire features the runtime understood for this operation. Always a superset of the caller's required features, because any shortfall is a refusal instead. Operation availability remains a separate typed result.</summary>
+    [JsonPropertyName("grantedCapabilities")]
+    public IList<CatalogCapability> GrantedCapabilities { get => field ??= []; set; }
 
-    /// <summary>Unique name for the MCP server.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Protocol version of the runtime that served the request.</summary>
+    [JsonPropertyName("runtimeProtocolVersion")]
+    public long RuntimeProtocolVersion { get; set; }
 }
 
-/// <summary>MCP server name and replacement configuration to write to user configuration.</summary>
+/// <summary>One change applying the plan would make, described rather than serialised so the configuration payload stays behind the runtime boundary.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpConfigUpdateRequest
+public sealed class McpPlanConfigurationChange
 {
-    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
-    [JsonPropertyName("config")]
-    public JsonElement Config { get; set; }
+    /// <summary>Names of the configuration fields the change would set, without their values.</summary>
+    [JsonPropertyName("changedFields")]
+    public IList<string> ChangedFields { get => field ??= []; set; }
 
-    /// <summary>Name of the MCP server to update.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    /// <summary>Configuration key the change applies to.</summary>
     [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
     [MinLength(1)]
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    [JsonPropertyName("configKey")]
+    public string ConfigKey { get; set; } = string.Empty;
+
+    /// <summary>Whether the change would create a new entry or modify an existing one.</summary>
+    [JsonPropertyName("operation")]
+    public McpPlanConfigurationOperation Operation { get; set; }
+
+    /// <summary>Scope the change would be written to.</summary>
+    [JsonPropertyName("scope")]
+    public McpPlanScope Scope { get; set; }
+
+    /// <summary>Secret placeholders the written configuration would reference. The constrained placeholder type cannot carry a literal secret value.</summary>
+    [JsonPropertyName("secretReferences")]
+    public IList<string> SecretReferences { get => field ??= []; set; }
 }
 
-/// <summary>MCP server name to remove from user configuration.</summary>
+/// <summary>Normalised identity of the MCP server a plan targets, independent of how the card spelled it.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpConfigRemoveRequest
+public sealed class McpPlanResourceIdentity
 {
-    /// <summary>Name of the MCP server to remove.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    /// <summary>Canonical, normalised name of the server, for example `io.github.owner/server`.</summary>
     [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
     [MinLength(1)]
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-}
+    [JsonPropertyName("canonicalName")]
+    public string CanonicalName { get; set; } = string.Empty;
 
-/// <summary>MCP server names to enable for new sessions.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class McpConfigEnableRequest
-{
-    /// <summary>Names of MCP servers to enable. Each server is removed from the persisted disabled list so new sessions spawn it. Unknown or already-enabled names are ignored.</summary>
-    [JsonPropertyName("names")]
-    public IList<string> Names { get => field ??= []; set; }
+    /// <summary>Registry identifier of the server, when it came from a registry.</summary>
+    [JsonPropertyName("registryId")]
+    public string? RegistryId { get; set; }
+
+    /// <summary>Local configuration key the server would be recorded under.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Version advertised by the card, when it declares one.</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
 }
 
-/// <summary>MCP server names to disable for new sessions.</summary>
+/// <summary>Outcome of evaluating the planned server against registry and enterprise policy. Evaluation is read-only.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpConfigDisableRequest
+public sealed class McpPlanPolicyResult
 {
-    /// <summary>Names of MCP servers to disable. Each server is added to the persisted disabled list so new sessions skip it. Already-disabled names are ignored. Active sessions keep their current connections until they end.</summary>
-    [JsonPropertyName("names")]
-    public IList<string> Names { get => field ??= []; set; }
+    /// <summary>What policy decided for this server.</summary>
+    [JsonPropertyName("decision")]
+    public McpPlanPolicyDecision Decision { get; set; }
+
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
+
+    /// <summary>Which authority produced the decision.</summary>
+    [JsonPropertyName("source")]
+    public McpPlanPolicySource Source { get; set; }
 }
 
-/// <summary>Installed plugin that contributes a discovered extension.</summary>
+/// <summary>Semantic digest of a strictly parsed and schema-validated JSON MCP card. Both URL-backed and embedded cards are canonicalised with RFC 8785 JSON Canonicalization Scheme, encoded as UTF-8, and hashed with SHA-256.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class DiscoveredExtensionPlugin
+public sealed class CardDigest
 {
-    /// <summary>Installed plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Digest algorithm and canonical representation.</summary>
+    [JsonPropertyName("algorithm")]
+    public CardDigestAlgorithm Algorithm { get; set; }
+
+    /// <summary>SHA-256 digest of the RFC 8785 canonical UTF-8 bytes, encoded as exactly 64 lowercase hexadecimal characters.</summary>
+    [RegularExpression("^[0-9a-f]{64}$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(64)]
+    [MaxLength(64)]
+    [JsonPropertyName("value")]
+    public string Value { get; set; } = string.Empty;
 }
 
-/// <summary>Discovered extension metadata and persistent enablement state.</summary>
+/// <summary>Provenance of the exact validated JSON MCP card content bound privately to a completed plan and its opaque handle.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class DiscoveredExtension
+public sealed class McpPlanProvenance
 {
-    /// <summary>Whether this extension's persistent per-ID preference is enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Source-qualified ID accepted by both server and session extension enablement methods.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-
-    /// <summary>Human-readable extension name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Authority associated with the validated card, without path, query, or credentials. Inert untrusted data.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("authority")]
+    public string Authority { get; set; } = string.Empty;
 
-    /// <summary>Absolute path to the extension entry module, suitable for revealing it in a file manager.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Semantic digest of the exact validated JSON content bound to the plan handle.</summary>
+    [JsonPropertyName("cardDigest")]
+    public CardDigest CardDigest { get => field ??= new(); set; }
 
-    /// <summary>Containing plugin metadata for plugin-contributed extensions.</summary>
-    [JsonPropertyName("plugin")]
-    public DiscoveredExtensionPlugin? Plugin { get; set; }
+    /// <summary>JSON MCP media type the validated card was interpreted as.</summary>
+    [JsonPropertyName("mediaType")]
+    public McpServerCardMediaType MediaType { get; set; }
 
-    /// <summary>Discovery source.</summary>
-    [JsonPropertyName("source")]
-    public DiscoveredExtensionSource Source { get; set; }
+    /// <summary>ISO 8601 timestamp at which the runtime completed strict parsing and schema validation of the card content.</summary>
+    [JsonPropertyName("validatedAt")]
+    public string ValidatedAt { get; set; } = string.Empty;
 }
 
-/// <summary>Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.</summary>
+/// <summary>Where a plan would be written.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class DiscoveredExtensions
+public sealed class McpPlanTarget
 {
-    /// <summary>Discovered user and enabled installed-plugin extensions from persisted Copilot home state.</summary>
-    [JsonPropertyName("extensions")]
-    public IList<DiscoveredExtension> Extensions { get => field ??= []; set; }
+    /// <summary>Configuration key the server would be recorded under within that scope.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("configKey")]
+    public string ConfigKey { get; set; } = string.Empty;
 
-    /// <summary>Effective extension loading mode. Defaults to load_and_augment when unset.</summary>
-    [JsonPropertyName("mode")]
-    public DiscoveredExtensionMode Mode { get; set; }
+    /// <summary>Configuration scope the plan targets.</summary>
+    [JsonPropertyName("scope")]
+    public McpPlanScope Scope { get; set; }
 }
 
-/// <summary>Source-qualified extension identifiers to persistently enable for future sessions.</summary>
+/// <summary>One eligible way to run the server, represented as a tagged package or remote variant so package identity and endpoint states cannot contradict the install method.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>installMethod</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class DiscoveredExtensionsEnableRequest
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "installMethod",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpPlanTransportChoicePackage), "package")]
+[JsonDerivedType(typeof(McpPlanTransportChoiceRemote), "remote")]
+public partial class McpPlanTransportChoice
 {
-    /// <summary>Source-qualified user or plugin extension IDs to enable.</summary>
-    [JsonPropertyName("ids")]
-    public IList<string> Ids { get => field ??= []; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("installMethod")]
+    public virtual string InstallMethod { get; set; } = string.Empty;
 }
 
-/// <summary>Source-qualified extension identifiers to persistently disable for future sessions.</summary>
+
+/// <summary>One non-secret value a transport choice needs, represented as a scalar or enumerated variant so enum values cannot be missing or attached to another type.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class DiscoveredExtensionsDisableRequest
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpPlanRequiredValueScalar), "scalar")]
+[JsonDerivedType(typeof(McpPlanRequiredValueEnum), "enum")]
+public partial class McpPlanRequiredValue
 {
-    /// <summary>Source-qualified user or plugin extension IDs to disable.</summary>
-    [JsonPropertyName("ids")]
-    public IList<string> Ids { get => field ??= []; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Information about an installed plugin tracked in global state.</summary>
+
+/// <summary>One non-secret scalar value a transport choice needs before it can be applied.</summary>
+/// <remarks>The <c>scalar</c> variant of <see cref="McpPlanRequiredValue"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InstalledPluginInfo
+public partial class McpPlanRequiredValueScalar : McpPlanRequiredValue
 {
-    /// <summary>Opaque, stable hash identifying a direct (non-marketplace) install source. Present only for direct repo / URL / local installs; absent for marketplace plugins. Same source yields the same id; distinct sources never collide.</summary>
-    [JsonPropertyName("directSourceId")]
-    public string? DirectSourceId { get; set; }
-
-    /// <summary>Whether the plugin is currently enabled for new sessions.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "scalar";
 
-    /// <summary>Marketplace the plugin came from. Empty string ("") for direct repo / URL / local installs.</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
+    /// <summary>Where the value is applied when the server is launched.</summary>
+    [JsonPropertyName("category")]
+    public required McpPlanValueCategory Category { get; set; }
 
-    /// <summary>Plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Default supplied by the card, when the value can be resolved without input. Presence is the authoritative indication that a default exists. Inert untrusted data.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("defaultValue")]
+    public string? DefaultValue { get; set; }
 
-    /// <summary>Installed version (when reported by the plugin manifest).</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
-}
+    /// <summary>Human-readable explanation from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-/// <summary>Plugins installed in user/global state.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PluginListResult
-{
-    /// <summary>Installed plugins.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<InstalledPluginInfo> Plugins { get => field ??= []; set; }
-}
+    /// <summary>Whether the value may be supplied more than once.</summary>
+    [JsonPropertyName("isRepeated")]
+    public required bool IsRepeated { get; set; }
 
-/// <summary>Result of installing a plugin.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PluginInstallResult
-{
-    /// <summary>Set when the install path is deprecated (e.g. direct repo / URL / local installs). Callers should surface this to end users.</summary>
-    [JsonPropertyName("deprecationWarning")]
-    public string? DeprecationWarning { get; set; }
+    /// <summary>Key the value is supplied under. Inert untrusted data.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("key")]
+    public required string Key { get; set; }
 
-    /// <summary>The newly installed plugin's metadata.</summary>
-    [JsonPropertyName("plugin")]
-    public InstalledPluginInfo Plugin { get => field ??= new(); set; }
+    /// <summary>Whether the value must be present for the plan to be applicable.</summary>
+    [JsonPropertyName("required")]
+    public required bool Required { get; set; }
 
-    /// <summary>Optional post-install message provided by the plugin (e.g. setup instructions).</summary>
-    [JsonPropertyName("postInstallMessage")]
-    public string? PostInstallMessage { get; set; }
+    /// <summary>Human-readable label from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(200)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 
-    /// <summary>Number of skills discovered and installed from the plugin.</summary>
-    [JsonPropertyName("skillsInstalled")]
-    public long SkillsInstalled { get; set; }
+    /// <summary>Scalar type the value must conform to.</summary>
+    [JsonPropertyName("valueType")]
+    public required McpPlanScalarValueType ValueType { get; set; }
 }
 
-/// <summary>Plugin source and optional working directory for relative-path resolution.</summary>
+/// <summary>One enumerated non-secret value a transport choice needs before it can be applied. The permitted values are structurally required.</summary>
+/// <remarks>The <c>enum</c> variant of <see cref="McpPlanRequiredValue"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsInstallRequest
+public partial class McpPlanRequiredValueEnum : McpPlanRequiredValue
 {
-    /// <summary>Plugin install spec. Accepts the same forms as the CLI: "plugin@marketplace" (marketplace install), "owner/repo" or "owner/repo:subpath" (GitHub direct), an http/https/ssh URL, or a local path. Direct (non-marketplace) installs are deprecated and will produce a deprecationWarning in the result.</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
-
-    /// <summary>Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "enum";
+
+    /// <summary>Where the value is applied when the server is launched.</summary>
+    [JsonPropertyName("category")]
+    public required McpPlanValueCategory Category { get; set; }
+
+    /// <summary>Default supplied by the card, when the value can be resolved without input. Presence is the authoritative indication that a default exists. Inert untrusted data.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("defaultValue")]
+    public string? DefaultValue { get; set; }
+
+    /// <summary>Human-readable explanation from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Non-empty permitted value set. Inert untrusted data.</summary>
+    [JsonPropertyName("enumValues")]
+    public required IList<string> EnumValues { get; set; }
+
+    /// <summary>Whether the value may be supplied more than once.</summary>
+    [JsonPropertyName("isRepeated")]
+    public required bool IsRepeated { get; set; }
+
+    /// <summary>Key the value is supplied under. Inert untrusted data.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("key")]
+    public required string Key { get; set; }
+
+    /// <summary>Whether the value must be present for the plan to be applicable.</summary>
+    [JsonPropertyName("required")]
+    public required bool Required { get; set; }
+
+    /// <summary>Human-readable label from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(200)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    /// <summary>Discriminator: the value must be one of `enumValues`.</summary>
+    [JsonPropertyName("valueType")]
+    public required McpPlanEnumValueType ValueType { get; set; }
 }
 
-/// <summary>Name (or spec) of the plugin to uninstall.</summary>
+/// <summary>A secret a transport choice needs, referenced by placeholder. No secret value ever appears in a plan, and the placeholder resolves against the keychain only when a plan is applied.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsUninstallRequest
+public sealed class McpPlanSecretPlaceholder
 {
-    /// <summary>Stable source identity for a direct (non-marketplace) install. Disambiguates uninstall when multiple installed plugins share the same name.</summary>
-    [JsonPropertyName("directSourceId")]
-    public string? DirectSourceId { get; set; }
+    /// <summary>Key the secret is supplied under. Inert untrusted data.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
 
-    /// <summary>Plugin name or "plugin@marketplace" spec to uninstall. When ambiguous, prefer the fully-qualified spec.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>The runtime-assigned `${secret:&lt;id&gt;}` placeholder written into configuration in place of the value.</summary>
+    [JsonPropertyName("placeholder")]
+    public string Placeholder { get; set; } = string.Empty;
+
+    /// <summary>Human-readable label from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(200)]
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 }
 
-/// <summary>Result of updating a single plugin.</summary>
+/// <summary>An eligible local-package transport choice. Package identity is required and a remote endpoint cannot be represented.</summary>
+/// <remarks>The <c>package</c> variant of <see cref="McpPlanTransportChoice"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PluginUpdateResult
+public partial class McpPlanTransportChoicePackage : McpPlanTransportChoice
 {
-    /// <summary>Version after the update, when reported by the plugin manifest.</summary>
-    [JsonPropertyName("newVersion")]
-    public string? NewVersion { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string InstallMethod => "package";
 
-    /// <summary>Version that was previously installed, when available.</summary>
-    [JsonPropertyName("previousVersion")]
-    public string? PreviousVersion { get; set; }
+    /// <summary>Stable identifier for this choice within the plan, used to select it when the plan is applied.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(128)]
+    [JsonPropertyName("choiceId")]
+    public required string ChoiceId { get; set; }
 
-    /// <summary>Number of skills discovered and installed after the update.</summary>
-    [JsonPropertyName("skillsInstalled")]
-    public long SkillsInstalled { get; set; }
+    /// <summary>Package identifier. Inert untrusted data.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(512)]
+    [JsonPropertyName("packageIdentifier")]
+    public required string PackageIdentifier { get; set; }
+
+    /// <summary>Packaging ecosystem, for example `oci` or `npm`.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(64)]
+    [JsonPropertyName("packageType")]
+    public required string PackageType { get; set; }
+
+    /// <summary>Typed values this choice requires, excluding secrets.</summary>
+    [JsonPropertyName("requiredValues")]
+    public required IList<McpPlanRequiredValue> RequiredValues { get; set; }
+
+    /// <summary>Secrets this choice requires, referenced by placeholder only.</summary>
+    [JsonPropertyName("secretPlaceholders")]
+    public required IList<McpPlanSecretPlaceholder> SecretPlaceholders { get; set; }
+
+    /// <summary>Local process transport this package choice would use.</summary>
+    [JsonPropertyName("transport")]
+    public required McpPlanPackageTransport Transport { get; set; }
 }
 
-/// <summary>Name (or spec) of the plugin to update.</summary>
+/// <summary>An eligible remote-endpoint transport choice. The endpoint is required and package identity cannot be represented.</summary>
+/// <remarks>The <c>remote</c> variant of <see cref="McpPlanTransportChoice"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsUpdateRequest
+public partial class McpPlanTransportChoiceRemote : McpPlanTransportChoice
 {
-    /// <summary>Plugin name or "plugin@marketplace" spec to update.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string InstallMethod => "remote";
+
+    /// <summary>Stable identifier for this choice within the plan, used to select it when the plan is applied.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(128)]
+    [JsonPropertyName("choiceId")]
+    public required string ChoiceId { get; set; }
+
+    /// <summary>Endpoint URL. Inert untrusted data.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(2048)]
+    [JsonPropertyName("endpoint")]
+    public required string Endpoint { get; set; }
+
+    /// <summary>Typed values this choice requires, excluding secrets.</summary>
+    [JsonPropertyName("requiredValues")]
+    public required IList<McpPlanRequiredValue> RequiredValues { get; set; }
+
+    /// <summary>Secrets this choice requires, referenced by placeholder only.</summary>
+    [JsonPropertyName("secretPlaceholders")]
+    public required IList<McpPlanSecretPlaceholder> SecretPlaceholders { get; set; }
+
+    /// <summary>Endpoint transport this remote choice would use.</summary>
+    [JsonPropertyName("transport")]
+    public required McpPlanRemoteTransport Transport { get; set; }
 }
 
-/// <summary>Per-plugin result from updating all plugins, with versions, skills installed, success flag, and optional error.</summary>
+/// <summary>A normalised, inert description of what installing an MCP server would involve. Carries no raw card, no install specification, and no secret value.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PluginUpdateAllEntry
+public sealed class McpInstallPlan
 {
-    /// <summary>Error message (failure only).</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>The configuration changes installing would make, described rather than serialised, so the mutable configuration payload stays behind the runtime boundary.</summary>
+    [JsonPropertyName("configurationChanges")]
+    public IList<McpPlanConfigurationChange> ConfigurationChanges { get => field ??= []; set; }
 
-    /// <summary>Marketplace the plugin came from. Empty string ("") for direct installs.</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
+    /// <summary>Normalised identity of the server the plan would install.</summary>
+    [JsonPropertyName("identity")]
+    public McpPlanResourceIdentity Identity { get => field ??= new(); set; }
 
-    /// <summary>Plugin name that was updated.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Opaque, runtime-instance scoped, TTL-bound, single-use handle for this plan. Rejected when stale, replayed, or presented to a different runtime instance. Never logged.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("planHandle")]
+    public string PlanHandle { get; set; } = string.Empty;
 
-    /// <summary>Version after the update, when available.</summary>
-    [JsonPropertyName("newVersion")]
-    public string? NewVersion { get; set; }
+    /// <summary>ISO 8601 timestamp after which the plan handle is stale and will be rejected. Abandoning a plan needs no call: an unused handle simply expires, so cancellation before commit is side-effect free.</summary>
+    [JsonPropertyName("planHandleExpiresAt")]
+    public string PlanHandleExpiresAt { get; set; } = string.Empty;
 
-    /// <summary>Previously installed version, when available.</summary>
-    [JsonPropertyName("previousVersion")]
-    public string? PreviousVersion { get; set; }
+    /// <summary>Outcome of evaluating the server against registry and enterprise policy.</summary>
+    [JsonPropertyName("policy")]
+    public McpPlanPolicyResult Policy { get => field ??= new(); set; }
 
-    /// <summary>Number of skills installed after the update (success only).</summary>
-    [JsonPropertyName("skillsInstalled")]
-    public long? SkillsInstalled { get; set; }
+    /// <summary>Origin and semantic digest of the exact validated JSON MCP card content bound to this plan.</summary>
+    [JsonPropertyName("provenance")]
+    public McpPlanProvenance Provenance { get => field ??= new(); set; }
 
-    /// <summary>Whether the update succeeded for this plugin.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
-}
+    /// <summary>Identifier of the choice the runtime would pick by default. Omitted when there is no eligible transport, or when the runtime expresses no preference.</summary>
+    [JsonPropertyName("recommendedTransportChoiceId")]
+    public string? RecommendedTransportChoiceId { get; set; }
 
-/// <summary>Result of updating all installed plugins.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PluginUpdateAllResult
-{
-    /// <summary>Per-plugin update results in deterministic order.</summary>
-    [JsonPropertyName("results")]
-    public IList<PluginUpdateAllEntry> Results { get => field ??= []; set; }
+    /// <summary>Whether applying this plan would require an MCP reload to take effect. Planning itself never reloads.</summary>
+    [JsonPropertyName("reloadRequired")]
+    public bool ReloadRequired { get; set; }
+
+    /// <summary>Whether the plan cannot be applied without further input, because a required value has no default or a secret must be supplied.</summary>
+    [JsonPropertyName("requiresInteractiveConfiguration")]
+    public bool RequiresInteractiveConfiguration { get; set; }
+
+    /// <summary>Configuration scope and key the plan would write to.</summary>
+    [JsonPropertyName("target")]
+    public McpPlanTarget Target { get => field ??= new(); set; }
+
+    /// <summary>Every eligible transport, so a host can present an explicit choice. A completed plan always has at least one; when none is eligible, planning returns `CatalogUnavailableTransportError` instead.</summary>
+    [JsonPropertyName("transportChoices")]
+    public IList<McpPlanTransportChoice> TransportChoices { get => field ??= []; set; }
 }
 
-/// <summary>Plugin names (or specs) to enable.</summary>
+/// <summary>A computed MCP install plan. Nothing has been applied: the plan describes what installing would change, and the plan handle is what a later apply operation would consume.</summary>
+/// <remarks>The <c>planned</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsEnableRequest
+public partial class McpPlanInstallResultPlanned : McpPlanInstallResult
 {
-    /// <summary>Plugin names or "plugin@marketplace" specs to enable. Unknown names are ignored. Non-marketplace direct installs are always enabled and cannot be toggled via this API.</summary>
-    [JsonPropertyName("names")]
-    public IList<string> Names { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "planned";
+
+    /// <summary>Protocol version and capabilities the runtime honoured.</summary>
+    [JsonPropertyName("negotiated")]
+    public required CatalogNegotiatedContract Negotiated { get; set; }
+
+    /// <summary>The normalised plan.</summary>
+    [JsonPropertyName("plan")]
+    public required McpInstallPlan Plan { get; set; }
 }
 
-/// <summary>Plugin names (or specs) to disable.</summary>
+/// <summary>The caller's protocol version or required capabilities cannot be honoured. Returned instead of a partial or ambiguous success.</summary>
+/// <remarks>The <c>negotiation-refused</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsDisableRequest
+public partial class McpPlanInstallResultNegotiationRefused : McpPlanInstallResult
 {
-    /// <summary>Plugin names or "plugin@marketplace" specs to disable. Unknown names are ignored. Non-marketplace direct installs cannot be disabled via this API; uninstall them instead. Plugin-owned MCP servers are stopped in active sessions immediately; other plugin contributions remain available until each session reloads plugins.</summary>
-    [JsonPropertyName("names")]
-    public IList<string> Names { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "negotiation-refused";
+
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Lowest caller protocol version this runtime will serve.</summary>
+    [JsonPropertyName("minimumSupportedProtocolVersion")]
+    public required long MinimumSupportedProtocolVersion { get; set; }
+
+    /// <summary>Whether the version or the capability set was the problem.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogNegotiationRefusedReason Reason { get; set; }
+
+    /// <summary>Protocol version of the runtime that refused the request.</summary>
+    [JsonPropertyName("runtimeProtocolVersion")]
+    public required long RuntimeProtocolVersion { get; set; }
+
+    /// <summary>Every wire feature this runtime understands, so the caller can retry within that contract. This list does not imply that every deployment has enabled every operation.</summary>
+    [JsonPropertyName("supportedCapabilities")]
+    public required IList<CatalogCapability> SupportedCapabilities { get; set; }
+
+    /// <summary>The subset of the caller's bounded extensible capability identifiers this runtime cannot honour.</summary>
+    [JsonPropertyName("unsupportedCapabilities")]
+    public required IList<string> UnsupportedCapabilities { get; set; }
 }
 
-/// <summary>Registered marketplace summary.</summary>
+/// <summary>A presented handle was not accepted. Handles are runtime-instance scoped, TTL-bound, and single-use, so each way of failing is reported distinctly.</summary>
+/// <remarks>The <c>handle-rejected</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceInfo
+public partial class McpPlanInstallResultHandleRejected : McpPlanInstallResult
 {
-    /// <summary>True when this is a default marketplace shipped with the runtime. Defaults are not removable.</summary>
-    [JsonPropertyName("isDefault")]
-    public bool? IsDefault { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "handle-rejected";
 
-    /// <summary>Marketplace name (matches the @marketplace suffix in plugin specs).</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Which kind of handle was presented.</summary>
+    [JsonPropertyName("handleType")]
+    public required CatalogHandleType HandleType { get; set; }
 
-    /// <summary>Human-readable description of where the marketplace data is fetched from (e.g. "GitHub: owner/repo").</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
+    /// <summary>Human-readable explanation, safe to surface. Never contains the handle itself, nor a query, URL, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Why the handle was rejected.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogHandleRejectionReason Reason { get; set; }
 }
 
-/// <summary>All registered marketplaces, including built-in defaults.</summary>
+/// <summary>The request was rejected before any work was done, because a bounded field fell outside its permitted range or a required field was unusable.</summary>
+/// <remarks>The <c>invalid-request</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceListResult
+public partial class McpPlanInstallResultInvalidRequest : McpPlanInstallResult
 {
-    /// <summary>Registered marketplaces.</summary>
-    [JsonPropertyName("marketplaces")]
-    public IList<MarketplaceInfo> Marketplaces { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "invalid-request";
+
+    /// <summary>Which request field was rejected.</summary>
+    [JsonPropertyName("field")]
+    public required CatalogInvalidRequestField Field { get; set; }
+
+    /// <summary>Human-readable explanation, safe to surface. Never echoes the offending value, nor a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 }
 
-/// <summary>Result of registering a new marketplace.</summary>
+/// <summary>An optional catalog authentication exchange did not establish the caller's identity. Anonymous search remains supported; this refusal is reserved for an operation that cannot continue after the attempted exchange. It is distinct from `policy-rejected` and from a network failure, and the reason identifies the recovery action.</summary>
+/// <remarks>The <c>authentication-required</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceAddResult
+public partial class McpPlanInstallResultAuthenticationRequired : McpPlanInstallResult
 {
-    /// <summary>Final name of the marketplace as resolved from its manifest.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "authentication-required";
+
+    /// <summary>Human-readable explanation, safe to surface. Never contains a credential or token, nor a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Why authentication failed. Only an expired credential justifies attempting a silent refresh; an absent or rejected credential requires sign-in.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogAuthenticationRequiredReason Reason { get; set; }
 }
 
-/// <summary>Marketplace source and optional working directory for relative-path resolution.</summary>
+/// <summary>Registry or enterprise policy refused the operation.</summary>
+/// <remarks>The <c>policy-rejected</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesAddRequest
+public partial class McpPlanInstallResultPolicyRejected : McpPlanInstallResult
 {
-    /// <summary>Marketplace source. Accepts the same forms as the CLI: "owner/repo" or "owner/repo#ref" (GitHub), an http/https/ssh URL (optionally with #ref), a git scp-style URL (user@host:path), or a local path. The marketplace's own name (from its manifest) is used as the registration key.</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "policy-rejected";
 
-    /// <summary>Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Which authority produced the decision.</summary>
+    [JsonPropertyName("source")]
+    public required McpPlanPolicySource Source { get; set; }
 }
 
-/// <summary>Outcome of the remove attempt, including dependent-plugin info when applicable.</summary>
+/// <summary>The runtime could not reach the catalog authority or retrieve a card. Covers being offline as well as transport-level failure.</summary>
+/// <remarks>The <c>network-failure</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceRemoveResult
+public partial class McpPlanInstallResultNetworkFailure : McpPlanInstallResult
 {
-    /// <summary>Names of installed plugins that prevented removal. Populated only when `removed=false`.</summary>
-    [JsonPropertyName("dependentPlugins")]
-    public IList<string>? DependentPlugins { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "network-failure";
 
-    /// <summary>True when the marketplace was actually removed. False when removal was skipped because the marketplace has dependent plugins and `force` was not set.</summary>
-    [JsonPropertyName("removed")]
-    public bool Removed { get; set; }
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Categorised failure, low cardinality so it can be aggregated without carrying a URL.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogNetworkFailureReason Reason { get; set; }
+
+    /// <summary>HTTP status code, when the failure was a rejected response.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("statusCode")]
+    public int? StatusCode { get; set; }
 }
 
-/// <summary>Name of the marketplace to remove and an optional force flag.</summary>
+/// <summary>Retrieval was refused by the runtime's hardened fetch boundary before any request left the process, or before a redirect was followed.</summary>
+/// <remarks>The <c>unsafe-retrieval</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesRemoveRequest
+public partial class McpPlanInstallResultUnsafeRetrieval : McpPlanInstallResult
 {
-    /// <summary>When true, also uninstall every plugin sourced from this marketplace. When false (default), removal is a no-op if any plugin from this marketplace is installed and the dependent plugin names are returned in the result.</summary>
-    [JsonPropertyName("force")]
-    public bool? Force { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unsafe-retrieval";
 
-    /// <summary>Marketplace name to remove.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Human-readable explanation, safe to surface. Never contains the refused URL, nor a query, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Which control refused the retrieval, low cardinality so it can be aggregated without carrying a URL.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogUnsafeRetrievalReason Reason { get; set; }
 }
 
-/// <summary>Plugin entry advertised by a marketplace.</summary>
+/// <summary>A card could not be parsed or did not satisfy its declared media type's schema.</summary>
+/// <remarks>The <c>malformed-card</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MarketplacePluginInfo
+public partial class McpPlanInstallResultMalformedCard : McpPlanInstallResult
 {
-    /// <summary>Short description from the marketplace catalog, when present.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "malformed-card";
 
-    /// <summary>Plugin name as listed in the marketplace catalog.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Media type the card was interpreted as, when it declared one this runtime recognises.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mediaType")]
+    public CatalogMediaType? MediaType { get; set; }
+
+    /// <summary>Human-readable explanation, safe to surface. Never echoes card content, nor a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>How the card failed validation.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogMalformedCardReason Reason { get; set; }
 }
 
-/// <summary>Plugins advertised by the marketplace.</summary>
+/// <summary>An upstream catalog response broke the wire contract. Most importantly, every result must carry exactly one of a URL or embedded data: a result carrying both, or neither, is refused here rather than being guessed at.</summary>
+/// <remarks>The <c>contract-violation</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceBrowseResult
+public partial class McpPlanInstallResultContractViolation : McpPlanInstallResult
 {
-    /// <summary>Plugins advertised by the marketplace.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<MarketplacePluginInfo> Plugins { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "contract-violation";
+
+    /// <summary>Human-readable explanation, safe to surface. Never echoes response content, nor a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Which rule the response broke.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogContractViolationReason Reason { get; set; }
 }
 
-/// <summary>Name of the marketplace whose plugin catalog to fetch.</summary>
+/// <summary>No transport this runtime can use is available for the requested server.</summary>
+/// <remarks>The <c>unavailable-transport</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesBrowseRequest
+public partial class McpPlanInstallResultUnavailableTransport : McpPlanInstallResult
 {
-    /// <summary>Marketplace name to browse.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unavailable-transport";
+
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Why no transport could be offered.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogUnavailableTransportReason Reason { get; set; }
 }
 
-/// <summary>Per-marketplace refresh result, including marketplace name, success flag, and optional failure error.</summary>
+/// <summary>The candidate is discoverable but cannot be installed. `application/ai-skill` resolves here, because it stays searchable while remaining typed non-installable.</summary>
+/// <remarks>The <c>not-installable</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceRefreshEntry
+public partial class McpPlanInstallResultNotInstallable : McpPlanInstallResult
 {
-    /// <summary>Error message (failure only).</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "not-installable";
 
-    /// <summary>Marketplace name that was refreshed.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 
-    /// <summary>Whether the refresh succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Why the candidate cannot be installed.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogNotInstallableReason Reason { get; set; }
 }
 
-/// <summary>Result of refreshing one or more marketplace catalogs.</summary>
+/// <summary>The operation is not available on this runtime. Distinct from a network failure: nothing was attempted.</summary>
+/// <remarks>The <c>unavailable</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceRefreshResult
+public partial class McpPlanInstallResultUnavailable : McpPlanInstallResult
 {
-    /// <summary>Per-marketplace refresh results in deterministic order.</summary>
-    [JsonPropertyName("results")]
-    public IList<MarketplaceRefreshEntry> Results { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unavailable";
+
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Why the operation is unavailable.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogUnavailableReason Reason { get; set; }
 }
 
-/// <summary>RPC data type for PluginsMarketplacesRefresh operations.</summary>
+/// <summary>The protocol version and capability set a caller requires, supplied on every catalog request so negotiation cannot be skipped by omission.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesRefreshRequest
+public sealed class CatalogClientContract
 {
-    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>SDK protocol version the caller was generated against. A caller below the runtime's minimum supported version is refused rather than served a partial result.</summary>
+    [JsonPropertyName("protocolVersion")]
+    public long ProtocolVersion { get; set; }
+
+    /// <summary>Wire features the caller requires the runtime to understand. Identifiers are bounded but extensible so a newer caller can negotiate with an older runtime. Requiring an unknown feature yields a typed refusal listing what is understood, never a partial grant. A grant does not promise that a deployment has enabled the operation; typed unavailable results report that separately.</summary>
+    [JsonPropertyName("requiredCapabilities")]
+    public IList<string> RequiredCapabilities { get => field ??= []; set; }
 }
 
-/// <summary>Server-side skill metadata, including name, description, source, enabled/invocable state, path, project path, and argument hint.</summary>
+/// <summary>What an install plan is computed from: a candidate handle from a previous search, or a card supplied directly.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ServerSkill
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpPlanInstallSourceCandidate), "candidate")]
+[JsonDerivedType(typeof(McpPlanInstallSourceCard), "card")]
+public partial class McpPlanInstallSource
 {
-    /// <summary>Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field.</summary>
-    [JsonPropertyName("argumentHint")]
-    public string? ArgumentHint { get; set; }
-
-    /// <summary>Description of what the skill does.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Whether the skill is currently enabled (based on global config).</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Unique identifier for the skill.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
 
-    /// <summary>Absolute path to the skill file.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
 
-    /// <summary>The project path this skill belongs to (only for project/inherited skills).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+/// <summary>Plan from a candidate returned by a previous catalog search.</summary>
+/// <remarks>The <c>candidate</c> variant of <see cref="McpPlanInstallSource"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class McpPlanInstallSourceCandidate : McpPlanInstallSource
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "candidate";
 
-    /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
-    [JsonPropertyName("source")]
-    public SkillSource Source { get; set; }
+    /// <summary>Single-use candidate handle. Consumed by this call, so a replay of the same handle is rejected.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(256)]
+    [JsonPropertyName("candidateHandle")]
+    public required string CandidateHandle { get; set; }
 
-    /// <summary>Whether the skill can be invoked by the user as a slash command.</summary>
-    [JsonPropertyName("userInvocable")]
-    public bool UserInvocable { get; set; }
+    /// <summary>The runtime- or authority-minted `searchId` returned with the search that produced this candidate. A search implementation binds it to private candidate-handle context; a planning implementation must verify that context before returning a plan. The unavailable planning implementation in this contract layer validates presence but does not claim the verification has occurred. It identifies a search rather than a person and must never be joined with user identity to re-identify anyone.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(64)]
+    [JsonPropertyName("searchId")]
+    public required string SearchId { get; set; }
 }
 
-/// <summary>Skills discovered across global and project sources.</summary>
+/// <summary>A card supplied directly by the caller. Exactly one of a URL or embedded data, encoded structurally so neither both nor neither can be expressed.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ServerSkillList
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpServerCardReferenceUrl), "url")]
+[JsonDerivedType(typeof(McpServerCardReferenceEmbedded), "embedded")]
+public partial class McpServerCardReference
 {
-    /// <summary>Messages for skills that failed to load (e.g. malformed SKILL.md). Empty when host skills are excluded so host-local paths are not disclosed to multitenant callers.</summary>
-    [JsonPropertyName("errors")]
-    public IList<string>? Errors { get; set; }
-
-    /// <summary>All discovered skills across all sources.</summary>
-    [JsonPropertyName("skills")]
-    public IList<ServerSkill> Skills { get => field ??= []; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Optional project paths and additional skill directories to include in discovery.</summary>
+
+/// <summary>An MCP server card to be retrieved from a URL through the runtime's hardened fetch boundary.</summary>
+/// <remarks>The <c>url</c> variant of <see cref="McpServerCardReference"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SkillsDiscoverRequest
+public partial class McpServerCardReferenceUrl : McpServerCardReference
 {
-    /// <summary>When true, omit skills from the host's global sources (personal, custom, plugin, and built-in), returning only project-scoped skills. For multitenant deployments.</summary>
-    [JsonPropertyName("excludeHostSkills")]
-    public bool? ExcludeHostSkills { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "url";
 
-    /// <summary>Optional list of project directory paths to scan for project-scoped skills.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Media type the card is expected to conform to.</summary>
+    [JsonPropertyName("mediaType")]
+    public required McpServerCardMediaType MediaType { get; set; }
 
-    /// <summary>Optional list of additional skill directory paths to include.</summary>
-    [JsonPropertyName("skillDirectories")]
-    public IList<string>? SkillDirectories { get; set; }
+    /// <summary>Card URL. Retrieved only through the runtime's hardened boundary, with scheme, credential, address-range, redirect, timeout, and response-size controls applied. Never logged.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(2048)]
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
 }
 
-/// <summary>Canonical directory where skills can be discovered or created, with scope, preference, and optional project path.</summary>
+/// <summary>An MCP server card supplied inline as an inert document.</summary>
+/// <remarks>The <c>embedded</c> variant of <see cref="McpServerCardReference"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SkillDiscoveryPath
+public partial class McpServerCardReferenceEmbedded : McpServerCardReference
 {
-    /// <summary>Absolute path of the create/discovery target (may not exist on disk yet).</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-
-    /// <summary>Whether this is the canonical directory to create a new skill in its tier. At most one entry per tier is preferred; the `personal-agents` and `custom` scopes are never preferred.</summary>
-    [JsonPropertyName("preferredForCreation")]
-    public bool PreferredForCreation { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "embedded";
 
-    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+    /// <summary>The card document verbatim, treated as inert untrusted bytes. The runtime parses and validates it; the host is not expected to interpret it. Never logged.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(1048576)]
+    [JsonPropertyName("data")]
+    public required string Data { get; set; }
 
-    /// <summary>Which tier this directory belongs to.</summary>
-    [JsonPropertyName("scope")]
-    public SkillDiscoveryScope Scope { get; set; }
+    /// <summary>Media type the card is expected to conform to.</summary>
+    [JsonPropertyName("mediaType")]
+    public required McpServerCardMediaType MediaType { get; set; }
 }
 
-/// <summary>Canonical locations where skills can be created so the runtime will recognize them.</summary>
+/// <summary>Plan from a card supplied directly by the caller, without a preceding search.</summary>
+/// <remarks>The <c>card</c> variant of <see cref="McpPlanInstallSource"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SkillDiscoveryPathList
+public partial class McpPlanInstallSourceCard : McpPlanInstallSource
 {
-    /// <summary>Canonical skill create/discovery directories, in priority order.</summary>
-    [JsonPropertyName("paths")]
-    public IList<SkillDiscoveryPath> Paths { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "card";
+
+    /// <summary>The card to plan from: exactly one of a URL or embedded data.</summary>
+    [JsonPropertyName("card")]
+    public required McpServerCardReference Card { get; set; }
 }
 
-/// <summary>Optional project paths to enumerate.</summary>
+/// <summary>A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SkillsGetDiscoveryPathsRequest
+internal sealed class McpPlanInstallRequest
 {
-    /// <summary>When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments.</summary>
-    [JsonPropertyName("excludeHostSkills")]
-    public bool? ExcludeHostSkills { get; set; }
+    /// <summary>Protocol version and capabilities the caller requires.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Configuration scope the plan targets. Defaults to user scope when omitted.</summary>
+    [JsonPropertyName("scope")]
+    public McpPlanScope? Scope { get; set; }
+
+    /// <summary>What to plan: either a candidate handle from a previous search, or a card supplied directly.</summary>
+    [JsonPropertyName("source")]
+    public McpPlanInstallSource Source { get => field ??= new(); set; }
 }
 
-/// <summary>Skill names to mark as disabled in global configuration, replacing any previous list.</summary>
+/// <summary>User-configured MCP servers, keyed by server name.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SkillsConfigSetDisabledSkillsRequest
+public sealed class McpConfigList
 {
-    /// <summary>List of skill names to disable.</summary>
-    [JsonPropertyName("disabledSkills")]
-    public IList<string> DisabledSkills { get => field ??= []; set; }
+    /// <summary>All MCP servers from user config, keyed by name.</summary>
+    [JsonPropertyName("servers")]
+    public IDictionary<string, JsonElement> Servers { get => field ??= new Dictionary<string, JsonElement>(); set; }
 }
 
-/// <summary>Agent metadata, including identifiers, display details, source, tools, model, MCP servers, skills, and file path.</summary>
+/// <summary>MCP server name and configuration to add to user configuration.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentInfo
+internal sealed class McpConfigAddRequest
 {
-    /// <summary>Description of the agent's purpose.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Human-readable display name.</summary>
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; set; } = string.Empty;
-
-    /// <summary>Stable identifier for selection. For most agents this is the same as `name`; for plugin/builtin agents it may differ. Always populated; defaults to `name` when no distinct id was assigned.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-
-    /// <summary>MCP server configurations attached to this agent, keyed by server name. Server config shape mirrors the MCP `mcpServers` schema.</summary>
-    [Experimental(Diagnostics.Experimental)]
-    [JsonPropertyName("mcpServers")]
-    public IDictionary<string, JsonElement>? McpServers { get; set; }
-
-    /// <summary>Authored preferred model id for this agent. Runtime model selection may choose a different model; omitted means no authored preference.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
+    [JsonPropertyName("config")]
+    public JsonElement Config { get; set; }
 
-    /// <summary>Name of the agent. Use `id` as the stable selection identifier.</summary>
+    /// <summary>Unique name for the MCP server.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
     [JsonPropertyName("name")]
     public string Name { get; set; } = string.Empty;
-
-    /// <summary>Absolute local file path of the agent definition. Only set for file-based agents loaded from disk; remote agents do not have a path.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
-
-    /// <summary>Authored base prompt for the agent. Runtime prompt assembly may add dynamic context at invocation time. Omitted from `session.agent.list` unless `includePrompt` is true.</summary>
-    [JsonPropertyName("prompt")]
-    public string? Prompt { get; set; }
-
-    /// <summary>Skill names preloaded into this agent's context. Omitted means none.</summary>
-    [JsonPropertyName("skills")]
-    public IList<string>? Skills { get; set; }
-
-    /// <summary>Where the agent definition was loaded from.</summary>
-    [JsonPropertyName("source")]
-    public AgentInfoSource? Source { get; set; }
-
-    /// <summary>Allowed tool names for this agent. Empty array means none; omitted means inherit defaults.</summary>
-    [JsonPropertyName("tools")]
-    public IList<string>? Tools { get; set; }
-
-    /// <summary>Whether the agent can be selected directly by the user. Agents marked `false` are subagent-only.</summary>
-    [JsonPropertyName("userInvocable")]
-    public bool? UserInvocable { get; set; }
 }
 
-/// <summary>Agents discovered across user, project, plugin, and remote sources.</summary>
+/// <summary>MCP server name and replacement configuration to write to user configuration.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ServerAgentList
+internal sealed class McpConfigUpdateRequest
 {
-    /// <summary>All discovered agents across all sources.</summary>
-    [JsonPropertyName("agents")]
-    public IList<AgentInfo> Agents { get => field ??= []; set; }
+    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
+    [JsonPropertyName("config")]
+    public JsonElement Config { get; set; }
+
+    /// <summary>Name of the MCP server to update.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Optional project paths to include in agent discovery.</summary>
+/// <summary>MCP server name to remove from user configuration.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class AgentsDiscoverRequest
+internal sealed class McpConfigRemoveRequest
 {
-    /// <summary>When true, omit the host's agents (the user-level agent directory and all plugin agents), leaving only project and remote agents. For multitenant deployments.</summary>
-    [JsonPropertyName("excludeHostAgents")]
-    public bool? ExcludeHostAgents { get; set; }
-
-    /// <summary>Optional list of project directory paths to scan for project-scoped agents. When omitted or empty, only user/plugin/remote-independent agents are returned (no project scan).</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Name of the MCP server to remove.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Canonical directory where custom agents can be discovered or created, with scope, preference, and optional project path.</summary>
+/// <summary>MCP server names to enable for new sessions.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentDiscoveryPath
+internal sealed class McpConfigEnableRequest
 {
-    /// <summary>Absolute path of the search/create directory (may not exist on disk yet).</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-
-    /// <summary>Whether this is the canonical directory to create a new agent in its tier. At most one entry per tier is preferred.</summary>
-    [JsonPropertyName("preferredForCreation")]
-    public bool PreferredForCreation { get; set; }
-
-    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
-
-    /// <summary>Which tier this directory belongs to.</summary>
-    [JsonPropertyName("scope")]
-    public AgentDiscoveryPathScope Scope { get; set; }
+    /// <summary>Names of MCP servers to enable. Each server is removed from the persisted disabled list so new sessions spawn it. Unknown or already-enabled names are ignored.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
 }
 
-/// <summary>Canonical locations where custom agents can be created so the runtime will recognize them.</summary>
+/// <summary>MCP server names to disable for new sessions.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentDiscoveryPathList
+internal sealed class McpConfigDisableRequest
 {
-    /// <summary>Canonical agent create/discovery directories, in priority order.</summary>
-    [JsonPropertyName("paths")]
-    public IList<AgentDiscoveryPath> Paths { get => field ??= []; set; }
+    /// <summary>Names of MCP servers to disable. Each server is added to the persisted disabled list so new sessions skip it. Already-disabled names are ignored. Active sessions keep their current connections until they end.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
 }
 
-/// <summary>Optional project paths to include when enumerating agent discovery directories.</summary>
+/// <summary>Installed plugin that contributes a discovered extension.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class AgentsGetDiscoveryPathsRequest
+public sealed class DiscoveredExtensionPlugin
 {
-    /// <summary>When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).</summary>
-    [JsonPropertyName("excludeHostAgents")]
-    public bool? ExcludeHostAgents { get; set; }
-
-    /// <summary>Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Installed plugin name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Loaded instruction source for a session, including path, content, category, location, applicability, and optional description.</summary>
+/// <summary>Discovered extension metadata and persistent enablement state.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InstructionSource
+public sealed class DiscoveredExtension
 {
-    /// <summary>Glob pattern(s) from frontmatter — when set, this instruction applies only to matching files.</summary>
-    [JsonPropertyName("applyTo")]
-    public IList<string>? ApplyTo { get; set; }
-
-    /// <summary>Raw content of the instruction file.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
-
-    /// <summary>When true, this source starts disabled and must be toggled on by the user.</summary>
-    [JsonPropertyName("defaultDisabled")]
-    public bool? DefaultDisabled { get; set; }
-
-    /// <summary>Short description (body after frontmatter) for use in instruction tables.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Whether this extension's persistent per-ID preference is enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Unique identifier for this source (used for toggling).</summary>
+    /// <summary>Source-qualified ID accepted by both server and session extension enablement methods.</summary>
     [JsonPropertyName("id")]
     public string Id { get; set; } = string.Empty;
 
-    /// <summary>Human-readable label.</summary>
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
+    /// <summary>Human-readable extension name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Where this source lives — used for UI grouping.</summary>
-    [JsonPropertyName("location")]
-    public InstructionSourceLocation Location { get; set; }
+    /// <summary>Absolute path to the extension entry module, suitable for revealing it in a file manager.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>The project path this source was discovered from. Only set by sessionless discovery for repository, working-directory, and project-scoped plugin sources, where it disambiguates sources across multiple workspace roots. The session-scoped getSources leaves it unset.</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+    /// <summary>Containing plugin metadata for plugin-contributed extensions.</summary>
+    [JsonPropertyName("plugin")]
+    public DiscoveredExtensionPlugin? Plugin { get; set; }
 
-    /// <summary>File path relative to repo or absolute for home.</summary>
-    [JsonPropertyName("sourcePath")]
-    public string SourcePath { get; set; } = string.Empty;
+    /// <summary>Discovery source.</summary>
+    [JsonPropertyName("source")]
+    public DiscoveredExtensionSource Source { get; set; }
+}
 
-    /// <summary>Category of instruction source — used for merge logic.</summary>
-    [JsonPropertyName("type")]
-    public InstructionSourceType Type { get; set; }
+/// <summary>Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class DiscoveredExtensions
+{
+    /// <summary>Discovered user and enabled installed-plugin extensions from persisted Copilot home state.</summary>
+    [JsonPropertyName("extensions")]
+    public IList<DiscoveredExtension> Extensions { get => field ??= []; set; }
+
+    /// <summary>Effective extension loading mode. Defaults to load_and_augment when unset.</summary>
+    [JsonPropertyName("mode")]
+    public DiscoveredExtensionMode Mode { get; set; }
 }
 
-/// <summary>Instruction sources discovered across user, repository, and plugin sources.</summary>
+/// <summary>Source-qualified extension identifiers to persistently enable for future sessions.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ServerInstructionSourceList
+internal sealed class DiscoveredExtensionsEnableRequest
 {
-    /// <summary>All discovered instruction sources.</summary>
-    [JsonPropertyName("sources")]
-    public IList<InstructionSource> Sources { get => field ??= []; set; }
+    /// <summary>Source-qualified user or plugin extension IDs to enable.</summary>
+    [JsonPropertyName("ids")]
+    public IList<string> Ids { get => field ??= []; set; }
 }
 
-/// <summary>Optional project paths to include in instruction discovery.</summary>
+/// <summary>Source-qualified extension identifiers to persistently disable for future sessions.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class InstructionsDiscoverRequest
+internal sealed class DiscoveredExtensionsDisableRequest
 {
-    /// <summary>When true, omit the host's instruction sources (user/home-level files and plugin rules), leaving only repository and working-directory sources. For multitenant deployments.</summary>
-    [JsonPropertyName("excludeHostInstructions")]
-    public bool? ExcludeHostInstructions { get; set; }
+    /// <summary>Source-qualified user or plugin extension IDs to disable.</summary>
+    [JsonPropertyName("ids")]
+    public IList<string> Ids { get => field ??= []; set; }
+}
 
-    /// <summary>Optional list of project directory paths to scan for repository/working-directory instruction sources. When omitted or empty, only user-level and plugin instruction sources are returned (no project scan).</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+/// <summary>Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(CatalogSearchResultSucceeded), "succeeded")]
+[JsonDerivedType(typeof(CatalogSearchResultNegotiationRefused), "negotiation-refused")]
+[JsonDerivedType(typeof(CatalogSearchResultUnsupportedKind), "unsupported-kind")]
+[JsonDerivedType(typeof(CatalogSearchResultInvalidRequest), "invalid-request")]
+[JsonDerivedType(typeof(CatalogSearchResultAuthenticationRequired), "authentication-required")]
+[JsonDerivedType(typeof(CatalogSearchResultPolicyRejected), "policy-rejected")]
+[JsonDerivedType(typeof(CatalogSearchResultNetworkFailure), "network-failure")]
+[JsonDerivedType(typeof(CatalogSearchResultUnsafeRetrieval), "unsafe-retrieval")]
+[JsonDerivedType(typeof(CatalogSearchResultMalformedCard), "malformed-card")]
+[JsonDerivedType(typeof(CatalogSearchResultContractViolation), "contract-violation")]
+[JsonDerivedType(typeof(CatalogSearchResultUnavailable), "unavailable")]
+public partial class CatalogSearchResult
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Canonical file or directory where custom instructions can be discovered or created, with location, kind, preference, and project path.</summary>
+
+/// <summary>One inert catalog result, represented as an MCP server or discovery-only AI skill variant so kind, media type, provenance, and installability cannot contradict each other.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InstructionDiscoveryPath
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(CatalogCandidateMcpServer), "mcp-server")]
+[JsonDerivedType(typeof(CatalogCandidateAiSkill), "ai-skill")]
+public partial class CatalogCandidate
 {
-    /// <summary>Whether the target is a single file or a directory of instruction files.</summary>
+    /// <summary>The type discriminator.</summary>
     [JsonPropertyName("kind")]
-    public InstructionDiscoveryPathKind Kind { get; set; }
+    public virtual string Kind { get; set; } = string.Empty;
+}
 
-    /// <summary>Which tier this target belongs to.</summary>
-    [JsonPropertyName("location")]
-    public InstructionDiscoveryPathLocation Location { get; set; }
 
-    /// <summary>Absolute path of the file or directory (may not exist on disk yet).</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+/// <summary>Where and when an MCP server catalog reference was observed. Discovery provenance deliberately carries no content digest because search does not establish the exact validated content a later plan will bind.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CatalogMcpServerCandidateProvenance
+{
+    /// <summary>Host of the catalog authority that advertised the reference, without path, query, or credentials. Inert untrusted data.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("authority")]
+    public string Authority { get; set; } = string.Empty;
 
-    /// <summary>Whether this is the canonical target to create new instructions in its tier. At most one entry per tier is preferred.</summary>
-    [JsonPropertyName("preferredForCreation")]
-    public bool PreferredForCreation { get; set; }
+    /// <summary>JSON MCP media type advertised for the referenced card.</summary>
+    [JsonPropertyName("mediaType")]
+    public McpServerCardMediaType MediaType { get; set; }
 
-    /// <summary>The input project path this target was derived from (only for repository targets).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+    /// <summary>ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a retrieval or validation timestamp.</summary>
+    [JsonPropertyName("observedAt")]
+    public string ObservedAt { get; set; } = string.Empty;
 }
 
-/// <summary>Canonical files and directories where custom instructions can be created so the runtime will recognize them.</summary>
+/// <summary>Where a candidate's card came from. Exactly one of a URL or embedded data: the union has no variant carrying both, and no variant carrying neither, so the rule holds structurally rather than by validation.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InstructionDiscoveryPathList
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(CatalogCandidateSourceUrl), "url")]
+[JsonDerivedType(typeof(CatalogCandidateSourceEmbedded), "embedded")]
+public partial class CatalogCandidateSource
 {
-    /// <summary>Canonical instruction create/discovery files and directories, in priority order.</summary>
-    [JsonPropertyName("paths")]
-    public IList<InstructionDiscoveryPath> Paths { get => field ??= []; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Optional project paths to include when enumerating instruction discovery targets.</summary>
+
+/// <summary>Candidate whose card is retrieved from a URL through the runtime's hardened fetch boundary.</summary>
+/// <remarks>The <c>url</c> variant of <see cref="CatalogCandidateSource"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class InstructionsGetDiscoveryPathsRequest
+public partial class CatalogCandidateSourceUrl : CatalogCandidateSource
 {
-    /// <summary>When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).</summary>
-    [JsonPropertyName("excludeHostInstructions")]
-    public bool? ExcludeHostInstructions { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "url";
 
-    /// <summary>Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Card URL as advertised. Inert untrusted data: the runtime retrieves it only through its own hardened boundary, and it is never logged.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
 }
 
-/// <summary>A literal choice the command input accepts, with a human-facing description.</summary>
+/// <summary>Candidate whose card reference arrived inline. The document and its content-derived properties stay behind the runtime boundary.</summary>
+/// <remarks>The <c>embedded</c> variant of <see cref="CatalogCandidateSource"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SlashCommandInputChoice
+public partial class CatalogCandidateSourceEmbedded : CatalogCandidateSource
 {
-    /// <summary>Human-readable description shown alongside the choice.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>The literal choice value (e.g. 'on', 'off', 'show').</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "embedded";
 }
 
-/// <summary>Optional unstructured input hint.</summary>
+/// <summary>An inert MCP server catalog result. Every free-text field is untrusted external data and must never be treated as an instruction, and the handle is the only way to refer to the candidate in a later operation.</summary>
+/// <remarks>The <c>mcp-server</c> variant of <see cref="CatalogCandidate"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SlashCommandInput
+public partial class CatalogCandidateMcpServer : CatalogCandidate
 {
-    /// <summary>Optional literal choices the input accepts, each with a human-facing description; clients may render these as selectable options.</summary>
-    [JsonPropertyName("choices")]
-    public IList<SlashCommandInputChoice>? Choices { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp-server";
 
-    /// <summary>Optional completion hint for the input (e.g. 'directory' for filesystem path completion).</summary>
-    [JsonPropertyName("completion")]
-    public SlashCommandInputCompletion? Completion { get; set; }
+    /// <summary>Description taken verbatim from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Hint to display when command input has not been provided.</summary>
-    [JsonPropertyName("hint")]
-    public string Hint { get; set; } = string.Empty;
+    /// <summary>Display name taken verbatim from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(200)]
+    [JsonPropertyName("displayName")]
+    public required string DisplayName { get; set; }
 
-    /// <summary>When true, clients should pass the full text after the command name as a single argument rather than splitting on whitespace.</summary>
-    [JsonPropertyName("preserveMultilineInput")]
-    public bool? PreserveMultilineInput { get; set; }
+    /// <summary>Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries no readable information and is rejected when stale, replayed, or presented to a different runtime instance. Never logged.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("handle")]
+    public required string Handle { get; set; }
 
-    /// <summary>When true, the command requires non-empty input; clients should render the input hint as required.</summary>
-    [JsonPropertyName("required")]
-    public bool? Required { get; set; }
+    /// <summary>ISO 8601 timestamp after which the handle is stale and will be rejected.</summary>
+    [JsonPropertyName("handleExpiresAt")]
+    public required string HandleExpiresAt { get; set; }
+
+    /// <summary>Whether this MCP server can be planned for installation, and if policy prevents it.</summary>
+    [JsonPropertyName("installability")]
+    public required CatalogMcpServerInstallability Installability { get; set; }
+
+    /// <summary>JSON MCP media type of the underlying card.</summary>
+    [JsonPropertyName("mediaType")]
+    public required McpServerCardMediaType MediaType { get; set; }
+
+    /// <summary>Where the catalog reference was observed, without the card itself or any content digest.</summary>
+    [JsonPropertyName("provenance")]
+    public required CatalogMcpServerCandidateProvenance Provenance { get; set; }
+
+    /// <summary>Publisher taken verbatim from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(200)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("publisher")]
+    public string? Publisher { get; set; }
+
+    /// <summary>Where the card came from: exactly one of a URL or embedded data, encoded as a tagged union so neither both nor neither can be represented.</summary>
+    [JsonPropertyName("source")]
+    public required CatalogCandidateSource Source { get; set; }
 }
 
-/// <summary>Slash-command metadata with name, aliases, description, kind, input hint, execution allowance, and schedulability.</summary>
+/// <summary>Where and when an AI skill catalog reference was observed. Discovery provenance deliberately carries no content digest because search does not establish the exact validated content a later plan will bind.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SlashCommandInfo
+public sealed class CatalogAiSkillCandidateProvenance
 {
-    /// <summary>Canonical aliases without leading slashes.</summary>
-    [JsonPropertyName("aliases")]
-    public IList<string>? Aliases { get; set; }
+    /// <summary>Host of the catalog authority that advertised the reference, without path, query, or credentials. Inert untrusted data.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("authority")]
+    public string Authority { get; set; } = string.Empty;
 
-    /// <summary>Whether the command may run while an agent turn is active.</summary>
-    [JsonPropertyName("allowDuringAgentExecution")]
-    public bool AllowDuringAgentExecution { get; set; }
+    /// <summary>Media type advertised for the referenced AI skill card.</summary>
+    [JsonPropertyName("mediaType")]
+    public string MediaType { get; set; } = string.Empty;
 
-    /// <summary>Human-readable command description.</summary>
+    /// <summary>ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a retrieval or validation timestamp.</summary>
+    [JsonPropertyName("observedAt")]
+    public string ObservedAt { get; set; } = string.Empty;
+}
+
+/// <summary>An inert AI skill catalog result. AI skills are discovery-only and cannot be represented as installable through this surface.</summary>
+/// <remarks>The <c>ai-skill</c> variant of <see cref="CatalogCandidate"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class CatalogCandidateAiSkill : CatalogCandidate
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "ai-skill";
+
+    /// <summary>Description taken verbatim from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
+    public string? Description { get; set; }
 
-    /// <summary>Whether the command is experimental.</summary>
-    [JsonPropertyName("experimental")]
-    public bool? Experimental { get; set; }
+    /// <summary>Display name taken verbatim from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(200)]
+    [JsonPropertyName("displayName")]
+    public required string DisplayName { get; set; }
 
-    /// <summary>Optional unstructured input hint.</summary>
-    [JsonPropertyName("input")]
-    public SlashCommandInput? Input { get; set; }
+    /// <summary>Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries no readable information and is rejected when stale, replayed, or presented to a different runtime instance. Never logged.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("handle")]
+    public required string Handle { get; set; }
 
-    /// <summary>Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command.</summary>
-    [JsonPropertyName("kind")]
-    public SlashCommandKind Kind { get; set; }
+    /// <summary>ISO 8601 timestamp after which the handle is stale and will be rejected.</summary>
+    [JsonPropertyName("handleExpiresAt")]
+    public required string HandleExpiresAt { get; set; }
 
-    /// <summary>Canonical command name without a leading slash.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>AI skills are discovery-only and cannot be installed through this surface.</summary>
+    [JsonPropertyName("installability")]
+    public required string Installability { get; set; }
 
-    /// <summary>Whether the command may be the target of `/every` / `/after` schedules. Resolution happens at every tick, so only set this when the command is safe to re-invoke and produces an agent prompt.</summary>
-    [JsonPropertyName("schedulable")]
-    public bool? Schedulable { get; set; }
-}
+    /// <summary>Media type of the underlying AI skill card.</summary>
+    [JsonPropertyName("mediaType")]
+    public required string MediaType { get; set; }
 
-/// <summary>Slash commands available in the session, after applying any include/exclude filters.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class CommandList
-{
-    /// <summary>Commands available in this session.</summary>
-    [JsonPropertyName("commands")]
-    public IList<SlashCommandInfo> Commands { get => field ??= []; set; }
+    /// <summary>Where the catalog reference was observed, without the card itself or any content digest.</summary>
+    [JsonPropertyName("provenance")]
+    public required CatalogAiSkillCandidateProvenance Provenance { get; set; }
+
+    /// <summary>Publisher taken verbatim from the card. Inert untrusted text.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(200)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("publisher")]
+    public string? Publisher { get; set; }
+
+    /// <summary>Where the card came from: exactly one of a URL or embedded data, encoded as a tagged union so neither both nor neither can be represented.</summary>
+    [JsonPropertyName("source")]
+    public required CatalogCandidateSource Source { get; set; }
 }
 
-/// <summary>A single user setting's effective value alongside its default, so consumers can render settings left at their default.</summary>
+/// <summary>A completed catalog search: inert candidate summaries, each carrying a single-use handle.</summary>
+/// <remarks>The <c>succeeded</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UserSettingMetadata
+public partial class CatalogSearchResultSucceeded : CatalogSearchResult
 {
-    /// <summary>The centrally-known default for this setting (null when no default is registered).</summary>
-    [JsonPropertyName("default")]
-    public JsonElement Default { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "succeeded";
 
-    /// <summary>True when the user has not set an explicit value for this setting (i.e. it is left at its default). Reflects whether the user has overridden the key, not whether the effective value happens to equal the default — a key explicitly set to a value identical to the default still reports false.</summary>
-    [JsonPropertyName("isDefault")]
-    public bool IsDefault { get; set; }
+    /// <summary>Matching candidates, never more than the requested limit. All text is inert untrusted data.</summary>
+    [JsonPropertyName("candidates")]
+    public required IList<CatalogCandidate> Candidates { get; set; }
 
-    /// <summary>The effective value: the user's value if set, otherwise the default.</summary>
-    [JsonPropertyName("value")]
-    public JsonElement Value { get; set; }
+    /// <summary>Protocol version and capabilities the runtime honoured.</summary>
+    [JsonPropertyName("negotiated")]
+    public required CatalogNegotiatedContract Negotiated { get; set; }
+
+    /// <summary>Pseudonymous identifier for this search, issued by the runtime or by the catalog authority it queried and never by the caller, so it cannot be forged or replayed to attribute an install to a search that never happened. Always present on a success, so a result set can be tied to the installs it leads to. It identifies a search rather than a person: it is derived from no user, account, device, or query data, and must never be joined with user identity to re-identify anyone.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(64)]
+    [JsonPropertyName("searchId")]
+    public required string SearchId { get; set; }
+
+    /// <summary>Whether further matches existed beyond the requested limit.</summary>
+    [JsonPropertyName("truncated")]
+    public required bool Truncated { get; set; }
 }
 
-/// <summary>Per-key metadata for every known user setting (settings.json overlaid with the legacy config.json, config.json wins), including settings left at their default. Excludes repository- and enterprise-managed overrides.</summary>
+/// <summary>The caller's protocol version or required capabilities cannot be honoured. Returned instead of a partial or ambiguous success.</summary>
+/// <remarks>The <c>negotiation-refused</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UserSettingsGetResult
+public partial class CatalogSearchResultNegotiationRefused : CatalogSearchResult
 {
-    /// <summary>Every known user setting keyed by setting name, each with its effective value, default, and whether it is at the default.</summary>
-    [JsonPropertyName("settings")]
-    public IDictionary<string, UserSettingMetadata> Settings { get => field ??= new Dictionary<string, UserSettingMetadata>(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "negotiation-refused";
+
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Lowest caller protocol version this runtime will serve.</summary>
+    [JsonPropertyName("minimumSupportedProtocolVersion")]
+    public required long MinimumSupportedProtocolVersion { get; set; }
+
+    /// <summary>Whether the version or the capability set was the problem.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogNegotiationRefusedReason Reason { get; set; }
+
+    /// <summary>Protocol version of the runtime that refused the request.</summary>
+    [JsonPropertyName("runtimeProtocolVersion")]
+    public required long RuntimeProtocolVersion { get; set; }
+
+    /// <summary>Every wire feature this runtime understands, so the caller can retry within that contract. This list does not imply that every deployment has enabled every operation.</summary>
+    [JsonPropertyName("supportedCapabilities")]
+    public required IList<CatalogCapability> SupportedCapabilities { get; set; }
+
+    /// <summary>The subset of the caller's bounded extensible capability identifiers this runtime cannot honour.</summary>
+    [JsonPropertyName("unsupportedCapabilities")]
+    public required IList<string> UnsupportedCapabilities { get; set; }
 }
 
-/// <summary>Outcome of writing user settings.</summary>
+/// <summary>The request asked for a candidate kind this runtime does not serve.</summary>
+/// <remarks>The <c>unsupported-kind</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UserSettingsSetResult
+public partial class CatalogSearchResultUnsupportedKind : CatalogSearchResult
 {
-    /// <summary>Top-level keys whose write landed in settings.json but is shadowed by a value still present in the legacy config.json (config.json wins on read). The write does not take effect until the legacy value is removed.</summary>
-    [JsonPropertyName("shadowedKeys")]
-    public IList<string> ShadowedKeys { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unsupported-kind";
+
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>The kinds from the request that are not supported.</summary>
+    [JsonPropertyName("requestedKinds")]
+    public required IList<CatalogCandidateKind> RequestedKinds { get; set; }
+
+    /// <summary>Every candidate kind this runtime can serve.</summary>
+    [JsonPropertyName("supportedKinds")]
+    public required IList<CatalogCandidateKind> SupportedKinds { get; set; }
 }
 
-/// <summary>Partial user settings to write to settings.json. Each top-level key is written individually, replacing the existing value; a key whose value is null is removed.</summary>
+/// <summary>The request was rejected before any work was done, because a bounded field fell outside its permitted range or a required field was unusable.</summary>
+/// <remarks>The <c>invalid-request</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class UserSettingsSetRequest
+public partial class CatalogSearchResultInvalidRequest : CatalogSearchResult
 {
-    /// <summary>Partial user settings to write, as a free-form object keyed by setting name.</summary>
-    [JsonPropertyName("settings")]
-    public JsonElement Settings { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "invalid-request";
+
+    /// <summary>Which request field was rejected.</summary>
+    [JsonPropertyName("field")]
+    public required CatalogInvalidRequestField Field { get; set; }
+
+    /// <summary>Human-readable explanation, safe to surface. Never echoes the offending value, nor a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 }
 
-/// <summary>Indicates whether the calling client was registered as the session filesystem provider.</summary>
+/// <summary>An optional catalog authentication exchange did not establish the caller's identity. Anonymous search remains supported; this refusal is reserved for an operation that cannot continue after the attempted exchange. It is distinct from `policy-rejected` and from a network failure, and the reason identifies the recovery action.</summary>
+/// <remarks>The <c>authentication-required</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsSetProviderResult
+public partial class CatalogSearchResultAuthenticationRequired : CatalogSearchResult
 {
-    /// <summary>Whether the provider was set successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "authentication-required";
+
+    /// <summary>Human-readable explanation, safe to surface. Never contains a credential or token, nor a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Why authentication failed. Only an expired credential justifies attempting a silent refresh; an absent or rejected credential requires sign-in.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogAuthenticationRequiredReason Reason { get; set; }
 }
 
-/// <summary>Optional capabilities declared by the provider.</summary>
+/// <summary>Registry or enterprise policy refused the operation.</summary>
+/// <remarks>The <c>policy-rejected</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsSetProviderCapabilities
+public partial class CatalogSearchResultPolicyRejected : CatalogSearchResult
 {
-    /// <summary>Whether the provider supports SQLite query/exists operations.</summary>
-    [JsonPropertyName("sqlite")]
-    public bool? Sqlite { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "policy-rejected";
+
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Which authority produced the decision.</summary>
+    [JsonPropertyName("source")]
+    public required McpPlanPolicySource Source { get; set; }
 }
 
-/// <summary>Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider.</summary>
+/// <summary>The runtime could not reach the catalog authority or retrieve a card. Covers being offline as well as transport-level failure.</summary>
+/// <remarks>The <c>network-failure</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionFsSetProviderRequest
+public partial class CatalogSearchResultNetworkFailure : CatalogSearchResult
 {
-    /// <summary>Optional capabilities declared by the provider.</summary>
-    [JsonPropertyName("capabilities")]
-    public SessionFsSetProviderCapabilities? Capabilities { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "network-failure";
 
-    /// <summary>Path conventions used by this filesystem.</summary>
-    [JsonPropertyName("conventions")]
-    public SessionFsSetProviderConventions Conventions { get; set; }
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 
-    /// <summary>Initial working directory for sessions.</summary>
-    [JsonPropertyName("initialCwd")]
-    public string InitialCwd { get; set; } = string.Empty;
+    /// <summary>Categorised failure, low cardinality so it can be aggregated without carrying a URL.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogNetworkFailureReason Reason { get; set; }
 
-    /// <summary>Path within each session's SessionFs where the runtime stores files for that session.</summary>
-    [JsonPropertyName("sessionStatePath")]
-    public string SessionStatePath { get; set; } = string.Empty;
+    /// <summary>HTTP status code, when the failure was a rejected response.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("statusCode")]
+    public int? StatusCode { get; set; }
 }
 
-/// <summary>Indicates whether the calling client was registered as the LLM inference provider.</summary>
+/// <summary>Retrieval was refused by the runtime's hardened fetch boundary before any request left the process, or before a redirect was followed.</summary>
+/// <remarks>The <c>unsafe-retrieval</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceSetProviderResult
+public partial class CatalogSearchResultUnsafeRetrieval : CatalogSearchResult
 {
-    /// <summary>Whether the provider was set successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unsafe-retrieval";
 
-/// <summary>Whether the start frame was accepted.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpResponseStartResult
-{
-    /// <summary>True when the response start was matched to a pending request; false when unknown.</summary>
-    [JsonPropertyName("accepted")]
-    public bool Accepted { get; set; }
+    /// <summary>Human-readable explanation, safe to surface. Never contains the refused URL, nor a query, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Which control refused the retrieval, low cardinality so it can be aggregated without carrying a URL.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogUnsafeRetrievalReason Reason { get; set; }
 }
 
-/// <summary>Response head.</summary>
+/// <summary>A card could not be parsed or did not satisfy its declared media type's schema.</summary>
+/// <remarks>The <c>malformed-card</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class LlmInferenceHttpResponseStartRequest
+public partial class CatalogSearchResultMalformedCard : CatalogSearchResult
 {
-    /// <summary>Gets or sets the <c>headers</c> value.</summary>
-    [JsonPropertyName("headers")]
-    public IDictionary<string, IList<string>> Headers { get => field ??= new Dictionary<string, IList<string>>(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "malformed-card";
 
-    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Media type the card was interpreted as, when it declared one this runtime recognises.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mediaType")]
+    public CatalogMediaType? MediaType { get; set; }
 
-    /// <summary>HTTP status code.</summary>
-    [JsonPropertyName("status")]
-    public long Status { get; set; }
+    /// <summary>Human-readable explanation, safe to surface. Never echoes card content, nor a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 
-    /// <summary>Optional HTTP status reason phrase.</summary>
-    [JsonPropertyName("statusText")]
-    public string? StatusText { get; set; }
+    /// <summary>How the card failed validation.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogMalformedCardReason Reason { get; set; }
 }
 
-/// <summary>Whether the chunk was accepted.</summary>
+/// <summary>An upstream catalog response broke the wire contract. Most importantly, every result must carry exactly one of a URL or embedded data: a result carrying both, or neither, is refused here rather than being guessed at.</summary>
+/// <remarks>The <c>contract-violation</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpResponseChunkResult
+public partial class CatalogSearchResultContractViolation : CatalogSearchResult
 {
-    /// <summary>True when the chunk was matched to a pending request; false when unknown.</summary>
-    [JsonPropertyName("accepted")]
-    public bool Accepted { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "contract-violation";
+
+    /// <summary>Human-readable explanation, safe to surface. Never echoes response content, nor a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Which rule the response broke.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogContractViolationReason Reason { get; set; }
 }
 
-/// <summary>Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.</summary>
+/// <summary>The operation is not available on this runtime. Distinct from a network failure: nothing was attempted.</summary>
+/// <remarks>The <c>unavailable</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpResponseChunkError
+public partial class CatalogSearchResultUnavailable : CatalogSearchResult
 {
-    /// <summary>Optional machine-readable error code.</summary>
-    [JsonPropertyName("code")]
-    public string? Code { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unavailable";
 
-    /// <summary>Human-readable failure description.</summary>
+    /// <summary>Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(1000)]
     [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    public required string Message { get; set; }
+
+    /// <summary>Why the operation is unavailable.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogUnavailableReason Reason { get; set; }
 }
 
-/// <summary>A response body chunk or terminal error.</summary>
+/// <summary>A bounded catalog search. Both the query length and the result count are capped by the schema so a caller cannot request an unbounded scan.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class LlmInferenceHttpResponseChunkRequest
+internal sealed class CatalogSearchRequest
 {
-    /// <summary>When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.</summary>
-    [JsonPropertyName("binary")]
-    public bool? Binary { get; set; }
+    /// <summary>Protocol version and capabilities the caller requires.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty (e.g. when the response body is empty: send a single chunk with empty data and end=true).</summary>
-    [JsonPropertyName("data")]
-    public string Data { get; set; } = string.Empty;
-
-    /// <summary>When true, this is the final body chunk for the response. The runtime treats the response body as complete after receiving an end-marked chunk.</summary>
-    [JsonPropertyName("end")]
-    public bool? End { get; set; }
+    /// <summary>Restrict results to these candidate kinds. When omitted, every kind the runtime supports is searched.</summary>
+    [JsonPropertyName("kinds")]
+    public IList<CatalogCandidateKind>? Kinds { get; set; }
 
-    /// <summary>Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.</summary>
-    [JsonPropertyName("error")]
-    public LlmInferenceHttpResponseChunkError? Error { get; set; }
+    /// <summary>Maximum number of candidates to return. Defaults to 10 when omitted.</summary>
+    [JsonPropertyName("limit")]
+    public int? Limit { get; set; }
 
-    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Free-text search query. Never written to logs or telemetry.</summary>
+    [RegularExpression("\\S")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(256)]
+    [JsonPropertyName("query")]
+    public string Query { get; set; } = string.Empty;
 }
 
-/// <summary>Pre-resolved working-directory context for session startup.</summary>
+/// <summary>Information about an installed plugin tracked in global state.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionContext
+public sealed class InstalledPluginInfo
 {
-    /// <summary>Active git branch.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
-
-    /// <summary>Most recent working directory for this session.</summary>
-    [JsonPropertyName("cwd")]
-    public string Cwd { get; set; } = string.Empty;
-
-    /// <summary>Git repository root, if the cwd was inside a git repo.</summary>
-    [JsonPropertyName("gitRoot")]
-    public string? GitRoot { get; set; }
+    /// <summary>Opaque, stable hash identifying a direct (non-marketplace) install source. Present only for direct repo / URL / local installs; absent for marketplace plugins. Same source yields the same id; distinct sources never collide.</summary>
+    [JsonPropertyName("directSourceId")]
+    public string? DirectSourceId { get; set; }
 
-    /// <summary>Repository host type.</summary>
-    [JsonPropertyName("hostType")]
-    public SessionContextHostType? HostType { get; set; }
+    /// <summary>Whether the plugin is currently enabled for new sessions.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Repository slug in `owner/name` form, when known.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
-}
+    /// <summary>Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — a plugin belonging to a directory/local marketplace, which is loaded from its real directory on every pass instead of a copy under the installed-plugins cache. Its presence is what marks a listed plugin as live: such a plugin is always present on disk, so `enabled` is its only meaningful state and it is never "not installed".</summary>
+    [JsonPropertyName("installedFrom")]
+    public string? InstalledFrom { get; set; }
 
-/// <summary>GitHub repository the remote session belongs to.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class RemoteSessionMetadataRepository
-{
-    /// <summary>Branch associated with the remote session.</summary>
-    [JsonPropertyName("branch")]
-    public string Branch { get; set; } = string.Empty;
+    /// <summary>Marketplace the plugin came from. Empty string ("") for direct repo / URL / local installs.</summary>
+    [JsonPropertyName("marketplace")]
+    public string Marketplace { get; set; } = string.Empty;
 
-    /// <summary>Repository name.</summary>
+    /// <summary>Plugin name.</summary>
     [JsonPropertyName("name")]
     public string Name { get; set; } = string.Empty;
 
-    /// <summary>Repository owner.</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { get; set; } = string.Empty;
+    /// <summary>Installed version (when reported by the plugin manifest).</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
 }
 
-/// <summary>Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).</summary>
+/// <summary>Plugins installed in user/global state.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteSessionMetadataValue
+public sealed class PluginListResult
 {
-    /// <summary>Most recent working directory context.</summary>
-    [JsonPropertyName("context")]
-    public SessionContext? Context { get; set; }
-
-    /// <summary>Always true for remote sessions.</summary>
-    [JsonPropertyName("isRemote")]
-    public bool IsRemote { get; set; }
-
-    /// <summary>Last-modified time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public string ModifiedTime { get; set; } = string.Empty;
-
-    /// <summary>Optional human-friendly name set via /rename.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
-
-    /// <summary>Pull request number associated with the session.</summary>
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
-
-    /// <summary>Backing remote session IDs (most recent first).</summary>
-    [JsonPropertyName("remoteSessionIds")]
-    public IList<string> RemoteSessionIds { get => field ??= []; set; }
-
-    /// <summary>GitHub repository the remote session belongs to.</summary>
-    [JsonPropertyName("repository")]
-    public RemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
-
-    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { get; set; }
-
-    /// <summary>Stable session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.</summary>
-    [JsonPropertyName("staleAt")]
-    public string? StaleAt { get; set; }
-
-    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("startTime")]
-    public string StartTime { get; set; } = string.Empty;
-
-    /// <summary>Server-side task state returned by GitHub.</summary>
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
-
-    /// <summary>Short summary of the session, when one has been derived.</summary>
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
-
-    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
-    [JsonPropertyName("taskType")]
-    public RemoteSessionMetadataTaskType? TaskType { get; set; }
+    /// <summary>Installed plugins.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<InstalledPluginInfo> Plugins { get => field ??= []; set; }
 }
 
-/// <summary>`sessions.open` handoff progress update with step, status, and optional message.</summary>
+/// <summary>Result of installing a plugin.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsOpenProgress
+public sealed class PluginInstallResult
 {
-    /// <summary>Optional step message.</summary>
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
+    /// <summary>Set when the install path is deprecated (e.g. direct repo / URL / local installs). Callers should surface this to end users.</summary>
+    [JsonPropertyName("deprecationWarning")]
+    public string? DeprecationWarning { get; set; }
 
-    /// <summary>Step status.</summary>
-    [JsonPropertyName("status")]
-    public SessionsOpenProgressStatus Status { get; set; }
+    /// <summary>The newly installed plugin's metadata.</summary>
+    [JsonPropertyName("plugin")]
+    public InstalledPluginInfo Plugin { get => field ??= new(); set; }
 
-    /// <summary>Handoff step.</summary>
-    [JsonPropertyName("step")]
-    public SessionsOpenProgressStep Step { get; set; }
+    /// <summary>Optional post-install message provided by the plugin (e.g. setup instructions).</summary>
+    [JsonPropertyName("postInstallMessage")]
+    public string? PostInstallMessage { get; set; }
+
+    /// <summary>Number of skills discovered and installed from the plugin.</summary>
+    [JsonPropertyName("skillsInstalled")]
+    public long SkillsInstalled { get; set; }
 }
 
-/// <summary>Result of opening a session.</summary>
+/// <summary>Plugin source and optional working directory for relative-path resolution.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionOpenResult
+internal sealed class PluginsInstallRequest
 {
-    /// <summary>Remote session metadata, present when status is `connected`.</summary>
-    [JsonPropertyName("metadata")]
-    public RemoteSessionMetadataValue? Metadata { get; set; }
-
-    /// <summary>Handoff progress steps, present when status is `handed_off`.</summary>
-    [JsonPropertyName("progress")]
-    public IList<SessionsOpenProgress>? Progress { get; set; }
-
-    /// <summary>Remote session ID, present when status is `connected`.</summary>
-    [JsonPropertyName("remoteSessionId")]
-    public string? RemoteSessionId { get; set; }
-
-    /// <summary>In-process SessionClientApi handle for the opened session, returned to CLI callers as a transitional shortcut. Marked internal so the public SDK surface does not expose it; SDK consumers should construct per-session clients from `sessionId` instead.</summary>
-    [JsonInclude]
-    [JsonPropertyName("sessionApi")]
-    internal JsonElement? SessionApi { get; set; }
-
-    /// <summary>Opened session ID. Omitted when status is `not_found`.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
-
-    /// <summary>Startup prompts queued by user-level hook configs at session creation. Only populated when status is `created`; resumed sessions return an empty array.</summary>
-    [JsonPropertyName("startupPrompts")]
-    public IList<string>? StartupPrompts { get; set; }
+    /// <summary>Plugin install spec. Accepts the same forms as the CLI: "plugin@marketplace" (marketplace install), "owner/repo" or "owner/repo:subpath" (GitHub direct), an http/https/ssh URL, or a local path. Direct (non-marketplace) installs are deprecated and will produce a deprecationWarning in the result.</summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; } = string.Empty;
 
-    /// <summary>Outcome of the open request.</summary>
-    [JsonPropertyName("status")]
-    public SessionsOpenStatus Status { get; set; }
+    /// <summary>Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
 }
 
-/// <summary>Identifier and optional friendly name assigned to the newly forked session.</summary>
+/// <summary>Name (or spec) of the plugin to uninstall.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsForkResult
+internal sealed class PluginsUninstallRequest
 {
-    /// <summary>Friendly name assigned to the forked session, if any.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Stable source identity for a direct (non-marketplace) install. Disambiguates uninstall when multiple installed plugins share the same name.</summary>
+    [JsonPropertyName("directSourceId")]
+    public string? DirectSourceId { get; set; }
 
-    /// <summary>The new forked session's ID.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Plugin name or "plugin@marketplace" spec to uninstall. When ambiguous, prefer the fully-qualified spec.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.</summary>
+/// <summary>Result of updating a single plugin.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsForkRequest
+public sealed class PluginUpdateResult
 {
-    /// <summary>Optional friendly name to assign to the forked session.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Version after the update, when reported by the plugin manifest.</summary>
+    [JsonPropertyName("newVersion")]
+    public string? NewVersion { get; set; }
 
-    /// <summary>Source session ID to fork from.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Version that was previously installed, when available.</summary>
+    [JsonPropertyName("previousVersion")]
+    public string? PreviousVersion { get; set; }
 
-    /// <summary>Optional event ID boundary. When provided, the fork includes only events before this ID (exclusive). When omitted, all events are included.</summary>
-    [JsonPropertyName("toEventId")]
-    public string? ToEventId { get; set; }
+    /// <summary>Number of skills discovered and installed after the update.</summary>
+    [JsonPropertyName("skillsInstalled")]
+    public long SkillsInstalled { get; set; }
 }
 
-/// <summary>Repository associated with the connected remote session.</summary>
+/// <summary>Name (or spec) of the plugin to update.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ConnectedRemoteSessionMetadataRepository
+internal sealed class PluginsUpdateRequest
 {
-    /// <summary>Branch associated with the remote session.</summary>
-    [JsonPropertyName("branch")]
-    public string Branch { get; set; } = string.Empty;
-
-    /// <summary>Repository name.</summary>
+    /// <summary>Plugin name or "plugin@marketplace" spec to update.</summary>
     [JsonPropertyName("name")]
     public string Name { get; set; } = string.Empty;
-
-    /// <summary>Repository owner or organization login.</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { get; set; } = string.Empty;
 }
 
-/// <summary>Metadata for a connected remote session.</summary>
+/// <summary>Per-plugin result from updating all plugins, with versions, skills installed, success flag, and optional error.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ConnectedRemoteSessionMetadata
+public sealed class PluginUpdateAllEntry
 {
-    /// <summary>Neutral SDK discriminator for the connected remote session kind.</summary>
-    [JsonPropertyName("kind")]
-    public ConnectedRemoteSessionMetadataKind Kind { get; set; }
+    /// <summary>Error message (failure only).</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Last session update time as an ISO 8601 string.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public DateTimeOffset ModifiedTime { get; set; }
+    /// <summary>Marketplace the plugin came from. Empty string ("") for direct installs.</summary>
+    [JsonPropertyName("marketplace")]
+    public string Marketplace { get; set; } = string.Empty;
 
-    /// <summary>Optional friendly session name.</summary>
+    /// <summary>Plugin name that was updated.</summary>
     [JsonPropertyName("name")]
-    public string? Name { get; set; }
-
-    /// <summary>Pull request number associated with the session.</summary>
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
-
-    /// <summary>Repository associated with the connected remote session.</summary>
-    [JsonPropertyName("repository")]
-    public ConnectedRemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
-
-    /// <summary>Original remote resource identifier.</summary>
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { get; set; }
-
-    /// <summary>SDK session ID for the connected remote session.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Remote session staleness deadline as an ISO 8601 string.</summary>
-    [JsonPropertyName("staleAt")]
-    public DateTimeOffset? StaleAt { get; set; }
+    /// <summary>Version after the update, when available.</summary>
+    [JsonPropertyName("newVersion")]
+    public string? NewVersion { get; set; }
 
-    /// <summary>Session start time as an ISO 8601 string.</summary>
-    [JsonPropertyName("startTime")]
-    public DateTimeOffset StartTime { get; set; }
+    /// <summary>Previously installed version, when available.</summary>
+    [JsonPropertyName("previousVersion")]
+    public string? PreviousVersion { get; set; }
 
-    /// <summary>Remote session state returned by the backing service.</summary>
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
+    /// <summary>Number of skills installed after the update (success only).</summary>
+    [JsonPropertyName("skillsInstalled")]
+    public long? SkillsInstalled { get; set; }
 
-    /// <summary>Optional session summary.</summary>
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
+    /// <summary>Whether the update succeeded for this plugin.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Remote session connection result.</summary>
+/// <summary>Result of updating all installed plugins.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteSessionConnectionResult
+public sealed class PluginUpdateAllResult
 {
-    /// <summary>Metadata for a connected remote session.</summary>
-    [JsonPropertyName("metadata")]
-    public ConnectedRemoteSessionMetadata Metadata { get => field ??= new(); set; }
-
-    /// <summary>SDK session ID for the connected remote session.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Per-plugin update results in deterministic order.</summary>
+    [JsonPropertyName("results")]
+    public IList<PluginUpdateAllEntry> Results { get => field ??= []; set; }
 }
 
-/// <summary>Remote session connection parameters.</summary>
+/// <summary>Plugin names (or specs) to enable.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ConnectRemoteSessionParams
+internal sealed class PluginsEnableRequest
 {
-    /// <summary>Session ID to connect to.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Plugin names or "plugin@marketplace" specs to enable. Unknown names are ignored. Non-marketplace direct installs are always enabled and cannot be toggled via this API.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
 }
 
-/// <summary>Local or remote session metadata entry. Narrow on `isRemote` to access source-specific fields.</summary>
-/// <remarks>Data type discriminated by <c>isRemote</c>.</remarks>
+/// <summary>Plugin names (or specs) to disable.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class SessionListEntry
+internal sealed class PluginsDisableRequest
 {
-    /// <summary>The boolean discriminator.</summary>
-    [JsonPropertyName("isRemote")]
-    public bool IsRemote { get; set; }
-
-    /// <summary>Runtime client name that created/last resumed this session.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
-
-    /// <summary>Pre-resolved working-directory context for session startup.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("context")]
-    public SessionContext? Context { get; set; }
-
-    /// <summary>True for detached maintenance sessions that should be hidden from normal resume lists.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("isDetached")]
-    public bool? IsDetached { get; set; }
+    /// <summary>Plugin names or "plugin@marketplace" specs to disable. Unknown names are ignored. Non-marketplace direct installs cannot be disabled via this API; uninstall them instead. Plugin-owned MCP servers are stopped in active sessions immediately; other plugin contributions remain available until each session reloads plugins.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
+}
 
-    /// <summary>GitHub task ID, when this local session is bound to one. Only present for local sessions exported to remote control.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mcTaskId")]
-    public string? McTaskId { get; set; }
+/// <summary>Trusted built-in plugin directories to use for this runtime process.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PluginsBuiltinSetRequest
+{
+    /// <summary>Complete replacement set of trusted built-in plugin directories. Every entry must be an absolute local filesystem path no longer than 4096 characters.</summary>
+    [JsonPropertyName("paths")]
+    public IList<string> Paths { get => field ??= []; set; }
+}
 
-    /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public required string ModifiedTime { get; set; }
+/// <summary>Registered marketplace summary.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class MarketplaceInfo
+{
+    /// <summary>True when this is a default marketplace shipped with the runtime. Defaults are not removable.</summary>
+    [JsonPropertyName("isDefault")]
+    public bool? IsDefault { get; set; }
 
-    /// <summary>Optional human-friendly name set via /rename.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    /// <summary>Marketplace name (matches the @marketplace suffix in plugin specs).</summary>
     [JsonPropertyName("name")]
-    public string? Name { get; set; }
-
-    /// <summary>Pull request number associated with the session.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
-
-    /// <summary>Backing remote session IDs (most recent first).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("remoteSessionIds")]
-    public IList<string>? RemoteSessionIds { get; set; }
-
-    /// <summary>GitHub repository the remote session belongs to.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("repository")]
-    public RemoteSessionMetadataRepository? Repository { get; set; }
-
-    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { get; set; }
-
-    /// <summary>Stable session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public required string SessionId { get; set; }
-
-    /// <summary>Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("staleAt")]
-    public string? StaleAt { get; set; }
-
-    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("startTime")]
-    public required string StartTime { get; set; }
-
-    /// <summary>Server-side task state returned by GitHub.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
-
-    /// <summary>Short summary of the session, when one has been derived.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("taskType")]
-    public RemoteSessionMetadataTaskType? TaskType { get; set; }
+    /// <summary>Human-readable description of where the marketplace data is fetched from (e.g. "GitHub: owner/repo").</summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; } = string.Empty;
 }
 
-/// <summary>Sessions matching the filter, ordered most-recently-modified first.</summary>
+/// <summary>All registered marketplaces, including built-in defaults.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionList
+public sealed class MarketplaceListResult
 {
-    /// <summary>Sessions ordered most-recently-modified first. Discriminated by `isRemote`.</summary>
-    [JsonPropertyName("sessions")]
-    public IList<SessionListEntry> Sessions { get => field ??= []; set; }
+    /// <summary>Registered marketplaces.</summary>
+    [JsonPropertyName("marketplaces")]
+    public IList<MarketplaceInfo> Marketplaces { get => field ??= []; set; }
 }
 
-/// <summary>Optional filter applied to the returned sessions.</summary>
+/// <summary>Result of registering a new marketplace.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionListFilter
+public sealed class MarketplaceAddResult
 {
-    /// <summary>Match sessions whose context.branch equals this value.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
-
-    /// <summary>Match sessions whose context.cwd equals this value.</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
+    /// <summary>Final name of the marketplace as resolved from its manifest.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+}
 
-    /// <summary>Match sessions whose context.gitRoot equals this value.</summary>
-    [JsonPropertyName("gitRoot")]
-    public string? GitRoot { get; set; }
+/// <summary>Marketplace source and optional working directory for relative-path resolution.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PluginsMarketplacesAddRequest
+{
+    /// <summary>Marketplace source. Accepts the same forms as the CLI: "owner/repo" or "owner/repo#ref" (GitHub), an http/https/ssh URL (optionally with #ref), a git scp-style URL (user@host:path), or a local path. The marketplace's own name (from its manifest) is used as the registration key.</summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; } = string.Empty;
 
-    /// <summary>Match sessions whose context.repository equals this value.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
+    /// <summary>Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
 }
 
-/// <summary>Optional source filter, metadata-load limit, and context filter applied to the returned sessions.</summary>
+/// <summary>Outcome of the remove attempt, including dependent-plugin info when applicable.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsListRequest
+public sealed class MarketplaceRemoveResult
 {
-    /// <summary>Optional filter applied to the returned sessions.</summary>
-    [JsonPropertyName("filter")]
-    public SessionListFilter? Filter { get; set; }
-
-    /// <summary>When true, include detached maintenance sessions. Defaults to false for user-facing session lists.</summary>
-    [JsonPropertyName("includeDetached")]
-    public bool? IncludeDetached { get; set; }
+    /// <summary>Names of installed plugins that prevented removal. Populated only when `removed=false`.</summary>
+    [JsonPropertyName("dependentPlugins")]
+    public IList<string>? DependentPlugins { get; set; }
 
-    /// <summary>When provided, only the first N local sessions (sorted by modification time, newest first) load full metadata; remaining sessions return basic info only. Use 0 to return only basic info for every local session. Has no effect on remote entries (which always carry their full shape).</summary>
-    [JsonPropertyName("metadataLimit")]
-    public long? MetadataLimit { get; set; }
+    /// <summary>True when the marketplace was actually removed. False when removal was skipped because the marketplace has dependent plugins and `force` was not set.</summary>
+    [JsonPropertyName("removed")]
+    public bool Removed { get; set; }
+}
 
-    /// <summary>Which session sources to include. Defaults to `local` for backward compatibility.</summary>
-    [JsonPropertyName("source")]
-    public SessionSource? Source { get; set; }
+/// <summary>Name of the marketplace to remove and an optional force flag.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PluginsMarketplacesRemoveRequest
+{
+    /// <summary>When true, also uninstall every plugin sourced from this marketplace. When false (default), removal is a no-op if any plugin from this marketplace is installed and the dependent plugin names are returned in the result.</summary>
+    [JsonPropertyName("force")]
+    public bool? Force { get; set; }
 
-    /// <summary>Only meaningful when `source` includes remote. When true, propagates errors from the remote service instead of silently returning an empty remote list. Defaults to false.</summary>
-    [JsonPropertyName("throwOnError")]
-    public bool? ThrowOnError { get; set; }
+    /// <summary>Marketplace name to remove.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Persisted local session metadata, including identifiers, timestamps, summary/name, client, context, detached state, and task ID.</summary>
+/// <summary>Plugin entry advertised by a marketplace.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LocalSessionMetadataValue
+public sealed class MarketplacePluginInfo
 {
-    /// <summary>Runtime client name that created/last resumed this session.</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
+    /// <summary>Short description from the marketplace catalog, when present.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Pre-resolved working-directory context for session startup.</summary>
-    [JsonPropertyName("context")]
-    public SessionContext? Context { get; set; }
-
-    /// <summary>True for detached maintenance sessions that should be hidden from normal resume lists.</summary>
-    [JsonPropertyName("isDetached")]
-    public bool? IsDetached { get; set; }
-
-    /// <summary>Always false for local sessions.</summary>
-    [JsonPropertyName("isRemote")]
-    public bool IsRemote { get; set; }
-
-    /// <summary>GitHub task ID, when this local session is bound to one. Only present for local sessions exported to remote control.</summary>
-    [JsonPropertyName("mcTaskId")]
-    public string? McTaskId { get; set; }
-
-    /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public string ModifiedTime { get; set; } = string.Empty;
-
-    /// <summary>Optional human-friendly name set via /rename.</summary>
+    /// <summary>Plugin name as listed in the marketplace catalog.</summary>
     [JsonPropertyName("name")]
-    public string? Name { get; set; }
-
-    /// <summary>Stable session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("startTime")]
-    public string StartTime { get; set; } = string.Empty;
-
-    /// <summary>Short summary of the session, when one has been derived.</summary>
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Persisted local session metadata when the session exists.</summary>
+/// <summary>Plugins advertised by the marketplace.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetMetadataResult
+public sealed class MarketplaceBrowseResult
 {
-    /// <summary>Local session metadata, omitted when the session does not exist.</summary>
-    [JsonPropertyName("session")]
-    public LocalSessionMetadataValue? Session { get; set; }
+    /// <summary>Plugins advertised by the marketplace.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<MarketplacePluginInfo> Plugins { get => field ??= []; set; }
 }
 
-/// <summary>Session ID whose persisted metadata should be read.</summary>
+/// <summary>Name of the marketplace whose plugin catalog to fetch.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetMetadataRequest
+internal sealed class PluginsMarketplacesBrowseRequest
 {
-    /// <summary>Session ID to inspect.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Marketplace name to browse.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Recent local session IDs that contain user-visible history.</summary>
+/// <summary>Per-marketplace refresh result, including marketplace name, success flag, and optional failure error.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsListNonEmptySessionIdsResult
+public sealed class MarketplaceRefreshEntry
 {
-    /// <summary>Session IDs ordered newest-first.</summary>
-    [JsonPropertyName("sessionIds")]
-    public IList<string> SessionIds { get => field ??= []; set; }
-}
+    /// <summary>Error message (failure only).</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-/// <summary>Limit for non-empty local session IDs.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsListNonEmptySessionIdsRequest
-{
-    /// <summary>Maximum number of session IDs to return.</summary>
-    [JsonPropertyName("limit")]
-    public long? Limit { get; set; }
-}
+    /// <summary>Marketplace name that was refreshed.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-/// <summary>ID of the local session bound to the given GitHub task, or omitted when none.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionsFindByTaskIDResult
-{
-    /// <summary>Omitted when no local session is bound to that GitHub task.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>Whether the refresh succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>GitHub task ID to look up.</summary>
+/// <summary>Result of refreshing one or more marketplace catalogs.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsFindByTaskIDRequest
+public sealed class MarketplaceRefreshResult
 {
-    /// <summary>GitHub task ID to look up.</summary>
-    [JsonPropertyName("taskId")]
-    public string TaskId { get; set; } = string.Empty;
+    /// <summary>Per-marketplace refresh results in deterministic order.</summary>
+    [JsonPropertyName("results")]
+    public IList<MarketplaceRefreshEntry> Results { get => field ??= []; set; }
 }
 
-/// <summary>Session ID matching the prefix, omitted when no unique match exists.</summary>
+/// <summary>RPC data type for PluginsMarketplacesRefresh operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsFindByPrefixResult
+internal sealed class PluginsMarketplacesRefreshRequest
 {
-    /// <summary>Omitted when no unique session matches the prefix (no match or ambiguous).</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 }
 
-/// <summary>UUID prefix to resolve to a unique session ID.</summary>
+/// <summary>Server-side skill metadata, including name, description, source, enabled/invocable state, path, project path, and argument hint.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsFindByPrefixRequest
+public sealed class ServerSkill
 {
-    /// <summary>UUID prefix (&gt;=7 hex chars, &lt;36 chars). Returns the unique session ID, or undefined when there is no match or the prefix matches multiple sessions.</summary>
-    [JsonPropertyName("prefix")]
-    public string Prefix { get; set; } = string.Empty;
-}
+    /// <summary>Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field.</summary>
+    [JsonPropertyName("argumentHint")]
+    public string? ArgumentHint { get; set; }
 
-/// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionsGetLastForContextResult
-{
-    /// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>Canonical slash command name used to invoke the skill, without the leading '/'.</summary>
+    [JsonPropertyName("commandName")]
+    public string? CommandName { get; set; }
+
+    /// <summary>Description of what the skill does.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Whether the skill is currently enabled (based on global config).</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>Unique identifier for the skill.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Absolute path to the skill file.</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
+
+    /// <summary>The project path this skill belongs to (only for project/inherited skills).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
+
+    /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
+    [JsonPropertyName("source")]
+    public SkillSource Source { get; set; }
+
+    /// <summary>Whether the skill can be invoked by the user as a slash command.</summary>
+    [JsonPropertyName("userInvocable")]
+    public bool UserInvocable { get; set; }
 }
 
-/// <summary>Optional working-directory context used to score session relevance.</summary>
+/// <summary>Skills discovered across global and project sources.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetLastForContextRequest
+public sealed class ServerSkillList
 {
-    /// <summary>Optional working-directory context used to score session relevance. When omitted the most-recently-modified session wins.</summary>
-    [JsonPropertyName("context")]
-    public SessionContext? Context { get; set; }
+    /// <summary>Messages for skills that failed to load (e.g. malformed SKILL.md). Empty when host skills are excluded so host-local paths are not disclosed to multitenant callers.</summary>
+    [JsonPropertyName("errors")]
+    public IList<string>? Errors { get; set; }
+
+    /// <summary>All discovered skills across all sources.</summary>
+    [JsonPropertyName("skills")]
+    public IList<ServerSkill> Skills { get => field ??= []; set; }
 }
 
-/// <summary>Absolute path to the session's events.jsonl file on disk.</summary>
+/// <summary>Optional project paths and additional skill directories to include in discovery.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetEventFilePathResult
+internal sealed class SkillsDiscoverRequest
 {
-    /// <summary>Absolute path to the session's events.jsonl file.</summary>
-    [JsonPropertyName("filePath")]
-    public string FilePath { get; set; } = string.Empty;
+    /// <summary>When true, omit skills from the host's global sources (personal, custom, plugin, and built-in), returning only project-scoped skills. For multitenant deployments.</summary>
+    [JsonPropertyName("excludeHostSkills")]
+    public bool? ExcludeHostSkills { get; set; }
+
+    /// <summary>Optional list of project directory paths to scan for project-scoped skills.</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
+
+    /// <summary>Optional list of additional skill directory paths to include.</summary>
+    [JsonPropertyName("skillDirectories")]
+    public IList<string>? SkillDirectories { get; set; }
 }
 
-/// <summary>Session ID whose event-log file path to compute.</summary>
+/// <summary>Canonical directory where skills can be discovered or created, with scope, preference, and optional project path.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetEventFilePathRequest
+public sealed class SkillDiscoveryPath
 {
-    /// <summary>Session ID whose event-log file path to compute.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Absolute path of the create/discovery target (may not exist on disk yet).</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Whether this is the canonical directory to create a new skill in its tier. At most one entry per tier is preferred; the `personal-agents` and `custom` scopes are never preferred.</summary>
+    [JsonPropertyName("preferredForCreation")]
+    public bool PreferredForCreation { get; set; }
+
+    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
+
+    /// <summary>Which tier this directory belongs to.</summary>
+    [JsonPropertyName("scope")]
+    public SkillDiscoveryScope Scope { get; set; }
 }
 
-/// <summary>Map of sessionId -&gt; on-disk size in bytes for each session's workspace directory.</summary>
+/// <summary>Canonical locations where skills can be created so the runtime will recognize them.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionSizes
+public sealed class SkillDiscoveryPathList
 {
-    /// <summary>Map of sessionId -&gt; on-disk size in bytes for the session's workspace directory.</summary>
-    [JsonPropertyName("sizes")]
-    public IDictionary<string, long> Sizes { get => field ??= new Dictionary<string, long>(); set; }
+    /// <summary>Canonical skill create/discovery directories, in priority order.</summary>
+    [JsonPropertyName("paths")]
+    public IList<SkillDiscoveryPath> Paths { get => field ??= []; set; }
 }
 
-/// <summary>Session IDs from the input set that are currently in use by another process.</summary>
+/// <summary>Optional project paths to enumerate.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsCheckInUseResult
+internal sealed class SkillsGetDiscoveryPathsRequest
 {
-    /// <summary>Session IDs from the input set that are currently held by another running process via an alive lock file.</summary>
-    [JsonPropertyName("inUse")]
-    public IList<string> InUse { get => field ??= []; set; }
+    /// <summary>When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments.</summary>
+    [JsonPropertyName("excludeHostSkills")]
+    public bool? ExcludeHostSkills { get; set; }
+
+    /// <summary>Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
 }
 
-/// <summary>Session IDs to test for live in-use locks.</summary>
+/// <summary>Skill names to mark as disabled in global configuration, replacing any previous list.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsCheckInUseRequest
+internal sealed class SkillsConfigSetDisabledSkillsRequest
 {
-    /// <summary>Session IDs to test for live in-use locks.</summary>
-    [JsonPropertyName("sessionIds")]
-    public IList<string> SessionIds { get => field ??= []; set; }
+    /// <summary>List of skill names to disable.</summary>
+    [JsonPropertyName("disabledSkills")]
+    public IList<string> DisabledSkills { get => field ??= []; set; }
 }
 
-/// <summary>The session's persisted remote-steerable flag, or omitted when no value has been persisted.</summary>
+/// <summary>Adds or removes a single skill from the global disabled list, leaving every other entry untouched.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetPersistedRemoteSteerableResult
+internal sealed class SkillsConfigSetSkillDisabledRequest
 {
-    /// <summary>The session's persisted remote-steerable flag if recorded; omitted when no value has been persisted.</summary>
-    [JsonPropertyName("remoteSteerable")]
-    public bool? RemoteSteerable { get; set; }
+    /// <summary>True to disable the skill, false to enable it.</summary>
+    [JsonPropertyName("disabled")]
+    public bool Disabled { get; set; }
+
+    /// <summary>Name of the skill to add to or remove from the disabled list.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
+/// <summary>Agent metadata, including identifiers, display details, source, tools, model, MCP servers, skills, and file path.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetPersistedRemoteSteerableRequest
+public sealed class AgentInfo
 {
-    /// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Description of the agent's purpose.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Human-readable display name.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
+
+    /// <summary>Stable identifier for selection. For most agents this is the same as `name`; for plugin/builtin agents it may differ. Always populated; defaults to `name` when no distinct id was assigned.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>MCP server configurations attached to this agent, keyed by server name. Server config shape mirrors the MCP `mcpServers` schema.</summary>
+    [Experimental(Diagnostics.Experimental)]
+    [JsonPropertyName("mcpServers")]
+    public IDictionary<string, JsonElement>? McpServers { get; set; }
+
+    /// <summary>Authored preferred model id for this agent. Runtime model selection may choose a different model; omitted means no authored preference.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+
+    /// <summary>Name of the agent. Use `id` as the stable selection identifier.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Absolute local file path of the agent definition. Only set for file-based agents loaded from disk; remote agents do not have a path.</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
+
+    /// <summary>Authored base prompt for the agent. Runtime prompt assembly may add dynamic context at invocation time. Omitted from `session.agent.list` unless `includePrompt` is true.</summary>
+    [JsonPropertyName("prompt")]
+    public string? Prompt { get; set; }
+
+    /// <summary>Skill names preloaded into this agent's context. Omitted means none.</summary>
+    [JsonPropertyName("skills")]
+    public IList<string>? Skills { get; set; }
+
+    /// <summary>Where the agent definition was loaded from.</summary>
+    [JsonPropertyName("source")]
+    public AgentInfoSource? Source { get; set; }
+
+    /// <summary>Allowed tool names for this agent. Empty array means none; omitted means inherit defaults.</summary>
+    [JsonPropertyName("tools")]
+    public IList<string>? Tools { get; set; }
+
+    /// <summary>Whether the agent can be selected directly by the user. Agents marked `false` are subagent-only.</summary>
+    [JsonPropertyName("userInvocable")]
+    public bool? UserInvocable { get; set; }
 }
 
-/// <summary>Closes a session: emits shutdown, flushes pending events to disk, releases the in-use lock, disposes the active session. Idempotent: succeeds even if the session is not currently active.</summary>
+/// <summary>Agents discovered across user, project, plugin, and remote sources.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsCloseResult
+public sealed class ServerAgentList
 {
+    /// <summary>All discovered agents across all sources.</summary>
+    [JsonPropertyName("agents")]
+    public IList<AgentInfo> Agents { get => field ??= []; set; }
 }
 
-/// <summary>Session ID to close.</summary>
+/// <summary>Optional project paths to include in agent discovery.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsCloseRequest
+internal sealed class AgentsDiscoverRequest
 {
-    /// <summary>Session ID to close.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>When true, omit the host's agents (the user-level agent directory and all plugin agents), leaving only project and remote agents. For multitenant deployments.</summary>
+    [JsonPropertyName("excludeHostAgents")]
+    public bool? ExcludeHostAgents { get; set; }
+
+    /// <summary>Optional list of project directory paths to scan for project-scoped agents. When omitted or empty, only user/plugin/remote-independent agents are returned (no project scan).</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
 }
 
-/// <summary>Map of sessionId -&gt; bytes freed by removing the session's workspace directory.</summary>
+/// <summary>Canonical directory where custom agents can be discovered or created, with scope, preference, and optional project path.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionBulkDeleteResult
+public sealed class AgentDiscoveryPath
 {
-    /// <summary>Map of sessionId -&gt; bytes freed by removing the session's workspace directory. Sessions whose deletion failed are omitted from this map (failures are logged on the server but not surfaced per-id; check the map for absent IDs to detect them).</summary>
-    [JsonPropertyName("freedBytes")]
-    public IDictionary<string, long> FreedBytes { get => field ??= new Dictionary<string, long>(); set; }
+    /// <summary>Absolute path of the search/create directory (may not exist on disk yet).</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Whether this is the canonical directory to create a new agent in its tier. At most one entry per tier is preferred.</summary>
+    [JsonPropertyName("preferredForCreation")]
+    public bool PreferredForCreation { get; set; }
+
+    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
+
+    /// <summary>Which tier this directory belongs to.</summary>
+    [JsonPropertyName("scope")]
+    public AgentDiscoveryPathScope Scope { get; set; }
 }
 
-/// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
+/// <summary>Canonical locations where custom agents can be created so the runtime will recognize them.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsBulkDeleteRequest
+public sealed class AgentDiscoveryPathList
 {
-    /// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
-    [JsonPropertyName("sessionIds")]
-    public IList<string> SessionIds { get => field ??= []; set; }
+    /// <summary>Canonical agent create/discovery directories, in priority order.</summary>
+    [JsonPropertyName("paths")]
+    public IList<AgentDiscoveryPath> Paths { get => field ??= []; set; }
 }
 
-/// <summary>Session ID to delete from disk.</summary>
+/// <summary>Optional project paths to include when enumerating agent discovery directories.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsDeleteRequest
+internal sealed class AgentsGetDiscoveryPathsRequest
 {
-    /// <summary>Session ID to delete.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).</summary>
+    [JsonPropertyName("excludeHostAgents")]
+    public bool? ExcludeHostAgents { get; set; }
 
-    /// <summary>Internal resolved session directory path to delete.</summary>
-    [JsonPropertyName("sessionPath")]
-    public string? SessionPath { get; set; }
+    /// <summary>Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
 }
 
-/// <summary>Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.</summary>
+/// <summary>Loaded instruction source for a session, including path, content, category, location, applicability, and optional description.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionPruneResult
+public sealed class InstructionSource
 {
-    /// <summary>Session IDs that would be deleted in dry-run mode (always empty otherwise).</summary>
-    [JsonPropertyName("candidates")]
-    public IList<string> Candidates { get => field ??= []; set; }
+    /// <summary>Glob pattern(s) from frontmatter — when set, this instruction applies only to matching files.</summary>
+    [JsonPropertyName("applyTo")]
+    public IList<string>? ApplyTo { get; set; }
 
-    /// <summary>Session IDs that were deleted (always empty in dry-run mode).</summary>
-    [JsonPropertyName("deleted")]
-    public IList<string> Deleted { get => field ??= []; set; }
+    /// <summary>Raw content of the instruction file.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <summary>True when no deletions were actually performed.</summary>
-    [JsonPropertyName("dryRun")]
-    public bool DryRun { get; set; }
+    /// <summary>When true, this source starts disabled and must be toggled on by the user.</summary>
+    [JsonPropertyName("defaultDisabled")]
+    public bool? DefaultDisabled { get; set; }
 
-    /// <summary>Total bytes freed (actual when not dry-run, projected when dry-run).</summary>
-    [JsonPropertyName("freedBytes")]
-    public long FreedBytes { get; set; }
+    /// <summary>Short description (body after frontmatter) for use in instruction tables.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Session IDs that were skipped (e.g., named sessions).</summary>
-    [JsonPropertyName("skipped")]
-    public IList<string> Skipped { get => field ??= []; set; }
-}
+    /// <summary>Unique identifier for this source (used for toggling).</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-/// <summary>Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsPruneOldRequest
-{
-    /// <summary>When true, only report what would be deleted without performing any deletion.</summary>
-    [JsonPropertyName("dryRun")]
-    public bool? DryRun { get; set; }
+    /// <summary>Human-readable label.</summary>
+    [JsonPropertyName("label")]
+    public string Label { get; set; } = string.Empty;
 
-    /// <summary>Session IDs that should never be considered for pruning.</summary>
-    [JsonPropertyName("excludeSessionIds")]
-    public IList<string>? ExcludeSessionIds { get; set; }
+    /// <summary>Where this source lives — used for UI grouping.</summary>
+    [JsonPropertyName("location")]
+    public InstructionSourceLocation Location { get; set; }
 
-    /// <summary>When true, named sessions (set via /rename) are also eligible for pruning.</summary>
-    [JsonPropertyName("includeNamed")]
-    public bool? IncludeNamed { get; set; }
+    /// <summary>The project path this source was discovered from. Only set by sessionless discovery for repository, working-directory, and project-scoped plugin sources, where it disambiguates sources across multiple workspace roots. The session-scoped getSources leaves it unset.</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
 
-    /// <summary>Delete sessions whose modifiedTime is at least this many days old.</summary>
-    [JsonPropertyName("olderThanDays")]
-    public long OlderThanDays { get; set; }
+    /// <summary>File path relative to repo or absolute for home.</summary>
+    [JsonPropertyName("sourcePath")]
+    public string SourcePath { get; set; } = string.Empty;
+
+    /// <summary>Category of instruction source — used for merge logic.</summary>
+    [JsonPropertyName("type")]
+    public InstructionSourceType Type { get; set; }
 }
 
-/// <summary>Flush a session's pending events to disk. No-op when no writer exists for the session (e.g., already closed).</summary>
+/// <summary>Instruction sources discovered across user, repository, and plugin sources.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsSaveResult
+public sealed class ServerInstructionSourceList
 {
+    /// <summary>All discovered instruction sources.</summary>
+    [JsonPropertyName("sources")]
+    public IList<InstructionSource> Sources { get => field ??= []; set; }
 }
 
-/// <summary>Session ID whose pending events should be flushed to disk.</summary>
+/// <summary>Optional project paths to include in instruction discovery.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsSaveRequest
+internal sealed class InstructionsDiscoverRequest
 {
-    /// <summary>Session ID whose pending events should be flushed to disk.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>When true, omit the host's instruction sources (user/home-level files and plugin rules), leaving only repository and working-directory sources. For multitenant deployments.</summary>
+    [JsonPropertyName("excludeHostInstructions")]
+    public bool? ExcludeHostInstructions { get; set; }
+
+    /// <summary>Optional list of project directory paths to scan for repository/working-directory instruction sources. When omitted or empty, only user-level and plugin instruction sources are returned (no project scan).</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
 }
 
-/// <summary>Release the in-use lock held by this process for the given session. No-op when this process does not currently hold a lock for the session.</summary>
+/// <summary>Canonical file or directory where custom instructions can be discovered or created, with location, kind, preference, and project path.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsReleaseLockResult
+public sealed class InstructionDiscoveryPath
 {
+    /// <summary>Whether the target is a single file or a directory of instruction files.</summary>
+    [JsonPropertyName("kind")]
+    public InstructionDiscoveryPathKind Kind { get; set; }
+
+    /// <summary>Which tier this target belongs to.</summary>
+    [JsonPropertyName("location")]
+    public InstructionDiscoveryPathLocation Location { get; set; }
+
+    /// <summary>Absolute path of the file or directory (may not exist on disk yet).</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Whether this is the canonical target to create new instructions in its tier. At most one entry per tier is preferred.</summary>
+    [JsonPropertyName("preferredForCreation")]
+    public bool PreferredForCreation { get; set; }
+
+    /// <summary>The input project path this target was derived from (only for repository targets).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
 }
 
-/// <summary>Session ID whose in-use lock should be released.</summary>
+/// <summary>Canonical files and directories where custom instructions can be created so the runtime will recognize them.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsReleaseLockRequest
+public sealed class InstructionDiscoveryPathList
 {
-    /// <summary>Session ID whose in-use lock should be released.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Canonical instruction create/discovery files and directories, in priority order.</summary>
+    [JsonPropertyName("paths")]
+    public IList<InstructionDiscoveryPath> Paths { get => field ??= []; set; }
 }
 
-/// <summary>The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.</summary>
+/// <summary>Optional project paths to include when enumerating instruction discovery targets.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionEnrichMetadataResult
+internal sealed class InstructionsGetDiscoveryPathsRequest
 {
-    /// <summary>Enriched records, with summary and context backfilled. Sessions confirmed empty and unnamed may be omitted.</summary>
-    [JsonPropertyName("sessions")]
-    public IList<LocalSessionMetadataValue> Sessions { get => field ??= []; set; }
+    /// <summary>When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).</summary>
+    [JsonPropertyName("excludeHostInstructions")]
+    public bool? ExcludeHostInstructions { get; set; }
+
+    /// <summary>Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
 }
 
-/// <summary>Session metadata records to enrich with summary and context information.</summary>
+/// <summary>A literal choice the command input accepts, with a human-facing description.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsEnrichMetadataRequest
+public sealed class SlashCommandInputChoice
 {
-    /// <summary>Session metadata records to enrich. Records that already have summary and context are returned unchanged.</summary>
-    [JsonPropertyName("sessions")]
-    public IList<LocalSessionMetadataValue> Sessions { get => field ??= []; set; }
-}
+    /// <summary>Human-readable description shown alongside the choice.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-/// <summary>Reload all hooks (user, plugin, optionally repo) and apply them to the active session. Call after installing or removing plugins so their hooks take effect immediately. No-op when no active session matches the given sessionId.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionsReloadPluginHooksResult
-{
+    /// <summary>The literal choice value (e.g. 'on', 'off', 'show').</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Active session ID and an optional flag for deferring repo-level hooks until folder trust.</summary>
+/// <summary>Optional unstructured input hint.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsReloadPluginHooksRequest
+public sealed class SlashCommandInput
 {
-    /// <summary>When true, skip repo-level hooks. Use before folder trust is confirmed; loadDeferredRepoHooks loads them post-trust.</summary>
-    [JsonPropertyName("deferRepoHooks")]
-    public bool? DeferRepoHooks { get; set; }
+    /// <summary>Optional literal choices the input accepts, each with a human-facing description; clients may render these as selectable options.</summary>
+    [JsonPropertyName("choices")]
+    public IList<SlashCommandInputChoice>? Choices { get; set; }
 
-    /// <summary>Active session ID to reload hooks for.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Optional completion hint for the input (e.g. 'directory' for filesystem path completion).</summary>
+    [JsonPropertyName("completion")]
+    public SlashCommandInputCompletion? Completion { get; set; }
 
-/// <summary>Queued repo-level startup prompts and the total hook command count after loading.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionLoadDeferredRepoHooksResult
-{
-    /// <summary>Total hook command count (user + plugin + repo) loaded for the session by this call. Captured atomically with startupPrompts so callers don't need to read a separate counter.</summary>
-    [JsonPropertyName("hookCount")]
-    public long HookCount { get; set; }
+    /// <summary>Hint to display when command input has not been provided.</summary>
+    [JsonPropertyName("hint")]
+    public string Hint { get; set; } = string.Empty;
 
-    /// <summary>Repo-level startup prompts queued from repo hook configs. Empty on resume, when no repo configs were pending, or when disableAllHooks is set.</summary>
-    [JsonPropertyName("startupPrompts")]
-    public IList<string> StartupPrompts { get => field ??= []; set; }
-}
+    /// <summary>When true, clients should pass the full text after the command name as a single argument rather than splitting on whitespace.</summary>
+    [JsonPropertyName("preserveMultilineInput")]
+    public bool? PreserveMultilineInput { get; set; }
 
-/// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsLoadDeferredRepoHooksRequest
-{
-    /// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>When true, the command requires non-empty input; clients should render the input hint as required.</summary>
+    [JsonPropertyName("required")]
+    public bool? Required { get; set; }
 }
 
-/// <summary>Replace the manager-wide additional plugins. New session creations and subsequent hook reloads see the new set; already-running sessions keep their existing hook installation until the next reload.</summary>
+/// <summary>Slash-command metadata with name, aliases, description, kind, input hint, execution allowance, and schedulability.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsSetAdditionalPluginsResult
+public sealed class SlashCommandInfo
 {
-}
+    /// <summary>Canonical aliases without leading slashes.</summary>
+    [JsonPropertyName("aliases")]
+    public IList<string>? Aliases { get; set; }
 
-/// <summary>Installed plugin record from global state, with marketplace, version, install time, enabled state, cache path, and source.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class InstalledPlugin
-{
-    /// <summary>Path where the plugin is cached locally.</summary>
-    [JsonPropertyName("cache_path")]
-    public string? CachePath { get; set; }
+    /// <summary>Whether the command may run while an agent turn is active.</summary>
+    [JsonPropertyName("allowDuringAgentExecution")]
+    public bool AllowDuringAgentExecution { get; set; }
 
-    /// <summary>Whether the plugin is currently enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>Human-readable command description.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>Installation timestamp.</summary>
-    [JsonPropertyName("installed_at")]
-    public string InstalledAt { get; set; } = string.Empty;
+    /// <summary>Whether the command is experimental.</summary>
+    [JsonPropertyName("experimental")]
+    public bool? Experimental { get; set; }
 
-    /// <summary>Marketplace the plugin came from (empty string for direct repo installs).</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
+    /// <summary>Optional unstructured input hint.</summary>
+    [JsonPropertyName("input")]
+    public SlashCommandInput? Input { get; set; }
 
-    /// <summary>Plugin name.</summary>
+    /// <summary>Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command.</summary>
+    [JsonPropertyName("kind")]
+    public SlashCommandKind Kind { get; set; }
+
+    /// <summary>Canonical command name without a leading slash.</summary>
     [JsonPropertyName("name")]
     public string Name { get; set; } = string.Empty;
 
-    /// <summary>Source for direct repo installs (when marketplace is empty).</summary>
-    [JsonPropertyName("source")]
-    public JsonElement? Source { get; set; }
-
-    /// <summary>Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.</summary>
-    [JsonPropertyName("source_sha")]
-    public string? SourceSha { get; set; }
-
-    /// <summary>Version installed (if available).</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    /// <summary>Whether the command may be the target of `/every` / `/after` schedules. Resolution happens at every tick, so only set this when the command is safe to re-invoke and produces an agent prompt.</summary>
+    [JsonPropertyName("schedulable")]
+    public bool? Schedulable { get; set; }
 }
 
-/// <summary>Manager-wide additional plugins to register; replaces any previously-configured set.</summary>
+/// <summary>Slash commands available in the session, after applying any include/exclude filters.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsSetAdditionalPluginsRequest
+public sealed class CommandList
 {
-    /// <summary>Manager-wide additional plugins to register. Replaces any previously-configured set. Pass an empty array to clear.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<InstalledPlugin> Plugins { get => field ??= []; set; }
+    /// <summary>Commands available in this session.</summary>
+    [JsonPropertyName("commands")]
+    public IList<SlashCommandInfo> Commands { get => field ??= []; set; }
 }
 
-/// <summary>Dynamic-context board entry count, when available.</summary>
+/// <summary>A single user setting's effective value alongside its default, so consumers can render settings left at their default.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetBoardEntryCountResult
+public sealed class UserSettingMetadata
 {
-    /// <summary>Board entry count, when available.</summary>
-    [JsonPropertyName("count")]
-    public long? Count { get; set; }
+    /// <summary>The centrally-known default for this setting (null when no default is registered).</summary>
+    [JsonPropertyName("default")]
+    public JsonElement Default { get; set; }
+
+    /// <summary>True when the user has not set an explicit value for this setting (i.e. it is left at its default). Reflects whether the user has overridden the key, not whether the effective value happens to equal the default — a key explicitly set to a value identical to the default still reports false.</summary>
+    [JsonPropertyName("isDefault")]
+    public bool IsDefault { get; set; }
+
+    /// <summary>The effective value: the user's value if set, otherwise the default.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement Value { get; set; }
 }
 
-/// <summary>Session ID whose board entry count should be returned.</summary>
+/// <summary>Per-key metadata for every known user setting (settings.json overlaid with the legacy config.json, config.json wins), including settings left at their default. Excludes repository- and enterprise-managed overrides.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetBoardEntryCountRequest
+public sealed class UserSettingsGetResult
 {
-    /// <summary>Session ID whose board entry count should be returned.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Every known user setting keyed by setting name, each with its effective value, default, and whether it is at the default.</summary>
+    [JsonPropertyName("settings")]
+    public IDictionary<string, UserSettingMetadata> Settings { get => field ??= new Dictionary<string, UserSettingMetadata>(); set; }
 }
 
-/// <summary>State of the runtime-managed remote-control singleton.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>state</c>.</remarks>
+/// <summary>Outcome of writing user settings.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "state",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(RemoteControlStatusOff), "off")]
-[JsonDerivedType(typeof(RemoteControlStatusConnecting), "connecting")]
-[JsonDerivedType(typeof(RemoteControlStatusActive), "active")]
-[JsonDerivedType(typeof(RemoteControlStatusError), "error")]
-public partial class RemoteControlStatus
+public sealed class UserSettingsSetResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("state")]
-    public virtual string State { get; set; } = string.Empty;
+    /// <summary>Top-level keys whose write landed in settings.json but is shadowed by a value still present in the legacy config.json (config.json wins on read). The write does not take effect until the legacy value is removed.</summary>
+    [JsonPropertyName("shadowedKeys")]
+    public IList<string> ShadowedKeys { get => field ??= []; set; }
 }
 
-
-/// <summary>Remote control is not connected.</summary>
-/// <remarks>The <c>off</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <summary>Partial user settings to write to settings.json. Each top-level key is written individually, replacing the existing value; a key whose value is null is removed.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class RemoteControlStatusOff : RemoteControlStatus
+internal sealed class UserSettingsSetRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string State => "off";
+    /// <summary>Partial user settings to write, as a free-form object keyed by setting name.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement Settings { get; set; }
 }
 
-/// <summary>Remote control is in the middle of initial setup.</summary>
-/// <remarks>The <c>connecting</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <summary>Validated device-managed settings discovered before a session exists.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class RemoteControlStatusConnecting : RemoteControlStatus
+public sealed class ManagedSettingsReadResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string State => "connecting";
+    /// <summary>Discovery or validation error text when managed settings could not be read safely.</summary>
+    [JsonPropertyName("errorMessage")]
+    public string? ErrorMessage { get; set; }
 
-    /// <summary>Session id the connection is attaching to.</summary>
-    [JsonPropertyName("attachedSessionId")]
-    public required string AttachedSessionId { get; set; }
+    /// <summary>Validated, canonical managed-settings JSON. Omitted when no managed settings were discovered or when discovered settings failed validation.</summary>
+    [JsonPropertyName("settingsJson")]
+    public JsonElement? SettingsJson { get; set; }
 }
 
-/// <summary>Remote control is connected to a local session.</summary>
-/// <remarks>The <c>active</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <summary>Indicates whether the calling client was registered as the session filesystem provider.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class RemoteControlStatusActive : RemoteControlStatus
+public sealed class SessionFsSetProviderResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string State => "active";
+    /// <summary>Whether the provider was set successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>Session id remote control is pointed at.</summary>
-    [JsonPropertyName("attachedSessionId")]
-    public required string AttachedSessionId { get; set; }
+/// <summary>Optional capabilities declared by the provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionFsSetProviderCapabilities
+{
+    /// <summary>Whether the provider supports SQLite query/exists operations.</summary>
+    [JsonPropertyName("sqlite")]
+    public bool? Sqlite { get; set; }
+}
 
-    /// <summary>True while a read-only/session-sync export is deferred, awaiting the first `user.message` before its MC session exists. Marked internal: this field is excluded from the public SDK surface and is populated only on the CLI in-process path.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("awaitingFirstMessage")]
-    internal bool? AwaitingFirstMessage { get; set; }
+/// <summary>Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionFsSetProviderRequest
+{
+    /// <summary>Optional capabilities declared by the provider.</summary>
+    [JsonPropertyName("capabilities")]
+    public SessionFsSetProviderCapabilities? Capabilities { get; set; }
 
-    /// <summary>MC frontend URL for this session, when known.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("frontendUrl")]
-    public string? FrontendUrl { get; set; }
+    /// <summary>Path conventions used by this filesystem.</summary>
+    [JsonPropertyName("conventions")]
+    public SessionFsSetProviderConventions Conventions { get; set; }
 
-    /// <summary>Whether the MC session may steer this session.</summary>
-    [JsonPropertyName("isSteerable")]
-    public required bool IsSteerable { get; set; }
+    /// <summary>Initial working directory for sessions.</summary>
+    [JsonPropertyName("initialCwd")]
+    public string InitialCwd { get; set; } = string.Empty;
 
-    /// <summary>In-process prompt-manager handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, the same bidirectional prompt-routing handshake is expressed via dedicated remote-control RPCs (register/resolve) rather than a shared in-process object.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("promptManager")]
-    internal JsonElement? PromptManager { get; set; }
+    /// <summary>Path within each session's SessionFs where the runtime stores files for that session.</summary>
+    [JsonPropertyName("sessionStatePath")]
+    public string SessionStatePath { get; set; } = string.Empty;
 }
 
-/// <summary>The last setup attempt failed. The singleton is otherwise off.</summary>
-/// <remarks>The <c>error</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <summary>Indicates whether the calling client was registered as the LLM inference provider.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class RemoteControlStatusError : RemoteControlStatus
+public sealed class LlmInferenceSetProviderResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string State => "error";
+    /// <summary>Whether the provider was set successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>Session id the failing setup attempt targeted, when known.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("attachedSessionId")]
-    public string? AttachedSessionId { get; set; }
-
-    /// <summary>Human-readable error message from the last setup attempt.</summary>
-    [JsonPropertyName("error")]
-    public required string Error { get; set; }
-}
-
-/// <summary>Wrapper for the singleton's current status.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlStatusResult
-{
-    /// <summary>State of the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("status")]
-    public RemoteControlStatus Status { get => field ??= new(); set; }
-}
-
-/// <summary>Reattach to an existing MC session without creating a new one.</summary>
+/// <summary>Whether the start frame was accepted.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlConfigExistingMcSession
+public sealed class LlmInferenceHttpResponseStartResult
 {
-    /// <summary>Existing MC session ID to reattach to.</summary>
-    [JsonPropertyName("mcSessionId")]
-    public string McSessionId { get; set; } = string.Empty;
-
-    /// <summary>Existing MC task ID for the reattached session.</summary>
-    [JsonPropertyName("mcTaskId")]
-    public string McTaskId { get; set; } = string.Empty;
+    /// <summary>True when the response start was matched to a pending request; false when unknown.</summary>
+    [JsonPropertyName("accepted")]
+    public bool Accepted { get; set; }
 }
 
-/// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
+/// <summary>Response head.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlConfig
+internal sealed class LlmInferenceHttpResponseStartRequest
 {
-    /// <summary>Reattach to an existing MC session without creating a new one.</summary>
-    [JsonPropertyName("existingMcSession")]
-    public RemoteControlConfigExistingMcSession? ExistingMcSession { get; set; }
-
-    /// <summary>Whether the user explicitly requested remote (vs. implicit session-sync). Controls warning surfacing for missing-repo cases.</summary>
-    [JsonPropertyName("explicit")]
-    public bool Explicit { get; set; }
-
-    /// <summary>Whether remote export should be enabled.</summary>
-    [JsonPropertyName("remote")]
-    public bool Remote { get; set; }
+    /// <summary>HTTP response headers, preserving multiple values per name.</summary>
+    [JsonPropertyName("headers")]
+    public IDictionary<string, IList<string>> Headers { get => field ??= new Dictionary<string, IList<string>>(); set; }
 
-    /// <summary>When true, suppresses timeline messages on successful setup.</summary>
-    [JsonPropertyName("silent")]
-    public bool Silent { get; set; }
+    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 
-    /// <summary>Whether the MC session may steer the local session (write mode).</summary>
-    [JsonPropertyName("steerable")]
-    public bool Steerable { get; set; }
+    /// <summary>HTTP status code.</summary>
+    [JsonPropertyName("status")]
+    public long Status { get; set; }
 
-    /// <summary>Existing Mission Control task ID to attach the exported session to.</summary>
-    [JsonPropertyName("taskId")]
-    public string? TaskId { get; set; }
+    /// <summary>Optional HTTP status reason phrase.</summary>
+    [JsonPropertyName("statusText")]
+    public string? StatusText { get; set; }
 }
 
-/// <summary>Parameters for attaching the remote-control singleton to a session.</summary>
+/// <summary>Whether the chunk was accepted.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsStartRemoteControlRequest
+public sealed class LlmInferenceHttpResponseChunkResult
 {
-    /// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("config")]
-    public RemoteControlConfig Config { get => field ??= new(); set; }
-
-    /// <summary>Local session id to attach remote control to.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>True when the chunk was matched to a pending request; false when unknown.</summary>
+    [JsonPropertyName("accepted")]
+    public bool Accepted { get; set; }
 }
 
-/// <summary>Outcome of a transferRemoteControl call.</summary>
+/// <summary>Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlTransferResult
+public sealed class LlmInferenceHttpResponseChunkError
 {
-    /// <summary>State of the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("status")]
-    public RemoteControlStatus Status { get => field ??= new(); set; }
+    /// <summary>Optional machine-readable error code.</summary>
+    [JsonPropertyName("code")]
+    public string? Code { get; set; }
 
-    /// <summary>Whether the rebinding actually happened.</summary>
-    [JsonPropertyName("transferred")]
-    public bool Transferred { get; set; }
+    /// <summary>Human-readable failure description.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for atomically rebinding the remote-control singleton.</summary>
+/// <summary>A response body chunk or terminal error.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsTransferRemoteControlRequest
+internal sealed class LlmInferenceHttpResponseChunkRequest
 {
-    /// <summary>When provided, the transfer is rejected unless the singleton currently points at this session id (compare-and-swap semantics to avoid clobbering newer state).</summary>
-    [JsonPropertyName("expectedFromSessionId")]
-    public string? ExpectedFromSessionId { get; set; }
+    /// <summary>When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.</summary>
+    [JsonPropertyName("binary")]
+    public bool? Binary { get; set; }
 
-    /// <summary>Local session id to point remote control at.</summary>
-    [JsonPropertyName("toSessionId")]
-    public string ToSessionId { get; set; } = string.Empty;
-}
+    /// <summary>Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty (e.g. when the response body is empty: send a single chunk with empty data and end=true).</summary>
+    [JsonPropertyName("data")]
+    public string Data { get; set; } = string.Empty;
 
-/// <summary>Patch for the singleton's steering state.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsSetRemoteControlSteeringRequest
-{
-    /// <summary>Target steering state. Today only `true` is actionable on the underlying exporter; `false` is reserved for future use.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-}
+    /// <summary>When true, this is the final body chunk for the response. The runtime treats the response body as complete after receiving an end-marked chunk.</summary>
+    [JsonPropertyName("end")]
+    public bool? End { get; set; }
 
-/// <summary>Outcome of a stopRemoteControl call.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlStopResult
-{
-    /// <summary>State of the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("status")]
-    public RemoteControlStatus Status { get => field ??= new(); set; }
+    /// <summary>Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.</summary>
+    [JsonPropertyName("error")]
+    public LlmInferenceHttpResponseChunkError? Error { get; set; }
 
-    /// <summary>Whether the singleton was actually torn down by this call.</summary>
-    [JsonPropertyName("stopped")]
-    public bool Stopped { get; set; }
+    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for SessionsStopRemoteControl operations.</summary>
+/// <summary>Pre-resolved working-directory context for session startup.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsStopRemoteControlRequest
+public sealed class SessionContext
 {
-    /// <summary>When provided, the stop is rejected unless the singleton currently points at this session id (compare-and-swap semantics).</summary>
-    [JsonPropertyName("expectedSessionId")]
-    public string? ExpectedSessionId { get; set; }
+    /// <summary>Active git branch.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-    /// <summary>When true, the singleton is unconditionally torn down regardless of `expectedSessionId`. Use during shutdown or explicit `/remote off`.</summary>
-    [JsonPropertyName("force")]
-    public bool? Force { get; set; }
-}
+    /// <summary>Most recent working directory for this session.</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
 
-/// <summary>Handle for releasing the extension tool registration.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class RegisterExtensionToolsResult
-{
-    /// <summary>In-process unsubscribe function (CLI-only optimization). Marked internal: replaced by an explicit `extensions.unregister` RPC in the SDK migration.</summary>
-    [JsonInclude]
-    [JsonPropertyName("unsubscribe")]
-    internal JsonElement Unsubscribe { get; set; }
-}
+    /// <summary>Git repository root, if the cwd was inside a git repo.</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { get; set; }
 
-/// <summary>Optional registration options.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionsRegisterExtensionToolsOnSessionOptions
-{
-    /// <summary>In-process `() =&gt; boolean` gating callback (CLI-only optimization). Marked internal: replaced by runtime-side enable/disable RPCs in the SDK migration.</summary>
-    [JsonInclude]
-    [JsonPropertyName("enabled")]
-    internal JsonElement? Enabled { get; set; }
+    /// <summary>Repository host type.</summary>
+    [JsonPropertyName("hostType")]
+    public SessionContextHostType? HostType { get; set; }
+
+    /// <summary>Repository slug in `owner/name` form, when known.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
 }
 
-/// <summary>Params to attach an extension loader's tools to a session.</summary>
+/// <summary>GitHub repository the remote session belongs to.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class RegisterExtensionToolsParams
+public sealed class RemoteSessionMetadataRepository
 {
-    /// <summary>In-process ExtensionLoader handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, extension discovery/launch moves entirely into the runtime — the CLI passes pure config (search paths, disabled ids) via SessionOptions instead.</summary>
-    [JsonInclude]
-    [JsonPropertyName("loader")]
-    internal JsonElement Loader { get; set; }
+    /// <summary>Branch associated with the remote session.</summary>
+    [JsonPropertyName("branch")]
+    public string Branch { get; set; } = string.Empty;
 
-    /// <summary>Optional registration options.</summary>
-    [JsonPropertyName("options")]
-    public SessionsRegisterExtensionToolsOnSessionOptions? Options { get; set; }
+    /// <summary>Repository name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Session to register extension tools on.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Repository owner.</summary>
+    [JsonPropertyName("owner")]
+    public string Owner { get; set; } = string.Empty;
 }
 
-/// <summary>Params to attach or detach an in-process ExtensionController delegate.</summary>
+/// <summary>Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ConfigureSessionExtensionsParams
+public sealed class RemoteSessionMetadataValue
 {
-    /// <summary>In-process ExtensionController delegate (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. The post-SDK extension surface exposes list/enable/disable/reload via dedicated RPCs served by the runtime.</summary>
-    [JsonInclude]
-    [JsonPropertyName("controller")]
-    internal JsonElement? Controller { get; set; }
+    /// <summary>Most recent working directory context.</summary>
+    [JsonPropertyName("context")]
+    public SessionContext? Context { get; set; }
 
-    /// <summary>Session to attach the extension controller delegate to.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Host-supplied human description of what the session is doing right now ("running tests", "waiting for approval"). Optional in the protocol and absent on hosts that do not publish it, so never rely on it -- it enriches `hostStatus`, it does not replace it.</summary>
+    [JsonPropertyName("hostActivity")]
+    public string? HostActivity { get; set; }
 
-/// <summary>Outcome of an agentRegistry.spawn call.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AgentRegistrySpawnResultSpawned), "spawned")]
-[JsonDerivedType(typeof(AgentRegistrySpawnResultSpawnError), "spawn-error")]
-[JsonDerivedType(typeof(AgentRegistrySpawnResultRegistryTimeout), "registry-timeout")]
-[JsonDerivedType(typeof(AgentRegistrySpawnResultValidationError), "validation-error")]
-public partial class AgentRegistrySpawnResult
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Live status as the owning host reports it in its session listing, so a row for a session running elsewhere can show that it is running. Absent for hosts that publish no such status (the cloud task managers), which read as idle.</summary>
+    [JsonPropertyName("hostStatus")]
+    public RemoteSessionHostStatus? HostStatus { get; set; }
 
+    /// <summary>Always true for remote sessions.</summary>
+    [JsonPropertyName("isRemote")]
+    public bool IsRemote { get; set; }
 
-/// <summary>Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class AgentRegistryLiveTargetEntry
-{
-    /// <summary>Kind of attention required when status === "attention". Meaningful only when status === "attention".</summary>
-    [JsonPropertyName("attentionKind")]
-    public AgentRegistryLiveTargetEntryAttentionKind? AttentionKind { get; set; }
+    /// <summary>Last-modified time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public string ModifiedTime { get; set; } = string.Empty;
 
-    /// <summary>Git branch of the session (when known).</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
+    /// <summary>Optional human-friendly name set via /rename.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Copilot CLI version that wrote the entry.</summary>
-    [JsonPropertyName("copilotVersion")]
-    public string CopilotVersion { get; set; } = string.Empty;
+    /// <summary>Pull request number associated with the session.</summary>
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
 
-    /// <summary>Working directory of the session (when known).</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
-
-    /// <summary>Bind host for the entry's JSON-RPC server.</summary>
-    [JsonPropertyName("host")]
-    public string Host { get; set; } = string.Empty;
-
-    /// <summary>Process kind tag for the registry entry.</summary>
-    [JsonPropertyName("kind")]
-    public AgentRegistryLiveTargetEntryKind Kind { get; set; }
-
-    /// <summary>Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness).</summary>
-    [JsonPropertyName("lastSeenMs")]
-    public long LastSeenMs { get; set; }
-
-    /// <summary>How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.</summary>
-    [JsonPropertyName("lastTerminalEvent")]
-    public AgentRegistryLiveTargetEntryLastTerminalEvent? LastTerminalEvent { get; set; }
-
-    /// <summary>Model identifier currently selected for the session.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
-
-    /// <summary>Operating-system pid of the process owning this entry.</summary>
-    [JsonPropertyName("pid")]
-    public long Pid { get; set; }
+    /// <summary>Backing remote session IDs (most recent first).</summary>
+    [JsonPropertyName("remoteSessionIds")]
+    public IList<string> RemoteSessionIds { get => field ??= []; set; }
 
-    /// <summary>TCP port the entry's JSON-RPC server is listening on.</summary>
-    [JsonPropertyName("port")]
-    public long Port { get; set; }
+    /// <summary>GitHub repository the remote session belongs to.</summary>
+    [JsonPropertyName("repository")]
+    public RemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
 
-    /// <summary>Registry entry schema version (1 = ui-server, 2 = managed-server).</summary>
-    [JsonPropertyName("schemaVersion")]
-    public long SchemaVersion { get; set; }
+    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
 
-    /// <summary>Session ID of the foreground session for this entry.</summary>
+    /// <summary>Stable session identifier.</summary>
     [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Friendly session name (when set).</summary>
-    [JsonPropertyName("sessionName")]
-    public string? SessionName { get; set; }
+    /// <summary>Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.</summary>
+    [JsonPropertyName("staleAt")]
+    public string? StaleAt { get; set; }
 
-    /// <summary>ISO 8601 timestamp captured at registration.</summary>
-    [JsonPropertyName("startedAt")]
-    public string StartedAt { get; set; } = string.Empty;
+    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("startTime")]
+    public string StartTime { get; set; } = string.Empty;
 
-    /// <summary>Coarse lifecycle status of the foreground session.</summary>
-    [JsonPropertyName("status")]
-    public AgentRegistryLiveTargetEntryStatus? Status { get; set; }
+    /// <summary>Server-side task state returned by GitHub.</summary>
+    [JsonPropertyName("state")]
+    public string? State { get; set; }
 
-    /// <summary>Monotonic per-publisher revision counter incremented on every status update. Lets watchers detect transient flips.</summary>
-    [JsonPropertyName("statusRevision")]
-    public long? StatusRevision { get; set; }
+    /// <summary>Short summary of the session, when one has been derived.</summary>
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
 
-    /// <summary>Connection token (null when the target is unauthenticated).</summary>
-    [JsonInclude]
-    [JsonPropertyName("token")]
-    internal string? Token { get; set; }
+    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
+    [JsonPropertyName("taskType")]
+    public RemoteSessionMetadataTaskType? TaskType { get; set; }
 }
 
-/// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
+/// <summary>`sessions.open` handoff progress update with step, status, and optional message.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentRegistryLogCapture
+public sealed class SessionsOpenProgress
 {
-    /// <summary>Whether per-spawn log capture is on (false when env-disabled or open failed).</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Human-readable open failure message (only set when enabled === false AND the env-disable opt-out was NOT used).</summary>
-    [JsonPropertyName("openError")]
-    public string? OpenError { get; set; }
+    /// <summary>Optional step message.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
 
-    /// <summary>Categorized reason for log-open failure.</summary>
-    [JsonPropertyName("openErrorReason")]
-    public AgentRegistryLogCaptureOpenErrorReason? OpenErrorReason { get; set; }
+    /// <summary>Step status.</summary>
+    [JsonPropertyName("status")]
+    public SessionsOpenProgressStatus Status { get; set; }
 
-    /// <summary>Absolute path to the per-spawn log file (only set when enabled).</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+    /// <summary>Handoff step.</summary>
+    [JsonPropertyName("step")]
+    public SessionsOpenProgressStep Step { get; set; }
 }
 
-/// <summary>Managed-server child was spawned and registered successfully.</summary>
-/// <remarks>The <c>spawned</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+/// <summary>Result of opening a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultSpawned : AgentRegistrySpawnResult
+public sealed class SessionOpenResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "spawned";
+    /// <summary>Remote session metadata, present when status is `connected`.</summary>
+    [JsonPropertyName("metadata")]
+    public RemoteSessionMetadataValue? Metadata { get; set; }
 
-    /// <summary>Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).</summary>
-    [JsonPropertyName("entry")]
-    public required AgentRegistryLiveTargetEntry Entry { get; set; }
+    /// <summary>Handoff progress steps, present when status is `handed_off`.</summary>
+    [JsonPropertyName("progress")]
+    public IList<SessionsOpenProgress>? Progress { get; set; }
 
-    /// <summary>If the delegate attempted to send the initial prompt and failed, the categorized error message.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("initialPromptError")]
-    public string? InitialPromptError { get; set; }
+    /// <summary>Remote session ID, present when status is `connected`.</summary>
+    [JsonPropertyName("remoteSessionId")]
+    public string? RemoteSessionId { get; set; }
 
-    /// <summary>Whether the delegate already sent the initial prompt. Always omitted in the current wiring: the controller sends the prompt post-attach via the standard LocalRpcSession.send path.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("initialPromptSent")]
-    public bool? InitialPromptSent { get; set; }
+    /// <summary>Opened session ID. Omitted when status is `not_found`.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
 
-    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("logCapture")]
-    public AgentRegistryLogCapture? LogCapture { get; set; }
+    /// <summary>Startup prompts queued by user-level hook configs at session creation. Only populated when status is `created`; resumed sessions return an empty array.</summary>
+    [JsonPropertyName("startupPrompts")]
+    public IList<string>? StartupPrompts { get; set; }
+
+    /// <summary>Outcome of the open request.</summary>
+    [JsonPropertyName("status")]
+    public SessionsOpenStatus Status { get; set; }
 }
 
-/// <summary>`child_process.spawn` itself failed before the child entered the registry.</summary>
-/// <remarks>The <c>spawn-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+/// <summary>Identifier and optional friendly name assigned to the newly forked session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultSpawnError : AgentRegistrySpawnResult
+public sealed class SessionsForkResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "spawn-error";
-
-    /// <summary>Underlying errno code (e.g. ENOENT, EACCES) when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("code")]
-    public string? Code { get; set; }
+    /// <summary>Friendly name assigned to the forked session, if any.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Human-readable error message.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
+    /// <summary>The new forked session's ID.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Spawn succeeded but the child did not publish a matching managed-server entry within the timeout.</summary>
-/// <remarks>The <c>registry-timeout</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+/// <summary>Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultRegistryTimeout : AgentRegistrySpawnResult
+internal sealed class SessionsForkRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "registry-timeout";
+    /// <summary>Optional friendly name to assign to the forked session.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Process ID of the orphaned child (so the caller can offer 'kill the pid' guidance).</summary>
-    [JsonPropertyName("childPid")]
-    public required long ChildPid { get; set; }
+    /// <summary>Source session ID to fork from.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("logCapture")]
-    public AgentRegistryLogCapture? LogCapture { get; set; }
+    /// <summary>Optional event ID boundary. When provided, the fork includes only events before this ID (exclusive). When omitted, all events are included.</summary>
+    [JsonPropertyName("toEventId")]
+    public string? ToEventId { get; set; }
 }
 
-/// <summary>Synchronous pre-validation rejected the spawn request.</summary>
-/// <remarks>The <c>validation-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+/// <summary>Repository associated with the connected remote session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultValidationError : AgentRegistrySpawnResult
+public sealed class ConnectedRemoteSessionMetadataRepository
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "validation-error";
-
-    /// <summary>Which parameter field was invalid. Omitted when the rejection is not field-specific.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("field")]
-    public AgentRegistrySpawnValidationErrorField? Field { get; set; }
+    /// <summary>Branch associated with the remote session.</summary>
+    [JsonPropertyName("branch")]
+    public string Branch { get; set; } = string.Empty;
 
-    /// <summary>Human-readable explanation; safe to surface in the UI banner. Never logged to unrestricted telemetry.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
+    /// <summary>Repository name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.</summary>
-    [JsonPropertyName("reason")]
-    public required AgentRegistrySpawnValidationErrorReason Reason { get; set; }
+    /// <summary>Repository owner or organization login.</summary>
+    [JsonPropertyName("owner")]
+    public string Owner { get; set; } = string.Empty;
 }
 
-/// <summary>Inputs to spawn a managed-server child via the controller's spawn delegate.</summary>
+/// <summary>Metadata for a connected remote session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class AgentRegistrySpawnRequest
+public sealed class ConnectedRemoteSessionMetadata
 {
-    /// <summary>Custom or built-in agent name (e.g. 'explore'). When omitted, the child uses its own default.</summary>
-    [JsonPropertyName("agentName")]
-    public string? AgentName { get; set; }
-
-    /// <summary>Working directory for the spawned child (must be an existing directory).</summary>
-    [JsonPropertyName("cwd")]
-    public string Cwd { get; set; } = string.Empty;
-
-    /// <summary>Optional first user message. Forwarded to the caller (the CLI's spawn wrapper sends it post-attach via the standard LocalRpcSession.send path).</summary>
-    [JsonPropertyName("initialPrompt")]
-    public string? InitialPrompt { get; set; }
+    /// <summary>Neutral SDK discriminator for the connected remote session kind.</summary>
+    [JsonPropertyName("kind")]
+    public ConnectedRemoteSessionMetadataKind Kind { get; set; }
 
-    /// <summary>Model identifier to apply to the new session.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Last session update time as an ISO 8601 string.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public DateTimeOffset ModifiedTime { get; set; }
 
-    /// <summary>Friendly session name. Must satisfy validateSessionName: non-empty, no leading/trailing whitespace, &lt;=100 chars, no control chars, no double quotes.</summary>
+    /// <summary>Optional friendly session name.</summary>
     [JsonPropertyName("name")]
     public string? Name { get; set; }
 
-    /// <summary>Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.</summary>
-    [JsonPropertyName("permissionMode")]
-    public AgentRegistrySpawnPermissionMode? PermissionMode { get; set; }
-}
+    /// <summary>Pull request number associated with the session.</summary>
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSuspendRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
+    /// <summary>Repository associated with the connected remote session.</summary>
+    [JsonPropertyName("repository")]
+    public ConnectedRemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
+
+    /// <summary>Original remote resource identifier.</summary>
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
+
+    /// <summary>SDK session ID for the connected remote session.</summary>
+    [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Remote session staleness deadline as an ISO 8601 string.</summary>
+    [JsonPropertyName("staleAt")]
+    public DateTimeOffset? StaleAt { get; set; }
+
+    /// <summary>Session start time as an ISO 8601 string.</summary>
+    [JsonPropertyName("startTime")]
+    public DateTimeOffset StartTime { get; set; }
+
+    /// <summary>Remote session state returned by the backing service.</summary>
+    [JsonPropertyName("state")]
+    public string? State { get; set; }
+
+    /// <summary>Optional session summary.</summary>
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
 }
 
-/// <summary>Result of sending a user message.</summary>
+/// <summary>Remote session connection result.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SendResult
+public sealed class RemoteSessionConnectionResult
 {
-    /// <summary>Unique identifier assigned to the message.</summary>
-    [JsonPropertyName("messageId")]
-    public string MessageId { get; set; } = string.Empty;
+    /// <summary>Metadata for a connected remote session.</summary>
+    [JsonPropertyName("metadata")]
+    public ConnectedRemoteSessionMetadata Metadata { get => field ??= new(); set; }
+
+    /// <summary>SDK session ID for the connected remote session.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for sending a user message to the session.</summary>
+/// <summary>Remote session connection parameters.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SendRequest
+internal sealed class ConnectRemoteSessionParams
 {
-    /// <summary>The UI mode the agent was in when this message was sent. Defaults to the session's current mode.</summary>
-    [JsonPropertyName("agentMode")]
-    public SendAgentMode? AgentMode { get; set; }
+    /// <summary>Session ID to connect to.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Optional attachments (files, directories, selections, blobs, GitHub references) to include with the message.</summary>
-    [JsonPropertyName("attachments")]
-    public IList<Attachment>? Attachments { get; set; }
+/// <summary>Local or remote session metadata entry. Narrow on `isRemote` to access source-specific fields.</summary>
+/// <remarks>Data type discriminated by <c>isRemote</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class SessionListEntry
+{
+    /// <summary>The boolean discriminator.</summary>
+    [JsonPropertyName("isRemote")]
+    public bool IsRemote { get; set; }
 
-    /// <summary>If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.</summary>
-    [JsonPropertyName("billable")]
-    public bool? Billable { get; set; }
+    /// <summary>Runtime client name that created/last resumed this session.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-    /// <summary>If provided, this is shown in the timeline instead of `prompt`.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Pre-resolved working-directory context for session startup.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("context")]
+    public SessionContext? Context { get; set; }
 
-    /// <summary>How to deliver the message. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.</summary>
-    [JsonPropertyName("mode")]
-    public SendMode? Mode { get; set; }
+    /// <summary>Host-supplied human description of what the session is doing right now ("running tests", "waiting for approval"). Optional in the protocol and absent on hosts that do not publish it, so never rely on it -- it enriches `hostStatus`, it does not replace it.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("hostActivity")]
+    public string? HostActivity { get; set; }
 
-    /// <summary>If true, adds the message to the front of the queue instead of the end.</summary>
-    [JsonPropertyName("prepend")]
-    public bool? Prepend { get; set; }
+    /// <summary>Live status as the owning host reports it in its session listing, so a row for a session running elsewhere can show that it is running. Absent for hosts that publish no such status (the cloud task managers), which read as idle.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("hostStatus")]
+    public RemoteSessionHostStatus? HostStatus { get; set; }
 
-    /// <summary>The user message text.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>True for detached maintenance sessions that should be hidden from normal resume lists.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("isDetached")]
+    public bool? IsDetached { get; set; }
 
-    /// <summary>Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.</summary>
-    [JsonPropertyName("requestHeaders")]
-    public IDictionary<string, string>? RequestHeaders { get; set; }
+    /// <summary>GitHub task ID, when this local session is bound to one. Only present for local sessions exported to remote control.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mcTaskId")]
+    public string? McTaskId { get; set; }
 
-    /// <summary>If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange.</summary>
-    [JsonPropertyName("requiredTool")]
-    public string? RequiredTool { get; set; }
+    /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public required string ModifiedTime { get; set; }
 
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Optional human-friendly name set via /rename.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>Pull request number associated with the session.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
+
+    /// <summary>Backing remote session IDs (most recent first).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("remoteSessionIds")]
+    public IList<string>? RemoteSessionIds { get; set; }
+
+    /// <summary>GitHub repository the remote session belongs to.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("repository")]
+    public RemoteSessionMetadataRepository? Repository { get; set; }
+
+    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
+
+    /// <summary>Stable session identifier.</summary>
     [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    public required string SessionId { get; set; }
 
-    /// <summary>Optional provenance tag copied to the resulting user.message event. Must be `user`, `system`, `command-&lt;command-id&gt;` for command-originated messages, `schedule-&lt;numeric-id&gt;` for scheduled prompts, or `agent-&lt;agent-id&gt;` for prompts sent by another agent.</summary>
-    [RegularExpression("^(user|system|command-.*|schedule-\\d+|agent-.+)$")]
-    [JsonInclude]
-    [JsonPropertyName("source")]
-    internal string? Source { get; set; }
+    /// <summary>Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("staleAt")]
+    public string? StaleAt { get; set; }
 
-    /// <summary>W3C Trace Context traceparent header for distributed tracing of this agent turn.</summary>
-    [JsonPropertyName("traceparent")]
-    public string? Traceparent { get; set; }
+    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("startTime")]
+    public required string StartTime { get; set; }
 
-    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
-    [JsonPropertyName("tracestate")]
-    public string? Tracestate { get; set; }
+    /// <summary>Server-side task state returned by GitHub.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("state")]
+    public string? State { get; set; }
 
-    /// <summary>If true, await completion of the agentic loop for this message before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageId`; the caller can rely on the agent having processed the message before the call resolves. Transport-dependent tail semantics: on a LOCAL (in-process) session the wait additionally blocks until the completed turn's event tail has been dispatched to this session's in-process subscribers, so a subsequent read of subscriber state already reflects the turn; on a REMOTE session the wait resolves once the loop completes and mirrored delivery follows over the wire. Callers that need the stronger local guarantee on remote sessions should await the event stream explicitly.</summary>
-    [JsonPropertyName("wait")]
-    public bool? Wait { get; set; }
+    /// <summary>Short summary of the session, when one has been derived.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
+
+    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("taskType")]
+    public RemoteSessionMetadataTaskType? TaskType { get; set; }
 }
 
-/// <summary>Result of sending zero or more user messages.</summary>
+/// <summary>Sessions matching the filter, ordered most-recently-modified first.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SendMessagesResult
+public sealed class SessionList
 {
-    /// <summary>Unique identifiers assigned to the messages, one per provided message in order. Empty when no messages were provided.</summary>
-    [JsonPropertyName("messageIds")]
-    public IList<string> MessageIds { get => field ??= []; set; }
+    /// <summary>Sessions ordered most-recently-modified first. Discriminated by `isRemote`.</summary>
+    [JsonPropertyName("sessions")]
+    public IList<SessionListEntry> Sessions { get => field ??= []; set; }
 }
 
-/// <summary>A single user message to append to the session as part of a `session.sendMessages` turn.</summary>
+/// <summary>Optional filter applied to the returned sessions.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SendMessageItem
+public sealed class SessionListFilter
 {
-    /// <summary>Optional attachments (files, directories, selections, blobs, GitHub references) to include with this message.</summary>
-    [JsonPropertyName("attachments")]
-    public IList<Attachment>? Attachments { get; set; }
-
-    /// <summary>If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.</summary>
-    [JsonInclude]
-    [JsonPropertyName("billable")]
-    internal bool? Billable { get; set; }
-
-    /// <summary>If provided, this is shown in the timeline instead of `prompt`.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Match sessions whose context.branch equals this value.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-    /// <summary>The user message text.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Match sessions whose context.cwd equals this value.</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
 
-    /// <summary>If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange.</summary>
-    [JsonPropertyName("requiredTool")]
-    public string? RequiredTool { get; set; }
+    /// <summary>Match sessions whose context.gitRoot equals this value.</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { get; set; }
 
-    /// <summary>Optional provenance tag copied to the resulting user.message event. Must be `user`, `system`, `command-&lt;command-id&gt;` for command-originated messages, `schedule-&lt;numeric-id&gt;` for scheduled prompts, or `agent-&lt;agent-id&gt;` for prompts sent by another agent.</summary>
-    [RegularExpression("^(user|system|command-.*|schedule-\\d+|agent-.+)$")]
-    [JsonInclude]
-    [JsonPropertyName("source")]
-    internal string? Source { get; set; }
+    /// <summary>Match sessions whose context.repository equals this value.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
 }
 
-/// <summary>Parameters for sending zero or more user messages to the session in a single turn. Remote-backed (Mission Control) sessions do not support this method and will return an error.</summary>
+/// <summary>Optional source filter, metadata-load limit, and context filter applied to the returned sessions.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SendMessagesRequest
+internal sealed class SessionsListRequest
 {
-    /// <summary>The UI mode the agent was in when these messages were sent. Defaults to the session's current mode.</summary>
-    [JsonPropertyName("agentMode")]
-    public SendAgentMode? AgentMode { get; set; }
-
-    /// <summary>The user messages to append to the conversation, in order. May be empty, in which case a single turn runs over the existing history with no new user message.</summary>
-    [JsonPropertyName("messages")]
-    public IList<SendMessageItem> Messages { get => field ??= []; set; }
+    /// <summary>Optional filter applied to the returned sessions.</summary>
+    [JsonPropertyName("filter")]
+    public SessionListFilter? Filter { get; set; }
 
-    /// <summary>How to deliver the messages. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.</summary>
-    [JsonPropertyName("mode")]
-    public SendMode? Mode { get; set; }
+    /// <summary>When true, include detached maintenance sessions. Defaults to false for user-facing session lists.</summary>
+    [JsonPropertyName("includeDetached")]
+    public bool? IncludeDetached { get; set; }
 
-    /// <summary>If true, adds the messages to the front of the queue instead of the end.</summary>
-    [JsonPropertyName("prepend")]
-    public bool? Prepend { get; set; }
+    /// <summary>When provided, only the first N local sessions (sorted by modification time, newest first) load full metadata; remaining sessions return basic info only. Use 0 to return only basic info for every local session. Has no effect on remote entries (which always carry their full shape).</summary>
+    [JsonPropertyName("metadataLimit")]
+    public long? MetadataLimit { get; set; }
 
-    /// <summary>Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.</summary>
-    [JsonPropertyName("requestHeaders")]
-    public IDictionary<string, string>? RequestHeaders { get; set; }
+    /// <summary>Which session sources to include. Defaults to `local` for backward compatibility.</summary>
+    [JsonPropertyName("source")]
+    public SessionSource? Source { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Only meaningful when `source` includes remote. When true, propagates errors from the remote service instead of silently returning an empty remote list. Defaults to false.</summary>
+    [JsonPropertyName("throwOnError")]
+    public bool? ThrowOnError { get; set; }
+}
 
-    /// <summary>W3C Trace Context traceparent header for distributed tracing of this agent turn.</summary>
-    [JsonPropertyName("traceparent")]
-    public string? Traceparent { get; set; }
+/// <summary>Persisted local session metadata, including identifiers, timestamps, summary/name, client, context, detached state, and task ID.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class LocalSessionMetadataValue
+{
+    /// <summary>Runtime client name that created/last resumed this session.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
-    [JsonPropertyName("tracestate")]
-    public string? Tracestate { get; set; }
+    /// <summary>Pre-resolved working-directory context for session startup.</summary>
+    [JsonPropertyName("context")]
+    public SessionContext? Context { get; set; }
 
-    /// <summary>If true, await completion of the agentic loop for this turn before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageIds`; the caller can rely on the agent having processed the messages before the call resolves. Transport-dependent tail semantics: on a LOCAL (in-process) session the wait additionally blocks until the completed turn's event tail has been dispatched to this session's in-process subscribers, so a subsequent read of subscriber state already reflects the turn; on a REMOTE session the wait resolves once the loop completes and mirrored delivery follows over the wire. Callers that need the stronger local guarantee on remote sessions should await the event stream explicitly.</summary>
-    [JsonPropertyName("wait")]
-    public bool? Wait { get; set; }
-}
+    /// <summary>True for detached maintenance sessions that should be hidden from normal resume lists.</summary>
+    [JsonPropertyName("isDetached")]
+    public bool? IsDetached { get; set; }
 
-/// <summary>Internal request for sending a system notification.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SendSystemNotificationRequest
-{
-    /// <summary>Optional structured notification kind.</summary>
-    [JsonPropertyName("kind")]
-    public JsonElement? Kind { get; set; }
+    /// <summary>Always false for local sessions.</summary>
+    [JsonPropertyName("isRemote")]
+    public bool IsRemote { get; set; }
 
-    /// <summary>Notification text to deliver to the model.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>GitHub task ID, when this local session is bound to one. Only present for local sessions exported to remote control.</summary>
+    [JsonPropertyName("mcTaskId")]
+    public string? McTaskId { get; set; }
 
-    /// <summary>Internal delivery options, including passive policy.</summary>
-    [JsonPropertyName("options")]
-    public JsonElement? Options { get; set; }
+    /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public string ModifiedTime { get; set; } = string.Empty;
 
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Optional human-friendly name set via /rename.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>Stable session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("startTime")]
+    public string StartTime { get; set; } = string.Empty;
+
+    /// <summary>Short summary of the session, when one has been derived.</summary>
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
 }
 
-/// <summary>Result of aborting the current turn.</summary>
+/// <summary>Persisted local session metadata when the session exists.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AbortResult
+internal sealed class SessionsGetMetadataResult
 {
-    /// <summary>Error message if the abort failed.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Whether the abort completed successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Local session metadata, omitted when the session does not exist.</summary>
+    [JsonPropertyName("session")]
+    public LocalSessionMetadataValue? Session { get; set; }
 }
 
-/// <summary>Parameters for aborting the current turn.</summary>
+/// <summary>Session ID whose persisted metadata should be read.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class AbortRequest
+internal sealed class SessionsGetMetadataRequest
 {
-    /// <summary>Finite reason code describing why the current turn was aborted.</summary>
-    [JsonPropertyName("reason")]
-    public AbortReason? Reason { get; set; }
-
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Session ID to inspect.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of interrupting the main agent turn.</summary>
+/// <summary>Recent local session IDs that contain user-visible history.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InterruptMainTurnResult
+internal sealed class SessionsListNonEmptySessionIdsResult
 {
-    /// <summary>Whether an in-flight main agent turn was interrupted. False when the main loop was not processing.</summary>
-    [JsonPropertyName("interrupted")]
-    public bool Interrupted { get; set; }
+    /// <summary>Session IDs ordered newest-first.</summary>
+    [JsonPropertyName("sessionIds")]
+    public IList<string> SessionIds { get => field ??= []; set; }
 }
 
-/// <summary>Parameters for interrupting the main agent turn.</summary>
+/// <summary>Limit for non-empty local session IDs.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class InterruptMainTurnRequest
+internal sealed class SessionsListNonEmptySessionIdsRequest
 {
-    /// <summary>When true, the user's queued prompts are preserved and run as the next turn once the interrupted turn unwinds; when false (the default), the queue is cleared like a plain abort.</summary>
-    [JsonPropertyName("flushQueued")]
-    public bool? FlushQueued { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Maximum number of session IDs to return.</summary>
+    [JsonPropertyName("limit")]
+    public long? Limit { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>ID of the local session bound to the given GitHub task, or omitted when none.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionCancelAllBackgroundAgentsRequest
+public sealed class SessionsFindByTaskIDResult
 {
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Omitted when no local session is bound to that GitHub task.</summary>
     [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    public string? SessionId { get; set; }
 }
 
-/// <summary>Parameters for shutting down the session.</summary>
+/// <summary>GitHub task ID to look up.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ShutdownRequest
+internal sealed class SessionsFindByTaskIDRequest
 {
-    /// <summary>Optional human-readable reason. Typically the message of the error that triggered shutdown when type is 'error'.</summary>
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
+    /// <summary>GitHub task ID to look up.</summary>
+    [JsonPropertyName("taskId")]
+    public string TaskId { get; set; } = string.Empty;
+}
 
-    /// <summary>Target session identifier.</summary>
+/// <summary>Session ID matching the prefix, omitted when no unique match exists.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionsFindByPrefixResult
+{
+    /// <summary>Omitted when no unique session matches the prefix (no match or ambiguous).</summary>
     [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Why the session is being shut down. Defaults to "routine" when omitted.</summary>
-    [JsonPropertyName("type")]
-    public ShutdownType? Type { get; set; }
+    public string? SessionId { get; set; }
 }
 
-/// <summary>Identifier of the session event that was emitted for the log message.</summary>
+/// <summary>UUID prefix to resolve to a unique session ID.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LogResult
+internal sealed class SessionsFindByPrefixRequest
 {
-    /// <summary>The unique identifier of the emitted session event.</summary>
-    [JsonPropertyName("eventId")]
-    public Guid EventId { get; set; }
+    /// <summary>UUID prefix (&gt;=7 hex chars, &lt;36 chars). Returns the unique session ID, or undefined when there is no match or the prefix matches multiple sessions.</summary>
+    [JsonPropertyName("prefix")]
+    public string Prefix { get; set; } = string.Empty;
 }
 
-/// <summary>Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.</summary>
+/// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class LogRequest
+public sealed class SessionsGetLastForContextResult
 {
-    /// <summary>When true, the message is transient and not persisted to the session event log on disk.</summary>
-    [JsonPropertyName("ephemeral")]
-    public bool? Ephemeral { get; set; }
-
-    /// <summary>Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".</summary>
-    [JsonPropertyName("level")]
-    public SessionLogLevel? Level { get; set; }
-
-    /// <summary>Human-readable message.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
     [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Optional actionable tip displayed alongside the message. Only honored on `level: "info"`.</summary>
-    [JsonPropertyName("tip")]
-    public string? Tip { get; set; }
-
-    /// <summary>Domain category for this log entry (e.g., "mcp", "subscription", "policy", "model"). Maps to `infoType`/`warningType`/`errorType` on the emitted event. Defaults to "notification".</summary>
-    [JsonPropertyName("type")]
-    public string? Type { get; set; }
-
-    /// <summary>Optional URL the user can open in their browser for more details.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
+    public string? SessionId { get; set; }
 }
 
-/// <summary>Authentication status and account metadata for the session.</summary>
+/// <summary>Optional working-directory context used to score session relevance.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionAuthStatus
+internal sealed class SessionsGetLastForContextRequest
 {
-    /// <summary>Authentication type.</summary>
-    [JsonPropertyName("authType")]
-    public AuthInfoType? AuthType { get; set; }
-
-    /// <summary>Copilot plan tier (e.g., individual_pro, business).</summary>
-    [JsonPropertyName("copilotPlan")]
-    public string? CopilotPlan { get; set; }
-
-    /// <summary>Authentication host URL.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("host")]
-    public string? Host { get; set; }
-
-    /// <summary>Whether the session has resolved authentication.</summary>
-    [JsonPropertyName("isAuthenticated")]
-    public bool IsAuthenticated { get; set; }
-
-    /// <summary>Authenticated login/username, if available.</summary>
-    [JsonPropertyName("login")]
-    public string? Login { get; set; }
+    /// <summary>Optional working-directory context used to score session relevance. When omitted the most-recently-modified session wins.</summary>
+    [JsonPropertyName("context")]
+    public SessionContext? Context { get; set; }
+}
 
-    /// <summary>Human-readable authentication status description.</summary>
-    [JsonPropertyName("statusMessage")]
-    public string? StatusMessage { get; set; }
+/// <summary>Absolute path to the session's events.jsonl file on disk.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionsGetEventFilePathResult
+{
+    /// <summary>Absolute path to the session's events.jsonl file.</summary>
+    [JsonPropertyName("filePath")]
+    public string FilePath { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Session ID whose event-log file path to compute.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionGitHubAuthGetStatusRequest
+internal sealed class SessionsGetEventFilePathRequest
 {
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Session ID whose event-log file path to compute.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the credential update succeeded.</summary>
+/// <summary>Map of sessionId -&gt; on-disk size in bytes for each session's workspace directory.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionSetCredentialsResult
+public sealed class SessionSizes
 {
-    /// <summary>Whether the session ended up with a populated `copilotUser` for the installed credentials. `true` when the supplied credential already carried `copilotUser` or it was successfully re-resolved server-side. `false` when the credential is installed without `copilotUser` — either re-resolution failed, or the variant cannot be re-resolved from the credential alone (only the raw-token variants `token`, `env`, and `gh-cli` can). In both `false` cases the token swap still applied, but plan/quota/billing metadata is degraded. Present whenever a credential was supplied; omitted only when no credential was supplied (no-op call).</summary>
-    [JsonPropertyName("copilotUserResolved")]
-    public bool? CopilotUserResolved { get; set; }
-
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Map of sessionId -&gt; on-disk size in bytes for the session's workspace directory.</summary>
+    [JsonPropertyName("sizes")]
+    public IDictionary<string, long> Sizes { get => field ??= new Dictionary<string, long>(); set; }
 }
 
-/// <summary>New auth credentials to install on the session. Omit to leave credentials unchanged.</summary>
+/// <summary>Session IDs from the input set that are currently in use by another process.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSetCredentialsParams
+public sealed class SessionsCheckInUseResult
 {
-    /// <summary>The new auth credentials to install on the session. When omitted or `undefined`, the call is a no-op and the session's existing credentials are preserved. The runtime installs the supplied value immediately for outbound model/API requests. When the credential carries a raw token (`token`, `env`, or `gh-cli`) but no `copilotUser`, the runtime additionally re-resolves `copilotUser` server-side (best-effort, asynchronously, after the synchronous install) so plan/quota/billing metadata regains fidelity; on resolution failure the verbatim credential remains installed. It does NOT otherwise validate the credential. Several variants carry secret material; treat this method's params as containing secrets at rest and in transit.</summary>
-    [JsonPropertyName("credentials")]
-    public AuthInfo? Credentials { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Session IDs from the input set that are currently held by another running process via an alive lock file.</summary>
+    [JsonPropertyName("inUse")]
+    public IList<string> InUse { get => field ??= []; set; }
 }
 
-/// <summary>A file included in the redacted debug bundle.</summary>
+/// <summary>Session IDs to test for live in-use locks.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class DebugCollectLogsCollectedEntry
+internal sealed class SessionsCheckInUseRequest
 {
-    /// <summary>Relative path of the file in the staged bundle/archive.</summary>
-    [JsonPropertyName("bundlePath")]
-    public string BundlePath { get; set; } = string.Empty;
-
-    /// <summary>Redacted output size in bytes.</summary>
-    [JsonPropertyName("sizeBytes")]
-    public long SizeBytes { get; set; }
-
-    /// <summary>Source category for this entry.</summary>
-    [JsonPropertyName("source")]
-    public DebugCollectLogsSource Source { get; set; }
+    /// <summary>Session IDs to test for live in-use locks.</summary>
+    [JsonPropertyName("sessionIds")]
+    public IList<string> SessionIds { get => field ??= []; set; }
 }
 
-/// <summary>An optional debug bundle entry that could not be included.</summary>
+/// <summary>The session's persisted remote-steerable flag, or omitted when no value has been persisted.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class DebugCollectLogsSkippedEntry
+internal sealed class SessionsGetPersistedRemoteSteerableResult
 {
-    /// <summary>Relative path requested for this bundle entry.</summary>
-    [JsonPropertyName("bundlePath")]
-    public string BundlePath { get; set; } = string.Empty;
-
-    /// <summary>Server-local source path that could not be read.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
-
-    /// <summary>Reason the entry was skipped.</summary>
-    [JsonPropertyName("reason")]
-    public string Reason { get; set; } = string.Empty;
+    /// <summary>The session's persisted remote-steerable flag if recorded; omitted when no value has been persisted.</summary>
+    [JsonPropertyName("remoteSteerable")]
+    public bool? RemoteSteerable { get; set; }
 }
 
-/// <summary>Result of collecting a redacted debug bundle.</summary>
+/// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class DebugCollectLogsResult
+internal sealed class SessionsGetPersistedRemoteSteerableRequest
 {
-    /// <summary>Files included in the redacted bundle.</summary>
-    [JsonPropertyName("entries")]
-    public IList<DebugCollectLogsCollectedEntry> Entries { get => field ??= []; set; }
-
-    /// <summary>Destination kind that was written.</summary>
-    [JsonPropertyName("kind")]
-    public DebugCollectLogsResultKind Kind { get; set; }
-
-    /// <summary>Actual archive path or staging directory path written. This may differ from the requested path when no-overwrite suffixing or fallback-to-temp-directory was needed.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-
-    /// <summary>Optional files or directories that could not be included.</summary>
-    [JsonPropertyName("skippedEntries")]
-    public IList<DebugCollectLogsSkippedEntry>? SkippedEntries { get; set; }
+    /// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>A caller-provided server-local file or directory to include in the debug bundle.</summary>
+/// <summary>Closes a session: emits shutdown, flushes pending events to disk, releases the in-use lock, disposes the active session. Idempotent: succeeds even if the session is not currently active.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class DebugCollectLogsEntry
+public sealed class SessionsCloseResult
 {
-    /// <summary>Relative path to use inside the staged bundle/archive.</summary>
-    [JsonPropertyName("bundlePath")]
-    public string BundlePath { get; set; } = string.Empty;
-
-    /// <summary>Kind of source path to include.</summary>
-    [JsonPropertyName("kind")]
-    public DebugCollectLogsEntryKind Kind { get; set; }
-
-    /// <summary>Server-local source path to read.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-
-    /// <summary>How text content from this entry should be redacted. Defaults to plain-text.</summary>
-    [JsonPropertyName("redaction")]
-    public DebugCollectLogsRedaction? Redaction { get; set; }
-
-    /// <summary>When true, collection fails if this entry cannot be read. Defaults to false, which records the entry in `skippedEntries`.</summary>
-    [JsonPropertyName("required")]
-    public bool? Required { get; set; }
 }
 
-/// <summary>Destination for the redacted debug bundle.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Session ID to close.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(DebugCollectLogsDestinationArchive), "archive")]
-[JsonDerivedType(typeof(DebugCollectLogsDestinationDirectory), "directory")]
-public partial class DebugCollectLogsDestination
+internal sealed class SessionsCloseRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <summary>Session ID to close.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-
-/// <summary>The <c>archive</c> variant of <see cref="DebugCollectLogsDestination"/>.</summary>
+/// <summary>Map of sessionId -&gt; bytes freed by removing the session's workspace directory.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class DebugCollectLogsDestinationArchive : DebugCollectLogsDestination
+public sealed class SessionBulkDeleteResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "archive";
-
-    /// <summary>When true, create the archive atomically without overwriting an existing file by appending ` (N)` before the extension as needed. Defaults to false.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("noOverwrite")]
-    public bool? NoOverwrite { get; set; }
-
-    /// <summary>Absolute or server-relative path for the .tgz archive to create.</summary>
-    [JsonPropertyName("outputPath")]
-    public required string OutputPath { get; set; }
+    /// <summary>Map of sessionId -&gt; bytes freed by removing the session's workspace directory. Sessions whose deletion failed are omitted from this map (failures are logged on the server but not surfaced per-id; check the map for absent IDs to detect them).</summary>
+    [JsonPropertyName("freedBytes")]
+    public IDictionary<string, long> FreedBytes { get => field ??= new Dictionary<string, long>(); set; }
 }
 
-/// <summary>The <c>directory</c> variant of <see cref="DebugCollectLogsDestination"/>.</summary>
+/// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class DebugCollectLogsDestinationDirectory : DebugCollectLogsDestination
+internal sealed class SessionsBulkDeleteRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "directory";
-
-    /// <summary>Directory where redacted files should be staged. The directory is created if needed.</summary>
-    [JsonPropertyName("outputDirectory")]
-    public required string OutputDirectory { get; set; }
+    /// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
+    [JsonPropertyName("sessionIds")]
+    public IList<string> SessionIds { get => field ??= []; set; }
 }
 
-/// <summary>Built-in session diagnostics to include in the bundle. Omitted fields default to true.</summary>
+/// <summary>Session ID to delete from disk.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class DebugCollectLogsInclude
+internal sealed class SessionsDeleteRequest
 {
-    /// <summary>Server-local path to the current process log. When set, it is included as `process.log` and its directory is searched for prior logs from the same session.</summary>
-    [JsonPropertyName("currentProcessLogPath")]
-    public string? CurrentProcessLogPath { get; set; }
+    /// <summary>Session ID to delete.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Include the session event log (`events.jsonl`). Defaults to true.</summary>
-    [JsonPropertyName("events")]
-    public bool? Events { get; set; }
+    /// <summary>Internal resolved session directory path to delete.</summary>
+    [JsonPropertyName("sessionPath")]
+    public string? SessionPath { get; set; }
+}
 
-    /// <summary>Server-local path to the session's events.jsonl file. Internal callers normally omit this and let the runtime derive it from the session.</summary>
-    [JsonPropertyName("eventsPath")]
-    public string? EventsPath { get; set; }
+/// <summary>Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionPruneResult
+{
+    /// <summary>Session IDs that would be deleted in dry-run mode (always empty otherwise).</summary>
+    [JsonPropertyName("candidates")]
+    public IList<string> Candidates { get => field ??= []; set; }
 
-    /// <summary>Maximum number of previous process logs to include. Defaults to 5.</summary>
-    [JsonPropertyName("previousProcessLogLimit")]
-    public long? PreviousProcessLogLimit { get; set; }
+    /// <summary>Session IDs that were deleted (always empty in dry-run mode).</summary>
+    [JsonPropertyName("deleted")]
+    public IList<string> Deleted { get => field ??= []; set; }
 
-    /// <summary>Server-local process log directory to search when `currentProcessLogPath` is unavailable, useful for collecting logs for inactive sessions.</summary>
-    [JsonPropertyName("processLogDirectory")]
-    public string? ProcessLogDirectory { get; set; }
+    /// <summary>True when no deletions were actually performed.</summary>
+    [JsonPropertyName("dryRun")]
+    public bool DryRun { get; set; }
 
-    /// <summary>Include process logs for the session. Defaults to true.</summary>
-    [JsonPropertyName("processLogs")]
-    public bool? ProcessLogs { get; set; }
+    /// <summary>Total bytes freed (actual when not dry-run, projected when dry-run).</summary>
+    [JsonPropertyName("freedBytes")]
+    public long FreedBytes { get; set; }
 
-    /// <summary>Include interactive shell logs written under the session's `shell-logs` directory. Defaults to true.</summary>
-    [JsonPropertyName("shellLogs")]
-    public bool? ShellLogs { get; set; }
+    /// <summary>Session IDs that were skipped (e.g., named sessions).</summary>
+    [JsonPropertyName("skipped")]
+    public IList<string> Skipped { get => field ??= []; set; }
 }
 
-/// <summary>Options for collecting a redacted session debug bundle.</summary>
+/// <summary>Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class DebugCollectLogsRequest
+internal sealed class SessionsPruneOldRequest
 {
-    /// <summary>Caller-provided server-local files or directories to include in addition to the runtime's built-in session diagnostics. This lets host applications add their own diagnostics without changing the API shape.</summary>
-    [JsonPropertyName("additionalEntries")]
-    public IList<DebugCollectLogsEntry>? AdditionalEntries { get; set; }
+    /// <summary>When true, only report what would be deleted without performing any deletion.</summary>
+    [JsonPropertyName("dryRun")]
+    public bool? DryRun { get; set; }
 
-    /// <summary>Where the redacted bundle should be written. Use `archive` to produce a .tgz, or `directory` to stage redacted files for caller-managed upload/post-processing.</summary>
-    [JsonPropertyName("destination")]
-    public DebugCollectLogsDestination Destination { get => field ??= new(); set; }
+    /// <summary>Session IDs that should never be considered for pruning.</summary>
+    [JsonPropertyName("excludeSessionIds")]
+    public IList<string>? ExcludeSessionIds { get; set; }
 
-    /// <summary>Which built-in session diagnostics to include. Omitted fields default to true.</summary>
-    [JsonPropertyName("include")]
-    public DebugCollectLogsInclude? Include { get; set; }
+    /// <summary>When true, named sessions (set via /rename) are also eligible for pruning.</summary>
+    [JsonPropertyName("includeNamed")]
+    public bool? IncludeNamed { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Delete sessions whose modifiedTime is at least this many days old.</summary>
+    [JsonPropertyName("olderThanDays")]
+    public long OlderThanDays { get; set; }
 }
 
-/// <summary>Canvas action that the agent or host can invoke. To discover the input schema for a particular action, call the list_canvas_capabilities tool.</summary>
+/// <summary>Flush a session's pending events to disk. No-op when no writer exists for the session (e.g., already closed).</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CanvasAction
+public sealed class SessionsSaveResult
 {
-    /// <summary>Description of the action.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+}
 
-    /// <summary>JSON Schema for the action input.</summary>
-    [JsonPropertyName("inputSchema")]
-    public JsonElement? InputSchema { get; set; }
+/// <summary>Session ID whose pending events should be flushed to disk.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionsSaveRequest
+{
+    /// <summary>Session ID whose pending events should be flushed to disk.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Action name exposed by the canvas provider.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+/// <summary>Release the in-use lock held by this process for the given session. No-op when this process does not currently hold a lock for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionsReleaseLockResult
+{
 }
 
-/// <summary>Canvas available in the current session.</summary>
+/// <summary>Session ID whose in-use lock should be released.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class DiscoveredCanvas
+internal sealed class SessionsReleaseLockRequest
 {
-    /// <summary>Actions the agent or host may invoke on an open instance.</summary>
-    [JsonPropertyName("actions")]
-    public IList<CanvasAction>? Actions { get; set; }
+    /// <summary>Session ID whose in-use lock should be released.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public string CanvasId { get; set; } = string.Empty;
+/// <summary>The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionEnrichMetadataResult
+{
+    /// <summary>Enriched records, with summary and context backfilled. Sessions confirmed empty and unnamed may be omitted.</summary>
+    [JsonPropertyName("sessions")]
+    public IList<LocalSessionMetadataValue> Sessions { get => field ??= []; set; }
+}
 
-    /// <summary>Short, single-sentence description shown to the agent in canvas catalogs.</summary>
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Human-readable canvas name.</summary>
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; set; } = string.Empty;
-
-    /// <summary>Owning provider identifier.</summary>
-    [JsonPropertyName("extensionId")]
-    public string ExtensionId { get; set; } = string.Empty;
-
-    /// <summary>Owning extension display name, when available.</summary>
-    [JsonPropertyName("extensionName")]
-    public string? ExtensionName { get; set; }
-
-    /// <summary>Host-local PNG path for the canvas icon, when supplied.</summary>
-    [JsonPropertyName("icon")]
-    public string? Icon { get; set; }
-
-    /// <summary>JSON Schema for canvas open input.</summary>
-    [JsonPropertyName("inputSchema")]
-    public JsonElement? InputSchema { get; set; }
+/// <summary>Session metadata records to enrich with summary and context information.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionsEnrichMetadataRequest
+{
+    /// <summary>Session metadata records to enrich. Records that already have summary and context are returned unchanged.</summary>
+    [JsonPropertyName("sessions")]
+    public IList<LocalSessionMetadataValue> Sessions { get => field ??= []; set; }
 }
 
-/// <summary>Declared canvases available in this session.</summary>
+/// <summary>Reload all hooks (user, plugin, optionally repo) and apply them to the active session. Call after installing or removing plugins so their hooks take effect immediately. No-op when no active session matches the given sessionId.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CanvasList
+public sealed class SessionsReloadPluginHooksResult
 {
-    /// <summary>Declared canvases available in this session.</summary>
-    [JsonPropertyName("canvases")]
-    public IList<DiscoveredCanvas> Canvases { get => field ??= []; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Active session ID and an optional flag for deferring repo-level hooks until folder trust.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionCanvasListRequest
+internal sealed class SessionsReloadPluginHooksRequest
 {
-    /// <summary>Target session identifier.</summary>
+    /// <summary>When true, skip repo-level hooks. Use before folder trust is confirmed; loadDeferredRepoHooks loads them post-trust.</summary>
+    [JsonPropertyName("deferRepoHooks")]
+    public bool? DeferRepoHooks { get; set; }
+
+    /// <summary>Active session ID to reload hooks for.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Open canvas instance snapshot.</summary>
+/// <summary>Queued repo-level startup prompts and the total hook command count after loading.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class OpenCanvasInstance
+public sealed class SessionLoadDeferredRepoHooksResult
 {
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public string CanvasId { get; set; } = string.Empty;
-
-    /// <summary>Owning provider identifier.</summary>
-    [JsonPropertyName("extensionId")]
-    public string ExtensionId { get; set; } = string.Empty;
-
-    /// <summary>Owning extension display name, when available.</summary>
-    [JsonPropertyName("extensionName")]
-    public string? ExtensionName { get; set; }
-
-    /// <summary>Host-local PNG path for the canvas icon, when supplied.</summary>
-    [JsonPropertyName("icon")]
-    public string? Icon { get; set; }
-
-    /// <summary>Input supplied when the instance was opened.</summary>
-    [JsonPropertyName("input")]
-    public JsonElement? Input { get; set; }
-
-    /// <summary>Stable caller-supplied canvas instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
-
-    /// <summary>Provider-supplied status text.</summary>
-    [JsonPropertyName("status")]
-    public string? Status { get; set; }
-
-    /// <summary>Rendered title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>Total hook command count (user + plugin + repo) loaded for the session by this call. Captured atomically with startupPrompts so callers don't need to read a separate counter.</summary>
+    [JsonPropertyName("hookCount")]
+    public long HookCount { get; set; }
 
-    /// <summary>URL for web-rendered canvases.</summary>
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
+    /// <summary>Repo-level startup prompts queued from repo hook configs. Empty on resume, when no repo configs were pending, or when disableAllHooks is set.</summary>
+    [JsonPropertyName("startupPrompts")]
+    public IList<string> StartupPrompts { get => field ??= []; set; }
 }
 
-/// <summary>Live open-canvas snapshot.</summary>
+/// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CanvasListOpenResult
+internal sealed class SessionsLoadDeferredRepoHooksRequest
 {
-    /// <summary>Currently open canvas instances.</summary>
-    [JsonPropertyName("openCanvases")]
-    public IList<OpenCanvasInstance> OpenCanvases { get => field ??= []; set; }
+    /// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Replace the manager-wide additional plugins. New session creations and subsequent hook reloads see the new set; already-running sessions keep their existing hook installation until the next reload.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionCanvasListOpenRequest
+public sealed class SessionsSetAdditionalPluginsResult
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Canvas open parameters.</summary>
+/// <summary>Installed plugin record from global state, with marketplace, version, install time, enabled state, cache path, and source.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class CanvasOpenRequest
+public sealed class InstalledPlugin
 {
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public string CanvasId { get; set; } = string.Empty;
+    /// <summary>Path where the plugin is cached locally.</summary>
+    [JsonPropertyName("cache_path")]
+    public string? CachePath { get; set; }
 
-    /// <summary>Owning provider identifier. Optional when the canvasId is unique across providers; required to disambiguate when multiple providers register the same canvasId.</summary>
-    [JsonPropertyName("extensionId")]
-    public string? ExtensionId { get; set; }
+    /// <summary>Whether the plugin is currently enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Canvas open input.</summary>
-    [JsonPropertyName("input")]
-    public JsonElement? Input { get; set; }
+    /// <summary>Installation timestamp.</summary>
+    [JsonPropertyName("installed_at")]
+    public string InstalledAt { get; set; } = string.Empty;
 
-    /// <summary>Caller-supplied stable instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
+    /// <summary>Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — those synthesized at session start for a directory/local marketplace, whose cache_path points at the real plugin directory on disk rather than a copy under the installed-plugins cache. Its presence is what marks a record as live, and no record carrying it is ever written to the persisted installedPlugins key.</summary>
+    [JsonPropertyName("installed_from")]
+    public string? InstalledFrom { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Marketplace the plugin came from (empty string for direct repo installs).</summary>
+    [JsonPropertyName("marketplace")]
+    public string Marketplace { get; set; } = string.Empty;
+
+    /// <summary>Plugin name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Source for direct repo installs (when marketplace is empty).</summary>
+    [JsonPropertyName("source")]
+    public JsonElement? Source { get; set; }
+
+    /// <summary>Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.</summary>
+    [JsonPropertyName("source_sha")]
+    public string? SourceSha { get; set; }
+
+    /// <summary>Version installed (if available).</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
 }
 
-/// <summary>Canvas close parameters.</summary>
+/// <summary>Manager-wide additional plugins to register; replaces any previously-configured set.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class CanvasCloseRequest
+internal sealed class SessionsSetAdditionalPluginsRequest
 {
-    /// <summary>Open canvas instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Manager-wide additional plugins to register. Replaces any previously-configured set. Pass an empty array to clear.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<InstalledPlugin> Plugins { get => field ??= []; set; }
 }
 
-/// <summary>Canvas action invocation result.</summary>
+/// <summary>Dynamic-context board entry count, when available.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CanvasActionInvokeResult
+internal sealed class SessionsGetBoardEntryCountResult
 {
-    /// <summary>Provider-supplied action result.</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
+    /// <summary>Board entry count, when available.</summary>
+    [JsonPropertyName("count")]
+    public long? Count { get; set; }
 }
 
-/// <summary>Canvas action invocation parameters.</summary>
+/// <summary>Session ID whose board entry count should be returned.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class CanvasActionInvokeRequest
+internal sealed class SessionsGetBoardEntryCountRequest
 {
-    /// <summary>Action name to invoke.</summary>
-    [JsonPropertyName("actionName")]
-    public string ActionName { get; set; } = string.Empty;
-
-    /// <summary>Action input.</summary>
-    [JsonPropertyName("input")]
-    public JsonElement? Input { get; set; }
-
-    /// <summary>Open canvas instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Session ID whose board entry count should be returned.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Machine-readable factory run failure.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+/// <summary>State of the runtime-managed remote-control singleton.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>state</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
 [JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
+    TypeDiscriminatorPropertyName = "state",
     UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(FactoryRunFailureFactoryLimitReached), "factory_limit_reached")]
-[JsonDerivedType(typeof(FactoryRunFailureFactoryResumeDeclined), "factory_resume_declined")]
-[JsonDerivedType(typeof(FactoryRunFailureFactoryDurableFailure), "factory_durable_failure")]
-public partial class FactoryRunFailure
+[JsonDerivedType(typeof(RemoteControlStatusOff), "off")]
+[JsonDerivedType(typeof(RemoteControlStatusConnecting), "connecting")]
+[JsonDerivedType(typeof(RemoteControlStatusActive), "active")]
+[JsonDerivedType(typeof(RemoteControlStatusError), "error")]
+public partial class RemoteControlStatus
 {
     /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
+    [JsonPropertyName("state")]
+    public virtual string State { get; set; } = string.Empty;
 }
 
 
-/// <summary>The <c>factory_limit_reached</c> variant of <see cref="FactoryRunFailure"/>.</summary>
+/// <summary>Remote control is not connected.</summary>
+/// <remarks>The <c>off</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public partial class FactoryRunFailureFactoryLimitReached : FactoryRunFailure
+public partial class RemoteControlStatusOff : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "factory_limit_reached";
-
-    /// <summary>Resource ceiling that stopped the run.</summary>
-    [JsonPropertyName("kind")]
-    public required FactoryRunFailureKind Kind { get; set; }
-
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public required string RunId { get; set; }
-
-    /// <summary>Approved effective ceiling that was reached.</summary>
-    [JsonPropertyName("value")]
-    public required double Value { get; set; }
+    public override string State => "off";
 }
 
-/// <summary>The <c>factory_resume_declined</c> variant of <see cref="FactoryRunFailure"/>.</summary>
+/// <summary>Remote control is in the middle of initial setup.</summary>
+/// <remarks>The <c>connecting</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public partial class FactoryRunFailureFactoryResumeDeclined : FactoryRunFailure
+public partial class RemoteControlStatusConnecting : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "factory_resume_declined";
-
-    /// <summary>Human-readable reason the resume did not proceed.</summary>
-    [JsonPropertyName("reason")]
-    public required string Reason { get; set; }
+    public override string State => "connecting";
 
-    /// <summary>Factory run identifier whose changed limits were declined.</summary>
-    [JsonPropertyName("runId")]
-    public required string RunId { get; set; }
+    /// <summary>Session id the connection is attaching to.</summary>
+    [JsonPropertyName("attachedSessionId")]
+    public required string AttachedSessionId { get; set; }
 }
 
-/// <summary>The <c>factory_durable_failure</c> variant of <see cref="FactoryRunFailure"/>.</summary>
+/// <summary>Remote control is connected to a local session.</summary>
+/// <remarks>The <c>active</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public partial class FactoryRunFailureFactoryDurableFailure : FactoryRunFailure
+public partial class RemoteControlStatusActive : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "factory_durable_failure";
+    public override string State => "active";
 
-    /// <summary>Stable failure code.</summary>
-    [JsonPropertyName("code")]
-    public required string Code { get; set; }
+    /// <summary>Session id remote control is pointed at.</summary>
+    [JsonPropertyName("attachedSessionId")]
+    public required string AttachedSessionId { get; set; }
 
-    /// <summary>Execution-critical durable operation that failed.</summary>
-    [JsonPropertyName("operation")]
-    public required FactoryDurableOperation Operation { get; set; }
+    /// <summary>True while a read-only/session-sync export is deferred, awaiting the first `user.message` before its MC session exists. Marked internal: this field is excluded from the public SDK surface and is populated only on the CLI in-process path.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("awaitingFirstMessage")]
+    internal bool? AwaitingFirstMessage { get; set; }
 
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public required string RunId { get; set; }
+    /// <summary>MC frontend URL for this session, when known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("frontendUrl")]
+    public string? FrontendUrl { get; set; }
+
+    /// <summary>Whether the MC session may steer this session.</summary>
+    [JsonPropertyName("isSteerable")]
+    public required bool IsSteerable { get; set; }
 }
 
-/// <summary>Complete current or terminal factory run envelope.</summary>
+/// <summary>The last setup attempt failed. The singleton is otherwise off.</summary>
+/// <remarks>The <c>error</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryRunResult
+public partial class RemoteControlStatusError : RemoteControlStatus
 {
-    /// <summary>Error message for an errored run.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Machine-readable failure details for an errored run.</summary>
-    [JsonPropertyName("failure")]
-    public FactoryRunFailure? Failure { get; set; }
-
-    /// <summary>Reason for a halted or cancelled run.</summary>
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
-
-    /// <summary>Completed factory result.</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
-
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string State => "error";
 
-    /// <summary>Partial journal and progress snapshot for a halted, cancelled, or errored run.</summary>
-    [JsonPropertyName("snapshot")]
-    public JsonElement? Snapshot { get; set; }
+    /// <summary>Session id the failing setup attempt targeted, when known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("attachedSessionId")]
+    public string? AttachedSessionId { get; set; }
 
-    /// <summary>Current or terminal factory run status.</summary>
-    [JsonPropertyName("status")]
-    public FactoryRunStatus Status { get; set; }
+    /// <summary>Human-readable error message from the last setup attempt.</summary>
+    [JsonPropertyName("error")]
+    public required string Error { get; set; }
 }
 
-/// <summary>Wire-only per-invocation factory resource ceiling overrides.</summary>
+/// <summary>Wrapper for the singleton's current status.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryRunLimits
+public sealed class RemoteControlStatusResult
 {
-    /// <summary>Maximum AI credits consumed by factory subagents and their descendants. The post-paid ceiling is soft: parallel turns can settle beyond it before the run stops.</summary>
-    [JsonPropertyName("maxAiCredits")]
-    public double? MaxAiCredits { get; set; }
-
-    /// <summary>Maximum number of factory subagents that may run concurrently.</summary>
-    [JsonPropertyName("maxConcurrentSubagents")]
-    public long? MaxConcurrentSubagents { get; set; }
-
-    /// <summary>Maximum total number of factory subagents that may be admitted.</summary>
-    [JsonPropertyName("maxTotalSubagents")]
-    public long? MaxTotalSubagents { get; set; }
-
-    /// <summary>Maximum accumulated active-execution time in seconds. Active execution includes the entire extension body, subprocess waits, queued-agent waits, and sleeps; time between resumed attempts is not counted.</summary>
-    [JsonPropertyName("timeoutSeconds")]
-    public double? TimeoutSeconds { get; set; }
+    /// <summary>State of the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("status")]
+    public RemoteControlStatus Status { get => field ??= new(); set; }
 }
 
-/// <summary>Options controlling factory invocation.</summary>
+/// <summary>Reattach to an existing MC session without creating a new one.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RunOptions
+public sealed class RemoteControlConfigExistingMcSession
 {
-    /// <summary>Per-invocation resource ceiling overrides.</summary>
-    [JsonPropertyName("limits")]
-    public FactoryRunLimits? Limits { get; set; }
+    /// <summary>Existing MC session ID to reattach to.</summary>
+    [JsonPropertyName("mcSessionId")]
+    public string McSessionId { get; set; } = string.Empty;
 
-    /// <summary>Run identifier whose journal and progress should seed this resumed run.</summary>
-    [JsonPropertyName("resumeFromRunId")]
-    public string? ResumeFromRunId { get; set; }
+    /// <summary>Existing MC task ID for the reattached session.</summary>
+    [JsonPropertyName("mcTaskId")]
+    public string McTaskId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for invoking a registered factory.</summary>
+/// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryRunRequest
+public sealed class RemoteControlConfig
 {
-    /// <summary>Factory input value.</summary>
-    [JsonPropertyName("args")]
-    public JsonElement Args { get; set; }
+    /// <summary>Reattach to an existing MC session without creating a new one.</summary>
+    [JsonPropertyName("existingMcSession")]
+    public RemoteControlConfigExistingMcSession? ExistingMcSession { get; set; }
 
-    /// <summary>Registered factory name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Whether the user explicitly requested remote (vs. implicit session-sync). Controls warning surfacing for missing-repo cases.</summary>
+    [JsonPropertyName("explicit")]
+    public bool Explicit { get; set; }
 
-    /// <summary>Factory invocation options.</summary>
-    [JsonPropertyName("options")]
-    public RunOptions? Options { get; set; }
+    /// <summary>Whether remote export should be enabled.</summary>
+    [JsonPropertyName("remote")]
+    public bool Remote { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>When true, suppresses timeline messages on successful setup.</summary>
+    [JsonPropertyName("silent")]
+    public bool Silent { get; set; }
 
-/// <summary>Resolved persisted factory identity and resumed run envelope.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class FactoryResumeResult
-{
-    /// <summary>Persisted factory name resolved for the resumed run.</summary>
-    [JsonPropertyName("factoryName")]
-    public string FactoryName { get; set; } = string.Empty;
+    /// <summary>Whether the MC session may steer the local session (write mode).</summary>
+    [JsonPropertyName("steerable")]
+    public bool Steerable { get; set; }
 
-    /// <summary>Terminal resumed run envelope.</summary>
-    [JsonPropertyName("run")]
-    public FactoryRunResult Run { get => field ??= new(); set; }
+    /// <summary>Existing Mission Control task ID to attach the exported session to.</summary>
+    [JsonPropertyName("taskId")]
+    public string? TaskId { get; set; }
 }
 
-/// <summary>Parameters for resuming a factory run from its persisted identity.</summary>
+/// <summary>Parameters for attaching the remote-control singleton to a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryResumeRequest
+internal sealed class SessionsStartRemoteControlRequest
 {
-    /// <summary>Optional per-invocation resource ceiling overrides.</summary>
-    [JsonPropertyName("limits")]
-    public FactoryRunLimits? Limits { get; set; }
-
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("config")]
+    public RemoteControlConfig Config { get => field ??= new(); set; }
 
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Local session id to attach remote control to.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for retrieving a factory run.</summary>
+/// <summary>Outcome of a transferRemoteControl call.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryGetRunRequest
+public sealed class RemoteControlTransferResult
 {
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>State of the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("status")]
+    public RemoteControlStatus Status { get => field ??= new(); set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether the rebinding actually happened.</summary>
+    [JsonPropertyName("transferred")]
+    public bool Transferred { get; set; }
 }
 
-/// <summary>Declared or approved factory resource ceilings.</summary>
+/// <summary>Parameters for atomically rebinding the remote-control singleton.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryDeclaredLimits
+internal sealed class SessionsTransferRemoteControlRequest
 {
-    /// <summary>Gets or sets the <c>maxAiCredits</c> value.</summary>
-    [JsonPropertyName("maxAiCredits")]
-    public double? MaxAiCredits { get; set; }
-
-    /// <summary>Gets or sets the <c>maxConcurrentSubagents</c> value.</summary>
-    [JsonPropertyName("maxConcurrentSubagents")]
-    public long? MaxConcurrentSubagents { get; set; }
-
-    /// <summary>Gets or sets the <c>maxTotalSubagents</c> value.</summary>
-    [JsonPropertyName("maxTotalSubagents")]
-    public long? MaxTotalSubagents { get; set; }
+    /// <summary>When provided, the transfer is rejected unless the singleton currently points at this session id (compare-and-swap semantics to avoid clobbering newer state).</summary>
+    [JsonPropertyName("expectedFromSessionId")]
+    public string? ExpectedFromSessionId { get; set; }
 
-    /// <summary>Gets or sets the <c>timeoutSeconds</c> value.</summary>
-    [JsonPropertyName("timeoutSeconds")]
-    public double? TimeoutSeconds { get; set; }
+    /// <summary>Local session id to point remote control at.</summary>
+    [JsonPropertyName("toSessionId")]
+    public string ToSessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Durable factory resource consumption.</summary>
+/// <summary>Patch for the singleton's steering state.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryRunConsumed
+internal sealed class SessionsSetRemoteControlSteeringRequest
 {
-    /// <summary>Gets or sets the <c>activeMs</c> value.</summary>
-    [JsonPropertyName("activeMs")]
-    public long ActiveMs { get; set; }
-
-    /// <summary>Gets or sets the <c>nanoAiu</c> value.</summary>
-    [JsonPropertyName("nanoAiu")]
-    public long NanoAiu { get; set; }
-
-    /// <summary>Gets or sets the <c>subagents</c> value.</summary>
-    [JsonPropertyName("subagents")]
-    public long Subagents { get; set; }
+    /// <summary>Target steering state. Today only `true` is actionable on the underlying exporter; `false` is reserved for future use.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 }
 
-/// <summary>Current factory phase identity.</summary>
+/// <summary>Outcome of a stopRemoteControl call.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryCurrentPhase
+public sealed class RemoteControlStopResult
 {
-    /// <summary>Gets or sets the <c>id</c> value.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>State of the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("status")]
+    public RemoteControlStatus Status { get => field ??= new(); set; }
 
-    /// <summary>Gets or sets the <c>ordinal</c> value.</summary>
-    [JsonPropertyName("ordinal")]
-    public long? Ordinal { get; set; }
+    /// <summary>Whether the singleton was actually torn down by this call.</summary>
+    [JsonPropertyName("stopped")]
+    public bool Stopped { get; set; }
 }
 
-/// <summary>Prompt-safe terminal factory outcome.</summary>
+/// <summary>RPC data type for SessionsStopRemoteControl operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryRunTerminal
+internal sealed class SessionsStopRemoteControlRequest
 {
-    /// <summary>Gets or sets the <c>error</c> value.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Gets or sets the <c>failure</c> value.</summary>
-    [JsonPropertyName("failure")]
-    public FactoryRunFailure? Failure { get; set; }
-
-    /// <summary>Gets or sets the <c>reason</c> value.</summary>
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
+    /// <summary>When provided, the stop is rejected unless the singleton currently points at this session id (compare-and-swap semantics).</summary>
+    [JsonPropertyName("expectedSessionId")]
+    public string? ExpectedSessionId { get; set; }
 
-    /// <summary>Gets or sets the <c>resultPreview</c> value.</summary>
-    [JsonPropertyName("resultPreview")]
-    public string? ResultPreview { get; set; }
+    /// <summary>When true, the singleton is unconditionally torn down regardless of `expectedSessionId`. Use during shutdown or explicit `/remote off`.</summary>
+    [JsonPropertyName("force")]
+    public bool? Force { get; set; }
 }
 
-/// <summary>Durable factory run summary with read-time live overlays.</summary>
+/// <summary>Handle for releasing the extension tool registration.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryRunSummary
+internal sealed class RegisterExtensionToolsResult
 {
-    /// <summary>Gets or sets the <c>activeSegmentStartedAt</c> value.</summary>
-    [JsonPropertyName("activeSegmentStartedAt")]
-    public long? ActiveSegmentStartedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>approved</c> value.</summary>
-    [JsonPropertyName("approved")]
-    public FactoryDeclaredLimits? Approved { get; set; }
-
-    /// <summary>Gets or sets the <c>completedAt</c> value.</summary>
-    [JsonPropertyName("completedAt")]
-    public long? CompletedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>consumed</c> value.</summary>
-    [JsonPropertyName("consumed")]
-    public FactoryRunConsumed Consumed { get => field ??= new(); set; }
-
-    /// <summary>Gets or sets the <c>createdAt</c> value.</summary>
-    [JsonPropertyName("createdAt")]
-    public long CreatedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>currentPhase</c> value.</summary>
-    [JsonPropertyName("currentPhase")]
-    public FactoryCurrentPhase? CurrentPhase { get; set; }
-
-    /// <summary>Gets or sets the <c>declaredLimits</c> value.</summary>
-    [JsonPropertyName("declaredLimits")]
-    public FactoryDeclaredLimits DeclaredLimits { get => field ??= new(); set; }
-
-    /// <summary>Gets or sets the <c>declaredPhaseCount</c> value.</summary>
-    [JsonPropertyName("declaredPhaseCount")]
-    public long DeclaredPhaseCount { get; set; }
-
-    /// <summary>Gets or sets the <c>description</c> value.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Gets or sets the <c>factoryName</c> value.</summary>
-    [JsonPropertyName("factoryName")]
-    public string FactoryName { get; set; } = string.Empty;
-
-    /// <summary>Gets or sets the <c>liveAgentCount</c> value.</summary>
-    [JsonPropertyName("liveAgentCount")]
-    public long LiveAgentCount { get; set; }
-
-    /// <summary>Gets or sets the <c>observedAt</c> value.</summary>
-    [JsonPropertyName("observedAt")]
-    public long ObservedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>revision</c> value.</summary>
-    [JsonPropertyName("revision")]
-    public long Revision { get; set; }
-
-    /// <summary>Gets or sets the <c>runId</c> value.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
-
-    /// <summary>Gets or sets the <c>startedAt</c> value.</summary>
-    [JsonPropertyName("startedAt")]
-    public long? StartedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>status</c> value.</summary>
-    [JsonPropertyName("status")]
-    public FactoryRunStatus Status { get; set; }
-
-    /// <summary>Gets or sets the <c>terminal</c> value.</summary>
-    [JsonPropertyName("terminal")]
-    public FactoryRunTerminal? Terminal { get; set; }
-
-    /// <summary>Gets or sets the <c>totalSpawnedAgentCount</c> value.</summary>
-    [JsonPropertyName("totalSpawnedAgentCount")]
-    public long TotalSpawnedAgentCount { get; set; }
-
-    /// <summary>Gets or sets the <c>updatedAt</c> value.</summary>
-    [JsonPropertyName("updatedAt")]
-    public long UpdatedAt { get; set; }
 }
 
-/// <summary>Factory runs in durable creation order.</summary>
+/// <summary>Optional registration options.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryListRunsResult
+public sealed class SessionsRegisterExtensionToolsOnSessionOptions
 {
-    /// <summary>Gets or sets the <c>runs</c> value.</summary>
-    [JsonPropertyName("runs")]
-    public IList<FactoryRunSummary> Runs { get => field ??= []; set; }
 }
 
-/// <summary>Empty parameters for listing factory runs.</summary>
+/// <summary>Params to attach an extension loader's tools to a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryListRunsRequest
+internal sealed class RegisterExtensionToolsParams
 {
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Optional registration options.</summary>
+    [JsonPropertyName("options")]
+    public SessionsRegisterExtensionToolsOnSessionOptions? Options { get; set; }
+
+    /// <summary>Session to register extension tools on.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Prompt-safe durable identity and live status for a direct factory agent.</summary>
+/// <summary>Params to attach or detach an in-process ExtensionController delegate.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryAgentSummary
+internal sealed class ConfigureSessionExtensionsParams
 {
-    /// <summary>Gets or sets the <c>activeMs</c> value.</summary>
-    [JsonPropertyName("activeMs")]
-    public long ActiveMs { get; set; }
-
-    /// <summary>Gets or sets the <c>activity</c> value.</summary>
-    [JsonPropertyName("activity")]
-    public string? Activity { get; set; }
-
-    /// <summary>Gets or sets the <c>agentId</c> value.</summary>
-    [JsonPropertyName("agentId")]
-    public string AgentId { get; set; } = string.Empty;
-
-    /// <summary>Gets or sets the <c>agentType</c> value.</summary>
-    [JsonPropertyName("agentType")]
-    public string AgentType { get; set; } = string.Empty;
-
-    /// <summary>Gets or sets the <c>completedAt</c> value.</summary>
-    [JsonPropertyName("completedAt")]
-    public long? CompletedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>label</c> value.</summary>
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
+    /// <summary>Session to attach the extension controller delegate to.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Gets or sets the <c>phaseId</c> value.</summary>
-    [JsonPropertyName("phaseId")]
-    public string? PhaseId { get; set; }
+/// <summary>Outcome of an agentRegistry.spawn call.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(AgentRegistrySpawnResultSpawned), "spawned")]
+[JsonDerivedType(typeof(AgentRegistrySpawnResultSpawnError), "spawn-error")]
+[JsonDerivedType(typeof(AgentRegistrySpawnResultRegistryTimeout), "registry-timeout")]
+[JsonDerivedType(typeof(AgentRegistrySpawnResultValidationError), "validation-error")]
+public partial class AgentRegistrySpawnResult
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
 
-    /// <summary>Gets or sets the <c>requestedModel</c> value.</summary>
-    [JsonPropertyName("requestedModel")]
-    public string? RequestedModel { get; set; }
 
-    /// <summary>Gets or sets the <c>resolvedModel</c> value.</summary>
-    [JsonPropertyName("resolvedModel")]
-    public string? ResolvedModel { get; set; }
+/// <summary>Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class AgentRegistryLiveTargetEntry
+{
+    /// <summary>Kind of attention required when status === "attention". Meaningful only when status === "attention".</summary>
+    [JsonPropertyName("attentionKind")]
+    public AgentRegistryLiveTargetEntryAttentionKind? AttentionKind { get; set; }
 
-    /// <summary>Gets or sets the <c>runId</c> value.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Git branch of the session (when known).</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-    /// <summary>Gets or sets the <c>startedAt</c> value.</summary>
-    [JsonPropertyName("startedAt")]
-    public long? StartedAt { get; set; }
+    /// <summary>Copilot CLI version that wrote the entry.</summary>
+    [JsonPropertyName("copilotVersion")]
+    public string CopilotVersion { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>status</c> value.</summary>
-    [JsonPropertyName("status")]
-    public string Status { get; set; } = string.Empty;
+    /// <summary>Working directory of the session (when known).</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
 
-    /// <summary>Gets or sets the <c>toolCallId</c> value.</summary>
-    [JsonPropertyName("toolCallId")]
-    public string ToolCallId { get; set; } = string.Empty;
-}
+    /// <summary>Bind host for the entry's JSON-RPC server.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-/// <summary>Durable lifecycle and timing for one factory phase.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class FactoryPhaseObservation
-{
-    /// <summary>Gets or sets the <c>accumulatedActiveMs</c> value.</summary>
-    [JsonPropertyName("accumulatedActiveMs")]
-    public long AccumulatedActiveMs { get; set; }
+    /// <summary>Process kind tag for the registry entry.</summary>
+    [JsonPropertyName("kind")]
+    public AgentRegistryLiveTargetEntryKind Kind { get; set; }
 
-    /// <summary>Gets or sets the <c>completedAt</c> value.</summary>
-    [JsonPropertyName("completedAt")]
-    public long? CompletedAt { get; set; }
+    /// <summary>Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness).</summary>
+    [JsonPropertyName("lastSeenMs")]
+    public long LastSeenMs { get; set; }
 
-    /// <summary>Gets or sets the <c>currentActiveMs</c> value.</summary>
-    [JsonPropertyName("currentActiveMs")]
-    public long CurrentActiveMs { get; set; }
+    /// <summary>How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.</summary>
+    [JsonPropertyName("lastTerminalEvent")]
+    public AgentRegistryLiveTargetEntryLastTerminalEvent? LastTerminalEvent { get; set; }
 
-    /// <summary>Gets or sets the <c>detail</c> value.</summary>
-    [JsonPropertyName("detail")]
-    public string? Detail { get; set; }
+    /// <summary>Model identifier currently selected for the session.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Gets or sets the <c>entryCount</c> value.</summary>
-    [JsonPropertyName("entryCount")]
-    public long EntryCount { get; set; }
+    /// <summary>Operating-system pid of the process owning this entry.</summary>
+    [JsonPropertyName("pid")]
+    public long Pid { get; set; }
 
-    /// <summary>Gets or sets the <c>id</c> value.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>TCP port the entry's JSON-RPC server is listening on.</summary>
+    [JsonPropertyName("port")]
+    public long Port { get; set; }
 
-    /// <summary>Gets or sets the <c>lastEnteredRunAttempt</c> value.</summary>
-    [JsonPropertyName("lastEnteredRunAttempt")]
-    public long LastEnteredRunAttempt { get; set; }
+    /// <summary>Registry entry schema version (1 = ui-server, 2 = managed-server).</summary>
+    [JsonPropertyName("schemaVersion")]
+    public long SchemaVersion { get; set; }
 
-    /// <summary>Gets or sets the <c>liveAgentCount</c> value.</summary>
-    [JsonPropertyName("liveAgentCount")]
-    public long LiveAgentCount { get; set; }
+    /// <summary>Session ID of the foreground session for this entry.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
 
-    /// <summary>Gets or sets the <c>ordinal</c> value.</summary>
-    [JsonPropertyName("ordinal")]
-    public long? Ordinal { get; set; }
+    /// <summary>Friendly session name (when set).</summary>
+    [JsonPropertyName("sessionName")]
+    public string? SessionName { get; set; }
 
-    /// <summary>Gets or sets the <c>startedAt</c> value.</summary>
+    /// <summary>ISO 8601 timestamp captured at registration.</summary>
     [JsonPropertyName("startedAt")]
-    public long? StartedAt { get; set; }
+    public string StartedAt { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>status</c> value.</summary>
+    /// <summary>Coarse lifecycle status of the foreground session.</summary>
     [JsonPropertyName("status")]
-    public FactoryPhaseStatus Status { get; set; }
+    public AgentRegistryLiveTargetEntryStatus? Status { get; set; }
 
-    /// <summary>Gets or sets the <c>title</c> value.</summary>
-    [JsonPropertyName("title")]
-    public string Title { get; set; } = string.Empty;
+    /// <summary>Monotonic per-publisher revision counter incremented on every status update. Lets watchers detect transient flips.</summary>
+    [JsonPropertyName("statusRevision")]
+    public long? StatusRevision { get; set; }
 
-    /// <summary>Gets or sets the <c>totalAgentCount</c> value.</summary>
-    [JsonPropertyName("totalAgentCount")]
-    public long TotalAgentCount { get; set; }
+    /// <summary>Connection token (null when the target is unauthenticated).</summary>
+    [JsonInclude]
+    [JsonPropertyName("token")]
+    internal string? Token { get; set; }
 }
 
-/// <summary>One durable factory progress record.</summary>
+/// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryProgressLine
+public sealed class AgentRegistryLogCapture
 {
-    /// <summary>Resume attempt that emitted this record.</summary>
-    [JsonPropertyName("attempt")]
-    public long Attempt { get; set; }
-
-    /// <summary>Progress record kind.</summary>
-    [JsonPropertyName("kind")]
-    public FactoryLogLineKind Kind { get; set; }
-
-    /// <summary>Phase active when the record was emitted, or null before any phase.</summary>
-    [JsonPropertyName("phaseId")]
-    public string? PhaseId { get; set; }
+    /// <summary>Whether per-spawn log capture is on (false when env-disabled or open failed).</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Epoch milliseconds when the record was persisted.</summary>
-    [JsonPropertyName("recordedAt")]
-    public long RecordedAt { get; set; }
+    /// <summary>Human-readable open failure message (only set when enabled === false AND the env-disable opt-out was NOT used).</summary>
+    [JsonPropertyName("openError")]
+    public string? OpenError { get; set; }
 
-    /// <summary>Global monotonic sequence number within the run.</summary>
-    [JsonPropertyName("seq")]
-    public long Seq { get; set; }
+    /// <summary>Categorized reason for log-open failure.</summary>
+    [JsonPropertyName("openErrorReason")]
+    public AgentRegistryLogCaptureOpenErrorReason? OpenErrorReason { get; set; }
 
-    /// <summary>Prompt-safe progress text.</summary>
-    [JsonPropertyName("text")]
-    public string Text { get; set; } = string.Empty;
+    /// <summary>Absolute path to the per-spawn log file (only set when enabled).</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
 }
 
-/// <summary>A bidirectional page of factory progress.</summary>
+/// <summary>Managed-server child was spawned and registered successfully.</summary>
+/// <remarks>The <c>spawned</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryProgressPage
+public partial class AgentRegistrySpawnResultSpawned : AgentRegistrySpawnResult
 {
-    /// <summary>Gets or sets the <c>hasMoreNewer</c> value.</summary>
-    [JsonPropertyName("hasMoreNewer")]
-    public bool HasMoreNewer { get; set; }
-
-    /// <summary>Gets or sets the <c>hasMoreOlder</c> value.</summary>
-    [JsonPropertyName("hasMoreOlder")]
-    public bool HasMoreOlder { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "spawned";
 
-    /// <summary>Gets or sets the <c>newestSeq</c> value.</summary>
-    [JsonPropertyName("newestSeq")]
-    public long? NewestSeq { get; set; }
+    /// <summary>Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).</summary>
+    [JsonPropertyName("entry")]
+    public required AgentRegistryLiveTargetEntry Entry { get; set; }
 
-    /// <summary>Gets or sets the <c>oldestSeq</c> value.</summary>
-    [JsonPropertyName("oldestSeq")]
-    public long? OldestSeq { get; set; }
+    /// <summary>If the delegate attempted to send the initial prompt and failed, the categorized error message.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("initialPromptError")]
+    public string? InitialPromptError { get; set; }
 
-    /// <summary>Gets or sets the <c>records</c> value.</summary>
-    [JsonPropertyName("records")]
-    public IList<FactoryProgressLine> Records { get => field ??= []; set; }
+    /// <summary>Whether the delegate already sent the initial prompt. Always omitted in the current wiring: the controller sends the prompt post-attach via the standard LocalRpcSession.send path.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("initialPromptSent")]
+    public bool? InitialPromptSent { get; set; }
 
-    /// <summary>Run revision reflected by this page.</summary>
-    [JsonPropertyName("revision")]
-    public long Revision { get; set; }
+    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("logCapture")]
+    public AgentRegistryLogCapture? LogCapture { get; set; }
 }
 
-/// <summary>Full factory run observability detail.</summary>
+/// <summary>`child_process.spawn` itself failed before the child entered the registry.</summary>
+/// <remarks>The <c>spawn-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryRunDetail
+public partial class AgentRegistrySpawnResultSpawnError : AgentRegistrySpawnResult
 {
-    /// <summary>Gets or sets the <c>activeSegmentStartedAt</c> value.</summary>
-    [JsonPropertyName("activeSegmentStartedAt")]
-    public long? ActiveSegmentStartedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>agents</c> value.</summary>
-    [JsonPropertyName("agents")]
-    public IList<FactoryAgentSummary> Agents { get => field ??= []; set; }
-
-    /// <summary>Gets or sets the <c>approved</c> value.</summary>
-    [JsonPropertyName("approved")]
-    public FactoryDeclaredLimits? Approved { get; set; }
-
-    /// <summary>Gets or sets the <c>completedAt</c> value.</summary>
-    [JsonPropertyName("completedAt")]
-    public long? CompletedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>consumed</c> value.</summary>
-    [JsonPropertyName("consumed")]
-    public FactoryRunConsumed Consumed { get => field ??= new(); set; }
-
-    /// <summary>Gets or sets the <c>createdAt</c> value.</summary>
-    [JsonPropertyName("createdAt")]
-    public long CreatedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>currentPhase</c> value.</summary>
-    [JsonPropertyName("currentPhase")]
-    public FactoryCurrentPhase? CurrentPhase { get; set; }
-
-    /// <summary>Gets or sets the <c>declaredLimits</c> value.</summary>
-    [JsonPropertyName("declaredLimits")]
-    public FactoryDeclaredLimits DeclaredLimits { get => field ??= new(); set; }
-
-    /// <summary>Gets or sets the <c>declaredPhaseCount</c> value.</summary>
-    [JsonPropertyName("declaredPhaseCount")]
-    public long DeclaredPhaseCount { get; set; }
-
-    /// <summary>Gets or sets the <c>description</c> value.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Gets or sets the <c>factoryName</c> value.</summary>
-    [JsonPropertyName("factoryName")]
-    public string FactoryName { get; set; } = string.Empty;
-
-    /// <summary>Gets or sets the <c>liveAgentCount</c> value.</summary>
-    [JsonPropertyName("liveAgentCount")]
-    public long LiveAgentCount { get; set; }
-
-    /// <summary>Gets or sets the <c>observedAt</c> value.</summary>
-    [JsonPropertyName("observedAt")]
-    public long ObservedAt { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "spawn-error";
 
-    /// <summary>Gets or sets the <c>phases</c> value.</summary>
-    [JsonPropertyName("phases")]
-    public IList<FactoryPhaseObservation> Phases { get => field ??= []; set; }
+    /// <summary>Underlying errno code (e.g. ENOENT, EACCES) when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("code")]
+    public string? Code { get; set; }
 
-    /// <summary>Gets or sets the <c>progress</c> value.</summary>
-    [JsonPropertyName("progress")]
-    public FactoryProgressPage Progress { get => field ??= new(); set; }
+    /// <summary>Human-readable error message.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+}
 
-    /// <summary>Gets or sets the <c>revision</c> value.</summary>
-    [JsonPropertyName("revision")]
-    public long Revision { get; set; }
+/// <summary>Spawn succeeded but the child did not publish a matching managed-server entry within the timeout.</summary>
+/// <remarks>The <c>registry-timeout</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class AgentRegistrySpawnResultRegistryTimeout : AgentRegistrySpawnResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "registry-timeout";
 
-    /// <summary>Gets or sets the <c>runId</c> value.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Process ID of the orphaned child (so the caller can offer 'kill the pid' guidance).</summary>
+    [JsonPropertyName("childPid")]
+    public required long ChildPid { get; set; }
 
-    /// <summary>Gets or sets the <c>startedAt</c> value.</summary>
-    [JsonPropertyName("startedAt")]
-    public long? StartedAt { get; set; }
+    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("logCapture")]
+    public AgentRegistryLogCapture? LogCapture { get; set; }
+}
 
-    /// <summary>Gets or sets the <c>status</c> value.</summary>
-    [JsonPropertyName("status")]
-    public FactoryRunStatus Status { get; set; }
+/// <summary>Synchronous pre-validation rejected the spawn request.</summary>
+/// <remarks>The <c>validation-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class AgentRegistrySpawnResultValidationError : AgentRegistrySpawnResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "validation-error";
 
-    /// <summary>Gets or sets the <c>terminal</c> value.</summary>
-    [JsonPropertyName("terminal")]
-    public FactoryRunTerminal? Terminal { get; set; }
+    /// <summary>Which parameter field was invalid. Omitted when the rejection is not field-specific.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("field")]
+    public AgentRegistrySpawnValidationErrorField? Field { get; set; }
 
-    /// <summary>Gets or sets the <c>totalSpawnedAgentCount</c> value.</summary>
-    [JsonPropertyName("totalSpawnedAgentCount")]
-    public long TotalSpawnedAgentCount { get; set; }
+    /// <summary>Human-readable explanation; safe to surface in the UI banner. Never logged to unrestricted telemetry.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 
-    /// <summary>Gets or sets the <c>updatedAt</c> value.</summary>
-    [JsonPropertyName("updatedAt")]
-    public long UpdatedAt { get; set; }
+    /// <summary>Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.</summary>
+    [JsonPropertyName("reason")]
+    public required AgentRegistrySpawnValidationErrorReason Reason { get; set; }
 }
 
-/// <summary>Parameters for paging factory progress.</summary>
+/// <summary>Inputs to spawn a managed-server child via the controller's spawn delegate.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryGetRunProgressRequest
+internal sealed class AgentRegistrySpawnRequest
 {
-    /// <summary>Exclusive forward cursor.</summary>
-    [JsonPropertyName("afterSeq")]
-    public long? AfterSeq { get; set; }
+    /// <summary>Custom or built-in agent name (e.g. 'explore'). When omitted, the child uses its own default.</summary>
+    [JsonPropertyName("agentName")]
+    public string? AgentName { get; set; }
 
-    /// <summary>Exclusive backward cursor.</summary>
-    [JsonPropertyName("beforeSeq")]
-    public long? BeforeSeq { get; set; }
+    /// <summary>Working directory for the spawned child (must be an existing directory).</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
 
-    /// <summary>Maximum records to return. Defaults to 200 and is capped at 500.</summary>
-    [JsonPropertyName("limit")]
-    public int? Limit { get; set; }
+    /// <summary>Optional first user message. Forwarded to the caller (the CLI's spawn wrapper sends it post-attach via the standard LocalRpcSession.send path).</summary>
+    [JsonPropertyName("initialPrompt")]
+    public string? InitialPrompt { get; set; }
 
-    /// <summary>Optional phase identifier used to scope records and cursors.</summary>
-    [JsonPropertyName("phaseId")]
-    public string? PhaseId { get; set; }
+    /// <summary>Model identifier to apply to the new session.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Friendly session name. Must satisfy validateSessionName: non-empty, no leading/trailing whitespace, &lt;=100 chars, no control chars, no double quotes.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.</summary>
+    [JsonPropertyName("permissionMode")]
+    public AgentRegistrySpawnPermissionMode? PermissionMode { get; set; }
 }
 
-/// <summary>Parameters for cancelling a factory run.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryCancelRequest
+internal sealed class SessionSuspendRequest
 {
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Acknowledgement that a factory request was accepted.</summary>
+/// <summary>Result of sending a user message.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryAckResult
+public sealed class SendResult
 {
+    /// <summary>Unique identifier assigned to the message.</summary>
+    [JsonPropertyName("messageId")]
+    public string MessageId { get; set; } = string.Empty;
 }
 
-/// <summary>One ordered factory progress line.</summary>
+/// <summary>Parameters for sending a user message to the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryLogLine
+internal sealed class SendRequest
 {
-    /// <summary>Progress line kind.</summary>
-    [JsonPropertyName("kind")]
-    public FactoryLogLineKind Kind { get; set; }
+    /// <summary>The UI mode the agent was in when this message was sent. Defaults to the session's current mode.</summary>
+    [JsonPropertyName("agentMode")]
+    public SendAgentMode? AgentMode { get; set; }
 
-    /// <summary>Monotonic sequence number within the factory run.</summary>
-    [JsonPropertyName("seq")]
-    public long Seq { get; set; }
+    /// <summary>Optional attachments (files, directories, selections, blobs, GitHub references) to include with the message.</summary>
+    [JsonPropertyName("attachments")]
+    public IList<Attachment>? Attachments { get; set; }
 
-    /// <summary>Progress text.</summary>
-    [JsonPropertyName("text")]
-    public string Text { get; set; } = string.Empty;
-}
+    /// <summary>If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.</summary>
+    [JsonPropertyName("billable")]
+    public bool? Billable { get; set; }
 
-/// <summary>Parameters for recording factory progress.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryLogRequest
-{
-    /// <summary>Opaque token identifying the current factory execution attempt.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
+    /// <summary>If provided, this is shown in the timeline instead of `prompt`.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-    /// <summary>Ordered progress lines to append.</summary>
-    [JsonPropertyName("lines")]
-    public IList<FactoryLogLine> Lines { get => field ??= []; set; }
+    /// <summary>How to deliver the message. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.</summary>
+    [JsonPropertyName("mode")]
+    public SendMode? Mode { get; set; }
 
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>If true, adds the message to the front of the queue instead of the end.</summary>
+    [JsonPropertyName("prepend")]
+    public bool? Prepend { get; set; }
+
+    /// <summary>The user message text.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
+
+    /// <summary>Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.</summary>
+    [JsonPropertyName("requestHeaders")]
+    public IDictionary<string, string>? RequestHeaders { get; set; }
+
+    /// <summary>If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange.</summary>
+    [JsonPropertyName("requiredTool")]
+    public string? RequiredTool { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>Result of one factory-scoped subagent call.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class FactoryAgentResult
-{
-    /// <summary>Agent result, omitted when the agent produced no result.</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
-}
+    /// <summary>Optional provenance tag copied to the resulting user.message event. Must be `user`, `system`, `command-&lt;command-id&gt;` for command-originated messages, `schedule-&lt;numeric-id&gt;` for scheduled prompts, or `agent-&lt;agent-id&gt;` for prompts sent by another agent.</summary>
+    [RegularExpression("^(user|system|command-.*|schedule-\\d+|agent-.+)$")]
+    [JsonInclude]
+    [JsonPropertyName("source")]
+    internal string? Source { get; set; }
 
-/// <summary>Options for one factory-scoped subagent call.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class FactoryAgentOptions
-{
-    /// <summary>Optional label distinguishing otherwise identical memoized agent calls.</summary>
-    [JsonPropertyName("label")]
-    public string? Label { get; set; }
+    /// <summary>W3C Trace Context traceparent header for distributed tracing of this agent turn.</summary>
+    [JsonPropertyName("traceparent")]
+    public string? Traceparent { get; set; }
 
-    /// <summary>Optional model identifier for the subagent.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
+    [JsonPropertyName("tracestate")]
+    public string? Tracestate { get; set; }
 
-    /// <summary>Optional JSON Schema for structured agent output.</summary>
-    [JsonPropertyName("schema")]
-    public JsonElement? Schema { get; set; }
+    /// <summary>If true, await completion of the agentic loop for this message before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageId`; the caller can rely on the agent having processed the message before the call resolves. Transport-dependent tail semantics: on a LOCAL (in-process) session the wait additionally blocks until the completed turn's event tail has been dispatched to this session's in-process subscribers, so a subsequent read of subscriber state already reflects the turn; on a REMOTE session the wait resolves once the loop completes and mirrored delivery follows over the wire. Callers that need the stronger local guarantee on remote sessions should await the event stream explicitly.</summary>
+    [JsonPropertyName("wait")]
+    public bool? Wait { get; set; }
 }
 
-/// <summary>Parameters for one factory-scoped subagent call.</summary>
+/// <summary>Result of sending zero or more user messages.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryAgentRequest
+public sealed class SendMessagesResult
 {
-    /// <summary>Opaque token identifying the current factory execution attempt.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
+    /// <summary>Unique identifiers assigned to the messages, one per provided message in order. Empty when no messages were provided.</summary>
+    [JsonPropertyName("messageIds")]
+    public IList<string> MessageIds { get => field ??= []; set; }
+}
 
-    /// <summary>Factory run identifier that owns the subagent.</summary>
-    [JsonPropertyName("factoryRunId")]
-    public string FactoryRunId { get; set; } = string.Empty;
+/// <summary>A single user message to append to the session as part of a `session.sendMessages` turn.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SendMessageItem
+{
+    /// <summary>Optional attachments (files, directories, selections, blobs, GitHub references) to include with this message.</summary>
+    [JsonPropertyName("attachments")]
+    public IList<Attachment>? Attachments { get; set; }
 
-    /// <summary>Subagent execution options.</summary>
-    [JsonPropertyName("opts")]
-    public FactoryAgentOptions Opts { get => field ??= new(); set; }
+    /// <summary>If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.</summary>
+    [JsonInclude]
+    [JsonPropertyName("billable")]
+    internal bool? Billable { get; set; }
 
-    /// <summary>Prompt to send to the subagent.</summary>
+    /// <summary>If provided, this is shown in the timeline instead of `prompt`.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
+
+    /// <summary>The user message text.</summary>
     [JsonPropertyName("prompt")]
     public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange.</summary>
+    [JsonPropertyName("requiredTool")]
+    public string? RequiredTool { get; set; }
+
+    /// <summary>Optional provenance tag copied to the resulting user.message event. Must be `user`, `system`, `command-&lt;command-id&gt;` for command-originated messages, `schedule-&lt;numeric-id&gt;` for scheduled prompts, or `agent-&lt;agent-id&gt;` for prompts sent by another agent.</summary>
+    [RegularExpression("^(user|system|command-.*|schedule-\\d+|agent-.+)$")]
+    [JsonInclude]
+    [JsonPropertyName("source")]
+    internal string? Source { get; set; }
 }
 
-/// <summary>Result of reading a factory journal entry.</summary>
+/// <summary>Parameters for sending zero or more user messages to the session in a single turn. Remote-backed (Mission Control) sessions do not support this method and will return an error.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FactoryJournalGetResult
+internal sealed class SendMessagesRequest
 {
-    /// <summary>Whether the journal contained the requested key.</summary>
-    [JsonPropertyName("hit")]
-    public bool Hit { get; set; }
+    /// <summary>The UI mode the agent was in when these messages were sent. Defaults to the session's current mode.</summary>
+    [JsonPropertyName("agentMode")]
+    public SendAgentMode? AgentMode { get; set; }
 
-    /// <summary>Cached JSON result. The hit field distinguishes a cached JSON null from a miss.</summary>
-    [JsonPropertyName("resultJson")]
-    public JsonElement? ResultJson { get; set; }
-}
+    /// <summary>The user messages to append to the conversation, in order. May be empty, in which case a single turn runs over the existing history with no new user message.</summary>
+    [JsonPropertyName("messages")]
+    public IList<SendMessageItem> Messages { get => field ??= []; set; }
 
-/// <summary>Parameters for reading a factory journal entry.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryJournalGetRequest
-{
-    /// <summary>Opaque token identifying the current factory execution attempt.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
+    /// <summary>How to deliver the messages. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.</summary>
+    [JsonPropertyName("mode")]
+    public SendMode? Mode { get; set; }
 
-    /// <summary>Namespaced journal key.</summary>
-    [JsonPropertyName("key")]
-    public string Key { get; set; } = string.Empty;
+    /// <summary>If true, adds the messages to the front of the queue instead of the end.</summary>
+    [JsonPropertyName("prepend")]
+    public bool? Prepend { get; set; }
 
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.</summary>
+    [JsonPropertyName("requestHeaders")]
+    public IDictionary<string, string>? RequestHeaders { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>W3C Trace Context traceparent header for distributed tracing of this agent turn.</summary>
+    [JsonPropertyName("traceparent")]
+    public string? Traceparent { get; set; }
+
+    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
+    [JsonPropertyName("tracestate")]
+    public string? Tracestate { get; set; }
+
+    /// <summary>If true, await completion of the agentic loop for this turn before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageIds`; the caller can rely on the agent having processed the messages before the call resolves. Transport-dependent tail semantics: on a LOCAL (in-process) session the wait additionally blocks until the completed turn's event tail has been dispatched to this session's in-process subscribers, so a subsequent read of subscriber state already reflects the turn; on a REMOTE session the wait resolves once the loop completes and mirrored delivery follows over the wire. Callers that need the stronger local guarantee on remote sessions should await the event stream explicitly.</summary>
+    [JsonPropertyName("wait")]
+    public bool? Wait { get; set; }
 }
 
-/// <summary>Parameters for storing a factory journal entry.</summary>
+/// <summary>Internal request for sending a system notification.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FactoryJournalPutRequest
+internal sealed class SendSystemNotificationRequest
 {
-    /// <summary>Opaque token identifying the current factory execution attempt.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
-
-    /// <summary>Namespaced journal key.</summary>
-    [JsonPropertyName("key")]
-    public string Key { get; set; } = string.Empty;
+    /// <summary>Optional structured notification kind.</summary>
+    [JsonPropertyName("kind")]
+    public JsonElement? Kind { get; set; }
 
-    /// <summary>JSON result to memoize.</summary>
-    [JsonPropertyName("resultJson")]
-    public JsonElement ResultJson { get; set; }
+    /// <summary>Notification text to deliver to the model.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Internal delivery options, including passive policy.</summary>
+    [JsonPropertyName("options")]
+    public JsonElement? Options { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The currently selected model, reasoning effort, and context tier for the session. The context tier reflects `Session.getContextTier()`, restored from the session journal on resume.</summary>
+/// <summary>Result of aborting the current turn.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CurrentModel
+public sealed class AbortResult
 {
-    /// <summary>Context tier for models that support multiple context-window sizes.</summary>
-    [JsonPropertyName("contextTier")]
-    public ContextTier? ContextTier { get; set; }
-
-    /// <summary>Currently active model identifier.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+    /// <summary>Error message if the abort failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Reasoning effort level currently applied to the active model, when one is set. Reads `Session.getReasoningEffort()` synchronously after `getSelectedModel()` resolves so the two values are reported as a snapshot.</summary>
-    [JsonPropertyName("reasoningEffort")]
-    public string? ReasoningEffort { get; set; }
+    /// <summary>Whether the abort completed successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Parameters for aborting the current turn.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionModelGetCurrentRequest
+internal sealed class AbortRequest
 {
+    /// <summary>Finite reason code describing why the current turn was aborted.</summary>
+    [JsonPropertyName("reason")]
+    public AbortReason? Reason { get; set; }
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The model identifier active on the session after the switch.</summary>
+/// <summary>Result of interrupting the main agent turn.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ModelSwitchToResult
+public sealed class InterruptMainTurnResult
 {
-    /// <summary>True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains.</summary>
-    [JsonPropertyName("deferred")]
-    public bool? Deferred { get; set; }
-
-    /// <summary>Currently active model identifier after the switch.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+    /// <summary>Whether an in-flight main agent turn was interrupted. False when the main loop was not processing.</summary>
+    [JsonPropertyName("interrupted")]
+    public bool Interrupted { get; set; }
 }
 
-/// <summary>Vision-specific limits.</summary>
+/// <summary>Parameters for interrupting the main agent turn.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesOverrideLimitsVision
+internal sealed class InterruptMainTurnRequest
 {
-    /// <summary>Maximum image size in bytes.</summary>
-    [JsonPropertyName("max_prompt_image_size")]
-    public long? MaxPromptImageSize { get; set; }
-
-    /// <summary>Maximum number of images per prompt.</summary>
-    [JsonPropertyName("max_prompt_images")]
-    public long? MaxPromptImages { get; set; }
+    /// <summary>When true, the user's queued prompts are preserved and run as the next turn once the interrupted turn unwinds; when false (the default), the queue is cleared like a plain abort.</summary>
+    [JsonPropertyName("flushQueued")]
+    public bool? FlushQueued { get; set; }
 
-    /// <summary>MIME types the model accepts.</summary>
-    [JsonPropertyName("supported_media_types")]
-    public IList<string>? SupportedMediaTypes { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Token limits for prompts, outputs, and context window.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesOverrideLimits
+internal sealed class SessionCancelAllBackgroundAgentsRequest
 {
-    /// <summary>Maximum total context window size in tokens.</summary>
-    [JsonPropertyName("max_context_window_tokens")]
-    public long? MaxContextWindowTokens { get; set; }
-
-    /// <summary>Maximum number of output/completion tokens.</summary>
-    [JsonPropertyName("max_output_tokens")]
-    public long? MaxOutputTokens { get; set; }
-
-    /// <summary>Maximum number of prompt/input tokens.</summary>
-    [JsonPropertyName("max_prompt_tokens")]
-    public long? MaxPromptTokens { get; set; }
-
-    /// <summary>Vision-specific limits.</summary>
-    [JsonPropertyName("vision")]
-    public ModelCapabilitiesOverrideLimitsVision? Vision { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Feature flags indicating what the model supports.</summary>
+/// <summary>Parameters for shutting down the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesOverrideSupports
+internal sealed class ShutdownRequest
 {
-    /// <summary>Resolved Anthropic adaptive-thinking capability — unsupported / optional / required. 'required' models reject thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8).</summary>
-    [JsonPropertyName("adaptive_thinking")]
-    public AdaptiveThinkingSupport? AdaptiveThinking { get; set; }
+    /// <summary>Optional human-readable reason. Typically the message of the error that triggered shutdown when type is 'error'.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 
-    /// <summary>Whether this model supports reasoning effort configuration.</summary>
-    [JsonPropertyName("reasoningEffort")]
-    public bool? ReasoningEffort { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Whether this model supports vision/image input.</summary>
-    [JsonPropertyName("vision")]
-    public bool? Vision { get; set; }
+    /// <summary>Why the session is being shut down. Defaults to "routine" when omitted.</summary>
+    [JsonPropertyName("type")]
+    public ShutdownType? Type { get; set; }
 }
 
-/// <summary>Optional capability overrides (vision, tool_calls, reasoning, etc.).</summary>
+/// <summary>Identifier of the session event that was emitted for the log message.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesOverride
+public sealed class LogResult
 {
-    /// <summary>Token limits for prompts, outputs, and context window.</summary>
-    [JsonPropertyName("limits")]
-    public ModelCapabilitiesOverrideLimits? Limits { get; set; }
-
-    /// <summary>Feature flags indicating what the model supports.</summary>
-    [JsonPropertyName("supports")]
-    public ModelCapabilitiesOverrideSupports? Supports { get; set; }
+    /// <summary>The unique identifier of the emitted session event.</summary>
+    [JsonPropertyName("eventId")]
+    public Guid EventId { get; set; }
 }
 
-/// <summary>Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.</summary>
+/// <summary>Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ModelSwitchToRequest
+internal sealed class LogRequest
 {
-    /// <summary>Explicit context tier for the selected model. `"default"` / `"long_context"` apply the requested tier; omit this field to use normal model behavior with no explicit tier.</summary>
-    [JsonPropertyName("contextTier")]
-    public ContextTier? ContextTier { get; set; }
-
-    /// <summary>When true, defer this switch (enqueue it) if another model change is already queued, even when no turn is active — so it drains last (FIFO) and wins over the already-queued change. Intended for genuine user-initiated model selections; internal restore/reapply switches omit it and apply immediately when no turn is active. When no other model change is queued this has no effect (a switch still applies immediately unless a turn is active).</summary>
-    [JsonPropertyName("deferIfModelChangeQueued")]
-    public bool? DeferIfModelChangeQueued { get; set; }
-
-    /// <summary>Override individual model capabilities resolved by the runtime.</summary>
-    [JsonPropertyName("modelCapabilities")]
-    public ModelCapabilitiesOverride? ModelCapabilities { get; set; }
-
-    /// <summary>Model selection id to switch to, as returned by `list`. A bare id (e.g. `claude-sonnet-4.6`) names a Copilot (CAPI) model; a provider-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a registry BYOK model.</summary>
-    [JsonPropertyName("modelId")]
-    public string ModelId { get; set; } = string.Empty;
+    /// <summary>When true, the message is transient and not persisted to the session event log on disk.</summary>
+    [JsonPropertyName("ephemeral")]
+    public bool? Ephemeral { get; set; }
 
-    /// <summary>Reasoning effort level to use for the model. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. "none" disables reasoning. When omitted, no effort override is applied.</summary>
-    [JsonPropertyName("reasoningEffort")]
-    public string? ReasoningEffort { get; set; }
+    /// <summary>Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".</summary>
+    [JsonPropertyName("level")]
+    public SessionLogLevel? Level { get; set; }
 
-    /// <summary>Reasoning summary mode to request for supported model clients.</summary>
-    [JsonPropertyName("reasoningSummary")]
-    public ReasoningSummary? ReasoningSummary { get; set; }
+    /// <summary>Human-readable message.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Output verbosity level to request for supported models.</summary>
-    [JsonPropertyName("verbosity")]
-    public Verbosity? Verbosity { get; set; }
-}
-
-/// <summary>Update the session's reasoning effort without changing the selected model. Use `switchTo` instead when you also need to change the model. The runtime stores the effort on the session and applies it to subsequent turns.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ModelSetReasoningEffortResult
-{
-    /// <summary>Reasoning effort level recorded on the session after the update.</summary>
-    [JsonPropertyName("reasoningEffort")]
-    public string ReasoningEffort { get; set; } = string.Empty;
-}
-
-/// <summary>Reasoning effort level to apply to the currently selected model.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ModelSetReasoningEffortRequest
-{
-    /// <summary>Reasoning effort level to apply to the currently selected model. The host is responsible for validating the value against the model's supported levels before calling.</summary>
-    [JsonPropertyName("reasoningEffort")]
-    public string ReasoningEffort { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Optional actionable tip displayed alongside the message. Only honored on `level: "info"`.</summary>
+    [JsonPropertyName("tip")]
+    public string? Tip { get; set; }
 
-/// <summary>Cost-category metadata for a CAPI model.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionModelPriceCategory
-{
-    /// <summary>Gets or sets the <c>id</c> value.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Domain category for this log entry (e.g., "mcp", "subscription", "policy", "model"). Maps to `infoType`/`warningType`/`errorType` on the emitted event. Defaults to "notification".</summary>
+    [JsonPropertyName("type")]
+    public string? Type { get; set; }
 
-    /// <summary>Gets or sets the <c>priceCategory</c> value.</summary>
-    [JsonPropertyName("priceCategory")]
-    public ModelPickerPriceCategory PriceCategory { get; set; }
+    /// <summary>Optional URL the user can open in their browser for more details.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <summary>The list of models available to this session.</summary>
+/// <summary>Authentication status and account metadata for the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionModelList
+public sealed class SessionAuthStatus
 {
-    /// <summary>Available models, ordered with the most preferred default first. Includes both Copilot (CAPI) models and any registry BYOK models; a BYOK model appears under its provider-qualified selection id (`provider/id`).</summary>
-    [JsonPropertyName("list")]
-    public IList<JsonElement> List { get => field ??= []; set; }
+    /// <summary>Authentication type.</summary>
+    [JsonPropertyName("authType")]
+    public AuthInfoType? AuthType { get; set; }
 
-    /// <summary>Cost categories for the full CAPI catalog, including picker-disabled models that Auto may select. Metadata only; entries absent from `list` are not manually selectable.</summary>
-    [JsonPropertyName("modelPriceCategories")]
-    public IList<SessionModelPriceCategory>? ModelPriceCategories { get; set; }
+    /// <summary>Copilot plan tier (e.g., individual_pro, business).</summary>
+    [JsonPropertyName("copilotPlan")]
+    public string? CopilotPlan { get; set; }
 
-    /// <summary>Per-quota snapshots returned alongside the model list, keyed by quota type.</summary>
-    [JsonPropertyName("quotaSnapshots")]
-    public IDictionary<string, JsonElement>? QuotaSnapshots { get; set; }
-}
+    /// <summary>Authentication host URL.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("host")]
+    public string? Host { get; set; }
 
-/// <summary>RPC data type for SessionModelList operations.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionModelListRequest
-{
-    /// <summary>If true, bypasses the per-session model list cache and re-fetches from CAPI.</summary>
-    [JsonPropertyName("skipCache")]
-    public bool? SkipCache { get; set; }
-}
+    /// <summary>Whether the session has resolved authentication.</summary>
+    [JsonPropertyName("isAuthenticated")]
+    public bool IsAuthenticated { get; set; }
 
-/// <summary>RPC data type for SessionModelListRequestWithSession operations.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionModelListRequestWithSession
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Authenticated login/username, if available.</summary>
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
 
-    /// <summary>If true, bypasses the per-session model list cache and re-fetches from CAPI.</summary>
-    [JsonPropertyName("skipCache")]
-    public bool? SkipCache { get; set; }
+    /// <summary>Human-readable authentication status description.</summary>
+    [JsonPropertyName("statusMessage")]
+    public string? StatusMessage { get; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionModeGetRequest
+internal sealed class SessionGitHubAuthGetStatusRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Agent interaction mode to apply to the session.</summary>
+/// <summary>Indicates whether the credential update succeeded.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ModeSetRequest
+public sealed class SessionSetCredentialsResult
 {
-    /// <summary>The session mode the agent is operating in.</summary>
-    [JsonPropertyName("mode")]
-    public SessionMode Mode { get; set; }
+    /// <summary>Whether the session ended up with a populated `copilotUser` for the installed credentials. `true` when the supplied credential already carried `copilotUser` or it was successfully re-resolved server-side. `false` when the credential is installed without `copilotUser` — either re-resolution failed, or the variant cannot be re-resolved from the credential alone (only the raw-token variants `token`, `env`, and `gh-cli` can). In both `false` cases the token swap still applied, but plan/quota/billing metadata is degraded. Present whenever a credential was supplied; omitted only when no credential was supplied (no-op call).</summary>
+    [JsonPropertyName("copilotUserResolved")]
+    public bool? CopilotUserResolved { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>The session's friendly name, or null when not yet set.</summary>
+/// <summary>Authentication credentials accepted by session.gitHubAuth.setCredentials. Session-owned token-provider identities cannot be installed through this method.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class NameGetResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SettableAuthInfoHmac), "hmac")]
+[JsonDerivedType(typeof(SettableAuthInfoEnv), "env")]
+[JsonDerivedType(typeof(SettableAuthInfoToken), "token")]
+[JsonDerivedType(typeof(SettableAuthInfoCopilotApiToken), "copilot-api-token")]
+[JsonDerivedType(typeof(SettableAuthInfoUser), "user")]
+[JsonDerivedType(typeof(SettableAuthInfoGhCli), "gh-cli")]
+[JsonDerivedType(typeof(SettableAuthInfoApiKey), "api-key")]
+public partial class SettableAuthInfo
 {
-    /// <summary>The session name (user-set or auto-generated), or null if not yet set.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionNameGetRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>New friendly name to apply to the session.</summary>
+/// <summary>Authentication-info input variant for GitHub-internal HMAC auth, carrying the public GitHub host and HMAC secret.</summary>
+/// <remarks>The <c>hmac</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class NameSetRequest
+public partial class SettableAuthInfoHmac : SettableAuthInfo
 {
-    /// <summary>New session name (1–100 characters, trimmed of leading/trailing whitespace).</summary>
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [MaxLength(100)]
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "hmac";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
 
-/// <summary>Indicates whether the auto-generated summary was applied as the session's name.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class NameSetAutoResult
-{
-    /// <summary>Whether the auto-generated summary was persisted. False if the session already has a user-set name, the summary normalized to empty, or the session does not have a workspace.</summary>
-    [JsonPropertyName("applied")]
-    public bool Applied { get; set; }
+    /// <summary>HMAC secret used to sign requests.</summary>
+    [JsonPropertyName("hmac")]
+    public required string Hmac { get; set; }
+
+    /// <summary>Authentication host. HMAC auth always targets the public GitHub host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 }
 
-/// <summary>Auto-generated session summary to apply as the session's name when no user-set name exists.</summary>
+/// <summary>Authentication-info input variant for a token sourced from an environment variable, with host, optional login, token, and env var name.</summary>
+/// <remarks>The <c>env</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class NameSetAutoRequest
+public partial class SettableAuthInfoEnv : SettableAuthInfo
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "env";
 
-    /// <summary>Auto-generated session summary. Empty/whitespace-only values are ignored; values are trimmed before persisting.</summary>
-    [JsonPropertyName("summary")]
-    public string Summary { get; set; } = string.Empty;
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Name of the environment variable the token was sourced from.</summary>
+    [JsonPropertyName("envVar")]
+    public required string EnvVar { get; set; }
+
+    /// <summary>Authentication host (e.g. https://github.com or a GHES host).</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
+
+    /// <summary>User login associated with the token. Undefined for server-to-server tokens (those starting with `ghs_`).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
+
+    /// <summary>The token value itself. Treat as a secret.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
 }
 
-/// <summary>Existence, contents, and resolved path of the session plan file.</summary>
+/// <summary>Token authentication accepted by session.gitHubAuth.setCredentials.</summary>
+/// <remarks>The <c>token</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PlanReadResult
+public partial class SettableAuthInfoToken : SettableAuthInfo
 {
-    /// <summary>The content of the plan file, or null if it does not exist.</summary>
-    [JsonPropertyName("content")]
-    public string? Content { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "token";
 
-    /// <summary>Whether the plan file exists in the workspace.</summary>
-    [JsonPropertyName("exists")]
-    public bool Exists { get; set; }
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
 
-    /// <summary>Absolute file path of the plan file, or null if workspace is not enabled.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
-}
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionPlanReadRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The token value itself. Treat as a secret.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
 }
 
-/// <summary>Replacement contents to write to the session plan file.</summary>
+/// <summary>Authentication-info variant for direct Copilot API token auth sourced from environment variables, with public GitHub host.</summary>
+/// <remarks>The <c>copilot-api-token</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PlanUpdateRequest
+public partial class SettableAuthInfoCopilotApiToken : SettableAuthInfo
 {
-    /// <summary>The new content for the plan file.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "copilot-api-token";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Authentication host (always the public GitHub host).</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Authentication-info variant for OAuth user auth, with host and login; the token remains in the runtime secret store.</summary>
+/// <remarks>The <c>user</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionPlanDeleteRequest
+public partial class SettableAuthInfoUser : SettableAuthInfo
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "user";
+
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
+
+    /// <summary>OAuth user login.</summary>
+    [JsonPropertyName("login")]
+    public required string Login { get; set; }
 }
 
-/// <summary>A single todo row read from the session SQL `todos` table. All fields are optional because the SQL schema is best-effort and the agent may not have populated every column.</summary>
+/// <summary>Authentication-info input variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.</summary>
+/// <remarks>The <c>gh-cli</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PlanSqlTodosRow
+public partial class SettableAuthInfoGhCli : SettableAuthInfo
 {
-    /// <summary>Todo description.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "gh-cli";
 
-    /// <summary>Todo identifier.</summary>
-    [JsonPropertyName("id")]
-    public string? Id { get; set; }
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
 
-    /// <summary>Todo status.</summary>
-    [JsonPropertyName("status")]
-    public string? Status { get; set; }
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-    /// <summary>Todo title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>User login as reported by `gh auth status`.</summary>
+    [JsonPropertyName("login")]
+    public required string Login { get; set; }
+
+    /// <summary>The token returned by `gh auth token`. Treat as a secret.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
 }
 
-/// <summary>Todo rows read from the session SQL database. Empty when no session database is available.</summary>
+/// <summary>Authentication-info input variant for API-key authentication to a non-GitHub LLM provider, carrying the secret `apiKey` and host.</summary>
+/// <remarks>The <c>api-key</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PlanReadSqlTodosResult
+public partial class SettableAuthInfoApiKey : SettableAuthInfo
 {
-    /// <summary>Rows from the session SQL todos table, ordered by creation time and id.</summary>
-    [JsonPropertyName("rows")]
-    public IList<PlanSqlTodosRow> Rows { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "api-key";
+
+    /// <summary>The API key. Treat as a secret.</summary>
+    [JsonPropertyName("apiKey")]
+    public required string ApiKey { get; set; }
+
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>New auth credentials to install on the session. Omit to leave credentials unchanged.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionPlanReadSqlTodosRequest
+internal sealed class SessionSetCredentialsParams
 {
+    /// <summary>The new auth credentials to install on the session. When omitted or `undefined`, the call is a no-op and the session's existing credentials are preserved. The runtime installs the supplied value immediately for outbound model/API requests. When the credential carries a raw token (`token`, `env`, or `gh-cli`) but no `copilotUser`, the runtime additionally re-resolves `copilotUser` server-side (best-effort, asynchronously, after the synchronous install) so plan/quota/billing metadata regains fidelity; on resolution failure the verbatim credential remains installed. It does NOT otherwise validate the credential. Several variants carry secret material; treat this method's params as containing secrets at rest and in transit.</summary>
+    [JsonPropertyName("credentials")]
+    public SettableAuthInfo? Credentials { get; set; }
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>A single dependency edge read from the session SQL `todo_deps` table, indicating that one todo must complete before another.</summary>
+/// <summary>Credential-free authentication identity safe to expose to hosts and user interfaces.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PlanSqlTodoDependency
+public sealed class AuthIdentity
 {
-    /// <summary>ID of the todo it depends on.</summary>
-    [JsonPropertyName("dependsOn")]
-    public string DependsOn { get; set; } = string.Empty;
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known.</summary>
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
 
-    /// <summary>ID of the todo that has the dependency.</summary>
-    [JsonPropertyName("todoId")]
-    public string TodoId { get; set; } = string.Empty;
+    /// <summary>Name of the environment variable that supplied the credential, when applicable.</summary>
+    [JsonPropertyName("envVar")]
+    public string? EnvVar { get; set; }
+
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
+
+    /// <summary>Authenticated login, when available.</summary>
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
+
+    /// <summary>Opaque SDK GitHub credential registration backing this identity. Routing metadata only; never a credential.</summary>
+    [JsonPropertyName("registrationId")]
+    public string? RegistrationId { get; set; }
+
+    /// <summary>Authentication type.</summary>
+    [JsonPropertyName("type")]
+    public AuthInfoType Type { get; set; }
 }
 
-/// <summary>Todo rows + dependency edges read from the session SQL database.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PlanReadSqlTodosWithDependenciesResult
+internal sealed class SessionGitHubAuthGetCurrentAuthInfoRequest
 {
-    /// <summary>Edges from the session SQL todo_deps table. Empty when no database, no todo_deps table, or the SELECT failed. Read independently from `rows`, so a broken todo_deps table does not affect the rows result and vice versa.</summary>
-    [JsonPropertyName("dependencies")]
-    public IList<PlanSqlTodoDependency> Dependencies { get => field ??= []; set; }
-
-    /// <summary>Rows from the session SQL todos table, ordered by creation time and id. Empty when no database, no todos table, or the SELECT failed.</summary>
-    [JsonPropertyName("rows")]
-    public IList<PlanSqlTodosRow> Rows { get => field ??= []; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionPlanReadSqlTodosWithDependenciesRequest
+internal sealed class SessionGitHubAuthGetAllAuthAvailableRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for WorkspacesGetWorkspaceResultWorkspace operations.</summary>
-public sealed class WorkspacesGetWorkspaceResultWorkspace
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionGitHubAuthRefreshCopilotUserRequest
 {
-    /// <summary>Gets or sets the <c>branch</c> value.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
-
-    /// <summary>Gets or sets the <c>chronicle_sync_dismissed</c> value.</summary>
-    [JsonPropertyName("chronicle_sync_dismissed")]
-    public bool? ChronicleSyncDismissed { get; set; }
-
-    /// <summary>Gets or sets the <c>client_name</c> value.</summary>
-    [JsonPropertyName("client_name")]
-    public string? ClientName { get; set; }
-
-    /// <summary>Gets or sets the <c>created_at</c> value.</summary>
-    [JsonPropertyName("created_at")]
-    public DateTimeOffset? CreatedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>cwd</c> value.</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
-
-    /// <summary>Gets or sets the <c>git_root</c> value.</summary>
-    [JsonPropertyName("git_root")]
-    public string? GitRoot { get; set; }
-
-    /// <summary>Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.</summary>
-    [JsonPropertyName("host_type")]
-    public WorkspacesWorkspaceDetailsHostType? HostType { get; set; }
-
-    /// <summary>Gets or sets the <c>id</c> value.</summary>
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-
-    /// <summary>Gets or sets the <c>mc_last_event_id</c> value.</summary>
-    [JsonPropertyName("mc_last_event_id")]
-    public string? McLastEventId { get; set; }
-
-    /// <summary>Gets or sets the <c>mc_session_id</c> value.</summary>
-    [JsonPropertyName("mc_session_id")]
-    public string? McSessionId { get; set; }
-
-    /// <summary>Gets or sets the <c>mc_task_id</c> value.</summary>
-    [JsonPropertyName("mc_task_id")]
-    public string? McTaskId { get; set; }
-
-    /// <summary>Gets or sets the <c>name</c> value.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Gets or sets the <c>remote_steerable</c> value.</summary>
-    [JsonPropertyName("remote_steerable")]
-    public bool? RemoteSteerable { get; set; }
+/// <summary>Internal GitHub login parameters.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionAuthLoginRequest
+{
+    /// <summary>GitHub host URL.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>repository</c> value.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
+    /// <summary>GitHub login.</summary>
+    [JsonPropertyName("login")]
+    public string Login { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>summary_count</c> value.</summary>
-    [JsonPropertyName("summary_count")]
-    public long? SummaryCount { get; set; }
+    /// <summary>Whether to persist the token after login.</summary>
+    [JsonPropertyName("persist")]
+    public bool? Persist { get; set; }
 
-    /// <summary>Gets or sets the <c>updated_at</c> value.</summary>
-    [JsonPropertyName("updated_at")]
-    public DateTimeOffset? UpdatedAt { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>user_named</c> value.</summary>
-    [JsonPropertyName("user_named")]
-    public bool? UserNamed { get; set; }
+    /// <summary>GitHub authentication token.</summary>
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
 }
 
-/// <summary>Current workspace metadata for the session, including its absolute filesystem path when available.</summary>
+/// <summary>Parameters for switching the session's active authentication.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesGetWorkspaceResult
+internal sealed class SessionAuthSwitchRequest
 {
-    /// <summary>Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+    /// <summary>Authentication information to activate.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo AuthInfo { get => field ??= new(); set; }
 
-    /// <summary>Current workspace metadata, or null if not available.</summary>
-    [JsonPropertyName("workspace")]
-    public WorkspacesGetWorkspaceResultWorkspace? Workspace { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Optional token paired with the authentication information.</summary>
+    [JsonPropertyName("token")]
+    public string? Token { get; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesGetWorkspaceRequest
+internal sealed class SessionGitHubAuthLogoutRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Workspace metadata fields to update.</summary>
+/// <summary>Parameters identifying a GitHub authentication to log out.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesUpdateMetadataRequest
+internal sealed class SessionAuthLogoutUserRequest
 {
-    /// <summary>Opaque workspace context supplied by the session host.</summary>
-    [JsonPropertyName("context")]
-    public JsonElement? Context { get; set; }
-
-    /// <summary>Optional workspace display name override.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Authentication information to log out.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo AuthInfo { get => field ??= new(); set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Optional session context used when creating a local workspace.</summary>
+/// <summary>Validation error from an authentication attempt.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesEnsureRequest
+public sealed class AuthValidationError
 {
-    /// <summary>Opaque workspace context supplied by the session host.</summary>
-    [JsonPropertyName("context")]
-    public JsonElement? Context { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Optional message returned by GitHub.</summary>
+    [JsonPropertyName("githubMessage")]
+    public string? GitHubMessage { get; set; }
 
-/// <summary>Relative paths of files stored in the session workspace files directory.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesListFilesResult
-{
-    /// <summary>Relative file paths in the workspace files directory.</summary>
-    [JsonPropertyName("files")]
-    public IList<string> Files { get => field ??= []; set; }
+    /// <summary>Authentication validation error message.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesListFilesRequest
+internal sealed class SessionGitHubAuthLastAuthErrorsRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Contents of the requested workspace file as a UTF-8 string.</summary>
+/// <summary>A file included in the redacted debug bundle.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesReadFileResult
+public sealed class DebugCollectLogsCollectedEntry
 {
-    /// <summary>File content as a UTF-8 string.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Relative path of the file in the staged bundle/archive.</summary>
+    [JsonPropertyName("bundlePath")]
+    public string BundlePath { get; set; } = string.Empty;
+
+    /// <summary>Redacted output size in bytes.</summary>
+    [JsonPropertyName("sizeBytes")]
+    public long SizeBytes { get; set; }
+
+    /// <summary>Source category for this entry.</summary>
+    [JsonPropertyName("source")]
+    public DebugCollectLogsSource Source { get; set; }
 }
 
-/// <summary>Relative path of the workspace file to read.</summary>
+/// <summary>An optional debug bundle entry that could not be included.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesReadFileRequest
+public sealed class DebugCollectLogsSkippedEntry
 {
-    /// <summary>Relative path within the workspace files directory.</summary>
+    /// <summary>Relative path requested for this bundle entry.</summary>
+    [JsonPropertyName("bundlePath")]
+    public string BundlePath { get; set; } = string.Empty;
+
+    /// <summary>Server-local source path that could not be read.</summary>
     [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    public string? Path { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Reason the entry was skipped.</summary>
+    [JsonPropertyName("reason")]
+    public string Reason { get; set; } = string.Empty;
 }
 
-/// <summary>Relative path and UTF-8 content for the workspace file to create or overwrite.</summary>
+/// <summary>Result of collecting a redacted debug bundle.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesCreateFileRequest
+public sealed class DebugCollectLogsResult
 {
-    /// <summary>File content to write as a UTF-8 string.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Files included in the redacted bundle.</summary>
+    [JsonPropertyName("entries")]
+    public IList<DebugCollectLogsCollectedEntry> Entries { get => field ??= []; set; }
 
-    /// <summary>Relative path within the workspace files directory.</summary>
+    /// <summary>Destination kind that was written.</summary>
+    [JsonPropertyName("kind")]
+    public DebugCollectLogsResultKind Kind { get; set; }
+
+    /// <summary>Actual archive path or staging directory path written. This may differ from the requested path when no-overwrite suffixing or fallback-to-temp-directory was needed.</summary>
     [JsonPropertyName("path")]
     public string Path { get; set; } = string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Optional files or directories that could not be included.</summary>
+    [JsonPropertyName("skippedEntries")]
+    public IList<DebugCollectLogsSkippedEntry>? SkippedEntries { get; set; }
 }
 
-/// <summary>Workspace checkpoint metadata with assigned number, human-readable title, and checkpoint filename.</summary>
+/// <summary>A caller-provided server-local file or directory to include in the debug bundle.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesCheckpoints
+public sealed class DebugCollectLogsEntry
 {
-    /// <summary>Filename of the checkpoint within the workspace checkpoints directory.</summary>
-    [JsonPropertyName("filename")]
-    public string Filename { get; set; } = string.Empty;
+    /// <summary>Relative path to use inside the staged bundle/archive.</summary>
+    [JsonPropertyName("bundlePath")]
+    public string BundlePath { get; set; } = string.Empty;
 
-    /// <summary>Checkpoint number assigned by the workspace manager.</summary>
-    [JsonPropertyName("number")]
-    public long Number { get; set; }
+    /// <summary>Kind of source path to include.</summary>
+    [JsonPropertyName("kind")]
+    public DebugCollectLogsEntryKind Kind { get; set; }
 
-    /// <summary>Human-readable checkpoint title.</summary>
-    [JsonPropertyName("title")]
-    public string Title { get; set; } = string.Empty;
-}
+    /// <summary>Server-local source path to read.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-/// <summary>Workspace checkpoints in chronological order; empty when the workspace is not enabled.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesListCheckpointsResult
-{
-    /// <summary>Workspace checkpoints in chronological order. Empty when workspace is not enabled.</summary>
-    [JsonPropertyName("checkpoints")]
-    public IList<WorkspacesCheckpoints> Checkpoints { get => field ??= []; set; }
-}
+    /// <summary>How text content from this entry should be redacted. Defaults to plain-text.</summary>
+    [JsonPropertyName("redaction")]
+    public DebugCollectLogsRedaction? Redaction { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesListCheckpointsRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>When true, collection fails if this entry cannot be read. Defaults to false, which records the entry in `skippedEntries`.</summary>
+    [JsonPropertyName("required")]
+    public bool? Required { get; set; }
 }
 
-/// <summary>Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.</summary>
+/// <summary>Destination for the redacted debug bundle.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesReadCheckpointResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(DebugCollectLogsDestinationArchive), "archive")]
+[JsonDerivedType(typeof(DebugCollectLogsDestinationDirectory), "directory")]
+public partial class DebugCollectLogsDestination
 {
-    /// <summary>Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.</summary>
-    [JsonPropertyName("content")]
-    public string? Content { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Checkpoint number to read.</summary>
+
+/// <summary>The <c>archive</c> variant of <see cref="DebugCollectLogsDestination"/>.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesReadCheckpointRequest
+public partial class DebugCollectLogsDestinationArchive : DebugCollectLogsDestination
 {
-    /// <summary>Checkpoint number to read.</summary>
-    [JsonPropertyName("number")]
-    public long Number { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "archive";
 
-/// <summary>RPC data type for WorkspacesAddSummaryResultSummary operations.</summary>
-public sealed class WorkspacesAddSummaryResultSummary
-{
-}
+    /// <summary>When true, create the archive atomically without overwriting an existing file by appending ` (N)` before the extension as needed. Defaults to false.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("noOverwrite")]
+    public bool? NoOverwrite { get; set; }
 
-/// <summary>RPC data type for WorkspacesAddSummaryResultWorkspace operations.</summary>
-public sealed class WorkspacesAddSummaryResultWorkspace
-{
+    /// <summary>Absolute or server-relative path for the .tgz archive to create.</summary>
+    [JsonPropertyName("outputPath")]
+    public required string OutputPath { get; set; }
 }
 
-/// <summary>Persisted summary metadata and refreshed workspace metadata.</summary>
+/// <summary>The <c>directory</c> variant of <see cref="DebugCollectLogsDestination"/>.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesAddSummaryResult
+public partial class DebugCollectLogsDestinationDirectory : DebugCollectLogsDestination
 {
-    /// <summary>Gets or sets the <c>summary</c> value.</summary>
-    [JsonPropertyName("summary")]
-    public WorkspacesAddSummaryResultSummary? Summary { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "directory";
 
-    /// <summary>Gets or sets the <c>workspace</c> value.</summary>
-    [JsonPropertyName("workspace")]
-    public WorkspacesAddSummaryResultWorkspace? Workspace { get; set; }
+    /// <summary>Directory where redacted files should be staged. The directory is created if needed.</summary>
+    [JsonPropertyName("outputDirectory")]
+    public required string OutputDirectory { get; set; }
 }
 
-/// <summary>Compaction summary checkpoint to persist.</summary>
+/// <summary>Built-in session diagnostics to include in the bundle. Omitted fields default to true.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesAddSummaryRequest
+public sealed class DebugCollectLogsInclude
 {
-    /// <summary>Markdown summary content to persist.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Server-local path to the current process log. When set, it is included as `process.log` and its directory is searched for prior logs from the same session.</summary>
+    [JsonPropertyName("currentProcessLogPath")]
+    public string? CurrentProcessLogPath { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Include the session event log (`events.jsonl`). Defaults to true.</summary>
+    [JsonPropertyName("events")]
+    public bool? Events { get; set; }
 
-    /// <summary>Summary title shown in checkpoint listings.</summary>
-    [JsonPropertyName("title")]
-    public string Title { get; set; } = string.Empty;
+    /// <summary>Server-local path to the session's events.jsonl file. Internal callers normally omit this and let the runtime derive it from the session.</summary>
+    [JsonPropertyName("eventsPath")]
+    public string? EventsPath { get; set; }
+
+    /// <summary>Maximum number of previous process logs to include. Defaults to 5.</summary>
+    [JsonPropertyName("previousProcessLogLimit")]
+    public long? PreviousProcessLogLimit { get; set; }
+
+    /// <summary>Server-local process log directory to search when `currentProcessLogPath` is unavailable, useful for collecting logs for inactive sessions.</summary>
+    [JsonPropertyName("processLogDirectory")]
+    public string? ProcessLogDirectory { get; set; }
+
+    /// <summary>Include process logs for the session. Defaults to true.</summary>
+    [JsonPropertyName("processLogs")]
+    public bool? ProcessLogs { get; set; }
+
+    /// <summary>Include interactive shell logs written under the session's `shell-logs` directory. Defaults to true.</summary>
+    [JsonPropertyName("shellLogs")]
+    public bool? ShellLogs { get; set; }
 }
 
-/// <summary>Rollback point for local workspace summaries.</summary>
+/// <summary>Options for collecting a redacted session debug bundle.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesTruncateSummariesRequest
+internal sealed class DebugCollectLogsRequest
 {
-    /// <summary>Number of newest summaries to keep.</summary>
-    [JsonPropertyName("keepCount")]
-    public long KeepCount { get; set; }
+    /// <summary>Caller-provided server-local files or directories to include in addition to the runtime's built-in session diagnostics. This lets host applications add their own diagnostics without changing the API shape.</summary>
+    [JsonPropertyName("additionalEntries")]
+    public IList<DebugCollectLogsEntry>? AdditionalEntries { get; set; }
+
+    /// <summary>Where the redacted bundle should be written. Use `archive` to produce a .tgz, or `directory` to stage redacted files for caller-managed upload/post-processing.</summary>
+    [JsonPropertyName("destination")]
+    public DebugCollectLogsDestination Destination { get => field ??= new(); set; }
+
+    /// <summary>Which built-in session diagnostics to include. Omitted fields default to true.</summary>
+    [JsonPropertyName("include")]
+    public DebugCollectLogsInclude? Include { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Autopilot objective file content, or null when missing.</summary>
+/// <summary>Canvas action that the agent or host can invoke. To discover the input schema for a particular action, call the list_canvas_capabilities tool.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesReadAutopilotObjectiveResult
+public sealed class CanvasAction
 {
-    /// <summary>Autopilot objective file content, or null when missing.</summary>
-    [JsonPropertyName("content")]
-    public string? Content { get; set; }
+    /// <summary>Description of the action.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>JSON Schema for the action input.</summary>
+    [JsonPropertyName("inputSchema")]
+    public JsonElement? InputSchema { get; set; }
+
+    /// <summary>Action name exposed by the canvas provider.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Canvas available in the current session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesReadAutopilotObjectiveRequest
+public sealed class DiscoveredCanvas
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Actions the agent or host may invoke on an open instance.</summary>
+    [JsonPropertyName("actions")]
+    public IList<CanvasAction>? Actions { get; set; }
+
+    /// <summary>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public string CanvasId { get; set; } = string.Empty;
+
+    /// <summary>Short, single-sentence description shown to the agent in canvas catalogs.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Human-readable canvas name.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
+
+    /// <summary>Owning provider identifier.</summary>
+    [JsonPropertyName("extensionId")]
+    public string ExtensionId { get; set; } = string.Empty;
+
+    /// <summary>Owning extension display name, when available.</summary>
+    [JsonPropertyName("extensionName")]
+    public string? ExtensionName { get; set; }
+
+    /// <summary>Host-local PNG path for the canvas icon, when supplied.</summary>
+    [JsonPropertyName("icon")]
+    public string? Icon { get; set; }
+
+    /// <summary>JSON Schema for canvas open input.</summary>
+    [JsonPropertyName("inputSchema")]
+    public JsonElement? InputSchema { get; set; }
 }
 
-/// <summary>Result of writing the autopilot objective file.</summary>
+/// <summary>Declared canvases available in this session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesWriteAutopilotObjectiveResult
+public sealed class CanvasList
 {
-    /// <summary>Filesystem operation performed.</summary>
-    [JsonPropertyName("operation")]
-    public string Operation { get; set; } = string.Empty;
+    /// <summary>Declared canvases available in this session.</summary>
+    [JsonPropertyName("canvases")]
+    public IList<DiscoveredCanvas> Canvases { get => field ??= []; set; }
 }
 
-/// <summary>Autopilot objective file content to persist.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesWriteAutopilotObjectiveRequest
+internal sealed class SessionCanvasListRequest
 {
-    /// <summary>Autopilot objective file content.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of deleting the autopilot objective file.</summary>
+/// <summary>Open canvas instance snapshot.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesDeleteAutopilotObjectiveResult
+public sealed class OpenCanvasInstance
 {
-    /// <summary>True when a file was deleted.</summary>
-    [JsonPropertyName("deleted")]
-    public bool Deleted { get; set; }
-}
+    /// <summary>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public string CanvasId { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesDeleteAutopilotObjectiveRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Owning provider identifier.</summary>
+    [JsonPropertyName("extensionId")]
+    public string ExtensionId { get; set; } = string.Empty;
+
+    /// <summary>Owning extension display name, when available.</summary>
+    [JsonPropertyName("extensionName")]
+    public string? ExtensionName { get; set; }
+
+    /// <summary>Host-local PNG path for the canvas icon, when supplied.</summary>
+    [JsonPropertyName("icon")]
+    public string? Icon { get; set; }
+
+    /// <summary>Input supplied when the instance was opened.</summary>
+    [JsonPropertyName("input")]
+    public JsonElement? Input { get; set; }
+
+    /// <summary>Stable caller-supplied canvas instance identifier.</summary>
+    [JsonPropertyName("instanceId")]
+    public string InstanceId { get; set; } = string.Empty;
+
+    /// <summary>Provider-supplied status text.</summary>
+    [JsonPropertyName("status")]
+    public string? Status { get; set; }
+
+    /// <summary>Rendered title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    /// <summary>URL for web-rendered canvases.</summary>
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <summary>Whether the autopilot objective file exists.</summary>
+/// <summary>Live open-canvas snapshot.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesAutopilotObjectiveExistsResult
+public sealed class CanvasListOpenResult
 {
-    /// <summary>True when the objective file exists.</summary>
-    [JsonPropertyName("exists")]
-    public bool Exists { get; set; }
+    /// <summary>Currently open canvas instances.</summary>
+    [JsonPropertyName("openCanvases")]
+    public IList<OpenCanvasInstance> OpenCanvases { get => field ??= []; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesAutopilotObjectiveExistsRequest
+internal sealed class SessionCanvasListOpenRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for WorkspacesSaveLargePasteResultSaved operations.</summary>
-public sealed class WorkspacesSaveLargePasteResultSaved
+/// <summary>Canvas open parameters.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class CanvasOpenRequest
 {
-    /// <summary>Filename within the workspace files directory.</summary>
-    [JsonPropertyName("filename")]
-    public string Filename { get; set; } = string.Empty;
+    /// <summary>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public string CanvasId { get; set; } = string.Empty;
 
-    /// <summary>Absolute filesystem path to the saved paste file.</summary>
-    [JsonPropertyName("filePath")]
-    public string FilePath { get; set; } = string.Empty;
+    /// <summary>Owning provider identifier. Optional when the canvasId is unique across providers; required to disambiguate when multiple providers register the same canvasId.</summary>
+    [JsonPropertyName("extensionId")]
+    public string? ExtensionId { get; set; }
 
-    /// <summary>Size of the saved file in bytes.</summary>
-    [JsonPropertyName("sizeBytes")]
-    public long SizeBytes { get; set; }
-}
+    /// <summary>Canvas open input.</summary>
+    [JsonPropertyName("input")]
+    public JsonElement? Input { get; set; }
 
-/// <summary>Descriptor for the saved paste file, or null when the workspace is unavailable.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class WorkspacesSaveLargePasteResult
-{
-    /// <summary>Saved-paste descriptor, or null when the workspace is unavailable (e.g. CCA runtime, non-infinite sessions, remote sessions).</summary>
-    [JsonPropertyName("saved")]
-    public WorkspacesSaveLargePasteResultSaved? Saved { get; set; }
+    /// <summary>Caller-supplied stable instance identifier.</summary>
+    [JsonPropertyName("instanceId")]
+    public string InstanceId { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Pasted content to save as a UTF-8 file in the session workspace.</summary>
+/// <summary>Canvas close parameters.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesSaveLargePasteRequest
+internal sealed class CanvasCloseRequest
 {
-    /// <summary>Pasted content to save as a UTF-8 file.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Open canvas instance identifier.</summary>
+    [JsonPropertyName("instanceId")]
+    public string InstanceId { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>A single changed file and its unified diff.</summary>
+/// <summary>Canvas action invocation result.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspaceDiffFileChange
+public sealed class CanvasActionInvokeResult
 {
-    /// <summary>Type of change represented by this file diff.</summary>
-    [JsonPropertyName("changeType")]
-    public WorkspaceDiffFileChangeType ChangeType { get; set; }
-
-    /// <summary>Unified diff content for the file. Empty when the diff was truncated.</summary>
-    [JsonPropertyName("diff")]
-    public string Diff { get; set; } = string.Empty;
-
-    /// <summary>Whether the diff content was omitted because it exceeded the per-file size limit.</summary>
-    [JsonPropertyName("isTruncated")]
-    public bool? IsTruncated { get; set; }
-
-    /// <summary>Original file path for renamed files.</summary>
-    [JsonPropertyName("oldPath")]
-    public string? OldPath { get; set; }
-
-    /// <summary>Path to the changed file, relative to the workspace root when the file lives under it. A file changed outside the workspace root keeps a `../`-relative path, or an absolute path when no relative path exists (for example a different Windows drive).</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Provider-supplied action result.</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
 }
 
-/// <summary>Workspace diff result for the requested mode.</summary>
+/// <summary>Canvas action invocation parameters.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class WorkspaceDiffResult
+internal sealed class CanvasActionInvokeRequest
 {
-    /// <summary>Default branch used for a branch diff, when branch mode was requested.</summary>
-    [JsonPropertyName("baseBranch")]
-    public string? BaseBranch { get; set; }
-
-    /// <summary>Changed files and their unified diffs.</summary>
-    [JsonPropertyName("changes")]
-    public IList<WorkspaceDiffFileChange> Changes { get => field ??= []; set; }
-
-    /// <summary>Whether the requested diff fell back to unstaged changes, either because branch diff failed or session diff was unavailable.</summary>
-    [JsonPropertyName("isFallback")]
-    public bool IsFallback { get; set; }
+    /// <summary>Action name to invoke.</summary>
+    [JsonPropertyName("actionName")]
+    public string ActionName { get; set; } = string.Empty;
 
-    /// <summary>Effective mode used for the returned changes.</summary>
-    [JsonPropertyName("mode")]
-    public WorkspaceDiffMode Mode { get; set; }
+    /// <summary>Action input.</summary>
+    [JsonPropertyName("input")]
+    public JsonElement? Input { get; set; }
 
-    /// <summary>Diff mode requested by the client.</summary>
-    [JsonPropertyName("requestedMode")]
-    public WorkspaceDiffMode RequestedMode { get; set; }
+    /// <summary>Open canvas instance identifier.</summary>
+    [JsonPropertyName("instanceId")]
+    public string InstanceId { get; set; } = string.Empty;
 
-    /// <summary>Why the session diff could not be produced, when applicable. Set only when `session` mode was requested and `isFallback` is true, so a client can tell the permanent `file-change-tracking-disabled` apart from the transient `session-busy`, which the same request answers once the session settles. Never set for `unstaged` or `branch` mode, and never `unsupported-remote-session`: a remote session's captures live on its own host, so a `session`-mode diff is rejected for one rather than answered with a controller-side fallback.</summary>
-    [JsonPropertyName("unavailableReason")]
-    public HistoryRewindUnavailableReason? UnavailableReason { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for computing a workspace diff.</summary>
+/// <summary>Internal canvas provider registration parameters.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class WorkspacesDiffRequest
+internal sealed class CanvasProviderRegisterRequest
 {
-    /// <summary>When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.</summary>
-    [JsonPropertyName("ignoreWhitespace")]
-    public bool? IgnoreWhitespace { get; set; }
+    /// <summary>Canvas contributions supplied by the provider.</summary>
+    [JsonPropertyName("canvases")]
+    public IList<JsonElement> Canvases { get => field ??= []; set; }
 
-    /// <summary>Diff mode requested by the client.</summary>
-    [JsonPropertyName("mode")]
-    public WorkspaceDiffMode Mode { get; set; }
+    /// <summary>Connection identifier for callback routing.</summary>
+    [JsonPropertyName("connectionId")]
+    public string ConnectionId { get; set; } = string.Empty;
+
+    /// <summary>Provider metadata supplied by the host.</summary>
+    [JsonPropertyName("info")]
+    public JsonElement Info { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Characters that, when typed in the composer, should trigger a `completions.request`. Empty when the session has no host-driven completions (e.g. local sessions, or a relay host that does not advertise `completionTriggerCharacters`).</summary>
+/// <summary>Internal canvas provider unregistration parameters.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CompletionsGetTriggerCharactersResult
+internal sealed class CanvasProviderUnregisterRequest
 {
-    /// <summary>Trigger characters advertised by the host (e.g. `["@", "#"]`). Empty disables host-driven completions for the session.</summary>
-    [JsonPropertyName("triggerCharacters")]
-    public IList<string> TriggerCharacters { get => field ??= []; set; }
-}
+    /// <summary>Connection identifier to unregister.</summary>
+    [JsonPropertyName("connectionId")]
+    public string ConnectionId { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionCompletionsGetTriggerCharactersRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>A single host-driven completion. Accepting an item replaces `[rangeStart, rangeEnd)` (UTF-16 code units) in the composer with `insertText`; when the range is absent, the active token around the cursor is replaced.</summary>
+/// <summary>Machine-readable factory run failure.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionCompletionItem
-{
-    /// <summary>Text spliced into the composer when the item is accepted.</summary>
-    [JsonPropertyName("insertText")]
-    public string InsertText { get; set; } = string.Empty;
-
-    /// <summary>Render-kind hint for the picker row (e.g. `"document"`, `"directory"`), derived from the host's display kind.</summary>
-    [JsonPropertyName("kind")]
-    public string? Kind { get; set; }
-
-    /// <summary>Primary display label for the picker row. Falls back to `insertText` when absent.</summary>
-    [JsonPropertyName("label")]
-    public string? Label { get; set; }
-
-    /// <summary>End (exclusive) of the replacement range in `text`, in UTF-16 code units.</summary>
-    [JsonPropertyName("rangeEnd")]
-    public long? RangeEnd { get; set; }
-
-    /// <summary>Start of the replacement range in `text`, in UTF-16 code units.</summary>
-    [JsonPropertyName("rangeStart")]
-    public long? RangeStart { get; set; }
-}
-
-/// <summary>Host-driven completion items for the current composer input. Empty when the host returns no items or does not support completions.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class CompletionsRequestResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(FactoryRunFailureFactoryLimitReached), "factory_limit_reached")]
+[JsonDerivedType(typeof(FactoryRunFailureFactoryResumeDeclined), "factory_resume_declined")]
+[JsonDerivedType(typeof(FactoryRunFailureFactoryDurableFailure), "factory_durable_failure")]
+[JsonDerivedType(typeof(FactoryRunFailureFactoryAccountingIncomplete), "factory_accounting_incomplete")]
+public partial class FactoryRunFailure
 {
-    /// <summary>Completion items in host-ranked order.</summary>
-    [JsonPropertyName("items")]
-    public IList<SessionCompletionItem> Items { get => field ??= []; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Request host-driven completions for the current composer input.</summary>
+
+/// <summary>The <c>factory_limit_reached</c> variant of <see cref="FactoryRunFailure"/>.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class CompletionsRequestRequest
+public partial class FactoryRunFailureFactoryLimitReached : FactoryRunFailure
 {
-    /// <summary>Cursor offset within `text`, in UTF-16 code units.</summary>
-    [JsonPropertyName("offset")]
-    public long Offset { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "factory_limit_reached";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Resource ceiling that stopped the run.</summary>
+    [JsonPropertyName("kind")]
+    public required FactoryRunFailureKind Kind { get; set; }
 
-    /// <summary>The full composed composer input.</summary>
-    [JsonPropertyName("text")]
-    public string Text { get; set; } = string.Empty;
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
+
+    /// <summary>Approved effective ceiling that was reached.</summary>
+    [JsonPropertyName("value")]
+    public required double Value { get; set; }
 }
 
-/// <summary>Instruction sources loaded for the session, in merge order.</summary>
+/// <summary>The <c>factory_resume_declined</c> variant of <see cref="FactoryRunFailure"/>.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InstructionsGetSourcesResult
+public partial class FactoryRunFailureFactoryResumeDeclined : FactoryRunFailure
 {
-    /// <summary>Instruction sources for the session.</summary>
-    [JsonPropertyName("sources")]
-    public IList<InstructionSource> Sources { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "factory_resume_declined";
+
+    /// <summary>Human-readable reason the resume did not proceed.</summary>
+    [JsonPropertyName("reason")]
+    public required string Reason { get; set; }
+
+    /// <summary>Factory run identifier whose changed limits were declined.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>The <c>factory_durable_failure</c> variant of <see cref="FactoryRunFailure"/>.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionInstructionsGetSourcesRequest
+public partial class FactoryRunFailureFactoryDurableFailure : FactoryRunFailure
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "factory_durable_failure";
+
+    /// <summary>Stable failure code.</summary>
+    [JsonPropertyName("code")]
+    public required string Code { get; set; }
+
+    /// <summary>Execution-critical durable operation that failed.</summary>
+    [JsonPropertyName("operation")]
+    public required FactoryDurableOperation Operation { get; set; }
+
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
 }
 
-/// <summary>Indicates whether fleet mode was successfully activated.</summary>
+/// <summary>The run stopped because its usage accounting could not be completed.</summary>
+/// <remarks>The <c>factory_accounting_incomplete</c> variant of <see cref="FactoryRunFailure"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FleetStartResult
+public partial class FactoryRunFailureFactoryAccountingIncomplete : FactoryRunFailure
 {
-    /// <summary>Whether fleet mode was successfully activated.</summary>
-    [JsonPropertyName("started")]
-    public bool Started { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "factory_accounting_incomplete";
+
+    /// <summary>Confirmed usage in nano-AIU, representing the floor of what the run spent.</summary>
+    [JsonPropertyName("drainedNanoAiu")]
+    public required long DrainedNanoAiu { get; set; }
+
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
 }
 
-/// <summary>Optional user prompt to combine with the fleet orchestration instructions.</summary>
+/// <summary>Complete current or terminal factory run envelope.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FleetStartRequest
+public sealed class FactoryRunResult
 {
-    /// <summary>Optional user prompt to combine with fleet instructions.</summary>
-    [JsonPropertyName("prompt")]
-    public string? Prompt { get; set; }
+    /// <summary>Error message for an errored run.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Machine-readable failure details for an errored run.</summary>
+    [JsonPropertyName("failure")]
+    public FactoryRunFailure? Failure { get; set; }
+
+    /// <summary>Reason for a halted or cancelled run.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
+
+    /// <summary>Completed factory result.</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
+
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
+
+    /// <summary>Partial journal and progress snapshot for a halted, cancelled, or errored run.</summary>
+    [JsonPropertyName("snapshot")]
+    public JsonElement? Snapshot { get; set; }
+
+    /// <summary>Current or terminal factory run status.</summary>
+    [JsonPropertyName("status")]
+    public FactoryRunStatus Status { get; set; }
 }
 
-/// <summary>Agents available to the session.</summary>
+/// <summary>Wire-only per-invocation factory resource ceiling overrides.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentList
+public sealed class FactoryRunLimits
 {
-    /// <summary>Available agents.</summary>
-    [JsonPropertyName("agents")]
-    public IList<AgentInfo> Agents { get => field ??= []; set; }
+    /// <summary>Maximum AI credits consumed by factory subagents and their descendants. The post-paid ceiling is soft: parallel turns can settle beyond it before the run stops.</summary>
+    [JsonPropertyName("maxAiCredits")]
+    public double? MaxAiCredits { get; set; }
+
+    /// <summary>Maximum number of factory subagents that may run concurrently.</summary>
+    [JsonPropertyName("maxConcurrentSubagents")]
+    public long? MaxConcurrentSubagents { get; set; }
+
+    /// <summary>Maximum total number of factory subagents that may be admitted.</summary>
+    [JsonPropertyName("maxTotalSubagents")]
+    public long? MaxTotalSubagents { get; set; }
+
+    /// <summary>Maximum accumulated active-execution time in seconds. Active execution includes the entire extension body, subprocess waits, queued-agent waits, and sleeps; time between resumed attempts is not counted.</summary>
+    [JsonPropertyName("timeoutSeconds")]
+    public double? TimeoutSeconds { get; set; }
 }
 
-/// <summary>RPC data type for SessionAgentList operations.</summary>
+/// <summary>Options controlling factory invocation.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionAgentListRequest
+public sealed class RunOptions
 {
-    /// <summary>When true, request the session's configured built-in agents alongside custom agents. Listing applies feature, context, inclusion, exclusion, and user-disabled-agent policy, but does not evaluate transient invocation requirements such as model availability. Built-in metadata may be omitted when the session cannot project it, such as a relay session.</summary>
-    [JsonPropertyName("includeBuiltInAgents")]
-    public bool? IncludeBuiltInAgents { get; set; }
+    /// <summary>Per-invocation resource ceiling overrides.</summary>
+    [JsonPropertyName("limits")]
+    public FactoryRunLimits? Limits { get; set; }
 
-    /// <summary>When true, request authored base prompt text on each AgentInfo. Prompt text may be omitted when unavailable, such as for agents projected through a relay session.</summary>
-    [JsonPropertyName("includePrompt")]
-    public bool? IncludePrompt { get; set; }
+    /// <summary>Run identifier whose journal and progress should seed this resumed run.</summary>
+    [JsonPropertyName("resumeFromRunId")]
+    public string? ResumeFromRunId { get; set; }
 }
 
-/// <summary>RPC data type for SessionAgentListRequestWithSession operations.</summary>
+/// <summary>Parameters for invoking a registered factory.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionAgentListRequestWithSession
+internal sealed class FactoryRunRequest
 {
-    /// <summary>When true, request the session's configured built-in agents alongside custom agents. Listing applies feature, context, inclusion, exclusion, and user-disabled-agent policy, but does not evaluate transient invocation requirements such as model availability. Built-in metadata may be omitted when the session cannot project it, such as a relay session.</summary>
-    [JsonPropertyName("includeBuiltInAgents")]
-    public bool? IncludeBuiltInAgents { get; set; }
+    /// <summary>Factory input value.</summary>
+    [JsonPropertyName("args")]
+    public JsonElement Args { get; set; }
 
-    /// <summary>When true, request authored base prompt text on each AgentInfo. Prompt text may be omitted when unavailable, such as for agents projected through a relay session.</summary>
-    [JsonPropertyName("includePrompt")]
-    public bool? IncludePrompt { get; set; }
+    /// <summary>Registered factory name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Factory invocation options.</summary>
+    [JsonPropertyName("options")]
+    public RunOptions? Options { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>An in-memory authored prompt override for an available agent.</summary>
+/// <summary>Resolved persisted factory identity and resumed run envelope.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class AgentSetPromptRequest
+public sealed class FactoryResumeResult
 {
-    /// <summary>Stable effective agent id. Plugin namespace separators are normalized.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Persisted factory name resolved for the resumed run.</summary>
+    [JsonPropertyName("factoryName")]
+    public string FactoryName { get; set; } = string.Empty;
 
-    /// <summary>Replacement authored prompt. Empty text is valid.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Terminal resumed run envelope.</summary>
+    [JsonPropertyName("run")]
+    public FactoryRunResult Run { get => field ??= new(); set; }
+}
+
+/// <summary>Parameters for resuming a factory run from its persisted identity.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class FactoryResumeRequest
+{
+    /// <summary>Optional per-invocation resource ceiling overrides.</summary>
+    [JsonPropertyName("limits")]
+    public FactoryRunLimits? Limits { get; set; }
+
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The currently selected custom agent, or null when using the default agent.</summary>
+/// <summary>Parameters for retrieving a factory run.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentGetCurrentResult
+internal sealed class FactoryGetRunRequest
 {
-    /// <summary>Currently selected custom agent, or null if using the default agent.</summary>
-    [JsonPropertyName("agent")]
-    public AgentInfo? Agent { get; set; }
-}
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionAgentGetCurrentRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The newly selected custom agent.</summary>
+/// <summary>Declared or approved factory resource ceilings.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentSelectResult
+public sealed class FactoryDeclaredLimits
 {
-    /// <summary>The newly selected custom agent.</summary>
-    [JsonPropertyName("agent")]
-    public AgentInfo Agent { get => field ??= new(); set; }
-}
+    /// <summary>Maximum AI credits consumed by subagents and descendants.</summary>
+    [JsonPropertyName("maxAiCredits")]
+    public double? MaxAiCredits { get; set; }
 
-/// <summary>Name of the custom agent to select for subsequent turns.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class AgentSelectRequest
-{
-    /// <summary>Name of the custom agent to select.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Maximum concurrently active subagents.</summary>
+    [JsonPropertyName("maxConcurrentSubagents")]
+    public long? MaxConcurrentSubagents { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Maximum total subagents spawned by the run.</summary>
+    [JsonPropertyName("maxTotalSubagents")]
+    public long? MaxTotalSubagents { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionAgentDeselectRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Maximum accumulated active execution time in seconds.</summary>
+    [JsonPropertyName("timeoutSeconds")]
+    public double? TimeoutSeconds { get; set; }
 }
 
-/// <summary>Custom agents available to the session after reloading definitions from disk.</summary>
+/// <summary>Durable factory resource consumption.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentReloadResult
+public sealed class FactoryRunConsumed
 {
-    /// <summary>Reloaded custom agents.</summary>
-    [JsonPropertyName("agents")]
-    public IList<AgentInfo> Agents { get => field ??= []; set; }
-}
+    /// <summary>Accumulated active execution time in milliseconds.</summary>
+    [JsonPropertyName("activeMs")]
+    public long ActiveMs { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionAgentReloadRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>AI usage consumed by the run in nano-AIU.</summary>
+    [JsonPropertyName("nanoAiu")]
+    public long NanoAiu { get; set; }
+
+    /// <summary>Total subagents spawned by the run.</summary>
+    [JsonPropertyName("subagents")]
+    public long Subagents { get; set; }
 }
 
-/// <summary>Identifier assigned to the newly started background agent task.</summary>
+/// <summary>Current factory phase identity.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class TasksStartAgentResult
+public sealed class FactoryCurrentPhase
 {
-    /// <summary>Generated agent ID for the background task.</summary>
-    [JsonPropertyName("agentId")]
-    public string AgentId { get; set; } = string.Empty;
+    /// <summary>Current phase identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Zero-based declared phase ordinal, or null for an undeclared phase.</summary>
+    [JsonPropertyName("ordinal")]
+    public long? Ordinal { get; set; }
 }
 
-/// <summary>Agent type, prompt, name, and optional description and model override for the new task.</summary>
+/// <summary>Prompt-safe terminal factory outcome.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class TasksStartAgentRequest
+public sealed class FactoryRunTerminal
 {
-    /// <summary>Type of agent to start (e.g., 'explore', 'task', 'general-purpose').</summary>
-    [JsonPropertyName("agentType")]
-    public string AgentType { get; set; } = string.Empty;
-
-    /// <summary>Short description of the task.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
-
-    /// <summary>Optional model override.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Human-readable terminal error.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Short name for the agent, used to generate a human-readable ID.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Machine-readable terminal failure.</summary>
+    [JsonPropertyName("failure")]
+    public FactoryRunFailure? Failure { get; set; }
 
-    /// <summary>Task prompt for the agent.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Human-readable terminal reason.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Prompt-safe preview of the completed result.</summary>
+    [JsonPropertyName("resultPreview")]
+    public string? ResultPreview { get; set; }
 }
 
-/// <summary>Tracked task union returned by task APIs, containing either an agent task or a shell task.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+/// <summary>Durable factory run summary with read-time live overlays.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(TaskInfoAgent), "agent")]
-[JsonDerivedType(typeof(TaskInfoShell), "shell")]
-public partial class TaskInfo
+public sealed class FactoryRunSummary
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
-}
+    /// <summary>Epoch milliseconds when the current active segment started, or null while inactive.</summary>
+    [JsonPropertyName("activeSegmentStartedAt")]
+    public long? ActiveSegmentStartedAt { get; set; }
 
+    /// <summary>Approved effective resource ceilings, or null until approved.</summary>
+    [JsonPropertyName("approved")]
+    public FactoryDeclaredLimits? Approved { get; set; }
 
-/// <summary>Tracked background agent task metadata, including IDs, status, timing, agent type, prompt, model, result, and latest response.</summary>
-/// <remarks>The <c>agent</c> variant of <see cref="TaskInfo"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class TaskInfoAgent : TaskInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "agent";
+    /// <summary>Epoch milliseconds when the run completed, or null while nonterminal.</summary>
+    [JsonPropertyName("completedAt")]
+    public long? CompletedAt { get; set; }
 
-    /// <summary>ISO 8601 timestamp when the current active period began.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("activeStartedAt")]
-    public DateTimeOffset? ActiveStartedAt { get; set; }
+    /// <summary>Durable resource consumption.</summary>
+    [JsonPropertyName("consumed")]
+    public FactoryRunConsumed Consumed { get => field ??= new(); set; }
 
-    /// <summary>Accumulated active execution time in milliseconds.</summary>
-    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("activeTimeMs")]
-    public TimeSpan? ActiveTime { get; set; }
+    /// <summary>Epoch milliseconds when the run was created.</summary>
+    [JsonPropertyName("createdAt")]
+    public long CreatedAt { get; set; }
 
-    /// <summary>Type of agent running this task.</summary>
-    [JsonPropertyName("agentType")]
-    public required string AgentType { get; set; }
+    /// <summary>Current phase identity, or null before any phase is entered.</summary>
+    [JsonPropertyName("currentPhase")]
+    public FactoryCurrentPhase? CurrentPhase { get; set; }
 
-    /// <summary>Whether the task is currently in the original sync wait and can be moved to background mode. False once it is already backgrounded, idle, finished, or no longer has a promotable sync waiter.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("canPromoteToBackground")]
-    public bool? CanPromoteToBackground { get; set; }
+    /// <summary>Resource ceilings declared by the factory.</summary>
+    [JsonPropertyName("declaredLimits")]
+    public FactoryDeclaredLimits DeclaredLimits { get => field ??= new(); set; }
 
-    /// <summary>ISO 8601 timestamp when the task finished.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("completedAt")]
-    public DateTimeOffset? CompletedAt { get; set; }
+    /// <summary>Number of phases declared by the factory.</summary>
+    [JsonPropertyName("declaredPhaseCount")]
+    public long DeclaredPhaseCount { get; set; }
 
-    /// <summary>Short description of the task.</summary>
+    /// <summary>Human-readable factory description.</summary>
     [JsonPropertyName("description")]
-    public required string Description { get; set; }
-
-    /// <summary>Error message when the task failed.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Whether task execution is synchronously awaited or managed in the background.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("executionMode")]
-    public TaskExecutionMode? ExecutionMode { get; set; }
-
-    /// <summary>Unique task identifier.</summary>
-    [JsonPropertyName("id")]
-    public required string Id { get; set; }
-
-    /// <summary>ISO 8601 timestamp when the agent entered idle state.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("idleSince")]
-    public DateTimeOffset? IdleSince { get; set; }
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>Most recent response text from the agent.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("latestResponse")]
-    public string? LatestResponse { get; set; }
+    /// <summary>Registered factory name.</summary>
+    [JsonPropertyName("factoryName")]
+    public string FactoryName { get; set; } = string.Empty;
 
-    /// <summary>Requested model override for the task when specified.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Number of direct factory agents currently live.</summary>
+    [JsonPropertyName("liveAgentCount")]
+    public long LiveAgentCount { get; set; }
 
-    /// <summary>Most recent prompt delivered to the agent. Updated whenever the agent receives a follow-up message.</summary>
-    [JsonPropertyName("prompt")]
-    public required string Prompt { get; set; }
+    /// <summary>Epoch milliseconds when this live-overlay snapshot was observed.</summary>
+    [JsonPropertyName("observedAt")]
+    public long ObservedAt { get; set; }
 
-    /// <summary>Runtime model resolved for the task when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("resolvedModel")]
-    public string? ResolvedModel { get; set; }
+    /// <summary>Monotonic durable run revision.</summary>
+    [JsonPropertyName("revision")]
+    public long Revision { get; set; }
 
-    /// <summary>Result text from the task when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("result")]
-    public string? Result { get; set; }
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-    /// <summary>ISO 8601 timestamp when the task was started.</summary>
+    /// <summary>Epoch milliseconds when execution first started, or null before start.</summary>
     [JsonPropertyName("startedAt")]
-    public required DateTimeOffset StartedAt { get; set; }
+    public long? StartedAt { get; set; }
 
-    /// <summary>Current lifecycle status of the task.</summary>
+    /// <summary>Current factory run status.</summary>
     [JsonPropertyName("status")]
-    public required TaskStatus Status { get; set; }
+    public FactoryRunStatus Status { get; set; }
 
-    /// <summary>Tool call ID associated with this agent task.</summary>
-    [JsonPropertyName("toolCallId")]
-    public required string ToolCallId { get; set; }
+    /// <summary>Terminal run outcome, or null while nonterminal.</summary>
+    [JsonPropertyName("terminal")]
+    public FactoryRunTerminal? Terminal { get; set; }
+
+    /// <summary>Total direct factory agents spawned across all attempts.</summary>
+    [JsonPropertyName("totalSpawnedAgentCount")]
+    public long TotalSpawnedAgentCount { get; set; }
+
+    /// <summary>Epoch milliseconds when the durable run was last updated.</summary>
+    [JsonPropertyName("updatedAt")]
+    public long UpdatedAt { get; set; }
 }
 
-/// <summary>Tracked shell task metadata, including ID, command, status, timing, attachment/execution mode, log path, and PID.</summary>
-/// <remarks>The <c>shell</c> variant of <see cref="TaskInfo"/>.</remarks>
+/// <summary>A page of factory runs in durable creation order.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class TaskInfoShell : TaskInfo
+public sealed class FactoryListRunsResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "shell";
-
-    /// <summary>Whether the shell runs inside a managed PTY session or as an independent background process.</summary>
-    [JsonPropertyName("attachmentMode")]
-    public required TaskShellInfoAttachmentMode AttachmentMode { get; set; }
+    /// <summary>Whether terminal runs newer than this page exist.</summary>
+    [JsonPropertyName("hasMoreNewer")]
+    public bool? HasMoreNewer { get; set; }
 
-    /// <summary>Whether this shell task can be promoted to background mode.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("canPromoteToBackground")]
-    public bool? CanPromoteToBackground { get; set; }
+    /// <summary>Newest terminal-run cursor in this page, or null when the terminal window is empty.</summary>
+    [JsonPropertyName("newestSeq")]
+    public long? NewestSeq { get; set; }
 
-    /// <summary>Command being executed.</summary>
-    [JsonPropertyName("command")]
-    public required string Command { get; set; }
+    /// <summary>Oldest terminal-run cursor in this page, or null when the terminal window is empty.</summary>
+    [JsonPropertyName("oldestSeq")]
+    public long? OldestSeq { get; set; }
 
-    /// <summary>ISO 8601 timestamp when the task finished.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("completedAt")]
-    public DateTimeOffset? CompletedAt { get; set; }
+    /// <summary>Number of terminal runs older than this page.</summary>
+    [JsonPropertyName("omittedOlder")]
+    public long? OmittedOlder { get; set; }
 
-    /// <summary>Short description of the task.</summary>
-    [JsonPropertyName("description")]
-    public required string Description { get; set; }
+    /// <summary>Factory run summaries in durable creation order.</summary>
+    [JsonPropertyName("runs")]
+    public IList<FactoryRunSummary> Runs { get => field ??= []; set; }
+}
 
-    /// <summary>Whether task execution is synchronously awaited or managed in the background.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("executionMode")]
-    public TaskExecutionMode? ExecutionMode { get; set; }
-
-    /// <summary>Unique task identifier.</summary>
-    [JsonPropertyName("id")]
-    public required string Id { get; set; }
-
-    /// <summary>Path to the detached shell log, when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("logPath")]
-    public string? LogPath { get; set; }
-
-    /// <summary>Process ID when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("pid")]
-    public long? Pid { get; set; }
-
-    /// <summary>ISO 8601 timestamp when the task was started.</summary>
-    [JsonPropertyName("startedAt")]
-    public required DateTimeOffset StartedAt { get; set; }
-
-    /// <summary>Current lifecycle status of the task.</summary>
-    [JsonPropertyName("status")]
-    public required TaskStatus Status { get; set; }
-}
-
-/// <summary>Background tasks currently tracked by the session.</summary>
+/// <summary>Parameters for paging factory runs.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class TaskList
+internal sealed class FactoryListRunsRequest
 {
-    /// <summary>Currently tracked tasks.</summary>
-    [JsonPropertyName("tasks")]
-    public IList<TaskInfo> Tasks { get => field ??= []; set; }
-}
+    /// <summary>Exclusive forward cursor.</summary>
+    [JsonPropertyName("afterSeq")]
+    public long? AfterSeq { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionTasksListRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Exclusive backward cursor.</summary>
+    [JsonPropertyName("beforeSeq")]
+    public long? BeforeSeq { get; set; }
 
-/// <summary>Refresh metadata for any detached background shells the runtime knows about. Use after a long pause to pick up exit/output state for shells running outside the agent loop.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class TasksRefreshResult
-{
-}
+    /// <summary>Maximum terminal runs to return. Defaults to 200 and is capped at 500.</summary>
+    [JsonPropertyName("limit")]
+    public int? Limit { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionTasksRefreshRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Wait until all in-flight background tasks (agents + shells) and any follow-up turns scheduled by their completions have settled. Returns when the runtime is fully drained or after an internal timeout (default 10 minutes; configurable via COPILOT_TASK_WAIT_TIMEOUT_SECONDS).</summary>
+/// <summary>Prompt-safe durable identity and live status for a direct factory agent.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class TasksWaitForPendingResult
+public sealed class FactoryAgentSummary
 {
-}
+    /// <summary>Accumulated active agent time in milliseconds.</summary>
+    [JsonPropertyName("activeMs")]
+    public long ActiveMs { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionTasksWaitForPendingRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Prompt-safe live activity text.</summary>
+    [JsonPropertyName("activity")]
+    public string? Activity { get; set; }
 
-/// <summary>Polymorphic base type discriminated by <c>type</c>.</summary>
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(TasksGetProgressResultProgressAgent), "agent")]
-[JsonDerivedType(typeof(TasksGetProgressResultProgressShell), "shell")]
-public partial class TasksGetProgressResultProgress
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
-}
+    /// <summary>Stable direct-agent identifier.</summary>
+    [JsonPropertyName("agentId")]
+    public string AgentId { get; set; } = string.Empty;
 
+    /// <summary>Registered agent type.</summary>
+    [JsonPropertyName("agentType")]
+    public string AgentType { get; set; } = string.Empty;
 
-/// <summary>Timestamped display line for task progress output or recent agent activity.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class TaskProgressLine
-{
-    /// <summary>Display message, e.g., "▸ bash", "✓ edit src/foo.ts".</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>Epoch milliseconds when the agent completed.</summary>
+    [JsonPropertyName("completedAt")]
+    public long? CompletedAt { get; set; }
 
-    /// <summary>ISO 8601 timestamp when this event occurred.</summary>
-    [JsonPropertyName("timestamp")]
-    public DateTimeOffset Timestamp { get; set; }
-}
+    /// <summary>Friendly, non-unique name intended for display.</summary>
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
 
-/// <summary>Progress snapshot for an agent task, with recent activity lines and optional latest intent.</summary>
-/// <remarks>The <c>agent</c> variant of <see cref="TasksGetProgressResultProgress"/>.</remarks>
-public partial class TasksGetProgressResultProgressAgent : TasksGetProgressResultProgress
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "agent";
+    /// <summary>Friendly, non-unique name intended for display.</summary>
+    [JsonPropertyName("label")]
+    public string Label { get; set; } = string.Empty;
 
-    /// <summary>The most recent intent reported by the agent.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("latestIntent")]
-    public string? LatestIntent { get; set; }
+    /// <summary>Phase identifier active when the agent was launched, or null.</summary>
+    [JsonPropertyName("phaseId")]
+    public string? PhaseId { get; set; }
 
-    /// <summary>Recent tool execution events converted to display lines.</summary>
-    [JsonPropertyName("recentActivity")]
-    public required IList<TaskProgressLine> RecentActivity { get; set; }
-}
+    /// <summary>Model requested when the agent was launched.</summary>
+    [JsonPropertyName("requestedModel")]
+    public string? RequestedModel { get; set; }
 
-/// <summary>Progress snapshot for a shell task, with recent stdout/stderr output and optional process ID.</summary>
-/// <remarks>The <c>shell</c> variant of <see cref="TasksGetProgressResultProgress"/>.</remarks>
-public partial class TasksGetProgressResultProgressShell : TasksGetProgressResultProgress
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "shell";
+    /// <summary>Concrete model resolved for the agent.</summary>
+    [JsonPropertyName("resolvedModel")]
+    public string? ResolvedModel { get; set; }
 
-    /// <summary>Process ID when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("pid")]
-    public long? Pid { get; set; }
+    /// <summary>Owning factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-    /// <summary>Recent stdout/stderr lines from the running shell command.</summary>
-    [JsonPropertyName("recentOutput")]
-    public required string RecentOutput { get; set; }
-}
+    /// <summary>Epoch milliseconds when the agent started.</summary>
+    [JsonPropertyName("startedAt")]
+    public long? StartedAt { get; set; }
 
-/// <summary>Progress information for the task, or null when no task with that ID is tracked.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class TasksGetProgressResult
-{
-    /// <summary>Progress information for the task, discriminated by type. Returns null when no task with this ID is currently tracked.</summary>
-    [JsonPropertyName("progress")]
-    public TasksGetProgressResultProgress? Progress { get; set; }
+    /// <summary>Current durable or live agent status.</summary>
+    [JsonPropertyName("status")]
+    public string Status { get; set; } = string.Empty;
+
+    /// <summary>Tool-call identifier that launched the agent.</summary>
+    [JsonPropertyName("toolCallId")]
+    public string ToolCallId { get; set; } = string.Empty;
 }
 
-/// <summary>Identifier of the background task to fetch progress for.</summary>
+/// <summary>Durable lifecycle and timing for one factory phase.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class TasksGetProgressRequest
+public sealed class FactoryPhaseObservation
 {
-    /// <summary>Task identifier (agent ID or shell ID).</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Completed active time accumulated by this phase in milliseconds.</summary>
+    [JsonPropertyName("accumulatedActiveMs")]
+    public long AccumulatedActiveMs { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Epoch milliseconds when this phase completed; for a skipped phase, the synthetic skip timestamp (equal to `startedAt`).</summary>
+    [JsonPropertyName("completedAt")]
+    public long? CompletedAt { get; set; }
 
-/// <summary>The first sync-waiting task that can currently be promoted to background mode.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class TasksGetCurrentPromotableResult
-{
-    /// <summary>The first sync-waiting task (agent first, then shell) that can currently be promoted to background mode. Omitted if no such task exists. The returned task is guaranteed to have executionMode='sync' and canPromoteToBackground=true at the time of the call.</summary>
-    [JsonPropertyName("task")]
-    public TaskInfo? Task { get; set; }
-}
+    /// <summary>Current live active time for this phase in milliseconds.</summary>
+    [JsonPropertyName("currentActiveMs")]
+    public long CurrentActiveMs { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionTasksGetCurrentPromotableRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Optional human-readable phase detail.</summary>
+    [JsonPropertyName("detail")]
+    public string? Detail { get; set; }
 
-/// <summary>Indicates whether the task was successfully promoted to background mode.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class TasksPromoteToBackgroundResult
-{
-    /// <summary>Whether the task was successfully promoted to background mode.</summary>
-    [JsonPropertyName("promoted")]
-    public bool Promoted { get; set; }
-}
+    /// <summary>Number of times execution entered this phase.</summary>
+    [JsonPropertyName("entryCount")]
+    public long EntryCount { get; set; }
 
-/// <summary>Identifier of the task to promote to background mode.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class TasksPromoteToBackgroundRequest
-{
-    /// <summary>Task identifier.</summary>
+    /// <summary>Phase identifier.</summary>
     [JsonPropertyName("id")]
     public string Id { get; set; } = string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Most recent run attempt that entered this phase, or `0` if the phase has never been entered.</summary>
+    [JsonPropertyName("lastEnteredRunAttempt")]
+    public long LastEnteredRunAttempt { get; set; }
 
-/// <summary>The promoted task as it now exists in background mode, omitted if no promotable task was waiting.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class TasksPromoteCurrentToBackgroundResult
-{
-    /// <summary>The promoted task as it now exists in background mode, omitted if no promotable task was waiting. Atomic operation: avoids the race window of getCurrentPromotable + promoteToBackground.</summary>
-    [JsonPropertyName("task")]
-    public TaskInfo? Task { get; set; }
-}
+    /// <summary>Direct agents in this phase that are currently live.</summary>
+    [JsonPropertyName("liveAgentCount")]
+    public long LiveAgentCount { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionTasksPromoteCurrentToBackgroundRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Zero-based declared phase ordinal, or null for an undeclared phase.</summary>
+    [JsonPropertyName("ordinal")]
+    public long? Ordinal { get; set; }
+
+    /// <summary>Epoch milliseconds when this phase first started; for a skipped phase, the synthetic skip timestamp (equal to `completedAt`).</summary>
+    [JsonPropertyName("startedAt")]
+    public long? StartedAt { get; set; }
+
+    /// <summary>Derived lifecycle state of the phase.</summary>
+    [JsonPropertyName("status")]
+    public FactoryPhaseStatus Status { get; set; }
+
+    /// <summary>Human-readable phase title.</summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = string.Empty;
+
+    /// <summary>Total direct agents associated with this phase.</summary>
+    [JsonPropertyName("totalAgentCount")]
+    public long TotalAgentCount { get; set; }
 }
 
-/// <summary>Indicates whether the background task was successfully cancelled.</summary>
+/// <summary>One durable factory progress record.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class TasksCancelResult
+public sealed class FactoryProgressLine
 {
-    /// <summary>Whether the task was successfully cancelled.</summary>
-    [JsonPropertyName("cancelled")]
-    public bool Cancelled { get; set; }
-}
+    /// <summary>Resume attempt that emitted this record.</summary>
+    [JsonPropertyName("attempt")]
+    public long Attempt { get; set; }
 
-/// <summary>Identifier of the background task to cancel.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class TasksCancelRequest
-{
-    /// <summary>Task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Progress record kind.</summary>
+    [JsonPropertyName("kind")]
+    public FactoryLogLineKind Kind { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Phase active when the record was emitted, or null before any phase.</summary>
+    [JsonPropertyName("phaseId")]
+    public string? PhaseId { get; set; }
 
-/// <summary>Indicates whether the task was removed. False when the task does not exist or is still running/idle.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class TasksRemoveResult
-{
-    /// <summary>Whether the task was removed. Returns false if the task does not exist or is still running/idle (cancel it first).</summary>
-    [JsonPropertyName("removed")]
-    public bool Removed { get; set; }
-}
+    /// <summary>Epoch milliseconds when the record was persisted.</summary>
+    [JsonPropertyName("recordedAt")]
+    public long RecordedAt { get; set; }
 
-/// <summary>Identifier of the completed or cancelled task to remove from tracking.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class TasksRemoveRequest
-{
-    /// <summary>Task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Global monotonic sequence number within the run.</summary>
+    [JsonPropertyName("seq")]
+    public long Seq { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Prompt-safe progress text.</summary>
+    [JsonPropertyName("text")]
+    public string Text { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the message was delivered, with an error message when delivery failed.</summary>
+/// <summary>A bidirectional page of factory progress.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class TasksSendMessageResult
+public sealed class FactoryProgressPage
 {
-    /// <summary>Error message if delivery failed.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Whether progress records newer than this page exist.</summary>
+    [JsonPropertyName("hasMoreNewer")]
+    public bool HasMoreNewer { get; set; }
 
-    /// <summary>Whether the message was successfully delivered or steered.</summary>
-    [JsonPropertyName("sent")]
-    public bool Sent { get; set; }
-}
+    /// <summary>Whether progress records older than this page exist.</summary>
+    [JsonPropertyName("hasMoreOlder")]
+    public bool HasMoreOlder { get; set; }
 
-/// <summary>Identifier of the target agent task, message content, and optional sender agent ID.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class TasksSendMessageRequest
-{
-    /// <summary>Agent ID of the sender, if sent on behalf of another agent.</summary>
-    [JsonPropertyName("fromAgentId")]
-    public string? FromAgentId { get; set; }
+    /// <summary>Newest sequence number in this page, or null when empty.</summary>
+    [JsonPropertyName("newestSeq")]
+    public long? NewestSeq { get; set; }
 
-    /// <summary>Agent task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Oldest sequence number in this page, or null when empty.</summary>
+    [JsonPropertyName("oldestSeq")]
+    public long? OldestSeq { get; set; }
 
-    /// <summary>Message content to send to the agent.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>Progress records in sequence order.</summary>
+    [JsonPropertyName("records")]
+    public IList<FactoryProgressLine> Records { get => field ??= []; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Run revision reflected by this page.</summary>
+    [JsonPropertyName("revision")]
+    public long Revision { get; set; }
 }
 
-/// <summary>Skill metadata available to a session, with name, description, source, enabled/invocable state, path, plugin, and argument hint.</summary>
+/// <summary>Full factory run observability detail.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class Skill
+public sealed class FactoryRunDetail
 {
-    /// <summary>Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field.</summary>
-    [JsonPropertyName("argumentHint")]
-    public string? ArgumentHint { get; set; }
+    /// <summary>Epoch milliseconds when the current active segment started, or null while inactive.</summary>
+    [JsonPropertyName("activeSegmentStartedAt")]
+    public long? ActiveSegmentStartedAt { get; set; }
 
-    /// <summary>Description of what the skill does.</summary>
+    /// <summary>Durable identities and live statuses for direct factory agents.</summary>
+    [JsonPropertyName("agents")]
+    public IList<FactoryAgentSummary> Agents { get => field ??= []; set; }
+
+    /// <summary>Approved effective resource ceilings, or null until approved.</summary>
+    [JsonPropertyName("approved")]
+    public FactoryDeclaredLimits? Approved { get; set; }
+
+    /// <summary>Epoch milliseconds when the run completed, or null while nonterminal.</summary>
+    [JsonPropertyName("completedAt")]
+    public long? CompletedAt { get; set; }
+
+    /// <summary>Durable resource consumption.</summary>
+    [JsonPropertyName("consumed")]
+    public FactoryRunConsumed Consumed { get => field ??= new(); set; }
+
+    /// <summary>Epoch milliseconds when the run was created.</summary>
+    [JsonPropertyName("createdAt")]
+    public long CreatedAt { get; set; }
+
+    /// <summary>Current phase identity, or null before any phase is entered.</summary>
+    [JsonPropertyName("currentPhase")]
+    public FactoryCurrentPhase? CurrentPhase { get; set; }
+
+    /// <summary>Resource ceilings declared by the factory.</summary>
+    [JsonPropertyName("declaredLimits")]
+    public FactoryDeclaredLimits DeclaredLimits { get => field ??= new(); set; }
+
+    /// <summary>Number of phases declared by the factory.</summary>
+    [JsonPropertyName("declaredPhaseCount")]
+    public long DeclaredPhaseCount { get; set; }
+
+    /// <summary>Human-readable factory description.</summary>
     [JsonPropertyName("description")]
     public string Description { get; set; } = string.Empty;
 
-    /// <summary>Whether the skill is currently enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Unique identifier for the skill.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Registered factory name.</summary>
+    [JsonPropertyName("factoryName")]
+    public string FactoryName { get; set; } = string.Empty;
 
-    /// <summary>Absolute path to the skill file.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+    /// <summary>Number of direct factory agents currently live.</summary>
+    [JsonPropertyName("liveAgentCount")]
+    public long LiveAgentCount { get; set; }
 
-    /// <summary>Name of the plugin that provides the skill, when source is 'plugin'.</summary>
-    [JsonPropertyName("pluginName")]
-    public string? PluginName { get; set; }
+    /// <summary>Epoch milliseconds when this live-overlay snapshot was observed.</summary>
+    [JsonPropertyName("observedAt")]
+    public long ObservedAt { get; set; }
 
-    /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
-    [JsonPropertyName("source")]
-    public SkillSource Source { get; set; }
+    /// <summary>Lifecycle and timing observations for each factory phase.</summary>
+    [JsonPropertyName("phases")]
+    public IList<FactoryPhaseObservation> Phases { get => field ??= []; set; }
 
-    /// <summary>Whether the skill can be invoked by the user as a slash command.</summary>
-    [JsonPropertyName("userInvocable")]
-    public bool UserInvocable { get; set; }
-}
+    /// <summary>Bidirectional page of durable factory progress.</summary>
+    [JsonPropertyName("progress")]
+    public FactoryProgressPage Progress { get => field ??= new(); set; }
 
-/// <summary>Skills available to the session, with their enabled state.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SkillList
-{
-    /// <summary>Available skills.</summary>
-    [JsonPropertyName("skills")]
-    public IList<Skill> Skills { get => field ??= []; set; }
-}
+    /// <summary>Monotonic durable run revision.</summary>
+    [JsonPropertyName("revision")]
+    public long Revision { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSkillsListRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-/// <summary>Skill invocation record with name, path, content, allowed tools, and turn number.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SkillsInvokedSkill
-{
-    /// <summary>Tools that should be auto-approved when this skill is active, captured at invocation time.</summary>
-    [JsonPropertyName("allowedTools")]
-    public IList<string>? AllowedTools { get; set; }
+    /// <summary>Epoch milliseconds when execution first started, or null before start.</summary>
+    [JsonPropertyName("startedAt")]
+    public long? StartedAt { get; set; }
 
-    /// <summary>Full content of the skill file.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Current factory run status.</summary>
+    [JsonPropertyName("status")]
+    public FactoryRunStatus Status { get; set; }
 
-    /// <summary>Turn number when the skill was invoked.</summary>
-    [JsonPropertyName("invokedAtTurn")]
-    public long InvokedAtTurn { get; set; }
+    /// <summary>Terminal run outcome, or null while nonterminal.</summary>
+    [JsonPropertyName("terminal")]
+    public FactoryRunTerminal? Terminal { get; set; }
 
-    /// <summary>Unique identifier for the skill.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Total direct factory agents spawned across all attempts.</summary>
+    [JsonPropertyName("totalSpawnedAgentCount")]
+    public long TotalSpawnedAgentCount { get; set; }
 
-    /// <summary>Path to the SKILL.md file.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Epoch milliseconds when the durable run was last updated.</summary>
+    [JsonPropertyName("updatedAt")]
+    public long UpdatedAt { get; set; }
 }
 
-/// <summary>Skills invoked during this session, ordered by invocation time (most recent last).</summary>
+/// <summary>Parameters for paging factory progress.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SkillsGetInvokedResult
+internal sealed class FactoryGetRunProgressRequest
 {
-    /// <summary>Skills invoked during this session, ordered by invocation time (most recent last).</summary>
-    [JsonPropertyName("skills")]
-    public IList<SkillsInvokedSkill> Skills { get => field ??= []; set; }
-}
+    /// <summary>Exclusive forward cursor.</summary>
+    [JsonPropertyName("afterSeq")]
+    public long? AfterSeq { get; set; }
+
+    /// <summary>Exclusive backward cursor.</summary>
+    [JsonPropertyName("beforeSeq")]
+    public long? BeforeSeq { get; set; }
+
+    /// <summary>Maximum records to return. Defaults to 200 and is capped at 500.</summary>
+    [JsonPropertyName("limit")]
+    public int? Limit { get; set; }
+
+    /// <summary>Optional phase identifier used to scope records and cursors.</summary>
+    [JsonPropertyName("phaseId")]
+    public string? PhaseId { get; set; }
+
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSkillsGetInvokedRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Name of the skill to enable for the session.</summary>
+/// <summary>Parameters for cancelling a factory run.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SkillsEnableRequest
+internal sealed class FactoryCancelRequest
 {
-    /// <summary>Name of the skill to enable.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Name of the skill to disable for the session.</summary>
+/// <summary>Acknowledgement that a factory request was accepted.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SkillsDisableRequest
+public sealed class FactoryAckResult
 {
-    /// <summary>Name of the skill to disable.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Diagnostics from reloading skill definitions, with warnings and errors as separate lists.</summary>
+/// <summary>One ordered factory progress line.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SkillsLoadDiagnostics
+public sealed class FactoryLogLine
 {
-    /// <summary>Errors emitted while loading skills (e.g. skills that failed to load entirely).</summary>
-    [JsonPropertyName("errors")]
-    public IList<string> Errors { get => field ??= []; set; }
+    /// <summary>Progress line kind.</summary>
+    [JsonPropertyName("kind")]
+    public FactoryLogLineKind Kind { get; set; }
 
-    /// <summary>Warnings emitted while loading skills (e.g. skills that loaded but had issues).</summary>
-    [JsonPropertyName("warnings")]
-    public IList<string> Warnings { get => field ??= []; set; }
-}
+    /// <summary>Monotonic sequence number within the factory run.</summary>
+    [JsonPropertyName("seq")]
+    public long Seq { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSkillsReloadRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Progress text.</summary>
+    [JsonPropertyName("text")]
+    public string Text { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Parameters for recording factory progress.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSkillsEnsureLoadedRequest
+internal sealed class FactoryLogRequest
 {
+    /// <summary>Opaque token identifying the current factory execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
+
+    /// <summary>Ordered progress lines to append.</summary>
+    [JsonPropertyName("lines")]
+    public IList<FactoryLogLine> Lines { get => field ??= []; set; }
+
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Recorded MCP server connection failure.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class McpServerFailureInfo
-{
-    /// <summary>Failure message produced when the MCP server connection failed.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
-
-    /// <summary>epoch-ms timestamp at which the failure was recorded.</summary>
-    [JsonPropertyName("timestamp")]
-    public long Timestamp { get; set; }
-}
-
-/// <summary>Recorded MCP server pending-auth state.</summary>
+/// <summary>Result of one factory-scoped subagent call.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpServerNeedsAuthInfo
+public sealed class FactoryAgentResult
 {
-    /// <summary>epoch-ms timestamp at which the server signalled it needs authentication.</summary>
-    [JsonPropertyName("timestamp")]
-    public long Timestamp { get; set; }
+    /// <summary>Agent result, omitted when the agent produced no result.</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
 }
 
-/// <summary>Host-level state, omitted when no MCP host is initialized.</summary>
+/// <summary>Options for one factory-scoped subagent call.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpHostState
+public sealed class FactoryAgentOptions
 {
-    /// <summary>Names of currently-connected MCP clients.</summary>
-    [JsonPropertyName("clients")]
-    public IList<string> Clients { get => field ??= []; set; }
-
-    /// <summary>Configured servers that are explicitly disabled.</summary>
-    [JsonPropertyName("disabledServers")]
-    public IList<string> DisabledServers { get => field ??= []; set; }
+    /// <summary>Optional custom agent name for the subagent. This field is accepted but not yet honored.</summary>
+    [JsonPropertyName("agent")]
+    public string? Agent { get; set; }
 
-    /// <summary>Map of server name to recorded connection failure.</summary>
-    [JsonPropertyName("failedServers")]
-    public IDictionary<string, McpServerFailureInfo> FailedServers { get => field ??= new Dictionary<string, McpServerFailureInfo>(); set; }
+    /// <summary>Optional context tier for the subagent. This field is accepted but not yet honored.</summary>
+    [JsonPropertyName("contextTier")]
+    public ContextTier? ContextTier { get; set; }
 
-    /// <summary>Configured servers filtered out by MCP server policy.</summary>
-    [JsonPropertyName("filteredServers")]
-    public IList<string> FilteredServers { get => field ??= []; set; }
+    /// <summary>Optional label distinguishing otherwise identical memoized agent calls.</summary>
+    [JsonPropertyName("label")]
+    public string? Label { get; set; }
 
-    /// <summary>Whether third-party MCP servers are policy-enabled for this session.</summary>
-    [JsonPropertyName("mcp3pEnabled")]
-    public bool Mcp3pEnabled { get; set; }
+    /// <summary>Optional model identifier for the subagent.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Map of server name to recorded pending-auth state.</summary>
-    [JsonPropertyName("needsAuthServers")]
-    public IDictionary<string, McpServerNeedsAuthInfo> NeedsAuthServers { get => field ??= new Dictionary<string, McpServerNeedsAuthInfo>(); set; }
+    /// <summary>Optional reasoning effort for the subagent. This field is accepted but not yet honored.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
 
-    /// <summary>Names of servers with in-flight connection attempts.</summary>
-    [JsonPropertyName("pendingConnections")]
-    public IList<string> PendingConnections { get => field ??= []; set; }
+    /// <summary>Optional JSON Schema for structured agent output.</summary>
+    [JsonPropertyName("schema")]
+    public JsonElement? Schema { get; set; }
 }
 
-/// <summary>MCP server status entry, including config source/plugin source and any connection error.</summary>
+/// <summary>Parameters for one factory-scoped subagent call.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpServer
+internal sealed class FactoryAgentRequest
 {
-    /// <summary>Error message if the server failed to connect.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Server name (config key).</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Opaque token identifying the current factory execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
 
-    /// <summary>Configuration source: user, workspace, plugin, or builtin.</summary>
-    [JsonPropertyName("source")]
-    public McpServerSource? Source { get; set; }
+    /// <summary>Factory run identifier that owns the subagent.</summary>
+    [JsonPropertyName("factoryRunId")]
+    public string FactoryRunId { get; set; } = string.Empty;
 
-    /// <summary>Plugin name that provided this server, when source is plugin.</summary>
-    [JsonPropertyName("sourcePlugin")]
-    public string? SourcePlugin { get; set; }
+    /// <summary>Subagent execution options.</summary>
+    [JsonPropertyName("opts")]
+    public FactoryAgentOptions Opts { get => field ??= new(); set; }
 
-    /// <summary>Plugin version that provided this server, when source is plugin.</summary>
-    [JsonPropertyName("sourcePluginVersion")]
-    public string? SourcePluginVersion { get; set; }
+    /// <summary>Prompt to send to the subagent.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Connection status: connected, failed, needs-auth, pending, disabled, stopped, or not_configured.</summary>
-    [JsonPropertyName("status")]
-    public McpServerStatus Status { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>MCP servers configured for the session, with their connection status and host-level state.</summary>
+/// <summary>Result of reading a factory journal entry.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpServerList
+public sealed class FactoryJournalGetResult
 {
-    /// <summary>Host-level state, omitted when no MCP host is initialized.</summary>
-    [JsonPropertyName("host")]
-    public McpHostState? Host { get; set; }
+    /// <summary>Whether the journal contained the requested key.</summary>
+    [JsonPropertyName("hit")]
+    public bool Hit { get; set; }
 
-    /// <summary>Configured MCP servers.</summary>
-    [JsonPropertyName("servers")]
-    public IList<McpServer> Servers { get => field ??= []; set; }
+    /// <summary>Cached JSON result. The hit field distinguishes a cached JSON null from a miss.</summary>
+    [JsonPropertyName("resultJson")]
+    public JsonElement? ResultJson { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Parameters for reading a factory journal entry.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionMcpListRequest
+internal sealed class FactoryJournalGetRequest
 {
+    /// <summary>Opaque token identifying the current factory execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
+
+    /// <summary>Namespaced journal key.</summary>
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
+
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Normalized MCP Apps discovery metadata from a tool's `_meta.ui` block.</summary>
+/// <summary>Parameters for storing a factory journal entry.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpToolUi
+internal sealed class FactoryJournalPutRequest
 {
-    /// <summary>URI of the tool's MCP App resource, typically a `ui://` resource identifier. Use `session.mcp.resources.read` to fetch its HTML and resource metadata.</summary>
-    [JsonPropertyName("resourceUri")]
-    public string? ResourceUri { get; set; }
+    /// <summary>Opaque token identifying the current factory execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
 
-    /// <summary>Tool visibility advertised by the server. When absent, MCP Apps defaults apply.</summary>
-    [JsonPropertyName("visibility")]
-    public IList<McpToolUiVisibility>? Visibility { get; set; }
-}
+    /// <summary>Namespaced journal key.</summary>
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
 
-/// <summary>MCP tool metadata with tool name, optional description, and normalized MCP Apps discovery metadata.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class McpTools
-{
-    /// <summary>Tool description, when provided.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>JSON result to memoize.</summary>
+    [JsonPropertyName("resultJson")]
+    public JsonElement ResultJson { get; set; }
 
-    /// <summary>Tool name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-    /// <summary>Normalized MCP Apps discovery metadata. An empty object indicates that a valid `_meta.ui` block was present without recognized fields.</summary>
-    [JsonPropertyName("ui")]
-    public McpToolUi? Ui { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Tools exposed by the connected MCP server. Throws when the server is not connected.</summary>
+/// <summary>The currently selected model, reasoning effort, and context tier for the session. The context tier reflects `Session.getContextTier()`, restored from the session journal on resume.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpListToolsResult
+public sealed class CurrentModel
 {
-    /// <summary>Tools exposed by the server.</summary>
-    [JsonPropertyName("tools")]
-    public IList<McpTools> Tools { get => field ??= []; set; }
+    /// <summary>Context tier for models that support multiple context-window sizes.</summary>
+    [JsonPropertyName("contextTier")]
+    public ContextTier? ContextTier { get; set; }
+
+    /// <summary>Currently active model identifier.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
+
+    /// <summary>Reasoning effort level currently applied to the active model, when one is set. Reads `Session.getReasoningEffort()` synchronously after `getSelectedModel()` resolves so the two values are reported as a snapshot.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
 }
 
-/// <summary>Server name whose tool list should be returned.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpListToolsRequest
+internal sealed class SessionModelGetCurrentRequest
 {
-    /// <summary>Name of the connected MCP server whose tools to list.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Name of the MCP server to enable for the session.</summary>
+/// <summary>RPC data type for ModelSwitchConfirmation operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpEnableRequest
+public sealed class ModelSwitchConfirmation
 {
-    /// <summary>Name of the MCP server to enable.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Current conversation token count before switching models.</summary>
+    [JsonPropertyName("currentTokens")]
+    public double CurrentTokens { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Target model token limit used by the compaction preflight.</summary>
+    [JsonPropertyName("targetLimit")]
+    public double TargetLimit { get; set; }
+
+    /// <summary>Display name of the model that requires compaction confirmation.</summary>
+    [JsonPropertyName("targetModelDisplayName")]
+    public string TargetModelDisplayName { get; set; } = string.Empty;
 }
 
-/// <summary>Name of the MCP server to disable for the session.</summary>
+/// <summary>The model identifier active on the session after the switch.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpDisableRequest
+public sealed class ModelSwitchToResult
 {
-    /// <summary>Name of the MCP server to disable.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Compaction confirmation projection when status is confirmation_required.</summary>
+    [JsonPropertyName("confirmation")]
+    public ModelSwitchConfirmation? Confirmation { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains.</summary>
+    [JsonPropertyName("deferred")]
+    public bool? Deferred { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionMcpReloadRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Deprecation warnings associated with the selected model or options.</summary>
+    [JsonPropertyName("deprecationWarnings")]
+    public IList<string>? DeprecationWarnings { get; set; }
+
+    /// <summary>User-facing outcome message for the model switch.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    /// <summary>Currently active model identifier after the switch.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
+
+    /// <summary>Persistence failure encountered after applying the model switch.</summary>
+    [JsonPropertyName("persistenceError")]
+    public string? PersistenceError { get; set; }
+
+    /// <summary>Lifecycle result for the requested switch.</summary>
+    [JsonPropertyName("status")]
+    public string? Status { get; set; }
+
+    /// <summary>User-facing warning produced while applying the model switch.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
 }
 
-/// <summary>MCP server allowed by policy, with server name and optional PII-free explanatory note.</summary>
+/// <summary>Vision-specific limits.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAllowedServer
+public sealed class ModelCapabilitiesOverrideLimitsVision
 {
-    /// <summary>Allowed server name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Maximum image size in bytes.</summary>
+    [JsonPropertyName("max_prompt_image_size")]
+    public long? MaxPromptImageSize { get; set; }
 
-    /// <summary>PII-free note explaining why the server was allowed.</summary>
-    [JsonPropertyName("redactedNote")]
-    public string? RedactedNote { get; set; }
+    /// <summary>Maximum number of images per prompt.</summary>
+    [JsonPropertyName("max_prompt_images")]
+    public long? MaxPromptImages { get; set; }
+
+    /// <summary>MIME types the model accepts.</summary>
+    [JsonPropertyName("supported_media_types")]
+    public IList<string>? SupportedMediaTypes { get; set; }
 }
 
-/// <summary>MCP server filtered by policy, with name, reason, and optional redacted reason.</summary>
+/// <summary>Token limits for prompts, outputs, and context window.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpFilteredServer
+public sealed class ModelCapabilitiesOverrideLimits
 {
-    /// <summary>Deprecated. This field is no longer populated.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-#if NET5_0_OR_GREATER
-    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
-#endif
-    [JsonPropertyName("enterpriseName")]
-    public string? EnterpriseName { get; set; }
+    /// <summary>Maximum total context window size in tokens.</summary>
+    [JsonPropertyName("max_context_window_tokens")]
+    public long? MaxContextWindowTokens { get; set; }
 
-    /// <summary>Filtered server name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Maximum number of output/completion tokens.</summary>
+    [JsonPropertyName("max_output_tokens")]
+    public long? MaxOutputTokens { get; set; }
 
-    /// <summary>Human-readable filter reason.</summary>
-    [JsonPropertyName("reason")]
-    public string Reason { get; set; } = string.Empty;
+    /// <summary>Maximum number of prompt/input tokens.</summary>
+    [JsonPropertyName("max_prompt_tokens")]
+    public long? MaxPromptTokens { get; set; }
 
-    /// <summary>PII-free filter reason.</summary>
-    [JsonPropertyName("redactedReason")]
-    public string? RedactedReason { get; set; }
+    /// <summary>Vision-specific limits.</summary>
+    [JsonPropertyName("vision")]
+    public ModelCapabilitiesOverrideLimitsVision? Vision { get; set; }
 }
 
-/// <summary>MCP server startup filtering result.</summary>
+/// <summary>Feature flags indicating what the model supports.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpStartServersResult
+public sealed class ModelCapabilitiesOverrideSupports
 {
-    /// <summary>Non-default servers allowed by policy.</summary>
-    [JsonPropertyName("allowedServers")]
-    public IList<McpAllowedServer>? AllowedServers { get; set; }
+    /// <summary>Resolved Anthropic adaptive-thinking capability — unsupported / optional / required. 'required' models reject thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8).</summary>
+    [JsonPropertyName("adaptive_thinking")]
+    public AdaptiveThinkingSupport? AdaptiveThinking { get; set; }
 
-    /// <summary>Servers filtered out before startup.</summary>
-    [JsonPropertyName("filteredServers")]
-    public IList<McpFilteredServer> FilteredServers { get => field ??= []; set; }
+    /// <summary>Whether this model supports reasoning effort configuration.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public bool? ReasoningEffort { get; set; }
+
+    /// <summary>Whether this model supports vision/image input.</summary>
+    [JsonPropertyName("vision")]
+    public bool? Vision { get; set; }
 }
 
-/// <summary>Opaque MCP reload configuration.</summary>
+/// <summary>Optional capability overrides (vision, tool_calls, reasoning, etc.).</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpReloadWithConfigRequest
+public sealed class ModelCapabilitiesOverride
 {
-    /// <summary>Opaque runtime MCP reload configuration. Marked internal: an in-process runtime shape (reloadMcpServers throws over the wire).</summary>
-    [JsonInclude]
-    [JsonPropertyName("config")]
-    internal JsonElement Config { get; set; }
+    /// <summary>Token limits for prompts, outputs, and context window.</summary>
+    [JsonPropertyName("limits")]
+    public ModelCapabilitiesOverrideLimits? Limits { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Feature flags indicating what the model supports.</summary>
+    [JsonPropertyName("supports")]
+    public ModelCapabilitiesOverrideSupports? Supports { get; set; }
 }
 
-/// <summary>MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class McpExecuteSamplingResult
+/// <summary>Environment variables consulted while resolving model-picker settings.</summary>
+public sealed class ModelPickerSettingsContextEnvironment
 {
 }
 
-/// <summary>Outcome of an MCP sampling execution: success result, failure error, or cancellation.</summary>
+/// <summary>Filesystem and environment context used to resolve model-picker settings.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpSamplingExecutionResult
+public sealed class ModelPickerSettingsContext
 {
-    /// <summary>Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.</summary>
-    [JsonPropertyName("action")]
-    public McpSamplingExecutionAction Action { get; set; }
+    /// <summary>Optional Copilot configuration directory containing persisted settings.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
 
-    /// <summary>Error description, present when action='failure'.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Environment variables consulted while resolving model-picker settings.</summary>
+    [JsonPropertyName("environment")]
+    public ModelPickerSettingsContextEnvironment Environment { get => field ??= new(); set; }
 
-    /// <summary>MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.</summary>
-    [JsonPropertyName("result")]
-    public McpExecuteSamplingResult? Result { get; set; }
+    /// <summary>User home directory used when resolving persisted settings.</summary>
+    [JsonPropertyName("homeDirectory")]
+    public string HomeDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Raw MCP CreateMessageRequest params, as received in the `sampling.requested` event. Treated as opaque at the schema layer; the runtime converts the embedded MCP messages into the OpenAI chat-completion shape internally.</summary>
+/// <summary>RPC data type for ModelPickerPersistence operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpExecuteSamplingRequest
+public sealed class ModelPickerPersistenceRequest
 {
+    /// <summary>Whether context tier was explicitly selected and should be persisted.</summary>
+    [JsonPropertyName("contextTierExplicit")]
+    public bool? ContextTierExplicit { get; set; }
+
+    /// <summary>Whether reasoning effort was explicitly selected and should be persisted.</summary>
+    [JsonPropertyName("reasoningEffortExplicit")]
+    public bool? ReasoningEffortExplicit { get; set; }
+
+    /// <summary>Filesystem and environment context used to resolve settings persistence.</summary>
+    [JsonPropertyName("settingsContext")]
+    public ModelPickerSettingsContext SettingsContext { get => field ??= new(); set; }
 }
 
-/// <summary>Identifiers and raw MCP CreateMessageRequest params used to run a sampling inference.</summary>
+/// <summary>Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpExecuteSamplingParams
+internal sealed class ModelSwitchToRequest
 {
-    /// <summary>The original MCP JSON-RPC request ID (string or number). Used by the runtime to correlate the inference with the originating MCP request for telemetry; this is distinct from `requestId` (which is the schema-level cancellation handle).</summary>
-    [JsonPropertyName("mcpRequestId")]
-    public JsonElement McpRequestId { get; set; }
+    /// <summary>Explicit response to a model-switch compaction preflight. Omit to request a confirmation projection when compaction is necessary.</summary>
+    [JsonPropertyName("compactionDecision")]
+    public string? CompactionDecision { get; set; }
 
-    /// <summary>Raw MCP CreateMessageRequest params, as received in the `sampling.requested` event. Treated as opaque at the schema layer; the runtime converts the embedded MCP messages into the OpenAI chat-completion shape internally.</summary>
-    [JsonPropertyName("request")]
-    public McpExecuteSamplingRequest Request { get => field ??= new(); set; }
+    /// <summary>Explicit context tier for the selected model. `"default"` / `"long_context"` apply the requested tier; omit this field to use normal model behavior with no explicit tier.</summary>
+    [JsonPropertyName("contextTier")]
+    public ContextTier? ContextTier { get; set; }
 
-    /// <summary>Caller-provided unique identifier for this sampling execution. Use this same ID with cancelSamplingExecution to cancel the in-flight call. Must be unique within the session for the lifetime of the call.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>When true, defer this switch (enqueue it) if another model change is already queued, even when no turn is active — so it drains last (FIFO) and wins over the already-queued change. Intended for genuine user-initiated model selections; internal restore/reapply switches omit it and apply immediately when no turn is active. When no other model change is queued this has no effect (a switch still applies immediately unless a turn is active).</summary>
+    [JsonPropertyName("deferIfModelChangeQueued")]
+    public bool? DeferIfModelChangeQueued { get; set; }
 
-    /// <summary>Name of the MCP server that initiated the sampling request.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Override individual model capabilities resolved by the runtime.</summary>
+    [JsonPropertyName("modelCapabilities")]
+    public ModelCapabilitiesOverride? ModelCapabilities { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Settings scope used when persisting the selected model.</summary>
+    [JsonPropertyName("modelChangeScope")]
+    public string? ModelChangeScope { get; set; }
 
-/// <summary>Indicates whether an in-flight sampling execution with the given requestId was found and cancelled.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class McpCancelSamplingExecutionResult
-{
-    /// <summary>True if an in-flight execution with the given requestId was found and signalled to cancel. False when no such execution is in flight (already completed, never started, or cancelled by another caller).</summary>
-    [JsonPropertyName("cancelled")]
-    public bool Cancelled { get; set; }
-}
+    /// <summary>Model selection id to switch to, as returned by `list`. A bare id (e.g. `claude-sonnet-4.6`) names a Copilot (CAPI) model; a provider-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a registry BYOK model.</summary>
+    [JsonPropertyName("modelId")]
+    public string ModelId { get; set; } = string.Empty;
 
-/// <summary>The requestId previously passed to executeSampling that should be cancelled.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class McpCancelSamplingExecutionParams
-{
-    /// <summary>The requestId previously passed to executeSampling that should be cancelled.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Optional settings context and explicit-override flags used to persist a picker selection.</summary>
+    [JsonPropertyName("pickerPersistence")]
+    public ModelPickerPersistenceRequest? PickerPersistence { get; set; }
+
+    /// <summary>Reasoning effort level to use for the model. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. "none" disables reasoning. When omitted, no effort override is applied.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
+
+    /// <summary>Reasoning summary mode to request for supported model clients.</summary>
+    [JsonPropertyName("reasoningSummary")]
+    public ReasoningSummary? ReasoningSummary { get; set; }
+
+    /// <summary>Optional repository settings scope to persist after the switch commits.</summary>
+    [JsonPropertyName("repoScope")]
+    public string? RepoScope { get; set; }
+
+    /// <summary>Require the target to be currently available and enabled before applying the switch.</summary>
+    [JsonPropertyName("requireAvailable")]
+    public bool? RequireAvailable { get; set; }
+
+    /// <summary>When true, evaluate context-window compaction policy before applying the switch.</summary>
+    [JsonPropertyName("runCompactionPreflight")]
+    public bool? RunCompactionPreflight { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>Env-value mode recorded on the session after the update.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class McpSetEnvValueModeResult
-{
-    /// <summary>Mode recorded on the session after the update.</summary>
-    [JsonPropertyName("mode")]
-    public McpSetEnvValueModeDetails Mode { get; set; }
+    /// <summary>Origin to record on the effective `session.model_change` event. Defaults to `sdk` when omitted.</summary>
+    [JsonPropertyName("source")]
+    public ModelChangeSource? Source { get; set; }
+
+    /// <summary>Output verbosity level to request for supported models.</summary>
+    [JsonPropertyName("verbosity")]
+    public Verbosity? Verbosity { get; set; }
 }
 
-/// <summary>Mode controlling how MCP server env values are resolved (`direct` or `indirect`).</summary>
+/// <summary>Managed, repository, and CLI model overrides to overlay onto the session at startup.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpSetEnvValueModeParams
+internal sealed class ModelApplyStartupOverlayRequest
 {
-    /// <summary>How environment-variable values supplied to MCP servers are resolved. "direct" passes literal string values; "indirect" treats values as references (e.g. names of environment variables on the host) that the runtime resolves before launch. Defaults to the runtime's startup mode; clients that intentionally launch MCP servers with literal values (e.g. CLI prompt mode and ACP) set this to "direct".</summary>
-    [JsonPropertyName("mode")]
-    public McpSetEnvValueModeDetails Mode { get; set; }
+    /// <summary>Model explicitly selected by the CLI, when provided.</summary>
+    [JsonPropertyName("cliModel")]
+    public string? CliModel { get; set; }
+
+    /// <summary>Whether the overlay is being applied while resuming a deferred session.</summary>
+    [JsonPropertyName("deferredResume")]
+    public bool? DeferredResume { get; set; }
+
+    /// <summary>Model required by device-managed policy, when configured.</summary>
+    [JsonPropertyName("deviceManagedModel")]
+    public string? DeviceManagedModel { get; set; }
+
+    /// <summary>Context tier selected by repository settings, when configured.</summary>
+    [JsonPropertyName("repoContextTier")]
+    public string? RepoContextTier { get; set; }
+
+    /// <summary>Model selected by repository settings, when configured.</summary>
+    [JsonPropertyName("repoModel")]
+    public string? RepoModel { get; set; }
+
+    /// <summary>Reasoning effort selected by repository settings, when configured.</summary>
+    [JsonPropertyName("repoReasoningEffort")]
+    public string? RepoReasoningEffort { get; set; }
+
+    /// <summary>Model required by server-managed policy, when configured.</summary>
+    [JsonPropertyName("serverManagedModel")]
+    public string? ServerManagedModel { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the auto-managed `github` MCP server was removed (false when nothing to remove).</summary>
+/// <summary>Update the session's reasoning effort without changing the selected model. Use `switchTo` instead when you also need to change the model. The runtime stores the effort on the session and applies it to subsequent turns.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpRemoveGitHubResult
+public sealed class ModelSetReasoningEffortResult
 {
-    /// <summary>True when the auto-managed `github` MCP server was removed; false when no removal happened (e.g. user has explicitly configured a `github` server, or the server was not registered).</summary>
-    [JsonPropertyName("removed")]
-    public bool Removed { get; set; }
+    /// <summary>Reasoning effort level recorded on the session after the update.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string ReasoningEffort { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Reasoning effort level to apply to the currently selected model.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionMcpRemoveGitHubRequest
+internal sealed class ModelSetReasoningEffortRequest
 {
+    /// <summary>Reasoning effort level to apply to the currently selected model. The host is responsible for validating the value against the model's supported levels before calling.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string ReasoningEffort { get; set; } = string.Empty;
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of configuring GitHub MCP.</summary>
+/// <summary>Cost-category metadata for a CAPI model.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpConfigureGitHubResult
+public sealed class SessionModelPriceCategory
 {
-    /// <summary>Whether GitHub MCP configuration changed.</summary>
-    [JsonPropertyName("changed")]
-    public bool Changed { get; set; }
+    /// <summary>CAPI model identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Cost category assigned to the model.</summary>
+    [JsonPropertyName("priceCategory")]
+    public ModelPickerPriceCategory PriceCategory { get; set; }
 }
 
-/// <summary>Opaque auth info used to configure GitHub MCP.</summary>
+/// <summary>The list of models available to this session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpConfigureGitHubRequest
+public sealed class SessionModelList
 {
-    /// <summary>Opaque runtime auth info for GitHub MCP configuration. Marked internal: an in-process runtime shape (configureGitHubMcp is a no-op over the wire).</summary>
-    [JsonInclude]
-    [JsonPropertyName("authInfo")]
-    internal JsonElement AuthInfo { get; set; }
+    /// <summary>Available models, ordered with the most preferred default first. Includes both Copilot (CAPI) models and any registry BYOK models; a BYOK model appears under its provider-qualified selection id (`provider/id`).</summary>
+    [JsonPropertyName("list")]
+    public IList<JsonElement> List { get => field ??= []; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Cost categories for the full CAPI catalog, including picker-disabled models that Auto may select. Metadata only; entries absent from `list` are not manually selectable.</summary>
+    [JsonPropertyName("modelPriceCategories")]
+    public IList<SessionModelPriceCategory>? ModelPriceCategories { get; set; }
+
+    /// <summary>Per-quota snapshots returned alongside the model list, keyed by quota type.</summary>
+    [JsonPropertyName("quotaSnapshots")]
+    public IDictionary<string, JsonElement>? QuotaSnapshots { get; set; }
 }
 
-/// <summary>Server name and optional configuration for an individual MCP server start. Omit `config` for a config-free start-by-name of an already-configured server.</summary>
+/// <summary>RPC data type for SessionModelList operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpStartServerRequest
+public sealed class SessionModelListRequest
 {
-    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE). Omit to start the server with its already-registered configuration (config-free start-by-name).</summary>
-    [JsonPropertyName("config")]
-    public JsonElement? Config { get; set; }
-
-    /// <summary>Name of the MCP server to start.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>If true, bypasses the per-session model list cache and re-fetches from CAPI.</summary>
+    [JsonPropertyName("skipCache")]
+    public bool? SkipCache { get; set; }
 }
 
-/// <summary>Server name and optional replacement configuration for an individual MCP server restart. Omit `config` for a config-free restart-by-name of an already-configured server.</summary>
+/// <summary>RPC data type for SessionModelListRequestWithSession operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpRestartServerRequest
+internal sealed class SessionModelListRequestWithSession
 {
-    /// <summary>Replacement MCP server configuration (stdio process or remote HTTP/SSE). Omit to restart the server with its already-registered configuration (config-free restart-by-name).</summary>
-    [JsonPropertyName("config")]
-    public JsonElement? Config { get; set; }
-
-    /// <summary>Name of the MCP server to restart.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>If true, bypasses the per-session model list cache and re-fetches from CAPI.</summary>
+    [JsonPropertyName("skipCache")]
+    public bool? SkipCache { get; set; }
 }
 
-/// <summary>Server name for an individual MCP server stop.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpStopServerRequest
+internal sealed class SessionModeGetRequest
 {
-    /// <summary>Name of the MCP server to stop.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Registration parameters for an external MCP client.</summary>
+/// <summary>Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpRegisterExternalClientRequest
+public sealed class ModeSetResult
 {
-    /// <summary>In-process MCP Client instance. Marked internal: cannot be serialized across the JSON-RPC boundary.</summary>
-    [JsonInclude]
-    [JsonPropertyName("client")]
-    internal JsonElement Client { get; set; }
+    /// <summary>Whether the host should arm an interactive continuation after the mode change.</summary>
+    [JsonPropertyName("armInteractiveContinuation")]
+    public bool? ArmInteractiveContinuation { get; set; }
 
-    /// <summary>In-process server config (MCPServerConfig) paired with the in-process client/transport. Marked internal alongside its companions.</summary>
-    [JsonInclude]
-    [JsonPropertyName("config")]
-    internal JsonElement Config { get; set; }
+    /// <summary>Compaction confirmation required before the mode change can complete.</summary>
+    [JsonPropertyName("confirmation")]
+    public ModelSwitchConfirmation? Confirmation { get; set; }
 
-    /// <summary>Logical server name for the external client.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Whether the host must defer implementing the requested mode change.</summary>
+    [JsonPropertyName("deferImplementation")]
+    public bool? DeferImplementation { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Deprecation warnings associated with the model selected by the mode change.</summary>
+    [JsonPropertyName("deprecationWarnings")]
+    public IList<string>? DeprecationWarnings { get; set; }
 
-    /// <summary>In-process MCP Transport instance. Marked internal: cannot be serialized across the JSON-RPC boundary.</summary>
-    [JsonInclude]
-    [JsonPropertyName("transport")]
-    internal JsonElement Transport { get; set; }
+    /// <summary>User-facing outcome message for the model switch triggered by the mode change.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    /// <summary>Whether applying the mode changed the active model.</summary>
+    [JsonPropertyName("modelChanged")]
+    public bool ModelChanged { get; set; }
+
+    /// <summary>Lifecycle status of the requested mode change.</summary>
+    [JsonPropertyName("status")]
+    public string Status { get; set; } = string.Empty;
+
+    /// <summary>User-facing warning produced while applying the mode change.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
 }
 
-/// <summary>Server name identifying the external client to remove.</summary>
+/// <summary>Agent interaction mode to apply to the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpUnregisterExternalClientRequest
+internal sealed class ModeSetRequest
 {
-    /// <summary>Server name of the external client to unregister.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Explicit response to a model-switch compaction preflight.</summary>
+    [JsonPropertyName("compactionDecision")]
+    public string? CompactionDecision { get; set; }
+
+    /// <summary>Session whose plan-mode base state should be inherited.</summary>
+    [JsonPropertyName("inheritPlanBaseFromSessionId")]
+    public string? InheritPlanBaseFromSessionId { get; set; }
+
+    /// <summary>The session mode the agent is operating in.</summary>
+    [JsonPropertyName("mode")]
+    public SessionMode Mode { get; set; }
+
+    /// <summary>Whether the selected plan model should be persisted.</summary>
+    [JsonPropertyName("persistPlanSelection")]
+    public bool? PersistPlanSelection { get; set; }
+
+    /// <summary>Settings context used when persisting the selected plan model.</summary>
+    [JsonPropertyName("pickerSettingsContext")]
+    public ModelPickerSettingsContext? PickerSettingsContext { get; set; }
+
+    /// <summary>Context tier to use with the dedicated plan model.</summary>
+    [JsonPropertyName("planContextTier")]
+    public string? PlanContextTier { get; set; }
+
+    /// <summary>Action to perform when leaving plan mode.</summary>
+    [JsonPropertyName("planExitAction")]
+    public string? PlanExitAction { get; set; }
+
+    /// <summary>Dedicated model to use in plan mode, when configured.</summary>
+    [JsonPropertyName("planModel")]
+    public string? PlanModel { get; set; }
+
+    /// <summary>Whether a dedicated plan model is configured.</summary>
+    [JsonPropertyName("planModelConfigured")]
+    public bool? PlanModelConfigured { get; set; }
+
+    /// <summary>Reasoning effort to use with the dedicated plan model.</summary>
+    [JsonPropertyName("planReasoningEffort")]
+    public string? PlanReasoningEffort { get; set; }
+
+    /// <summary>Whether leaving plan mode should restore the session's previous model.</summary>
+    [JsonPropertyName("restorePlanModel")]
+    public bool? RestorePlanModel { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Whether the named MCP server is running.</summary>
+/// <summary>The session's friendly name, or null when not yet set.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpIsServerRunningResult
+public sealed class NameGetResult
 {
-    /// <summary>True if the server has an active client and transport.</summary>
-    [JsonPropertyName("running")]
-    public bool Running { get; set; }
+    /// <summary>The session name (user-set or auto-generated), or null if not yet set.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 }
 
-/// <summary>Server name to check running status for.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpIsServerRunningRequest
+internal sealed class SessionNameGetRequest
 {
-    /// <summary>Name of the MCP server to check.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the pending MCP OAuth response was accepted.</summary>
+/// <summary>New friendly name to apply to the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpOauthHandlePendingResult
+internal sealed class NameSetRequest
 {
-    /// <summary>Whether the response was accepted. False if the request was unknown, timed out, or already resolved.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>New session name (1–100 characters, trimmed of leading/trailing whitespace).</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [MaxLength(100)]
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Host response to the pending OAuth request.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Indicates whether the auto-generated summary was applied as the session's name.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpOauthPendingRequestResponseToken), "token")]
-[JsonDerivedType(typeof(McpOauthPendingRequestResponseCancelled), "cancelled")]
-public partial class McpOauthPendingRequestResponse
+public sealed class NameSetAutoResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <summary>Whether the auto-generated summary was persisted. False if the session already has a user-set name, the summary normalized to empty, or the session does not have a workspace.</summary>
+    [JsonPropertyName("applied")]
+    public bool Applied { get; set; }
 }
 
-
-/// <summary>The <c>token</c> variant of <see cref="McpOauthPendingRequestResponse"/>.</summary>
+/// <summary>Auto-generated session summary to apply as the session's name when no user-set name exists.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class McpOauthPendingRequestResponseToken : McpOauthPendingRequestResponse
+internal sealed class NameSetAutoRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "token";
-
-    /// <summary>Access token acquired by the SDK host.</summary>
-    [JsonPropertyName("accessToken")]
-    public required string AccessToken { get; set; }
-
-    /// <summary>Token lifetime in seconds, if known.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("expiresIn")]
-    public long? ExpiresIn { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>OAuth token type. Defaults to Bearer when omitted.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("tokenType")]
-    public string? TokenType { get; set; }
+    /// <summary>Auto-generated session summary. Empty/whitespace-only values are ignored; values are trimmed before persisting.</summary>
+    [JsonPropertyName("summary")]
+    public string Summary { get; set; } = string.Empty;
 }
 
-/// <summary>The <c>cancelled</c> variant of <see cref="McpOauthPendingRequestResponse"/>.</summary>
+/// <summary>Existence, contents, and resolved path of the session plan file.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class McpOauthPendingRequestResponseCancelled : McpOauthPendingRequestResponse
+public sealed class PlanReadResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "cancelled";
+    /// <summary>The content of the plan file, or null if it does not exist.</summary>
+    [JsonPropertyName("content")]
+    public string? Content { get; set; }
+
+    /// <summary>Whether the plan file exists in the workspace.</summary>
+    [JsonPropertyName("exists")]
+    public bool Exists { get; set; }
+
+    /// <summary>Absolute file path of the plan file, or null if workspace is not enabled.</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
 }
 
-/// <summary>Pending MCP OAuth request ID and host-provided token or cancellation response.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpOauthHandlePendingRequest
+internal sealed class SessionPlanReadRequest
 {
-    /// <summary>OAuth request identifier from the mcp.oauth_required event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
-
-    /// <summary>Host response to the pending OAuth request.</summary>
-    [JsonPropertyName("result")]
-    public McpOauthPendingRequestResponse Result { get => field ??= new(); set; }
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the MCP server whose persisted OAuth credentials were updated.</summary>
+/// <summary>Replacement contents to write to the session plan file.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpOauthAuthenticationStateChangedRequest
+internal sealed class PlanUpdateRequest
 {
-    /// <summary>Whether the target session must mint a session-scoped access token instead of reusing a shared access token persisted by another session.</summary>
-    [JsonPropertyName("refreshSessionToken")]
-    public bool? RefreshSessionToken { get; set; }
-
-    /// <summary>Name of the MCP server whose OAuth credentials were updated. Omit only when the host cannot identify the server.</summary>
-    [JsonPropertyName("serverName")]
-    public string? ServerName { get; set; }
+    /// <summary>The new content for the plan file.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>OAuth authorization URL the caller should open, or empty when cached tokens already authenticated the server.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpOauthLoginResult
+internal sealed class SessionPlanDeleteRequest
 {
-    /// <summary>URL the caller should open in a browser to complete OAuth. Omitted when cached tokens were still valid and no browser interaction was needed — the server is already reconnected in that case. When present, the runtime starts the callback listener before returning and continues the flow in the background; completion is signaled via session.mcp_server_status_changed.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("authorizationUrl")]
-    public string? AuthorizationUrl { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback success-page copy, and static OAuth client selection.</summary>
+/// <summary>A single todo row read from the session SQL `todos` table. All fields are optional because the SQL schema is best-effort and the agent may not have populated every column.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpOauthLoginRequest
+public sealed class PlanSqlTodosRow
 {
-    /// <summary>Optional override for the body text shown on the OAuth loopback callback success page. When omitted, the runtime applies a neutral fallback; callers driving interactive auth should pass surface-specific copy telling the user where to return.</summary>
-    [JsonPropertyName("callbackSuccessMessage")]
-    public string? CallbackSuccessMessage { get; set; }
+    /// <summary>Todo creation time, as stored by the session SQL schema's `datetime('now')` default: `YYYY-MM-DD HH:MM:SS` in UTC. Lets clients attribute todos to the work item that created them (e.g. scoping a goal's progress to the todos it produced) rather than to the whole session.</summary>
+    [JsonPropertyName("createdAt")]
+    public string? CreatedAt { get; set; }
 
-    /// <summary>Optional OAuth client ID override for this login. When set, the runtime uses this pre-registered static client instead of dynamic client registration.</summary>
-    [JsonPropertyName("clientId")]
-    public string? ClientId { get; set; }
+    /// <summary>Todo description.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Optional override for the OAuth client display name shown on the consent screen. Applies to newly registered dynamic clients only — existing registrations keep the name they were created with. When omitted, the runtime applies a neutral fallback; callers driving interactive auth should pass their own surface-specific label so the consent screen matches the product the user sees.</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
+    /// <summary>Todo identifier.</summary>
+    [JsonPropertyName("id")]
+    public string? Id { get; set; }
 
-    /// <summary>Optional OAuth client secret override for this login. The runtime treats this as an ephemeral host-owned secret, uses it for this authentication attempt and does not persist it.</summary>
-    [JsonPropertyName("clientSecret")]
-    public string? ClientSecret { get; set; }
-
-    /// <summary>When true, clears any cached OAuth token for the server and runs a full new authorization. Use when the user explicitly wants to switch accounts or believes their session is stuck.</summary>
-    [JsonPropertyName("forceReauth")]
-    public bool? ForceReauth { get; set; }
-
-    /// <summary>Optional OAuth grant type override for this login. Defaults to the server configuration, or authorization_code when no grant type is specified.</summary>
-    [JsonPropertyName("grantType")]
-    public McpOauthLoginGrantType? GrantType { get; set; }
+    /// <summary>Todo status.</summary>
+    [JsonPropertyName("status")]
+    public string? Status { get; set; }
 
-    /// <summary>Optional override indicating whether the static OAuth client is public. When false, the runtime treats it as confidential and uses the per-login clientSecret if provided, otherwise retrieving the client secret from the MCP OAuth secret store.</summary>
-    [JsonPropertyName("publicClient")]
-    public bool? PublicClient { get; set; }
+    /// <summary>Todo title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+}
 
-    /// <summary>Name of the remote MCP server to authenticate.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+/// <summary>Todo rows read from the session SQL database. Empty when no session database is available.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PlanReadSqlTodosResult
+{
+    /// <summary>Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables.</summary>
+    [JsonPropertyName("rows")]
+    public IList<PlanSqlTodosRow> Rows { get => field ??= []; set; }
+}
 
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionPlanReadSqlTodosRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the pending MCP OAuth response was accepted.</summary>
+/// <summary>A single dependency edge read from the session SQL `todo_deps` table, indicating that one todo must complete before another.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpOauthRespondResult
+public sealed class PlanSqlTodoDependency
 {
-    /// <summary>Whether the response was accepted. False if the request was unknown, timed out, or already resolved.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>ID of the todo it depends on.</summary>
+    [JsonPropertyName("dependsOn")]
+    public string DependsOn { get; set; } = string.Empty;
+
+    /// <summary>ID of the todo that has the dependency.</summary>
+    [JsonPropertyName("todoId")]
+    public string TodoId { get; set; } = string.Empty;
 }
 
-/// <summary>Pending MCP OAuth request id to respond to.</summary>
+/// <summary>Todo rows + dependency edges read from the session SQL database.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpOauthRespondRequest
+public sealed class PlanReadSqlTodosWithDependenciesResult
 {
-    /// <summary>OAuth request identifier from the mcp.oauth_required event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Edges from the session SQL todo_deps table. Empty when no database, no todo_deps table, or the SELECT failed. Read independently from `rows`, so a broken todo_deps table does not affect the rows result and vice versa.</summary>
+    [JsonPropertyName("dependencies")]
+    public IList<PlanSqlTodoDependency> Dependencies { get => field ??= []; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables. Empty when no database, no todos table, or the SELECT failed.</summary>
+    [JsonPropertyName("rows")]
+    public IList<PlanSqlTodosRow> Rows { get => field ??= []; set; }
 }
 
-/// <summary>Indicates whether the pending MCP headers refresh response was accepted.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpHeadersHandlePendingHeadersRefreshRequestResult
+internal sealed class SessionPlanReadSqlTodosWithDependenciesRequest
 {
-    /// <summary>Whether the response was accepted. False if the request was unknown, timed out, or already resolved.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Host response: supply dynamic headers or decline this refresh.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestHeaders), "headers")]
-[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestNone), "none")]
-public partial class McpHeadersHandlePendingHeadersRefreshRequest
+/// <summary>RPC data type for WorkspacesGetWorkspaceResultWorkspace operations.</summary>
+public sealed class WorkspacesGetWorkspaceResultWorkspace
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Current Git branch.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
+
+    /// <summary>Whether the per-session Chronicle upgrade prompt was dismissed for the workspace.</summary>
+    [JsonPropertyName("chronicle_sync_dismissed")]
+    public bool? ChronicleSyncDismissed { get; set; }
 
+    /// <summary>Name of the client that created the workspace.</summary>
+    [JsonPropertyName("client_name")]
+    public string? ClientName { get; set; }
 
-/// <summary>The <c>headers</c> variant of <see cref="McpHeadersHandlePendingHeadersRefreshRequest"/>.</summary>
+    /// <summary>Timestamp when the workspace was created.</summary>
+    [JsonPropertyName("created_at")]
+    public DateTimeOffset? CreatedAt { get; set; }
+
+    /// <summary>Current working directory associated with the workspace.</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
+
+    /// <summary>Git repository root associated with the workspace.</summary>
+    [JsonPropertyName("git_root")]
+    public string? GitRoot { get; set; }
+
+    /// <summary>Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.</summary>
+    [JsonPropertyName("host_type")]
+    public WorkspacesWorkspaceDetailsHostType? HostType { get; set; }
+
+    /// <summary>Stable workspace identifier.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Most recent Mission Control event identifier observed for the workspace.</summary>
+    [JsonPropertyName("mc_last_event_id")]
+    public string? McLastEventId { get; set; }
+
+    /// <summary>Mission Control session identifier associated with the workspace.</summary>
+    [JsonPropertyName("mc_session_id")]
+    public string? McSessionId { get; set; }
+
+    /// <summary>Mission Control task identifier associated with the workspace.</summary>
+    [JsonPropertyName("mc_task_id")]
+    public string? McTaskId { get; set; }
+
+    /// <summary>Workspace display name.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>Whether the workspace session can be steered remotely.</summary>
+    [JsonPropertyName("remote_steerable")]
+    public bool? RemoteSteerable { get; set; }
+
+    /// <summary>Repository identifier associated with the workspace.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
+
+    /// <summary>Number of persisted summaries in the workspace.</summary>
+    [JsonPropertyName("summary_count")]
+    public long? SummaryCount { get; set; }
+
+    /// <summary>Timestamp when the workspace was last updated.</summary>
+    [JsonPropertyName("updated_at")]
+    public DateTimeOffset? UpdatedAt { get; set; }
+
+    /// <summary>Whether the workspace name was explicitly chosen by the user.</summary>
+    [JsonPropertyName("user_named")]
+    public bool? UserNamed { get; set; }
+}
+
+/// <summary>Current workspace metadata for the session, including its absolute filesystem path when available.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class McpHeadersHandlePendingHeadersRefreshRequestHeaders : McpHeadersHandlePendingHeadersRefreshRequest
+public sealed class WorkspacesGetWorkspaceResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "headers";
+    /// <summary>Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
 
-    /// <summary>Headers to overlay onto the MCP request. Dynamic headers override static config headers but do not replace SDK-managed request headers.</summary>
-    [JsonPropertyName("headers")]
-    public required IDictionary<string, string> Headers { get; set; }
+    /// <summary>Current workspace metadata, or null if not available.</summary>
+    [JsonPropertyName("workspace")]
+    public WorkspacesGetWorkspaceResultWorkspace? Workspace { get; set; }
 }
 
-/// <summary>The <c>none</c> variant of <see cref="McpHeadersHandlePendingHeadersRefreshRequest"/>.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class McpHeadersHandlePendingHeadersRefreshRequestNone : McpHeadersHandlePendingHeadersRefreshRequest
+internal sealed class SessionWorkspacesGetWorkspaceRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "none";
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>MCP headers refresh request id and the host response.</summary>
+/// <summary>Workspace metadata fields to update.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpHeadersHandlePendingHeadersRefreshRequestRequest
+internal sealed class WorkspacesUpdateMetadataRequest
 {
-    /// <summary>Headers refresh request identifier from mcp.headers_refresh_required.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Opaque workspace context supplied by the session host.</summary>
+    [JsonPropertyName("context")]
+    public JsonElement? Context { get; set; }
 
-    /// <summary>Host response: supply dynamic headers or decline this refresh.</summary>
-    [JsonPropertyName("result")]
-    public McpHeadersHandlePendingHeadersRefreshRequest Result { get => field ??= new(); set; }
+    /// <summary>Optional workspace display name override.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>MCP Apps resource content with URI, optional MIME type, text or base64 blob, and resource metadata.</summary>
+/// <summary>Optional session context used when creating a local workspace.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAppsResourceContent
+internal sealed class WorkspacesEnsureRequest
 {
-    /// <summary>Resource-level metadata (CSP, permissions, etc.).</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
-
-    /// <summary>Base64-encoded binary content.</summary>
-    [JsonPropertyName("blob")]
-    public string? Blob { get; set; }
-
-    /// <summary>MIME type of the content.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
-
-    /// <summary>Text content (e.g. HTML).</summary>
-    [JsonPropertyName("text")]
-    public string? Text { get; set; }
+    /// <summary>Opaque workspace context supplied by the session host.</summary>
+    [JsonPropertyName("context")]
+    public JsonElement? Context { get; set; }
 
-    /// <summary>The resource URI (typically ui://...).</summary>
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Resource contents returned by the MCP server.</summary>
+/// <summary>Relative paths of files stored in the session workspace files directory.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAppsReadResourceResult
+public sealed class WorkspacesListFilesResult
 {
-    /// <summary>Resource contents returned by the server.</summary>
-    [JsonPropertyName("contents")]
-    public IList<McpAppsResourceContent> Contents { get => field ??= []; set; }
+    /// <summary>Relative file paths in the workspace files directory.</summary>
+    [JsonPropertyName("files")]
+    public IList<string> Files { get => field ??= []; set; }
 }
 
-/// <summary>MCP server and resource URI to fetch.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpAppsReadResourceRequest
+internal sealed class SessionWorkspacesListFilesRequest
 {
-    /// <summary>Name of the MCP server hosting the resource.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Resource URI (typically ui://...).</summary>
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
 }
 
-/// <summary>App-callable tools from the named MCP server.</summary>
+/// <summary>Contents of the requested workspace file as a UTF-8 string.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAppsListToolsResult
+public sealed class WorkspacesReadFileResult
 {
-    /// <summary>App-callable tools from the server.</summary>
-    [JsonPropertyName("tools")]
-    public IList<IDictionary<string, JsonElement>> Tools { get => field ??= []; set; }
+    /// <summary>File content as a UTF-8 string.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 }
 
-/// <summary>MCP server to list app-callable tools for.</summary>
+/// <summary>Relative path of the workspace file to read.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpAppsListToolsRequest
+internal sealed class WorkspacesReadFileRequest
 {
-    /// <summary>**Required.** Server whose ui:// view issued the request. Per SEP-1865 ('callable by the app from this server only'), the call is rejected when this differs from `serverName`, and rejected outright when missing.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("originServerName")]
-    public string OriginServerName { get; set; } = string.Empty;
-
-    /// <summary>MCP server hosting the app.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Relative path within the workspace files directory.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>MCP server, tool name, and arguments to invoke from an MCP App view.</summary>
+/// <summary>Relative path and UTF-8 content for the workspace file to create or overwrite.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpAppsCallToolRequest
+internal sealed class WorkspacesCreateFileRequest
 {
-    /// <summary>Tool arguments.</summary>
-    [JsonPropertyName("arguments")]
-    public IDictionary<string, JsonElement>? Arguments { get; set; }
-
-    /// <summary>**Required.** Server whose ui:// view issued the request. Per SEP-1865 ('callable by the app from this server only'), the call is rejected when this differs from `serverName`, and rejected outright when missing.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("originServerName")]
-    public string OriginServerName { get; set; } = string.Empty;
+    /// <summary>File content to write as a UTF-8 string.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <summary>MCP server hosting the tool.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Relative path within the workspace files directory.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>MCP tool name.</summary>
-    [JsonPropertyName("toolName")]
-    public string ToolName { get; set; } = string.Empty;
 }
 
-/// <summary>Host context advertised to MCP App guests.</summary>
+/// <summary>Workspace checkpoint metadata with assigned number, human-readable title, and checkpoint filename.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAppsSetHostContextDetails
+public sealed class WorkspacesCheckpoints
 {
-    /// <summary>Display modes the host supports.</summary>
-    [JsonPropertyName("availableDisplayModes")]
-    public IList<McpAppsSetHostContextDetailsAvailableDisplayMode>? AvailableDisplayModes { get; set; }
-
-    /// <summary>Current display mode (SEP-1865).</summary>
-    [JsonPropertyName("displayMode")]
-    public McpAppsSetHostContextDetailsDisplayMode? DisplayMode { get; set; }
+    /// <summary>Filename of the checkpoint within the workspace checkpoints directory.</summary>
+    [JsonPropertyName("filename")]
+    public string Filename { get; set; } = string.Empty;
 
-    /// <summary>BCP-47 locale, e.g. 'en-US'.</summary>
-    [JsonPropertyName("locale")]
-    public string? Locale { get; set; }
+    /// <summary>Checkpoint number assigned by the workspace manager.</summary>
+    [JsonPropertyName("number")]
+    public long Number { get; set; }
 
-    /// <summary>Platform type for responsive design.</summary>
-    [JsonPropertyName("platform")]
-    public McpAppsSetHostContextDetailsPlatform? Platform { get; set; }
+    /// <summary>Human-readable checkpoint title.</summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = string.Empty;
+}
 
-    /// <summary>UI theme preference per SEP-1865.</summary>
-    [JsonPropertyName("theme")]
-    public McpAppsSetHostContextDetailsTheme? Theme { get; set; }
+/// <summary>Workspace checkpoints in chronological order; empty when the workspace is not enabled.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class WorkspacesListCheckpointsResult
+{
+    /// <summary>Workspace checkpoints in chronological order. Empty when workspace is not enabled.</summary>
+    [JsonPropertyName("checkpoints")]
+    public IList<WorkspacesCheckpoints> Checkpoints { get => field ??= []; set; }
+}
 
-    /// <summary>IANA timezone, e.g. 'America/New_York'.</summary>
-    [JsonPropertyName("timeZone")]
-    public string? TimeZone { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionWorkspacesListCheckpointsRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Host application identifier.</summary>
-    [JsonPropertyName("userAgent")]
-    public string? UserAgent { get; set; }
+/// <summary>Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class WorkspacesReadCheckpointResult
+{
+    /// <summary>Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.</summary>
+    [JsonPropertyName("content")]
+    public string? Content { get; set; }
 }
 
-/// <summary>Host context to advertise to MCP App guests.</summary>
+/// <summary>Checkpoint number to read.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpAppsSetHostContextRequest
+internal sealed class WorkspacesReadCheckpointRequest
 {
-    /// <summary>Host context advertised to MCP App guests.</summary>
-    [JsonPropertyName("context")]
-    public McpAppsSetHostContextDetails Context { get => field ??= new(); set; }
+    /// <summary>Checkpoint number to read.</summary>
+    [JsonPropertyName("number")]
+    public long Number { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Current host context.</summary>
+/// <summary>Metadata for the persisted summary.</summary>
+public sealed class WorkspacesAddSummaryResultSummary
+{
+}
+
+/// <summary>Refreshed metadata for the containing workspace.</summary>
+public sealed class WorkspacesAddSummaryResultWorkspace
+{
+}
+
+/// <summary>Persisted summary metadata and refreshed workspace metadata.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAppsHostContextDetails
+public sealed class WorkspacesAddSummaryResult
 {
-    /// <summary>Display modes the host supports.</summary>
-    [JsonPropertyName("availableDisplayModes")]
-    public IList<McpAppsHostContextDetailsAvailableDisplayMode>? AvailableDisplayModes { get; set; }
+    /// <summary>Metadata for the persisted summary.</summary>
+    [JsonPropertyName("summary")]
+    public WorkspacesAddSummaryResultSummary? Summary { get; set; }
 
-    /// <summary>Current display mode (SEP-1865).</summary>
-    [JsonPropertyName("displayMode")]
-    public McpAppsHostContextDetailsDisplayMode? DisplayMode { get; set; }
+    /// <summary>Refreshed metadata for the containing workspace.</summary>
+    [JsonPropertyName("workspace")]
+    public WorkspacesAddSummaryResultWorkspace? Workspace { get; set; }
+}
 
-    /// <summary>BCP-47 locale, e.g. 'en-US'.</summary>
-    [JsonPropertyName("locale")]
-    public string? Locale { get; set; }
+/// <summary>Compaction summary checkpoint to persist.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class WorkspacesAddSummaryRequest
+{
+    /// <summary>Markdown summary content to persist.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <summary>Platform type for responsive design.</summary>
-    [JsonPropertyName("platform")]
-    public McpAppsHostContextDetailsPlatform? Platform { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>UI theme preference per SEP-1865.</summary>
-    [JsonPropertyName("theme")]
-    public McpAppsHostContextDetailsTheme? Theme { get; set; }
+    /// <summary>Summary title shown in checkpoint listings.</summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = string.Empty;
+}
 
-    /// <summary>IANA timezone, e.g. 'America/New_York'.</summary>
-    [JsonPropertyName("timeZone")]
-    public string? TimeZone { get; set; }
+/// <summary>Rollback point for local workspace summaries.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class WorkspacesTruncateSummariesRequest
+{
+    /// <summary>Number of newest summaries to keep.</summary>
+    [JsonPropertyName("keepCount")]
+    public long KeepCount { get; set; }
 
-    /// <summary>Host application identifier.</summary>
-    [JsonPropertyName("userAgent")]
-    public string? UserAgent { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Current host context advertised to MCP App guests.</summary>
+/// <summary>Autopilot objective file content, or null when missing.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAppsHostContext
+public sealed class WorkspacesReadAutopilotObjectiveResult
 {
-    /// <summary>Current host context.</summary>
-    [JsonPropertyName("context")]
-    public McpAppsHostContextDetails Context { get => field ??= new(); set; }
+    /// <summary>Autopilot objective file content, or null when missing.</summary>
+    [JsonPropertyName("content")]
+    public string? Content { get; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionMcpAppsGetHostContextRequest
+internal sealed class SessionWorkspacesReadAutopilotObjectiveRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Capability negotiation snapshot.</summary>
+/// <summary>Result of writing the autopilot objective file.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAppsDiagnoseCapability
+public sealed class WorkspacesWriteAutopilotObjectiveResult
 {
-    /// <summary>Whether the runtime advertises `extensions.io.modelcontextprotocol/ui` to MCP servers.</summary>
-    [JsonPropertyName("advertised")]
-    public bool Advertised { get; set; }
-
-    /// <summary>Whether the MCP_APPS feature flag (or COPILOT_MCP_APPS env override) is on.</summary>
-    [JsonPropertyName("featureFlagEnabled")]
-    public bool FeatureFlagEnabled { get; set; }
-
-    /// <summary>Whether the session has the `mcp-apps` capability.</summary>
-    [JsonPropertyName("sessionHasMcpApps")]
-    public bool SessionHasMcpApps { get; set; }
+    /// <summary>Filesystem operation performed.</summary>
+    [JsonPropertyName("operation")]
+    public string Operation { get; set; } = string.Empty;
 }
 
-/// <summary>What the server returned for this session.</summary>
+/// <summary>Autopilot objective file content to persist.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAppsDiagnoseServer
+internal sealed class WorkspacesWriteAutopilotObjectiveRequest
 {
-    /// <summary>Whether the named server is currently connected.</summary>
-    [JsonPropertyName("connected")]
-    public bool Connected { get; set; }
-
-    /// <summary>Up to 5 tool names with `_meta.ui` for quick inspection.</summary>
-    [JsonPropertyName("sampleToolNames")]
-    public IList<string> SampleToolNames { get => field ??= []; set; }
-
-    /// <summary>Total tools returned by the server's tools/list.</summary>
-    [JsonPropertyName("toolCount")]
-    public double ToolCount { get; set; }
+    /// <summary>Autopilot objective file content.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <summary>Tools whose `_meta.ui` is populated (resourceUri and/or visibility set).</summary>
-    [JsonPropertyName("toolsWithUiMeta")]
-    public double ToolsWithUiMeta { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Diagnostic snapshot of MCP Apps wiring for the named server.</summary>
+/// <summary>Result of deleting the autopilot objective file.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpAppsDiagnoseResult
+public sealed class WorkspacesDeleteAutopilotObjectiveResult
 {
-    /// <summary>Capability negotiation snapshot.</summary>
-    [JsonPropertyName("capability")]
-    public McpAppsDiagnoseCapability Capability { get => field ??= new(); set; }
-
-    /// <summary>What the server returned for this session.</summary>
-    [JsonPropertyName("server")]
-    public McpAppsDiagnoseServer Server { get => field ??= new(); set; }
+    /// <summary>True when a file was deleted.</summary>
+    [JsonPropertyName("deleted")]
+    public bool Deleted { get; set; }
 }
 
-/// <summary>MCP server to diagnose MCP Apps wiring for.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpAppsDiagnoseRequest
+internal sealed class SessionWorkspacesDeleteAutopilotObjectiveRequest
 {
-    /// <summary>MCP server to probe.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>MCP resource content with URI, optional MIME type, text or base64 blob, and resource metadata.</summary>
+/// <summary>Whether the autopilot objective file exists.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpResourceContent
+public sealed class WorkspacesAutopilotObjectiveExistsResult
 {
-    /// <summary>Resource-level metadata (CSP, permissions, etc.).</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
+    /// <summary>True when the objective file exists.</summary>
+    [JsonPropertyName("exists")]
+    public bool Exists { get; set; }
+}
 
-    /// <summary>Base64-encoded binary content.</summary>
-    [JsonPropertyName("blob")]
-    public string? Blob { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionWorkspacesAutopilotObjectiveExistsRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>MIME type of the content.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+/// <summary>RPC data type for WorkspacesSaveLargePasteResultSaved operations.</summary>
+public sealed class WorkspacesSaveLargePasteResultSaved
+{
+    /// <summary>Filename within the workspace files directory.</summary>
+    [JsonPropertyName("filename")]
+    public string Filename { get; set; } = string.Empty;
 
-    /// <summary>Text content (e.g. HTML).</summary>
-    [JsonPropertyName("text")]
-    public string? Text { get; set; }
+    /// <summary>Absolute filesystem path to the saved paste file.</summary>
+    [JsonPropertyName("filePath")]
+    public string FilePath { get; set; } = string.Empty;
 
-    /// <summary>The resource URI.</summary>
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
+    /// <summary>Size of the saved file in bytes.</summary>
+    [JsonPropertyName("sizeBytes")]
+    public long SizeBytes { get; set; }
 }
 
-/// <summary>Resource contents returned by the MCP server.</summary>
+/// <summary>Descriptor for the saved paste file, or null when the workspace is unavailable.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpResourcesReadResult
+public sealed class WorkspacesSaveLargePasteResult
 {
-    /// <summary>Resource contents returned by the server.</summary>
-    [JsonPropertyName("contents")]
-    public IList<McpResourceContent> Contents { get => field ??= []; set; }
+    /// <summary>Saved-paste descriptor, or null when the workspace is unavailable (e.g. CCA runtime, non-infinite sessions, remote sessions).</summary>
+    [JsonPropertyName("saved")]
+    public WorkspacesSaveLargePasteResultSaved? Saved { get; set; }
 }
 
-/// <summary>MCP server and resource URI to fetch.</summary>
+/// <summary>Pasted content to save as a UTF-8 file in the session workspace.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpResourcesReadRequest
+internal sealed class WorkspacesSaveLargePasteRequest
 {
-    /// <summary>Name of the MCP server hosting the resource.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Pasted content to save as a UTF-8 file.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Resource URI.</summary>
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
 }
 
-/// <summary>Standard MCP resource annotations plus preserved non-standard annotation fields.</summary>
+/// <summary>A single changed file and its unified diff.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpResourceAnnotations
+public sealed class WorkspaceDiffFileChange
 {
-    /// <summary>Server-provided non-standard annotation fields preserved from the MCP response.</summary>
-    [JsonPropertyName("additionalProperties")]
-    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+    /// <summary>Type of change represented by this file diff.</summary>
+    [JsonPropertyName("changeType")]
+    public WorkspaceDiffFileChangeType ChangeType { get; set; }
 
-    /// <summary>Intended audience roles for this resource.</summary>
-    [JsonPropertyName("audience")]
-    public IList<string>? Audience { get; set; }
+    /// <summary>Unified diff content for the file. Empty when the diff was truncated.</summary>
+    [JsonPropertyName("diff")]
+    public string Diff { get; set; } = string.Empty;
 
-    /// <summary>Last-modified timestamp hint.</summary>
-    [JsonPropertyName("lastModified")]
-    public string? LastModified { get; set; }
+    /// <summary>Whether the diff content was omitted because it exceeded the per-file size limit.</summary>
+    [JsonPropertyName("isTruncated")]
+    public bool? IsTruncated { get; set; }
 
-    /// <summary>Priority hint for model/client use.</summary>
-    [JsonPropertyName("priority")]
-    public double? Priority { get; set; }
+    /// <summary>Original file path for renamed files.</summary>
+    [JsonPropertyName("oldPath")]
+    public string? OldPath { get; set; }
+
+    /// <summary>Path to the changed file, relative to the workspace root when the file lives under it. A file changed outside the workspace root keeps a `../`-relative path, or an absolute path when no relative path exists (for example a different Windows drive).</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 }
 
-/// <summary>A resource icon descriptor plus preserved non-standard icon fields.</summary>
+/// <summary>Workspace diff result for the requested mode.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpResourceIcon
+public sealed class WorkspaceDiffResult
 {
-    /// <summary>Server-provided non-standard icon fields preserved from the MCP response.</summary>
-    [JsonPropertyName("additionalProperties")]
-    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+    /// <summary>Default branch used for a branch diff, when branch mode was requested.</summary>
+    [JsonPropertyName("baseBranch")]
+    public string? BaseBranch { get; set; }
 
-    /// <summary>Icon MIME type, when known.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+    /// <summary>Changed files and their unified diffs.</summary>
+    [JsonPropertyName("changes")]
+    public IList<WorkspaceDiffFileChange> Changes { get => field ??= []; set; }
 
-    /// <summary>Icon sizes hint.</summary>
-    [JsonPropertyName("sizes")]
-    public string? Sizes { get; set; }
+    /// <summary>Whether the requested diff fell back to unstaged changes, either because branch diff failed or session diff was unavailable.</summary>
+    [JsonPropertyName("isFallback")]
+    public bool IsFallback { get; set; }
 
-    /// <summary>Icon URI.</summary>
-    [JsonPropertyName("src")]
-    public string Src { get; set; } = string.Empty;
+    /// <summary>Effective mode used for the returned changes.</summary>
+    [JsonPropertyName("mode")]
+    public WorkspaceDiffMode Mode { get; set; }
 
-    /// <summary>Theme hint for this icon.</summary>
-    [JsonPropertyName("theme")]
-    public string? Theme { get; set; }
+    /// <summary>Diff mode requested by the client.</summary>
+    [JsonPropertyName("requestedMode")]
+    public WorkspaceDiffMode RequestedMode { get; set; }
+
+    /// <summary>Why the session diff could not be produced, when applicable. Set only when `session` mode was requested and `isFallback` is true, so a client can tell the permanent `file-change-tracking-disabled` apart from the transient `session-busy`, which the same request answers once the session settles. Never set for `unstaged` or `branch` mode, and never `unsupported-remote-session`: a remote session's captures live on its own host, so a `session`-mode diff is rejected for one rather than answered with a controller-side fallback.</summary>
+    [JsonPropertyName("unavailableReason")]
+    public HistoryRewindUnavailableReason? UnavailableReason { get; set; }
 }
 
-/// <summary>An MCP resource descriptor (spec `Resource`): URI, name, and optional title, description, MIME type, size, icons, annotations, and metadata. Server-provided fields outside the standard descriptor shape are exposed under `additionalProperties`.</summary>
+/// <summary>Parameters for computing a workspace diff.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpResource
+internal sealed class WorkspacesDiffRequest
 {
-    /// <summary>Resource-level metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
+    /// <summary>When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.</summary>
+    [JsonPropertyName("ignoreWhitespace")]
+    public bool? IgnoreWhitespace { get; set; }
 
-    /// <summary>Server-provided non-standard descriptor fields preserved from the MCP response.</summary>
-    [JsonPropertyName("additionalProperties")]
-    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+    /// <summary>Diff mode requested by the client.</summary>
+    [JsonPropertyName("mode")]
+    public WorkspaceDiffMode Mode { get; set; }
 
-    /// <summary>Model/client annotations associated with this resource.</summary>
-    [JsonPropertyName("annotations")]
-    public McpResourceAnnotations? Annotations { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Optional description of what this resource represents.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+/// <summary>Characters that, when typed in the composer, should trigger a `completions.request`. Empty when the session has no host-driven completions (e.g. local sessions, or a relay host that does not advertise `completionTriggerCharacters`).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CompletionsGetTriggerCharactersResult
+{
+    /// <summary>Trigger characters advertised by the host (e.g. `["@", "#"]`). Empty disables host-driven completions for the session.</summary>
+    [JsonPropertyName("triggerCharacters")]
+    public IList<string> TriggerCharacters { get => field ??= []; set; }
+}
 
-    /// <summary>Icons associated with this resource.</summary>
-    [JsonPropertyName("icons")]
-    public IList<McpResourceIcon>? Icons { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionCompletionsGetTriggerCharactersRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>MIME type of the resource, if known.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+/// <summary>A single host-driven completion. Accepting an item replaces `[rangeStart, rangeEnd)` (UTF-16 code units) in the composer with `insertText`; when the range is absent, the active token around the cursor is replaced.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionCompletionItem
+{
+    /// <summary>Text spliced into the composer when the item is accepted.</summary>
+    [JsonPropertyName("insertText")]
+    public string InsertText { get; set; } = string.Empty;
 
-    /// <summary>The programmatic name of the resource.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Render-kind hint for the picker row (e.g. `"document"`, `"directory"`), derived from the host's display kind.</summary>
+    [JsonPropertyName("kind")]
+    public string? Kind { get; set; }
 
-    /// <summary>Resource size in bytes, when known.</summary>
-    [JsonPropertyName("size")]
-    public long? Size { get; set; }
+    /// <summary>Primary display label for the picker row. Falls back to `insertText` when absent.</summary>
+    [JsonPropertyName("label")]
+    public string? Label { get; set; }
 
-    /// <summary>Optional human-readable display title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>End (exclusive) of the replacement range in `text`, in UTF-16 code units.</summary>
+    [JsonPropertyName("rangeEnd")]
+    public long? RangeEnd { get; set; }
 
-    /// <summary>The resource URI (e.g. ui://... or file:///...).</summary>
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
+    /// <summary>Start of the replacement range in `text`, in UTF-16 code units.</summary>
+    [JsonPropertyName("rangeStart")]
+    public long? RangeStart { get; set; }
 }
 
-/// <summary>One page of resources advertised by the named MCP server.</summary>
+/// <summary>Host-driven completion items for the current composer input. Empty when the host returns no items or does not support completions.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpResourcesListResult
+public sealed class CompletionsRequestResult
 {
-    /// <summary>Opaque cursor for the next page, if the server has more resources.</summary>
-    [JsonPropertyName("nextCursor")]
-    public string? NextCursor { get; set; }
-
-    /// <summary>Resources advertised by the server (proxied MCP `resources/list`).</summary>
-    [JsonPropertyName("resources")]
-    public IList<McpResource> Resources { get => field ??= []; set; }
+    /// <summary>Completion items in host-ranked order.</summary>
+    [JsonPropertyName("items")]
+    public IList<SessionCompletionItem> Items { get => field ??= []; set; }
 }
 
-/// <summary>MCP server whose resources to enumerate.</summary>
+/// <summary>Request host-driven completions for the current composer input.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpResourcesListRequest
+internal sealed class CompletionsRequestRequest
 {
-    /// <summary>Opaque MCP pagination cursor from a prior `nextCursor` value.</summary>
-    [JsonPropertyName("cursor")]
-    public string? Cursor { get; set; }
-
-    /// <summary>Name of the MCP server whose resources to enumerate.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Cursor offset within `text`, in UTF-16 code units.</summary>
+    [JsonPropertyName("offset")]
+    public long Offset { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>The full composed composer input.</summary>
+    [JsonPropertyName("text")]
+    public string Text { get; set; } = string.Empty;
 }
 
-/// <summary>An MCP resource template descriptor (spec `ResourceTemplate`): an RFC 6570 URI template, name, and optional title, description, MIME type, icons, annotations, and metadata. Server-provided fields outside the standard descriptor shape are exposed under `additionalProperties`.</summary>
+/// <summary>Instruction sources loaded for the session, in merge order.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpResourceTemplate
+public sealed class InstructionsGetSourcesResult
 {
-    /// <summary>Resource-template-level metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
-
-    /// <summary>Server-provided non-standard descriptor fields preserved from the MCP response.</summary>
-    [JsonPropertyName("additionalProperties")]
-    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
-
-    /// <summary>Model/client annotations associated with this template.</summary>
-    [JsonPropertyName("annotations")]
-    public McpResourceAnnotations? Annotations { get; set; }
-
-    /// <summary>Optional description of what this template is for.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Instruction sources for the session.</summary>
+    [JsonPropertyName("sources")]
+    public IList<InstructionSource> Sources { get => field ??= []; set; }
+}
 
-    /// <summary>Icons associated with resources matching this template.</summary>
-    [JsonPropertyName("icons")]
-    public IList<McpResourceIcon>? Icons { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionInstructionsGetSourcesRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>MIME type for resources matching this template, if uniform.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+/// <summary>Indicates whether fleet mode was successfully activated.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class FleetStartResult
+{
+    /// <summary>Whether fleet mode was successfully activated.</summary>
+    [JsonPropertyName("started")]
+    public bool Started { get; set; }
+}
 
-    /// <summary>The programmatic name of the resource template.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+/// <summary>Optional user prompt to combine with the fleet orchestration instructions.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class FleetStartRequest
+{
+    /// <summary>Optional user prompt to combine with fleet instructions.</summary>
+    [JsonPropertyName("prompt")]
+    public string? Prompt { get; set; }
 
-    /// <summary>Optional human-readable display title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>An RFC 6570 URI template for constructing resource URIs.</summary>
-    [JsonPropertyName("uriTemplate")]
-    public string UriTemplate { get; set; } = string.Empty;
+/// <summary>Agents available to the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class AgentList
+{
+    /// <summary>Available agents.</summary>
+    [JsonPropertyName("agents")]
+    public IList<AgentInfo> Agents { get => field ??= []; set; }
 }
 
-/// <summary>One page of resource templates advertised by the named MCP server.</summary>
+/// <summary>RPC data type for SessionAgentList operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class McpResourcesListTemplatesResult
+public sealed class SessionAgentListRequest
 {
-    /// <summary>Opaque cursor for the next page, if the server has more resource templates.</summary>
-    [JsonPropertyName("nextCursor")]
-    public string? NextCursor { get; set; }
+    /// <summary>When true, request the session's configured built-in agents alongside custom agents. Listing applies feature, context, inclusion, exclusion, and user-disabled-agent policy, but does not evaluate transient invocation requirements such as model availability. Built-in metadata may be omitted when the session cannot project it, such as a relay session.</summary>
+    [JsonPropertyName("includeBuiltInAgents")]
+    public bool? IncludeBuiltInAgents { get; set; }
 
-    /// <summary>Resource templates advertised by the server (proxied MCP `resources/templates/list`).</summary>
-    [JsonPropertyName("resourceTemplates")]
-    public IList<McpResourceTemplate> ResourceTemplates { get => field ??= []; set; }
+    /// <summary>When true, request authored base prompt text on each AgentInfo. Prompt text may be omitted when unavailable, such as for agents projected through a relay session.</summary>
+    [JsonPropertyName("includePrompt")]
+    public bool? IncludePrompt { get; set; }
 }
 
-/// <summary>MCP server whose resource templates to enumerate.</summary>
+/// <summary>RPC data type for SessionAgentListRequestWithSession operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class McpResourcesListTemplatesRequest
+internal sealed class SessionAgentListRequestWithSession
 {
-    /// <summary>Opaque MCP pagination cursor from a prior `nextCursor` value.</summary>
-    [JsonPropertyName("cursor")]
-    public string? Cursor { get; set; }
+    /// <summary>When true, request the session's configured built-in agents alongside custom agents. Listing applies feature, context, inclusion, exclusion, and user-disabled-agent policy, but does not evaluate transient invocation requirements such as model availability. Built-in metadata may be omitted when the session cannot project it, such as a relay session.</summary>
+    [JsonPropertyName("includeBuiltInAgents")]
+    public bool? IncludeBuiltInAgents { get; set; }
 
-    /// <summary>Name of the MCP server whose resource templates to enumerate.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>When true, request authored base prompt text on each AgentInfo. Prompt text may be omitted when unavailable, such as for agents projected through a relay session.</summary>
+    [JsonPropertyName("includePrompt")]
+    public bool? IncludePrompt { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Session plugin metadata, with name, marketplace, optional version, and enabled state.</summary>
+/// <summary>An in-memory authored prompt override for an available agent.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class Plugin
+internal sealed class AgentSetPromptRequest
 {
-    /// <summary>Whether the plugin is currently enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Marketplace the plugin came from.</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
+    /// <summary>Stable effective agent id. Plugin namespace separators are normalized.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Replacement authored prompt. Empty text is valid.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Installed version.</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Plugins installed for the session, with their enabled state and version metadata.</summary>
+/// <summary>The currently selected custom agent, or null when using the default agent.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PluginList
+public sealed class AgentGetCurrentResult
 {
-    /// <summary>Installed plugins.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<Plugin> Plugins { get => field ??= []; set; }
+    /// <summary>Currently selected custom agent, or null if using the default agent.</summary>
+    [JsonPropertyName("agent")]
+    public AgentInfo? Agent { get; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionPluginsListRequest
+internal sealed class SessionAgentGetCurrentRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for SessionPluginsReload operations.</summary>
+/// <summary>The newly selected custom agent.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionPluginsReloadRequest
+public sealed class AgentSelectResult
 {
-    /// <summary>When true, skip repo-level hooks during the hook reload. Use before folder trust is confirmed; load them post-trust via `sessions.loadDeferredRepoHooks`.</summary>
-    [JsonPropertyName("deferRepoHooks")]
-    public bool? DeferRepoHooks { get; set; }
-
-    /// <summary>Re-run custom-agent discovery after refreshing plugins. Defaults to true.</summary>
-    [JsonPropertyName("reloadCustomAgents")]
-    public bool? ReloadCustomAgents { get; set; }
-
-    /// <summary>Re-discover and relaunch subprocess extensions (including plugin-shipped extensions) after refreshing plugins. Defaults to true. Has no effect when the session has no active extension controller (e.g. extensions were not requested for the session).</summary>
-    [JsonPropertyName("reloadExtensions")]
-    public bool? ReloadExtensions { get; set; }
-
-    /// <summary>Re-load user, plugin, and (subject to `deferRepoHooks`) repo hooks. Defaults to true. Has no effect when the host has not registered a hook reloader (e.g. remote sessions).</summary>
-    [JsonPropertyName("reloadHooks")]
-    public bool? ReloadHooks { get; set; }
-
-    /// <summary>Reload MCP server connections after refreshing plugins. Defaults to true.</summary>
-    [JsonPropertyName("reloadMcp")]
-    public bool? ReloadMcp { get; set; }
+    /// <summary>The newly selected custom agent.</summary>
+    [JsonPropertyName("agent")]
+    public AgentInfo Agent { get => field ??= new(); set; }
 }
 
-/// <summary>RPC data type for SessionPluginsReloadRequestWithSession operations.</summary>
+/// <summary>Name of the custom agent to select for subsequent turns.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionPluginsReloadRequestWithSession
+internal sealed class AgentSelectRequest
 {
-    /// <summary>When true, skip repo-level hooks during the hook reload. Use before folder trust is confirmed; load them post-trust via `sessions.loadDeferredRepoHooks`.</summary>
-    [JsonPropertyName("deferRepoHooks")]
-    public bool? DeferRepoHooks { get; set; }
-
-    /// <summary>Re-run custom-agent discovery after refreshing plugins. Defaults to true.</summary>
-    [JsonPropertyName("reloadCustomAgents")]
-    public bool? ReloadCustomAgents { get; set; }
+    /// <summary>Name of the custom agent to select.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Re-discover and relaunch subprocess extensions (including plugin-shipped extensions) after refreshing plugins. Defaults to true. Has no effect when the session has no active extension controller (e.g. extensions were not requested for the session).</summary>
-    [JsonPropertyName("reloadExtensions")]
-    public bool? ReloadExtensions { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Re-load user, plugin, and (subject to `deferRepoHooks`) repo hooks. Defaults to true. Has no effect when the host has not registered a hook reloader (e.g. remote sessions).</summary>
-    [JsonPropertyName("reloadHooks")]
-    public bool? ReloadHooks { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionAgentDeselectRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Reload MCP server connections after refreshing plugins. Defaults to true.</summary>
-    [JsonPropertyName("reloadMcp")]
-    public bool? ReloadMcp { get; set; }
+/// <summary>Custom agents available to the session after reloading definitions from disk.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class AgentReloadResult
+{
+    /// <summary>Reloaded custom agents.</summary>
+    [JsonPropertyName("agents")]
+    public IList<AgentInfo> Agents { get => field ??= []; set; }
+}
 
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionAgentReloadRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.</summary>
+/// <summary>Identifier assigned to the newly started background agent task.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ProviderSessionToken
+public sealed class TasksStartAgentResult
 {
-    /// <summary>When the token expires, if known. Callers should refresh by calling `getEndpoint` again before this time, or reactively on any 401/403 response from `baseUrl`.</summary>
-    [JsonPropertyName("expiresAt")]
-    public DateTimeOffset? ExpiresAt { get; set; }
+    /// <summary>Generated agent ID for the background task.</summary>
+    [JsonPropertyName("agentId")]
+    public string AgentId { get; set; } = string.Empty;
+}
 
-    /// <summary>HTTP header name the token must be sent under.</summary>
-    [JsonPropertyName("header")]
-    public string Header { get; set; } = string.Empty;
+/// <summary>Agent type, prompt, name, and optional description and model override for the new task.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class TasksStartAgentRequest
+{
+    /// <summary>Type of agent to start (e.g., 'explore', 'task', 'general-purpose').</summary>
+    [JsonPropertyName("agentType")]
+    public string AgentType { get; set; } = string.Empty;
 
-    /// <summary>The model the token is bound to, when applicable. When set, the token is only valid for requests against this model.</summary>
+    /// <summary>Short description of the task.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Optional model override.</summary>
     [JsonPropertyName("model")]
     public string? Model { get; set; }
 
-    /// <summary>The short-lived token value.</summary>
-    [JsonPropertyName("token")]
-    public string Token { get; set; } = string.Empty;
+    /// <summary>Friendly, non-unique name used when displaying the agent.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Task prompt for the agent.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>A snapshot of the provider endpoint the session is currently configured to talk to.</summary>
-[Experimental(Diagnostics.Experimental)]
+/// <summary>Tracked task union returned by task APIs, containing either an agent task or a shell task.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(TaskInfoAgent), "agent")]
+[JsonDerivedType(typeof(TaskInfoShell), "shell")]
+public partial class TaskInfo
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
+}
+
+
+/// <summary>Tracked background agent task metadata, including IDs, status, timing, agent type, prompt, model, result, and latest response.</summary>
+/// <remarks>The <c>agent</c> variant of <see cref="TaskInfo"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class TaskInfoAgent : TaskInfo
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "agent";
+
+    /// <summary>ISO 8601 timestamp when the current active period began.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("activeStartedAt")]
+    public DateTimeOffset? ActiveStartedAt { get; set; }
+
+    /// <summary>Accumulated active execution time in milliseconds.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("activeTimeMs")]
+    public TimeSpan? ActiveTime { get; set; }
+
+    /// <summary>Type of agent running this task.</summary>
+    [JsonPropertyName("agentType")]
+    public required string AgentType { get; set; }
+
+    /// <summary>Whether the task is currently in the original sync wait and can be moved to background mode. False once it is already backgrounded, idle, finished, or no longer has a promotable sync waiter.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("canPromoteToBackground")]
+    public bool? CanPromoteToBackground { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the task finished.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("completedAt")]
+    public DateTimeOffset? CompletedAt { get; set; }
+
+    /// <summary>Short description of the task.</summary>
+    [JsonPropertyName("description")]
+    public required string Description { get; set; }
+
+    /// <summary>Friendly, non-unique name intended for display.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
+
+    /// <summary>Error message when the task failed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Whether task execution is synchronously awaited or managed in the background.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("executionMode")]
+    public TaskExecutionMode? ExecutionMode { get; set; }
+
+    /// <summary>Unique task identifier.</summary>
+    [JsonPropertyName("id")]
+    public required string Id { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the agent entered idle state.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("idleSince")]
+    public DateTimeOffset? IdleSince { get; set; }
+
+    /// <summary>Most recent response text from the agent.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("latestResponse")]
+    public string? LatestResponse { get; set; }
+
+    /// <summary>Requested model override for the task when specified.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+
+    /// <summary>Most recent prompt delivered to the agent. Updated whenever the agent receives a follow-up message.</summary>
+    [JsonPropertyName("prompt")]
+    public required string Prompt { get; set; }
+
+    /// <summary>Runtime model resolved for the task when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("resolvedModel")]
+    public string? ResolvedModel { get; set; }
+
+    /// <summary>Result text from the task when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("result")]
+    public string? Result { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the task was started.</summary>
+    [JsonPropertyName("startedAt")]
+    public required DateTimeOffset StartedAt { get; set; }
+
+    /// <summary>Current lifecycle status of the task.</summary>
+    [JsonPropertyName("status")]
+    public required TaskStatus Status { get; set; }
+
+    /// <summary>Tool call ID associated with this agent task.</summary>
+    [JsonPropertyName("toolCallId")]
+    public required string ToolCallId { get; set; }
+}
+
+/// <summary>Tracked shell task metadata, including ID, command, status, timing, attachment/execution mode, log path, and PID.</summary>
+/// <remarks>The <c>shell</c> variant of <see cref="TaskInfo"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class TaskInfoShell : TaskInfo
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "shell";
+
+    /// <summary>Whether the shell runs inside a managed PTY session or as an independent background process.</summary>
+    [JsonPropertyName("attachmentMode")]
+    public required TaskShellInfoAttachmentMode AttachmentMode { get; set; }
+
+    /// <summary>Whether this shell task can be promoted to background mode.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("canPromoteToBackground")]
+    public bool? CanPromoteToBackground { get; set; }
+
+    /// <summary>Command being executed.</summary>
+    [JsonPropertyName("command")]
+    public required string Command { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the task finished.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("completedAt")]
+    public DateTimeOffset? CompletedAt { get; set; }
+
+    /// <summary>Short description of the task.</summary>
+    [JsonPropertyName("description")]
+    public required string Description { get; set; }
+
+    /// <summary>Whether task execution is synchronously awaited or managed in the background.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("executionMode")]
+    public TaskExecutionMode? ExecutionMode { get; set; }
+
+    /// <summary>Unique task identifier.</summary>
+    [JsonPropertyName("id")]
+    public required string Id { get; set; }
+
+    /// <summary>Path to the detached shell log, when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("logPath")]
+    public string? LogPath { get; set; }
+
+    /// <summary>Process ID when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("pid")]
+    public long? Pid { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the task was started.</summary>
+    [JsonPropertyName("startedAt")]
+    public required DateTimeOffset StartedAt { get; set; }
+
+    /// <summary>Current lifecycle status of the task.</summary>
+    [JsonPropertyName("status")]
+    public required TaskStatus Status { get; set; }
+}
+
+/// <summary>Background tasks currently tracked by the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TaskList
+{
+    /// <summary>Currently tracked tasks.</summary>
+    [JsonPropertyName("tasks")]
+    public IList<TaskInfo> Tasks { get => field ??= []; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionTasksListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Refresh metadata for any detached background shells the runtime knows about. Use after a long pause to pick up exit/output state for shells running outside the agent loop.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TasksRefreshResult
+{
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionTasksRefreshRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Wait until all in-flight background tasks (agents + shells) and any follow-up turns scheduled by their completions have settled. Returns when the runtime is fully drained or after an internal timeout (default 10 minutes; configurable via COPILOT_TASK_WAIT_TIMEOUT_SECONDS).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TasksWaitForPendingResult
+{
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionTasksWaitForPendingRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Polymorphic base type discriminated by <c>type</c>.</summary>
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(TasksGetProgressResultProgressAgent), "agent")]
+[JsonDerivedType(typeof(TasksGetProgressResultProgressShell), "shell")]
+public partial class TasksGetProgressResultProgress
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
+}
+
+
+/// <summary>Timestamped display line for task progress output or recent agent activity.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TaskProgressLine
+{
+    /// <summary>Display message, e.g., "▸ bash", "✓ edit src/foo.ts".</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+
+    /// <summary>ISO 8601 timestamp when this event occurred.</summary>
+    [JsonPropertyName("timestamp")]
+    public DateTimeOffset Timestamp { get; set; }
+}
+
+/// <summary>Progress snapshot for an agent task, with recent activity lines and optional latest intent.</summary>
+/// <remarks>The <c>agent</c> variant of <see cref="TasksGetProgressResultProgress"/>.</remarks>
+public partial class TasksGetProgressResultProgressAgent : TasksGetProgressResultProgress
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "agent";
+
+    /// <summary>The most recent intent reported by the agent.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("latestIntent")]
+    public string? LatestIntent { get; set; }
+
+    /// <summary>Recent tool execution events converted to display lines.</summary>
+    [JsonPropertyName("recentActivity")]
+    public required IList<TaskProgressLine> RecentActivity { get; set; }
+}
+
+/// <summary>Progress snapshot for a shell task, with recent stdout/stderr output and optional process ID.</summary>
+/// <remarks>The <c>shell</c> variant of <see cref="TasksGetProgressResultProgress"/>.</remarks>
+public partial class TasksGetProgressResultProgressShell : TasksGetProgressResultProgress
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "shell";
+
+    /// <summary>Process ID when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("pid")]
+    public long? Pid { get; set; }
+
+    /// <summary>Recent stdout/stderr lines from the running shell command.</summary>
+    [JsonPropertyName("recentOutput")]
+    public required string RecentOutput { get; set; }
+}
+
+/// <summary>Progress information for the task, or null when no task with that ID is tracked.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TasksGetProgressResult
+{
+    /// <summary>Progress information for the task, discriminated by type. Returns null when no task with this ID is currently tracked.</summary>
+    [JsonPropertyName("progress")]
+    public TasksGetProgressResultProgress? Progress { get; set; }
+}
+
+/// <summary>Identifier of the background task to fetch progress for.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class TasksGetProgressRequest
+{
+    /// <summary>Task identifier (agent ID or shell ID).</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>The first sync-waiting task that can currently be promoted to background mode.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TasksGetCurrentPromotableResult
+{
+    /// <summary>The first sync-waiting task (agent first, then shell) that can currently be promoted to background mode. Omitted if no such task exists. The returned task is guaranteed to have executionMode='sync' and canPromoteToBackground=true at the time of the call.</summary>
+    [JsonPropertyName("task")]
+    public TaskInfo? Task { get; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionTasksGetCurrentPromotableRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the task was successfully promoted to background mode.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TasksPromoteToBackgroundResult
+{
+    /// <summary>Whether the task was successfully promoted to background mode.</summary>
+    [JsonPropertyName("promoted")]
+    public bool Promoted { get; set; }
+}
+
+/// <summary>Identifier of the task to promote to background mode.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class TasksPromoteToBackgroundRequest
+{
+    /// <summary>Task identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>The promoted task as it now exists in background mode, omitted if no promotable task was waiting.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TasksPromoteCurrentToBackgroundResult
+{
+    /// <summary>The promoted task as it now exists in background mode, omitted if no promotable task was waiting. Atomic operation: avoids the race window of getCurrentPromotable + promoteToBackground.</summary>
+    [JsonPropertyName("task")]
+    public TaskInfo? Task { get; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionTasksPromoteCurrentToBackgroundRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the background task was successfully cancelled.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TasksCancelResult
+{
+    /// <summary>Whether the task was successfully cancelled.</summary>
+    [JsonPropertyName("cancelled")]
+    public bool Cancelled { get; set; }
+}
+
+/// <summary>Identifier of the background task to cancel.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class TasksCancelRequest
+{
+    /// <summary>Task identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the task was removed. False when the task does not exist or is still running/idle.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TasksRemoveResult
+{
+    /// <summary>Whether the task was removed. Returns false if the task does not exist or is still running/idle (cancel it first).</summary>
+    [JsonPropertyName("removed")]
+    public bool Removed { get; set; }
+}
+
+/// <summary>Identifier of the completed or cancelled task to remove from tracking.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class TasksRemoveRequest
+{
+    /// <summary>Task identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the message was delivered, with an error message when delivery failed.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TasksSendMessageResult
+{
+    /// <summary>Error message if delivery failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Whether the message was successfully delivered or steered.</summary>
+    [JsonPropertyName("sent")]
+    public bool Sent { get; set; }
+}
+
+/// <summary>Identifier of the target agent task, message content, and optional sender agent ID.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class TasksSendMessageRequest
+{
+    /// <summary>Agent ID of the sender, if sent on behalf of another agent.</summary>
+    [JsonPropertyName("fromAgentId")]
+    public string? FromAgentId { get; set; }
+
+    /// <summary>Agent task identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Message content to send to the agent.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Skill metadata available to a session, with name, description, source, enabled/invocable state, path, plugin, and argument hint.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class Skill
+{
+    /// <summary>Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field.</summary>
+    [JsonPropertyName("argumentHint")]
+    public string? ArgumentHint { get; set; }
+
+    /// <summary>Canonical slash command name used to invoke the skill, without the leading '/'.</summary>
+    [JsonPropertyName("commandName")]
+    public string? CommandName { get; set; }
+
+    /// <summary>Description of what the skill does.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Whether the skill is currently enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>Unique identifier for the skill.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Absolute path to the skill file.</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
+
+    /// <summary>Name of the plugin that provides the skill, when source is 'plugin'.</summary>
+    [JsonPropertyName("pluginName")]
+    public string? PluginName { get; set; }
+
+    /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
+    [JsonPropertyName("source")]
+    public SkillSource Source { get; set; }
+
+    /// <summary>Whether the skill can be invoked by the user as a slash command.</summary>
+    [JsonPropertyName("userInvocable")]
+    public bool UserInvocable { get; set; }
+}
+
+/// <summary>Skills available to the session, with their enabled state.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SkillList
+{
+    /// <summary>Available skills.</summary>
+    [JsonPropertyName("skills")]
+    public IList<Skill> Skills { get => field ??= []; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionSkillsListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Skill invocation record with name, path, content, allowed tools, and turn number.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SkillsInvokedSkill
+{
+    /// <summary>Tools that should be auto-approved when this skill is active, captured at invocation time.</summary>
+    [JsonPropertyName("allowedTools")]
+    public IList<string>? AllowedTools { get; set; }
+
+    /// <summary>Full content of the skill file.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
+
+    /// <summary>Turn number when the skill was invoked.</summary>
+    [JsonPropertyName("invokedAtTurn")]
+    public long InvokedAtTurn { get; set; }
+
+    /// <summary>Unique identifier for the skill.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Path to the SKILL.md file.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+}
+
+/// <summary>Skills invoked during this session, ordered by invocation time (most recent last).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SkillsGetInvokedResult
+{
+    /// <summary>Skills invoked during this session, ordered by invocation time (most recent last).</summary>
+    [JsonPropertyName("skills")]
+    public IList<SkillsInvokedSkill> Skills { get => field ??= []; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionSkillsGetInvokedRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Name of the skill to enable for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SkillsEnableRequest
+{
+    /// <summary>Name of the skill to enable.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Name of the skill to disable for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SkillsDisableRequest
+{
+    /// <summary>Name of the skill to disable.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Diagnostics from reloading skill definitions, with warnings and errors as separate lists.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SkillsLoadDiagnostics
+{
+    /// <summary>Errors emitted while loading skills (e.g. skills that failed to load entirely).</summary>
+    [JsonPropertyName("errors")]
+    public IList<string> Errors { get => field ??= []; set; }
+
+    /// <summary>Warnings emitted while loading skills (e.g. skills that loaded but had issues).</summary>
+    [JsonPropertyName("warnings")]
+    public IList<string> Warnings { get => field ??= []; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionSkillsReloadRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionSkillsEnsureLoadedRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Recorded MCP server connection failure.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpServerFailureInfo
+{
+    /// <summary>Failure message produced when the MCP server connection failed.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+
+    /// <summary>epoch-ms timestamp at which the failure was recorded.</summary>
+    [JsonPropertyName("timestamp")]
+    public long Timestamp { get; set; }
+}
+
+/// <summary>Recorded MCP server pending-auth state.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpServerNeedsAuthInfo
+{
+    /// <summary>epoch-ms timestamp at which the server signalled it needs authentication.</summary>
+    [JsonPropertyName("timestamp")]
+    public long Timestamp { get; set; }
+}
+
+/// <summary>Host-level state, omitted when no MCP host is initialized.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpHostState
+{
+    /// <summary>Names of currently-connected MCP clients.</summary>
+    [JsonPropertyName("clients")]
+    public IList<string> Clients { get => field ??= []; set; }
+
+    /// <summary>Configured servers that are explicitly disabled.</summary>
+    [JsonPropertyName("disabledServers")]
+    public IList<string> DisabledServers { get => field ??= []; set; }
+
+    /// <summary>Map of server name to recorded connection failure.</summary>
+    [JsonPropertyName("failedServers")]
+    public IDictionary<string, McpServerFailureInfo> FailedServers { get => field ??= new Dictionary<string, McpServerFailureInfo>(); set; }
+
+    /// <summary>Configured servers filtered out by MCP server policy.</summary>
+    [JsonPropertyName("filteredServers")]
+    public IList<string> FilteredServers { get => field ??= []; set; }
+
+    /// <summary>Whether third-party MCP servers are policy-enabled for this session.</summary>
+    [JsonPropertyName("mcp3pEnabled")]
+    public bool Mcp3pEnabled { get; set; }
+
+    /// <summary>Map of server name to recorded pending-auth state.</summary>
+    [JsonPropertyName("needsAuthServers")]
+    public IDictionary<string, McpServerNeedsAuthInfo> NeedsAuthServers { get => field ??= new Dictionary<string, McpServerNeedsAuthInfo>(); set; }
+
+    /// <summary>Names of servers with in-flight connection attempts.</summary>
+    [JsonPropertyName("pendingConnections")]
+    public IList<string> PendingConnections { get => field ??= []; set; }
+}
+
+/// <summary>MCP server status entry, including config source/plugin source and any connection error.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpServer
+{
+    /// <summary>Error message if the server failed to connect.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Server name (config key).</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Configuration source: user, workspace, plugin, or builtin.</summary>
+    [JsonPropertyName("source")]
+    public McpServerSource? Source { get; set; }
+
+    /// <summary>Plugin name that provided this server, when source is plugin.</summary>
+    [JsonPropertyName("sourcePlugin")]
+    public string? SourcePlugin { get; set; }
+
+    /// <summary>Plugin version that provided this server, when source is plugin.</summary>
+    [JsonPropertyName("sourcePluginVersion")]
+    public string? SourcePluginVersion { get; set; }
+
+    /// <summary>Connection status: connected, failed, needs-auth, pending, disabled, stopped, or not_configured.</summary>
+    [JsonPropertyName("status")]
+    public McpServerStatus Status { get; set; }
+}
+
+/// <summary>MCP servers configured for the session, with their connection status and host-level state.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpServerList
+{
+    /// <summary>Host-level state, omitted when no MCP host is initialized.</summary>
+    [JsonPropertyName("host")]
+    public McpHostState? Host { get; set; }
+
+    /// <summary>Configured MCP servers.</summary>
+    [JsonPropertyName("servers")]
+    public IList<McpServer> Servers { get => field ??= []; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionMcpListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Normalized MCP Apps discovery metadata from a tool's `_meta.ui` block.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpToolUi
+{
+    /// <summary>URI of the tool's MCP App resource, typically a `ui://` resource identifier. Use `session.mcp.resources.read` to fetch its HTML and resource metadata.</summary>
+    [JsonPropertyName("resourceUri")]
+    public string? ResourceUri { get; set; }
+
+    /// <summary>Tool visibility advertised by the server. When absent, MCP Apps defaults apply.</summary>
+    [JsonPropertyName("visibility")]
+    public IList<McpToolUiVisibility>? Visibility { get; set; }
+}
+
+/// <summary>MCP tool metadata with tool name, optional description, and normalized MCP Apps discovery metadata.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpTools
+{
+    /// <summary>Tool description, when provided.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Tool name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Normalized MCP Apps discovery metadata. An empty object indicates that a valid `_meta.ui` block was present without recognized fields.</summary>
+    [JsonPropertyName("ui")]
+    public McpToolUi? Ui { get; set; }
+}
+
+/// <summary>Tools exposed by the connected MCP server. Throws when the server is not connected.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpListToolsResult
+{
+    /// <summary>Tools exposed by the server.</summary>
+    [JsonPropertyName("tools")]
+    public IList<McpTools> Tools { get => field ??= []; set; }
+}
+
+/// <summary>Server name whose tool list should be returned.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpListToolsRequest
+{
+    /// <summary>Name of the connected MCP server whose tools to list.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Name of the MCP server to enable for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpEnableRequest
+{
+    /// <summary>Name of the MCP server to enable.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Name of the MCP server to disable for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpDisableRequest
+{
+    /// <summary>Name of the MCP server to disable.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionMcpReloadRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Result of moving in-flight MCP loading to the background.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class MoveMcpLoadingToBackgroundResult
+{
+    /// <summary>Whether an in-flight MCP load was moved to the background, releasing turns that were waiting on it. False when no MCP load was in flight or the waiting turns had already been released.</summary>
+    [JsonPropertyName("movedToBackground")]
+    public bool MovedToBackground { get; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionMcpMoveLoadingToBackgroundRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>MCP server allowed by policy, with server name and optional PII-free explanatory note.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAllowedServer
+{
+    /// <summary>Allowed server name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>PII-free note explaining why the server was allowed.</summary>
+    [JsonPropertyName("redactedNote")]
+    public string? RedactedNote { get; set; }
+}
+
+/// <summary>MCP server whose connection attempt failed.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpFailedServer
+{
+    /// <summary>The captured connection failure detail.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>The config key of the server that failed to connect.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+}
+
+/// <summary>MCP server filtered by policy, with name, reason, and optional redacted reason.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpFilteredServer
+{
+    /// <summary>Deprecated. This field is no longer populated.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+#if NET5_0_OR_GREATER
+    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
+#endif
+    [JsonPropertyName("enterpriseName")]
+    public string? EnterpriseName { get; set; }
+
+    /// <summary>Filtered server name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Human-readable filter reason.</summary>
+    [JsonPropertyName("reason")]
+    public string Reason { get; set; } = string.Empty;
+
+    /// <summary>PII-free filter reason.</summary>
+    [JsonPropertyName("redactedReason")]
+    public string? RedactedReason { get; set; }
+}
+
+/// <summary>MCP server startup filtering result.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpStartServersResult
+{
+    /// <summary>Non-default servers allowed by policy.</summary>
+    [JsonPropertyName("allowedServers")]
+    public IList<McpAllowedServer>? AllowedServers { get; set; }
+
+    /// <summary>Servers whose connection attempt failed.</summary>
+    [JsonPropertyName("failedServers")]
+    public IList<McpFailedServer>? FailedServers { get; set; }
+
+    /// <summary>Servers filtered out before startup.</summary>
+    [JsonPropertyName("filteredServers")]
+    public IList<McpFilteredServer> FilteredServers { get => field ??= []; set; }
+}
+
+/// <summary>Opaque MCP reload configuration.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpReloadWithConfigRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpExecuteSamplingResult
+{
+}
+
+/// <summary>Outcome of an MCP sampling execution: success result, failure error, or cancellation.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpSamplingExecutionResult
+{
+    /// <summary>Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.</summary>
+    [JsonPropertyName("action")]
+    public McpSamplingExecutionAction Action { get; set; }
+
+    /// <summary>Error description, present when action='failure'.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.</summary>
+    [JsonPropertyName("result")]
+    public McpExecuteSamplingResult? Result { get; set; }
+}
+
+/// <summary>Raw MCP CreateMessageRequest params, as received in the `sampling.requested` event. Treated as opaque at the schema layer; the runtime converts the embedded MCP messages into the OpenAI chat-completion shape internally.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpExecuteSamplingRequest
+{
+}
+
+/// <summary>Identifiers and raw MCP CreateMessageRequest params used to run a sampling inference.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpExecuteSamplingParams
+{
+    /// <summary>The original MCP JSON-RPC request ID (string or number). Used by the runtime to correlate the inference with the originating MCP request for telemetry; this is distinct from `requestId` (which is the schema-level cancellation handle).</summary>
+    [JsonPropertyName("mcpRequestId")]
+    public JsonElement McpRequestId { get; set; }
+
+    /// <summary>Raw MCP CreateMessageRequest params, as received in the `sampling.requested` event. Treated as opaque at the schema layer; the runtime converts the embedded MCP messages into the OpenAI chat-completion shape internally.</summary>
+    [JsonPropertyName("request")]
+    public McpExecuteSamplingRequest Request { get => field ??= new(); set; }
+
+    /// <summary>Caller-provided unique identifier for this sampling execution. Use this same ID with cancelSamplingExecution to cancel the in-flight call. Must be unique within the session for the lifetime of the call.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Name of the MCP server that initiated the sampling request.</summary>
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether an in-flight sampling execution with the given requestId was found and cancelled.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpCancelSamplingExecutionResult
+{
+    /// <summary>True if an in-flight execution with the given requestId was found and signalled to cancel. False when no such execution is in flight (already completed, never started, or cancelled by another caller).</summary>
+    [JsonPropertyName("cancelled")]
+    public bool Cancelled { get; set; }
+}
+
+/// <summary>The requestId previously passed to executeSampling that should be cancelled.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpCancelSamplingExecutionParams
+{
+    /// <summary>The requestId previously passed to executeSampling that should be cancelled.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Env-value mode recorded on the session after the update.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpSetEnvValueModeResult
+{
+    /// <summary>Mode recorded on the session after the update.</summary>
+    [JsonPropertyName("mode")]
+    public McpSetEnvValueModeDetails Mode { get; set; }
+}
+
+/// <summary>Mode controlling how MCP server env values are resolved (`direct` or `indirect`).</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpSetEnvValueModeParams
+{
+    /// <summary>How environment-variable values supplied to MCP servers are resolved. "direct" passes literal string values; "indirect" treats values as references (e.g. names of environment variables on the host) that the runtime resolves before launch. Defaults to the runtime's startup mode; clients that intentionally launch MCP servers with literal values (e.g. CLI prompt mode and ACP) set this to "direct".</summary>
+    [JsonPropertyName("mode")]
+    public McpSetEnvValueModeDetails Mode { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the auto-managed `github` MCP server was removed (false when nothing to remove).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpRemoveGitHubResult
+{
+    /// <summary>True when the auto-managed `github` MCP server was removed; false when no removal happened (e.g. user has explicitly configured a `github` server, or the server was not registered).</summary>
+    [JsonPropertyName("removed")]
+    public bool Removed { get; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionMcpRemoveGitHubRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Result of configuring GitHub MCP.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpConfigureGitHubResult
+{
+    /// <summary>Whether GitHub MCP configuration changed.</summary>
+    [JsonPropertyName("changed")]
+    public bool Changed { get; set; }
+}
+
+/// <summary>Credential-free authentication identity used to configure GitHub MCP.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpConfigureGitHubRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Server name and optional configuration for an individual MCP server start. Omit `config` for a config-free start-by-name of an already-configured server.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpStartServerRequest
+{
+    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE). Omit to start the server with its already-registered configuration (config-free start-by-name).</summary>
+    [JsonPropertyName("config")]
+    public JsonElement? Config { get; set; }
+
+    /// <summary>Name of the MCP server to start.</summary>
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Server name and optional replacement configuration for an individual MCP server restart. Omit `config` for a config-free restart-by-name of an already-configured server.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpRestartServerRequest
+{
+    /// <summary>Replacement MCP server configuration (stdio process or remote HTTP/SSE). Omit to restart the server with its already-registered configuration (config-free restart-by-name).</summary>
+    [JsonPropertyName("config")]
+    public JsonElement? Config { get; set; }
+
+    /// <summary>Name of the MCP server to restart.</summary>
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Server name for an individual MCP server stop.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpStopServerRequest
+{
+    /// <summary>Name of the MCP server to stop.</summary>
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Registration parameters for an external MCP client.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpRegisterExternalClientRequest
+{
+    /// <summary>Logical server name for the external client.</summary>
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Server name identifying the external client to remove.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpUnregisterExternalClientRequest
+{
+    /// <summary>Server name of the external client to unregister.</summary>
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Whether the named MCP server is running.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpIsServerRunningResult
+{
+    /// <summary>True if the server has an active client and transport.</summary>
+    [JsonPropertyName("running")]
+    public bool Running { get; set; }
+}
+
+/// <summary>Server name to check running status for.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpIsServerRunningRequest
+{
+    /// <summary>Name of the MCP server to check.</summary>
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the pending MCP OAuth response was accepted.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpOauthHandlePendingResult
+{
+    /// <summary>Whether the response was accepted. False if the request was unknown, timed out, or already resolved.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Host response to the pending OAuth request.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpOauthPendingRequestResponseToken), "token")]
+[JsonDerivedType(typeof(McpOauthPendingRequestResponseCancelled), "cancelled")]
+public partial class McpOauthPendingRequestResponse
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
+
+
+/// <summary>The <c>token</c> variant of <see cref="McpOauthPendingRequestResponse"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class McpOauthPendingRequestResponseToken : McpOauthPendingRequestResponse
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "token";
+
+    /// <summary>Access token acquired by the SDK host.</summary>
+    [JsonPropertyName("accessToken")]
+    public required string AccessToken { get; set; }
+
+    /// <summary>Token lifetime in seconds, if known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("expiresIn")]
+    public long? ExpiresIn { get; set; }
+
+    /// <summary>OAuth token type. Defaults to bearer when omitted.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("tokenType")]
+    public string? TokenType { get; set; }
+}
+
+/// <summary>The <c>cancelled</c> variant of <see cref="McpOauthPendingRequestResponse"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class McpOauthPendingRequestResponseCancelled : McpOauthPendingRequestResponse
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "cancelled";
+}
+
+/// <summary>Pending MCP OAuth request ID and host-provided token or cancellation response.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpOauthHandlePendingRequest
+{
+    /// <summary>OAuth request identifier from the mcp.oauth_required event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Host response to the pending OAuth request.</summary>
+    [JsonPropertyName("result")]
+    public McpOauthPendingRequestResponse Result { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Identifies the MCP server whose persisted OAuth credentials were updated.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpOauthAuthenticationStateChangedRequest
+{
+    /// <summary>Whether the target session must mint a session-scoped access token instead of reusing a shared access token persisted by another session.</summary>
+    [JsonPropertyName("refreshSessionToken")]
+    public bool? RefreshSessionToken { get; set; }
+
+    /// <summary>Name of the MCP server whose OAuth credentials were updated. Omit only when the host cannot identify the server.</summary>
+    [JsonPropertyName("serverName")]
+    public string? ServerName { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>OAuth authorization URL the caller should open, or empty when cached tokens already authenticated the server.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpOauthLoginResult
+{
+    /// <summary>URL the caller should open in a browser to complete OAuth. Omitted when cached tokens were still valid and no browser interaction was needed — the server is already reconnected in that case. When present, the runtime starts the callback listener before returning and continues the flow in the background; completion is signaled via session.mcp_server_status_changed.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("authorizationUrl")]
+    public string? AuthorizationUrl { get; set; }
+}
+
+/// <summary>Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback success-page copy, and static OAuth client selection.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpOauthLoginRequest
+{
+    /// <summary>Optional override for the body text shown on the OAuth loopback callback success page. When omitted, the runtime applies a neutral fallback; callers driving interactive auth should pass surface-specific copy telling the user where to return.</summary>
+    [JsonPropertyName("callbackSuccessMessage")]
+    public string? CallbackSuccessMessage { get; set; }
+
+    /// <summary>Optional OAuth client ID override for this login. When set, the runtime uses this pre-registered static client instead of dynamic client registration.</summary>
+    [JsonPropertyName("clientId")]
+    public string? ClientId { get; set; }
+
+    /// <summary>Optional override for the OAuth client display name shown on the consent screen. Applies to newly registered dynamic clients only — existing registrations keep the name they were created with. When omitted, the runtime applies a neutral fallback; callers driving interactive auth should pass their own surface-specific label so the consent screen matches the product the user sees.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
+
+    /// <summary>Optional OAuth client secret override for this login. The runtime treats this as an ephemeral host-owned secret, uses it for this authentication attempt and does not persist it.</summary>
+    [JsonPropertyName("clientSecret")]
+    public string? ClientSecret { get; set; }
+
+    /// <summary>When true, clears any cached OAuth token for the server and runs a full new authorization. Use when the user explicitly wants to switch accounts or believes their session is stuck.</summary>
+    [JsonPropertyName("forceReauth")]
+    public bool? ForceReauth { get; set; }
+
+    /// <summary>Optional OAuth grant type override for this login. Defaults to the server configuration, or authorization_code when no grant type is specified.</summary>
+    [JsonPropertyName("grantType")]
+    public McpOauthLoginGrantType? GrantType { get; set; }
+
+    /// <summary>Optional override indicating whether the static OAuth client is public. When false, the runtime treats it as confidential and uses the per-login clientSecret if provided, otherwise retrieving the client secret from the MCP OAuth secret store.</summary>
+    [JsonPropertyName("publicClient")]
+    public bool? PublicClient { get; set; }
+
+    /// <summary>Name of the remote MCP server to authenticate.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Passive MCP OAuth probe result. `authenticated` means the server accepted the probe request while an OAuth-origin access token was attached; it does not prove the server required or independently validated that token. The probe does not make a second unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are reserved for API-call failures.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>status</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "status",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpOauthProbeResultNoAuthRequired), "no-auth-required")]
+[JsonDerivedType(typeof(McpOauthProbeResultAuthenticated), "authenticated")]
+[JsonDerivedType(typeof(McpOauthProbeResultNeedsAuth), "needs-auth")]
+[JsonDerivedType(typeof(McpOauthProbeResultFailed), "failed")]
+public partial class McpOauthProbeResult
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("status")]
+    public virtual string Status { get; set; } = string.Empty;
+}
+
+
+/// <summary>The <c>no-auth-required</c> variant of <see cref="McpOauthProbeResult"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class McpOauthProbeResultNoAuthRequired : McpOauthProbeResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "no-auth-required";
+
+    /// <summary>HTTP response returned by the server.</summary>
+    [JsonPropertyName("httpResponse")]
+    public required McpOauthHttpResponse HttpResponse { get; set; }
+}
+
+/// <summary>The <c>authenticated</c> variant of <see cref="McpOauthProbeResult"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class McpOauthProbeResultAuthenticated : McpOauthProbeResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "authenticated";
+
+    /// <summary>HTTP response returned by the server.</summary>
+    [JsonPropertyName("httpResponse")]
+    public required McpOauthHttpResponse HttpResponse { get; set; }
+}
+
+/// <summary>The <c>needs-auth</c> variant of <see cref="McpOauthProbeResult"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class McpOauthProbeResultNeedsAuth : McpOauthProbeResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "needs-auth";
+
+    /// <summary>HTTP 401 or 403 response returned by the server.</summary>
+    [JsonPropertyName("httpResponse")]
+    public required McpOauthHttpResponse HttpResponse { get; set; }
+
+    /// <summary>Why authentication is needed.</summary>
+    [JsonPropertyName("reason")]
+    public required McpOauthProbeNeedsAuthReason Reason { get; set; }
+
+    /// <summary>Parsed WWW-Authenticate challenge parameters, when present and parseable.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("wwwAuthenticateParams")]
+    public McpOauthWWWAuthenticateParams? WwwAuthenticateParams { get; set; }
+}
+
+/// <summary>The <c>failed</c> variant of <see cref="McpOauthProbeResult"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class McpOauthProbeResultFailed : McpOauthProbeResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "failed";
+
+    /// <summary>Human-readable probe failure detail.</summary>
+    [JsonPropertyName("error")]
+    public required string Error { get; set; }
+
+    /// <summary>HTTP response returned by the server, when the probe reached the server and captured the complete response.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("httpResponse")]
+    public McpOauthHttpResponse? HttpResponse { get; set; }
+}
+
+/// <summary>Remote MCP server name for a passive OAuth status probe.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpOauthProbeRequest
+{
+    /// <summary>Name of the configured remote MCP server to probe.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the pending MCP OAuth response was accepted.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpOauthRespondResult
+{
+    /// <summary>Whether the response was accepted. False if the request was unknown, timed out, or already resolved.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Pending MCP OAuth request id to respond to.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpOauthRespondRequest
+{
+    /// <summary>OAuth request identifier from the mcp.oauth_required event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the pending MCP headers refresh response was accepted.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpHeadersHandlePendingHeadersRefreshRequestResult
+{
+    /// <summary>Whether the response was accepted. False if the request was unknown, timed out, or already resolved.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Host response: supply dynamic headers or decline this refresh.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestHeaders), "headers")]
+[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestNone), "none")]
+public partial class McpHeadersHandlePendingHeadersRefreshRequest
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
+
+
+/// <summary>The <c>headers</c> variant of <see cref="McpHeadersHandlePendingHeadersRefreshRequest"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class McpHeadersHandlePendingHeadersRefreshRequestHeaders : McpHeadersHandlePendingHeadersRefreshRequest
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "headers";
+
+    /// <summary>Headers to overlay onto the MCP request. Dynamic headers override static config headers but do not replace SDK-managed request headers.</summary>
+    [JsonPropertyName("headers")]
+    public required IDictionary<string, string> Headers { get; set; }
+}
+
+/// <summary>The <c>none</c> variant of <see cref="McpHeadersHandlePendingHeadersRefreshRequest"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class McpHeadersHandlePendingHeadersRefreshRequestNone : McpHeadersHandlePendingHeadersRefreshRequest
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "none";
+}
+
+/// <summary>MCP headers refresh request id and the host response.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpHeadersHandlePendingHeadersRefreshRequestRequest
+{
+    /// <summary>Headers refresh request identifier from mcp.headers_refresh_required.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Host response: supply dynamic headers or decline this refresh.</summary>
+    [JsonPropertyName("result")]
+    public McpHeadersHandlePendingHeadersRefreshRequest Result { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>MCP Apps resource content with URI, optional MIME type, text or base64 blob, and resource metadata.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAppsResourceContent
+{
+    /// <summary>Resource-level metadata (CSP, permissions, etc.).</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
+
+    /// <summary>Base64-encoded binary content.</summary>
+    [JsonPropertyName("blob")]
+    public string? Blob { get; set; }
+
+    /// <summary>MIME type of the content.</summary>
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
+
+    /// <summary>Text content (e.g. HTML).</summary>
+    [JsonPropertyName("text")]
+    public string? Text { get; set; }
+
+    /// <summary>The resource URI (typically ui://...).</summary>
+    [JsonPropertyName("uri")]
+    public string Uri { get; set; } = string.Empty;
+}
+
+/// <summary>Resource contents returned by the MCP server.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAppsReadResourceResult
+{
+    /// <summary>Resource contents returned by the server.</summary>
+    [JsonPropertyName("contents")]
+    public IList<McpAppsResourceContent> Contents { get => field ??= []; set; }
+}
+
+/// <summary>MCP server and resource URI to fetch.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpAppsReadResourceRequest
+{
+    /// <summary>Name of the MCP server hosting the resource.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Resource URI (typically ui://...).</summary>
+    [JsonPropertyName("uri")]
+    public string Uri { get; set; } = string.Empty;
+}
+
+/// <summary>App-callable tools from the named MCP server.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAppsListToolsResult
+{
+    /// <summary>App-callable tools from the server.</summary>
+    [JsonPropertyName("tools")]
+    public IList<IDictionary<string, JsonElement>> Tools { get => field ??= []; set; }
+}
+
+/// <summary>MCP server to list app-callable tools for.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpAppsListToolsRequest
+{
+    /// <summary>**Required.** Server whose ui:// view issued the request. Per SEP-1865 ('callable by the app from this server only'), the call is rejected when this differs from `serverName`, and rejected outright when missing.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("originServerName")]
+    public string OriginServerName { get; set; } = string.Empty;
+
+    /// <summary>MCP server hosting the app.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>MCP server, tool name, and arguments to invoke from an MCP App view.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpAppsCallToolRequest
+{
+    /// <summary>Tool arguments.</summary>
+    [JsonPropertyName("arguments")]
+    public IDictionary<string, JsonElement>? Arguments { get; set; }
+
+    /// <summary>**Required.** Server whose ui:// view issued the request. Per SEP-1865 ('callable by the app from this server only'), the call is rejected when this differs from `serverName`, and rejected outright when missing.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("originServerName")]
+    public string OriginServerName { get; set; } = string.Empty;
+
+    /// <summary>MCP server hosting the tool.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>MCP tool name.</summary>
+    [JsonPropertyName("toolName")]
+    public string ToolName { get; set; } = string.Empty;
+}
+
+/// <summary>Host context advertised to MCP App guests.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAppsSetHostContextDetails
+{
+    /// <summary>Display modes the host supports.</summary>
+    [JsonPropertyName("availableDisplayModes")]
+    public IList<McpAppsSetHostContextDetailsAvailableDisplayMode>? AvailableDisplayModes { get; set; }
+
+    /// <summary>Current display mode (SEP-1865).</summary>
+    [JsonPropertyName("displayMode")]
+    public McpAppsSetHostContextDetailsDisplayMode? DisplayMode { get; set; }
+
+    /// <summary>BCP-47 locale, e.g. 'en-US'.</summary>
+    [JsonPropertyName("locale")]
+    public string? Locale { get; set; }
+
+    /// <summary>Platform type for responsive design.</summary>
+    [JsonPropertyName("platform")]
+    public McpAppsSetHostContextDetailsPlatform? Platform { get; set; }
+
+    /// <summary>UI theme preference per SEP-1865.</summary>
+    [JsonPropertyName("theme")]
+    public McpAppsSetHostContextDetailsTheme? Theme { get; set; }
+
+    /// <summary>IANA timezone, e.g. 'America/New_York'.</summary>
+    [JsonPropertyName("timeZone")]
+    public string? TimeZone { get; set; }
+
+    /// <summary>Host application identifier.</summary>
+    [JsonPropertyName("userAgent")]
+    public string? UserAgent { get; set; }
+}
+
+/// <summary>Host context to advertise to MCP App guests.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpAppsSetHostContextRequest
+{
+    /// <summary>Host context advertised to MCP App guests.</summary>
+    [JsonPropertyName("context")]
+    public McpAppsSetHostContextDetails Context { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Current host context.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAppsHostContextDetails
+{
+    /// <summary>Display modes the host supports.</summary>
+    [JsonPropertyName("availableDisplayModes")]
+    public IList<McpAppsHostContextDetailsAvailableDisplayMode>? AvailableDisplayModes { get; set; }
+
+    /// <summary>Current display mode (SEP-1865).</summary>
+    [JsonPropertyName("displayMode")]
+    public McpAppsHostContextDetailsDisplayMode? DisplayMode { get; set; }
+
+    /// <summary>BCP-47 locale, e.g. 'en-US'.</summary>
+    [JsonPropertyName("locale")]
+    public string? Locale { get; set; }
+
+    /// <summary>Platform type for responsive design.</summary>
+    [JsonPropertyName("platform")]
+    public McpAppsHostContextDetailsPlatform? Platform { get; set; }
+
+    /// <summary>UI theme preference per SEP-1865.</summary>
+    [JsonPropertyName("theme")]
+    public McpAppsHostContextDetailsTheme? Theme { get; set; }
+
+    /// <summary>IANA timezone, e.g. 'America/New_York'.</summary>
+    [JsonPropertyName("timeZone")]
+    public string? TimeZone { get; set; }
+
+    /// <summary>Host application identifier.</summary>
+    [JsonPropertyName("userAgent")]
+    public string? UserAgent { get; set; }
+}
+
+/// <summary>Current host context advertised to MCP App guests.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAppsHostContext
+{
+    /// <summary>Current host context.</summary>
+    [JsonPropertyName("context")]
+    public McpAppsHostContextDetails Context { get => field ??= new(); set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionMcpAppsGetHostContextRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Capability negotiation snapshot.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAppsDiagnoseCapability
+{
+    /// <summary>Whether the runtime advertises `extensions.io.modelcontextprotocol/ui` to MCP servers.</summary>
+    [JsonPropertyName("advertised")]
+    public bool Advertised { get; set; }
+
+    /// <summary>Whether the MCP_APPS feature flag (or COPILOT_MCP_APPS env override) is on.</summary>
+    [JsonPropertyName("featureFlagEnabled")]
+    public bool FeatureFlagEnabled { get; set; }
+
+    /// <summary>Whether the session has the `mcp-apps` capability.</summary>
+    [JsonPropertyName("sessionHasMcpApps")]
+    public bool SessionHasMcpApps { get; set; }
+}
+
+/// <summary>What the server returned for this session.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAppsDiagnoseServer
+{
+    /// <summary>Whether the named server is currently connected.</summary>
+    [JsonPropertyName("connected")]
+    public bool Connected { get; set; }
+
+    /// <summary>Up to 5 tool names with `_meta.ui` for quick inspection.</summary>
+    [JsonPropertyName("sampleToolNames")]
+    public IList<string> SampleToolNames { get => field ??= []; set; }
+
+    /// <summary>Total tools returned by the server's tools/list.</summary>
+    [JsonPropertyName("toolCount")]
+    public double ToolCount { get; set; }
+
+    /// <summary>Tools whose `_meta.ui` is populated (resourceUri and/or visibility set).</summary>
+    [JsonPropertyName("toolsWithUiMeta")]
+    public double ToolsWithUiMeta { get; set; }
+}
+
+/// <summary>Diagnostic snapshot of MCP Apps wiring for the named server.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpAppsDiagnoseResult
+{
+    /// <summary>Capability negotiation snapshot.</summary>
+    [JsonPropertyName("capability")]
+    public McpAppsDiagnoseCapability Capability { get => field ??= new(); set; }
+
+    /// <summary>What the server returned for this session.</summary>
+    [JsonPropertyName("server")]
+    public McpAppsDiagnoseServer Server { get => field ??= new(); set; }
+}
+
+/// <summary>MCP server to diagnose MCP Apps wiring for.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpAppsDiagnoseRequest
+{
+    /// <summary>MCP server to probe.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>MCP resource content with URI, optional MIME type, text or base64 blob, and resource metadata.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpResourceContent
+{
+    /// <summary>Resource-level metadata (CSP, permissions, etc.).</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
+
+    /// <summary>Base64-encoded binary content.</summary>
+    [JsonPropertyName("blob")]
+    public string? Blob { get; set; }
+
+    /// <summary>MIME type of the content.</summary>
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
+
+    /// <summary>Text content (e.g. HTML).</summary>
+    [JsonPropertyName("text")]
+    public string? Text { get; set; }
+
+    /// <summary>The resource URI.</summary>
+    [JsonPropertyName("uri")]
+    public string Uri { get; set; } = string.Empty;
+}
+
+/// <summary>Resource contents returned by the MCP server.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpResourcesReadResult
+{
+    /// <summary>Resource contents returned by the server.</summary>
+    [JsonPropertyName("contents")]
+    public IList<McpResourceContent> Contents { get => field ??= []; set; }
+}
+
+/// <summary>MCP server and resource URI to fetch.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpResourcesReadRequest
+{
+    /// <summary>Name of the MCP server hosting the resource.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Resource URI.</summary>
+    [JsonPropertyName("uri")]
+    public string Uri { get; set; } = string.Empty;
+}
+
+/// <summary>Standard MCP resource annotations plus preserved non-standard annotation fields.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpResourceAnnotations
+{
+    /// <summary>Server-provided non-standard annotation fields preserved from the MCP response.</summary>
+    [JsonPropertyName("additionalProperties")]
+    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+
+    /// <summary>Intended audience roles for this resource.</summary>
+    [JsonPropertyName("audience")]
+    public IList<string>? Audience { get; set; }
+
+    /// <summary>Last-modified timestamp hint.</summary>
+    [JsonPropertyName("lastModified")]
+    public string? LastModified { get; set; }
+
+    /// <summary>Priority hint for model/client use.</summary>
+    [JsonPropertyName("priority")]
+    public double? Priority { get; set; }
+}
+
+/// <summary>A resource icon descriptor plus preserved non-standard icon fields.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpResourceIcon
+{
+    /// <summary>Server-provided non-standard icon fields preserved from the MCP response.</summary>
+    [JsonPropertyName("additionalProperties")]
+    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+
+    /// <summary>Icon MIME type, when known.</summary>
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
+
+    /// <summary>Icon sizes hint.</summary>
+    [JsonPropertyName("sizes")]
+    public string? Sizes { get; set; }
+
+    /// <summary>Icon URI.</summary>
+    [JsonPropertyName("src")]
+    public string Src { get; set; } = string.Empty;
+
+    /// <summary>Theme hint for this icon.</summary>
+    [JsonPropertyName("theme")]
+    public string? Theme { get; set; }
+}
+
+/// <summary>An MCP resource descriptor (spec `Resource`): URI, name, and optional title, description, MIME type, size, icons, annotations, and metadata. Server-provided fields outside the standard descriptor shape are exposed under `additionalProperties`.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpResource
+{
+    /// <summary>Resource-level metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
+
+    /// <summary>Server-provided non-standard descriptor fields preserved from the MCP response.</summary>
+    [JsonPropertyName("additionalProperties")]
+    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+
+    /// <summary>Model/client annotations associated with this resource.</summary>
+    [JsonPropertyName("annotations")]
+    public McpResourceAnnotations? Annotations { get; set; }
+
+    /// <summary>Optional description of what this resource represents.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Icons associated with this resource.</summary>
+    [JsonPropertyName("icons")]
+    public IList<McpResourceIcon>? Icons { get; set; }
+
+    /// <summary>MIME type of the resource, if known.</summary>
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
+
+    /// <summary>The programmatic name of the resource.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Resource size in bytes, when known.</summary>
+    [JsonPropertyName("size")]
+    public long? Size { get; set; }
+
+    /// <summary>Optional human-readable display title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    /// <summary>The resource URI (e.g. ui://... or file:///...).</summary>
+    [JsonPropertyName("uri")]
+    public string Uri { get; set; } = string.Empty;
+}
+
+/// <summary>One page of resources advertised by the named MCP server.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpResourcesListResult
+{
+    /// <summary>Opaque cursor for the next page, if the server has more resources.</summary>
+    [JsonPropertyName("nextCursor")]
+    public string? NextCursor { get; set; }
+
+    /// <summary>Resources advertised by the server (proxied MCP `resources/list`).</summary>
+    [JsonPropertyName("resources")]
+    public IList<McpResource> Resources { get => field ??= []; set; }
+}
+
+/// <summary>MCP server whose resources to enumerate.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpResourcesListRequest
+{
+    /// <summary>Opaque MCP pagination cursor from a prior `nextCursor` value.</summary>
+    [JsonPropertyName("cursor")]
+    public string? Cursor { get; set; }
+
+    /// <summary>Name of the MCP server whose resources to enumerate.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>An MCP resource template descriptor (spec `ResourceTemplate`): an RFC 6570 URI template, name, and optional title, description, MIME type, icons, annotations, and metadata. Server-provided fields outside the standard descriptor shape are exposed under `additionalProperties`.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpResourceTemplate
+{
+    /// <summary>Resource-template-level metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
+
+    /// <summary>Server-provided non-standard descriptor fields preserved from the MCP response.</summary>
+    [JsonPropertyName("additionalProperties")]
+    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+
+    /// <summary>Model/client annotations associated with this template.</summary>
+    [JsonPropertyName("annotations")]
+    public McpResourceAnnotations? Annotations { get; set; }
+
+    /// <summary>Optional description of what this template is for.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Icons associated with resources matching this template.</summary>
+    [JsonPropertyName("icons")]
+    public IList<McpResourceIcon>? Icons { get; set; }
+
+    /// <summary>MIME type for resources matching this template, if uniform.</summary>
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
+
+    /// <summary>The programmatic name of the resource template.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Optional human-readable display title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    /// <summary>An RFC 6570 URI template for constructing resource URIs.</summary>
+    [JsonPropertyName("uriTemplate")]
+    public string UriTemplate { get; set; } = string.Empty;
+}
+
+/// <summary>One page of resource templates advertised by the named MCP server.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpResourcesListTemplatesResult
+{
+    /// <summary>Opaque cursor for the next page, if the server has more resource templates.</summary>
+    [JsonPropertyName("nextCursor")]
+    public string? NextCursor { get; set; }
+
+    /// <summary>Resource templates advertised by the server (proxied MCP `resources/templates/list`).</summary>
+    [JsonPropertyName("resourceTemplates")]
+    public IList<McpResourceTemplate> ResourceTemplates { get => field ??= []; set; }
+}
+
+/// <summary>MCP server whose resource templates to enumerate.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class McpResourcesListTemplatesRequest
+{
+    /// <summary>Opaque MCP pagination cursor from a prior `nextCursor` value.</summary>
+    [JsonPropertyName("cursor")]
+    public string? Cursor { get; set; }
+
+    /// <summary>Name of the MCP server whose resource templates to enumerate.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Session plugin metadata, with name, marketplace, optional version, and enabled state.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class Plugin
+{
+    /// <summary>Whether the plugin is currently enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>Marketplace the plugin came from.</summary>
+    [JsonPropertyName("marketplace")]
+    public string Marketplace { get; set; } = string.Empty;
+
+    /// <summary>Plugin name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Installed version.</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
+}
+
+/// <summary>Plugins installed for the session, with their enabled state and version metadata.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PluginList
+{
+    /// <summary>Installed plugins.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<Plugin> Plugins { get => field ??= []; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionPluginsListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>RPC data type for SessionPluginsReload operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionPluginsReloadRequest
+{
+    /// <summary>When true, skip repo-level hooks during the hook reload. Use before folder trust is confirmed; load them post-trust via `sessions.loadDeferredRepoHooks`.</summary>
+    [JsonPropertyName("deferRepoHooks")]
+    public bool? DeferRepoHooks { get; set; }
+
+    /// <summary>Re-run custom-agent discovery after refreshing plugins. Defaults to true.</summary>
+    [JsonPropertyName("reloadCustomAgents")]
+    public bool? ReloadCustomAgents { get; set; }
+
+    /// <summary>Re-discover and relaunch subprocess extensions (including plugin-shipped extensions) after refreshing plugins. Defaults to true. Has no effect when the session has no active extension controller (e.g. extensions were not requested for the session).</summary>
+    [JsonPropertyName("reloadExtensions")]
+    public bool? ReloadExtensions { get; set; }
+
+    /// <summary>Re-load user, plugin, and (subject to `deferRepoHooks`) repo hooks. Defaults to true. Has no effect when the host has not registered a hook reloader (e.g. remote sessions).</summary>
+    [JsonPropertyName("reloadHooks")]
+    public bool? ReloadHooks { get; set; }
+
+    /// <summary>Reload MCP server connections after refreshing plugins. Defaults to true.</summary>
+    [JsonPropertyName("reloadMcp")]
+    public bool? ReloadMcp { get; set; }
+}
+
+/// <summary>RPC data type for SessionPluginsReloadRequestWithSession operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionPluginsReloadRequestWithSession
+{
+    /// <summary>When true, skip repo-level hooks during the hook reload. Use before folder trust is confirmed; load them post-trust via `sessions.loadDeferredRepoHooks`.</summary>
+    [JsonPropertyName("deferRepoHooks")]
+    public bool? DeferRepoHooks { get; set; }
+
+    /// <summary>Re-run custom-agent discovery after refreshing plugins. Defaults to true.</summary>
+    [JsonPropertyName("reloadCustomAgents")]
+    public bool? ReloadCustomAgents { get; set; }
+
+    /// <summary>Re-discover and relaunch subprocess extensions (including plugin-shipped extensions) after refreshing plugins. Defaults to true. Has no effect when the session has no active extension controller (e.g. extensions were not requested for the session).</summary>
+    [JsonPropertyName("reloadExtensions")]
+    public bool? ReloadExtensions { get; set; }
+
+    /// <summary>Re-load user, plugin, and (subject to `deferRepoHooks`) repo hooks. Defaults to true. Has no effect when the host has not registered a hook reloader (e.g. remote sessions).</summary>
+    [JsonPropertyName("reloadHooks")]
+    public bool? ReloadHooks { get; set; }
+
+    /// <summary>Reload MCP server connections after refreshing plugins. Defaults to true.</summary>
+    [JsonPropertyName("reloadMcp")]
+    public bool? ReloadMcp { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ProviderSessionToken
+{
+    /// <summary>When the token expires, if known. Callers should refresh by calling `getEndpoint` again before this time, or reactively on any 401/403 response from `baseUrl`.</summary>
+    [JsonPropertyName("expiresAt")]
+    public DateTimeOffset? ExpiresAt { get; set; }
+
+    /// <summary>HTTP header name the token must be sent under.</summary>
+    [JsonPropertyName("header")]
+    public string Header { get; set; } = string.Empty;
+
+    /// <summary>The model the token is bound to, when applicable. When set, the token is only valid for requests against this model.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+
+    /// <summary>The short-lived token value.</summary>
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
+}
+
+/// <summary>A snapshot of the provider endpoint the session is currently configured to talk to.</summary>
+[Experimental(Diagnostics.Experimental)]
 public sealed class ProviderEndpoint
 {
-    /// <summary>A credential the caller should use with this endpoint. Omitted only when the endpoint accepts unauthenticated requests.</summary>
-    [JsonPropertyName("apiKey")]
-    public string? ApiKey { get; set; }
+    /// <summary>A credential the caller should use with this endpoint. Omitted only when the endpoint accepts unauthenticated requests.</summary>
+    [JsonPropertyName("apiKey")]
+    public string? ApiKey { get; set; }
+
+    /// <summary>Base URL to pass to the LLM client library.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("baseUrl")]
+    public string BaseUrl { get; set; } = string.Empty;
+
+    /// <summary>HTTP headers the caller must include on every outbound request.</summary>
+    [JsonPropertyName("headers")]
+    public IDictionary<string, string> Headers { get => field ??= new Dictionary<string, string>(); set; }
+
+    /// <summary>Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.</summary>
+    [JsonPropertyName("sessionToken")]
+    public ProviderSessionToken? SessionToken { get; set; }
+
+    /// <summary>Transport to be used for provider requests.</summary>
+    [JsonPropertyName("transport")]
+    public ProviderEndpointTransport? Transport { get; set; }
+
+    /// <summary>Provider family. Matches the `type` field of a BYOK provider config.</summary>
+    [JsonPropertyName("type")]
+    public ProviderEndpointType Type { get; set; }
+
+    /// <summary>Wire API to be used, when required for the provider type.</summary>
+    [JsonPropertyName("wireApi")]
+    public ProviderEndpointWireApi? WireApi { get; set; }
+}
+
+/// <summary>RPC data type for SessionProviderGetEndpoint operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionProviderGetEndpointRequest
+{
+    /// <summary>Model identifier the caller intends to use against the returned endpoint. Used to pick the correct wire shape. Omit to use whichever model the session is currently using.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
+}
+
+/// <summary>RPC data type for SessionProviderGetEndpointRequestWithSession operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionProviderGetEndpointRequestWithSession
+{
+    /// <summary>Model identifier the caller intends to use against the returned endpoint. Used to pick the correct wire shape. Omit to use whichever model the session is currently using.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>The selectable model entries synthesized for the models added by this call.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ProviderAddResult
+{
+    /// <summary>Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.</summary>
+    [JsonPropertyName("models")]
+    public IList<JsonElement> Models { get => field ??= []; set; }
+}
+
+/// <summary>A BYOK model definition referencing a named provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ProviderModelConfig
+{
+    /// <summary>Optional capability overrides (vision, tool_calls, reasoning, etc.).</summary>
+    [JsonPropertyName("capabilities")]
+    public ModelCapabilitiesOverride? Capabilities { get; set; }
+
+    /// <summary>Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Maximum context window tokens for the model.</summary>
+    [JsonPropertyName("maxContextWindowTokens")]
+    public double? MaxContextWindowTokens { get; set; }
+
+    /// <summary>Maximum output tokens for the model.</summary>
+    [JsonPropertyName("maxOutputTokens")]
+    public double? MaxOutputTokens { get; set; }
+
+    /// <summary>Maximum prompt/input tokens for the model.</summary>
+    [JsonPropertyName("maxPromptTokens")]
+    public double? MaxPromptTokens { get; set; }
+
+    /// <summary>Well-known base model id used for behavior/capability/config lookup. Defaults to `id`.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
+
+    /// <summary>Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`).</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>Name of the configured provider that serves this model.</summary>
+    [JsonPropertyName("provider")]
+    public string Provider { get; set; } = string.Empty;
+
+    /// <summary>The model name sent to the provider API for inference. Defaults to `id`.</summary>
+    [JsonPropertyName("wireModel")]
+    public string? WireModel { get; set; }
+}
+
+/// <summary>Azure-specific provider options.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ProviderConfigAzure
+{
+    /// <summary>API version. When set, uses the versioned deployment route. When omitted, uses the GA versionless v1 route.</summary>
+    [JsonPropertyName("apiVersion")]
+    public string? ApiVersion { get; set; }
+}
+
+/// <summary>External SDK input for a named custom model provider. Ingested by the native protocol boundary before host dispatch.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class NamedProviderConfig
+{
+    /// <summary>Static API key used to authenticate provider requests.</summary>
+    [JsonPropertyName("apiKey")]
+    public string? ApiKey { get; set; }
+
+    /// <summary>Azure authentication configuration for the provider.</summary>
+    [JsonPropertyName("azure")]
+    public ProviderConfigAzure? Azure { get; set; }
+
+    /// <summary>Base URL for provider API requests.</summary>
+    [JsonPropertyName("baseUrl")]
+    public string BaseUrl { get; set; } = string.Empty;
+
+    /// <summary>Static bearer token used to authenticate provider requests.</summary>
+    [JsonPropertyName("bearerToken")]
+    public string? BearerToken { get; set; }
+
+    /// <summary>Whether the host supplies bearer tokens dynamically.</summary>
+    [JsonPropertyName("hasBearerTokenProvider")]
+    public bool? HasBearerTokenProvider { get; set; }
+
+    /// <summary>Additional HTTP headers included with provider requests.</summary>
+    [JsonPropertyName("headers")]
+    public IDictionary<string, string>? Headers { get; set; }
+
+    /// <summary>Unique provider name used to qualify model selection IDs.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Transport used to communicate with the provider.</summary>
+    [JsonPropertyName("transport")]
+    public ProviderConfigTransport? Transport { get; set; }
+
+    /// <summary>Provider protocol family.</summary>
+    [JsonPropertyName("type")]
+    public ProviderConfigType? Type { get; set; }
+
+    /// <summary>Wire API used to communicate with the provider.</summary>
+    [JsonPropertyName("wireApi")]
+    public ProviderConfigWireApi? WireApi { get; set; }
+}
+
+/// <summary>BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ProviderAddRequest
+{
+    /// <summary>BYOK model definitions to register. Each must reference a provider that is already registered or included in this same call. Selection ids (`provider/id`) must be unique across the registry.</summary>
+    [JsonPropertyName("models")]
+    public IList<ProviderModelConfig>? Models { get; set; }
+
+    /// <summary>Named BYOK provider connections to register, additive to any providers already in the registry. Each name must be unique across the registry and must not contain '/'.</summary>
+    [JsonPropertyName("providers")]
+    public IList<NamedProviderConfig>? Providers { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the session options patch was applied successfully.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionUpdateOptionsResult
+{
+    /// <summary>Number of hooks loaded from installed plugins, returned when installedPlugins is updated.</summary>
+    [JsonPropertyName("pluginHookCount")]
+    public long? PluginHookCount { get; set; }
+
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Source descriptor for a `session.options.update` content-exclusion rule, with source name and type.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class OptionsUpdateAdditionalContentExclusionPolicyRuleSource
+{
+    /// <summary>Name of the policy source.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Type of the policy source.</summary>
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = string.Empty;
+}
+
+/// <summary>Single content-exclusion rule supplied to `session.options.update`, with paths, match conditions, and source.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class OptionsUpdateAdditionalContentExclusionPolicyRule
+{
+    /// <summary>Conditions of which at least one must match.</summary>
+    [JsonPropertyName("ifAnyMatch")]
+    public IList<string>? IfAnyMatch { get; set; }
+
+    /// <summary>Conditions none of which may match.</summary>
+    [JsonPropertyName("ifNoneMatch")]
+    public IList<string>? IfNoneMatch { get; set; }
+
+    /// <summary>Path patterns covered by this rule.</summary>
+    [JsonPropertyName("paths")]
+    public IList<string> Paths { get => field ??= []; set; }
+
+    /// <summary>Source descriptor for a `session.options.update` content-exclusion rule, with source name and type.</summary>
+    [JsonPropertyName("source")]
+    public OptionsUpdateAdditionalContentExclusionPolicyRuleSource Source { get => field ??= new(); set; }
+}
+
+/// <summary>Content-exclusion policy supplied to `session.options.update`, with rules, last-updated data, and scope.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class OptionsUpdateAdditionalContentExclusionPolicy
+{
+    /// <summary>Opaque policy update timestamp supplied by the host.</summary>
+    [JsonPropertyName("last_updated_at")]
+    public JsonElement LastUpdatedAt { get; set; }
+
+    /// <summary>Content-exclusion rules to apply.</summary>
+    [JsonPropertyName("rules")]
+    public IList<OptionsUpdateAdditionalContentExclusionPolicyRule> Rules { get => field ??= []; set; }
+
+    /// <summary>Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.</summary>
+    [JsonPropertyName("scope")]
+    public OptionsUpdateAdditionalContentExclusionPolicyScope Scope { get; set; }
+}
+
+/// <summary>Options scoped to the built-in CAPI (Copilot API) provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CapiSessionOptions
+{
+    /// <summary>Whether to use WebSocket transport for the CAPI Responses API. Enabled by default when the model advertises `ws:/responses` support; set to `false` to force the HTTP Responses transport in environments where WebSockets are blocked (e.g. behind a proxy). Setting this to `false` is equivalent to the `COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES` environment variable.</summary>
+    [JsonPropertyName("enableWebSocketResponses")]
+    public bool? EnableWebSocketResponses { get; set; }
+}
+
+/// <summary>Installed plugin record for a session, with marketplace, version, install time, enabled state, cache path, and source.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionInstalledPlugin
+{
+    /// <summary>Path where the plugin is cached locally.</summary>
+    [JsonPropertyName("cache_path")]
+    public string? CachePath { get; set; }
+
+    /// <summary>Whether the plugin is currently enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>Installation timestamp (ISO-8601).</summary>
+    [JsonPropertyName("installed_at")]
+    public string InstalledAt { get; set; } = string.Empty;
+
+    /// <summary>Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — those synthesized at session start for a directory/local marketplace, whose cache_path points at the real plugin directory on disk rather than a copy under the installed-plugins cache. Its presence is what marks a record as live, and no record carrying it is ever written to the persisted installedPlugins key.</summary>
+    [JsonPropertyName("installed_from")]
+    public string? InstalledFrom { get; set; }
+
+    /// <summary>Marketplace the plugin came from (empty string for direct repo installs).</summary>
+    [JsonPropertyName("marketplace")]
+    public string Marketplace { get; set; } = string.Empty;
+
+    /// <summary>Plugin name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Source descriptor for direct repo installs (when marketplace is empty).</summary>
+    [JsonPropertyName("source")]
+    public JsonElement? Source { get; set; }
+
+    /// <summary>Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.</summary>
+    [JsonPropertyName("source_sha")]
+    public string? SourceSha { get; set; }
+
+    /// <summary>Installed version, if known.</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
+}
+
+/// <summary>Custom model-provider configuration (BYOK).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ProviderConfig
+{
+    /// <summary>API key. Optional for local providers like Ollama.</summary>
+    [JsonPropertyName("apiKey")]
+    public string? ApiKey { get; set; }
+
+    /// <summary>Azure-specific provider options.</summary>
+    [JsonPropertyName("azure")]
+    public ProviderConfigAzure? Azure { get; set; }
+
+    /// <summary>API endpoint URL.</summary>
+    [JsonPropertyName("baseUrl")]
+    public string BaseUrl { get; set; } = string.Empty;
+
+    /// <summary>Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set.</summary>
+    [JsonPropertyName("bearerToken")]
+    public string? BearerToken { get; set; }
+
+    /// <summary>When true, the SDK client supplies bearer tokens on demand: the runtime calls the client-session `providerToken.getToken` callback before each request and applies the returned token as an `Authorization: Bearer &lt;token&gt;` header. This is the bearer/OAuth scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens (including Anthropic's), not a provider-specific API-key header such as Anthropic's `x-api-key`. The token-acquiring function itself stays on the SDK side and is never serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`, the callback takes precedence: the runtime applies the token returned by `providerToken.getToken` as the `Authorization: Bearer` header for each request and does not send the static credential.</summary>
+    [JsonPropertyName("hasBearerTokenProvider")]
+    public bool? HasBearerTokenProvider { get; set; }
+
+    /// <summary>Custom HTTP headers to include in all outbound requests to the provider.</summary>
+    [JsonPropertyName("headers")]
+    public IDictionary<string, string>? Headers { get; set; }
+
+    /// <summary>Maximum context window tokens for the model.</summary>
+    [JsonPropertyName("maxContextWindowTokens")]
+    public double? MaxContextWindowTokens { get; set; }
+
+    /// <summary>Maximum output tokens for the model.</summary>
+    [JsonPropertyName("maxOutputTokens")]
+    public double? MaxOutputTokens { get; set; }
+
+    /// <summary>Maximum prompt/input tokens for the model.</summary>
+    [JsonPropertyName("maxPromptTokens")]
+    public double? MaxPromptTokens { get; set; }
+
+    /// <summary>Overrides for model capabilities when they cannot be inferred from modelId.</summary>
+    [JsonPropertyName("modelCapabilities")]
+    public ModelCapabilitiesOverride? ModelCapabilities { get; set; }
+
+    /// <summary>Well-known model ID used for capability lookup. When set, agent behavior config and token limits are inferred from this model.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
+
+    /// <summary>Provider name used for model and telemetry attribution.</summary>
+    [JsonPropertyName("providerName")]
+    public string? ProviderName { get; set; }
+
+    /// <summary>Provider transport. Defaults to "http".</summary>
+    [JsonPropertyName("transport")]
+    public ProviderConfigTransport? Transport { get; set; }
+
+    /// <summary>Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.</summary>
+    [JsonPropertyName("type")]
+    public ProviderConfigType? Type { get; set; }
+
+    /// <summary>Wire API format (openai/azure only). Defaults to "completions".</summary>
+    [JsonPropertyName("wireApi")]
+    public ProviderConfigWireApi? WireApi { get; set; }
+
+    /// <summary>The model identifier sent to the provider API for inference (the "wire" model), as opposed to modelId which is the well-known base.</summary>
+    [JsonPropertyName("wireModel")]
+    public string? WireModel { get; set; }
+}
+
+/// <summary>Credential-injection capability flags applied while the sandbox is enabled. For the same capability independent of sandboxing, and matched to the credential's GitHub host, see `shell.credentials`; the two are additive.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SandboxConfigAuth
+{
+    /// <summary>Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the OS keyring the sandbox blocks. Default: false (opt-in).</summary>
+    [JsonPropertyName("gh")]
+    public bool? Gh { get; set; }
+
+    /// <summary>Whether to inject git credentials as an `http.&lt;url&gt;.extraheader` so authenticated HTTPS git works inside the sandbox without the shell-based credential helper the sandbox blocks. github.com is served by the Copilot token; every other forge (Azure DevOps, GitHub Enterprise Server, GitLab, ...) by a credential the host resolves from the user's own helper before the sandbox is applied. Default: false (opt-in).</summary>
+    [JsonPropertyName("git")]
+    public bool? Git { get; set; }
+}
+
+/// <summary>macOS seatbelt experimental options.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SandboxConfigUserPolicyExperimentalSeatbelt
+{
+    /// <summary>Whether the macOS seatbelt profile may access the keychain.</summary>
+    [JsonPropertyName("keychainAccess")]
+    public bool? KeychainAccess { get; set; }
+}
+
+/// <summary>Platform-specific experimental policy fields.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SandboxConfigUserPolicyExperimental
+{
+    /// <summary>macOS seatbelt experimental options.</summary>
+    [JsonPropertyName("seatbelt")]
+    public SandboxConfigUserPolicyExperimentalSeatbelt? Seatbelt { get; set; }
+}
+
+/// <summary>Filesystem rules to merge into the base policy.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SandboxConfigUserPolicyFilesystem
+{
+    /// <summary>Whether to clear the policy when the session exits.</summary>
+    [JsonPropertyName("clearPolicyOnExit")]
+    public bool? ClearPolicyOnExit { get; set; }
+
+    /// <summary>Paths explicitly denied.</summary>
+    [JsonPropertyName("deniedPaths")]
+    public IList<string>? DeniedPaths { get; set; }
+
+    /// <summary>Paths granted read-only access.</summary>
+    [JsonPropertyName("readonlyPaths")]
+    public IList<string>? ReadonlyPaths { get; set; }
+
+    /// <summary>Paths granted read/write access.</summary>
+    [JsonPropertyName("readwritePaths")]
+    public IList<string>? ReadwritePaths { get; set; }
+}
+
+/// <summary>HTTP proxy configuration for sandboxed traffic.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SandboxConfigUserPolicyNetworkProxy
+{
+    /// <summary>Optional password for proxy authentication, combined with the URL at spawn time. The persisted value may be a literal password, a `${secret:…}` reference resolved from the OS keychain, or a `${VAR}`/`$VAR` environment reference; it is resolved just before the sandboxed process routes through the proxy. The /sandbox dialog stores a real password in the OS keychain and persists only a `${secret:…}` placeholder (never plaintext in settings.json); the field is masked in the dialog and redacted by /settings show.</summary>
+    [JsonPropertyName("password")]
+    public string? Password { get; set; }
+
+    /// <summary>Proxy URL (e.g. http://proxy.example.com:8080). The port is optional and defaults to the scheme's standard port when omitted. Credentials must not be embedded here — a `user:pass@` authority is rejected; put them in the separate `username`/`password` fields. A credential-free http:// loopback URL is routed through the localhost proxy automatically; loopback covers localhost and any *.localhost subdomain, the whole 127.0.0.0/8 range, ::1, and IPv4-mapped loopback (::ffff:127.0.0.1). An https:// URL, or one with a username/password set, is used as-is.</summary>
+    [JsonPropertyName("url")]
+    public string Url { get; set; } = string.Empty;
+
+    /// <summary>Optional username for proxy authentication. Combined with the URL (and `password`) into `user:pass@host` when the sandboxed process routes through the proxy.</summary>
+    [JsonPropertyName("username")]
+    public string? Username { get; set; }
+}
+
+/// <summary>Network rules to merge into the base policy.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SandboxConfigUserPolicyNetwork
+{
+    /// <summary>Whether traffic to local/loopback addresses is allowed.</summary>
+    [JsonPropertyName("allowLocalNetwork")]
+    public bool? AllowLocalNetwork { get; set; }
+
+    /// <summary>Whether outbound network traffic is allowed at all.</summary>
+    [JsonPropertyName("allowOutbound")]
+    public bool? AllowOutbound { get; set; }
+
+    /// <summary>HTTP proxy the sandboxed process routes traffic through. Enforced on Windows and cooperative (honored by well-behaved tools, not strictly enforced) on Linux and macOS. Credentials go in the separate `username`/`password` fields. A credential-free http:// loopback proxy URL is routed through the localhost proxy automatically; an https:// or authenticated loopback URL is used as-is.</summary>
+    [JsonPropertyName("proxy")]
+    public SandboxConfigUserPolicyNetworkProxy? Proxy { get; set; }
+}
+
+/// <summary>macOS seatbelt-specific options.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SandboxConfigUserPolicySeatbelt
+{
+    /// <summary>Whether the macOS seatbelt profile may access the keychain.</summary>
+    [JsonPropertyName("keychainAccess")]
+    public bool? KeychainAccess { get; set; }
+}
+
+/// <summary>User-managed sandbox policy fragment merged into the auto-discovered base policy.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SandboxConfigUserPolicy
+{
+    /// <summary>Deprecated legacy location for `seatbelt`; read only when the top-level `seatbelt` is absent.</summary>
+    [JsonPropertyName("experimental")]
+    public SandboxConfigUserPolicyExperimental? Experimental { get; set; }
+
+    /// <summary>Filesystem rules to merge into the base policy.</summary>
+    [JsonPropertyName("filesystem")]
+    public SandboxConfigUserPolicyFilesystem? Filesystem { get; set; }
+
+    /// <summary>Network rules to merge into the base policy.</summary>
+    [JsonPropertyName("network")]
+    public SandboxConfigUserPolicyNetwork? Network { get; set; }
+
+    /// <summary>macOS seatbelt options to merge into the base policy.</summary>
+    [JsonPropertyName("seatbelt")]
+    public SandboxConfigUserPolicySeatbelt? Seatbelt { get; set; }
+}
+
+/// <summary>Resolved sandbox configuration.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SandboxConfig
+{
+    /// <summary>Whether to auto-add the current working directory to readwritePaths. Default: true.</summary>
+    [JsonPropertyName("addCurrentWorkingDirectory")]
+    public bool? AddCurrentWorkingDirectory { get; set; }
+
+    /// <summary>Whether to auto-grant read access to the tool directories discovered on PATH and in toolchain environment variables (GOROOT, CARGO_HOME, JAVA_HOME, VIRTUAL_ENV, and similar), and to common developer-tool caches, registries, and toolchains in their default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and up-front creation of) the scratch caches builds write on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so builds work without extra configuration; a relocated CARGO_HOME additionally gets its Cargo lock files granted read-write. Set to false to disable every grant listed above: user-installed toolchains (rustup, nvm, pyenv, conda, pipx) then need explicit userPolicy.filesystem entries — readonlyPaths to read them, plus readwriteFiles for a relocated CARGO_HOME's .package-cache and .global-cache, which Cargo locks on every build. Only these developer-tool grants are affected: the working directory (see addCurrentWorkingDirectory), temporary storage, session log paths, and system locations follow their own rules and stay granted, so commands still run. Default: true (enabled by default; set to false to opt out).</summary>
+    [JsonPropertyName("allowDevToolAccess")]
+    public bool? AllowDevToolAccess { get; set; }
+
+    /// <summary>Credential-injection capability flags.</summary>
+    [JsonPropertyName("auth")]
+    public SandboxConfigAuth? Auth { get; set; }
+
+    /// <summary>Whether sandboxing is enabled for the session.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>User-managed sandbox policy fragment merged into the auto-discovered base policy.</summary>
+    [JsonPropertyName("userPolicy")]
+    public SandboxConfigUserPolicy? UserPolicy { get; set; }
+}
+
+/// <summary>
+/// Command-scoped GitHub credential injection for the shell commands an agent runs.
+/// 
+/// Each channel is opt-in and independent, and injection is scoped to the individual command
+/// spawn: the credential is resolved from the session's *current* authentication at every spawn
+/// and reaches only spawns whose script actually invokes `git` or `gh`. Because nothing is
+/// retained between spawns, replacing the session credential (`session.gitHubAuth.setCredentials`)
+/// changes what the next spawned command presents — which seeding a credential into the runtime
+/// process's own environment cannot do, since a child's environment is fixed at `exec`.
+/// 
+/// The credential is matched to the host it authenticates to, so a github.com credential is never
+/// presented to a GitHub Enterprise host and vice versa. Where a channel cannot express that
+/// boundary it injects nothing rather than crossing it -- see `gh` below.
+/// 
+/// This is independent of `sandboxConfig`: it is a decision about which identity the agent
+/// presents, not about what the agent may touch, and it works on every platform whether or not
+/// an OS sandboxing backend is available. `sandboxConfig.auth` remains the sandbox-scoped
+/// spelling and is additive with this one.
+/// </summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ShellCredentials
+{
+    /// <summary>
+    /// Whether to authenticate the agent's `gh` commands as the session's GitHub credential, by
+    /// exporting `GH_TOKEN` to a spawn that runs `gh`. Any inherited `gh` credential is removed from
+    /// spawns that do not, so the credential stays command-scoped.
+    /// 
+    /// Applies to a github.com credential only. `gh` picks its credential variable from the host a
+    /// command targets rather than the one the credential belongs to, and the command can choose that
+    /// target, so `GH_ENTERPRISE_TOKEN` would offer a single-tenant enterprise credential to every
+    /// other enterprise host. A session whose credential is enterprise-scoped therefore runs `gh`
+    /// unauthenticated; its `git` commands are unaffected, because `http.&lt;host&gt;.extraheader` is scoped
+    /// to one host by construction. Default: false (opt-in).
+    /// </summary>
+    [JsonPropertyName("gh")]
+    public bool? Gh { get; set; }
+
+    /// <summary>
+    /// Whether to authenticate the agent's `git` commands as the session's GitHub credential, by
+    /// injecting an `http.&lt;host&gt;.extraheader` (plus `insteadOf` rewrites so SSH-spelled remotes for
+    /// that host use the authenticated HTTPS transport). Applied only to a spawn that runs a
+    /// remote-contacting `git` subcommand. Default: false (opt-in).
+    /// </summary>
+    [JsonPropertyName("git")]
+    public bool? Git { get; set; }
+}
+
+/// <summary>A host-provided script sourced before each built-in shell command when its shell target matches the active shell.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ShellInitScript
+{
+    /// <summary>Path to the script to source.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Built-in shell that may source this script.</summary>
+    [JsonPropertyName("shell")]
+    public ShellInitScriptShell Shell { get; set; }
+}
+
+/// <summary>Per-session settings for built-in shell tools.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ShellOptions
+{
+    /// <summary>Command-scoped GitHub credential injection for shell commands.</summary>
+    [JsonPropertyName("credentials")]
+    public ShellCredentials? Credentials { get; set; }
+
+    /// <summary>Controls automatic non-interactive profile loading where supported. Explicit initScripts are unaffected.</summary>
+    [JsonPropertyName("initProfile")]
+    public ShellInitProfile? InitProfile { get; set; }
+
+    /// <summary>
+    /// Ordered host-provided script paths sourced before each built-in shell command when the
+    /// entry's shell target matches the active shell. Use these for rc files, environment setup scripts,
+    /// or other custom scripts. A script that returns a nonzero status is reported, and later scripts
+    /// and the user command continue while the shell remains running. Because scripts are sourced into
+    /// the command shell, `exit`, `exec`, failures under `set -e`, or other shell-terminating behavior
+    /// can prevent continuation. Script standard output is preserved; Bash script stderr is discarded,
+    /// PowerShell exception messages are replaced, and runtime-generated failure notices omit
+    /// configured script paths. When sandboxing is enabled, each script must already be readable under
+    /// the active sandbox filesystem policy. Pass an empty array to clear the list.
+    /// </summary>
+    [JsonPropertyName("initScripts")]
+    public IList<ShellInitScript>? InitScripts { get; set; }
+
+    /// <summary>
+    /// Flags passed to the active built-in shell process on startup, replacing its default flags.
+    /// When omitted, the built-in Bash shell uses `--norc --noprofile`,
+    /// and the built-in PowerShell shell uses `-NoProfile -NoLogo`.
+    /// </summary>
+    [JsonPropertyName("processFlags")]
+    public IList<string>? ProcessFlags { get; set; }
+}
+
+/// <summary>Patch of mutable session options to apply to the running session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionUpdateOptionsParams
+{
+    /// <summary>Additional content-exclusion policies to merge into the session's policy set.</summary>
+    [Experimental(Diagnostics.Experimental)]
+    [JsonPropertyName("additionalContentExclusionPolicies")]
+    public IList<OptionsUpdateAdditionalContentExclusionPolicy>? AdditionalContentExclusionPolicies { get; set; }
+
+    /// <summary>Runtime context discriminator (e.g., `cli`, `actions`).</summary>
+    [JsonPropertyName("agentContext")]
+    public string? AgentContext { get; set; }
+
+    /// <summary>Whether to include instructions from every MCP server in the system prompt instead of only allowlisted servers.</summary>
+    [JsonPropertyName("allowAllMcpServerInstructions")]
+    public bool? AllowAllMcpServerInstructions { get; set; }
+
+    /// <summary>Whether to disable the `ask_user` tool (encourages autonomous behavior).</summary>
+    [JsonPropertyName("askUserDisabled")]
+    public bool? AskUserDisabled { get; set; }
+
+    /// <summary>Allowlist of tool names available to this session.</summary>
+    [JsonPropertyName("availableTools")]
+    public IList<string>? AvailableTools { get; set; }
+
+    /// <summary>Options scoped to the built-in CAPI (Copilot API) provider.</summary>
+    [JsonPropertyName("capi")]
+    public CapiSessionOptions? Capi { get; set; }
+
+    /// <summary>Identifier of the client driving the session.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
+
+    /// <summary>Whether to include the `Co-authored-by` trailer in commit messages.</summary>
+    [JsonPropertyName("coauthorEnabled")]
+    public bool? CoauthorEnabled { get; set; }
+
+    /// <summary>Context tier for models with tiered pricing. The session uses this to derive effective `modelCapabilitiesOverrides` so compaction, truncation, token display, and request limits honor the selected tier.</summary>
+    [JsonPropertyName("contextTier")]
+    public OptionsUpdateContextTier? ContextTier { get; set; }
+
+    /// <summary>Whether to allow auto-mode continuation across turns.</summary>
+    [JsonPropertyName("continueOnAutoMode")]
+    public bool? ContinueOnAutoMode { get; set; }
+
+    /// <summary>Override URL for the Copilot API endpoint.</summary>
+    [JsonPropertyName("copilotUrl")]
+    public string? CopilotUrl { get; set; }
+
+    /// <summary>Whether to default custom agents to local-only execution.</summary>
+    [JsonPropertyName("customAgentsLocalOnly")]
+    public bool? CustomAgentsLocalOnly { get; set; }
+
+    /// <summary>Instruction source IDs to exclude from the system prompt.</summary>
+    [JsonPropertyName("disabledInstructionSources")]
+    public IList<string>? DisabledInstructionSources { get; set; }
+
+    /// <summary>Skill IDs that should be excluded from this session.</summary>
+    [JsonPropertyName("disabledSkills")]
+    public IList<string>? DisabledSkills { get; set; }
+
+    /// <summary>Whether to enable loading of `.github/hooks/` filesystem hooks. Separate from the SDK callback hook mechanism.</summary>
+    [JsonPropertyName("enableFileHooks")]
+    public bool? EnableFileHooks { get; set; }
+
+    /// <summary>Whether to enable host git operations (context resolution, child repo scanning, git info in system prompt).</summary>
+    [JsonPropertyName("enableHostGitOperations")]
+    public bool? EnableHostGitOperations { get; set; }
+
+    /// <summary>Whether to discover custom instructions on demand after successful file views (AGENTS.md / CLAUDE.md / .github/copilot-instructions.md surfacing). Combined with `skipCustomInstructions`.</summary>
+    [JsonPropertyName("enableOnDemandInstructionDiscovery")]
+    public bool? EnableOnDemandInstructionDiscovery { get; set; }
+
+    /// <summary>Whether to surface reasoning-summary events from the model.</summary>
+    [JsonPropertyName("enableReasoningSummaries")]
+    public bool? EnableReasoningSummaries { get; set; }
+
+    /// <summary>Whether shell-script safety heuristics are enabled.</summary>
+    [JsonPropertyName("enableScriptSafety")]
+    public bool? EnableScriptSafety { get; set; }
+
+    /// <summary>Whether to enable cross-session store writes and reads.</summary>
+    [JsonPropertyName("enableSessionStore")]
+    public bool? EnableSessionStore { get; set; }
+
+    /// <summary>Whether to enable skill directory scanning and loading. Falls back to enableConfigDiscovery when unset.</summary>
+    [JsonPropertyName("enableSkills")]
+    public bool? EnableSkills { get; set; }
+
+    /// <summary>Whether to stream model responses.</summary>
+    [JsonPropertyName("enableStreaming")]
+    public bool? EnableStreaming { get; set; }
+
+    /// <summary>How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch).</summary>
+    [JsonPropertyName("envValueMode")]
+    public OptionsUpdateEnvValueMode? EnvValueMode { get; set; }
+
+    /// <summary>Override directory for the session-events log. When unset, the runtime's default events log directory is used.</summary>
+    [JsonPropertyName("eventsLogDirectory")]
+    public string? EventsLogDirectory { get; set; }
+
+    /// <summary>Whether subagent callback events should be forwarded into the session event log sink.</summary>
+    [JsonPropertyName("eventsLogIncludesSubagents")]
+    public bool? EventsLogIncludesSubagents { get; set; }
+
+    /// <summary>Built-in subagent names to exclude from this session. Excluded built-ins are hidden from agent discovery and cannot be dispatched unless a custom agent with the same name is available.</summary>
+    [JsonPropertyName("excludedBuiltinAgents")]
+    public IList<string>? ExcludedBuiltinAgents { get; set; }
+
+    /// <summary>Denylist of tool names for this session.</summary>
+    [JsonPropertyName("excludedTools")]
+    public IList<string>? ExcludedTools { get; set; }
+
+    /// <summary>Map of feature-flag IDs to their boolean enabled state.</summary>
+    [JsonPropertyName("featureFlags")]
+    public IDictionary<string, bool>? FeatureFlags { get; set; }
+
+    /// <summary>Built-in subagent names to include in this session. When specified, only these built-ins are available, subject to runtime availability and exclusions. Custom agents with the same name remain available. Set to null to remove the allowlist restriction.</summary>
+    [JsonPropertyName("includedBuiltinAgents")]
+    public IList<string>? IncludedBuiltinAgents { get; set; }
+
+    /// <summary>Built-in skill names to include in this session. When specified, only these runtime-bundled skills are available. Skills from other sources with the same name remain available. Set to null to remove the allowlist restriction.</summary>
+    [JsonPropertyName("includedBuiltinSkills")]
+    public IList<string>? IncludedBuiltinSkills { get; set; }
+
+    /// <summary>Full set of installed plugins for the session. Replaces the existing list; the runtime invalidates the skills cache only when the list materially changes.</summary>
+    [JsonPropertyName("installedPlugins")]
+    public IList<SessionInstalledPlugin>? InstalledPlugins { get; set; }
+
+    /// <summary>Stable integration identifier used for analytics and rate-limit attribution.</summary>
+    [JsonPropertyName("integrationId")]
+    public string? IntegrationId { get; set; }
+
+    /// <summary>Whether experimental capabilities are enabled.</summary>
+    [JsonPropertyName("isExperimentalMode")]
+    public bool? IsExperimentalMode { get; set; }
+
+    /// <summary>Whether interactive shell sessions are logged.</summary>
+    [JsonPropertyName("logInteractiveShells")]
+    public bool? LogInteractiveShells { get; set; }
+
+    /// <summary>Identifier sent to LSP-style integrations.</summary>
+    [JsonPropertyName("lspClientName")]
+    public string? LspClientName { get; set; }
+
+    /// <summary>Whether to expose the `manage_schedule` tool to the agent. The runtime always owns the per-session schedule registry; this flag only controls tool exposure (typically gated to staff users).</summary>
+    [JsonPropertyName("manageScheduleEnabled")]
+    public bool? ManageScheduleEnabled { get; set; }
+
+    /// <summary>Maximum decoded byte size of a single model-facing binary tool result (e.g. an image) persisted inline in session events and re-presented to the model on later turns / resume. Larger results are persisted as a metadata-only marker and shown to the model as a short text note. Defaults to 10 MB.</summary>
+    [JsonPropertyName("maxInlineBinaryBytes")]
+    public long? MaxInlineBinaryBytes { get; set; }
+
+    /// <summary>The model ID to use for assistant turns.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+
+    /// <summary>Per-property model capability overrides for the selected model.</summary>
+    [JsonPropertyName("modelCapabilitiesOverrides")]
+    public ModelCapabilitiesOverride? ModelCapabilitiesOverrides { get; set; }
+
+    /// <summary>Organization-level custom instructions to inject into the system prompt.</summary>
+    [JsonPropertyName("organizationCustomInstructions")]
+    public string? OrganizationCustomInstructions { get; set; }
+
+    /// <summary>Custom model-provider configuration (BYOK).</summary>
+    [JsonPropertyName("provider")]
+    public ProviderConfig? Provider { get; set; }
+
+    /// <summary>Reasoning effort for the selected model. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. When omitted, no effort override is applied.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
+
+    /// <summary>Reasoning summary mode for supported model clients.</summary>
+    [JsonPropertyName("reasoningSummary")]
+    public OptionsUpdateReasoningSummary? ReasoningSummary { get; set; }
+
+    /// <summary>Whether the session is running in an interactive UI.</summary>
+    [JsonPropertyName("runningInInteractiveMode")]
+    public bool? RunningInInteractiveMode { get; set; }
+
+    /// <summary>Resolved sandbox configuration.</summary>
+    [JsonPropertyName("sandboxConfig")]
+    public SandboxConfig? SandboxConfig { get; set; }
+
+    /// <summary>Origin of the sandbox choice. The runtime uses this only for internal telemetry provenance; managed policy is derived independently.</summary>
+    [JsonInclude]
+    [JsonPropertyName("sandboxConfigSource")]
+    internal SandboxConfigSource? SandboxConfigSource { get; set; }
+
+    /// <summary>Replaces the session's capability set with the given list. Use to enable or disable capabilities mid-session (e.g., remove `memory` for reproducible scripted runs). Omit the field to leave the existing capability set unchanged.</summary>
+    [JsonPropertyName("sessionCapabilities")]
+    public IList<SessionCapability>? SessionCapabilities { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Optional session limits. Pass null to clear the session limits.</summary>
+    [JsonPropertyName("sessionLimits")]
+    public SessionLimitsConfig? SessionLimits { get; set; }
+
+    /// <summary>Per-session settings for built-in shell tools.</summary>
+    [JsonPropertyName("shell")]
+    public ShellOptions? Shell { get; set; }
+
+    /// <summary>Use shell.initProfile instead. Shell init profile (`None` or `NonInteractive`).</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+#if NET5_0_OR_GREATER
+    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
+#endif
+    [JsonPropertyName("shellInitProfile")]
+    public string? ShellInitProfile { get; set; }
+
+    /// <summary>PowerShell process flags applied to built-in and user-requested shell commands.</summary>
+    [JsonPropertyName("shellProcessFlags")]
+    public IList<string>? ShellProcessFlags { get; set; }
+
+    /// <summary>Additional directories to search for skills.</summary>
+    [JsonPropertyName("skillDirectories")]
+    public IList<string>? SkillDirectories { get; set; }
+
+    /// <summary>Whether to skip loading custom instruction sources.</summary>
+    [JsonPropertyName("skipCustomInstructions")]
+    public bool? SkipCustomInstructions { get; set; }
+
+    /// <summary>Whether to skip embedding retrieval pipeline initialization and execution.</summary>
+    [JsonPropertyName("skipEmbeddingRetrieval")]
+    public bool? SkipEmbeddingRetrieval { get; set; }
+
+    /// <summary>When true, the selected custom agent's prompt is not injected into the user message (skill context is still injected). Used by automation triggers where the agent prompt is already in the problem statement.</summary>
+    [JsonPropertyName("suppressCustomAgentPrompt")]
+    public bool? SuppressCustomAgentPrompt { get; set; }
+
+    /// <summary>Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.</summary>
+    [JsonPropertyName("toolFilterPrecedence")]
+    public OptionsUpdateToolFilterPrecedence? ToolFilterPrecedence { get; set; }
+
+    /// <summary>Optional path for trajectory output.</summary>
+    [JsonPropertyName("trajectoryFile")]
+    public string? TrajectoryFile { get; set; }
+
+    /// <summary>Output verbosity level for supported models.</summary>
+    [JsonPropertyName("verbosity")]
+    public Verbosity? Verbosity { get; set; }
+
+    /// <summary>Absolute working-directory path for shell tools.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
+}
+
+/// <summary>Parameters for (re)loading the merged LSP configuration set.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class LspInitializeRequest
+{
+    /// <summary>Force re-initialization even when LSP configs were already loaded for the working directory.</summary>
+    [JsonPropertyName("force")]
+    public bool? Force { get; set; }
+
+    /// <summary>Git root used as the boundary when traversing for project-level LSP configs (supports monorepos).</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Working directory used to load project-level LSP configs. Defaults to the session working directory when omitted.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
+}
+
+/// <summary>Discovered extension metadata, including source-qualified ID, name, discovery source, status, and optional process ID.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class Extension
+{
+    /// <summary>Source-qualified ID (e.g., 'project:my-ext', 'user:auth-helper', 'plugin:my-plugin:my-ext').</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Extension name (directory name).</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Process ID if the extension is running.</summary>
+    [JsonPropertyName("pid")]
+    public long? Pid { get; set; }
+
+    /// <summary>Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin (installed plugin), or session (session-state/&lt;id&gt;/extensions/).</summary>
+    [JsonPropertyName("source")]
+    public ExtensionSource Source { get; set; }
+
+    /// <summary>Current status: running, disabled, failed, or starting.</summary>
+    [JsonPropertyName("status")]
+    public ExtensionStatus Status { get; set; }
+}
+
+/// <summary>Extensions discovered for the session, with their current status.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ExtensionList
+{
+    /// <summary>Discovered extensions and their current status.</summary>
+    [JsonPropertyName("extensions")]
+    public IList<Extension> Extensions { get => field ??= []; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionExtensionsListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Source-qualified extension identifier to enable for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ExtensionsEnableRequest
+{
+    /// <summary>Source-qualified extension ID to enable.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Source-qualified extension identifier to disable for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ExtensionsDisableRequest
+{
+    /// <summary>Source-qualified extension ID to disable.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionExtensionsReloadRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Attachment union accepted by push input, covering files, directories, GitHub objects, blobs, snippets, and extension context.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(PushAttachmentFile), "file")]
+[JsonDerivedType(typeof(PushAttachmentDirectory), "directory")]
+[JsonDerivedType(typeof(PushAttachmentSelection), "selection")]
+[JsonDerivedType(typeof(PushAttachmentGitHubReference), "github_reference")]
+[JsonDerivedType(typeof(PushAttachmentGitHubCommit), "github_commit")]
+[JsonDerivedType(typeof(PushAttachmentGitHubRelease), "github_release")]
+[JsonDerivedType(typeof(PushAttachmentGitHubActionsJob), "github_actions_job")]
+[JsonDerivedType(typeof(PushAttachmentGitHubRepository), "github_repository")]
+[JsonDerivedType(typeof(PushAttachmentGitHubFileDiff), "github_file_diff")]
+[JsonDerivedType(typeof(PushAttachmentGitHubTreeComparison), "github_tree_comparison")]
+[JsonDerivedType(typeof(PushAttachmentGitHubUrl), "github_url")]
+[JsonDerivedType(typeof(PushAttachmentGitHubFile), "github_file")]
+[JsonDerivedType(typeof(PushAttachmentGitHubSnippet), "github_snippet")]
+[JsonDerivedType(typeof(PushAttachmentBlob), "blob")]
+[JsonDerivedType(typeof(PushAttachmentExtensionContext), "extension_context")]
+public partial class PushAttachment
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
+}
+
+
+/// <summary>Optional line range to scope the attachment to a specific section of the file.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PushAttachmentFileLineRange
+{
+    /// <summary>End line number (1-based, inclusive).</summary>
+    [JsonPropertyName("end")]
+    public long End { get; set; }
+
+    /// <summary>Start line number (1-based).</summary>
+    [JsonPropertyName("start")]
+    public long Start { get; set; }
+}
+
+/// <summary>File attachment.</summary>
+/// <remarks>The <c>file</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentFile : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "file";
+
+    /// <summary>User-facing display name for the attachment.</summary>
+    [JsonPropertyName("displayName")]
+    public required string DisplayName { get; set; }
+
+    /// <summary>Optional line range to scope the attachment to a specific section of the file.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("lineRange")]
+    public PushAttachmentFileLineRange? LineRange { get; set; }
+
+    /// <summary>Absolute file path.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
+}
+
+/// <summary>Directory attachment.</summary>
+/// <remarks>The <c>directory</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentDirectory : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "directory";
+
+    /// <summary>User-facing display name for the attachment.</summary>
+    [JsonPropertyName("displayName")]
+    public required string DisplayName { get; set; }
+
+    /// <summary>Absolute directory path.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
+}
+
+/// <summary>End position of the selection.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PushAttachmentSelectionDetailsEnd
+{
+    /// <summary>End character offset within the line (0-based).</summary>
+    [JsonPropertyName("character")]
+    public long Character { get; set; }
+
+    /// <summary>End line number (0-based).</summary>
+    [JsonPropertyName("line")]
+    public long Line { get; set; }
+}
+
+/// <summary>Start position of the selection.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PushAttachmentSelectionDetailsStart
+{
+    /// <summary>Start character offset within the line (0-based).</summary>
+    [JsonPropertyName("character")]
+    public long Character { get; set; }
+
+    /// <summary>Start line number (0-based).</summary>
+    [JsonPropertyName("line")]
+    public long Line { get; set; }
+}
+
+/// <summary>Position range of the selection within the file.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PushAttachmentSelectionDetails
+{
+    /// <summary>End position of the selection.</summary>
+    [JsonPropertyName("end")]
+    public PushAttachmentSelectionDetailsEnd End { get => field ??= new(); set; }
+
+    /// <summary>Start position of the selection.</summary>
+    [JsonPropertyName("start")]
+    public PushAttachmentSelectionDetailsStart Start { get => field ??= new(); set; }
+}
+
+/// <summary>Code selection attachment from an editor.</summary>
+/// <remarks>The <c>selection</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentSelection : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "selection";
+
+    /// <summary>User-facing display name for the selection.</summary>
+    [JsonPropertyName("displayName")]
+    public required string DisplayName { get; set; }
+
+    /// <summary>Absolute path to the file containing the selection.</summary>
+    [JsonPropertyName("filePath")]
+    public required string FilePath { get; set; }
+
+    /// <summary>Position range of the selection within the file.</summary>
+    [JsonPropertyName("selection")]
+    public required PushAttachmentSelectionDetails Selection { get; set; }
+
+    /// <summary>The selected text content.</summary>
+    [JsonPropertyName("text")]
+    public required string Text { get; set; }
+}
+
+/// <summary>GitHub issue, pull request, or discussion reference.</summary>
+/// <remarks>The <c>github_reference</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubReference : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_reference";
+
+    /// <summary>Issue, pull request, or discussion number.</summary>
+    [JsonPropertyName("number")]
+    public required long Number { get; set; }
+
+    /// <summary>Type of GitHub reference.</summary>
+    [JsonPropertyName("referenceType")]
+    public required PushAttachmentGitHubReferenceType ReferenceType { get; set; }
+
+    /// <summary>Current state of the referenced item (e.g., open, closed, merged).</summary>
+    [JsonPropertyName("state")]
+    public required string State { get; set; }
+
+    /// <summary>Title of the referenced item.</summary>
+    [JsonPropertyName("title")]
+    public required string Title { get; set; }
+
+    /// <summary>URL to the referenced item on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
+
+/// <summary>Pointer to a GitHub repository.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PushGitHubRepoRef
+{
+    /// <summary>Numeric GitHub repository id.</summary>
+    [JsonPropertyName("id")]
+    public long? Id { get; set; }
+
+    /// <summary>Repository name (without owner).</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Repository owner login (user or organization).</summary>
+    [JsonPropertyName("owner")]
+    public string Owner { get; set; } = string.Empty;
+}
+
+/// <summary>Pointer to a GitHub commit.</summary>
+/// <remarks>The <c>github_commit</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubCommit : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_commit";
+
+    /// <summary>First line of the commit message.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Full commit SHA.</summary>
+    [JsonPropertyName("oid")]
+    public required string Oid { get; set; }
+
+    /// <summary>Repository the commit belongs to.</summary>
+    [JsonPropertyName("repo")]
+    public required PushGitHubRepoRef Repo { get; set; }
+
+    /// <summary>URL to the commit on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
+
+/// <summary>Pointer to a GitHub release.</summary>
+/// <remarks>The <c>github_release</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubRelease : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_release";
+
+    /// <summary>Human-readable release name.</summary>
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
+
+    /// <summary>Repository the release belongs to.</summary>
+    [JsonPropertyName("repo")]
+    public required PushGitHubRepoRef Repo { get; set; }
+
+    /// <summary>Git tag the release is anchored to.</summary>
+    [JsonPropertyName("tagName")]
+    public required string TagName { get; set; }
+
+    /// <summary>URL to the release on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
+
+/// <summary>Pointer to a GitHub Actions job.</summary>
+/// <remarks>The <c>github_actions_job</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubActionsJob : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_actions_job";
+
+    /// <summary>Terminal conclusion of the job when finished (e.g., success, failure, cancelled). Absent for in-progress jobs.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("conclusion")]
+    public string? Conclusion { get; set; }
+
+    /// <summary>Job id within the workflow run.</summary>
+    [JsonPropertyName("jobId")]
+    public required long JobId { get; set; }
+
+    /// <summary>Display name of the job.</summary>
+    [JsonPropertyName("jobName")]
+    public required string JobName { get; set; }
+
+    /// <summary>Repository the workflow run belongs to.</summary>
+    [JsonPropertyName("repo")]
+    public required PushGitHubRepoRef Repo { get; set; }
+
+    /// <summary>URL to the job on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+
+    /// <summary>Display name of the workflow the job ran in.</summary>
+    [JsonPropertyName("workflowName")]
+    public required string WorkflowName { get; set; }
+}
+
+/// <summary>Pointer to a GitHub repository.</summary>
+/// <remarks>The <c>github_repository</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubRepository : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_repository";
+
+    /// <summary>Short description of the repository.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Git ref this attachment is anchored at (branch, tag, or commit). When absent the default branch is implied.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ref")]
+    public string? Ref { get; set; }
+
+    /// <summary>Repository pointer.</summary>
+    [JsonPropertyName("repo")]
+    public required PushGitHubRepoRef Repo { get; set; }
+
+    /// <summary>URL to the repository on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
+
+/// <summary>One side of a file diff (head or base).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PushAttachmentGitHubFileDiffSide
+{
+    /// <summary>Repository-relative path to the file.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Git ref (branch, tag, or commit SHA) the file is read at.</summary>
+    [JsonPropertyName("ref")]
+    public string Ref { get; set; } = string.Empty;
+
+    /// <summary>Repository the file lives in.</summary>
+    [JsonPropertyName("repo")]
+    public PushGitHubRepoRef Repo { get => field ??= new(); set; }
+}
+
+/// <summary>Pointer to a single-file diff. At least one of `head` and `base` must be present.</summary>
+/// <remarks>The <c>github_file_diff</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubFileDiff : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_file_diff";
+
+    /// <summary>File location on the base side of the diff. Absent for additions.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("base")]
+    public PushAttachmentGitHubFileDiffSide? Base { get; set; }
+
+    /// <summary>File location on the head side of the diff. Absent for deletions.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("head")]
+    public PushAttachmentGitHubFileDiffSide? Head { get; set; }
+
+    /// <summary>URL to the diff on GitHub (e.g., a commit, compare, or PR-file URL).</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
+
+/// <summary>One side of a tree comparison (head or base).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PushAttachmentGitHubTreeComparisonSide
+{
+    /// <summary>Repository the revision belongs to.</summary>
+    [JsonPropertyName("repo")]
+    public PushGitHubRepoRef Repo { get => field ??= new(); set; }
+
+    /// <summary>Git revision (branch, tag, or commit SHA).</summary>
+    [JsonPropertyName("revision")]
+    public string Revision { get; set; } = string.Empty;
+}
+
+/// <summary>Pointer to a comparison between two git revisions.</summary>
+/// <remarks>The <c>github_tree_comparison</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubTreeComparison : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_tree_comparison";
+
+    /// <summary>Base side of the comparison.</summary>
+    [JsonPropertyName("base")]
+    public required PushAttachmentGitHubTreeComparisonSide Base { get; set; }
+
+    /// <summary>Head side of the comparison.</summary>
+    [JsonPropertyName("head")]
+    public required PushAttachmentGitHubTreeComparisonSide Head { get; set; }
+
+    /// <summary>URL to the comparison on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
+
+/// <summary>Generic GitHub URL reference.</summary>
+/// <remarks>The <c>github_url</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubUrl : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_url";
+
+    /// <summary>URL to the GitHub resource.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
+
+/// <summary>Pointer to a file in a GitHub repository at a specific ref.</summary>
+/// <remarks>The <c>github_file</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubFile : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_file";
+
+    /// <summary>Repository-relative path to the file.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
+
+    /// <summary>Git ref the file is read at (branch, tag, or commit SHA).</summary>
+    [JsonPropertyName("ref")]
+    public required string Ref { get; set; }
+
+    /// <summary>Repository the file lives in.</summary>
+    [JsonPropertyName("repo")]
+    public required PushGitHubRepoRef Repo { get; set; }
+
+    /// <summary>URL to the file on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
+
+/// <summary>Pointer to a line range inside a file in a GitHub repository.</summary>
+/// <remarks>The <c>github_snippet</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentGitHubSnippet : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_snippet";
+
+    /// <summary>Line range the snippet covers.</summary>
+    [JsonPropertyName("lineRange")]
+    public required PushAttachmentFileLineRange LineRange { get; set; }
+
+    /// <summary>Repository-relative path to the file.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
+
+    /// <summary>Git ref the file is read at (branch, tag, or commit SHA).</summary>
+    [JsonPropertyName("ref")]
+    public required string Ref { get; set; }
+
+    /// <summary>Repository the file lives in.</summary>
+    [JsonPropertyName("repo")]
+    public required PushGitHubRepoRef Repo { get; set; }
+
+    /// <summary>URL to the snippet on GitHub (with line anchor).</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
+
+/// <summary>Blob attachment with inline base64-encoded data.</summary>
+/// <remarks>The <c>blob</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentBlob : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "blob";
+
+    /// <summary>Base64-encoded content.</summary>
+    [Base64String]
+    [JsonPropertyName("data")]
+    public required string Data { get; set; }
+
+    /// <summary>User-facing display name for the attachment.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
+
+    /// <summary>MIME type of the inline data.</summary>
+    [JsonPropertyName("mimeType")]
+    public required string MimeType { get; set; }
+}
+
+/// <summary>Slim input shape for extension_context attachments; identity fields are runtime-derived.</summary>
+/// <remarks>The <c>extension_context</c> variant of <see cref="PushAttachment"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PushAttachmentExtensionContext : PushAttachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "extension_context";
+
+    /// <summary>Caller-supplied JSON payload (required, may be null but not undefined).</summary>
+    [JsonPropertyName("payload")]
+    public required JsonElement Payload { get; set; }
+
+    /// <summary>Human-readable composer pill label.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("title")]
+    public required string Title { get; set; }
+}
+
+/// <summary>Parameters for session.extensions.sendAttachmentsToMessage.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SendAttachmentsToMessageParams
+{
+    /// <summary>Attachments to push into the next user-message turn. extension_context entries take the slim shape; standard variants take their full AttachmentSchema shape.</summary>
+    [JsonPropertyName("attachments")]
+    public IList<PushAttachment> Attachments { get => field ??= []; set; }
+
+    /// <summary>Optional canvas instance binding the push for provenance. When supplied, the runtime resolves the canvas, verifies it is owned by the calling extension, and stamps canvasId/instanceId onto each extension_context entry. When omitted, no resolution runs and those fields stay unset on the attachment.</summary>
+    [JsonPropertyName("instanceId")]
+    public string? InstanceId { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>A tool name and arguments to execute through the session's native invocation pipeline.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ToolsExecuteRequest
+{
+    /// <summary>Arguments supplied to the tool.</summary>
+    [JsonPropertyName("arguments")]
+    public JsonElement Arguments { get; set; }
+
+    /// <summary>Name of the currently offered tool to execute.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Optional identifier used to correlate this invocation with its tool call.</summary>
+    [JsonPropertyName("toolCallId")]
+    public string? ToolCallId { get; set; }
+}
+
+/// <summary>Custom grammar input format accepted by a built-in tool.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class BuiltinToolFormat
+{
+    /// <summary>Grammar definition accepted by the tool.</summary>
+    [JsonPropertyName("definition")]
+    public string Definition { get; set; } = string.Empty;
+
+    /// <summary>Grammar syntax used by the format definition.</summary>
+    [JsonPropertyName("syntax")]
+    public string Syntax { get; set; } = string.Empty;
+
+    /// <summary>Custom input-format discriminator.</summary>
+    [JsonPropertyName("type")]
+    public BuiltinToolFormatType Type { get; set; }
+}
+
+/// <summary>JSON Schema object accepted by a built-in tool.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class BuiltinToolInputSchema
+{
+    /// <summary>Root type of the tool input schema.</summary>
+    [JsonPropertyName("type")]
+    public BuiltinToolInputSchemaType Type { get; set; }
+}
+
+/// <summary>Rust-owned metadata and input schema for a built-in tool.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class BuiltinToolDescriptor
+{
+    /// <summary>Model-facing description of the tool's behavior.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Optional custom input format used instead of a JSON Schema.</summary>
+    [JsonPropertyName("format")]
+    public BuiltinToolFormat? Format { get; set; }
+
+    /// <summary>Whether the tool provides a specialized intention summary.</summary>
+    [JsonPropertyName("hasSummariseIntention")]
+    public bool HasSummariseIntention { get; set; }
+
+    /// <summary>JSON Schema for the tool input, or null when the tool uses a custom format.</summary>
+    [JsonPropertyName("inputSchema")]
+    public BuiltinToolInputSchema? InputSchema { get; set; }
+
+    /// <summary>Optional supplemental usage instructions for the tool.</summary>
+    [JsonPropertyName("instructions")]
+    public string? Instructions { get; set; }
+
+    /// <summary>Whether the tool executes commands in a terminal.</summary>
+    [JsonPropertyName("isTerminal")]
+    public bool IsTerminal { get; set; }
+
+    /// <summary>Stable name used to invoke the built-in tool.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Policy describing which tool metadata may be recorded without obfuscation.</summary>
+    [JsonPropertyName("safeForTelemetry")]
+    public JsonElement SafeForTelemetry { get; set; }
+
+    /// <summary>Optional human-readable title for the tool.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    /// <summary>Optional tool category discriminator.</summary>
+    [JsonPropertyName("type")]
+    public string? Type { get; set; }
+}
+
+/// <summary>Rust-owned built-in tool descriptors for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ToolsGetBuiltinDescriptorsResult
+{
+    /// <summary>Built-in tool descriptors materialized for the session.</summary>
+    [JsonPropertyName("tools")]
+    public IList<BuiltinToolDescriptor> Tools { get => field ??= []; set; }
+}
+
+/// <summary>Shell-specific names and description lines used to materialize built-in shell tool descriptors.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ToolsShellDescriptorConfig
+{
+    /// <summary>Additional model-facing shell description lines.</summary>
+    [JsonPropertyName("descriptionLines")]
+    public IList<string> DescriptionLines { get => field ??= []; set; }
+
+    /// <summary>Human-readable shell name.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
+
+    /// <summary>Tool name used to list active shells.</summary>
+    [JsonPropertyName("listShellsToolName")]
+    public string ListShellsToolName { get; set; } = string.Empty;
+
+    /// <summary>Tool name used to read shell output.</summary>
+    [JsonPropertyName("readShellToolName")]
+    public string ReadShellToolName { get; set; } = string.Empty;
+
+    /// <summary>Tool name used to start shell commands.</summary>
+    [JsonPropertyName("shellToolName")]
+    public string ShellToolName { get; set; } = string.Empty;
+
+    /// <summary>Stable shell type identifier.</summary>
+    [JsonPropertyName("shellType")]
+    public string ShellType { get; set; } = string.Empty;
+
+    /// <summary>Tool name used to stop shell commands.</summary>
+    [JsonPropertyName("stopShellToolName")]
+    public string StopShellToolName { get; set; } = string.Empty;
+}
+
+/// <summary>Options controlling how Rust-owned built-in tool descriptors are materialized.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ToolsGetBuiltinDescriptorsRequest
+{
+    /// <summary>Whether background task completion notifications are enabled.</summary>
+    [JsonPropertyName("backgroundTaskNotificationsEnabled")]
+    public bool? BackgroundTaskNotificationsEnabled { get; set; }
+
+    /// <summary>Whether tool descriptors should include authoring metadata.</summary>
+    [JsonPropertyName("includeAuthor")]
+    public bool? IncludeAuthor { get; set; }
+
+    /// <summary>Whether line numbers should be omitted from the view tool descriptor.</summary>
+    [JsonPropertyName("noViewLineNumbers")]
+    public bool? NoViewLineNumbers { get; set; }
+
+    /// <summary>Whether descriptors should favor fewer user-intervention prompts.</summary>
+    [JsonPropertyName("reduceUserIntervention")]
+    public bool? ReduceUserIntervention { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Whether shell commands may only run asynchronously.</summary>
+    [JsonPropertyName("shellAsyncOnlyEnabled")]
+    public bool? ShellAsyncOnlyEnabled { get; set; }
+
+    /// <summary>Shell-specific names and description lines for shell tools.</summary>
+    [JsonPropertyName("shellConfig")]
+    public ToolsShellDescriptorConfig? ShellConfig { get; set; }
+
+    /// <summary>Whether the configured shell supports PowerShell 7 syntax.</summary>
+    [JsonPropertyName("shellSupportsPowerShell7Syntax")]
+    public bool? ShellSupportsPowerShell7Syntax { get; set; }
+
+    /// <summary>Default shell timeout in milliseconds.</summary>
+    [JsonPropertyName("shellTimeoutMs")]
+    public double? ShellTimeoutMs { get; set; }
+
+    /// <summary>Whether semantic skill lookup is available.</summary>
+    [JsonPropertyName("skillEmbeddingEnabled")]
+    public bool? SkillEmbeddingEnabled { get; set; }
+}
+
+/// <summary>Task completion notification with summary from the agent.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TaskCompleteData
+{
+    /// <summary>Active autopilot objective ID evaluated by the completion reviewer.</summary>
+    [JsonPropertyName("objectiveId")]
+    public long? ObjectiveId { get; set; }
+
+    /// <summary>Semantic completion decision. Absent on legacy events and invalid tool calls.</summary>
+    [JsonPropertyName("outcome")]
+    public TaskCompletionOutcome? Outcome { get; set; }
+
+    /// <summary>Label-safe runtime rationale for the completion decision (e.g. a cancellation or pause/resume downgrade), when one applies. Reviewer-authored rationale is intentionally omitted here because this event has no IFC label channel; the reviewer's findings remain available through its own labeled sub-agent events.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
+
+    /// <summary>Whether the task was accepted as complete. False when validation failed or completion was rejected or blocked by the reviewer.</summary>
+    [JsonPropertyName("success")]
+    public bool? Success { get; set; }
+
+    /// <summary>Summary of the completed task, provided by the agent.</summary>
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
+}
+
+/// <summary>Binary result returned by a tool for the model.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ExternalToolTextResultForLlmBinaryResultsForLlm
+{
+    /// <summary>Base64-encoded binary data.</summary>
+    [Base64String]
+    [JsonPropertyName("data")]
+    public string Data { get; set; } = string.Empty;
+
+    /// <summary>Human-readable description of the binary data.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Optional metadata from the producing tool.</summary>
+    [JsonPropertyName("metadata")]
+    public IDictionary<string, JsonElement>? Metadata { get; set; }
+
+    /// <summary>MIME type of the binary data.</summary>
+    [JsonPropertyName("mimeType")]
+    public string MimeType { get; set; } = string.Empty;
+
+    /// <summary>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
+    [JsonPropertyName("type")]
+    public ExternalToolTextResultForLlmBinaryResultsForLlmType Type { get; set; }
+}
+
+/// <summary>A content block within a tool result, which may be text, terminal output, image, audio, or a resource.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(ExternalToolTextResultForLlmContentText), "text")]
+[JsonDerivedType(typeof(ExternalToolTextResultForLlmContentTerminal), "terminal")]
+[JsonDerivedType(typeof(ExternalToolTextResultForLlmContentShellExit), "shell_exit")]
+[JsonDerivedType(typeof(ExternalToolTextResultForLlmContentImage), "image")]
+[JsonDerivedType(typeof(ExternalToolTextResultForLlmContentAudio), "audio")]
+[JsonDerivedType(typeof(ExternalToolTextResultForLlmContentResourceLink), "resource_link")]
+[JsonDerivedType(typeof(ExternalToolTextResultForLlmContentResource), "resource")]
+public partial class ExternalToolTextResultForLlmContent
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
+}
+
+
+/// <summary>Plain text content block.</summary>
+/// <remarks>The <c>text</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class ExternalToolTextResultForLlmContentText : ExternalToolTextResultForLlmContent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "text";
+
+    /// <summary>The text content.</summary>
+    [JsonPropertyName("text")]
+    public required string Text { get; set; }
+}
+
+/// <summary>Terminal/shell output content block with optional exit code and working directory.</summary>
+/// <remarks>The <c>terminal</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class ExternalToolTextResultForLlmContentTerminal : ExternalToolTextResultForLlmContent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "terminal";
+
+    /// <summary>Working directory where the command was executed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
+
+    /// <summary>Process exit code, if the command has completed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("exitCode")]
+    public long? ExitCode { get; set; }
+
+    /// <summary>Terminal/shell output text.</summary>
+    [JsonPropertyName("text")]
+    public required string Text { get; set; }
+}
+
+/// <summary>Shell command exit metadata with optional output preview.</summary>
+/// <remarks>The <c>shell_exit</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class ExternalToolTextResultForLlmContentShellExit : ExternalToolTextResultForLlmContent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "shell_exit";
+
+    /// <summary>Working directory where the shell command was executed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
+
+    /// <summary>Exit code from the completed shell command.</summary>
+    [JsonPropertyName("exitCode")]
+    public required long ExitCode { get; set; }
+
+    /// <summary>Output associated with this shell command, if available. May be partial, truncated, or a preview; not guaranteed to be full output.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("outputPreview")]
+    public string? OutputPreview { get; set; }
+
+    /// <summary>Whether outputPreview is known to be incomplete or truncated.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("outputTruncated")]
+    public bool? OutputTruncated { get; set; }
+
+    /// <summary>Shell id, as assigned by Copilot runtime.</summary>
+    [JsonPropertyName("shellId")]
+    public required string ShellId { get; set; }
+}
+
+/// <summary>Image content block with base64-encoded data.</summary>
+/// <remarks>The <c>image</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class ExternalToolTextResultForLlmContentImage : ExternalToolTextResultForLlmContent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "image";
+
+    /// <summary>Base64-encoded image data.</summary>
+    [Base64String]
+    [JsonPropertyName("data")]
+    public required string Data { get; set; }
+
+    /// <summary>MIME type of the image (e.g., image/png, image/jpeg).</summary>
+    [JsonPropertyName("mimeType")]
+    public required string MimeType { get; set; }
+}
+
+/// <summary>Audio content block with base64-encoded data.</summary>
+/// <remarks>The <c>audio</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class ExternalToolTextResultForLlmContentAudio : ExternalToolTextResultForLlmContent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "audio";
+
+    /// <summary>Base64-encoded audio data.</summary>
+    [Base64String]
+    [JsonPropertyName("data")]
+    public required string Data { get; set; }
+
+    /// <summary>MIME type of the audio (e.g., audio/wav, audio/mpeg).</summary>
+    [JsonPropertyName("mimeType")]
+    public required string MimeType { get; set; }
+}
+
+/// <summary>Icon image for a resource.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ExternalToolTextResultForLlmContentResourceLinkIcon
+{
+    /// <summary>MIME type of the icon image.</summary>
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
+
+    /// <summary>Available icon sizes (e.g., ['16x16', '32x32']).</summary>
+    [JsonPropertyName("sizes")]
+    public IList<string>? Sizes { get; set; }
+
+    /// <summary>URL or path to the icon image.</summary>
+    [JsonPropertyName("src")]
+    public string Src { get; set; } = string.Empty;
+
+    /// <summary>Theme variant this icon is intended for.</summary>
+    [JsonPropertyName("theme")]
+    public ExternalToolTextResultForLlmContentResourceLinkIconTheme? Theme { get; set; }
+}
+
+/// <summary>Resource link content block referencing an external resource.</summary>
+/// <remarks>The <c>resource_link</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class ExternalToolTextResultForLlmContentResourceLink : ExternalToolTextResultForLlmContent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "resource_link";
+
+    /// <summary>Human-readable description of the resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Icons associated with this resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("icons")]
+    public IList<ExternalToolTextResultForLlmContentResourceLinkIcon>? Icons { get; set; }
+
+    /// <summary>MIME type of the resource content.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
+
+    /// <summary>Resource name identifier.</summary>
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
+
+    /// <summary>Size of the resource in bytes.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("size")]
+    public long? Size { get; set; }
+
+    /// <summary>Human-readable display title for the resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    /// <summary>URI identifying the resource.</summary>
+    [JsonPropertyName("uri")]
+    public required string Uri { get; set; }
+}
+
+/// <summary>Embedded resource content block with inline text or binary data.</summary>
+/// <remarks>The <c>resource</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class ExternalToolTextResultForLlmContentResource : ExternalToolTextResultForLlmContent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "resource";
+
+    /// <summary>The embedded resource contents, either text or base64-encoded binary.</summary>
+    [JsonPropertyName("resource")]
+    public required JsonElement Resource { get; set; }
+}
+
+/// <summary>A message injected by a tool result.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ToolResultNewMessage
+{
+    /// <summary>Message content to inject after the tool result.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
+
+    /// <summary>Source attributed to the injected message.</summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; } = string.Empty;
+}
+
+/// <summary>RPC data type for TaskCompletionDecision operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class TaskCompletionDecision
+{
+    /// <summary>Objective eligibility token captured when the decision was evaluated.</summary>
+    [JsonPropertyName("completionEligibilityToken")]
+    public long? CompletionEligibilityToken { get; set; }
+
+    /// <summary>Whether completion was accepted after the reviewer-rejection budget was exhausted.</summary>
+    [JsonPropertyName("completionRejectionBudgetExhausted")]
+    public bool? CompletionRejectionBudgetExhausted { get; set; }
+
+    /// <summary>Active autopilot objective evaluated by the completion reviewer.</summary>
+    [JsonPropertyName("objectiveId")]
+    public long? ObjectiveId { get; set; }
+
+    /// <summary>Semantic result of evaluating the task completion request.</summary>
+    [JsonPropertyName("outcome")]
+    public TaskCompletionOutcome Outcome { get; set; }
+
+    /// <summary>Rationale for the completion decision, when one is available.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
+
+    /// <summary>Whether the rationale was derived from completion-reviewer output.</summary>
+    [JsonPropertyName("reviewerDerived")]
+    public bool? ReviewerDerived { get; set; }
+
+    /// <summary>Information-flow metadata captured from the completion reviewer.</summary>
+    [JsonPropertyName("reviewerResultMeta")]
+    public JsonElement? ReviewerResultMeta { get; set; }
+}
+
+/// <summary>Expanded canonical result returned by a session tool.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ToolResultExpanded
+{
+    /// <summary>Base64-encoded binary results returned to the model.</summary>
+    [JsonPropertyName("binaryResultsForLlm")]
+    public IList<ExternalToolTextResultForLlmBinaryResultsForLlm>? BinaryResultsForLlm { get; set; }
+
+    /// <summary>Sources returned by the tool that the model may cite.</summary>
+    [JsonPropertyName("citableSources")]
+    public IList<JsonElement>? CitableSources { get; set; }
+
+    /// <summary>Structured content blocks returned to the model.</summary>
+    [JsonPropertyName("contents")]
+    public IList<ExternalToolTextResultForLlmContent>? Contents { get; set; }
+
+    /// <summary>Error message for an unsuccessful execution.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Metadata propagated with the tool result, including information-flow labels.</summary>
+    [JsonPropertyName("mcpMeta")]
+    public IDictionary<string, JsonElement>? McpMeta { get; set; }
+
+    /// <summary>Messages to inject after the tool result.</summary>
+    [JsonPropertyName("newMessages")]
+    public IList<ToolResultNewMessage>? NewMessages { get; set; }
+
+    /// <summary>Whether post-tool-use failure hooks have already processed this result.</summary>
+    [JsonPropertyName("postToolUseFailureHooksProcessed")]
+    public bool? PostToolUseFailureHooksProcessed { get; set; }
+
+    /// <summary>Execution outcome classification.</summary>
+    [JsonPropertyName("resultType")]
+    public ToolResultType ResultType { get; set; }
+
+    /// <summary>Detailed log content available for session display.</summary>
+    [JsonPropertyName("sessionLog")]
+    public string? SessionLog { get; set; }
+
+    /// <summary>Skill invocation metadata produced by the tool.</summary>
+    [JsonPropertyName("skillInvocation")]
+    public JsonElement? SkillInvocation { get; set; }
+
+    /// <summary>Whether large-output post-processing should be skipped.</summary>
+    [JsonPropertyName("skipLargeOutputProcessing")]
+    public bool? SkipLargeOutputProcessing { get; set; }
+
+    /// <summary>Structured result content in addition to the model-facing text.</summary>
+    [JsonPropertyName("structuredContent")]
+    public JsonElement? StructuredContent { get; set; }
+
+    /// <summary>Completion-review decision produced by the task-completion tool.</summary>
+    [JsonPropertyName("taskCompletionDecision")]
+    public TaskCompletionDecision? TaskCompletionDecision { get; set; }
+
+    /// <summary>Text result returned to the model.</summary>
+    [JsonPropertyName("textResultForLlm")]
+    public string TextResultForLlm { get; set; } = string.Empty;
+
+    /// <summary>Deferred tool names made available by this result.</summary>
+    [JsonPropertyName("toolReferences")]
+    public IList<string>? ToolReferences { get; set; }
+
+    /// <summary>Tool-specific telemetry payload.</summary>
+    [JsonPropertyName("toolTelemetry")]
+    public JsonElement? ToolTelemetry { get; set; }
+
+    /// <summary>Optional UI resource produced by the tool.</summary>
+    [JsonPropertyName("uiResource")]
+    public JsonElement? UiResource { get; set; }
+}
+
+/// <summary>Task-completion tool arguments and final result used to build a label-safe session event payload.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ToolsTaskCompleteEventDataRequest
+{
+    /// <summary>Final expanded result returned by the task_complete tool.</summary>
+    [JsonPropertyName("finalResult")]
+    public ToolResultExpanded FinalResult { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Arguments supplied to the completed task_complete tool call.</summary>
+    [JsonPropertyName("toolArgs")]
+    public JsonElement ToolArgs { get; set; }
+}
+
+/// <summary>Indicates whether the external tool call result was handled successfully.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class HandlePendingToolCallResult
+{
+    /// <summary>Whether the tool call result was handled successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Pending external tool call request ID, with the tool result or an error describing why it failed.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class HandlePendingToolCallRequest
+{
+    /// <summary>Error message if the tool call failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Request ID of the pending tool call.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Tool call result (string or expanded result object).</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Resolve, build, and validate the runtime tool list for this session. Subagent sessions and consumer flows that need an initialized tool set before `send` invoke this. Default base-class implementation is a no-op for sessions that don't support tool validation.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ToolsInitializeAndValidateResult
+{
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionToolsInitializeAndValidateRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Lightweight metadata for a currently initialized session tool.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CurrentToolMetadata
+{
+    /// <summary>Whether the tool is loaded on demand via tool search.</summary>
+    [JsonPropertyName("deferLoading")]
+    public bool? DeferLoading { get; set; }
+
+    /// <summary>Tool description.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>JSON Schema for tool input.</summary>
+    [JsonPropertyName("input_schema")]
+    public IDictionary<string, JsonElement>? InputSchema { get; set; }
+
+    /// <summary>MCP server name for MCP-backed tools.</summary>
+    [JsonPropertyName("mcpServerName")]
+    public string? McpServerName { get; set; }
+
+    /// <summary>Raw MCP tool name for MCP-backed tools.</summary>
+    [JsonPropertyName("mcpToolName")]
+    public string? McpToolName { get; set; }
+
+    /// <summary>Model-facing tool name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Optional MCP/config namespaced tool name.</summary>
+    [JsonPropertyName("namespacedName")]
+    public string? NamespacedName { get; set; }
+}
+
+/// <summary>Current lightweight tool metadata snapshot for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ToolsGetCurrentMetadataResult
+{
+    /// <summary>Current tool metadata, or null when tools have not been initialized yet.</summary>
+    [JsonPropertyName("tools")]
+    public IList<CurrentToolMetadata>? Tools { get; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionToolsGetCurrentMetadataRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Empty result after replacing the calling connection's externally implemented tools.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ToolsSetResult
+{
+}
+
+/// <summary>Serializable definition of a caller-implemented tool whose execution is handled over the SDK connection.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ProtocolExternalToolDefinition
+{
+    /// <summary>Tool-loading deferral policy.</summary>
+    [JsonPropertyName("defer")]
+    public ProtocolExternalToolDefer? Defer { get; set; }
+
+    /// <summary>Model-visible explanation of what the tool does.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Whether the tool executes commands in a terminal.</summary>
+    [JsonPropertyName("isTerminal")]
+    public bool? IsTerminal { get; set; }
+
+    /// <summary>Optional caller-defined metadata associated with the tool.</summary>
+    [JsonPropertyName("metadata")]
+    public IDictionary<string, JsonElement>? Metadata { get; set; }
+
+    /// <summary>Unique model-visible tool name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Whether this definition replaces a built-in tool with the same name.</summary>
+    [JsonPropertyName("overridesBuiltInTool")]
+    public bool? OverridesBuiltInTool { get; set; }
+
+    /// <summary>JSON Schema describing the tool's input arguments.</summary>
+    [JsonPropertyName("parameters")]
+    public IDictionary<string, JsonElement>? Parameters { get; set; }
+
+    /// <summary>Whether execution bypasses the normal tool permission prompt.</summary>
+    [JsonPropertyName("skipPermission")]
+    public bool? SkipPermission { get; set; }
+
+    /// <summary>Optional human-readable display title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+}
+
+/// <summary>Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ToolsSetRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Complete replacement list for the calling connection.</summary>
+    [JsonPropertyName("tools")]
+    public IList<ProtocolExternalToolDefinition> Tools { get => field ??= []; set; }
+}
+
+/// <summary>Empty result after applying subagent settings.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ToolsUpdateSubagentSettingsResult
+{
+}
+
+/// <summary>Subagent model, reasoning effort, and context tier settings.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SubagentSettingsEntry
+{
+    /// <summary>Context tier override for matching subagents.</summary>
+    [JsonPropertyName("contextTier")]
+    public SubagentSettingsEntryContextTier? ContextTier { get; set; }
+
+    /// <summary>Reasoning effort override for matching subagents.</summary>
+    [JsonPropertyName("effortLevel")]
+    public string? EffortLevel { get; set; }
+
+    /// <summary>Model override for matching subagents.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+}
+
+/// <summary>Configured per-agent subagent overrides.</summary>
+public sealed class UpdateSubagentSettingsRequestSubagents
+{
+    /// <summary>Per-agent settings keyed by subagent agent_type.</summary>
+    [JsonPropertyName("agents")]
+    public IDictionary<string, SubagentSettingsEntry>? Agents { get; set; }
+
+    /// <summary>Names of subagents the user has turned off; they cannot be dispatched.</summary>
+    [JsonPropertyName("disabledSubagents")]
+    public IList<string>? DisabledSubagents { get; set; }
+
+    /// <summary>Maximum number of subagents that can run concurrently; applies to usage-based billing users only.</summary>
+    [JsonPropertyName("maxConcurrency")]
+    public int? MaxConcurrency { get; set; }
+
+    /// <summary>Maximum subagent nesting depth; applies to usage-based billing users only.</summary>
+    [JsonPropertyName("maxDepth")]
+    public int? MaxDepth { get; set; }
+}
+
+/// <summary>Subagent settings to apply to the current session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UpdateSubagentSettingsRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Subagent settings to apply, or null to clear the live session override.</summary>
+    [JsonPropertyName("subagents")]
+    public UpdateSubagentSettingsRequestSubagents? Subagents { get; set; }
+}
+
+/// <summary>RPC data type for SessionCommandsList operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionCommandsListRequest
+{
+    /// <summary>Include runtime built-in commands.</summary>
+    [JsonPropertyName("includeBuiltins")]
+    public bool? IncludeBuiltins { get; set; }
+
+    /// <summary>Include commands registered by protocol clients, including SDK clients and extensions.</summary>
+    [JsonPropertyName("includeClientCommands")]
+    public bool? IncludeClientCommands { get; set; }
+
+    /// <summary>Include enabled user-invocable skills and commands.</summary>
+    [JsonPropertyName("includeSkills")]
+    public bool? IncludeSkills { get; set; }
+}
+
+/// <summary>RPC data type for SessionCommandsListRequestWithSession operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionCommandsListRequestWithSession
+{
+    /// <summary>Include runtime built-in commands.</summary>
+    [JsonPropertyName("includeBuiltins")]
+    public bool? IncludeBuiltins { get; set; }
+
+    /// <summary>Include commands registered by protocol clients, including SDK clients and extensions.</summary>
+    [JsonPropertyName("includeClientCommands")]
+    public bool? IncludeClientCommands { get; set; }
+
+    /// <summary>Include enabled user-invocable skills and commands.</summary>
+    [JsonPropertyName("includeSkills")]
+    public bool? IncludeSkills { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Result of invoking the slash command (text output, prompt to send to the agent, completion, or subcommand selection).</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SlashCommandInvocationResultText), "text")]
+[JsonDerivedType(typeof(SlashCommandInvocationResultAgentPrompt), "agent-prompt")]
+[JsonDerivedType(typeof(SlashCommandInvocationResultCompleted), "completed")]
+[JsonDerivedType(typeof(SlashCommandInvocationResultSelectSubcommand), "select-subcommand")]
+[JsonDerivedType(typeof(SlashCommandInvocationResultAddTimelineEntry), "add-timeline-entry")]
+[JsonDerivedType(typeof(SlashCommandInvocationResultShowDialog), "show-dialog")]
+[JsonDerivedType(typeof(SlashCommandInvocationResultSetModel), "set-model")]
+[JsonDerivedType(typeof(SlashCommandInvocationResultSetPlanModel), "set-plan-model")]
+public partial class SlashCommandInvocationResult
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
+
+
+/// <summary>Slash-command invocation result containing text output plus Markdown/ANSI rendering flags.</summary>
+/// <remarks>The <c>text</c> variant of <see cref="SlashCommandInvocationResult"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class SlashCommandInvocationResultText : SlashCommandInvocationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "text";
+
+    /// <summary>Whether text contains Markdown.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("markdown")]
+    public bool? Markdown { get; set; }
+
+    /// <summary>Whether ANSI sequences should be preserved.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("preserveAnsi")]
+    public bool? PreserveAnsi { get; set; }
+
+    /// <summary>True when the invocation mutated user runtime settings; consumers caching settings should refresh.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
+
+    /// <summary>Text output for the client to render.</summary>
+    [JsonPropertyName("text")]
+    public required string Text { get; set; }
+}
+
+/// <summary>Slash-command invocation result that submits an agent prompt, with display prompt, optional mode, optional user-facing notice, and settings-change flag.</summary>
+/// <remarks>The <c>agent-prompt</c> variant of <see cref="SlashCommandInvocationResult"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class SlashCommandInvocationResultAgentPrompt : SlashCommandInvocationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "agent-prompt";
+
+    /// <summary>Prompt text to display to the user.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public required string DisplayPrompt { get; set; }
+
+    /// <summary>Optional target session mode for the agent prompt.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mode")]
+    public SessionMode? Mode { get; set; }
+
+    /// <summary>Optional user-facing notice to show before the prompt is submitted.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("notice")]
+    public string? Notice { get; set; }
+
+    /// <summary>Prompt to submit to the agent.</summary>
+    [JsonPropertyName("prompt")]
+    public required string Prompt { get; set; }
+
+    /// <summary>True when the invocation mutated user runtime settings; consumers caching settings should refresh.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
+}
+
+/// <summary>Slash-command invocation result indicating completion, with optional message and settings-change flag.</summary>
+/// <remarks>The <c>completed</c> variant of <see cref="SlashCommandInvocationResult"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class SlashCommandInvocationResultCompleted : SlashCommandInvocationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "completed";
+
+    /// <summary>Optional user-facing message describing the completed command.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    /// <summary>True when the invocation mutated user runtime settings; consumers caching settings should refresh.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
+}
+
+/// <summary>Selectable slash-command subcommand option with name, description, and optional group label.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SlashCommandSelectSubcommandOption
+{
+    /// <summary>Human-readable description of the subcommand.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Optional group label for organizing options.</summary>
+    [JsonPropertyName("group")]
+    public string? Group { get; set; }
+
+    /// <summary>Subcommand name to invoke.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+}
+
+/// <summary>Slash-command invocation result asking the client to present subcommand options for a parent command.</summary>
+/// <remarks>The <c>select-subcommand</c> variant of <see cref="SlashCommandInvocationResult"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class SlashCommandInvocationResultSelectSubcommand : SlashCommandInvocationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "select-subcommand";
+
+    /// <summary>Parent command name that requires subcommand selection.</summary>
+    [JsonPropertyName("command")]
+    public required string Command { get; set; }
+
+    /// <summary>Available subcommand options for the client to present.</summary>
+    [JsonPropertyName("options")]
+    public required IList<SlashCommandSelectSubcommandOption> Options { get; set; }
+
+    /// <summary>True when the invocation mutated user runtime settings; consumers caching settings should refresh.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
+
+    /// <summary>Human-readable title for the selection UI.</summary>
+    [JsonPropertyName("title")]
+    public required string Title { get; set; }
+}
+
+/// <summary>RPC data type for SlashCommandTimelineEntry operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SlashCommandTimelineEntry
+{
+    /// <summary>Text displayed for the timeline entry.</summary>
+    [JsonPropertyName("text")]
+    public string Text { get; set; } = string.Empty;
+
+    /// <summary>Timeline entry presentation type.</summary>
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = string.Empty;
+
+    /// <summary>Optional URL associated with the timeline entry.</summary>
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
+}
+
+/// <summary>The <c>add-timeline-entry</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class SlashCommandInvocationResultAddTimelineEntry : SlashCommandInvocationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "add-timeline-entry";
+
+    /// <summary>Timeline entry the host should append.</summary>
+    [JsonPropertyName("entry")]
+    public required SlashCommandTimelineEntry Entry { get; set; }
+
+    /// <summary>Optional text the host should prefill into the input editor.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("prefillInput")]
+    public string? PrefillInput { get; set; }
+
+    /// <summary>Whether command execution changed persisted runtime settings.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
+}
+
+/// <summary>RPC data type for SlashCommandModelPickerDialog operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SlashCommandModelPickerDialog
+{
+    /// <summary>Discriminator for a model-picker dialog.</summary>
+    [JsonPropertyName("kind")]
+    public string Kind { get; set; } = string.Empty;
+
+    /// <summary>Model that should be enabled before it can be selected.</summary>
+    [JsonPropertyName("modelToEnable")]
+    public string? ModelToEnable { get; set; }
+
+    /// <summary>Settings scope the picker should modify.</summary>
+    [JsonPropertyName("scope")]
+    public string? Scope { get; set; }
+
+    /// <summary>Model-selection target represented by the picker.</summary>
+    [JsonPropertyName("target")]
+    public string? Target { get; set; }
+}
+
+/// <summary>The <c>show-dialog</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class SlashCommandInvocationResultShowDialog : SlashCommandInvocationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "show-dialog";
+
+    /// <summary>Dialog the host should display.</summary>
+    [JsonPropertyName("dialog")]
+    public required SlashCommandModelPickerDialog Dialog { get; set; }
+
+    /// <summary>Whether command execution changed persisted runtime settings.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
+}
+
+/// <summary>User-settings snapshot to restore if the host cancels the model switch.</summary>
+public sealed class SlashCommandInvocationResultSetModelRevertOnCancel
+{
+}
+
+/// <summary>The <c>set-model</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class SlashCommandInvocationResultSetModel : SlashCommandInvocationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "set-model";
+
+    /// <summary>Model selected by the command.</summary>
+    [JsonPropertyName("model")]
+    public required string Model { get; set; }
+
+    /// <summary>Reasoning effort selected for the model.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
+
+    /// <summary>Repository settings scope modified by the command.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("repoScope")]
+    public string? RepoScope { get; set; }
+
+    /// <summary>User-settings snapshot to restore if the host cancels the model switch.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("revertOnCancel")]
+    public SlashCommandInvocationResultSetModelRevertOnCancel? RevertOnCancel { get; set; }
+
+    /// <summary>Whether command execution changed persisted runtime settings.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
+
+    /// <summary>Settings scope modified by the command.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("scope")]
+    public string? Scope { get; set; }
+
+    /// <summary>User-facing warning produced while selecting the model.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
+}
+
+/// <summary>The <c>set-plan-model</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class SlashCommandInvocationResultSetPlanModel : SlashCommandInvocationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "set-plan-model";
+
+    /// <summary>User-facing confirmation message for the plan-model selection.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Dedicated model selected for plan mode.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("planModel")]
+    public string? PlanModel { get; set; }
+
+    /// <summary>Whether command execution changed persisted runtime settings.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
+}
+
+/// <summary>Slash command name and optional raw input string to invoke.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class CommandsInvokeRequest
+{
+    /// <summary>Raw input after the command name.</summary>
+    [JsonPropertyName("input")]
+    public string? Input { get; set; }
+
+    /// <summary>Command name. Leading slashes are stripped and the name is matched case-insensitively.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Optional client surface that initiated the invocation.</summary>
+    [JsonPropertyName("origin")]
+    public CommandsInvocationOrigin? Origin { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Whether finalizing the invocation effect succeeded, and the failure reason when it did not.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class CommandsFinalizeInvocationEffectResult
+{
+    /// <summary>Failure reason when the invocation effect could not be finalized.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Whether the pending invocation effect was finalized successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>The slash-command result object that produced the pending effect, echoed back unchanged.</summary>
+public sealed class CommandsFinalizeInvocationEffectRequestEffect
+{
+}
+
+/// <summary>The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class CommandsFinalizeInvocationEffectRequest
+{
+    /// <summary>The slash-command result object that produced the pending effect, echoed back unchanged.</summary>
+    [JsonPropertyName("effect")]
+    public CommandsFinalizeInvocationEffectRequestEffect Effect { get => field ??= new(); set; }
+
+    /// <summary>Whether the host applied or cancelled the pending invocation effect.</summary>
+    [JsonPropertyName("outcome")]
+    public CommandsInvocationEffectOutcome Outcome { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the pending client-handled command was completed successfully.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CommandsHandlePendingCommandResult
+{
+    /// <summary>Whether the command was handled successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Pending command request ID and an optional error if the client handler failed.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class CommandsHandlePendingCommandRequest
+{
+    /// <summary>Error message if the command handler failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Request ID from the command invocation event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Error message produced while executing the command, if any.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ExecuteCommandResult
+{
+    /// <summary>Error message produced while executing the command, if any. Omitted when the handler succeeded.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+}
+
+/// <summary>Slash command name and argument string to execute synchronously.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ExecuteCommandParams
+{
+    /// <summary>Argument string to pass to the command (empty string if none).</summary>
+    [JsonPropertyName("args")]
+    public string Args { get; set; } = string.Empty;
+
+    /// <summary>Name of the slash command to invoke (without the leading '/').</summary>
+    [JsonPropertyName("commandName")]
+    public string CommandName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the command was accepted into the local execution queue.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class EnqueueCommandResult
+{
+    /// <summary>True when the command was accepted into the local execution queue. False when the call targets a session that does not support local command queueing (e.g. remote sessions).</summary>
+    [JsonPropertyName("queued")]
+    public bool Queued { get; set; }
+}
+
+/// <summary>Slash-prefixed command string to enqueue for FIFO processing.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class EnqueueCommandParams
+{
+    /// <summary>Slash-prefixed command string to enqueue, e.g. '/compact' or '/model gpt-4'. Queued FIFO with any in-flight items; if the session is idle, processing kicks off immediately.</summary>
+    [JsonPropertyName("command")]
+    public string Command { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the queued-command response was matched to a pending request.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CommandsRespondToQueuedCommandResult
+{
+    /// <summary>Whether a pending queued command with the given request ID was found and resolved. False when the request was already resolved, cancelled, or unknown.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Result of the queued command execution.</summary>
+/// <remarks>Data type discriminated by <c>handled</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class QueuedCommandResult
+{
+    /// <summary>The boolean discriminator.</summary>
+    [JsonPropertyName("handled")]
+    public bool Handled { get; set; }
+
+    /// <summary>When true, the runtime will not process subsequent queued commands until a new request comes in.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("stopProcessingQueue")]
+    public bool? StopProcessingQueue { get; set; }
+}
+
+/// <summary>Queued-command request ID and the result indicating whether the host executed it (and whether to stop processing further queued commands).</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class CommandsRespondToQueuedCommandRequest
+{
+    /// <summary>Request ID from the `command.queued` event the host is responding to.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Result of the queued command execution.</summary>
+    [JsonPropertyName("result")]
+    public QueuedCommandResult Result { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Telemetry engagement ID for the session, when available.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionTelemetryEngagement
+{
+    /// <summary>Current telemetry engagement ID, when available.</summary>
+    [JsonPropertyName("engagementId")]
+    public string? EngagementId { get; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionTelemetryGetEngagementIdRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Feature override key/value pairs to attach to subsequent telemetry events from this session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class TelemetrySetFeatureOverridesRequest
+{
+    /// <summary>Override key/value pairs to attach to subsequent telemetry events from this session. Replaces any previously-set overrides.</summary>
+    [JsonPropertyName("features")]
+    public IDictionary<string, string> Features { get => field ??= new Dictionary<string, string>(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIEphemeralQueryResult
+{
+    /// <summary>Answer returned by the model.</summary>
+    [JsonPropertyName("answer")]
+    public string Answer { get; set; } = string.Empty;
+}
+
+/// <summary>Transient question to answer without adding it to conversation history.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UIEphemeralQueryRequest
+{
+    /// <summary>Question to answer from the current conversation context.</summary>
+    [JsonPropertyName("question")]
+    public string Question { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>MCP response metadata.</summary>
+public sealed class UIElicitationResponseMeta
+{
+}
+
+/// <summary>The elicitation response (accept with form values, decline, or cancel).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIElicitationResponse
+{
+    /// <summary>MCP response metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public UIElicitationResponseMeta? Meta { get; set; }
+
+    /// <summary>The user's response: accept (submitted), decline (rejected), or cancel (dismissed).</summary>
+    [JsonPropertyName("action")]
+    public UIElicitationResponseAction Action { get; set; }
+
+    /// <summary>The form values submitted by the user (present when action is 'accept').</summary>
+    [JsonPropertyName("content")]
+    public IDictionary<string, JsonElement>? Content { get; set; }
+}
+
+/// <summary>MCP request metadata.</summary>
+public sealed class UIElicitationRequestMeta
+{
+}
+
+/// <summary>JSON Schema describing the form fields to present to the user.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIElicitationSchema
+{
+    /// <summary>Form field definitions, keyed by field name.</summary>
+    [JsonPropertyName("properties")]
+    public IDictionary<string, JsonElement> Properties { get => field ??= new Dictionary<string, JsonElement>(); set; }
+
+    /// <summary>List of required field names.</summary>
+    [JsonPropertyName("required")]
+    public IList<string>? Required { get; set; }
+
+    /// <summary>Schema type indicator (always 'object').</summary>
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = string.Empty;
+}
+
+/// <summary>Metadata controlling an MCP task's lifetime.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class McpTaskMetadata
+{
+    /// <summary>Task time-to-live.</summary>
+    [JsonPropertyName("ttl")]
+    public long? Ttl { get; set; }
+}
+
+/// <summary>Prompt message and JSON schema describing the form fields to elicit from the user.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UIElicitationRequest
+{
+    /// <summary>MCP request metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public UIElicitationRequestMeta? Meta { get; set; }
+
+    /// <summary>Message describing what information is needed from the user.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+
+    /// <summary>Elicitation mode. Omitted and form are equivalent for structured elicitation.</summary>
+    [JsonPropertyName("mode")]
+    public McpElicitationFormMode? Mode { get; set; }
+
+    /// <summary>JSON Schema describing the form fields to present to the user.</summary>
+    [JsonPropertyName("requestedSchema")]
+    public UIElicitationSchema RequestedSchema { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>MCP task metadata.</summary>
+    [JsonPropertyName("task")]
+    public McpTaskMetadata? Task { get; set; }
+}
+
+/// <summary>Indicates whether the elicitation response was accepted; false if it was already resolved by another client.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIElicitationResult
+{
+    /// <summary>Whether the response was accepted. False if the request was already resolved by another client.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Pending elicitation request ID and the user's response (accept/decline/cancel + form values).</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UIHandlePendingElicitationRequest
+{
+    /// <summary>The unique request ID from the elicitation.requested event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>The elicitation response (accept with form values, decline, or cancel).</summary>
+    [JsonPropertyName("result")]
+    public UIElicitationResponse Result { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the pending UI request was resolved by this call.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIHandlePendingResult
+{
+    /// <summary>True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>User response for a pending user-input request, with answer text and whether it was typed freeform.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIUserInputResponse
+{
+    /// <summary>The user's answer text.</summary>
+    [JsonPropertyName("answer")]
+    public string Answer { get; set; } = string.Empty;
+
+    /// <summary>True if the user typed a freeform response, false if they selected a presented choice. Used by telemetry to differentiate between free text input and choice selection.</summary>
+    [JsonPropertyName("wasFreeform")]
+    public bool WasFreeform { get; set; }
+}
+
+/// <summary>Request ID of a pending `user_input.requested` event and the user's response.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UIHandlePendingUserInputRequest
+{
+    /// <summary>The unique request ID from the user_input.requested event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>User response for a pending user-input request, with answer text and whether it was typed freeform.</summary>
+    [JsonPropertyName("response")]
+    public UIUserInputResponse Response { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIHandlePendingSamplingResponse
+{
+}
+
+/// <summary>Request ID of a pending `sampling.requested` event and an optional sampling result payload (omit to reject).</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UIHandlePendingSamplingRequest
+{
+    /// <summary>The unique request ID from the sampling.requested event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.</summary>
+    [JsonPropertyName("response")]
+    public UIHandlePendingSamplingResponse? Response { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Request ID of a pending `auto_mode_switch.requested` event and the user's response.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UIHandlePendingAutoModeSwitchRequest
+{
+    /// <summary>The unique request ID from the auto_mode_switch.requested event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>User's choice for auto-mode switching: yes (allow this turn), yes_always (allow + persist as setting), or no (decline).</summary>
+    [JsonPropertyName("response")]
+    public UIAutoModeSwitchResponse Response { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>The user's selected action for an exhausted session limit.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UISessionLimitsExhaustedResponse
+{
+    /// <summary>Action selected by the user.</summary>
+    [JsonPropertyName("action")]
+    public UISessionLimitsExhaustedResponseAction Action { get; set; }
+
+    /// <summary>AI Credits to add to the current max when action is 'add'.</summary>
+    [JsonPropertyName("additionalAiCredits")]
+    public double? AdditionalAiCredits { get; set; }
+
+    /// <summary>New absolute max AI Credits when action is 'set'.</summary>
+    [JsonPropertyName("maxAiCredits")]
+    public double? MaxAiCredits { get; set; }
+}
+
+/// <summary>Request ID of a pending `session_limits_exhausted.requested` event and the user's selected limit action.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UIHandlePendingSessionLimitsExhaustedRequest
+{
+    /// <summary>The unique request ID from the session_limits_exhausted.requested event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>The selected session-limit action.</summary>
+    [JsonPropertyName("response")]
+    public UISessionLimitsExhaustedResponse Response { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>User response for a pending exit-plan-mode request, with approval state, selected action, auto-approve flag, and feedback.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIExitPlanModeResponse
+{
+    /// <summary>Whether the plan was approved.</summary>
+    [JsonPropertyName("approved")]
+    public bool Approved { get; set; }
+
+    /// <summary>Whether subsequent edits should be auto-approved without confirmation.</summary>
+    [JsonPropertyName("autoApproveEdits")]
+    public bool? AutoApproveEdits { get; set; }
+
+    /// <summary>When true, the agent is instructed to end its turn without starting implementation so the client can restore the session model and auto-submit a fresh implementation turn on it. Set only when a distinct plan configuration (a different model, reasoning effort, or context tier) actually ran the planning turn.</summary>
+    [JsonPropertyName("deferImplementation")]
+    public bool? DeferImplementation { get; set; }
+
+    /// <summary>Feedback from the user when they declined the plan or requested changes.</summary>
+    [JsonPropertyName("feedback")]
+    public string? Feedback { get; set; }
+
+    /// <summary>The action the user selected. Defaults to 'autopilot' when autoApproveEdits is true, otherwise 'interactive'.</summary>
+    [JsonPropertyName("selectedAction")]
+    public UIExitPlanModeAction? SelectedAction { get; set; }
+}
+
+/// <summary>Request ID of a pending `exit_plan_mode.requested` event and the user's response.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UIHandlePendingExitPlanModeRequest
+{
+    /// <summary>The unique request ID from the exit_plan_mode.requested event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>User response for a pending exit-plan-mode request, with approval state, selected action, auto-approve flag, and feedback.</summary>
+    [JsonPropertyName("response")]
+    public UIExitPlanModeResponse Response { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Register an in-process handler for `auto_mode_switch.requested` events. The caller still attaches the actual listener via the standard event-subscription mechanism; this registration solely tells the server bridge to skip its own dispatch (so a remote client doesn't race the in-process handler for the same requestId).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIRegisterDirectAutoModeSwitchHandlerResult
+{
+    /// <summary>Opaque handle representing the registration. Pass this same handle to `unregisterDirectAutoModeSwitchHandler` when the in-process handler is no longer active. Multiple registrations are reference-counted; the server bridge will only dispatch auto-mode-switch requests when no handles are active.</summary>
+    [JsonPropertyName("handle")]
+    public string Handle { get; set; } = string.Empty;
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionUiRegisterDirectAutoModeSwitchHandlerRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the handle was active and the registration count was decremented.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class UIUnregisterDirectAutoModeSwitchHandlerResult
+{
+    /// <summary>True if the handle was active and decremented the counter; false if the handle was unknown.</summary>
+    [JsonPropertyName("unregistered")]
+    public bool Unregistered { get; set; }
+}
+
+/// <summary>Opaque handle previously returned by `registerDirectAutoModeSwitchHandler` to release.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class UIUnregisterDirectAutoModeSwitchHandlerRequest
+{
+    /// <summary>Handle previously returned by `registerDirectAutoModeSwitchHandler`.</summary>
+    [JsonPropertyName("handle")]
+    public string Handle { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the operation succeeded.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsConfigureResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsConfigureAdditionalContentExclusionPolicyRuleSource
+{
+    /// <summary>Name of the policy source.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Type of the policy source.</summary>
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = string.Empty;
+}
+
+/// <summary>Single content-exclusion rule supplied to `session.permissions.configure`, with paths, match conditions, and source.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsConfigureAdditionalContentExclusionPolicyRule
+{
+    /// <summary>Conditions of which at least one must match.</summary>
+    [JsonPropertyName("ifAnyMatch")]
+    public IList<string>? IfAnyMatch { get; set; }
+
+    /// <summary>Conditions none of which may match.</summary>
+    [JsonPropertyName("ifNoneMatch")]
+    public IList<string>? IfNoneMatch { get; set; }
+
+    /// <summary>Path patterns covered by this rule.</summary>
+    [JsonPropertyName("paths")]
+    public IList<string> Paths { get => field ??= []; set; }
+
+    /// <summary>Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type.</summary>
+    [JsonPropertyName("source")]
+    public PermissionsConfigureAdditionalContentExclusionPolicyRuleSource Source { get => field ??= new(); set; }
+}
+
+/// <summary>Content-exclusion policy supplied to `session.permissions.configure`, with rules, last-updated data, and scope.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsConfigureAdditionalContentExclusionPolicy
+{
+    /// <summary>Opaque policy update timestamp supplied by the host.</summary>
+    [JsonPropertyName("last_updated_at")]
+    public JsonElement LastUpdatedAt { get; set; }
+
+    /// <summary>Content-exclusion rules to apply.</summary>
+    [JsonPropertyName("rules")]
+    public IList<PermissionsConfigureAdditionalContentExclusionPolicyRule> Rules { get => field ??= []; set; }
+
+    /// <summary>Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope` enumeration.</summary>
+    [JsonPropertyName("scope")]
+    public PermissionsConfigureAdditionalContentExclusionPolicyScope Scope { get; set; }
+}
+
+/// <summary>If specified, replaces the session's path-permission policy. The runtime constructs the appropriate PathManager based on these inputs (rooted at the session's working directory). Omit to leave the current path policy unchanged.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionPathsConfig
+{
+    /// <summary>Additional directories to allow tool access to (in addition to the session's working directory). Conventional `.github/skills/` and `.github/agents/` definitions under them also join the session catalogs when their subsystem gates are enabled, so supplying a directory is a trust decision for configuration stored there. When `unrestricted` is true, these are still pre-populated on the UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention completion).</summary>
+    [JsonPropertyName("additionalDirectories")]
+    public IList<string>? AdditionalDirectories { get; set; }
+
+    /// <summary>Whether to include the system temp directory in the allowed list (defaults to true). Ignored when `unrestricted` is true.</summary>
+    [JsonPropertyName("includeTempDirectory")]
+    public bool? IncludeTempDirectory { get; set; }
+
+    /// <summary>If true, the runtime allows access to all paths without prompting. Equivalent to constructing an UnrestrictedPathManager.</summary>
+    [JsonPropertyName("unrestricted")]
+    public bool? Unrestricted { get; set; }
+
+    /// <summary>Workspace root path (special-cased to be allowed even before the directory exists). Ignored when `unrestricted` is true.</summary>
+    [JsonPropertyName("workspacePath")]
+    public string? WorkspacePath { get; set; }
+}
+
+/// <summary>If specified, replaces the session's approved/denied permission rules. Omit to leave the current rules unchanged.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionRulesSet
+{
+    /// <summary>Rules that auto-approve matching requests.</summary>
+    [JsonPropertyName("approved")]
+    public IList<PermissionRule> Approved { get => field ??= []; set; }
+
+    /// <summary>Rules that auto-deny matching requests.</summary>
+    [JsonPropertyName("denied")]
+    public IList<PermissionRule> Denied { get => field ??= []; set; }
+}
+
+/// <summary>If specified, replaces the session's URL-permission policy. The runtime constructs a fresh DefaultUrlManager based on these inputs. Omit to leave the current URL policy unchanged.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionUrlsConfig
+{
+    /// <summary>Initial list of allowed URL/domain patterns. Patterns may include path components. Ignored when `unrestricted` is true.</summary>
+    [JsonPropertyName("initialAllowed")]
+    public IList<string>? InitialAllowed { get; set; }
+
+    /// <summary>If true, the runtime allows access to all URLs without prompting. Initial allow-list is ignored when this is true.</summary>
+    [JsonPropertyName("unrestricted")]
+    public bool? Unrestricted { get; set; }
+}
+
+/// <summary>Patch of permission policy fields to apply (omit a field to leave it unchanged).</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionsConfigureParams
+{
+    /// <summary>If specified, replaces the host-supplied GitHub Content Exclusion policies on the session (combined with natively-discovered policies when evaluating tool/file access). Omit to leave the current policies unchanged.</summary>
+    [JsonPropertyName("additionalContentExclusionPolicies")]
+    public IList<PermissionsConfigureAdditionalContentExclusionPolicy>? AdditionalContentExclusionPolicies { get; set; }
+
+    /// <summary>If specified, sets whether path/URL read permission requests are auto-approved. Omit to leave the current value unchanged.</summary>
+    [JsonPropertyName("approveAllReadPermissionRequests")]
+    public bool? ApproveAllReadPermissionRequests { get; set; }
+
+    /// <summary>If specified, sets whether tool permission requests are auto-approved without prompting. Omit to leave the current value unchanged.</summary>
+    [JsonPropertyName("approveAllToolPermissionRequests")]
+    public bool? ApproveAllToolPermissionRequests { get; set; }
+
+    /// <summary>If specified, replaces the session's path-permission policy. The runtime constructs the appropriate PathManager based on these inputs (rooted at the session's working directory). Omit to leave the current path policy unchanged.</summary>
+    [JsonPropertyName("paths")]
+    public PermissionPathsConfig? Paths { get; set; }
+
+    /// <summary>If specified, replaces the session's approved/denied permission rules. Omit to leave the current rules unchanged.</summary>
+    [JsonPropertyName("rules")]
+    public PermissionRulesSet? Rules { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>If specified, replaces the session's URL-permission policy. The runtime constructs a fresh DefaultUrlManager based on these inputs. Omit to leave the current URL policy unchanged.</summary>
+    [JsonPropertyName("urls")]
+    public PermissionUrlsConfig? Urls { get; set; }
+}
+
+/// <summary>Indicates whether the permission decision was applied; false when the request was already resolved.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionRequestResult
+{
+    /// <summary>Whether the permission request was handled successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Optional informational context describing how and where the permission decision was made. This does not affect permission behavior.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionDecisionContext
+{
+    /// <summary>Disposition of the permission request as observed by the responding client.</summary>
+    [JsonPropertyName("outcome")]
+    public PermissionDecisionOutcome Outcome { get; set; }
+
+    /// <summary>Whether the responding client could ask a user interactively, was running headlessly, or had no response path. Omit when the client cannot determine this authoritatively.</summary>
+    [JsonPropertyName("responseCapability")]
+    public PermissionResponseCapability? ResponseCapability { get; set; }
+
+    /// <summary>Controlled reason or actor responsible for the response.</summary>
+    [JsonPropertyName("source")]
+    public PermissionDecisionSource Source { get; set; }
+
+    /// <summary>Client surface that submitted the response.</summary>
+    [JsonPropertyName("surface")]
+    public PermissionDecisionSurface Surface { get; set; }
+}
+
+/// <summary>The client's response to the pending permission prompt.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(PermissionDecisionApproveOnce), "approve-once")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSession), "approve-for-session")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocation), "approve-for-location")]
+[JsonDerivedType(typeof(PermissionDecisionApprovePermanently), "approve-permanently")]
+[JsonDerivedType(typeof(PermissionDecisionReject), "reject")]
+[JsonDerivedType(typeof(PermissionDecisionUserNotAvailable), "user-not-available")]
+[JsonDerivedType(typeof(PermissionDecisionApproved), "approved")]
+[JsonDerivedType(typeof(PermissionDecisionApprovedForSession), "approved-for-session")]
+[JsonDerivedType(typeof(PermissionDecisionApprovedForLocation), "approved-for-location")]
+[JsonDerivedType(typeof(PermissionDecisionCancelled), "cancelled")]
+[JsonDerivedType(typeof(PermissionDecisionDeniedByRules), "denied-by-rules")]
+[JsonDerivedType(typeof(PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser), "denied-no-approval-rule-and-could-not-request-from-user")]
+[JsonDerivedType(typeof(PermissionDecisionDeniedInteractivelyByUser), "denied-interactively-by-user")]
+[JsonDerivedType(typeof(PermissionDecisionDeniedByContentExclusionPolicy), "denied-by-content-exclusion-policy")]
+[JsonDerivedType(typeof(PermissionDecisionDeniedByPermissionRequestHook), "denied-by-permission-request-hook")]
+public partial class PermissionDecision
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
+
+
+/// <summary>Permission-decision request variant to approve only the current permission request.</summary>
+/// <remarks>The <c>approve-once</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveOnce : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approve-once";
+
+    /// <summary>True only when a host surfaced this request to a user who approved it.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("approvedInteractively")]
+    public bool? ApprovedInteractively { get; set; }
+}
+
+/// <summary>Session-scoped approval to remember (tool prompts only; omitted for path/url prompts).</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalCommands), "commands")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalRead), "read")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalWrite), "write")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalMcp), "mcp")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalMcpSampling), "mcp-sampling")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalMemory), "memory")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalCustomTool), "custom-tool")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalExtensionManagement), "extension-management")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalFactory), "factory")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess), "extension-permission-access")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalExtensionEnvAccess), "extension-env-access")]
+public partial class PermissionDecisionApproveForSessionApproval
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
+
+
+/// <summary>Session-scoped approval details for specific command identifiers.</summary>
+/// <remarks>The <c>commands</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalCommands : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "commands";
+
+    /// <summary>Command identifiers covered by this approval.</summary>
+    [JsonPropertyName("commandIdentifiers")]
+    public required IList<string> CommandIdentifiers { get; set; }
+}
+
+/// <summary>Session-scoped approval details for read-only filesystem operations.</summary>
+/// <remarks>The <c>read</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalRead : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "read";
+}
+
+/// <summary>Session-scoped approval details for filesystem write operations.</summary>
+/// <remarks>The <c>write</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalWrite : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "write";
+}
+
+/// <summary>Session-scoped approval details for an MCP server tool, or all tools on the server when `toolName` is null.</summary>
+/// <remarks>The <c>mcp</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalMcp : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp";
+
+    /// <summary>MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
+
+    /// <summary>MCP tool name, or null to cover every tool on the server.</summary>
+    [JsonPropertyName("toolName")]
+    public string? ToolName { get; set; }
+}
+
+/// <summary>Session-scoped approval details for MCP sampling requests from a server.</summary>
+/// <remarks>The <c>mcp-sampling</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalMcpSampling : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp-sampling";
+
+    /// <summary>MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
+}
+
+/// <summary>Session-scoped approval details for writes to long-term memory.</summary>
+/// <remarks>The <c>memory</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalMemory : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "memory";
+}
+
+/// <summary>Session-scoped approval details for a custom tool, keyed by tool name.</summary>
+/// <remarks>The <c>custom-tool</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalCustomTool : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "custom-tool";
+
+    /// <summary>Custom tool name.</summary>
+    [JsonPropertyName("toolName")]
+    public required string ToolName { get; set; }
+}
+
+/// <summary>Session-scoped approval details for extension-management operations, optionally narrowed by operation.</summary>
+/// <remarks>The <c>extension-management</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalExtensionManagement : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-management";
+
+    /// <summary>Optional operation identifier; when omitted, the approval covers all extension management operations.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("operation")]
+    public string? Operation { get; set; }
+}
+
+/// <summary>Session-scoped factory approval, optionally narrowed by approval key.</summary>
+/// <remarks>The <c>factory</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalFactory : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "factory";
+
+    /// <summary>Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("approvalKey")]
+    public string? ApprovalKey { get; set; }
+}
+
+/// <summary>Session-scoped approval details for an extension's permission-gated capability access, keyed by extension name.</summary>
+/// <remarks>The <c>extension-permission-access</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-permission-access";
+
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
+}
+
+/// <summary>Session-scoped approval details for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.</summary>
+/// <remarks>The <c>extension-env-access</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalExtensionEnvAccess : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-env-access";
+
+    /// <summary>Names of the sensitive environment variables this approval covers. Values are never persisted.</summary>
+    [JsonPropertyName("environmentVariables")]
+    public required IList<string> EnvironmentVariables { get; set; }
+
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
+}
+
+/// <summary>Permission-decision request variant to approve for the rest of the session, with optional tool approval or URL domain.</summary>
+/// <remarks>The <c>approve-for-session</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSession : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approve-for-session";
+
+    /// <summary>Session-scoped approval to remember (tool prompts only; omitted for path/url prompts).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("approval")]
+    public PermissionDecisionApproveForSessionApproval? Approval { get; set; }
+
+    /// <summary>URL domain to approve for the rest of the session (URL prompts only).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("domain")]
+    public string? Domain { get; set; }
+}
+
+/// <summary>Approval to persist for this location.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalCommands), "commands")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalRead), "read")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalWrite), "write")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalMcp), "mcp")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalMcpSampling), "mcp-sampling")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalMemory), "memory")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalCustomTool), "custom-tool")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalExtensionManagement), "extension-management")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalFactory), "factory")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess), "extension-permission-access")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalExtensionEnvAccess), "extension-env-access")]
+public partial class PermissionDecisionApproveForLocationApproval
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
+
+
+/// <summary>Location-scoped approval details for specific command identifiers.</summary>
+/// <remarks>The <c>commands</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalCommands : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "commands";
+
+    /// <summary>Command identifiers covered by this approval.</summary>
+    [JsonPropertyName("commandIdentifiers")]
+    public required IList<string> CommandIdentifiers { get; set; }
+}
+
+/// <summary>Location-scoped approval details for read-only filesystem operations.</summary>
+/// <remarks>The <c>read</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalRead : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "read";
+}
+
+/// <summary>Location-scoped approval details for filesystem write operations.</summary>
+/// <remarks>The <c>write</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalWrite : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "write";
+}
+
+/// <summary>Location-scoped approval details for an MCP server tool, or all tools on the server when `toolName` is null.</summary>
+/// <remarks>The <c>mcp</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalMcp : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp";
+
+    /// <summary>MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
+
+    /// <summary>MCP tool name, or null to cover every tool on the server.</summary>
+    [JsonPropertyName("toolName")]
+    public string? ToolName { get; set; }
+}
+
+/// <summary>Location-scoped approval details for MCP sampling requests from a server.</summary>
+/// <remarks>The <c>mcp-sampling</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalMcpSampling : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp-sampling";
+
+    /// <summary>MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
+}
+
+/// <summary>Location-scoped approval details for writes to long-term memory.</summary>
+/// <remarks>The <c>memory</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalMemory : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "memory";
+}
+
+/// <summary>Location-scoped approval details for a custom tool, keyed by tool name.</summary>
+/// <remarks>The <c>custom-tool</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalCustomTool : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "custom-tool";
+
+    /// <summary>Custom tool name.</summary>
+    [JsonPropertyName("toolName")]
+    public required string ToolName { get; set; }
+}
+
+/// <summary>Location-scoped approval details for extension-management operations, optionally narrowed by operation.</summary>
+/// <remarks>The <c>extension-management</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalExtensionManagement : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-management";
+
+    /// <summary>Optional operation identifier; when omitted, the approval covers all extension management operations.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("operation")]
+    public string? Operation { get; set; }
+}
+
+/// <summary>Location-scoped factory approval, optionally narrowed by approval key.</summary>
+/// <remarks>The <c>factory</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalFactory : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "factory";
+
+    /// <summary>Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("approvalKey")]
+    public string? ApprovalKey { get; set; }
+}
+
+/// <summary>Location-scoped approval details for an extension's permission-gated capability access, keyed by extension name.</summary>
+/// <remarks>The <c>extension-permission-access</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-permission-access";
+
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
+}
+
+/// <summary>Location-scoped approval details for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.</summary>
+/// <remarks>The <c>extension-env-access</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocationApprovalExtensionEnvAccess : PermissionDecisionApproveForLocationApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-env-access";
+
+    /// <summary>Names of the sensitive environment variables this approval covers. Values are never persisted.</summary>
+    [JsonPropertyName("environmentVariables")]
+    public required IList<string> EnvironmentVariables { get; set; }
+
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
+}
+
+/// <summary>Permission-decision request variant to approve and persist a permission for a project location, with approval details and location key.</summary>
+/// <remarks>The <c>approve-for-location</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForLocation : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approve-for-location";
+
+    /// <summary>Approval to persist for this location.</summary>
+    [JsonPropertyName("approval")]
+    public required PermissionDecisionApproveForLocationApproval Approval { get; set; }
+
+    /// <summary>Location key (git root or cwd) to persist the approval to.</summary>
+    [JsonPropertyName("locationKey")]
+    public required string LocationKey { get; set; }
+}
+
+/// <summary>Permission-decision request variant to permanently approve a URL domain across sessions.</summary>
+/// <remarks>The <c>approve-permanently</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApprovePermanently : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approve-permanently";
+
+    /// <summary>URL domain to approve permanently.</summary>
+    [JsonPropertyName("domain")]
+    public required string Domain { get; set; }
+}
+
+/// <summary>Permission-decision request variant to reject a pending permission request, with optional feedback.</summary>
+/// <remarks>The <c>reject</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionReject : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "reject";
+
+    /// <summary>Optional feedback explaining the rejection.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("feedback")]
+    public string? Feedback { get; set; }
+}
+
+/// <summary>Permission-decision variant indicating no user was available to confirm the request.</summary>
+/// <remarks>The <c>user-not-available</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionUserNotAvailable : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "user-not-available";
+}
+
+/// <summary>Permission-decision variant indicating the request was approved.</summary>
+/// <remarks>The <c>approved</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApproved : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approved";
+}
+
+/// <summary>Permission-decision variant indicating approval was remembered for the session, with approval details.</summary>
+/// <remarks>The <c>approved-for-session</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApprovedForSession : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approved-for-session";
+
+    /// <summary>The approval to add as a session-scoped rule.</summary>
+    [JsonPropertyName("approval")]
+    public required UserToolSessionApproval Approval { get; set; }
+}
+
+/// <summary>Permission-decision variant indicating approval was persisted for a project location, with approval details and location key.</summary>
+/// <remarks>The <c>approved-for-location</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionApprovedForLocation : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approved-for-location";
+
+    /// <summary>The approval to persist for this location.</summary>
+    [JsonPropertyName("approval")]
+    public required UserToolSessionApproval Approval { get; set; }
+
+    /// <summary>The location key (git root or cwd) to persist the approval to.</summary>
+    [JsonPropertyName("locationKey")]
+    public required string LocationKey { get; set; }
+}
+
+/// <summary>Permission-decision variant indicating the request was cancelled before use, with an optional reason.</summary>
+/// <remarks>The <c>cancelled</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionCancelled : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "cancelled";
+
+    /// <summary>Optional explanation of why the request was cancelled.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
+}
+
+/// <summary>Permission-decision variant indicating explicit denial by permission rules, with the matching rules.</summary>
+/// <remarks>The <c>denied-by-rules</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionDeniedByRules : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "denied-by-rules";
+
+    /// <summary>Rules that denied the request.</summary>
+    [JsonPropertyName("rules")]
+    public required IList<PermissionRule> Rules { get; set; }
+}
+
+/// <summary>Permission-decision variant indicating no approval rule matched and user confirmation was unavailable.</summary>
+/// <remarks>The <c>denied-no-approval-rule-and-could-not-request-from-user</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "denied-no-approval-rule-and-could-not-request-from-user";
+}
+
+/// <summary>Permission-decision variant indicating the user denied an interactive prompt, with optional feedback and force-reject flag.</summary>
+/// <remarks>The <c>denied-interactively-by-user</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionDeniedInteractivelyByUser : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "denied-interactively-by-user";
+
+    /// <summary>Optional feedback from the user explaining the denial.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("feedback")]
+    public string? Feedback { get; set; }
+
+    /// <summary>Whether to force-reject the current agent turn.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("forceReject")]
+    public bool? ForceReject { get; set; }
+}
+
+/// <summary>Permission-decision variant indicating denial by content-exclusion policy, with path and message.</summary>
+/// <remarks>The <c>denied-by-content-exclusion-policy</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionDeniedByContentExclusionPolicy : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "denied-by-content-exclusion-policy";
+
+    /// <summary>Human-readable explanation of why the path was excluded.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>File path that triggered the exclusion.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
+}
+
+/// <summary>Permission-decision variant indicating denial by a permission request hook, with optional message and interrupt flag.</summary>
+/// <remarks>The <c>denied-by-permission-request-hook</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionDecisionDeniedByPermissionRequestHook : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "denied-by-permission-request-hook";
+
+    /// <summary>Whether to interrupt the current agent turn.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("interrupt")]
+    public bool? Interrupt { get; set; }
+
+    /// <summary>Optional message from the hook explaining the denial.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+}
+
+/// <summary>Pending permission request ID and the decision to apply (approve/reject and scope).</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionDecisionRequest
+{
+    /// <summary>Optional informational context describing how and where this response was made. Omit it to preserve legacy behavior without attributing an origin.</summary>
+    [JsonPropertyName("decisionContext")]
+    public PermissionDecisionContext? DecisionContext { get; set; }
+
+    /// <summary>Request ID of the pending permission request.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>The client's response to the pending permission prompt.</summary>
+    [JsonPropertyName("result")]
+    public PermissionDecision Result { get => field ??= new(); set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Pending permission prompt reconstructed from event history, with request ID and user-facing prompt details.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PendingPermissionRequest
+{
+    /// <summary>The user-facing permission prompt details (commands, write, read, mcp, url, memory, custom-tool, path, hook).</summary>
+    [JsonPropertyName("request")]
+    public PermissionPromptRequest Request { get; set; } = null!;
+
+    /// <summary>Unique identifier for the pending permission request.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+}
+
+/// <summary>List of pending permission requests reconstructed from event history.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PendingPermissionRequestList
+{
+    /// <summary>Pending permission prompts reconstructed from the session's event history. Equivalent to the set of `permission.requested` events that have not yet been followed by a matching `permission.completed` event. Used by clients (e.g. the CLI) to hydrate UI for prompts that were emitted before the client attached to the session.</summary>
+    [JsonPropertyName("items")]
+    public IList<PendingPermissionRequest> Items { get => field ??= []; set; }
+}
+
+/// <summary>No parameters; returns currently-pending permission requests for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionsPendingRequestsRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Indicates whether the operation succeeded.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsSetApproveAllResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Allow-all toggle for tool permission requests, with an optional telemetry source.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionsSetApproveAllRequest
+{
+    /// <summary>Whether to auto-approve all tool permission requests.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.</summary>
+    [JsonPropertyName("source")]
+    public PermissionsSetApproveAllSource? Source { get; set; }
+}
+
+/// <summary>Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsSetModeResult
+{
+    /// <summary>Authoritative permission mode after the mutation.</summary>
+    [JsonPropertyName("mode")]
+    public PermissionMode Mode { get; set; }
+
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Permission mode to apply for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionsSetModeRequest
+{
+    /// <summary>Optional judge model id for assisted mode. When omitted, the session resolves the provider default: `gpt-5.5` for CAPI sessions and the active session model for BYOK sessions.</summary>
+    [JsonPropertyName("assistedApprovalModel")]
+    public string? AssistedApprovalModel { get; set; }
+
+    /// <summary>Permission mode to apply.</summary>
+    [JsonPropertyName("mode")]
+    public PermissionMode Mode { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK callers.</summary>
+    [JsonPropertyName("source")]
+    public PermissionModeSource? Source { get; set; }
+}
+
+/// <summary>Current permission mode.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsGetModeResult
+{
+    /// <summary>Current permission mode.</summary>
+    [JsonPropertyName("mode")]
+    public PermissionMode Mode { get; set; }
+}
+
+/// <summary>No parameters.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionsGetModeRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Base URL to pass to the LLM client library.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("baseUrl")]
-    public string BaseUrl { get; set; } = string.Empty;
+/// <summary>Indicates whether the operation succeeded.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsModifyRulesResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>HTTP headers the caller must include on every outbound request.</summary>
-    [JsonPropertyName("headers")]
-    public IDictionary<string, string> Headers { get => field ??= new Dictionary<string, string>(); set; }
+/// <summary>Scope and add/remove instructions for modifying session- or location-scoped permission rules.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionsModifyRulesParams
+{
+    /// <summary>Rules to add to the scope. Applied before `remove`/`removeAll`.</summary>
+    [JsonPropertyName("add")]
+    public IList<PermissionRule>? Add { get; set; }
 
-    /// <summary>Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.</summary>
-    [JsonPropertyName("sessionToken")]
-    public ProviderSessionToken? SessionToken { get; set; }
+    /// <summary>Specific rules to remove from the scope. Ignored when `removeAll` is true.</summary>
+    [JsonPropertyName("remove")]
+    public IList<PermissionRule>? Remove { get; set; }
 
-    /// <summary>Transport to be used for provider requests.</summary>
-    [JsonPropertyName("transport")]
-    public ProviderEndpointTransport? Transport { get; set; }
+    /// <summary>When true, removes every rule currently in the scope (after any `add` is applied). Useful for clearing the location scope wholesale.</summary>
+    [JsonPropertyName("removeAll")]
+    public bool? RemoveAll { get; set; }
 
-    /// <summary>Provider family. Matches the `type` field of a BYOK provider config.</summary>
-    [JsonPropertyName("type")]
-    public ProviderEndpointType Type { get; set; }
+    /// <summary>Whether the change applies to ephemeral session-scoped rules (cleared at session end) or to location-scoped rules persisted via the location-permissions config file.</summary>
+    [JsonPropertyName("scope")]
+    public PermissionsModifyRulesScope Scope { get; set; }
 
-    /// <summary>Wire API to be used, when required for the provider type.</summary>
-    [JsonPropertyName("wireApi")]
-    public ProviderEndpointWireApi? WireApi { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for SessionProviderGetEndpoint operations.</summary>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionProviderGetEndpointRequest
+public sealed class PermissionsSetRequiredResult
 {
-    /// <summary>Model identifier the caller intends to use against the returned endpoint. Used to pick the correct wire shape. Omit to use whichever model the session is currently using.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>RPC data type for SessionProviderGetEndpointRequestWithSession operations.</summary>
+/// <summary>Toggles whether permission prompts should be bridged into session events for this client.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionProviderGetEndpointRequestWithSession
+internal sealed class PermissionsSetRequiredRequest
 {
-    /// <summary>Model identifier the caller intends to use against the returned endpoint. Used to pick the correct wire shape. Omit to use whichever model the session is currently using.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+    /// <summary>Whether the client wants `permission.requested` events bridged from the session-owned permission service. CLI clients that render prompt UI set this to `true` for as long as their listener is mounted; headless callers leave it unset (the default is `false`).</summary>
+    [JsonPropertyName("required")]
+    public bool Required { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The selectable model entries synthesized for the models added by this call.</summary>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ProviderAddResult
+public sealed class PermissionsResetSessionApprovalsResult
 {
-    /// <summary>Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.</summary>
-    [JsonPropertyName("models")]
-    public IList<JsonElement> Models { get => field ??= []; set; }
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>A BYOK model definition referencing a named provider.</summary>
+/// <summary>Clears session-scoped tool permission approvals, and optionally the location-scoped ones.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ProviderModelConfig
+internal sealed class PermissionsResetSessionApprovalsRequest
 {
-    /// <summary>Optional capability overrides (vision, tool_calls, reasoning, etc.).</summary>
-    [JsonPropertyName("capabilities")]
-    public ModelCapabilitiesOverride? Capabilities { get; set; }
-
-    /// <summary>Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-
-    /// <summary>Maximum context window tokens for the model.</summary>
-    [JsonPropertyName("maxContextWindowTokens")]
-    public double? MaxContextWindowTokens { get; set; }
+    /// <summary>Whether location-scoped approvals are cleared too. Defaults to `true`.</summary>
+    [JsonPropertyName("includeLocation")]
+    public bool? IncludeLocation { get; set; }
 
-    /// <summary>Maximum output tokens for the model.</summary>
-    [JsonPropertyName("maxOutputTokens")]
-    public double? MaxOutputTokens { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Maximum prompt/input tokens for the model.</summary>
-    [JsonPropertyName("maxPromptTokens")]
-    public double? MaxPromptTokens { get; set; }
+/// <summary>Indicates whether the operation succeeded.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsNotifyPromptShownResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>Well-known base model id used for behavior/capability/config lookup. Defaults to `id`.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+/// <summary>Notification payload describing the permission prompt that the client just rendered.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionPromptShownNotification
+{
+    /// <summary>Human-readable description of the prompt the user is being asked to approve. Used by the runtime to fire the registered `permission_prompt` notification hook (e.g. terminal bell, desktop notification).</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 
-    /// <summary>Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`).</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Name of the NamedProviderConfig that serves this model.</summary>
-    [JsonPropertyName("provider")]
-    public string Provider { get; set; } = string.Empty;
+/// <summary>Snapshot of the session's allow-listed directories and primary working directory.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionPathsList
+{
+    /// <summary>All directories currently allowed for tool access on this session.</summary>
+    [JsonPropertyName("directories")]
+    public IList<string> Directories { get => field ??= []; set; }
 
-    /// <summary>The model name sent to the provider API for inference. Defaults to `id`.</summary>
-    [JsonPropertyName("wireModel")]
-    public string? WireModel { get; set; }
+    /// <summary>The primary working directory for this session.</summary>
+    [JsonPropertyName("primary")]
+    public string Primary { get; set; } = string.Empty;
 }
 
-/// <summary>Azure-specific provider options.</summary>
+/// <summary>No parameters; returns the session's allow-listed directories.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ProviderConfigAzure
+internal sealed class PermissionsPathsListRequest
 {
-    /// <summary>API version. When set, uses the versioned deployment route. When omitted, uses the GA versionless v1 route.</summary>
-    [JsonPropertyName("apiVersion")]
-    public string? ApiVersion { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>A named BYOK provider connection (transport + credentials).</summary>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class NamedProviderConfig
+public sealed class PermissionsPathsAddResult
 {
-    /// <summary>API key. Optional for local providers like Ollama.</summary>
-    [JsonPropertyName("apiKey")]
-    public string? ApiKey { get; set; }
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>Azure-specific provider options.</summary>
-    [JsonPropertyName("azure")]
-    public ProviderConfigAzure? Azure { get; set; }
+/// <summary>Directory path to add to the session's allowed directories.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionPathsAddParams
+{
+    /// <summary>Directory to add to the allow-list. The runtime resolves and validates the path before adding, then loads conventional `.github/skills/` and `.github/agents/` definitions under it when their subsystem gates are enabled. Adding the directory is therefore also a trust decision for configuration stored there.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>API endpoint URL.</summary>
-    [JsonPropertyName("baseUrl")]
-    public string BaseUrl { get; set; } = string.Empty;
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set.</summary>
-    [JsonPropertyName("bearerToken")]
-    public string? BearerToken { get; set; }
+/// <summary>Indicates whether the operation succeeded.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsPathsUpdatePrimaryResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>When true, the SDK client supplies bearer tokens on demand: the runtime calls the client-session `providerToken.getToken` callback before each request and applies the returned token as an `Authorization: Bearer &lt;token&gt;` header. This is the bearer/OAuth scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens (including Anthropic's), not a provider-specific API-key header such as Anthropic's `x-api-key`. The token-acquiring function itself stays on the SDK side and is never serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`, the callback takes precedence: the runtime applies the token returned by `providerToken.getToken` as the `Authorization: Bearer` header for each request and does not send the static credential.</summary>
-    [JsonPropertyName("hasBearerTokenProvider")]
-    public bool? HasBearerTokenProvider { get; set; }
+/// <summary>Directory path to set as the session's new primary working directory.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionPathsUpdatePrimaryParams
+{
+    /// <summary>Directory to set as the new primary working directory for the session's permission policy.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Custom HTTP headers to include in all outbound requests to the provider.</summary>
-    [JsonPropertyName("headers")]
-    public IDictionary<string, string>? Headers { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Stable identifier referenced by BYOK model definitions. Must not contain '/'.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+/// <summary>Indicates whether the supplied path is within the session's allowed directories.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionPathsAllowedCheckResult
+{
+    /// <summary>Whether the path is within the session's allowed directories.</summary>
+    [JsonPropertyName("allowed")]
+    public bool Allowed { get; set; }
+}
 
-    /// <summary>Provider transport. Defaults to "http".</summary>
-    [JsonPropertyName("transport")]
-    public ProviderConfigTransport? Transport { get; set; }
+/// <summary>Path to evaluate against the session's allowed directories.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionPathsAllowedCheckParams
+{
+    /// <summary>Path to check against the session's allowed directories.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.</summary>
-    [JsonPropertyName("type")]
-    public ProviderConfigType? Type { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Wire API format (openai/azure only). Defaults to "completions".</summary>
-    [JsonPropertyName("wireApi")]
-    public ProviderConfigWireApi? WireApi { get; set; }
+/// <summary>Indicates whether the supplied path is within the session's workspace directory.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionPathsWorkspaceCheckResult
+{
+    /// <summary>Whether the path is within the session workspace directory.</summary>
+    [JsonPropertyName("allowed")]
+    public bool Allowed { get; set; }
 }
 
-/// <summary>BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.</summary>
+/// <summary>Path to evaluate against the session's workspace (primary) directory.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ProviderAddRequest
+internal sealed class PermissionPathsWorkspaceCheckParams
 {
-    /// <summary>BYOK model definitions to register. Each must reference a provider that is already registered or included in this same call. Selection ids (`provider/id`) must be unique across the registry.</summary>
-    [JsonPropertyName("models")]
-    public IList<ProviderModelConfig>? Models { get; set; }
-
-    /// <summary>Named BYOK provider connections to register, additive to any providers already in the registry. Each name must be unique across the registry and must not contain '/'.</summary>
-    [JsonPropertyName("providers")]
-    public IList<NamedProviderConfig>? Providers { get; set; }
+    /// <summary>Path to check against the session workspace directory.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the session options patch was applied successfully.</summary>
+/// <summary>Resolved location-permissions key and type.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionUpdateOptionsResult
+public sealed class PermissionLocationResolveResult
 {
-    /// <summary>Number of hooks loaded from installed plugins, returned when installedPlugins is updated.</summary>
-    [JsonPropertyName("pluginHookCount")]
-    public long? PluginHookCount { get; set; }
+    /// <summary>Location key used in the location-permissions store.</summary>
+    [JsonPropertyName("locationKey")]
+    public string LocationKey { get; set; } = string.Empty;
 
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Whether the location is a git repo or directory.</summary>
+    [JsonPropertyName("locationType")]
+    public PermissionLocationType LocationType { get; set; }
 }
 
-/// <summary>Source descriptor for a `session.options.update` content-exclusion rule, with source name and type.</summary>
+/// <summary>Working directory to resolve into a location-permissions key.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class OptionsUpdateAdditionalContentExclusionPolicyRuleSource
+internal sealed class PermissionLocationResolveParams
 {
-    /// <summary>Gets or sets the <c>name</c> value.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>type</c> value.</summary>
-    [JsonPropertyName("type")]
-    public string Type { get; set; } = string.Empty;
+    /// <summary>Working directory whose permission location should be resolved.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Single content-exclusion rule supplied to `session.options.update`, with paths, match conditions, and source.</summary>
+/// <summary>Summary of persisted location permissions applied to the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class OptionsUpdateAdditionalContentExclusionPolicyRule
+public sealed class PermissionLocationApplyResult
 {
-    /// <summary>Gets or sets the <c>ifAnyMatch</c> value.</summary>
-    [JsonPropertyName("ifAnyMatch")]
-    public IList<string>? IfAnyMatch { get; set; }
+    /// <summary>Number of persisted allowed directories added to the live path manager.</summary>
+    [JsonPropertyName("appliedDirectoryCount")]
+    public long AppliedDirectoryCount { get; set; }
 
-    /// <summary>Gets or sets the <c>ifNoneMatch</c> value.</summary>
-    [JsonPropertyName("ifNoneMatch")]
-    public IList<string>? IfNoneMatch { get; set; }
+    /// <summary>Number of location-scoped rules added to the live permission service.</summary>
+    [JsonPropertyName("appliedRuleCount")]
+    public long AppliedRuleCount { get; set; }
 
-    /// <summary>Gets or sets the <c>paths</c> value.</summary>
-    [JsonPropertyName("paths")]
-    public IList<string> Paths { get => field ??= []; set; }
+    /// <summary>Location-scoped rules applied to the live permission service.</summary>
+    [JsonPropertyName("appliedRules")]
+    public IList<PermissionRule> AppliedRules { get => field ??= []; set; }
 
-    /// <summary>Source descriptor for a `session.options.update` content-exclusion rule, with source name and type.</summary>
-    [JsonPropertyName("source")]
-    public OptionsUpdateAdditionalContentExclusionPolicyRuleSource Source { get => field ??= new(); set; }
+    /// <summary>Whether a different location was applied since the previous apply call.</summary>
+    [JsonPropertyName("changed")]
+    public bool Changed { get; set; }
+
+    /// <summary>Location key used in the location-permissions store.</summary>
+    [JsonPropertyName("locationKey")]
+    public string LocationKey { get; set; } = string.Empty;
+
+    /// <summary>Whether the location is a git repo or directory.</summary>
+    [JsonPropertyName("locationType")]
+    public PermissionLocationType LocationType { get; set; }
 }
 
-/// <summary>Content-exclusion policy supplied to `session.options.update`, with rules, last-updated data, and scope.</summary>
+/// <summary>Working directory to load persisted location permissions for.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class OptionsUpdateAdditionalContentExclusionPolicy
+internal sealed class PermissionLocationApplyParams
 {
-    /// <summary>Gets or sets the <c>last_updated_at</c> value.</summary>
-    [JsonPropertyName("last_updated_at")]
-    public JsonElement LastUpdatedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>rules</c> value.</summary>
-    [JsonPropertyName("rules")]
-    public IList<OptionsUpdateAdditionalContentExclusionPolicyRule> Rules { get => field ??= []; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.</summary>
-    [JsonPropertyName("scope")]
-    public OptionsUpdateAdditionalContentExclusionPolicyScope Scope { get; set; }
+    /// <summary>Working directory whose persisted location permissions should be applied.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Options scoped to the built-in CAPI (Copilot API) provider.</summary>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CapiSessionOptions
+public sealed class PermissionsLocationsAddToolApprovalResult
 {
-    /// <summary>Whether to use WebSocket transport for the CAPI Responses API. Enabled by default when the model advertises `ws:/responses` support; set to `false` to force the HTTP Responses transport in environments where WebSockets are blocked (e.g. behind a proxy). Setting this to `false` is equivalent to the `COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES` environment variable.</summary>
-    [JsonPropertyName("enableWebSocketResponses")]
-    public bool? EnableWebSocketResponses { get; set; }
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Installed plugin record for a session, with marketplace, version, install time, enabled state, cache path, and source.</summary>
+/// <summary>Tool approval to persist and apply.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionInstalledPlugin
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsCommands), "commands")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsRead), "read")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsWrite), "write")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsMcp), "mcp")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsMcpSampling), "mcp-sampling")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsMemory), "memory")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsCustomTool), "custom-tool")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsExtensionManagement), "extension-management")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsFactory), "factory")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess), "extension-permission-access")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess), "extension-env-access")]
+public partial class PermissionsLocationsAddToolApprovalDetails
 {
-    /// <summary>Path where the plugin is cached locally.</summary>
-    [JsonPropertyName("cache_path")]
-    public string? CachePath { get; set; }
-
-    /// <summary>Whether the plugin is currently enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Installation timestamp (ISO-8601).</summary>
-    [JsonPropertyName("installed_at")]
-    public string InstalledAt { get; set; } = string.Empty;
-
-    /// <summary>Marketplace the plugin came from (empty string for direct repo installs).</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
-
-    /// <summary>Plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
 
-    /// <summary>Source descriptor for direct repo installs (when marketplace is empty).</summary>
-    [JsonPropertyName("source")]
-    public JsonElement? Source { get; set; }
 
-    /// <summary>Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.</summary>
-    [JsonPropertyName("source_sha")]
-    public string? SourceSha { get; set; }
+/// <summary>Location-persisted tool approval details for specific command identifiers.</summary>
+/// <remarks>The <c>commands</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionsLocationsAddToolApprovalDetailsCommands : PermissionsLocationsAddToolApprovalDetails
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "commands";
 
-    /// <summary>Installed version, if known.</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    /// <summary>Command identifiers covered by this approval.</summary>
+    [JsonPropertyName("commandIdentifiers")]
+    public required IList<string> CommandIdentifiers { get; set; }
 }
 
-/// <summary>Custom model-provider configuration (BYOK).</summary>
+/// <summary>Location-persisted tool approval details for read-only filesystem operations.</summary>
+/// <remarks>The <c>read</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ProviderConfig
+public partial class PermissionsLocationsAddToolApprovalDetailsRead : PermissionsLocationsAddToolApprovalDetails
 {
-    /// <summary>API key. Optional for local providers like Ollama.</summary>
-    [JsonPropertyName("apiKey")]
-    public string? ApiKey { get; set; }
-
-    /// <summary>Azure-specific provider options.</summary>
-    [JsonPropertyName("azure")]
-    public ProviderConfigAzure? Azure { get; set; }
-
-    /// <summary>API endpoint URL.</summary>
-    [JsonPropertyName("baseUrl")]
-    public string BaseUrl { get; set; } = string.Empty;
-
-    /// <summary>Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set.</summary>
-    [JsonPropertyName("bearerToken")]
-    public string? BearerToken { get; set; }
-
-    /// <summary>When true, the SDK client supplies bearer tokens on demand: the runtime calls the client-session `providerToken.getToken` callback before each request and applies the returned token as an `Authorization: Bearer &lt;token&gt;` header. This is the bearer/OAuth scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens (including Anthropic's), not a provider-specific API-key header such as Anthropic's `x-api-key`. The token-acquiring function itself stays on the SDK side and is never serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`, the callback takes precedence: the runtime applies the token returned by `providerToken.getToken` as the `Authorization: Bearer` header for each request and does not send the static credential.</summary>
-    [JsonPropertyName("hasBearerTokenProvider")]
-    public bool? HasBearerTokenProvider { get; set; }
-
-    /// <summary>Custom HTTP headers to include in all outbound requests to the provider.</summary>
-    [JsonPropertyName("headers")]
-    public IDictionary<string, string>? Headers { get; set; }
-
-    /// <summary>Maximum context window tokens for the model.</summary>
-    [JsonPropertyName("maxContextWindowTokens")]
-    public double? MaxContextWindowTokens { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "read";
+}
 
-    /// <summary>Maximum output tokens for the model.</summary>
-    [JsonPropertyName("maxOutputTokens")]
-    public double? MaxOutputTokens { get; set; }
+/// <summary>Location-persisted tool approval details for filesystem write operations.</summary>
+/// <remarks>The <c>write</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionsLocationsAddToolApprovalDetailsWrite : PermissionsLocationsAddToolApprovalDetails
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "write";
+}
 
-    /// <summary>Maximum prompt/input tokens for the model.</summary>
-    [JsonPropertyName("maxPromptTokens")]
-    public double? MaxPromptTokens { get; set; }
+/// <summary>Location-persisted tool approval details for an MCP server tool, or all tools when `toolName` is null.</summary>
+/// <remarks>The <c>mcp</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionsLocationsAddToolApprovalDetailsMcp : PermissionsLocationsAddToolApprovalDetails
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp";
 
-    /// <summary>Well-known model ID used for capability lookup. When set, agent behavior config and token limits are inferred from this model.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+    /// <summary>MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
 
-    /// <summary>Provider transport. Defaults to "http".</summary>
-    [JsonPropertyName("transport")]
-    public ProviderConfigTransport? Transport { get; set; }
+    /// <summary>MCP tool name, or null to cover every tool on the server.</summary>
+    [JsonPropertyName("toolName")]
+    public string? ToolName { get; set; }
+}
 
-    /// <summary>Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.</summary>
-    [JsonPropertyName("type")]
-    public ProviderConfigType? Type { get; set; }
+/// <summary>Location-persisted tool approval details for MCP sampling requests from a server.</summary>
+/// <remarks>The <c>mcp-sampling</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionsLocationsAddToolApprovalDetailsMcpSampling : PermissionsLocationsAddToolApprovalDetails
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp-sampling";
 
-    /// <summary>Wire API format (openai/azure only). Defaults to "completions".</summary>
-    [JsonPropertyName("wireApi")]
-    public ProviderConfigWireApi? WireApi { get; set; }
+    /// <summary>MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
+}
 
-    /// <summary>The model identifier sent to the provider API for inference (the "wire" model), as opposed to modelId which is the well-known base.</summary>
-    [JsonPropertyName("wireModel")]
-    public string? WireModel { get; set; }
+/// <summary>Location-persisted tool approval details for writes to long-term memory.</summary>
+/// <remarks>The <c>memory</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionsLocationsAddToolApprovalDetailsMemory : PermissionsLocationsAddToolApprovalDetails
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "memory";
 }
 
-/// <summary>macOS seatbelt experimental options.</summary>
+/// <summary>Location-persisted tool approval details for a custom tool, keyed by tool name.</summary>
+/// <remarks>The <c>custom-tool</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyExperimentalSeatbelt
+public partial class PermissionsLocationsAddToolApprovalDetailsCustomTool : PermissionsLocationsAddToolApprovalDetails
 {
-    /// <summary>Whether the macOS seatbelt profile may access the keychain.</summary>
-    [JsonPropertyName("keychainAccess")]
-    public bool? KeychainAccess { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "custom-tool";
+
+    /// <summary>Custom tool name.</summary>
+    [JsonPropertyName("toolName")]
+    public required string ToolName { get; set; }
 }
 
-/// <summary>Platform-specific experimental policy fields.</summary>
+/// <summary>Location-persisted tool approval details for extension-management operations, optionally narrowed by operation.</summary>
+/// <remarks>The <c>extension-management</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyExperimental
+public partial class PermissionsLocationsAddToolApprovalDetailsExtensionManagement : PermissionsLocationsAddToolApprovalDetails
 {
-    /// <summary>macOS seatbelt experimental options.</summary>
-    [JsonPropertyName("seatbelt")]
-    public SandboxConfigUserPolicyExperimentalSeatbelt? Seatbelt { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-management";
+
+    /// <summary>Optional operation identifier; when omitted, the approval covers all extension management operations.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("operation")]
+    public string? Operation { get; set; }
 }
 
-/// <summary>Filesystem rules to merge into the base policy.</summary>
+/// <summary>Location-persisted factory approval, optionally narrowed by approval key.</summary>
+/// <remarks>The <c>factory</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyFilesystem
+public partial class PermissionsLocationsAddToolApprovalDetailsFactory : PermissionsLocationsAddToolApprovalDetails
 {
-    /// <summary>Whether to clear the policy when the session exits.</summary>
-    [JsonPropertyName("clearPolicyOnExit")]
-    public bool? ClearPolicyOnExit { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "factory";
 
-    /// <summary>Paths explicitly denied.</summary>
-    [JsonPropertyName("deniedPaths")]
-    public IList<string>? DeniedPaths { get; set; }
+    /// <summary>Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("approvalKey")]
+    public string? ApprovalKey { get; set; }
+}
 
-    /// <summary>Paths granted read-only access.</summary>
-    [JsonPropertyName("readonlyPaths")]
-    public IList<string>? ReadonlyPaths { get; set; }
+/// <summary>Location-persisted tool approval details for an extension's permission-gated capability access, keyed by extension name.</summary>
+/// <remarks>The <c>extension-permission-access</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess : PermissionsLocationsAddToolApprovalDetails
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-permission-access";
 
-    /// <summary>Paths granted read/write access.</summary>
-    [JsonPropertyName("readwritePaths")]
-    public IList<string>? ReadwritePaths { get; set; }
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
 }
 
-/// <summary>HTTP proxy configuration for sandboxed traffic.</summary>
+/// <summary>Location-persisted tool approval details for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.</summary>
+/// <remarks>The <c>extension-env-access</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyNetworkProxy
+public partial class PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess : PermissionsLocationsAddToolApprovalDetails
 {
-    /// <summary>Optional password for proxy authentication, combined with the URL at spawn time. The persisted value may be a literal password, a `${secret:…}` reference resolved from the OS keychain, or a `${VAR}`/`$VAR` environment reference; it is resolved just before the sandboxed process routes through the proxy. The /sandbox dialog stores a real password in the OS keychain and persists only a `${secret:…}` placeholder (never plaintext in settings.json); the field is masked in the dialog and redacted by /settings show.</summary>
-    [JsonPropertyName("password")]
-    public string? Password { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-env-access";
 
-    /// <summary>Proxy URL (e.g. http://proxy.example.com:8080). The port is optional and defaults to the scheme's standard port when omitted. Credentials must not be embedded here — a `user:pass@` authority is rejected; put them in the separate `username`/`password` fields. A credential-free http:// loopback URL is routed through the localhost proxy automatically; loopback covers localhost and any *.localhost subdomain, the whole 127.0.0.0/8 range, ::1, and IPv4-mapped loopback (::ffff:127.0.0.1). An https:// URL, or one with a username/password set, is used as-is.</summary>
-    [JsonPropertyName("url")]
-    public string Url { get; set; } = string.Empty;
+    /// <summary>Names of the sensitive environment variables this approval covers. Values are never persisted.</summary>
+    [JsonPropertyName("environmentVariables")]
+    public required IList<string> EnvironmentVariables { get; set; }
 
-    /// <summary>Optional username for proxy authentication. Combined with the URL (and `password`) into `user:pass@host` when the sandboxed process routes through the proxy.</summary>
-    [JsonPropertyName("username")]
-    public string? Username { get; set; }
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
 }
 
-/// <summary>Network rules to merge into the base policy.</summary>
+/// <summary>Location-scoped tool approval to persist.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyNetwork
+internal sealed class PermissionLocationAddToolApprovalParams
 {
-    /// <summary>Whether traffic to local/loopback addresses is allowed.</summary>
-    [JsonPropertyName("allowLocalNetwork")]
-    public bool? AllowLocalNetwork { get; set; }
+    /// <summary>Tool approval to persist and apply.</summary>
+    [JsonPropertyName("approval")]
+    public PermissionsLocationsAddToolApprovalDetails Approval { get => field ??= new(); set; }
 
-    /// <summary>Whether outbound network traffic is allowed at all.</summary>
-    [JsonPropertyName("allowOutbound")]
-    public bool? AllowOutbound { get; set; }
+    /// <summary>Location key (git root or cwd) to persist the approval to.</summary>
+    [JsonPropertyName("locationKey")]
+    public string LocationKey { get; set; } = string.Empty;
 
-    /// <summary>HTTP proxy the sandboxed process routes traffic through. Enforced on Windows and cooperative (honored by well-behaved tools, not strictly enforced) on Linux and macOS. Credentials go in the separate `username`/`password` fields. A credential-free http:// loopback proxy URL is routed through the localhost proxy automatically; an https:// or authenticated loopback URL is used as-is.</summary>
-    [JsonPropertyName("proxy")]
-    public SandboxConfigUserPolicyNetworkProxy? Proxy { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>macOS seatbelt-specific options.</summary>
+/// <summary>Folder trust check result.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicySeatbelt
+public sealed class FolderTrustCheckResult
 {
-    /// <summary>Whether the macOS seatbelt profile may access the keychain.</summary>
-    [JsonPropertyName("keychainAccess")]
-    public bool? KeychainAccess { get; set; }
+    /// <summary>Whether the folder is trusted.</summary>
+    [JsonPropertyName("trusted")]
+    public bool Trusted { get; set; }
 }
 
-/// <summary>User-managed sandbox policy fragment merged into the auto-discovered base policy.</summary>
+/// <summary>Folder path to check for trust.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicy
+internal sealed class FolderTrustCheckParams
 {
-    /// <summary>Deprecated legacy location for `seatbelt`; read only when the top-level `seatbelt` is absent.</summary>
-    [JsonPropertyName("experimental")]
-    public SandboxConfigUserPolicyExperimental? Experimental { get; set; }
-
-    /// <summary>Filesystem rules to merge into the base policy.</summary>
-    [JsonPropertyName("filesystem")]
-    public SandboxConfigUserPolicyFilesystem? Filesystem { get; set; }
+    /// <summary>Folder path to check.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Network rules to merge into the base policy.</summary>
-    [JsonPropertyName("network")]
-    public SandboxConfigUserPolicyNetwork? Network { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>macOS seatbelt options to merge into the base policy.</summary>
-    [JsonPropertyName("seatbelt")]
-    public SandboxConfigUserPolicySeatbelt? Seatbelt { get; set; }
+/// <summary>Indicates whether the operation succeeded.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsFolderTrustAddTrustedResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Resolved sandbox configuration.</summary>
+/// <summary>Folder path to add to trusted folders.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SandboxConfig
+internal sealed class FolderTrustAddParams
 {
-    /// <summary>Whether to auto-add the current working directory to readwritePaths. Default: true.</summary>
-    [JsonPropertyName("addCurrentWorkingDirectory")]
-    public bool? AddCurrentWorkingDirectory { get; set; }
+    /// <summary>Folder path to mark as trusted.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Whether to auto-grant read access to common developer-tool caches, registries, and toolchains in their default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and, on Unix, up-front creation of) the scratch caches builds write on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so builds work without exporting CARGO_HOME/GOPATH/etc. Default: true (enabled by default; set to false to opt out).</summary>
-    [JsonPropertyName("allowDevToolCaches")]
-    public bool? AllowDevToolCaches { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Whether sandboxing is enabled for the session.</summary>
+/// <summary>Indicates whether the operation succeeded.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PermissionsUrlsSetUnrestrictedModeResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Whether the URL-permission policy should run in unrestricted mode.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PermissionUrlsSetUnrestrictedModeParams
+{
+    /// <summary>Whether to allow access to all URLs without prompting. Toggles the runtime's URL-permission policy in place.</summary>
     [JsonPropertyName("enabled")]
     public bool Enabled { get; set; }
 
-    /// <summary>Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the OS keyring the sandbox blocks. Default: false (opt-in).</summary>
-    [JsonPropertyName("ghAuth")]
-    public bool? GhAuth { get; set; }
-
-    /// <summary>Whether to inject the Copilot GitHub token as an `http.&lt;host&gt;.extraheader` so authenticated HTTPS git works inside the sandbox without the shell-based credential helper the sandbox blocks. Default: false (opt-in).</summary>
-    [JsonPropertyName("gitAuth")]
-    public bool? GitAuth { get; set; }
-
-    /// <summary>User-managed sandbox policy fragment merged into the auto-discovered base policy.</summary>
-    [JsonPropertyName("userPolicy")]
-    public SandboxConfigUserPolicy? UserPolicy { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>A host-provided script sourced before each built-in shell command when its shell target matches the active shell.</summary>
+/// <summary>The repository the remote session targets.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ShellInitScript
+public sealed class MetadataSnapshotRemoteMetadataRepository
 {
-    /// <summary>Path to the script to source.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>The branch the remote session is operating on.</summary>
+    [JsonPropertyName("branch")]
+    public string Branch { get; set; } = string.Empty;
 
-    /// <summary>Built-in shell that may source this script.</summary>
-    [JsonPropertyName("shell")]
-    public ShellInitScriptShell Shell { get; set; }
+    /// <summary>The GitHub repository name (without owner).</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>The GitHub owner (user or organization) of the target repository.</summary>
+    [JsonPropertyName("owner")]
+    public string Owner { get; set; } = string.Empty;
 }
 
-/// <summary>Per-session settings for built-in shell tools.</summary>
+/// <summary>Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ShellOptions
+public sealed class MetadataSnapshotRemoteMetadata
 {
-    /// <summary>Controls automatic non-interactive profile loading where supported. Explicit initScripts are unaffected.</summary>
-    [JsonPropertyName("initProfile")]
-    public ShellInitProfile? InitProfile { get; set; }
+    /// <summary>The pull request number the remote session is associated with, if any.</summary>
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
 
-    /// <summary>
-    /// Ordered host-provided script paths sourced before each built-in shell command when the
-    /// entry's shell target matches the active shell. Use these for rc files, environment setup scripts,
-    /// or other custom scripts. A script that returns a nonzero status is reported, and later scripts
-    /// and the user command continue while the shell remains running. Because scripts are sourced into
-    /// the command shell, `exit`, `exec`, failures under `set -e`, or other shell-terminating behavior
-    /// can prevent continuation. Script standard output is preserved; Bash script stderr is discarded,
-    /// PowerShell exception messages are replaced, and runtime-generated failure notices omit
-    /// configured script paths. When sandboxing is enabled, each script must already be readable under
-    /// the active sandbox filesystem policy. Pass an empty array to clear the list.
-    /// </summary>
-    [JsonPropertyName("initScripts")]
-    public IList<ShellInitScript>? InitScripts { get; set; }
+    /// <summary>The repository the remote session targets.</summary>
+    [JsonPropertyName("repository")]
+    public MetadataSnapshotRemoteMetadataRepository Repository { get => field ??= new(); set; }
 
-    /// <summary>
-    /// Flags passed to the active built-in shell process on startup, replacing its default flags.
-    /// When omitted, the built-in Bash shell uses `--norc --noprofile`,
-    /// and the built-in PowerShell shell uses `-NoProfile -NoLogo`.
-    /// </summary>
-    [JsonPropertyName("processFlags")]
-    public IList<string>? ProcessFlags { get; set; }
+    /// <summary>The original resource identifier (task ID or PR node ID), preserved across event-replay reconstructions. Falls back to `sessionId` when absent.</summary>
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
+
+    /// <summary>Whether the remote task originated from Copilot Coding Agent (cca) or a CLI `--remote` invocation.</summary>
+    [JsonPropertyName("taskType")]
+    public MetadataSnapshotRemoteMetadataTaskType? TaskType { get; set; }
 }
 
-/// <summary>Patch of mutable session options to apply to the running session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionUpdateOptionsParams
+/// <summary>Public-facing projection of workspace metadata for SDK / TUI consumers.</summary>
+public sealed class SessionMetadataSnapshotWorkspace
 {
-    /// <summary>Additional content-exclusion policies to merge into the session's policy set.</summary>
-    [Experimental(Diagnostics.Experimental)]
-    [JsonPropertyName("additionalContentExclusionPolicies")]
-    public IList<OptionsUpdateAdditionalContentExclusionPolicy>? AdditionalContentExclusionPolicies { get; set; }
-
-    /// <summary>Runtime context discriminator (e.g., `cli`, `actions`).</summary>
-    [JsonPropertyName("agentContext")]
-    public string? AgentContext { get; set; }
+    /// <summary>Branch checked out at session start, if any.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-    /// <summary>Whether to include instructions from every MCP server in the system prompt instead of only allowlisted servers.</summary>
-    [JsonPropertyName("allowAllMcpServerInstructions")]
-    public bool? AllowAllMcpServerInstructions { get; set; }
+    /// <summary>ISO 8601 timestamp when the workspace was created.</summary>
+    [JsonPropertyName("created_at")]
+    public DateTimeOffset? CreatedAt { get; set; }
 
-    /// <summary>Whether to disable the `ask_user` tool (encourages autonomous behavior).</summary>
-    [JsonPropertyName("askUserDisabled")]
-    public bool? AskUserDisabled { get; set; }
+    /// <summary>Current working directory at session start.</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
 
-    /// <summary>Allowlist of tool names available to this session.</summary>
-    [JsonPropertyName("availableTools")]
-    public IList<string>? AvailableTools { get; set; }
+    /// <summary>Resolved git root for cwd, if any.</summary>
+    [JsonPropertyName("git_root")]
+    public string? GitRoot { get; set; }
 
-    /// <summary>Options scoped to the built-in CAPI (Copilot API) provider.</summary>
-    [JsonPropertyName("capi")]
-    public CapiSessionOptions? Capi { get; set; }
+    /// <summary>Repository host type, if known.</summary>
+    [JsonPropertyName("host_type")]
+    public WorkspaceSummaryHostType? HostType { get; set; }
 
-    /// <summary>Identifier of the client driving the session.</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
+    /// <summary>Workspace identifier (1:1 with sessionId).</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Whether to include the `Co-authored-by` trailer in commit messages.</summary>
-    [JsonPropertyName("coauthorEnabled")]
-    public bool? CoauthorEnabled { get; set; }
+    /// <summary>Display name for the session, if set.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Context tier for models with tiered pricing. The session uses this to derive effective `modelCapabilitiesOverrides` so compaction, truncation, token display, and request limits honor the selected tier.</summary>
-    [JsonPropertyName("contextTier")]
-    public OptionsUpdateContextTier? ContextTier { get; set; }
+    /// <summary>Repository identifier in 'owner/repo' or 'org/project/repo' format, if any.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
 
-    /// <summary>Whether to allow auto-mode continuation across turns.</summary>
-    [JsonPropertyName("continueOnAutoMode")]
-    public bool? ContinueOnAutoMode { get; set; }
+    /// <summary>ISO 8601 timestamp when the workspace was last updated.</summary>
+    [JsonPropertyName("updated_at")]
+    public DateTimeOffset? UpdatedAt { get; set; }
 
-    /// <summary>Override URL for the Copilot API endpoint.</summary>
-    [JsonPropertyName("copilotUrl")]
-    public string? CopilotUrl { get; set; }
+    /// <summary>Whether the display name was explicitly set by the user.</summary>
+    [JsonPropertyName("user_named")]
+    public bool? UserNamed { get; set; }
+}
 
-    /// <summary>Whether to default custom agents to local-only execution.</summary>
-    [JsonPropertyName("customAgentsLocalOnly")]
-    public bool? CustomAgentsLocalOnly { get; set; }
+/// <summary>Point-in-time snapshot of slow-changing session identifier and state fields.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionMetadataSnapshot
+{
+    /// <summary>True when the session was detected to be in use by another process at construction time. Local consumers may surface a confirmation prompt before fully attaching. Always false for new sessions.</summary>
+    [JsonPropertyName("alreadyInUse")]
+    public bool AlreadyInUse { get; set; }
 
-    /// <summary>Instruction source IDs to exclude from the system prompt.</summary>
-    [JsonPropertyName("disabledInstructionSources")]
-    public IList<string>? DisabledInstructionSources { get; set; }
+    /// <summary>Runtime client name associated with the session (telemetry identifier).</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-    /// <summary>Skill IDs that should be excluded from this session.</summary>
-    [JsonPropertyName("disabledSkills")]
-    public IList<string>? DisabledSkills { get; set; }
+    /// <summary>The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot').</summary>
+    [JsonPropertyName("currentMode")]
+    public MetadataSnapshotCurrentMode CurrentMode { get; set; }
 
-    /// <summary>Whether to enable loading of `.github/hooks/` filesystem hooks. Separate from the SDK callback hook mechanism.</summary>
-    [JsonPropertyName("enableFileHooks")]
-    public bool? EnableFileHooks { get; set; }
+    /// <summary>User-provided name supplied at session construction (via `--name`), if any. Immutable after construction.</summary>
+    [JsonPropertyName("initialName")]
+    public string? InitialName { get; set; }
 
-    /// <summary>Whether to enable host git operations (context resolution, child repo scanning, git info in system prompt).</summary>
-    [JsonPropertyName("enableHostGitOperations")]
-    public bool? EnableHostGitOperations { get; set; }
+    /// <summary>Whether this is a remote session (i.e., one whose runtime executes elsewhere and is steered through this process).</summary>
+    [JsonPropertyName("isRemote")]
+    public bool IsRemote { get; set; }
 
-    /// <summary>Whether to discover custom instructions on demand after successful file views (AGENTS.md / CLAUDE.md / .github/copilot-instructions.md surfacing). Combined with `skipCustomInstructions`.</summary>
-    [JsonPropertyName("enableOnDemandInstructionDiscovery")]
-    public bool? EnableOnDemandInstructionDiscovery { get; set; }
+    /// <summary>ISO 8601 timestamp of when the session's persisted state was last modified on disk. For new sessions, equals startTime. For resumed sessions, reflects the previous modification time at construction.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public DateTimeOffset ModifiedTime { get; set; }
 
-    /// <summary>Whether to surface reasoning-summary events from the model.</summary>
-    [JsonPropertyName("enableReasoningSummaries")]
-    public bool? EnableReasoningSummaries { get; set; }
+    /// <summary>Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.</summary>
+    [JsonPropertyName("remoteMetadata")]
+    public MetadataSnapshotRemoteMetadata? RemoteMetadata { get; set; }
 
-    /// <summary>Whether shell-script safety heuristics are enabled.</summary>
-    [JsonPropertyName("enableScriptSafety")]
-    public bool? EnableScriptSafety { get; set; }
+    /// <summary>Currently selected model identifier, if any.</summary>
+    [JsonPropertyName("selectedModel")]
+    public string? SelectedModel { get; set; }
 
-    /// <summary>Whether to enable cross-session store writes and reads.</summary>
-    [JsonPropertyName("enableSessionStore")]
-    public bool? EnableSessionStore { get; set; }
+    /// <summary>The unique identifier of the session.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Whether to enable skill directory scanning and loading. Falls back to enableConfigDiscovery when unset.</summary>
-    [JsonPropertyName("enableSkills")]
-    public bool? EnableSkills { get; set; }
+    /// <summary>Current session limits, or null when no limits are active.</summary>
+    [JsonPropertyName("sessionLimits")]
+    public SessionLimitsConfig? SessionLimits { get; set; }
 
-    /// <summary>Whether to stream model responses.</summary>
-    [JsonPropertyName("enableStreaming")]
-    public bool? EnableStreaming { get; set; }
+    /// <summary>ISO 8601 timestamp of when the session started.</summary>
+    [JsonPropertyName("startTime")]
+    public DateTimeOffset StartTime { get; set; }
 
-    /// <summary>How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch).</summary>
-    [JsonPropertyName("envValueMode")]
-    public OptionsUpdateEnvValueMode? EnvValueMode { get; set; }
+    /// <summary>Short human-readable summary of the session, if known. Omitted when no summary has been generated.</summary>
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
 
-    /// <summary>Override directory for the session-events log. When unset, the runtime's default events log directory is used.</summary>
-    [JsonPropertyName("eventsLogDirectory")]
-    public string? EventsLogDirectory { get; set; }
+    /// <summary>Absolute path to the session's current working directory.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
 
-    /// <summary>Whether subagent callback events should be forwarded into the session event log sink.</summary>
-    [JsonPropertyName("eventsLogIncludesSubagents")]
-    public bool? EventsLogIncludesSubagents { get; set; }
+    /// <summary>Public-facing workspace metadata for this session, or null if the session has no associated workspace. Excludes runtime-internal fields (GitHub IDs, summary count, internal flags).</summary>
+    [JsonPropertyName("workspace")]
+    public SessionMetadataSnapshotWorkspace? Workspace { get; set; }
 
-    /// <summary>Built-in subagent names to exclude from this session. Excluded built-ins are hidden from agent discovery and cannot be dispatched unless a custom agent with the same name is available.</summary>
-    [JsonPropertyName("excludedBuiltinAgents")]
-    public IList<string>? ExcludedBuiltinAgents { get; set; }
+    /// <summary>Absolute path to the session's workspace directory on disk, or null if the session has no associated workspace.</summary>
+    [JsonPropertyName("workspacePath")]
+    public string? WorkspacePath { get; set; }
+}
 
-    /// <summary>Denylist of tool names for this session.</summary>
-    [JsonPropertyName("excludedTools")]
-    public IList<string>? ExcludedTools { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionMetadataSnapshotRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Map of feature-flag IDs to their boolean enabled state.</summary>
-    [JsonPropertyName("featureFlags")]
-    public IDictionary<string, bool>? FeatureFlags { get; set; }
+/// <summary>Indicates whether the local session is currently processing a turn or background continuation.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class MetadataIsProcessingResult
+{
+    /// <summary>Whether the session is currently processing user/agent messages. False for non-local sessions (which don't run a local agentic loop). Reflects an in-flight turn or background continuation.</summary>
+    [JsonPropertyName("processing")]
+    public bool Processing { get; set; }
+}
 
-    /// <summary>Built-in subagent names to include in this session. When specified, only these built-ins are available, subject to runtime availability and exclusions. Custom agents with the same name remain available. Set to null to remove the allowlist restriction.</summary>
-    [JsonPropertyName("includedBuiltinAgents")]
-    public IList<string>? IncludedBuiltinAgents { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionMetadataIsProcessingRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Full set of installed plugins for the session. Replaces the existing list; the runtime invalidates the skills cache only when the list materially changes.</summary>
-    [JsonPropertyName("installedPlugins")]
-    public IList<SessionInstalledPlugin>? InstalledPlugins { get; set; }
+/// <summary>Current activity flags for the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionActivity
+{
+    /// <summary>Whether an in-flight operation can currently be aborted.</summary>
+    [JsonPropertyName("abortable")]
+    public bool Abortable { get; set; }
 
-    /// <summary>Stable integration identifier used for analytics and rate-limit attribution.</summary>
-    [JsonPropertyName("integrationId")]
-    public string? IntegrationId { get; set; }
+    /// <summary>Whether the session currently has active work, including running turns or tasks.</summary>
+    [JsonPropertyName("hasActiveWork")]
+    public bool HasActiveWork { get; set; }
+}
 
-    /// <summary>Whether experimental capabilities are enabled.</summary>
-    [JsonPropertyName("isExperimentalMode")]
-    public bool? IsExperimentalMode { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionMetadataActivityRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Whether interactive shell sessions are logged.</summary>
-    [JsonPropertyName("logInteractiveShells")]
-    public bool? LogInteractiveShells { get; set; }
+/// <summary>Token-usage breakdown for the session's current context window.</summary>
+public sealed class MetadataContextInfoResultContextInfo
+{
+    /// <summary>Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%).</summary>
+    [JsonPropertyName("bufferTokens")]
+    public long BufferTokens { get; set; }
 
-    /// <summary>Identifier sent to LSP-style integrations.</summary>
-    [JsonPropertyName("lspClientName")]
-    public string? LspClientName { get; set; }
+    /// <summary>Token count at which background compaction starts (configurable percentage of promptTokenLimit).</summary>
+    [JsonPropertyName("compactionThreshold")]
+    public long CompactionThreshold { get; set; }
 
-    /// <summary>Whether to expose the `manage_schedule` tool to the agent. The runtime always owns the per-session schedule registry; this flag only controls tool exposure (typically gated to staff users).</summary>
-    [JsonPropertyName("manageScheduleEnabled")]
-    public bool? ManageScheduleEnabled { get; set; }
+    /// <summary>Tokens consumed by user/assistant/tool messages.</summary>
+    [JsonPropertyName("conversationTokens")]
+    public long ConversationTokens { get; set; }
 
-    /// <summary>Maximum decoded byte size of a single model-facing binary tool result (e.g. an image) persisted inline in session events and re-presented to the model on later turns / resume. Larger results are persisted as a metadata-only marker and shown to the model as a short text note. Defaults to 10 MB.</summary>
-    [JsonPropertyName("maxInlineBinaryBytes")]
-    public long? MaxInlineBinaryBytes { get; set; }
+    /// <summary>Prompt token limit plus the model's full output token limit.</summary>
+    [JsonPropertyName("limit")]
+    public long Limit { get; set; }
 
-    /// <summary>The model ID to use for assistant turns.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools).</summary>
+    [JsonPropertyName("mcpToolsTokens")]
+    public long McpToolsTokens { get; set; }
 
-    /// <summary>Per-property model capability overrides for the selected model.</summary>
-    [JsonPropertyName("modelCapabilitiesOverrides")]
-    public ModelCapabilitiesOverride? ModelCapabilitiesOverrides { get; set; }
+    /// <summary>The model used for token counting.</summary>
+    [JsonPropertyName("modelName")]
+    public string ModelName { get; set; } = string.Empty;
 
-    /// <summary>Organization-level custom instructions to inject into the system prompt.</summary>
-    [JsonPropertyName("organizationCustomInstructions")]
-    public string? OrganizationCustomInstructions { get; set; }
+    /// <summary>Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified).</summary>
+    [JsonPropertyName("promptTokenLimit")]
+    public long PromptTokenLimit { get; set; }
 
-    /// <summary>Custom model-provider configuration (BYOK).</summary>
-    [JsonPropertyName("provider")]
-    public ProviderConfig? Provider { get; set; }
+    /// <summary>Tokens consumed by the system prompt.</summary>
+    [JsonPropertyName("systemTokens")]
+    public long SystemTokens { get; set; }
 
-    /// <summary>Reasoning effort for the selected model. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. When omitted, no effort override is applied.</summary>
-    [JsonPropertyName("reasoningEffort")]
-    public string? ReasoningEffort { get; set; }
+    /// <summary>Tokens consumed by tool definitions sent to the model (excludes deferred tools).</summary>
+    [JsonPropertyName("toolDefinitionsTokens")]
+    public long ToolDefinitionsTokens { get; set; }
 
-    /// <summary>Reasoning summary mode for supported model clients.</summary>
-    [JsonPropertyName("reasoningSummary")]
-    public OptionsUpdateReasoningSummary? ReasoningSummary { get; set; }
+    /// <summary>Sum of system, conversation and tool-definition tokens.</summary>
+    [JsonPropertyName("totalTokens")]
+    public long TotalTokens { get; set; }
+}
 
-    /// <summary>Whether the session is running in an interactive UI.</summary>
-    [JsonPropertyName("runningInInteractiveMode")]
-    public bool? RunningInInteractiveMode { get; set; }
+/// <summary>Token breakdown for the session's current context window, or null if uninitialized.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class MetadataContextInfoResult
+{
+    /// <summary>Token breakdown for the current context window, or null if the session has not yet been initialized (no system prompt or tool metadata cached).</summary>
+    [JsonPropertyName("contextInfo")]
+    public MetadataContextInfoResultContextInfo? ContextInfo { get; set; }
+}
 
-    /// <summary>Resolved sandbox configuration.</summary>
-    [JsonPropertyName("sandboxConfig")]
-    public SandboxConfig? SandboxConfig { get; set; }
+/// <summary>Model identifier and token limits used to compute the context-info breakdown.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class MetadataContextInfoRequest
+{
+    /// <summary>Maximum output tokens allowed by the target model. Pass 0 if unknown.</summary>
+    [JsonPropertyName("outputTokenLimit")]
+    public long OutputTokenLimit { get; set; }
 
-    /// <summary>Replaces the session's capability set with the given list. Use to enable or disable capabilities mid-session (e.g., remove `memory` for reproducible scripted runs). Omit the field to leave the existing capability set unchanged.</summary>
-    [JsonPropertyName("sessionCapabilities")]
-    public IList<SessionCapability>? SessionCapabilities { get; set; }
+    /// <summary>Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default.</summary>
+    [JsonPropertyName("promptTokenLimit")]
+    public long PromptTokenLimit { get; set; }
+
+    /// <summary>Model identifier used for tokenization. Omit to use the session default. Used both for token counting and to compute display values.</summary>
+    [JsonPropertyName("selectedModel")]
+    public string? SelectedModel { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Optional session limits. Pass null to clear the session limits.</summary>
-    [JsonPropertyName("sessionLimits")]
-    public SessionLimitsConfig? SessionLimits { get; set; }
+/// <summary>The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`.</summary>
+public sealed class MetadataContextAttributionResultContextAttributionCategories
+{
+    /// <summary>Output reserve plus post-blocking-threshold buffer.</summary>
+    [JsonPropertyName("buffer")]
+    public long Buffer { get; set; }
 
-    /// <summary>Per-session settings for built-in shell tools.</summary>
-    [JsonPropertyName("shell")]
-    public ShellOptions? Shell { get; set; }
+    /// <summary>Custom-instructions tokens (0 when none are configured).</summary>
+    [JsonPropertyName("customInstructions")]
+    public long CustomInstructions { get; set; }
 
-    /// <summary>Use shell.initProfile instead. Shell init profile (`None` or `NonInteractive`).</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-#if NET5_0_OR_GREATER
-    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
-#endif
-    [JsonPropertyName("shellInitProfile")]
-    public string? ShellInitProfile { get; set; }
+    /// <summary>Remaining unused window capacity (clamped at 0).</summary>
+    [JsonPropertyName("freeSpace")]
+    public long FreeSpace { get; set; }
 
-    /// <summary>PowerShell process flags applied to built-in and user-requested shell commands.</summary>
-    [JsonPropertyName("shellProcessFlags")]
-    public IList<string>? ShellProcessFlags { get; set; }
+    /// <summary>MCP tool-definition tokens.</summary>
+    [JsonPropertyName("mcpTools")]
+    public long McpTools { get; set; }
 
-    /// <summary>Additional directories to search for skills.</summary>
-    [JsonPropertyName("skillDirectories")]
-    public IList<string>? SkillDirectories { get; set; }
+    /// <summary>Conversation (user/assistant/tool) message tokens.</summary>
+    [JsonPropertyName("messages")]
+    public long Messages { get; set; }
 
-    /// <summary>Whether to skip loading custom instruction sources.</summary>
-    [JsonPropertyName("skipCustomInstructions")]
-    public bool? SkipCustomInstructions { get; set; }
+    /// <summary>System prompt tokens, excluding custom instructions.</summary>
+    [JsonPropertyName("systemPrompt")]
+    public long SystemPrompt { get; set; }
 
-    /// <summary>Whether to skip embedding retrieval pipeline initialization and execution.</summary>
-    [JsonPropertyName("skipEmbeddingRetrieval")]
-    public bool? SkipEmbeddingRetrieval { get; set; }
+    /// <summary>Non-MCP tool-definition tokens.</summary>
+    [JsonPropertyName("systemTools")]
+    public long SystemTools { get; set; }
+}
 
-    /// <summary>When true, the selected custom agent's prompt is not injected into the user message (skill context is still injected). Used by automation triggers where the agent prompt is already in the problem statement.</summary>
-    [JsonPropertyName("suppressCustomAgentPrompt")]
-    public bool? SuppressCustomAgentPrompt { get; set; }
+/// <summary>Successful compaction history for the session.</summary>
+public sealed class MetadataContextAttributionResultContextAttributionCompactions
+{
+    /// <summary>Number of successful compactions in this session.</summary>
+    [JsonPropertyName("count")]
+    public long Count { get; set; }
+}
 
-    /// <summary>Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.</summary>
-    [JsonPropertyName("toolFilterPrecedence")]
-    public OptionsUpdateToolFilterPrecedence? ToolFilterPrecedence { get; set; }
+/// <summary>RPC data type for MetadataContextAttributionResultContextAttributionEntry operations.</summary>
+public sealed class MetadataContextAttributionResultContextAttributionEntry
+{
+    /// <summary>Supplementary per-entry metadata (e.g. `messageCount`, `role`, `evictable`, `pluginSource`). Values are stringified; parse as needed and ignore unrecognized keys.</summary>
+    [JsonPropertyName("attributes")]
+    public IDictionary<string, string>? Attributes { get; set; }
 
-    /// <summary>Optional path for trajectory output.</summary>
-    [JsonPropertyName("trajectoryFile")]
-    public string? TrajectoryFile { get; set; }
+    /// <summary>Identifier for this entry, formed by joining its `kind` and source name (e.g. `tool:bash`, `skill:tmux`, `toolDefinition:bash`); unique within the snapshot. Use it to match the same entry across snapshots, to correlate with other APIs (skill/agent/MCP registries), and as the `parentId` target for nesting. Distinct from the human-facing `label`.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Output verbosity level for supported models.</summary>
-    [JsonPropertyName("verbosity")]
-    public Verbosity? Verbosity { get; set; }
+    /// <summary>Source category for this entry. Not a closed set — tolerate unknown values. Known values today: `skill`, `subagent`, `mcpServer`, `tool`, `system`, `toolDefinition`, `plugin`.</summary>
+    [JsonPropertyName("kind")]
+    public string Kind { get; set; } = string.Empty;
 
-    /// <summary>Absolute working-directory path for shell tools.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
+    /// <summary>Human-readable display label, e.g. `bash` or `skill: tmux`. Presentation-only; may be localized/reformatted without notice — do not key off it.</summary>
+    [JsonPropertyName("label")]
+    public string Label { get; set; } = string.Empty;
+
+    /// <summary>Optional `id` of the parent entry: e.g. a `plugin` entry parenting its `skill`/`mcpServer` entries, or the `system` entry parenting `toolDefinition` entries. Omitted for top-level entries.</summary>
+    [JsonPropertyName("parentId")]
+    public string? ParentId { get; set; }
+
+    /// <summary>Token count currently in context attributable to this entry.</summary>
+    [JsonPropertyName("tokens")]
+    public long Tokens { get; set; }
 }
 
-/// <summary>Parameters for (re)loading the merged LSP configuration set.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class LspInitializeRequest
+/// <summary>Per-source token attribution snapshot for the current context window. The heaviest individual messages are available separately via `metadata.getContextHeaviestMessages`.</summary>
+public sealed class MetadataContextAttributionResultContextAttribution
 {
-    /// <summary>Force re-initialization even when LSP configs were already loaded for the working directory.</summary>
-    [JsonPropertyName("force")]
-    public bool? Force { get; set; }
+    /// <summary>Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`.</summary>
+    [JsonPropertyName("bufferTokens")]
+    public long BufferTokens { get; set; }
 
-    /// <summary>Git root used as the boundary when traversing for project-level LSP configs (supports monorepos).</summary>
-    [JsonPropertyName("gitRoot")]
-    public string? GitRoot { get; set; }
+    /// <summary>The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`.</summary>
+    [JsonPropertyName("categories")]
+    public MetadataContextAttributionResultContextAttributionCategories Categories { get => field ??= new(); set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Successful compaction history for the session.</summary>
+    [JsonPropertyName("compactions")]
+    public MetadataContextAttributionResultContextAttributionCompactions Compactions { get => field ??= new(); set; }
 
-    /// <summary>Working directory used to load project-level LSP configs. Defaults to the session working directory when omitted.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
-}
+    /// <summary>Token count at which background compaction starts. Mirrors `SessionContextInfo.compactionThreshold`.</summary>
+    [JsonPropertyName("compactionThreshold")]
+    public long CompactionThreshold { get; set; }
 
-/// <summary>Discovered extension metadata, including source-qualified ID, name, discovery source, status, and optional process ID.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class Extension
-{
-    /// <summary>Source-qualified ID (e.g., 'project:my-ext', 'user:auth-helper', 'plugin:my-plugin:my-ext').</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`.</summary>
+    [JsonPropertyName("entries")]
+    public IList<MetadataContextAttributionResultContextAttributionEntry> Entries { get => field ??= []; set; }
 
-    /// <summary>Extension name (directory name).</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Prompt limit plus the model's output reserve: the full context window `categories.freeSpace` and `categories.buffer` are measured against. Mirrors `SessionContextInfo.limit`.</summary>
+    [JsonPropertyName("limit")]
+    public long Limit { get; set; }
 
-    /// <summary>Process ID if the extension is running.</summary>
-    [JsonPropertyName("pid")]
-    public long? Pid { get; set; }
+    /// <summary>The concrete model id the entire breakdown was tokenized against (feeds the per-model token multiplier). Under `Auto` (Free/Student) this is the resolved model, not the literal `auto` sentinel, so totals are not undercounted. A single-model approximation of a potentially multi-model Auto session.</summary>
+    [JsonPropertyName("modelId")]
+    public string ModelId { get; set; } = string.Empty;
 
-    /// <summary>Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin (installed plugin), or session (session-state/&lt;id&gt;/extensions/).</summary>
-    [JsonPropertyName("source")]
-    public ExtensionSource Source { get; set; }
+    /// <summary>How `modelId` was chosen. Not a closed set — tolerate unknown values. Known values today: `autoResolved` (the model Auto resolved to), `selected` (the user's explicitly selected model), `default` (a fallback before any model is known).</summary>
+    [JsonPropertyName("modelSource")]
+    public string ModelSource { get; set; } = string.Empty;
 
-    /// <summary>Current status: running, disabled, failed, or starting.</summary>
-    [JsonPropertyName("status")]
-    public ExtensionStatus Status { get; set; }
+    /// <summary>Maximum prompt tokens the resolved model accepts — the denominator for a `##k/###k` context-usage display. Mirrors `SessionContextInfo.promptTokenLimit`.</summary>
+    [JsonPropertyName("promptTokenLimit")]
+    public long PromptTokenLimit { get; set; }
+
+    /// <summary>Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share.</summary>
+    [JsonPropertyName("totalTokens")]
+    public long TotalTokens { get; set; }
 }
 
-/// <summary>Extensions discovered for the session, with their current status.</summary>
+/// <summary>Per-source attribution breakdown for the session's current context window, or null if uninitialized.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ExtensionList
+public sealed class MetadataContextAttributionResult
 {
-    /// <summary>Discovered extensions and their current status.</summary>
-    [JsonPropertyName("extensions")]
-    public IList<Extension> Extensions { get => field ??= []; set; }
+    /// <summary>Per-source context-window attribution, or null if the session has not yet been initialized (no system prompt or tool metadata cached).</summary>
+    [JsonPropertyName("contextAttribution")]
+    public MetadataContextAttributionResultContextAttribution? ContextAttribution { get; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionExtensionsListRequest
+internal sealed class SessionMetadataGetContextAttributionRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Source-qualified extension identifier to enable for the session.</summary>
+/// <summary>A single large message currently in context.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ExtensionsEnableRequest
+public sealed class ContextHeaviestMessage
 {
-    /// <summary>Source-qualified extension ID to enable.</summary>
+    /// <summary>Stable identifier for this message within the snapshot.</summary>
     [JsonPropertyName("id")]
     public string Id { get; set; } = string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Human-readable source label, e.g. `tool: bash` or `skill: tmux`. Presentation-only.</summary>
+    [JsonPropertyName("label")]
+    public string Label { get; set; } = string.Empty;
+
+    /// <summary>Role of the chat message (`user`, `assistant`, or `tool`).</summary>
+    [JsonPropertyName("role")]
+    public string Role { get; set; } = string.Empty;
+
+    /// <summary>Token count currently in context for this individual message.</summary>
+    [JsonPropertyName("tokens")]
+    public long Tokens { get; set; }
 }
 
-/// <summary>Source-qualified extension identifier to disable for the session.</summary>
+/// <summary>The heaviest individual messages in the session's context window, most-expensive first.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ExtensionsDisableRequest
+public sealed class MetadataContextHeaviestMessagesResult
 {
-    /// <summary>Source-qualified extension ID to disable.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Heaviest messages, most-expensive first.</summary>
+    [JsonPropertyName("messages")]
+    public IList<ContextHeaviestMessage> Messages { get => field ??= []; set; }
+
+    /// <summary>Total token count of the current context window, so callers can compute each message's share without a second call.</summary>
+    [JsonPropertyName("totalTokens")]
+    public long TotalTokens { get; set; }
+}
+
+/// <summary>Parameters for the heaviest-messages query.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class MetadataContextHeaviestMessagesRequest
+{
+    /// <summary>Maximum number of messages to return, most-expensive first. Omit for the server default.</summary>
+    [JsonPropertyName("limit")]
+    public long? Limit { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Notify the session that its working directory context has changed. Emits a `session.context_changed` event so consumers (telemetry, OTel tracker, ACP, the timeline UI) can react. Use this when the host has detected a cwd/branch/repo change outside the session's normal lifecycle (e.g., after a shell command in interactive mode). For a local session, a report whose `cwd` diverges from the session's current working directory is ignored (the call still succeeds but records nothing and emits no event); move a local session's working directory via `metadata.setWorkingDirectory` instead.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionExtensionsReloadRequest
+public sealed class MetadataRecordContextChangeResult
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Attachment union accepted by push input, covering files, directories, GitHub objects, blobs, snippets, and extension context.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+/// <summary>Updated working directory and git context. Emitted as the new payload of `session.context_changed`.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(PushAttachmentFile), "file")]
-[JsonDerivedType(typeof(PushAttachmentDirectory), "directory")]
-[JsonDerivedType(typeof(PushAttachmentSelection), "selection")]
-[JsonDerivedType(typeof(PushAttachmentGitHubReference), "github_reference")]
-[JsonDerivedType(typeof(PushAttachmentGitHubCommit), "github_commit")]
-[JsonDerivedType(typeof(PushAttachmentGitHubRelease), "github_release")]
-[JsonDerivedType(typeof(PushAttachmentGitHubActionsJob), "github_actions_job")]
-[JsonDerivedType(typeof(PushAttachmentGitHubRepository), "github_repository")]
-[JsonDerivedType(typeof(PushAttachmentGitHubFileDiff), "github_file_diff")]
-[JsonDerivedType(typeof(PushAttachmentGitHubTreeComparison), "github_tree_comparison")]
-[JsonDerivedType(typeof(PushAttachmentGitHubUrl), "github_url")]
-[JsonDerivedType(typeof(PushAttachmentGitHubFile), "github_file")]
-[JsonDerivedType(typeof(PushAttachmentGitHubSnippet), "github_snippet")]
-[JsonDerivedType(typeof(PushAttachmentBlob), "blob")]
-[JsonDerivedType(typeof(PushAttachmentExtensionContext), "extension_context")]
-public partial class PushAttachment
+public sealed class SessionWorkingDirectoryContext
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
-}
+    /// <summary>Merge-base commit SHA (fork point from the remote default branch).</summary>
+    [JsonPropertyName("baseCommit")]
+    public string? BaseCommit { get; set; }
 
+    /// <summary>Current git branch name.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-/// <summary>Optional line range to scope the attachment to a specific section of the file.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PushAttachmentFileLineRange
-{
-    /// <summary>End line number (1-based, inclusive).</summary>
-    [JsonPropertyName("end")]
-    public long End { get; set; }
+    /// <summary>Current working directory path.</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
 
-    /// <summary>Start line number (1-based).</summary>
-    [JsonPropertyName("start")]
-    public long Start { get; set; }
-}
+    /// <summary>Root directory of the git repository, resolved via git rev-parse.</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { get; set; }
 
-/// <summary>File attachment.</summary>
-/// <remarks>The <c>file</c> variant of <see cref="PushAttachment"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentFile : PushAttachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "file";
+    /// <summary>Head commit of the current git branch.</summary>
+    [JsonPropertyName("headCommit")]
+    public string? HeadCommit { get; set; }
 
-    /// <summary>User-facing display name for the attachment.</summary>
-    [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
+    /// <summary>Hosting platform type of the repository.</summary>
+    [JsonPropertyName("hostType")]
+    public SessionWorkingDirectoryContextHostType? HostType { get; set; }
 
-    /// <summary>Optional line range to scope the attachment to a specific section of the file.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("lineRange")]
-    public PushAttachmentFileLineRange? LineRange { get; set; }
+    /// <summary>Repository identifier derived from the git remote URL ("owner/name" for GitHub, "org/project/repo" for Azure DevOps).</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
 
-    /// <summary>Absolute file path.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Raw host string from the git remote URL (e.g. "github.com", "dev.azure.com").</summary>
+    [JsonPropertyName("repositoryHost")]
+    public string? RepositoryHost { get; set; }
 }
 
-/// <summary>Directory attachment.</summary>
-/// <remarks>The <c>directory</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Updated working-directory/git context to record on the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentDirectory : PushAttachment
+internal sealed class MetadataRecordContextChangeRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "directory";
+    /// <summary>Updated working directory and git context. Emitted as the new payload of `session.context_changed`.</summary>
+    [JsonPropertyName("context")]
+    public SessionWorkingDirectoryContext Context { get => field ??= new(); set; }
 
-    /// <summary>User-facing display name for the attachment.</summary>
-    [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Absolute directory path.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+/// <summary>Update the session's working directory. Used by the host when the user explicitly changes cwd (e.g., the `/cd` slash command). The host is responsible for any related side-effects (file index, etc.); it does NOT change the process working directory (a session's cwd is per-session, not process-global). For local sessions the runtime validates the target first (an absolute path that exists on disk) and re-bases the permission primary directory; a rejected validation fails the call before anything is mutated, persisted, or emitted. Location-scoped permission rules are then re-keyed to the new directory (best-effort). Remote sessions only record the path.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class MetadataSetWorkingDirectoryResult
+{
+    /// <summary>Working directory after the update.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>End position of the selection.</summary>
+/// <summary>Absolute path to set as the session's new working directory. For local sessions the path must be absolute and exist on disk: it is validated before any session state changes, and a failing validation rejects the call with nothing mutated, persisted, or emitted. Remote sessions record the path as-is.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PushAttachmentSelectionDetailsEnd
+internal sealed class MetadataSetWorkingDirectoryRequest
 {
-    /// <summary>End character offset within the line (0-based).</summary>
-    [JsonPropertyName("character")]
-    public long Character { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>End line number (0-based).</summary>
-    [JsonPropertyName("line")]
-    public long Line { get; set; }
+    /// <summary>Absolute path to set as the session's working directory. The runtime updates the session's recorded cwd so subsequent operations (shell tools, file lookups, telemetry) anchor to it.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Start position of the selection.</summary>
+/// <summary>Re-tokenize the session's existing messages against `modelId` and return the token totals. Useful for hosts that want an initial estimate of context usage on session resume, before the next agent turn fires `session.context_info_changed` events. Returns zeros for an empty session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PushAttachmentSelectionDetailsStart
+public sealed class MetadataRecomputeContextTokensResult
 {
-    /// <summary>Start character offset within the line (0-based).</summary>
-    [JsonPropertyName("character")]
-    public long Character { get; set; }
+    /// <summary>Tokens contributed by user/assistant/tool messages (excludes system/developer prompts).</summary>
+    [JsonPropertyName("messagesTokenCount")]
+    public long MessagesTokenCount { get; set; }
 
-    /// <summary>Start line number (0-based).</summary>
-    [JsonPropertyName("line")]
-    public long Line { get; set; }
+    /// <summary>Tokens contributed by system/developer prompt snapshots.</summary>
+    [JsonPropertyName("systemTokenCount")]
+    public long SystemTokenCount { get; set; }
+
+    /// <summary>Sum of tokens across chat-context and system-context messages currently held by the session.</summary>
+    [JsonPropertyName("totalTokens")]
+    public long TotalTokens { get; set; }
 }
 
-/// <summary>Position range of the selection within the file.</summary>
+/// <summary>Model identifier to use when re-tokenizing the session's existing messages.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PushAttachmentSelectionDetails
+internal sealed class MetadataRecomputeContextTokensRequest
 {
-    /// <summary>End position of the selection.</summary>
-    [JsonPropertyName("end")]
-    public PushAttachmentSelectionDetailsEnd End { get => field ??= new(); set; }
+    /// <summary>Model identifier used for tokenization. The runtime token-counts both chat-context and system-context messages against this model.</summary>
+    [JsonPropertyName("modelId")]
+    public string ModelId { get; set; } = string.Empty;
 
-    /// <summary>Start position of the selection.</summary>
-    [JsonPropertyName("start")]
-    public PushAttachmentSelectionDetailsStart Start { get => field ??= new(); set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Code selection attachment from an editor.</summary>
-/// <remarks>The <c>selection</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Availability of built-in job tools surfaced to boundary consumers.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentSelection : PushAttachment
+public sealed class SessionSettingsBuiltInToolAvailabilitySnapshot
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "selection";
+    /// <summary>Whether the create-pull-request tool is available.</summary>
+    [JsonPropertyName("createPullRequest")]
+    public bool? CreatePullRequest { get; set; }
 
-    /// <summary>User-facing display name for the selection.</summary>
-    [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
+    /// <summary>Whether the report-progress tool is available.</summary>
+    [JsonPropertyName("reportProgress")]
+    public bool? ReportProgress { get; set; }
+}
 
-    /// <summary>Absolute path to the file containing the selection.</summary>
-    [JsonPropertyName("filePath")]
-    public required string FilePath { get; set; }
+/// <summary>Redacted job settings for a session. The job nonce is excluded.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionSettingsJobSnapshot
+{
+    /// <summary>Availability of job-specific built-in tools.</summary>
+    [JsonPropertyName("builtInToolAvailability")]
+    public SessionSettingsBuiltInToolAvailabilitySnapshot? BuiltInToolAvailability { get; set; }
 
-    /// <summary>Position range of the selection within the file.</summary>
-    [JsonPropertyName("selection")]
-    public required PushAttachmentSelectionDetails Selection { get; set; }
+    /// <summary>GitHub Actions event type for the job.</summary>
+    [JsonPropertyName("eventType")]
+    public string? EventType { get; set; }
 
-    /// <summary>The selected text content.</summary>
-    [JsonPropertyName("text")]
-    public required string Text { get; set; }
+    /// <summary>Whether this is the workflow's trigger job.</summary>
+    [JsonPropertyName("isTriggerJob")]
+    public bool? IsTriggerJob { get; set; }
 }
 
-/// <summary>GitHub issue, pull request, or discussion reference.</summary>
-/// <remarks>The <c>github_reference</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Redacted model routing settings for a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubReference : PushAttachment
+public sealed class SessionSettingsModelSnapshot
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_reference";
+    /// <summary>Agent service callback URL for job and progress updates.</summary>
+    [JsonPropertyName("callbackUrl")]
+    public string? CallbackUrl { get; set; }
 
-    /// <summary>Issue, pull request, or discussion number.</summary>
-    [JsonPropertyName("number")]
-    public required long Number { get; set; }
+    /// <summary>Default reasoning effort for the selected model.</summary>
+    [JsonPropertyName("defaultReasoningEffort")]
+    public string? DefaultReasoningEffort { get; set; }
 
-    /// <summary>Type of GitHub reference.</summary>
-    [JsonPropertyName("referenceType")]
-    public required PushAttachmentGitHubReferenceType ReferenceType { get; set; }
+    /// <summary>Agent job identifier for the session.</summary>
+    [JsonPropertyName("instanceId")]
+    public string? InstanceId { get; set; }
 
-    /// <summary>Current state of the referenced item (e.g., open, closed, merged).</summary>
-    [JsonPropertyName("state")]
-    public required string State { get; set; }
+    /// <summary>Selected model identifier.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+}
 
-    /// <summary>Title of the referenced item.</summary>
-    [JsonPropertyName("title")]
-    public required string Title { get; set; }
+/// <summary>Online-evaluation settings safe to expose across the SDK boundary.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionSettingsOnlineEvaluationSnapshot
+{
+    /// <summary>Whether online evaluation is disabled.</summary>
+    [JsonPropertyName("disableOnlineEvaluation")]
+    public bool? DisableOnlineEvaluation { get; set; }
 
-    /// <summary>URL to the referenced item on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Whether online-evaluation output-file generation is enabled.</summary>
+    [JsonPropertyName("enableOnlineEvaluationOutputFile")]
+    public bool? EnableOnlineEvaluationOutputFile { get; set; }
 }
 
-/// <summary>Pointer to a GitHub repository.</summary>
+/// <summary>Redacted repository and GitHub host settings for a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PushGitHubRepoRef
+public sealed class SessionSettingsRepoSnapshot
 {
-    /// <summary>Numeric GitHub repository id.</summary>
+    /// <summary>Checked-out repository branch.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
+
+    /// <summary>Checked-out commit SHA.</summary>
+    [JsonPropertyName("commit")]
+    public string? Commit { get; set; }
+
+    /// <summary>GitHub server host name.</summary>
+    [JsonPropertyName("host")]
+    public string? Host { get; set; }
+
+    /// <summary>Protocol used to access the GitHub host.</summary>
+    [JsonPropertyName("hostProtocol")]
+    public string? HostProtocol { get; set; }
+
+    /// <summary>GitHub repository database ID.</summary>
     [JsonPropertyName("id")]
-    public long? Id { get; set; }
+    public double? Id { get; set; }
 
-    /// <summary>Repository name (without owner).</summary>
+    /// <summary>Repository name.</summary>
     [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    public string? Name { get; set; }
 
-    /// <summary>Repository owner login (user or organization).</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { get; set; } = string.Empty;
-}
+    /// <summary>GitHub repository owner database ID.</summary>
+    [JsonPropertyName("ownerId")]
+    public double? OwnerId { get; set; }
 
-/// <summary>Pointer to a GitHub commit.</summary>
-/// <remarks>The <c>github_commit</c> variant of <see cref="PushAttachment"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubCommit : PushAttachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_commit";
+    /// <summary>Repository owner login.</summary>
+    [JsonPropertyName("ownerName")]
+    public string? OwnerName { get; set; }
 
-    /// <summary>First line of the commit message.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
+    /// <summary>Number of commits in the pull request.</summary>
+    [JsonPropertyName("prCommitCount")]
+    public double? PrCommitCount { get; set; }
 
-    /// <summary>Full commit SHA.</summary>
-    [JsonPropertyName("oid")]
-    public required string Oid { get; set; }
+    /// <summary>Whether the repository is writable.</summary>
+    [JsonPropertyName("readWrite")]
+    public bool? ReadWrite { get; set; }
 
-    /// <summary>Repository the commit belongs to.</summary>
-    [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { get; set; }
+    /// <summary>GitHub secret-scanning service URL.</summary>
+    [JsonPropertyName("secretScanningUrl")]
+    public string? SecretScanningUrl { get; set; }
 
-    /// <summary>URL to the commit on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>GitHub server base URL.</summary>
+    [JsonPropertyName("serverUrl")]
+    public string? ServerUrl { get; set; }
 }
 
-/// <summary>Pointer to a GitHub release.</summary>
-/// <remarks>The <c>github_release</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Redacted validation and memory-tool settings for a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubRelease : PushAttachment
+public sealed class SessionSettingsValidationSnapshot
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_release";
+    /// <summary>Whether advisory validation is enabled.</summary>
+    [JsonPropertyName("advisoryEnabled")]
+    public bool? AdvisoryEnabled { get; set; }
 
-    /// <summary>Human-readable release name.</summary>
-    [JsonPropertyName("name")]
-    public required string Name { get; set; }
+    /// <summary>Whether CodeQL validation is enabled.</summary>
+    [JsonPropertyName("codeqlEnabled")]
+    public bool? CodeqlEnabled { get; set; }
 
-    /// <summary>Repository the release belongs to.</summary>
-    [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { get; set; }
+    /// <summary>Whether code-review validation is enabled.</summary>
+    [JsonPropertyName("codeReviewEnabled")]
+    public bool? CodeReviewEnabled { get; set; }
 
-    /// <summary>Git tag the release is anchored to.</summary>
-    [JsonPropertyName("tagName")]
-    public required string TagName { get; set; }
+    /// <summary>Model used for code-review validation.</summary>
+    [JsonPropertyName("codeReviewModel")]
+    public string? CodeReviewModel { get; set; }
 
-    /// <summary>URL to the release on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Dependabot validation timeout budget in seconds.</summary>
+    [JsonPropertyName("dependabotTimeout")]
+    public double? DependabotTimeout { get; set; }
+
+    /// <summary>Whether the memory-store tool is enabled.</summary>
+    [JsonPropertyName("memoryStoreEnabled")]
+    public bool? MemoryStoreEnabled { get; set; }
+
+    /// <summary>Whether the memory-vote tool is enabled.</summary>
+    [JsonPropertyName("memoryVoteEnabled")]
+    public bool? MemoryVoteEnabled { get; set; }
+
+    /// <summary>Whether secret-scanning validation is enabled.</summary>
+    [JsonPropertyName("secretScanningEnabled")]
+    public bool? SecretScanningEnabled { get; set; }
+
+    /// <summary>General validation timeout budget in seconds.</summary>
+    [JsonPropertyName("timeout")]
+    public double? Timeout { get; set; }
 }
 
-/// <summary>Pointer to a GitHub Actions job.</summary>
-/// <remarks>The <c>github_actions_job</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Redacted, serializable view of session runtime settings for SDK boundary consumers. Secrets and raw feature flags are intentionally excluded.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubActionsJob : PushAttachment
+internal sealed class SessionSettingsSnapshot
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_actions_job";
+    /// <summary>Name of the SDK client that created the session.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-    /// <summary>Terminal conclusion of the job when finished (e.g., success, failure, cancelled). Absent for in-progress jobs.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("conclusion")]
-    public string? Conclusion { get; set; }
+    /// <summary>Redacted job settings.</summary>
+    [JsonPropertyName("job")]
+    public SessionSettingsJobSnapshot Job { get => field ??= new(); set; }
 
-    /// <summary>Job id within the workflow run.</summary>
-    [JsonPropertyName("jobId")]
-    public required long JobId { get; set; }
+    /// <summary>Redacted model routing settings.</summary>
+    [JsonPropertyName("model")]
+    public SessionSettingsModelSnapshot Model { get => field ??= new(); set; }
 
-    /// <summary>Display name of the job.</summary>
-    [JsonPropertyName("jobName")]
-    public required string JobName { get; set; }
+    /// <summary>Online-evaluation settings safe for SDK consumers.</summary>
+    [JsonPropertyName("onlineEvaluation")]
+    public SessionSettingsOnlineEvaluationSnapshot OnlineEvaluation { get => field ??= new(); set; }
 
-    /// <summary>Repository the workflow run belongs to.</summary>
+    /// <summary>Redacted repository and host settings.</summary>
     [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { get; set; }
+    public SessionSettingsRepoSnapshot Repo { get => field ??= new(); set; }
 
-    /// <summary>URL to the job on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Session start time as Unix epoch milliseconds.</summary>
+    [JsonPropertyName("startTimeMs")]
+    public double? StartTimeMs { get; set; }
 
-    /// <summary>Display name of the workflow the job ran in.</summary>
-    [JsonPropertyName("workflowName")]
-    public required string WorkflowName { get; set; }
+    /// <summary>Session timeout in milliseconds.</summary>
+    [JsonPropertyName("timeoutMs")]
+    public double? TimeoutMs { get; set; }
+
+    /// <summary>Redacted validation and memory-tool settings.</summary>
+    [JsonPropertyName("validation")]
+    public SessionSettingsValidationSnapshot Validation { get => field ??= new(); set; }
+
+    /// <summary>Agent runtime version selector copied from the session settings, such as `latest` or a runtime release identifier.</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
 }
 
-/// <summary>Pointer to a GitHub repository.</summary>
-/// <remarks>The <c>github_repository</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubRepository : PushAttachment
+internal sealed class SessionSettingsSnapshotRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_repository";
-
-    /// <summary>Short description of the repository.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
-
-    /// <summary>Git ref this attachment is anchored at (branch, tag, or commit). When absent the default branch is implied.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("ref")]
-    public string? Ref { get; set; }
-
-    /// <summary>Repository pointer.</summary>
-    [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { get; set; }
-
-    /// <summary>URL to the repository on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>One side of a file diff (head or base).</summary>
+/// <summary>Result of evaluating a Rust-owned settings predicate.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PushAttachmentGitHubFileDiffSide
+internal sealed class SessionSettingsEvaluatePredicateResult
 {
-    /// <summary>Repository-relative path to the file.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-
-    /// <summary>Git ref (branch, tag, or commit SHA) the file is read at.</summary>
-    [JsonPropertyName("ref")]
-    public string Ref { get; set; } = string.Empty;
-
-    /// <summary>Repository the file lives in.</summary>
-    [JsonPropertyName("repo")]
-    public PushGitHubRepoRef Repo { get => field ??= new(); set; }
+    /// <summary>Whether the named settings predicate evaluated to enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 }
 
-/// <summary>Pointer to a single-file diff. At least one of `head` and `base` must be present.</summary>
-/// <remarks>The <c>github_file_diff</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Named Rust-owned settings predicate to evaluate for this session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubFileDiff : PushAttachment
+internal sealed class SessionSettingsEvaluatePredicateRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_file_diff";
-
-    /// <summary>File location on the base side of the diff. Absent for additions.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("base")]
-    public PushAttachmentGitHubFileDiffSide? Base { get; set; }
+    /// <summary>Predicate name. The runtime owns the raw feature-flag names and composition logic.</summary>
+    [JsonPropertyName("name")]
+    public SessionSettingsPredicateName Name { get; set; }
 
-    /// <summary>File location on the head side of the diff. Absent for deletions.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("head")]
-    public PushAttachmentGitHubFileDiffSide? Head { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>URL to the diff on GitHub (e.g., a commit, compare, or PR-file URL).</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Tool name for tool-scoped predicates such as trivial-change handling.</summary>
+    [JsonPropertyName("toolName")]
+    public string? ToolName { get; set; }
 }
 
-/// <summary>One side of a tree comparison (head or base).</summary>
+/// <summary>Content-exclusion decision for one requested path.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PushAttachmentGitHubTreeComparisonSide
+public sealed class ContentExclusionPathCheck
 {
-    /// <summary>Repository the revision belongs to.</summary>
-    [JsonPropertyName("repo")]
-    public PushGitHubRepoRef Repo { get => field ??= new(); set; }
+    /// <summary>Whether the session's complete content-exclusion policy excludes the path.</summary>
+    [JsonPropertyName("excluded")]
+    public bool Excluded { get; set; }
 
-    /// <summary>Git revision (branch, tag, or commit SHA).</summary>
-    [JsonPropertyName("revision")]
-    public string Revision { get; set; } = string.Empty;
+    /// <summary>The path supplied by the caller.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 }
 
-/// <summary>Pointer to a comparison between two git revisions.</summary>
-/// <remarks>The <c>github_tree_comparison</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Batch content-exclusion result. Callers must fail closed when policy evaluation is unavailable.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubTreeComparison : PushAttachment
+public sealed class ContentExclusionCheckPathsResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_tree_comparison";
+    /// <summary>Whether the session's policy service was available for the complete batch. When false, checks is empty and callers must treat every requested path as excluded.</summary>
+    [JsonPropertyName("available")]
+    public bool Available { get; set; }
 
-    /// <summary>Base side of the comparison.</summary>
-    [JsonPropertyName("base")]
-    public required PushAttachmentGitHubTreeComparisonSide Base { get; set; }
+    /// <summary>Per-path decisions in request order. Empty when available is false.</summary>
+    [JsonPropertyName("checks")]
+    public IList<ContentExclusionPathCheck> Checks { get => field ??= []; set; }
+}
 
-    /// <summary>Head side of the comparison.</summary>
-    [JsonPropertyName("head")]
-    public required PushAttachmentGitHubTreeComparisonSide Head { get; set; }
+/// <summary>Local file system absolute paths within the session working directory to check against its content-exclusion policy.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ContentExclusionCheckPathsRequest
+{
+    /// <summary>Local file system absolute paths within the session working directory to check. Results are returned in the same order, including duplicates.</summary>
+    [JsonPropertyName("paths")]
+    public IList<string> Paths { get => field ??= []; set; }
 
-    /// <summary>URL to the comparison on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Generic GitHub URL reference.</summary>
-/// <remarks>The <c>github_url</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Identifier of the spawned process, used to correlate streamed output and exit notifications.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubUrl : PushAttachment
+public sealed class ShellExecResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_url";
-
-    /// <summary>URL to the GitHub resource.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Unique identifier for tracking streamed output.</summary>
+    [JsonPropertyName("processId")]
+    public string ProcessId { get; set; } = string.Empty;
 }
 
-/// <summary>Pointer to a file in a GitHub repository at a specific ref.</summary>
-/// <remarks>The <c>github_file</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Shell command to run, with optional working directory and timeout in milliseconds.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubFile : PushAttachment
+internal sealed class ShellExecRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_file";
-
-    /// <summary>Repository-relative path to the file.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Shell command to execute.</summary>
+    [JsonPropertyName("command")]
+    public string Command { get; set; } = string.Empty;
 
-    /// <summary>Git ref the file is read at (branch, tag, or commit SHA).</summary>
-    [JsonPropertyName("ref")]
-    public required string Ref { get; set; }
+    /// <summary>Working directory (defaults to session working directory).</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
 
-    /// <summary>Repository the file lives in.</summary>
-    [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>URL to the file on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Timeout in milliseconds (default: 30000).</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("timeout")]
+    public TimeSpan? Timeout { get; set; }
 }
 
-/// <summary>Pointer to a line range inside a file in a GitHub repository.</summary>
-/// <remarks>The <c>github_snippet</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Indicates whether the signal was delivered; false if the process was unknown or already exited.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubSnippet : PushAttachment
+public sealed class ShellKillResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_snippet";
-
-    /// <summary>Line range the snippet covers.</summary>
-    [JsonPropertyName("lineRange")]
-    public required PushAttachmentFileLineRange LineRange { get; set; }
-
-    /// <summary>Repository-relative path to the file.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Whether the signal was sent successfully.</summary>
+    [JsonPropertyName("killed")]
+    public bool Killed { get; set; }
+}
 
-    /// <summary>Git ref the file is read at (branch, tag, or commit SHA).</summary>
-    [JsonPropertyName("ref")]
-    public required string Ref { get; set; }
+/// <summary>Identifier of a process previously returned by "shell.exec" and the signal to send.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ShellKillRequest
+{
+    /// <summary>Process identifier returned by shell.exec.</summary>
+    [JsonPropertyName("processId")]
+    public string ProcessId { get; set; } = string.Empty;
 
-    /// <summary>Repository the file lives in.</summary>
-    [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>URL to the snippet on GitHub (with line anchor).</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Signal to send (default: SIGTERM).</summary>
+    [JsonPropertyName("signal")]
+    public ShellKillSignal? Signal { get; set; }
 }
 
-/// <summary>Blob attachment with inline base64-encoded data.</summary>
-/// <remarks>The <c>blob</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Result of a user-requested shell command.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentBlob : PushAttachment
+public sealed class UserRequestedShellCommandResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "blob";
+    /// <summary>Error output when the execution failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Base64-encoded content.</summary>
-    [Base64String]
-    [JsonPropertyName("data")]
-    public required string Data { get; set; }
+    /// <summary>Process exit code, when available.</summary>
+    [JsonPropertyName("exitCode")]
+    public long? ExitCode { get; set; }
 
-    /// <summary>User-facing display name for the attachment.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
+    /// <summary>Captured command output.</summary>
+    [JsonPropertyName("output")]
+    public string Output { get; set; } = string.Empty;
 
-    /// <summary>MIME type of the inline data.</summary>
-    [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
+    /// <summary>Whether the command completed successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+
+    /// <summary>Tool call id emitted for the shell execution.</summary>
+    [JsonPropertyName("toolCallId")]
+    public string ToolCallId { get; set; } = string.Empty;
 }
 
-/// <summary>Slim input shape for extension_context attachments; identity fields are runtime-derived.</summary>
-/// <remarks>The <c>extension_context</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>User-requested shell command and cancellation handle.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PushAttachmentExtensionContext : PushAttachment
+internal sealed class ShellExecuteUserRequestedRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "extension_context";
+    /// <summary>Shell command to execute.</summary>
+    [JsonPropertyName("command")]
+    public string Command { get; set; } = string.Empty;
 
-    /// <summary>Caller-supplied JSON payload (required, may be null but not undefined).</summary>
-    [JsonPropertyName("payload")]
-    public required JsonElement Payload { get; set; }
+    /// <summary>Caller-provided cancellation handle for this execution.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 
-    /// <summary>Human-readable composer pill label.</summary>
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("title")]
-    public required string Title { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for session.extensions.sendAttachmentsToMessage.</summary>
+/// <summary>Cancellation result for a user-requested shell command.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SendAttachmentsToMessageParams
+public sealed class CancelUserRequestedShellCommandResult
 {
-    /// <summary>Attachments to push into the next user-message turn. extension_context entries take the slim shape; standard variants take their full AttachmentSchema shape.</summary>
-    [JsonPropertyName("attachments")]
-    public IList<PushAttachment> Attachments { get => field ??= []; set; }
+    /// <summary>Whether an in-flight execution was found and signalled to cancel.</summary>
+    [JsonPropertyName("cancelled")]
+    public bool Cancelled { get; set; }
+}
 
-    /// <summary>Optional canvas instance binding the push for provenance. When supplied, the runtime resolves the canvas, verifies it is owned by the calling extension, and stamps canvasId/instanceId onto each extension_context entry. When omitted, no resolution runs and those fields stay unset on the attachment.</summary>
-    [JsonPropertyName("instanceId")]
-    public string? InstanceId { get; set; }
+/// <summary>User-requested shell execution cancellation handle.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ShellCancelUserRequestedRequest
+{
+    /// <summary>Request ID previously passed to executeUserRequested.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the external tool call result was handled successfully.</summary>
+/// <summary>Post-compaction context window usage breakdown.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class HandlePendingToolCallResult
+public sealed class HistoryCompactContextWindow
 {
-    /// <summary>Whether the tool call result was handled successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Token count from non-system messages (user, assistant, tool).</summary>
+    [JsonPropertyName("conversationTokens")]
+    public long? ConversationTokens { get; set; }
+
+    /// <summary>Current total tokens in the context window (system + conversation + tool definitions).</summary>
+    [JsonPropertyName("currentTokens")]
+    public long CurrentTokens { get; set; }
+
+    /// <summary>Current number of messages in the conversation.</summary>
+    [JsonPropertyName("messagesLength")]
+    public long MessagesLength { get; set; }
+
+    /// <summary>Token count from system message(s).</summary>
+    [JsonPropertyName("systemTokens")]
+    public long? SystemTokens { get; set; }
+
+    /// <summary>Maximum token count for the model's context window.</summary>
+    [JsonPropertyName("tokenLimit")]
+    public long TokenLimit { get; set; }
+
+    /// <summary>Token count from tool definitions.</summary>
+    [JsonPropertyName("toolDefinitionsTokens")]
+    public long? ToolDefinitionsTokens { get; set; }
 }
 
-/// <summary>Pending external tool call request ID, with the tool result or an error describing why it failed.</summary>
+/// <summary>Compaction outcome with the number of tokens and messages removed, summary text, and the resulting context window breakdown.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class HandlePendingToolCallRequest
+public sealed class HistoryCompactResult
 {
-    /// <summary>Error message if the tool call failed.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Post-compaction context window usage breakdown.</summary>
+    [JsonPropertyName("contextWindow")]
+    public HistoryCompactContextWindow? ContextWindow { get; set; }
 
-    /// <summary>Request ID of the pending tool call.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Number of messages removed during compaction.</summary>
+    [JsonPropertyName("messagesRemoved")]
+    public long MessagesRemoved { get; set; }
 
-    /// <summary>Tool call result (string or expanded result object).</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
+    /// <summary>Whether compaction completed successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Summary text produced by compaction. Omitted when compaction did not produce a summary (e.g. failure path).</summary>
+    [JsonPropertyName("summaryContent")]
+    public string? SummaryContent { get; set; }
+
+    /// <summary>Number of tokens freed by compaction.</summary>
+    [JsonPropertyName("tokensRemoved")]
+    public long TokensRemoved { get; set; }
 }
 
-/// <summary>Resolve, build, and validate the runtime tool list for this session. Subagent sessions and consumer flows that need an initialized tool set before `send` invoke this. Default base-class implementation is a no-op for sessions that don't support tool validation.</summary>
+/// <summary>RPC data type for SessionHistoryCompact operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ToolsInitializeAndValidateResult
+public sealed class SessionHistoryCompactRequest
 {
+    /// <summary>Optional user-provided instructions to focus the compaction summary.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(4000)]
+    [JsonPropertyName("customInstructions")]
+    public string? CustomInstructions { get; set; }
+
+    /// <summary>Context window token limit this compaction is targeting, recorded as the `tokenLimit` on the persisted `session.compaction_start` / `session.compaction_complete` events. Set it when the compaction targets a window other than the compacting model's own, e.g. switching to a model with a smaller context window: the compaction still runs on the current model, so the limit that motivated it would otherwise be lost. When absent, the events record the compacting model's own resolved limit. Attribution metadata only - it does not change how much the compaction removes.</summary>
+    [JsonPropertyName("tokenLimit")]
+    public long? TokenLimit { get; set; }
+
+    /// <summary>What initiated this compaction request, recorded as the `trigger` on the persisted `session.compaction_start` / `session.compaction_complete` events. When absent, the compaction is persisted without trigger attribution (initiator unknown).</summary>
+    [JsonPropertyName("trigger")]
+    public SessionHistoryCompactRequestTrigger? Trigger { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>RPC data type for SessionHistoryCompactRequestWithSession operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionToolsInitializeAndValidateRequest
+internal sealed class SessionHistoryCompactRequestWithSession
 {
+    /// <summary>Optional user-provided instructions to focus the compaction summary.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MaxLength(4000)]
+    [JsonPropertyName("customInstructions")]
+    public string? CustomInstructions { get; set; }
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Context window token limit this compaction is targeting, recorded as the `tokenLimit` on the persisted `session.compaction_start` / `session.compaction_complete` events. Set it when the compaction targets a window other than the compacting model's own, e.g. switching to a model with a smaller context window: the compaction still runs on the current model, so the limit that motivated it would otherwise be lost. When absent, the events record the compacting model's own resolved limit. Attribution metadata only - it does not change how much the compaction removes.</summary>
+    [JsonPropertyName("tokenLimit")]
+    public long? TokenLimit { get; set; }
+
+    /// <summary>What initiated this compaction request, recorded as the `trigger` on the persisted `session.compaction_start` / `session.compaction_complete` events. When absent, the compaction is persisted without trigger attribution (initiator unknown).</summary>
+    [JsonPropertyName("trigger")]
+    public SessionHistoryCompactRequestTrigger? Trigger { get; set; }
 }
 
-/// <summary>Lightweight metadata for a currently initialized session tool.</summary>
+/// <summary>Number of events that were removed by the truncation.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CurrentToolMetadata
+public sealed class HistoryTruncateResult
 {
-    /// <summary>Whether the tool is loaded on demand via tool search.</summary>
-    [JsonPropertyName("deferLoading")]
-    public bool? DeferLoading { get; set; }
-
-    /// <summary>Tool description.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>JSON Schema for tool input.</summary>
-    [JsonPropertyName("input_schema")]
-    public IDictionary<string, JsonElement>? InputSchema { get; set; }
-
-    /// <summary>MCP server name for MCP-backed tools.</summary>
-    [JsonPropertyName("mcpServerName")]
-    public string? McpServerName { get; set; }
-
-    /// <summary>Raw MCP tool name for MCP-backed tools.</summary>
-    [JsonPropertyName("mcpToolName")]
-    public string? McpToolName { get; set; }
+    /// <summary>Failure detail when checkpointCleanupFailed is true.</summary>
+    [JsonPropertyName("checkpointCleanupError")]
+    public string? CheckpointCleanupError { get; set; }
 
-    /// <summary>Model-facing tool name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>True when conversation truncation succeeded but post-truncation workspace checkpoint cleanup failed. History is already truncated; callers may still prune snapshots but should report a checkpoint-cleanup rather than a truncation failure.</summary>
+    [JsonPropertyName("checkpointCleanupFailed")]
+    public bool? CheckpointCleanupFailed { get; set; }
 
-    /// <summary>Optional MCP/config namespaced tool name.</summary>
-    [JsonPropertyName("namespacedName")]
-    public string? NamespacedName { get; set; }
+    /// <summary>Number of events that were removed.</summary>
+    [JsonPropertyName("eventsRemoved")]
+    public long EventsRemoved { get; set; }
 }
 
-/// <summary>Current lightweight tool metadata snapshot for the session.</summary>
+/// <summary>Identifier of the event to truncate to; this event and all later events are removed.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ToolsGetCurrentMetadataResult
+internal sealed class HistoryTruncateRequest
 {
-    /// <summary>Current tool metadata, or null when tools have not been initialized yet.</summary>
-    [JsonPropertyName("tools")]
-    public IList<CurrentToolMetadata>? Tools { get; set; }
-}
+    /// <summary>Event ID to truncate to. This event and all events after it are removed from the session.</summary>
+    [JsonPropertyName("eventId")]
+    public string EventId { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionToolsGetCurrentMetadataRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Empty result after applying subagent settings.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ToolsUpdateSubagentSettingsResult
-{
-}
-
-/// <summary>Subagent model, reasoning effort, and context tier settings.</summary>
+/// <summary>A root user turn that the session can rewind to.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SubagentSettingsEntry
+public sealed class HistoryRewindPoint
 {
-    /// <summary>Context tier override for matching subagents.</summary>
-    [JsonPropertyName("contextTier")]
-    public SubagentSettingsEntryContextTier? ContextTier { get; set; }
+    /// <summary>Whether at least one file in this turn or a later turn can be restored.</summary>
+    [JsonPropertyName("canRestoreFiles")]
+    public bool CanRestoreFiles { get; set; }
 
-    /// <summary>Reasoning effort override for matching subagents.</summary>
-    [JsonPropertyName("effortLevel")]
-    public string? EffortLevel { get; set; }
+    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
+    [JsonPropertyName("eventId")]
+    public string EventId { get; set; } = string.Empty;
 
-    /// <summary>Model override for matching subagents.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
-}
+    /// <summary>Number of unique files in this turn and all later turns that have captured changes.</summary>
+    [JsonPropertyName("fileCount")]
+    public long FileCount { get; set; }
 
-/// <summary>Configured per-agent subagent overrides.</summary>
-public sealed class UpdateSubagentSettingsRequestSubagents
-{
-    /// <summary>Per-agent settings keyed by subagent agent_type.</summary>
-    [JsonPropertyName("agents")]
-    public IDictionary<string, SubagentSettingsEntry>? Agents { get; set; }
+    /// <summary>Whether this turn was an automatically injected autopilot continuation.</summary>
+    [JsonPropertyName("isAutopilotContinuation")]
+    public bool IsAutopilotContinuation { get; set; }
 
-    /// <summary>Names of subagents the user has turned off; they cannot be dispatched.</summary>
-    [JsonPropertyName("disabledSubagents")]
-    public IList<string>? DisabledSubagents { get; set; }
+    /// <summary>Lines added by this turn's captured file changes.</summary>
+    [JsonPropertyName("linesAdded")]
+    public long LinesAdded { get; set; }
 
-    /// <summary>Maximum number of subagents that can run concurrently; applies to usage-based billing users only.</summary>
-    [JsonPropertyName("maxConcurrency")]
-    public int? MaxConcurrency { get; set; }
+    /// <summary>Lines removed by this turn's captured file changes.</summary>
+    [JsonPropertyName("linesRemoved")]
+    public long LinesRemoved { get; set; }
 
-    /// <summary>Maximum subagent nesting depth; applies to usage-based billing users only.</summary>
-    [JsonPropertyName("maxDepth")]
-    public int? MaxDepth { get; set; }
-}
+    /// <summary>ISO timestamp of the user turn.</summary>
+    [JsonPropertyName("timestamp")]
+    public string Timestamp { get; set; } = string.Empty;
 
-/// <summary>Subagent settings to apply to the current session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class UpdateSubagentSettingsRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether this turn itself captured any file changes.</summary>
+    [JsonPropertyName("turnChangedFiles")]
+    public bool TurnChangedFiles { get; set; }
 
-    /// <summary>Subagent settings to apply, or null to clear the live session override.</summary>
-    [JsonPropertyName("subagents")]
-    public UpdateSubagentSettingsRequestSubagents? Subagents { get; set; }
+    /// <summary>User-visible message text for the turn.</summary>
+    [JsonPropertyName("userMessage")]
+    public string UserMessage { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for SessionCommandsList operations.</summary>
+/// <summary>Rewind points and file-change-tracking availability for the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionCommandsListRequest
+public sealed class HistoryListRewindPointsResult
 {
-    /// <summary>Include runtime built-in commands.</summary>
-    [JsonPropertyName("includeBuiltins")]
-    public bool? IncludeBuiltins { get; set; }
+    /// <summary>Whether this session captured file changes from its first turn.</summary>
+    [JsonPropertyName("fileChangeTrackingEnabled")]
+    public bool FileChangeTrackingEnabled { get; set; }
 
-    /// <summary>Include commands registered by protocol clients, including SDK clients and extensions.</summary>
-    [JsonPropertyName("includeClientCommands")]
-    public bool? IncludeClientCommands { get; set; }
+    /// <summary>Root user turns in chronological order. Empty when `unavailableReason` is set.</summary>
+    [JsonPropertyName("points")]
+    public IList<HistoryRewindPoint> Points { get => field ??= []; set; }
 
-    /// <summary>Include enabled user-invocable skills and commands.</summary>
-    [JsonPropertyName("includeSkills")]
-    public bool? IncludeSkills { get; set; }
+    /// <summary>Why the listed points could not be produced, when applicable; the points list is empty whenever it is set. `unsupported-remote-session` is permanent for the session and comes with `fileChangeTrackingEnabled: false`. `session-busy` is transient and only ever reported by a session that *is* tracking (`fileChangeTrackingEnabled: true`), because the file-change captures cannot be read while work that may still mutate them is in flight; the same request succeeds once the session settles, so a client that wants points should retry rather than treat it as a failure. It is never `file-change-tracking-disabled`: an untracked local session still lists conversation-only points and reports that through `fileChangeTrackingEnabled: false`.</summary>
+    [JsonPropertyName("unavailableReason")]
+    public HistoryRewindUnavailableReason? UnavailableReason { get; set; }
 }
 
-/// <summary>RPC data type for SessionCommandsListRequestWithSession operations.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionCommandsListRequestWithSession
+internal sealed class SessionHistoryListRewindPointsRequest
 {
-    /// <summary>Include runtime built-in commands.</summary>
-    [JsonPropertyName("includeBuiltins")]
-    public bool? IncludeBuiltins { get; set; }
-
-    /// <summary>Include commands registered by protocol clients, including SDK clients and extensions.</summary>
-    [JsonPropertyName("includeClientCommands")]
-    public bool? IncludeClientCommands { get; set; }
-
-    /// <summary>Include enabled user-invocable skills and commands.</summary>
-    [JsonPropertyName("includeSkills")]
-    public bool? IncludeSkills { get; set; }
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of invoking the slash command (text output, prompt to send to the agent, completion, or subcommand selection).</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SlashCommandInvocationResultText), "text")]
-[JsonDerivedType(typeof(SlashCommandInvocationResultAgentPrompt), "agent-prompt")]
-[JsonDerivedType(typeof(SlashCommandInvocationResultCompleted), "completed")]
-[JsonDerivedType(typeof(SlashCommandInvocationResultSelectSubcommand), "select-subcommand")]
-public partial class SlashCommandInvocationResult
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
-
-
-/// <summary>Slash-command invocation result containing text output plus Markdown/ANSI rendering flags.</summary>
-/// <remarks>The <c>text</c> variant of <see cref="SlashCommandInvocationResult"/>.</remarks>
+/// <summary>A file that a conversation-and-files rewind would restore.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultText : SlashCommandInvocationResult
+public sealed class HistoryRewindFilePreview
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "text";
-
-    /// <summary>Whether text contains Markdown.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("markdown")]
-    public bool? Markdown { get; set; }
+    /// <summary>Aggregate change made across the discarded turns.</summary>
+    [JsonPropertyName("changeType")]
+    public HistoryRewindChangeType ChangeType { get; set; }
 
-    /// <summary>Whether ANSI sequences should be preserved.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("preserveAnsi")]
-    public bool? PreserveAnsi { get; set; }
+    /// <summary>Lines added across the discarded turns.</summary>
+    [JsonPropertyName("linesAdded")]
+    public long LinesAdded { get; set; }
 
-    /// <summary>True when the invocation mutated user runtime settings; consumers caching settings should refresh.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("runtimeSettingsChanged")]
-    public bool? RuntimeSettingsChanged { get; set; }
+    /// <summary>Lines removed across the discarded turns.</summary>
+    [JsonPropertyName("linesRemoved")]
+    public long LinesRemoved { get; set; }
 
-    /// <summary>Text output for the client to render.</summary>
-    [JsonPropertyName("text")]
-    public required string Text { get; set; }
+    /// <summary>Absolute path of the captured file.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 }
 
-/// <summary>Slash-command invocation result that submits an agent prompt, with display prompt, optional mode, optional user-facing notice, and settings-change flag.</summary>
-/// <remarks>The <c>agent-prompt</c> variant of <see cref="SlashCommandInvocationResult"/>.</remarks>
+/// <summary>Files and aggregate changes for a prospective rewind.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultAgentPrompt : SlashCommandInvocationResult
+public sealed class HistoryPreviewRewindResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "agent-prompt";
-
-    /// <summary>Prompt text to display to the user.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public required string DisplayPrompt { get; set; }
-
-    /// <summary>Optional target session mode for the agent prompt.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mode")]
-    public SessionMode? Mode { get; set; }
+    /// <summary>Whether file restore is available for this session. This is authoritative: switch on it and read `reason` only when it is false.</summary>
+    [JsonPropertyName("available")]
+    public bool Available { get; set; }
 
-    /// <summary>Optional user-facing notice to show before the prompt is submitted.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("notice")]
-    public string? Notice { get; set; }
+    /// <summary>Number of unique files in the preview.</summary>
+    [JsonPropertyName("fileCount")]
+    public long FileCount { get; set; }
 
-    /// <summary>Prompt to submit to the agent.</summary>
-    [JsonPropertyName("prompt")]
-    public required string Prompt { get; set; }
+    /// <summary>Files ordered by path.</summary>
+    [JsonPropertyName("files")]
+    public IList<HistoryRewindFilePreview> Files { get => field ??= []; set; }
 
-    /// <summary>True when the invocation mutated user runtime settings; consumers caching settings should refresh.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("runtimeSettingsChanged")]
-    public bool? RuntimeSettingsChanged { get; set; }
+    /// <summary>Why file restore is unavailable, when applicable. Populated only when `available` is false and never set when `available` is true.</summary>
+    [JsonPropertyName("reason")]
+    public HistoryRewindUnavailableReason? Reason { get; set; }
 }
 
-/// <summary>Slash-command invocation result indicating completion, with optional message and settings-change flag.</summary>
-/// <remarks>The <c>completed</c> variant of <see cref="SlashCommandInvocationResult"/>.</remarks>
+/// <summary>Event boundary to preview for conversation-and-files rewind.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultCompleted : SlashCommandInvocationResult
+internal sealed class HistoryPreviewRewindRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "completed";
-
-    /// <summary>Optional user-facing message describing the completed command.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
+    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
+    [JsonPropertyName("eventId")]
+    public string EventId { get; set; } = string.Empty;
 
-    /// <summary>True when the invocation mutated user runtime settings; consumers caching settings should refresh.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("runtimeSettingsChanged")]
-    public bool? RuntimeSettingsChanged { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Selectable slash-command subcommand option with name, description, and optional group label.</summary>
+/// <summary>A captured file that rewind intentionally left unchanged.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SlashCommandSelectSubcommandOption
+public sealed class HistorySkippedFileRestore
 {
-    /// <summary>Human-readable description of the subcommand.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Optional group label for organizing options.</summary>
-    [JsonPropertyName("group")]
-    public string? Group { get; set; }
+    /// <summary>Absolute path of the skipped file.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Subcommand name to invoke.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Reason the file was not restored.</summary>
+    [JsonPropertyName("reason")]
+    public HistoryFileRestoreSkipReason Reason { get; set; }
 }
 
-/// <summary>Slash-command invocation result asking the client to present subcommand options for a parent command.</summary>
-/// <remarks>The <c>select-subcommand</c> variant of <see cref="SlashCommandInvocationResult"/>.</remarks>
+/// <summary>Structured outcome of a rewind request.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultSelectSubcommand : SlashCommandInvocationResult
+public sealed class HistoryRewindResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "select-subcommand";
+    /// <summary>Failure detail. Set only for the failure and partial-failure outcomes (`files-rolled-back`, `rollback-incomplete`, `truncation-failed`, `checkpoint-cleanup-failed`, `snapshot-prune-failed`); omitted for `success` and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`).</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Parent command name that requires subcommand selection.</summary>
-    [JsonPropertyName("command")]
-    public required string Command { get; set; }
+    /// <summary>Number of persisted events removed by conversation truncation. Present only when truncation succeeded (outcomes `success`, `checkpoint-cleanup-failed`, and `snapshot-prune-failed`); omitted for every unavailable outcome (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`) and for `truncation-failed`, `files-rolled-back`, and `rollback-incomplete`.</summary>
+    [JsonPropertyName("eventsRemoved")]
+    public long? EventsRemoved { get; set; }
 
-    /// <summary>Available subcommand options for the client to present.</summary>
-    [JsonPropertyName("options")]
-    public required IList<SlashCommandSelectSubcommandOption> Options { get; set; }
+    /// <summary>Overall rewind outcome. This discriminates the result: it governs which of the remaining fields are populated, so consumers must switch on it before reading `eventsRemoved`, `restoredFiles`, `skippedFiles`, or `error`. See each field for the outcomes that populate it.</summary>
+    [JsonPropertyName("outcome")]
+    public HistoryRewindOutcome Outcome { get; set; }
 
-    /// <summary>True when the invocation mutated user runtime settings; consumers caching settings should refresh.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("runtimeSettingsChanged")]
-    public bool? RuntimeSettingsChanged { get; set; }
+    /// <summary>Absolute paths restored to their captured preimages. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.</summary>
+    [JsonPropertyName("restoredFiles")]
+    public IList<string> RestoredFiles { get => field ??= []; set; }
 
-    /// <summary>Human-readable title for the selection UI.</summary>
-    [JsonPropertyName("title")]
-    public required string Title { get; set; }
+    /// <summary>Captured files intentionally left unchanged. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.</summary>
+    [JsonPropertyName("skippedFiles")]
+    public IList<HistorySkippedFileRestore> SkippedFiles { get => field ??= []; set; }
 }
 
-/// <summary>Slash command name and optional raw input string to invoke.</summary>
+/// <summary>Boundary and mode for rewinding session history.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class CommandsInvokeRequest
+internal sealed class HistoryRewindRequest
 {
-    /// <summary>Raw input after the command name.</summary>
-    [JsonPropertyName("input")]
-    public string? Input { get; set; }
+    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
+    [JsonPropertyName("eventId")]
+    public string EventId { get; set; } = string.Empty;
 
-    /// <summary>Command name. Leading slashes are stripped and the name is matched case-insensitively.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Whether to rewind only conversation history or also restore captured files.</summary>
+    [JsonPropertyName("mode")]
+    public HistoryRewindMode Mode { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the pending client-handled command was completed successfully.</summary>
+/// <summary>Indicates whether an in-progress background compaction was cancelled.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CommandsHandlePendingCommandResult
+public sealed class HistoryCancelBackgroundCompactionResult
 {
-    /// <summary>Whether the command was handled successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Whether an in-progress background compaction was cancelled. False when no compaction was running, when the session is remote, or when the underlying processor was unavailable.</summary>
+    [JsonPropertyName("cancelled")]
+    public bool Cancelled { get; set; }
 }
 
-/// <summary>Pending command request ID and an optional error if the client handler failed.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class CommandsHandlePendingCommandRequest
+internal sealed class SessionHistoryCancelBackgroundCompactionRequest
 {
-    /// <summary>Error message if the command handler failed.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Request ID from the command invocation event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Error message produced while executing the command, if any.</summary>
+/// <summary>Indicates whether an in-progress manual compaction was aborted.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ExecuteCommandResult
+public sealed class HistoryAbortManualCompactionResult
 {
-    /// <summary>Error message produced while executing the command, if any. Omitted when the handler succeeded.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Whether an in-progress manual compaction was aborted. False when no manual compaction was running, when its abort controller was already aborted, or when the session is remote.</summary>
+    [JsonPropertyName("aborted")]
+    public bool Aborted { get; set; }
 }
 
-/// <summary>Slash command name and argument string to execute synchronously.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ExecuteCommandParams
+internal sealed class SessionHistoryAbortManualCompactionRequest
 {
-    /// <summary>Argument string to pass to the command (empty string if none).</summary>
-    [JsonPropertyName("args")]
-    public string Args { get; set; } = string.Empty;
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Name of the slash command to invoke (without the leading '/').</summary>
-    [JsonPropertyName("commandName")]
-    public string CommandName { get; set; } = string.Empty;
+/// <summary>Markdown summary of the conversation context (empty when not available).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class HistorySummarizeForHandoffResult
+{
+    /// <summary>Markdown summary of the conversation context produced by an LLM. Empty string when there are no messages or when the session does not support local summarization.</summary>
+    [JsonPropertyName("summary")]
+    public string Summary { get; set; } = string.Empty;
+}
 
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionHistorySummarizeForHandoffRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the command was accepted into the local execution queue.</summary>
+/// <summary>What a successful clear removed. A clear that could not be applied rejects instead of reporting a count.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class EnqueueCommandResult
+public sealed class HistoryClearContextResult
 {
-    /// <summary>True when the command was accepted into the local execution queue. False when the call targets a session that does not support local command queueing (e.g. remote sessions).</summary>
-    [JsonPropertyName("queued")]
-    public bool Queued { get; set; }
+    /// <summary>Number of non-system, non-developer messages that were removed from the conversation. Zero only when the window already held no conversation.</summary>
+    [JsonPropertyName("messagesCleared")]
+    public long MessagesCleared { get; set; }
 }
 
-/// <summary>Slash-prefixed command string to enqueue for FIFO processing.</summary>
+/// <summary>Parameters for clearing the conversation and seeding the window that replaces it.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class EnqueueCommandParams
+internal sealed class HistoryClearContextRequest
 {
-    /// <summary>Slash-prefixed command string to enqueue, e.g. '/compact' or '/model gpt-4'. Queued FIFO with any in-flight items; if the session is idle, processing kicks off immediately.</summary>
-    [JsonPropertyName("command")]
-    public string Command { get; set; } = string.Empty;
+    /// <summary>First user message of the fresh context window. Required: a cleared window holding only system and developer messages is not a conversation a model can answer, so every clear seeds the window it creates. Delivered by the enclosing turn driver once the agentic loop exits, which is why the call must be made from inside a tool handler.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the queued-command response was matched to a pending request.</summary>
+/// <summary>User-facing pending queue entry, with kind and display text for a queued message, slash command, or model change.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CommandsRespondToQueuedCommandResult
+public sealed class QueuePendingItems
 {
-    /// <summary>Whether a pending queued command with the given request ID was found and resolved. False when the request was already resolved, cancelled, or unknown.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Agent mode stored on this queued entry, as stamped when it was enqueued. Items without an explicit mode report interactive. This is not necessarily the mode that will constrain the turn: a plan or autopilot session applies its own write gate, continuation loop and permission posture to every drained item regardless of the mode stored here.</summary>
+    [JsonPropertyName("agentMode")]
+    public SendAgentMode AgentMode { get; set; }
+
+    /// <summary>Human-readable text to display for this queue entry in the UI.</summary>
+    [JsonPropertyName("displayText")]
+    public string DisplayText { get; set; } = string.Empty;
+
+    /// <summary>Stable opaque id for the canonical queued item. Batch rows share one id.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Whether this item is a queued user message or a queued slash command / model change.</summary>
+    [JsonPropertyName("kind")]
+    public QueuePendingItemsKind Kind { get; set; }
 }
 
-/// <summary>Result of the queued command execution.</summary>
-/// <remarks>Data type discriminated by <c>handled</c>.</remarks>
+/// <summary>Snapshot of the session's pending queued items and immediate-steering messages.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class QueuedCommandResult
+public sealed class QueuePendingItemsResult
 {
-    /// <summary>The boolean discriminator.</summary>
-    [JsonPropertyName("handled")]
-    public bool Handled { get; set; }
+    /// <summary>How many leading entries of `steeringMessages` have already been folded into the running turn (and so have an emitted `user.message`), as opposed to still waiting for one. Absent for hosts that do not distinguish the two.</summary>
+    [JsonPropertyName("inFlightSteeringCount")]
+    public long? InFlightSteeringCount { get; set; }
 
-    /// <summary>When true, the runtime will not process subsequent queued commands until a new request comes in.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("stopProcessingQueue")]
-    public bool? StopProcessingQueue { get; set; }
+    /// <summary>Pending queued items in submission order. Includes user messages, queued slash commands, and queued model changes; omits internal system items.</summary>
+    [JsonPropertyName("items")]
+    public IList<QueuePendingItems> Items { get => field ??= []; set; }
+
+    /// <summary>Display text for messages currently in the immediate steering queue (interjections sent during a running turn).</summary>
+    [JsonPropertyName("steeringMessages")]
+    public IList<string> SteeringMessages { get => field ??= []; set; }
 }
 
-/// <summary>Queued-command request ID and the result indicating whether the host executed it (and whether to stop processing further queued commands).</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class CommandsRespondToQueuedCommandRequest
+internal sealed class SessionQueuePendingItemsRequest
 {
-    /// <summary>Request ID from the `command.queued` event the host is responding to.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
-
-    /// <summary>Result of the queued command execution.</summary>
-    [JsonPropertyName("result")]
-    public QueuedCommandResult Result { get => field ??= new(); set; }
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Telemetry engagement ID for the session, when available.</summary>
+/// <summary>Internal snapshot of native queue state for local session orchestration.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionTelemetryEngagement
+internal sealed class QueueSnapshotResult
 {
-    /// <summary>Current telemetry engagement ID, when available.</summary>
-    [JsonPropertyName("engagementId")]
-    public string? EngagementId { get; set; }
+    /// <summary>Insertion orders for queued items, aligned with `items`.</summary>
+    [JsonPropertyName("itemOrders")]
+    public IList<long>? ItemOrders { get; set; }
+
+    /// <summary>User-facing pending items in FIFO order.</summary>
+    [JsonPropertyName("items")]
+    public IList<QueuePendingItems> Items { get => field ??= []; set; }
+
+    /// <summary>Insertion orders for immediate steering messages, aligned with `steeringMessages`.</summary>
+    [JsonPropertyName("steeringMessageOrders")]
+    public IList<long>? SteeringMessageOrders { get; set; }
+
+    /// <summary>Immediate steering messages waiting for an active turn.</summary>
+    [JsonPropertyName("steeringMessages")]
+    public IList<string> SteeringMessages { get => field ??= []; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionTelemetryGetEngagementIdRequest
+internal sealed class SessionQueueSnapshotRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Feature override key/value pairs to attach to subsequent telemetry events from this session.</summary>
+/// <summary>Result of moving a queued item.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class TelemetrySetFeatureOverridesRequest
+public sealed class QueueMoveItemResult
 {
-    /// <summary>Override key/value pairs to attach to subsequent telemetry events from this session. Replaces any previously-set overrides.</summary>
-    [JsonPropertyName("features")]
-    public IDictionary<string, string> Features { get => field ??= new Dictionary<string, string>(); set; }
+    /// <summary>True when the item changed position; false when it was already at the requested position.</summary>
+    [JsonPropertyName("changed")]
+    public bool Changed { get; set; }
+}
+
+/// <summary>Parameters for moving a queued item by stable id.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class QueueMoveItemRequest
+{
+    /// <summary>Stable opaque queued-item id.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Zero-based target position in the public visible queue. Values outside the queue clamp to an end.</summary>
+    [JsonPropertyName("toPosition")]
+    public long ToPosition { get; set; }
 }
 
-/// <summary>Transient answer generated from current conversation context.</summary>
+/// <summary>Result of inserting a queued message.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UIEphemeralQueryResult
+public sealed class QueueInsertAtResult
 {
-    /// <summary>Full assistant response text.</summary>
-    [JsonPropertyName("answer")]
-    public string Answer { get; set; } = string.Empty;
+    /// <summary>Fresh stable opaque id assigned to the inserted item.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 }
 
-/// <summary>Transient question to answer without adding it to conversation history.</summary>
+/// <summary>Serializable message fields accepted by queue.insertAt.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class UIEphemeralQueryRequest
+public sealed class QueueInsertMessage
 {
-    /// <summary>In-process `AbortSignal` forwarded to the model client to cancel an in-flight request. Marked internal: excluded from the public SDK surface. Replaced by an explicit cancellation token + cancel RPC in the SDK migration.</summary>
-    [JsonInclude]
-    [JsonPropertyName("abortSignal")]
-    internal JsonElement? AbortSignal { get; set; }
+    /// <summary>Optional explicit agent mode. When omitted, the session's current mode is assigned.</summary>
+    [JsonPropertyName("agentMode")]
+    public SendAgentMode? AgentMode { get; set; }
 
-    /// <summary>In-process streaming callback `(text) =&gt; void` invoked with each token as the model emits it. Marked internal: excluded from the public SDK surface. In a process-separated SDK this is replaced by a streaming RPC that yields chunks and a final answer.</summary>
-    [JsonInclude]
-    [JsonPropertyName("onChunk")]
-    internal JsonElement? OnChunk { get; set; }
+    /// <summary>Optional attachments for the message.</summary>
+    [JsonPropertyName("attachments")]
+    public IList<Attachment>? Attachments { get; set; }
 
-    /// <summary>Question to answer from the current conversation context.</summary>
-    [JsonPropertyName("question")]
-    public string Question { get; set; } = string.Empty;
+    /// <summary>Whether the message is billable.</summary>
+    [JsonPropertyName("billable")]
+    public bool? Billable { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Accepted for internal SendOptions compatibility but ignored; delivery is derived from current session activity.</summary>
+    [JsonPropertyName("delivery")]
+    public string? Delivery { get; set; }
 
-/// <summary>The elicitation response (accept with form values, decline, or cancel).</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class UIElicitationResponse
-{
-    /// <summary>The user's response: accept (submitted), decline (rejected), or cancel (dismissed).</summary>
-    [JsonPropertyName("action")]
-    public UIElicitationResponseAction Action { get; set; }
+    /// <summary>Optional user-facing display text.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-    /// <summary>The form values submitted by the user (present when action is 'accept').</summary>
-    [JsonPropertyName("content")]
-    public IDictionary<string, JsonElement>? Content { get; set; }
-}
+    /// <summary>Accepted for SendOptions compatibility but ignored; inserted items always use queued delivery semantics.</summary>
+    [JsonPropertyName("mode")]
+    public SendMode? Mode { get; set; }
 
-/// <summary>JSON Schema describing the form fields to present to the user.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class UIElicitationSchema
-{
-    /// <summary>Form field definitions, keyed by field name.</summary>
-    [JsonPropertyName("properties")]
-    public IDictionary<string, JsonElement> Properties { get => field ??= new Dictionary<string, JsonElement>(); set; }
+    /// <summary>Accepted for SendOptions compatibility but ignored; the requested public position controls placement.</summary>
+    [JsonPropertyName("prepend")]
+    public bool? Prepend { get; set; }
 
-    /// <summary>List of required field names.</summary>
-    [JsonPropertyName("required")]
-    public IList<string>? Required { get; set; }
+    /// <summary>The user message text.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Schema type indicator (always 'object').</summary>
-    [JsonPropertyName("type")]
-    public string Type { get; set; } = string.Empty;
+    /// <summary>Per-turn request headers.</summary>
+    [JsonPropertyName("requestHeaders")]
+    public IDictionary<string, string>? RequestHeaders { get; set; }
+
+    /// <summary>Required tool name for the turn, when any.</summary>
+    [JsonPropertyName("requiredTool")]
+    public string? RequiredTool { get; set; }
+
+    /// <summary>Optional provenance source. `system` is rejected: it would hide the inserted row from `pendingItems` and make it unaddressable while still executing, so inserted items must stay visible.</summary>
+    [JsonPropertyName("source")]
+    public string? Source { get; set; }
+
+    /// <summary>Accepted for SendOptions compatibility but ignored; insertion scheduling is controlled by the queue drain state.</summary>
+    [JsonPropertyName("wait")]
+    public bool? Wait { get; set; }
 }
 
-/// <summary>Prompt message and JSON schema describing the form fields to elicit from the user.</summary>
+/// <summary>Parameters for inserting a queued message at a public visible position.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class UIElicitationRequest
+internal sealed class QueueInsertAtRequest
 {
-    /// <summary>Message describing what information is needed from the user.</summary>
+    /// <summary>Queued message contents and delivery metadata.</summary>
     [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    public QueueInsertMessage Message { get => field ??= new(); set; }
 
-    /// <summary>JSON Schema describing the form fields to present to the user.</summary>
-    [JsonPropertyName("requestedSchema")]
-    public UIElicitationSchema RequestedSchema { get => field ??= new(); set; }
+    /// <summary>Zero-based position in the public visible queue. Values outside the queue clamp to an end.</summary>
+    [JsonPropertyName("position")]
+    public long Position { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the elicitation response was accepted; false if it was already resolved by another client.</summary>
+/// <summary>Result of removing a queued item.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UIElicitationResult
+public sealed class QueueRemoveAtResult
 {
-    /// <summary>Whether the response was accepted. False if the request was already resolved by another client.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>True when the addressed item was removed.</summary>
+    [JsonPropertyName("removed")]
+    public bool Removed { get; set; }
 }
 
-/// <summary>Pending elicitation request ID and the user's response (accept/decline/cancel + form values).</summary>
+/// <summary>Parameters for removing a queued item by stable id.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class UIHandlePendingElicitationRequest
+internal sealed class QueueRemoveAtRequest
 {
-    /// <summary>The unique request ID from the elicitation.requested event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
-
-    /// <summary>The elicitation response (accept with form values, decline, or cancel).</summary>
-    [JsonPropertyName("result")]
-    public UIElicitationResponse Result { get => field ??= new(); set; }
+    /// <summary>Stable opaque ID of the queued item to remove.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the pending UI request was resolved by this call.</summary>
+/// <summary>Result of editing a queued message.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UIHandlePendingResult
+public sealed class QueueUpdateTextResult
 {
-    /// <summary>True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>True when the stored text changed.</summary>
+    [JsonPropertyName("updated")]
+    public bool Updated { get; set; }
 }
 
-/// <summary>User response for a pending user-input request, with answer text and whether it was typed freeform.</summary>
+/// <summary>Parameters for editing a single queued message.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UIUserInputResponse
+internal sealed class QueueUpdateTextRequest
 {
-    /// <summary>The user's answer text.</summary>
-    [JsonPropertyName("answer")]
-    public string Answer { get; set; } = string.Empty;
-
-    /// <summary>True if the user typed a freeform response, false if they selected a presented choice. Used by telemetry to differentiate between free text input and choice selection.</summary>
-    [JsonPropertyName("wasFreeform")]
-    public bool WasFreeform { get; set; }
-}
+    /// <summary>Optional replacement prompt displayed to the user.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-/// <summary>Request ID of a pending `user_input.requested` event and the user's response.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class UIHandlePendingUserInputRequest
-{
-    /// <summary>The unique request ID from the user_input.requested event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Stable opaque ID of the queued item to edit.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>User response for a pending user-input request, with answer text and whether it was typed freeform.</summary>
-    [JsonPropertyName("response")]
-    public UIUserInputResponse Response { get => field ??= new(); set; }
+    /// <summary>Replacement prompt sent to the model.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.</summary>
+/// <summary>Result of duplicating a queued item.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UIHandlePendingSamplingResponse
+public sealed class QueueDuplicateAtResult
 {
+    /// <summary>Fresh stable opaque id assigned to the duplicate.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 }
 
-/// <summary>Request ID of a pending `sampling.requested` event and an optional sampling result payload (omit to reject).</summary>
+/// <summary>Parameters for duplicating a queued item.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class UIHandlePendingSamplingRequest
+internal sealed class QueueDuplicateAtRequest
 {
-    /// <summary>The unique request ID from the sampling.requested event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
-
-    /// <summary>Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.</summary>
-    [JsonPropertyName("response")]
-    public UIHandlePendingSamplingResponse? Response { get; set; }
+    /// <summary>Stable opaque ID of the queued item to duplicate.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Request ID of a pending `auto_mode_switch.requested` event and the user's response.</summary>
+/// <summary>Parameters for acquiring or releasing the queued-lane drain pause. Acquisition is exclusive and non-idempotent: `paused: true` against an already-paused session fails with `queue_already_paused`. The pause is never released automatically — it is not tied to the caller's lifetime, so a client that exits without sending `paused: false` leaves the lane frozen. Release is unowned: `paused: false` clears the pause for any caller, including one that never acquired it.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class UIHandlePendingAutoModeSwitchRequest
+internal sealed class QueueSetDrainPausedRequest
 {
-    /// <summary>The unique request ID from the auto_mode_switch.requested event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
-
-    /// <summary>User's choice for auto-mode switching: yes (allow this turn), yes_always (allow + persist as setting), or no (decline).</summary>
-    [JsonPropertyName("response")]
-    public UIAutoModeSwitchResponse Response { get; set; }
+    /// <summary>Whether queued-lane draining should be paused.</summary>
+    [JsonPropertyName("paused")]
+    public bool Paused { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The user's selected action for an exhausted session limit.</summary>
+/// <summary>Result of trying to steer a queued message into a live turn.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UISessionLimitsExhaustedResponse
+public sealed class QueueSendNowResult
 {
-    /// <summary>Action selected by the user.</summary>
-    [JsonPropertyName("action")]
-    public UISessionLimitsExhaustedResponseAction Action { get; set; }
+    /// <summary>True when the item was accepted into the steering lane; false when no main turn was live.</summary>
+    [JsonPropertyName("steered")]
+    public bool Steered { get; set; }
+}
 
-    /// <summary>AI Credits to add to the current max when action is 'add'.</summary>
-    [JsonPropertyName("additionalAiCredits")]
-    public double? AdditionalAiCredits { get; set; }
+/// <summary>Parameters for steering a queued message into a live turn.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class QueueSendNowRequest
+{
+    /// <summary>Stable opaque ID of the queued item to steer into the live turn.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>New absolute max AI Credits when action is 'set'.</summary>
-    [JsonPropertyName("maxAiCredits")]
-    public double? MaxAiCredits { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Whether the native queue has pending work.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class QueueHasPendingResult
+{
+    /// <summary>True when queued or immediate native work is pending.</summary>
+    [JsonPropertyName("hasPending")]
+    public bool HasPending { get; set; }
 }
 
-/// <summary>Request ID of a pending `session_limits_exhausted.requested` event and the user's selected limit action.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class UIHandlePendingSessionLimitsExhaustedRequest
+internal sealed class SessionQueueHasPendingRequest
 {
-    /// <summary>The unique request ID from the session_limits_exhausted.requested event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
-
-    /// <summary>The selected session-limit action.</summary>
-    [JsonPropertyName("response")]
-    public UISessionLimitsExhaustedResponse Response { get => field ??= new(); set; }
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>User response for a pending exit-plan-mode request, with approval state, selected action, auto-approve flag, and feedback.</summary>
+/// <summary>Whether a deferred-idle drain should run.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UIExitPlanModeResponse
+internal sealed class QueueBeginDeferredIdleDrainResult
 {
-    /// <summary>Whether the plan was approved.</summary>
-    [JsonPropertyName("approved")]
-    public bool Approved { get; set; }
+    /// <summary>True when the host should run finishDeferredIdleDrain asynchronously.</summary>
+    [JsonPropertyName("shouldDrain")]
+    public bool ShouldDrain { get; set; }
+}
 
-    /// <summary>Whether subsequent edits should be auto-approved without confirmation.</summary>
-    [JsonPropertyName("autoApproveEdits")]
-    public bool? AutoApproveEdits { get; set; }
+/// <summary>Inputs for starting a deferred-idle drain.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class QueueBeginDeferredIdleDrainRequest
+{
+    /// <summary>Whether the host still has active background work.</summary>
+    [JsonPropertyName("activeBackgroundWork")]
+    public bool ActiveBackgroundWork { get; set; }
 
-    /// <summary>When true, the agent is instructed to end its turn without starting implementation so the client can restore the session model and auto-submit a fresh implementation turn on it. Set only when a distinct plan configuration (a different model, reasoning effort, or context tier) actually ran the planning turn.</summary>
-    [JsonPropertyName("deferImplementation")]
-    public bool? DeferImplementation { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Feedback from the user when they declined the plan or requested changes.</summary>
-    [JsonPropertyName("feedback")]
-    public string? Feedback { get; set; }
+/// <summary>Action selected by the native deferred-idle drain.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class QueueFinishDeferredIdleDrainResult
+{
+    /// <summary>Whether the deferred idle was caused by an aborted foreground turn.</summary>
+    [JsonPropertyName("aborted")]
+    public bool Aborted { get; set; }
 
-    /// <summary>The action the user selected. Defaults to 'autopilot' when autoApproveEdits is true, otherwise 'interactive'.</summary>
-    [JsonPropertyName("selectedAction")]
-    public UIExitPlanModeAction? SelectedAction { get; set; }
+    /// <summary>One of none, processQueue, or emitSessionIdle.</summary>
+    [JsonPropertyName("action")]
+    public string Action { get; set; } = string.Empty;
 }
 
-/// <summary>Request ID of a pending `exit_plan_mode.requested` event and the user's response.</summary>
+/// <summary>Inputs for completing a deferred-idle drain.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class UIHandlePendingExitPlanModeRequest
+internal sealed class QueueFinishDeferredIdleDrainRequest
 {
-    /// <summary>The unique request ID from the exit_plan_mode.requested event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Whether the host still has active background work.</summary>
+    [JsonPropertyName("activeBackgroundWork")]
+    public bool ActiveBackgroundWork { get; set; }
 
-    /// <summary>User response for a pending exit-plan-mode request, with approval state, selected action, auto-approve flag, and feedback.</summary>
-    [JsonPropertyName("response")]
-    public UIExitPlanModeResponse Response { get => field ??= new(); set; }
+    /// <summary>Whether native queued work remains.</summary>
+    [JsonPropertyName("hasPending")]
+    public bool HasPending { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Register an in-process handler for `auto_mode_switch.requested` events. The caller still attaches the actual listener via the standard event-subscription mechanism; this registration solely tells the server bridge to skip its own dispatch (so a remote client doesn't race the in-process handler for the same requestId).</summary>
+/// <summary>Inputs for marking session.idle deferred in native state.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UIRegisterDirectAutoModeSwitchHandlerResult
+internal sealed class QueueDeferSessionIdleRequest
 {
-    /// <summary>Opaque handle representing the registration. Pass this same handle to `unregisterDirectAutoModeSwitchHandler` when the in-process handler is no longer active. Multiple registrations are reference-counted; the server bridge will only dispatch auto-mode-switch requests when no handles are active.</summary>
-    [JsonPropertyName("handle")]
-    public string Handle { get; set; } = string.Empty;
-}
+    /// <summary>Whether the deferred idle was caused by an aborted foreground turn.</summary>
+    [JsonPropertyName("aborted")]
+    public bool Aborted { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionUiRegisterDirectAutoModeSwitchHandlerRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the handle was active and the registration count was decremented.</summary>
+/// <summary>Indicates whether a user-facing pending item was removed.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UIUnregisterDirectAutoModeSwitchHandlerResult
+public sealed class QueueRemoveMostRecentResult
 {
-    /// <summary>True if the handle was active and decremented the counter; false if the handle was unknown.</summary>
-    [JsonPropertyName("unregistered")]
-    public bool Unregistered { get; set; }
+    /// <summary>True if a user-facing pending item was removed (LIFO across both queues); false when no removable items remained.</summary>
+    [JsonPropertyName("removed")]
+    public bool Removed { get; set; }
 }
 
-/// <summary>Opaque handle previously returned by `registerDirectAutoModeSwitchHandler` to release.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class UIUnregisterDirectAutoModeSwitchHandlerRequest
+internal sealed class SessionQueueRemoveMostRecentRequest
 {
-    /// <summary>Handle previously returned by `registerDirectAutoModeSwitchHandler`.</summary>
-    [JsonPropertyName("handle")]
-    public string Handle { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsConfigureResult
+internal sealed class SessionQueueClearRequest
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type.</summary>
+/// <summary>Internal filter for consuming queued system notifications.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsConfigureAdditionalContentExclusionPolicyRuleSource
+internal sealed class QueueConsumeSystemNotificationsRequest
 {
-    /// <summary>Gets or sets the <c>name</c> value.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Opaque runtime-owned filter object.</summary>
+    [JsonPropertyName("filter")]
+    public JsonElement Filter { get; set; }
 
-    /// <summary>Gets or sets the <c>type</c> value.</summary>
-    [JsonPropertyName("type")]
-    public string Type { get; set; } = string.Empty;
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Single content-exclusion rule supplied to `session.permissions.configure`, with paths, match conditions, and source.</summary>
+/// <summary>Result of enqueueing the resume-pending wake item.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsConfigureAdditionalContentExclusionPolicyRule
+internal sealed class QueueEnqueueResumePendingResult
 {
-    /// <summary>Gets or sets the <c>ifAnyMatch</c> value.</summary>
-    [JsonPropertyName("ifAnyMatch")]
-    public IList<string>? IfAnyMatch { get; set; }
-
-    /// <summary>Gets or sets the <c>ifNoneMatch</c> value.</summary>
-    [JsonPropertyName("ifNoneMatch")]
-    public IList<string>? IfNoneMatch { get; set; }
-
-    /// <summary>Gets or sets the <c>paths</c> value.</summary>
-    [JsonPropertyName("paths")]
-    public IList<string> Paths { get => field ??= []; set; }
-
-    /// <summary>Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type.</summary>
-    [JsonPropertyName("source")]
-    public PermissionsConfigureAdditionalContentExclusionPolicyRuleSource Source { get => field ??= new(); set; }
+    /// <summary>True when a wake item was newly queued.</summary>
+    [JsonPropertyName("queued")]
+    public bool Queued { get; set; }
 }
 
-/// <summary>Content-exclusion policy supplied to `session.permissions.configure`, with rules, last-updated data, and scope.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsConfigureAdditionalContentExclusionPolicy
+internal sealed class SessionQueueEnqueueResumePendingRequest
 {
-    /// <summary>Gets or sets the <c>last_updated_at</c> value.</summary>
-    [JsonPropertyName("last_updated_at")]
-    public JsonElement LastUpdatedAt { get; set; }
-
-    /// <summary>Gets or sets the <c>rules</c> value.</summary>
-    [JsonPropertyName("rules")]
-    public IList<PermissionsConfigureAdditionalContentExclusionPolicyRule> Rules { get => field ??= []; set; }
-
-    /// <summary>Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope` enumeration.</summary>
-    [JsonPropertyName("scope")]
-    public PermissionsConfigureAdditionalContentExclusionPolicyScope Scope { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>If specified, replaces the session's path-permission policy. The runtime constructs the appropriate PathManager based on these inputs (rooted at the session's working directory). Omit to leave the current path policy unchanged.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionPathsConfig
+internal sealed class SessionQueueProcessRequest
 {
-    /// <summary>Additional directories to allow tool access to (in addition to the session's working directory). When `unrestricted` is true, these are still pre-populated on the UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention completion).</summary>
-    [JsonPropertyName("additionalDirectories")]
-    public IList<string>? AdditionalDirectories { get; set; }
-
-    /// <summary>Whether to include the system temp directory in the allowed list (defaults to true). Ignored when `unrestricted` is true.</summary>
-    [JsonPropertyName("includeTempDirectory")]
-    public bool? IncludeTempDirectory { get; set; }
-
-    /// <summary>If true, the runtime allows access to all paths without prompting. Equivalent to constructing an UnrestrictedPathManager.</summary>
-    [JsonPropertyName("unrestricted")]
-    public bool? Unrestricted { get; set; }
-
-    /// <summary>Workspace root path (special-cased to be allowed even before the directory exists). Ignored when `unrestricted` is true.</summary>
-    [JsonPropertyName("workspacePath")]
-    public string? WorkspacePath { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>If specified, replaces the session's approved/denied permission rules. Omit to leave the current rules unchanged.</summary>
+/// <summary>Batch of session events returned by a read, with cursor and continuation metadata.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionRulesSet
+public sealed class EventsReadResult
 {
-    /// <summary>Rules that auto-approve matching requests.</summary>
-    [JsonPropertyName("approved")]
-    public IList<PermissionRule> Approved { get => field ??= []; set; }
+    /// <summary>Opaque cursor for the next read. Pass back unchanged in the next read.cursor to continue from where this read left off. Always present, even when no events were returned. For a backward read this cursor pages toward OLDER events; keep passing `direction: backward` with it (the cursor is also self-describing, so backward paging continues correctly).</summary>
+    [JsonPropertyName("cursor")]
+    public string Cursor { get; set; } = string.Empty;
 
-    /// <summary>Rules that auto-deny matching requests.</summary>
-    [JsonPropertyName("denied")]
-    public IList<PermissionRule> Denied { get => field ??= []; set; }
-}
+    /// <summary>Cursor status: 'ok' means the cursor was applied successfully; 'expired' means the cursor referred to an event that no longer exists in history (e.g. truncated or compacted away) and the read fell back to a boundary of the remaining history. For a forward read the fallback starts from the beginning of the remaining history; for a backward read it falls back to the tail (the newest window). Because the fallback page is a fresh boundary snapshot rather than a continuation of the requested cursor, it may overlap events the consumer has already rendered — a backward fallback to the tail in particular can repeat the newest window. On 'expired', consumers should reset or rebase their local pagination state (or deduplicate by event id) before continuing from the returned cursor rather than blindly appending/prepending the fallback page.</summary>
+    [JsonPropertyName("cursorStatus")]
+    public EventsCursorStatus CursorStatus { get; set; }
 
-/// <summary>If specified, replaces the session's URL-permission policy. The runtime constructs a fresh DefaultUrlManager based on these inputs. Omit to leave the current URL policy unchanged.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PermissionUrlsConfig
-{
-    /// <summary>Initial list of allowed URL/domain patterns. Patterns may include path components. Ignored when `unrestricted` is true.</summary>
-    [JsonPropertyName("initialAllowed")]
-    public IList<string>? InitialAllowed { get; set; }
+    /// <summary>Session events for this batch, merged into a single stream in creation order: durable (persisted) events and ephemeral events interleave exactly as they were emitted. Set `includeEphemeral: false` to receive only durable events. Ephemeral events are never replayable once pruned from the in-memory ring, so a consumer that needs them should keep reading with a non-zero `waitMs`. For a backward (tail-first) read, the returned window contains persisted events only, still in chronological (oldest-to-newest) append order.</summary>
+    [JsonPropertyName("events")]
+    public IList<SessionEvent> Events { get => field ??= []; set; }
 
-    /// <summary>If true, the runtime allows access to all URLs without prompting. Initial allow-list is ignored when this is true.</summary>
-    [JsonPropertyName("unrestricted")]
-    public bool? Unrestricted { get; set; }
+    /// <summary>True when more events are available in the read's direction. For a forward read, true means the batch returned `max` events and more are available immediately. For a backward read, true means older persisted events remain before the returned window.</summary>
+    [JsonPropertyName("hasMore")]
+    public bool HasMore { get; set; }
 }
 
-/// <summary>Patch of permission policy fields to apply (omit a field to leave it unchanged).</summary>
+/// <summary>Cursor, batch size, and optional long-poll/filter parameters for reading session events.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionsConfigureParams
+internal sealed class EventLogReadRequest
 {
-    /// <summary>If specified, replaces the host-supplied GitHub Content Exclusion policies on the session (combined with natively-discovered policies when evaluating tool/file access). Omit to leave the current policies unchanged.</summary>
-    [JsonPropertyName("additionalContentExclusionPolicies")]
-    public IList<PermissionsConfigureAdditionalContentExclusionPolicy>? AdditionalContentExclusionPolicies { get; set; }
+    /// <summary>Optional non-empty list of subagent identifiers. When provided, only events owned by one of these agents are returned; ownership recognizes the event envelope's agentId plus legacy data.agentId and data.parentToolCallId markers. This filter takes precedence over agentScope.</summary>
+    [JsonPropertyName("agentIds")]
+    public IList<string>? AgentIds { get; set; }
 
-    /// <summary>If specified, sets whether path/URL read permission requests are auto-approved. Omit to leave the current value unchanged.</summary>
-    [JsonPropertyName("approveAllReadPermissionRequests")]
-    public bool? ApproveAllReadPermissionRequests { get; set; }
+    /// <summary>Agent-scope filter: 'primary' returns only main-agent events plus events whose type starts with 'subagent.' (matching the typed-subscription default behavior); 'all' returns events from all agents (matching wildcard-subscription behavior). Default is 'all' to preserve wildcard semantics for catch-up callers.</summary>
+    [JsonPropertyName("agentScope")]
+    public EventsAgentScope? AgentScope { get; set; }
 
-    /// <summary>If specified, sets whether tool permission requests are auto-approved without prompting. Omit to leave the current value unchanged.</summary>
-    [JsonPropertyName("approveAllToolPermissionRequests")]
-    public bool? ApproveAllToolPermissionRequests { get; set; }
+    /// <summary>Opaque cursor returned by a previous read. Omit on the first call to start from the beginning of the session's persisted history.</summary>
+    [JsonPropertyName("cursor")]
+    public string? Cursor { get; set; }
 
-    /// <summary>If specified, replaces the session's path-permission policy. The runtime constructs the appropriate PathManager based on these inputs (rooted at the session's working directory). Omit to leave the current path policy unchanged.</summary>
-    [JsonPropertyName("paths")]
-    public PermissionPathsConfig? Paths { get; set; }
+    /// <summary>Direction to page through the session's persisted event history. 'forward' (default) pages from the cursor toward newer events (or from the start of history when no cursor is given). 'backward' enables tail-first reads: with no cursor it returns the NEWEST `max` events, and the returned cursor pages toward OLDER events on subsequent backward reads. Events within a returned batch are always in chronological (oldest-to-newest) order, even for a backward read. Backward reads cover PERSISTED history only; ephemeral events are never returned by a backward read. `direction` selects the INITIAL read only: the returned cursor is self-describing, so a continuation read pages in the cursor's own direction regardless of the `direction` passed alongside it — a forward cursor always pages forward and a backward cursor always pages backward. Pass the direction that matches the cursor to avoid confusion.</summary>
+    [JsonPropertyName("direction")]
+    public EventsReadDirection? Direction { get; set; }
 
-    /// <summary>If specified, replaces the session's approved/denied permission rules. Omit to leave the current rules unchanged.</summary>
-    [JsonPropertyName("rules")]
-    public PermissionRulesSet? Rules { get; set; }
+    /// <summary>When false, skip ephemeral events entirely and return only durable (persisted) events. History-backfill callers that discard ephemerals anyway should set this so the read is bounded by the durable log length instead of racing the ephemeral ring on a busy session. Defaults to true (ephemerals are interleaved with durable events in creation order). Ignored by backward reads, which always cover persisted history only.</summary>
+    [JsonPropertyName("includeEphemeral")]
+    public bool? IncludeEphemeral { get; set; }
+
+    /// <summary>Maximum number of events to return in this batch (1–1000, default 200).</summary>
+    [JsonPropertyName("max")]
+    public long? Max { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>If specified, replaces the session's URL-permission policy. The runtime constructs a fresh DefaultUrlManager based on these inputs. Omit to leave the current URL policy unchanged.</summary>
-    [JsonPropertyName("urls")]
-    public PermissionUrlsConfig? Urls { get; set; }
-}
+    /// <summary>Either '*' to receive all event types, or a non-empty list of event types to receive.</summary>
+    [JsonPropertyName("types")]
+    public JsonElement? Types { get; set; }
 
-/// <summary>Indicates whether the permission decision was applied; false when the request was already resolved.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PermissionRequestResult
-{
-    /// <summary>Whether the permission request was handled successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Milliseconds to wait for new events when the cursor is at the tail of history. 0 (default) returns immediately even if no events are available. Capped at 30000ms. Ephemeral events that arrive during the wait are delivered in this batch but are NOT replayable on a subsequent read (use a non-zero waitMs in your next call to capture future ephemerals as they happen). This applies to forward reads only: a backward read always returns immediately and ignores `waitMs`, because backward paging covers persisted history only while new events append at the tail (the opposite end from a backward page), so no blocking or ephemeral delivery can occur.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("waitMs")]
+    public TimeSpan? Wait { get; set; }
 }
 
-/// <summary>The client's response to the pending permission prompt.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Snapshot of the current tail cursor without returning any events. Use this when a consumer wants to subscribe to live events going forward without first paginating through the entire persisted history (which would happen if `read` were called without a cursor on a long-lived session).</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(PermissionDecisionApproveOnce), "approve-once")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSession), "approve-for-session")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocation), "approve-for-location")]
-[JsonDerivedType(typeof(PermissionDecisionApprovePermanently), "approve-permanently")]
-[JsonDerivedType(typeof(PermissionDecisionReject), "reject")]
-[JsonDerivedType(typeof(PermissionDecisionUserNotAvailable), "user-not-available")]
-[JsonDerivedType(typeof(PermissionDecisionApproved), "approved")]
-[JsonDerivedType(typeof(PermissionDecisionApprovedForSession), "approved-for-session")]
-[JsonDerivedType(typeof(PermissionDecisionApprovedForLocation), "approved-for-location")]
-[JsonDerivedType(typeof(PermissionDecisionCancelled), "cancelled")]
-[JsonDerivedType(typeof(PermissionDecisionDeniedByRules), "denied-by-rules")]
-[JsonDerivedType(typeof(PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser), "denied-no-approval-rule-and-could-not-request-from-user")]
-[JsonDerivedType(typeof(PermissionDecisionDeniedInteractivelyByUser), "denied-interactively-by-user")]
-[JsonDerivedType(typeof(PermissionDecisionDeniedByContentExclusionPolicy), "denied-by-content-exclusion-policy")]
-[JsonDerivedType(typeof(PermissionDecisionDeniedByPermissionRequestHook), "denied-by-permission-request-hook")]
-public partial class PermissionDecision
+public sealed class EventLogTailResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <summary>Opaque cursor pointing at the current tail of the session's persisted-events history. Pass back to `read` to receive only events that arrive AFTER this snapshot. When the session has no events, this returns the same sentinel as an unset cursor (i.e. equivalent to omitting the cursor on a first read).</summary>
+    [JsonPropertyName("cursor")]
+    public string Cursor { get; set; } = string.Empty;
 }
 
-
-/// <summary>Permission-decision request variant to approve only the current permission request.</summary>
-/// <remarks>The <c>approve-once</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveOnce : PermissionDecision
+internal sealed class SessionEventLogTailRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approve-once";
-
-    /// <summary>True only when a host surfaced this request to a user who approved it.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("approvedInteractively")]
-    public bool? ApprovedInteractively { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Session-scoped approval to remember (tool prompts only; omitted for path/url prompts).</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Opaque handle representing an event-type interest registration.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalCommands), "commands")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalRead), "read")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalWrite), "write")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalMcp), "mcp")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalMcpSampling), "mcp-sampling")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalMemory), "memory")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalCustomTool), "custom-tool")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalExtensionManagement), "extension-management")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalFactory), "factory")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess), "extension-permission-access")]
-public partial class PermissionDecisionApproveForSessionApproval
+public sealed class RegisterEventInterestResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <summary>Opaque handle for this registration. Pass to releaseInterest to release. Each call to registerInterest produces a fresh handle, even when the same eventType is registered multiple times.</summary>
+    [JsonPropertyName("handle")]
+    public string Handle { get; set; } = string.Empty;
 }
 
-
-/// <summary>Session-scoped approval details for specific command identifiers.</summary>
-/// <remarks>The <c>commands</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+/// <summary>Event type to register consumer interest for, used by runtime gating logic.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalCommands : PermissionDecisionApproveForSessionApproval
+internal sealed class RegisterEventInterestParams
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "commands";
-
-    /// <summary>Command identifiers covered by this approval.</summary>
-    [JsonPropertyName("commandIdentifiers")]
-    public required IList<string> CommandIdentifiers { get; set; }
-}
+    /// <summary>The event type the consumer wants the runtime to treat as 'observed' for behavior-switching gating. Some runtime code paths inspect whether any consumer is interested in a specific event type and choose a different implementation accordingly (e.g. `mcp.oauth_required`: when interest is registered the runtime delegates interactive OAuth token acquisition to the consumer via `mcp.oauth_required` events; when no interest is registered the runtime still attempts non-interactive reconnect from cached or refreshable tokens, and only marks the server `needs-auth` if usable credentials are unavailable — it does not open a browser or start interactive OAuth without a consumer). SDK clients that long-poll events do NOT automatically appear as listeners to these gating checks — they must explicitly call `registerInterest` for each event type they want the runtime to count as having a consumer. Multiple registrations for the same event type from the same or different consumers are tracked independently and must each be released. See: `mcp.oauth_required`, `sampling.requested`, `auto_mode_switch.requested`, `session_limits_exhausted.requested`, `user_input.requested`, `elicitation.requested`, `command.queued`, `exit_plan_mode.requested`.</summary>
+    [JsonPropertyName("eventType")]
+    public string EventType { get; set; } = string.Empty;
 
-/// <summary>Session-scoped approval details for read-only filesystem operations.</summary>
-/// <remarks>The <c>read</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalRead : PermissionDecisionApproveForSessionApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "read";
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Session-scoped approval details for filesystem write operations.</summary>
-/// <remarks>The <c>write</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalWrite : PermissionDecisionApproveForSessionApproval
+public sealed class EventLogReleaseInterestResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "write";
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Session-scoped approval details for an MCP server tool, or all tools on the server when `toolName` is null.</summary>
-/// <remarks>The <c>mcp</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+/// <summary>Opaque handle previously returned by `registerInterest` to release.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalMcp : PermissionDecisionApproveForSessionApproval
+internal sealed class ReleaseEventInterestParams
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp";
-
-    /// <summary>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
+    /// <summary>Handle returned by a previous `registerInterest` call. Idempotent: releasing an unknown or already-released handle is a no-op (returns success). When the last outstanding handle for an event type is released, the runtime reverts to its 'no consumer' code path for that event type.</summary>
+    [JsonPropertyName("handle")]
+    public string Handle { get; set; } = string.Empty;
 
-    /// <summary>MCP tool name, or null to cover every tool on the server.</summary>
-    [JsonPropertyName("toolName")]
-    public string? ToolName { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Session-scoped approval details for MCP sampling requests from a server.</summary>
-/// <remarks>The <c>mcp-sampling</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+/// <summary>Request count and cost metrics for this model.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalMcpSampling : PermissionDecisionApproveForSessionApproval
+public sealed class UsageMetricsModelMetricRequests
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp-sampling";
+    /// <summary>User-initiated premium request cost (with multiplier applied).</summary>
+    [JsonPropertyName("cost")]
+    public double Cost { get; set; }
 
-    /// <summary>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
+    /// <summary>Number of API requests made with this model.</summary>
+    [JsonPropertyName("count")]
+    public long Count { get; set; }
 }
 
-/// <summary>Session-scoped approval details for writes to long-term memory.</summary>
-/// <remarks>The <c>memory</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+/// <summary>Per-model token-detail entry containing the accumulated token count for one token type.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalMemory : PermissionDecisionApproveForSessionApproval
+public sealed class UsageMetricsModelMetricTokenDetail
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "memory";
+    /// <summary>Accumulated token count for this token type.</summary>
+    [JsonPropertyName("tokenCount")]
+    public long TokenCount { get; set; }
 }
 
-/// <summary>Session-scoped approval details for a custom tool, keyed by tool name.</summary>
-/// <remarks>The <c>custom-tool</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+/// <summary>Token usage metrics for this model.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalCustomTool : PermissionDecisionApproveForSessionApproval
+public sealed class UsageMetricsModelMetricUsage
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "custom-tool";
+    /// <summary>Total tokens read from prompt cache.</summary>
+    [JsonPropertyName("cacheReadTokens")]
+    public long CacheReadTokens { get; set; }
 
-    /// <summary>Custom tool name.</summary>
-    [JsonPropertyName("toolName")]
-    public required string ToolName { get; set; }
-}
+    /// <summary>Total tokens written to prompt cache.</summary>
+    [JsonPropertyName("cacheWriteTokens")]
+    public long CacheWriteTokens { get; set; }
 
-/// <summary>Session-scoped approval details for extension-management operations, optionally narrowed by operation.</summary>
-/// <remarks>The <c>extension-management</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalExtensionManagement : PermissionDecisionApproveForSessionApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-management";
+    /// <summary>Total input tokens consumed.</summary>
+    [JsonPropertyName("inputTokens")]
+    public long InputTokens { get; set; }
 
-    /// <summary>Optional operation identifier; when omitted, the approval covers all extension management operations.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("operation")]
-    public string? Operation { get; set; }
+    /// <summary>Total output tokens produced.</summary>
+    [JsonPropertyName("outputTokens")]
+    public long OutputTokens { get; set; }
+
+    /// <summary>Total output tokens used for reasoning.</summary>
+    [JsonPropertyName("reasoningTokens")]
+    public long? ReasoningTokens { get; set; }
 }
 
-/// <summary>Session-scoped factory approval, optionally narrowed by approval key.</summary>
-/// <remarks>The <c>factory</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+/// <summary>Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalFactory : PermissionDecisionApproveForSessionApproval
+public sealed class UsageMetricsModelMetric
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "factory";
+    /// <summary>Latest known prompt-cache expiration for this model. A timestamp in the past indicates that the observed cache has expired.</summary>
+    [JsonPropertyName("cacheExpiresAt")]
+    public DateTimeOffset? CacheExpiresAt { get; set; }
 
-    /// <summary>Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("approvalKey")]
-    public string? ApprovalKey { get; set; }
-}
+    /// <summary>Request count and cost metrics for this model.</summary>
+    [JsonPropertyName("requests")]
+    public UsageMetricsModelMetricRequests Requests { get => field ??= new(); set; }
 
-/// <summary>Session-scoped approval details for an extension's permission-gated capability access, keyed by extension name.</summary>
-/// <remarks>The <c>extension-permission-access</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess : PermissionDecisionApproveForSessionApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-permission-access";
+    /// <summary>Token count details per type.</summary>
+    [JsonPropertyName("tokenDetails")]
+    public IDictionary<string, UsageMetricsModelMetricTokenDetail>? TokenDetails { get; set; }
 
-    /// <summary>Extension name.</summary>
-    [JsonPropertyName("extensionName")]
-    public required string ExtensionName { get; set; }
+    /// <summary>Accumulated nano-AI units cost for this model.</summary>
+    [JsonPropertyName("totalNanoAiu")]
+    public double? TotalNanoAiu { get; set; }
+
+    /// <summary>Token usage metrics for this model.</summary>
+    [JsonPropertyName("usage")]
+    public UsageMetricsModelMetricUsage Usage { get => field ??= new(); set; }
 }
 
-/// <summary>Permission-decision request variant to approve for the rest of the session, with optional tool approval or URL domain.</summary>
-/// <remarks>The <c>approve-for-session</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSession : PermissionDecision
+public sealed class UsageMetricsAgentMetric
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approve-for-session";
+    /// <summary>Human-readable label for this subagent invocation, copied from the originating `subagent.started` event. For task-tool subagents this is the invocation's task description rather than the agent's configured display name, so group by `agentName` for stable per-agent labels.</summary>
+    [JsonPropertyName("agentDisplayName")]
+    public string? AgentDisplayName { get; set; }
 
-    /// <summary>Session-scoped approval to remember (tool prompts only; omitted for path/url prompts).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("approval")]
-    public PermissionDecisionApproveForSessionApproval? Approval { get; set; }
+    /// <summary>Configured agent name, when this is a subagent.</summary>
+    [JsonPropertyName("agentName")]
+    public string? AgentName { get; set; }
 
-    /// <summary>URL domain to approve for the rest of the session (URL prompts only).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("domain")]
-    public string? Domain { get; set; }
+    /// <summary>Per-model usage for this agent, keyed by model identifier.</summary>
+    [JsonPropertyName("modelMetrics")]
+    public IDictionary<string, UsageMetricsModelMetric> ModelMetrics { get => field ??= new Dictionary<string, UsageMetricsModelMetric>(); set; }
+
+    /// <summary>Time spent in model API calls by this agent, in milliseconds.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("totalApiDurationMs")]
+    public TimeSpan TotalApiDuration { get; set; }
+
+    /// <summary>Accumulated nano-AI units cost for this agent.</summary>
+    [JsonPropertyName("totalNanoAiu")]
+    public double TotalNanoAiu { get; set; }
 }
 
-/// <summary>Approval to persist for this location.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Aggregated code change metrics.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalCommands), "commands")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalRead), "read")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalWrite), "write")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalMcp), "mcp")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalMcpSampling), "mcp-sampling")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalMemory), "memory")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalCustomTool), "custom-tool")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalExtensionManagement), "extension-management")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalFactory), "factory")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess), "extension-permission-access")]
-public partial class PermissionDecisionApproveForLocationApproval
+public sealed class UsageMetricsCodeChanges
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Distinct file paths modified during the session.</summary>
+    [JsonPropertyName("filesModified")]
+    public IList<string> FilesModified { get => field ??= []; set; }
 
+    /// <summary>Number of distinct files modified.</summary>
+    [JsonPropertyName("filesModifiedCount")]
+    public long FilesModifiedCount { get; set; }
 
-/// <summary>Location-scoped approval details for specific command identifiers.</summary>
-/// <remarks>The <c>commands</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalCommands : PermissionDecisionApproveForLocationApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "commands";
+    /// <summary>Total lines of code added.</summary>
+    [JsonPropertyName("linesAdded")]
+    public long LinesAdded { get; set; }
 
-    /// <summary>Command identifiers covered by this approval.</summary>
-    [JsonPropertyName("commandIdentifiers")]
-    public required IList<string> CommandIdentifiers { get; set; }
+    /// <summary>Total lines of code removed.</summary>
+    [JsonPropertyName("linesRemoved")]
+    public long LinesRemoved { get; set; }
 }
 
-/// <summary>Location-scoped approval details for read-only filesystem operations.</summary>
-/// <remarks>The <c>read</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+/// <summary>Session-wide token-detail entry containing the accumulated token count for one token type.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalRead : PermissionDecisionApproveForLocationApproval
+public sealed class UsageMetricsTokenDetail
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "read";
+    /// <summary>Accumulated token count for this token type.</summary>
+    [JsonPropertyName("tokenCount")]
+    public long TokenCount { get; set; }
 }
 
-/// <summary>Location-scoped approval details for filesystem write operations.</summary>
-/// <remarks>The <c>write</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+/// <summary>Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalWrite : PermissionDecisionApproveForLocationApproval
+public sealed class UsageGetMetricsResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "write";
-}
+    /// <summary>Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`.</summary>
+    [JsonPropertyName("agentMetrics")]
+    public IDictionary<string, UsageMetricsAgentMetric>? AgentMetrics { get; set; }
 
-/// <summary>Location-scoped approval details for an MCP server tool, or all tools on the server when `toolName` is null.</summary>
-/// <remarks>The <c>mcp</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalMcp : PermissionDecisionApproveForLocationApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp";
+    /// <summary>Aggregated code change metrics.</summary>
+    [JsonPropertyName("codeChanges")]
+    public UsageMetricsCodeChanges CodeChanges { get => field ??= new(); set; }
 
-    /// <summary>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
+    /// <summary>Currently active model identifier.</summary>
+    [JsonPropertyName("currentModel")]
+    public string? CurrentModel { get; set; }
 
-    /// <summary>MCP tool name, or null to cover every tool on the server.</summary>
-    [JsonPropertyName("toolName")]
-    public string? ToolName { get; set; }
-}
+    /// <summary>Input tokens from the most recent main-agent API call.</summary>
+    [JsonPropertyName("lastCallInputTokens")]
+    public long LastCallInputTokens { get; set; }
 
-/// <summary>Location-scoped approval details for MCP sampling requests from a server.</summary>
-/// <remarks>The <c>mcp-sampling</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalMcpSampling : PermissionDecisionApproveForLocationApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp-sampling";
+    /// <summary>Output tokens from the most recent main-agent API call.</summary>
+    [JsonPropertyName("lastCallOutputTokens")]
+    public long LastCallOutputTokens { get; set; }
 
-    /// <summary>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
+    /// <summary>Per-model token and request metrics, keyed by model identifier.</summary>
+    [JsonPropertyName("modelMetrics")]
+    public IDictionary<string, UsageMetricsModelMetric> ModelMetrics { get => field ??= new Dictionary<string, UsageMetricsModelMetric>(); set; }
+
+    /// <summary>ISO 8601 timestamp when the session started.</summary>
+    [JsonPropertyName("sessionStartTime")]
+    public DateTimeOffset SessionStartTime { get; set; }
+
+    /// <summary>Session-wide per-token-type accumulated token counts.</summary>
+    [JsonPropertyName("tokenDetails")]
+    public IDictionary<string, UsageMetricsTokenDetail>? TokenDetails { get; set; }
+
+    /// <summary>Total time spent in model API calls (milliseconds).</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("totalApiDurationMs")]
+    public TimeSpan TotalApiDuration { get; set; }
+
+    /// <summary>Session-wide accumulated nano-AI units cost.</summary>
+    [JsonPropertyName("totalNanoAiu")]
+    public double? TotalNanoAiu { get; set; }
+
+    /// <summary>Total user-initiated premium request cost across all models (may be fractional due to multipliers).</summary>
+    [JsonPropertyName("totalPremiumRequestCost")]
+    public double TotalPremiumRequestCost { get; set; }
+
+    /// <summary>Raw count of user-initiated API requests.</summary>
+    [JsonPropertyName("totalUserRequests")]
+    public long TotalUserRequests { get; set; }
 }
 
-/// <summary>Location-scoped approval details for writes to long-term memory.</summary>
-/// <remarks>The <c>memory</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalMemory : PermissionDecisionApproveForLocationApproval
+internal sealed class SessionUsageGetMetricsRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "memory";
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Location-scoped approval details for a custom tool, keyed by tool name.</summary>
-/// <remarks>The <c>custom-tool</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+/// <summary>Prediction result. Available results include prediction details; unavailable results include an explicit reason.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalCustomTool : PermissionDecisionApproveForLocationApproval
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SessionLimitPredictionResultAvailable), "available")]
+[JsonDerivedType(typeof(SessionLimitPredictionResultUnavailable), "unavailable")]
+public partial class SessionLimitPredictionResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "custom-tool";
-
-    /// <summary>Custom tool name.</summary>
-    [JsonPropertyName("toolName")]
-    public required string ToolName { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Location-scoped approval details for extension-management operations, optionally narrowed by operation.</summary>
-/// <remarks>The <c>extension-management</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+
+/// <summary>Baseline data provenance for a prediction.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalExtensionManagement : PermissionDecisionApproveForLocationApproval
+public sealed class SessionLimitPredictionBaselineData
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-management";
+    /// <summary>End of the baseline data slice.</summary>
+    [JsonPropertyName("windowEnd")]
+    public string WindowEnd { get; set; } = string.Empty;
 
-    /// <summary>Optional operation identifier; when omitted, the approval covers all extension management operations.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("operation")]
-    public string? Operation { get; set; }
+    /// <summary>Start of the baseline data slice.</summary>
+    [JsonPropertyName("windowStart")]
+    public string WindowStart { get; set; } = string.Empty;
 }
 
-/// <summary>Location-scoped factory approval, optionally narrowed by approval key.</summary>
-/// <remarks>The <c>factory</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+/// <summary>Semantic usage tier and its AI-credit cap.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalFactory : PermissionDecisionApproveForLocationApproval
+public sealed class SessionLimitPredictionTierOption
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "factory";
+    /// <summary>AI-credit cap for this tier.</summary>
+    [JsonPropertyName("cap")]
+    public double Cap { get; set; }
 
-    /// <summary>Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("approvalKey")]
-    public string? ApprovalKey { get; set; }
+    /// <summary>Semantic usage tier.</summary>
+    [JsonPropertyName("tier")]
+    public SessionLimitPredictionTier Tier { get; set; }
 }
 
-/// <summary>Location-scoped approval details for an extension's permission-gated capability access, keyed by extension name.</summary>
-/// <remarks>The <c>extension-permission-access</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+/// <summary>Explainable AI-credit session-limit prediction.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess : PermissionDecisionApproveForLocationApproval
+public sealed class SessionLimitPredictionDetails
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-permission-access";
+    /// <summary>Baseline data provenance.</summary>
+    [JsonPropertyName("baselineData")]
+    public SessionLimitPredictionBaselineData BaselineData { get => field ??= new(); set; }
 
-    /// <summary>Extension name.</summary>
-    [JsonPropertyName("extensionName")]
-    public required string ExtensionName { get; set; }
-}
+    /// <summary>Client population used for the prediction.</summary>
+    [JsonPropertyName("clientType")]
+    public SessionLimitPredictionClientType ClientType { get; set; }
+
+    /// <summary>Resolved model family when known.</summary>
+    [JsonPropertyName("family")]
+    public string? Family { get; set; }
+
+    /// <summary>Model identifier used for lookup.</summary>
+    [JsonPropertyName("modelId")]
+    public string ModelId { get; set; } = string.Empty;
+
+    /// <summary>Recommended maximum AI credits for this session.</summary>
+    [JsonPropertyName("recommendedCap")]
+    public double RecommendedCap { get; set; }
 
-/// <summary>Permission-decision request variant to approve and persist a permission for a project location, with approval details and location key.</summary>
-/// <remarks>The <c>approve-for-location</c> variant of <see cref="PermissionDecision"/>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocation : PermissionDecision
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approve-for-location";
+    /// <summary>Tier chosen as the recommended cap.</summary>
+    [JsonPropertyName("recommendedTier")]
+    public SessionLimitPredictionTier RecommendedTier { get; set; }
 
-    /// <summary>Approval to persist for this location.</summary>
-    [JsonPropertyName("approval")]
-    public required PermissionDecisionApproveForLocationApproval Approval { get; set; }
+    /// <summary>Baseline fallback level used to create the prediction.</summary>
+    [JsonPropertyName("source")]
+    public SessionLimitPredictionSource Source { get; set; }
 
-    /// <summary>Location key (git root or cwd) to persist the approval to.</summary>
-    [JsonPropertyName("locationKey")]
-    public required string LocationKey { get; set; }
+    /// <summary>Key matched at the source level, such as a model id, family id, or `global`.</summary>
+    [JsonPropertyName("sourceKey")]
+    public string SourceKey { get; set; } = string.Empty;
+
+    /// <summary>Ordered usage tiers and their AI-credit caps.</summary>
+    [JsonPropertyName("tiers")]
+    public IList<SessionLimitPredictionTierOption> Tiers { get => field ??= []; set; }
 }
 
-/// <summary>Permission-decision request variant to permanently approve a URL domain across sessions.</summary>
-/// <remarks>The <c>approve-permanently</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>The <c>available</c> variant of <see cref="SessionLimitPredictionResult"/>.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApprovePermanently : PermissionDecision
+public partial class SessionLimitPredictionResultAvailable : SessionLimitPredictionResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "approve-permanently";
+    public override string Kind => "available";
 
-    /// <summary>URL domain to approve permanently.</summary>
-    [JsonPropertyName("domain")]
-    public required string Domain { get; set; }
+    /// <summary>Predicted session limit details.</summary>
+    [JsonPropertyName("prediction")]
+    public required SessionLimitPredictionDetails Prediction { get; set; }
 }
 
-/// <summary>Permission-decision request variant to reject a pending permission request, with optional feedback.</summary>
-/// <remarks>The <c>reject</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>The <c>unavailable</c> variant of <see cref="SessionLimitPredictionResult"/>.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionReject : PermissionDecision
+public partial class SessionLimitPredictionResultUnavailable : SessionLimitPredictionResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "reject";
+    public override string Kind => "unavailable";
 
-    /// <summary>Optional feedback explaining the rejection.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("feedback")]
-    public string? Feedback { get; set; }
+    /// <summary>Reason no prediction is available.</summary>
+    [JsonPropertyName("reason")]
+    public required SessionLimitPredictionUnavailableReason Reason { get; set; }
 }
 
-/// <summary>Permission-decision variant indicating no user was available to confirm the request.</summary>
-/// <remarks>The <c>user-not-available</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>RPC data type for SessionLimitPredictionPredict operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionUserNotAvailable : PermissionDecision
+public sealed class SessionLimitPredictionPredictRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "user-not-available";
+    /// <summary>Client type to size for. Defaults to `cli-interactive`.</summary>
+    [JsonPropertyName("clientType")]
+    public SessionLimitPredictionClientType? ClientType { get; set; }
+
+    /// <summary>Optional model identifier override. If omitted, the session's current model is used.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
 }
 
-/// <summary>Permission-decision variant indicating the request was approved.</summary>
-/// <remarks>The <c>approved</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>RPC data type for SessionLimitPredictionPredictRequestWithSession operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApproved : PermissionDecision
+internal sealed class SessionLimitPredictionPredictRequestWithSession
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approved";
+    /// <summary>Client type to size for. Defaults to `cli-interactive`.</summary>
+    [JsonPropertyName("clientType")]
+    public SessionLimitPredictionClientType? ClientType { get; set; }
+
+    /// <summary>Optional model identifier override. If omitted, the session's current model is used.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Permission-decision variant indicating approval was remembered for the session, with approval details.</summary>
-/// <remarks>The <c>approved-for-session</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>GitHub URL for the session and a flag indicating whether remote steering is enabled.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApprovedForSession : PermissionDecision
+public sealed class RemoteEnableResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approved-for-session";
+    /// <summary>Whether remote steering is enabled.</summary>
+    [JsonPropertyName("remoteSteerable")]
+    public bool RemoteSteerable { get; set; }
 
-    /// <summary>The approval to add as a session-scoped rule.</summary>
-    [JsonPropertyName("approval")]
-    public required UserToolSessionApproval Approval { get; set; }
+    /// <summary>GitHub frontend URL for this session.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <summary>Permission-decision variant indicating approval was persisted for a project location, with approval details and location key.</summary>
-/// <remarks>The <c>approved-for-location</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>Optional remote session mode ("off", "export", or "on"); defaults to enabling both export and remote steering.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionApprovedForLocation : PermissionDecision
+internal sealed class RemoteEnableRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approved-for-location";
-
-    /// <summary>The approval to persist for this location.</summary>
-    [JsonPropertyName("approval")]
-    public required UserToolSessionApproval Approval { get; set; }
+    /// <summary>Per-session remote mode. "off" disables remote, "export" exports session events to GitHub without enabling remote steering, "on" enables both export and remote steering.</summary>
+    [JsonPropertyName("mode")]
+    public RemoteSessionMode? Mode { get; set; }
 
-    /// <summary>The location key (git root or cwd) to persist the approval to.</summary>
-    [JsonPropertyName("locationKey")]
-    public required string LocationKey { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Permission-decision variant indicating the request was cancelled before use, with an optional reason.</summary>
-/// <remarks>The <c>cancelled</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionCancelled : PermissionDecision
+internal sealed class SessionRemoteDisableRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "cancelled";
-
-    /// <summary>Optional explanation of why the request was cancelled.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Permission-decision variant indicating explicit denial by permission rules, with the matching rules.</summary>
-/// <remarks>The <c>denied-by-rules</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>Persist a steerability change as a `session.remote_steerable_changed` event. Used by the host (CLI / SDK consumer) when it has just finished enabling or disabling steering on a remote exporter that the runtime does not directly own.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedByRules : PermissionDecision
+public sealed class RemoteNotifySteerableChangedResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "denied-by-rules";
-
-    /// <summary>Rules that denied the request.</summary>
-    [JsonPropertyName("rules")]
-    public required IList<PermissionRule> Rules { get; set; }
 }
 
-/// <summary>Permission-decision variant indicating no approval rule matched and user confirmation was unavailable.</summary>
-/// <remarks>The <c>denied-no-approval-rule-and-could-not-request-from-user</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>New remote-steerability state to persist as a `session.remote_steerable_changed` event.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser : PermissionDecision
+internal sealed class RemoteNotifySteerableChangedRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "denied-no-approval-rule-and-could-not-request-from-user";
+    /// <summary>Whether the session now supports remote steering via GitHub. The runtime persists this as a `session.remote_steerable_changed` event so resume/replay sees the up-to-date capability.</summary>
+    [JsonPropertyName("remoteSteerable")]
+    public bool RemoteSteerable { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Permission-decision variant indicating the user denied an interactive prompt, with optional feedback and force-reject flag.</summary>
-/// <remarks>The <c>denied-interactively-by-user</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>Current sharing status and shareable GitHub URL for a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedInteractivelyByUser : PermissionDecision
+public sealed class VisibilityGetResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "denied-interactively-by-user";
+    /// <summary>Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("shareUrl")]
+    public string? ShareUrl { get; set; }
 
-    /// <summary>Optional feedback from the user explaining the denial.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("feedback")]
-    public string? Feedback { get; set; }
+    /// <summary>Current sharing status. Absent when the session is not synced or the status could not be retrieved (e.g. the user is not authenticated).</summary>
+    [JsonPropertyName("status")]
+    public SessionVisibilityStatus? Status { get; set; }
 
-    /// <summary>Whether to force-reject the current agent turn.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("forceReject")]
-    public bool? ForceReject { get; set; }
+    /// <summary>Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the session cannot be shared and `status`/`shareUrl` are absent.</summary>
+    [JsonPropertyName("synced")]
+    public bool Synced { get; set; }
 }
 
-/// <summary>Permission-decision variant indicating denial by content-exclusion policy, with path and message.</summary>
-/// <remarks>The <c>denied-by-content-exclusion-policy</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedByContentExclusionPolicy : PermissionDecision
+internal sealed class SessionVisibilityGetRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "denied-by-content-exclusion-policy";
-
-    /// <summary>Human-readable explanation of why the path was excluded.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
-
-    /// <summary>File path that triggered the exclusion.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Permission-decision variant indicating denial by a permission request hook, with optional message and interrupt flag.</summary>
-/// <remarks>The <c>denied-by-permission-request-hook</c> variant of <see cref="PermissionDecision"/>.</remarks>
+/// <summary>Effective sharing status and shareable GitHub URL after updating session visibility.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedByPermissionRequestHook : PermissionDecision
+public sealed class VisibilitySetResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "denied-by-permission-request-hook";
+    /// <summary>Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("shareUrl")]
+    public string? ShareUrl { get; set; }
 
-    /// <summary>Whether to interrupt the current agent turn.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("interrupt")]
-    public bool? Interrupt { get; set; }
+    /// <summary>Effective sharing status after the update. May differ from the requested status for task types that are already visible to repository readers by default. Absent when the update could not be applied (e.g. the session is not synced or the user is not authenticated).</summary>
+    [JsonPropertyName("status")]
+    public SessionVisibilityStatus? Status { get; set; }
 
-    /// <summary>Optional message from the hook explaining the denial.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
+    /// <summary>Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the visibility change could not be applied and `status`/`shareUrl` are absent.</summary>
+    [JsonPropertyName("synced")]
+    public bool Synced { get; set; }
 }
 
-/// <summary>Pending permission request ID and the decision to apply (approve/reject and scope).</summary>
+/// <summary>Desired sharing status for the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionDecisionRequest
+internal sealed class VisibilitySetRequest
 {
-    /// <summary>Request ID of the pending permission request.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
-
-    /// <summary>The client's response to the pending permission prompt.</summary>
-    [JsonPropertyName("result")]
-    public PermissionDecision Result { get => field ??= new(); set; }
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Sharing status to apply. "repo" makes the session visible to repository readers; "unshared" restricts it to the creator and collaborators.</summary>
+    [JsonPropertyName("status")]
+    public SessionVisibilityStatus Status { get; set; }
 }
 
-/// <summary>Pending permission prompt reconstructed from event history, with request ID and user-facing prompt details.</summary>
+/// <summary>Scheduled prompt entry with ID, timing (`intervalMs`, `cron`, or `at`), prompt text, recurrence, and next run time.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PendingPermissionRequest
+public sealed class ScheduleEntry
 {
-    /// <summary>The user-facing permission prompt details (commands, write, read, mcp, url, memory, custom-tool, path, hook).</summary>
-    [JsonPropertyName("request")]
-    public PermissionPromptRequest Request { get; set; } = null!;
+    /// <summary>Absolute fire time (epoch milliseconds) for a one-shot calendar schedule.</summary>
+    [JsonPropertyName("at")]
+    public long? At { get; set; }
 
-    /// <summary>Unique identifier for the pending permission request.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>5-field cron expression for a recurring calendar schedule, evaluated in `tz`.</summary>
+    [JsonPropertyName("cron")]
+    public string? Cron { get; set; }
+
+    /// <summary>Display-only label for the prompt as shown in the UI (e.g. `/skill-name` for a skill-invocation schedule). The actual enqueued prompt is `prompt`.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
+
+    /// <summary>Sequential id assigned by the runtime within the session. Stable across resumes (rebuilt from the event log).</summary>
+    [JsonPropertyName("id")]
+    public long Id { get; set; }
+
+    /// <summary>Interval between scheduled ticks, in milliseconds (relative-interval schedules).</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("intervalMs")]
+    public TimeSpan? Interval { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the next tick is scheduled to fire.</summary>
+    [JsonPropertyName("nextRunAt")]
+    public DateTimeOffset NextRunAt { get; set; }
+
+    /// <summary>Prompt text that gets enqueued on every tick.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
+
+    /// <summary>Whether the schedule re-arms after each tick (`/every`) or fires once (`/after`).</summary>
+    [JsonPropertyName("recurring")]
+    public bool Recurring { get; set; }
+
+    /// <summary>True for a self-paced (`dynamic`) schedule: no fixed cadence; the model arms each next run via the `manage_schedule` `wakeup` action. `nextRunAt` is model-controlled.</summary>
+    [JsonPropertyName("selfPaced")]
+    public bool? SelfPaced { get; set; }
+
+    /// <summary>IANA timezone the `cron` expression is evaluated in.</summary>
+    [JsonPropertyName("tz")]
+    public string? Tz { get; set; }
 }
 
-/// <summary>List of pending permission requests reconstructed from event history.</summary>
+/// <summary>Snapshot of the currently active recurring prompts for this session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PendingPermissionRequestList
+public sealed class ScheduleList
 {
-    /// <summary>Pending permission prompts reconstructed from the session's event history. Equivalent to the set of `permission.requested` events that have not yet been followed by a matching `permission.completed` event. Used by clients (e.g. the CLI) to hydrate UI for prompts that were emitted before the client attached to the session.</summary>
-    [JsonPropertyName("items")]
-    public IList<PendingPermissionRequest> Items { get => field ??= []; set; }
+    /// <summary>Active scheduled prompts, ordered by id.</summary>
+    [JsonPropertyName("entries")]
+    public IList<ScheduleEntry> Entries { get => field ??= []; set; }
 }
 
-/// <summary>No parameters; returns currently-pending permission requests for the session.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionsPendingRequestsRequest
+internal sealed class SessionScheduleListRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsSetApproveAllResult
+internal sealed class SessionScheduleHydrateRequest
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Allow-all toggle for tool permission requests, with an optional telemetry source.</summary>
+/// <summary>Whether the session currently has an active self-paced schedule.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionsSetApproveAllRequest
+internal sealed class ScheduleHasSelfPacedResult
 {
-    /// <summary>Whether to auto-approve all tool permission requests.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>True when at least one active schedule is self-paced.</summary>
+    [JsonPropertyName("hasSelfPaced")]
+    public bool HasSelfPaced { get; set; }
+}
 
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionScheduleHasSelfPacedRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.</summary>
-    [JsonPropertyName("source")]
-    public PermissionsSetApproveAllSource? Source { get; set; }
 }
 
-/// <summary>Indicates whether the operation succeeded and reports the post-mutation state.</summary>
+/// <summary>Result of registering or re-arming a scheduled prompt.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AllowAllPermissionSetResult
+internal sealed class ScheduleAddResult
 {
-    /// <summary>Authoritative full allow-all state after the mutation.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Authoritative allow-all mode after the mutation.</summary>
-    [JsonPropertyName("mode")]
-    public PermissionsAllowAllMode? Mode { get; set; }
+    /// <summary>The registered or updated schedule entry.</summary>
+    [JsonPropertyName("entry")]
+    public ScheduleEntry? Entry { get; set; }
 
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>User-facing validation error, when registration failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 }
 
-/// <summary>Allow-all mode to apply for the session.</summary>
+/// <summary>Register a relative-interval scheduled prompt.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionsSetAllowAllRequest
+internal sealed class ScheduleAddRequest
 {
-    /// <summary>Legacy full allow-all toggle. Prefer `mode`; when `mode` is omitted, `enabled: true` is treated as `mode: "on"` and any other value is treated as `mode: "off"`.</summary>
-    [JsonPropertyName("enabled")]
-    public bool? Enabled { get; set; }
+    /// <summary>Optional display-only prompt label.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-    /// <summary>Allow-all mode to apply. `on` enables full allow-all; `auto` enables advisory LLM auto-approval; `off` disables both.</summary>
-    [JsonPropertyName("mode")]
-    public PermissionsAllowAllMode? Mode { get; set; }
+    /// <summary>Human-readable interval such as `30s`, `5m`, or `2h`.</summary>
+    [JsonPropertyName("interval")]
+    public string Interval { get; set; } = string.Empty;
 
-    /// <summary>Optional model id for the `auto` mode auto-approval LLM judging. Only meaningful when `mode` is `auto`; ignored otherwise. When omitted, the session resolves a default judge model: `gpt-5.5` for CAPI sessions and the session's active model for BYOK sessions.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
+
+    /// <summary>Whether the schedule should re-arm after each tick. Defaults to true.</summary>
+    [JsonPropertyName("recurring")]
+    public bool? Recurring { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.</summary>
-    [JsonPropertyName("source")]
-    public PermissionsSetAllowAllSource? Source { get; set; }
 }
 
-/// <summary>Current allow-all permission mode.</summary>
+/// <summary>Register a cron scheduled prompt.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AllowAllPermissionState
+internal sealed class ScheduleAddCronRequest
 {
-    /// <summary>Whether full allow-all permissions are currently active.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>5-field cron expression.</summary>
+    [JsonPropertyName("cron")]
+    public string Cron { get; set; } = string.Empty;
 
-    /// <summary>Current allow-all mode.</summary>
-    [JsonPropertyName("mode")]
-    public PermissionsAllowAllMode? Mode { get; set; }
-}
+    /// <summary>Optional display-only prompt label.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
+
+    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
+
+    /// <summary>Whether the schedule should re-arm after each tick. Defaults to true.</summary>
+    [JsonPropertyName("recurring")]
+    public bool? Recurring { get; set; }
 
-/// <summary>No parameters.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionsGetAllowAllRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>Indicates whether the operation succeeded.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsModifyRulesResult
-{
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>IANA timezone for evaluating the cron expression.</summary>
+    [JsonPropertyName("tz")]
+    public string? Tz { get; set; }
 }
 
-/// <summary>Scope and add/remove instructions for modifying session- or location-scoped permission rules.</summary>
+/// <summary>Register an absolute-time scheduled prompt.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionsModifyRulesParams
+internal sealed class ScheduleAddAtRequest
 {
-    /// <summary>Rules to add to the scope. Applied before `remove`/`removeAll`.</summary>
-    [JsonPropertyName("add")]
-    public IList<PermissionRule>? Add { get; set; }
+    /// <summary>Epoch milliseconds when the prompt should fire.</summary>
+    [JsonPropertyName("at")]
+    public long At { get; set; }
 
-    /// <summary>Specific rules to remove from the scope. Ignored when `removeAll` is true.</summary>
-    [JsonPropertyName("remove")]
-    public IList<PermissionRule>? Remove { get; set; }
+    /// <summary>Optional display-only prompt label.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-    /// <summary>When true, removes every rule currently in the scope (after any `add` is applied). Useful for clearing the location scope wholesale.</summary>
-    [JsonPropertyName("removeAll")]
-    public bool? RemoveAll { get; set; }
+    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Whether the change applies to ephemeral session-scoped rules (cleared at session end) or to location-scoped rules persisted via the location-permissions config file.</summary>
-    [JsonPropertyName("scope")]
-    public PermissionsModifyRulesScope Scope { get; set; }
+    /// <summary>Whether the schedule should re-arm after each tick. Defaults to false.</summary>
+    [JsonPropertyName("recurring")]
+    public bool? Recurring { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Register a self-paced scheduled prompt.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsSetRequiredResult
+internal sealed class ScheduleAddSelfPacedRequest
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
-}
+    /// <summary>Optional display-only prompt label.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-/// <summary>Toggles whether permission prompts should be bridged into session events for this client.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionsSetRequiredRequest
-{
-    /// <summary>Whether the client wants `permission.requested` events bridged from the session-owned permission service. CLI clients that render prompt UI set this to `true` for as long as their listener is mounted; headless callers leave it unset (the default is `false`).</summary>
-    [JsonPropertyName("required")]
-    public bool Required { get; set; }
+    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Re-arm a self-paced scheduled prompt.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsResetSessionApprovalsResult
+internal sealed class ScheduleRearmSelfPacedRequest
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
-}
+    /// <summary>Epoch milliseconds when the prompt should next fire.</summary>
+    [JsonPropertyName("at")]
+    public long At { get; set; }
 
-/// <summary>Clears session-scoped tool permission approvals, and optionally the location-scoped ones.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionsResetSessionApprovalsRequest
-{
-    /// <summary>Whether location-scoped approvals are cleared too. Defaults to `true`.</summary>
-    [JsonPropertyName("includeLocation")]
-    public bool? IncludeLocation { get; set; }
+    /// <summary>Id of the self-paced scheduled prompt.</summary>
+    [JsonPropertyName("id")]
+    public long Id { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Remove a scheduled prompt by id. The result entry is omitted if the id was unknown.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsNotifyPromptShownResult
+public sealed class ScheduleStopResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>The removed entry, or omitted if no entry matched.</summary>
+    [JsonPropertyName("entry")]
+    public ScheduleEntry? Entry { get; set; }
 }
 
-/// <summary>Notification payload describing the permission prompt that the client just rendered.</summary>
+/// <summary>Identifier of the scheduled prompt to remove.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionPromptShownNotification
+internal sealed class ScheduleStopRequest
 {
-    /// <summary>Human-readable description of the prompt the user is being asked to approve. Used by the runtime to fire the registered `permission_prompt` notification hook (e.g. terminal bell, desktop notification).</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>Id of the scheduled prompt to remove.</summary>
+    [JsonPropertyName("id")]
+    public long Id { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Snapshot of the session's allow-listed directories and primary working directory.</summary>
+/// <summary>A bearer token supplied by the SDK client for a BYOK provider. The runtime sets it as `Authorization: Bearer &lt;token&gt;` on the outbound request and does no caching; the SDK consumer owns token caching and refresh.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionPathsList
+public sealed class ProviderTokenAcquireResult
 {
-    /// <summary>All directories currently allowed for tool access on this session.</summary>
-    [JsonPropertyName("directories")]
-    public IList<string> Directories { get => field ??= []; set; }
-
-    /// <summary>The primary working directory for this session.</summary>
-    [JsonPropertyName("primary")]
-    public string Primary { get; set; } = string.Empty;
+    /// <summary>The bearer token value (without the `Bearer ` prefix).</summary>
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
 }
 
-/// <summary>No parameters; returns the session's allow-listed directories.</summary>
+/// <summary>Asks the SDK client to acquire a bearer token for a BYOK provider whose config set `hasBearerTokenProvider: true`. Issued by the runtime before each outbound model request; the runtime does no caching, so this is sent once per request.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionsPathsListRequest
+public sealed class ProviderTokenAcquireRequest
 {
+    /// <summary>Name of the BYOK provider needing a token. For the legacy whole-session provider this is the implicit provider name; for named providers it is the configured provider name.</summary>
+    [JsonPropertyName("providerName")]
+    public string ProviderName { get; set; } = string.Empty;
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Result returned by an extension factory closure.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsPathsAddResult
+public sealed class FactoryExecuteResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Factory result value.</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
 }
 
-/// <summary>Directory path to add to the session's allowed directories.</summary>
+/// <summary>Parameters sent to the owning extension to execute a factory closure.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionPathsAddParams
+public sealed class FactoryExecuteRequest
 {
-    /// <summary>Directory to add to the allow-list. The runtime resolves and validates the path before adding.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Factory input value.</summary>
+    [JsonPropertyName("args")]
+    public JsonElement Args { get; set; }
+
+    /// <summary>Opaque token identifying this factory execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
+
+    /// <summary>Registered factory name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Parameters for cooperatively aborting a factory body.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsPathsUpdatePrimaryResult
+public sealed class FactoryAbortRequest
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Directory path to set as the session's new primary working directory.</summary>
+/// <summary>Describes a filesystem error.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionPathsUpdatePrimaryParams
+public sealed class SessionFsError
 {
-    /// <summary>Directory to set as the new primary working directory for the session's permission policy.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Error classification.</summary>
+    [JsonPropertyName("code")]
+    public SessionFsErrorCode Code { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Free-form detail about the error, for logging/diagnostics.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
 }
 
-/// <summary>Indicates whether the supplied path is within the session's allowed directories.</summary>
+/// <summary>File content as a UTF-8 string, or a filesystem error if the read failed.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionPathsAllowedCheckResult
+public sealed class SessionFsReadFileResult
 {
-    /// <summary>Whether the path is within the session's allowed directories.</summary>
-    [JsonPropertyName("allowed")]
-    public bool Allowed { get; set; }
+    /// <summary>File content as UTF-8 string.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
+
+    /// <summary>Describes a filesystem error.</summary>
+    [JsonPropertyName("error")]
+    public SessionFsError? Error { get; set; }
 }
 
-/// <summary>Path to evaluate against the session's allowed directories.</summary>
+/// <summary>Path of the file to read from the client-provided session filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionPathsAllowedCheckParams
+public sealed class SessionFsReadFileRequest
 {
-    /// <summary>Path to check against the session's allowed directories.</summary>
+    /// <summary>Path using SessionFs conventions.</summary>
     [JsonPropertyName("path")]
     public string Path { get; set; } = string.Empty;
 
@@ -11510,20 +17875,19 @@ internal sealed class PermissionPathsAllowedCheckParams
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the supplied path is within the session's workspace directory.</summary>
+/// <summary>File path, content to write, and optional mode for the client-provided session filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionPathsWorkspaceCheckResult
+public sealed class SessionFsWriteFileRequest
 {
-    /// <summary>Whether the path is within the session workspace directory.</summary>
-    [JsonPropertyName("allowed")]
-    public bool Allowed { get; set; }
-}
+    /// <summary>Content to write.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-/// <summary>Path to evaluate against the session's workspace (primary) directory.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionPathsWorkspaceCheckParams
-{
-    /// <summary>Path to check against the session workspace directory.</summary>
+    /// <summary>Optional POSIX-style mode for newly created files.</summary>
+    [JsonPropertyName("mode")]
+    public long? Mode { get; set; }
+
+    /// <summary>Path using SessionFs conventions.</summary>
     [JsonPropertyName("path")]
     public string Path { get; set; } = string.Empty;
 
@@ -11532,3648 +17896,3401 @@ internal sealed class PermissionPathsWorkspaceCheckParams
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Resolved location-permissions key and type.</summary>
+/// <summary>File path, content to append, and optional mode for the client-provided session filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionLocationResolveResult
+public sealed class SessionFsAppendFileRequest
 {
-    /// <summary>Location key used in the location-permissions store.</summary>
-    [JsonPropertyName("locationKey")]
-    public string LocationKey { get; set; } = string.Empty;
+    /// <summary>Content to append.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <summary>Whether the location is a git repo or directory.</summary>
-    [JsonPropertyName("locationType")]
-    public PermissionLocationType LocationType { get; set; }
-}
+    /// <summary>Optional POSIX-style mode for newly created files.</summary>
+    [JsonPropertyName("mode")]
+    public long? Mode { get; set; }
+
+    /// <summary>Path using SessionFs conventions.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-/// <summary>Working directory to resolve into a location-permissions key.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionLocationResolveParams
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Working directory whose permission location should be resolved.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string WorkingDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Summary of persisted location permissions applied to the session.</summary>
+/// <summary>Indicates whether the requested path exists in the client-provided session filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionLocationApplyResult
+public sealed class SessionFsExistsResult
 {
-    /// <summary>Number of persisted allowed directories added to the live path manager.</summary>
-    [JsonPropertyName("appliedDirectoryCount")]
-    public long AppliedDirectoryCount { get; set; }
-
-    /// <summary>Number of location-scoped rules added to the live permission service.</summary>
-    [JsonPropertyName("appliedRuleCount")]
-    public long AppliedRuleCount { get; set; }
-
-    /// <summary>Location-scoped rules applied to the live permission service.</summary>
-    [JsonPropertyName("appliedRules")]
-    public IList<PermissionRule> AppliedRules { get => field ??= []; set; }
-
-    /// <summary>Whether a different location was applied since the previous apply call.</summary>
-    [JsonPropertyName("changed")]
-    public bool Changed { get; set; }
-
-    /// <summary>Location key used in the location-permissions store.</summary>
-    [JsonPropertyName("locationKey")]
-    public string LocationKey { get; set; } = string.Empty;
-
-    /// <summary>Whether the location is a git repo or directory.</summary>
-    [JsonPropertyName("locationType")]
-    public PermissionLocationType LocationType { get; set; }
+    /// <summary>Whether the path exists.</summary>
+    [JsonPropertyName("exists")]
+    public bool Exists { get; set; }
 }
 
-/// <summary>Working directory to load persisted location permissions for.</summary>
+/// <summary>Path to test for existence in the client-provided session filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionLocationApplyParams
+public sealed class SessionFsExistsRequest
 {
+    /// <summary>Path using SessionFs conventions.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Working directory whose persisted location permissions should be applied.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string WorkingDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Filesystem metadata for the requested path, or a filesystem error if the stat failed.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsLocationsAddToolApprovalResult
+public sealed class SessionFsStatResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
-}
+    /// <summary>ISO 8601 timestamp of creation.</summary>
+    [JsonPropertyName("birthtime")]
+    public DateTimeOffset Birthtime { get; set; }
 
-/// <summary>Tool approval to persist and apply.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsCommands), "commands")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsRead), "read")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsWrite), "write")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsMcp), "mcp")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsMcpSampling), "mcp-sampling")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsMemory), "memory")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsCustomTool), "custom-tool")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsExtensionManagement), "extension-management")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsFactory), "factory")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess), "extension-permission-access")]
-public partial class PermissionsLocationsAddToolApprovalDetails
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Describes a filesystem error.</summary>
+    [JsonPropertyName("error")]
+    public SessionFsError? Error { get; set; }
+
+    /// <summary>Whether the path is a directory.</summary>
+    [JsonPropertyName("isDirectory")]
+    public bool IsDirectory { get; set; }
 
+    /// <summary>Whether the path is a file.</summary>
+    [JsonPropertyName("isFile")]
+    public bool IsFile { get; set; }
 
-/// <summary>Location-persisted tool approval details for specific command identifiers.</summary>
-/// <remarks>The <c>commands</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+    /// <summary>ISO 8601 timestamp of last modification.</summary>
+    [JsonPropertyName("mtime")]
+    public DateTimeOffset Mtime { get; set; }
+
+    /// <summary>File size in bytes.</summary>
+    [JsonPropertyName("size")]
+    public long Size { get; set; }
+}
+
+/// <summary>Path whose metadata should be returned from the client-provided session filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsCommands : PermissionsLocationsAddToolApprovalDetails
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "commands";
+public sealed class SessionFsStatRequest
+{
+    /// <summary>Path using SessionFs conventions.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Command identifiers covered by this approval.</summary>
-    [JsonPropertyName("commandIdentifiers")]
-    public required IList<string> CommandIdentifiers { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Location-persisted tool approval details for read-only filesystem operations.</summary>
-/// <remarks>The <c>read</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Directory path to create in the client-provided session filesystem, with options for recursive creation and POSIX mode.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsRead : PermissionsLocationsAddToolApprovalDetails
+public sealed class SessionFsMkdirRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "read";
+    /// <summary>Optional POSIX-style mode for newly created directories.</summary>
+    [JsonPropertyName("mode")]
+    public long? Mode { get; set; }
+
+    /// <summary>Path using SessionFs conventions.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Create parent directories as needed.</summary>
+    [JsonPropertyName("recursive")]
+    public bool? Recursive { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Location-persisted tool approval details for filesystem write operations.</summary>
-/// <remarks>The <c>write</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Names of entries in the requested directory, or a filesystem error if the read failed.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsWrite : PermissionsLocationsAddToolApprovalDetails
+public sealed class SessionFsReaddirResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "write";
+    /// <summary>Entry names in the directory.</summary>
+    [JsonPropertyName("entries")]
+    public IList<string> Entries { get => field ??= []; set; }
+
+    /// <summary>Describes a filesystem error.</summary>
+    [JsonPropertyName("error")]
+    public SessionFsError? Error { get; set; }
 }
 
-/// <summary>Location-persisted tool approval details for an MCP server tool, or all tools when `toolName` is null.</summary>
-/// <remarks>The <c>mcp</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Directory path whose entries should be listed from the client-provided session filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsMcp : PermissionsLocationsAddToolApprovalDetails
+public sealed class SessionFsReaddirRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp";
-
-    /// <summary>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
+    /// <summary>Path using SessionFs conventions.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>MCP tool name, or null to cover every tool on the server.</summary>
-    [JsonPropertyName("toolName")]
-    public string? ToolName { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Location-persisted tool approval details for MCP sampling requests from a server.</summary>
-/// <remarks>The <c>mcp-sampling</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Directory entry returned by session filesystem `readdirWithTypes`, with name and entry type.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsMcpSampling : PermissionsLocationsAddToolApprovalDetails
+public sealed class SessionFsReaddirWithTypesEntry
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp-sampling";
+    /// <summary>Entry name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
+    /// <summary>Entry type.</summary>
+    [JsonPropertyName("type")]
+    public SessionFsReaddirWithTypesEntryType Type { get; set; }
 }
 
-/// <summary>Location-persisted tool approval details for writes to long-term memory.</summary>
-/// <remarks>The <c>memory</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Entries in the requested directory paired with file/directory type information, or a filesystem error if the read failed.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsMemory : PermissionsLocationsAddToolApprovalDetails
+public sealed class SessionFsReaddirWithTypesResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "memory";
+    /// <summary>Directory entries with type information.</summary>
+    [JsonPropertyName("entries")]
+    public IList<SessionFsReaddirWithTypesEntry> Entries { get => field ??= []; set; }
+
+    /// <summary>Describes a filesystem error.</summary>
+    [JsonPropertyName("error")]
+    public SessionFsError? Error { get; set; }
 }
 
-/// <summary>Location-persisted tool approval details for a custom tool, keyed by tool name.</summary>
-/// <remarks>The <c>custom-tool</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Directory path whose entries (with type information) should be listed from the client-provided session filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsCustomTool : PermissionsLocationsAddToolApprovalDetails
+public sealed class SessionFsReaddirWithTypesRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "custom-tool";
+    /// <summary>Path using SessionFs conventions.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Custom tool name.</summary>
-    [JsonPropertyName("toolName")]
-    public required string ToolName { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Location-persisted tool approval details for extension-management operations, optionally narrowed by operation.</summary>
-/// <remarks>The <c>extension-management</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Path to remove from the client-provided session filesystem, with options for recursive removal and force.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsExtensionManagement : PermissionsLocationsAddToolApprovalDetails
+public sealed class SessionFsRmRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-management";
+    /// <summary>Ignore errors if the path does not exist.</summary>
+    [JsonPropertyName("force")]
+    public bool? Force { get; set; }
 
-    /// <summary>Optional operation identifier; when omitted, the approval covers all extension management operations.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("operation")]
-    public string? Operation { get; set; }
+    /// <summary>Path using SessionFs conventions.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Remove directories and their contents recursively.</summary>
+    [JsonPropertyName("recursive")]
+    public bool? Recursive { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Location-persisted factory approval, optionally narrowed by approval key.</summary>
-/// <remarks>The <c>factory</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Source and destination paths for renaming or moving an entry in the client-provided session filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsFactory : PermissionsLocationsAddToolApprovalDetails
+public sealed class SessionFsRenameRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "factory";
+    /// <summary>Destination path using SessionFs conventions.</summary>
+    [JsonPropertyName("dest")]
+    public string Dest { get; set; } = string.Empty;
 
-    /// <summary>Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("approvalKey")]
-    public string? ApprovalKey { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Source path using SessionFs conventions.</summary>
+    [JsonPropertyName("src")]
+    public string Src { get; set; } = string.Empty;
 }
 
-/// <summary>Location-persisted tool approval details for an extension's permission-gated capability access, keyed by extension name.</summary>
-/// <remarks>The <c>extension-permission-access</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Query results including rows, columns, and rows affected, or a filesystem error if execution failed.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess : PermissionsLocationsAddToolApprovalDetails
+public sealed class SessionFsSqliteQueryResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-permission-access";
+    /// <summary>Column names from the result set.</summary>
+    [JsonPropertyName("columns")]
+    public IList<string> Columns { get => field ??= []; set; }
 
-    /// <summary>Extension name.</summary>
-    [JsonPropertyName("extensionName")]
-    public required string ExtensionName { get; set; }
+    /// <summary>Describes a filesystem error.</summary>
+    [JsonPropertyName("error")]
+    public SessionFsError? Error { get; set; }
+
+    /// <summary>SQLite last_insert_rowid() value for INSERT.</summary>
+    [JsonPropertyName("lastInsertRowid")]
+    public long? LastInsertRowid { get; set; }
+
+    /// <summary>For SELECT: array of row objects. For others: empty array.</summary>
+    [JsonPropertyName("rows")]
+    public IList<IDictionary<string, JsonElement>> Rows { get => field ??= []; set; }
+
+    /// <summary>Number of rows affected (for INSERT/UPDATE/DELETE).</summary>
+    [JsonPropertyName("rowsAffected")]
+    public long RowsAffected { get; set; }
 }
 
-/// <summary>Location-scoped tool approval to persist.</summary>
+/// <summary>SQL query, query type, and optional bind parameters for executing a SQLite query against the per-session database. The provider applies its SQLite busy timeout for every call.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionLocationAddToolApprovalParams
+public sealed class SessionFsSqliteQueryRequest
 {
-    /// <summary>Tool approval to persist and apply.</summary>
-    [JsonPropertyName("approval")]
-    public PermissionsLocationsAddToolApprovalDetails Approval { get => field ??= new(); set; }
+    /// <summary>Optional named bind parameters.</summary>
+    [JsonPropertyName("params")]
+    public IDictionary<string, JsonElement>? Params { get; set; }
 
-    /// <summary>Location key (git root or cwd) to persist the approval to.</summary>
-    [JsonPropertyName("locationKey")]
-    public string LocationKey { get; set; } = string.Empty;
+    /// <summary>SQL query to execute.</summary>
+    [JsonPropertyName("query")]
+    public string Query { get; set; } = string.Empty;
+
+    /// <summary>How to execute the query: 'exec' for DDL/multi-statement (no results), 'query' for SELECT (returns rows), 'run' for INSERT/UPDATE/DELETE (returns rowsAffected).</summary>
+    [JsonPropertyName("queryType")]
+    public SessionFsSqliteQueryType QueryType { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Folder trust check result.</summary>
+/// <summary>Classified SQLite transaction failure. busyOrLocked guarantees rollback; postCommitAmbiguous must never be retried.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class FolderTrustCheckResult
+public sealed class SessionFsSqliteTransactionError
 {
-    /// <summary>Whether the folder is trusted.</summary>
-    [JsonPropertyName("trusted")]
-    public bool Trusted { get; set; }
+    /// <summary>Machine-readable classification of the transaction failure.</summary>
+    [JsonPropertyName("errorClass")]
+    public SessionFsSqliteTransactionErrorClass ErrorClass { get; set; }
+
+    /// <summary>Human-readable transaction failure message.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 }
 
-/// <summary>Folder path to check for trust.</summary>
+/// <summary>Per-statement results, or a classified transaction error.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FolderTrustCheckParams
+public sealed class SessionFsSqliteTransactionResult
 {
-    /// <summary>Folder path to check.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Classified transaction failure, when execution did not succeed.</summary>
+    [JsonPropertyName("error")]
+    public SessionFsSqliteTransactionError? Error { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Per-statement query results in input order.</summary>
+    [JsonPropertyName("results")]
+    public IList<SessionFsSqliteQueryResult> Results { get => field ??= []; set; }
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>One statement in an atomic SQLite transaction.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsFolderTrustAddTrustedResult
+public sealed class SessionFsSqliteTransactionStatement
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Optional named bind parameters.</summary>
+    [JsonPropertyName("params")]
+    public IDictionary<string, JsonElement>? Params { get; set; }
+
+    /// <summary>SQL statement to execute.</summary>
+    [JsonPropertyName("query")]
+    public string Query { get; set; } = string.Empty;
+
+    /// <summary>How to execute the statement.</summary>
+    [JsonPropertyName("queryType")]
+    public SessionFsSqliteQueryType QueryType { get; set; }
 }
 
-/// <summary>Folder path to add to trusted folders.</summary>
+/// <summary>Statements to execute atomically. Providers apply busy handling for every call.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class FolderTrustAddParams
+public sealed class SessionFsSqliteTransactionRequest
 {
-    /// <summary>Folder path to mark as trusted.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Ordered SQL statements to execute in one transaction.</summary>
+    [JsonPropertyName("statements")]
+    public IList<SessionFsSqliteTransactionStatement> Statements { get => field ??= []; set; }
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Indicates whether the per-session SQLite database already exists.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class PermissionsUrlsSetUnrestrictedModeResult
+public sealed class SessionFsSqliteExistsResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Whether the session database already exists.</summary>
+    [JsonPropertyName("exists")]
+    public bool Exists { get; set; }
 }
 
-/// <summary>Whether the URL-permission policy should run in unrestricted mode.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PermissionUrlsSetUnrestrictedModeParams
+/// <summary>Identifies the target session.</summary>
+public sealed class SessionFsSqliteExistsRequest
 {
-    /// <summary>Whether to allow access to all URLs without prompting. Toggles the runtime's URL-permission policy in place.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The repository the remote session targets.</summary>
+/// <summary>Canvas open result returned by the provider.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MetadataSnapshotRemoteMetadataRepository
+public sealed class CanvasProviderOpenResult
 {
-    /// <summary>The branch the remote session is operating on.</summary>
-    [JsonPropertyName("branch")]
-    public string Branch { get; set; } = string.Empty;
+    /// <summary>Provider-supplied status text.</summary>
+    [JsonPropertyName("status")]
+    public string? Status { get; set; }
 
-    /// <summary>The GitHub repository name (without owner).</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Provider-supplied title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 
-    /// <summary>The GitHub owner (user or organization) of the target repository.</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { get; set; } = string.Empty;
+    /// <summary>URL for web-rendered canvases.</summary>
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <summary>Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.</summary>
+/// <summary>Host capabilities.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MetadataSnapshotRemoteMetadata
+public sealed class CanvasHostContextCapabilities
 {
-    /// <summary>The pull request number the remote session is associated with, if any.</summary>
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
-
-    /// <summary>The repository the remote session targets.</summary>
-    [JsonPropertyName("repository")]
-    public MetadataSnapshotRemoteMetadataRepository Repository { get => field ??= new(); set; }
-
-    /// <summary>The original resource identifier (task ID or PR node ID), preserved across event-replay reconstructions. Falls back to `sessionId` when absent.</summary>
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { get; set; }
-
-    /// <summary>Whether the remote task originated from Copilot Coding Agent (cca) or a CLI `--remote` invocation.</summary>
-    [JsonPropertyName("taskType")]
-    public MetadataSnapshotRemoteMetadataTaskType? TaskType { get; set; }
+    /// <summary>Whether canvas rendering is supported.</summary>
+    [JsonPropertyName("canvases")]
+    public bool? Canvases { get; set; }
 }
 
-/// <summary>Public-facing projection of workspace metadata for SDK / TUI consumers.</summary>
-public sealed class SessionMetadataSnapshotWorkspace
+/// <summary>Host context supplied by the runtime.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CanvasHostContext
 {
-    /// <summary>Branch checked out at session start, if any.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
-
-    /// <summary>ISO 8601 timestamp when the workspace was created.</summary>
-    [JsonPropertyName("created_at")]
-    public DateTimeOffset? CreatedAt { get; set; }
+    /// <summary>Host capabilities.</summary>
+    [JsonPropertyName("capabilities")]
+    public CanvasHostContextCapabilities? Capabilities { get; set; }
+}
 
-    /// <summary>Current working directory at session start.</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
+/// <summary>Session context supplied by the runtime.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CanvasSessionContext
+{
+    /// <summary>Active session working directory, when known.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
+}
 
-    /// <summary>Resolved git root for cwd, if any.</summary>
-    [JsonPropertyName("git_root")]
-    public string? GitRoot { get; set; }
+/// <summary>Canvas open parameters sent to the provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CanvasProviderOpenRequest
+{
+    /// <summary>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public string CanvasId { get; set; } = string.Empty;
 
-    /// <summary>Repository host type, if known.</summary>
-    [JsonPropertyName("host_type")]
-    public WorkspaceSummaryHostType? HostType { get; set; }
+    /// <summary>Owning provider identifier.</summary>
+    [JsonPropertyName("extensionId")]
+    public string ExtensionId { get; set; } = string.Empty;
 
-    /// <summary>Workspace identifier (1:1 with sessionId).</summary>
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Host context supplied by the runtime.</summary>
+    [JsonPropertyName("host")]
+    public CanvasHostContext? Host { get; set; }
 
-    /// <summary>Display name for the session, if set.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Canvas open input.</summary>
+    [JsonPropertyName("input")]
+    public JsonElement? Input { get; set; }
 
-    /// <summary>Repository identifier in 'owner/repo' or 'org/project/repo' format, if any.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
+    /// <summary>Stable caller-supplied canvas instance identifier.</summary>
+    [JsonPropertyName("instanceId")]
+    public string InstanceId { get; set; } = string.Empty;
 
-    /// <summary>ISO 8601 timestamp when the workspace was last updated.</summary>
-    [JsonPropertyName("updated_at")]
-    public DateTimeOffset? UpdatedAt { get; set; }
+    /// <summary>Session context supplied by the runtime.</summary>
+    [JsonPropertyName("session")]
+    public CanvasSessionContext? Session { get; set; }
 
-    /// <summary>Whether the display name was explicitly set by the user.</summary>
-    [JsonPropertyName("user_named")]
-    public bool? UserNamed { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Point-in-time snapshot of slow-changing session identifier and state fields.</summary>
+/// <summary>Canvas close parameters sent to the provider.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionMetadataSnapshot
+public sealed class CanvasProviderCloseRequest
 {
-    /// <summary>True when the session was detected to be in use by another process at construction time. Local consumers may surface a confirmation prompt before fully attaching. Always false for new sessions.</summary>
-    [JsonPropertyName("alreadyInUse")]
-    public bool AlreadyInUse { get; set; }
-
-    /// <summary>Runtime client name associated with the session (telemetry identifier).</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
-
-    /// <summary>The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot').</summary>
-    [JsonPropertyName("currentMode")]
-    public MetadataSnapshotCurrentMode CurrentMode { get; set; }
-
-    /// <summary>User-provided name supplied at session construction (via `--name`), if any. Immutable after construction.</summary>
-    [JsonPropertyName("initialName")]
-    public string? InitialName { get; set; }
+    /// <summary>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public string CanvasId { get; set; } = string.Empty;
 
-    /// <summary>Whether this is a remote session (i.e., one whose runtime executes elsewhere and is steered through this process).</summary>
-    [JsonPropertyName("isRemote")]
-    public bool IsRemote { get; set; }
+    /// <summary>Owning provider identifier.</summary>
+    [JsonPropertyName("extensionId")]
+    public string ExtensionId { get; set; } = string.Empty;
 
-    /// <summary>ISO 8601 timestamp of when the session's persisted state was last modified on disk. For new sessions, equals startTime. For resumed sessions, reflects the previous modification time at construction.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public DateTimeOffset ModifiedTime { get; set; }
+    /// <summary>Host context supplied by the runtime.</summary>
+    [JsonPropertyName("host")]
+    public CanvasHostContext? Host { get; set; }
 
-    /// <summary>Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.</summary>
-    [JsonPropertyName("remoteMetadata")]
-    public MetadataSnapshotRemoteMetadata? RemoteMetadata { get; set; }
+    /// <summary>Canvas instance identifier.</summary>
+    [JsonPropertyName("instanceId")]
+    public string InstanceId { get; set; } = string.Empty;
 
-    /// <summary>Currently selected model identifier, if any.</summary>
-    [JsonPropertyName("selectedModel")]
-    public string? SelectedModel { get; set; }
+    /// <summary>Session context supplied by the runtime.</summary>
+    [JsonPropertyName("session")]
+    public CanvasSessionContext? Session { get; set; }
 
-    /// <summary>The unique identifier of the session.</summary>
+    /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Current session limits, or null when no limits are active.</summary>
-    [JsonPropertyName("sessionLimits")]
-    public SessionLimitsConfig? SessionLimits { get; set; }
+/// <summary>Canvas action invocation parameters sent to the provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CanvasProviderInvokeActionRequest
+{
+    /// <summary>Action name to invoke.</summary>
+    [JsonPropertyName("actionName")]
+    public string ActionName { get; set; } = string.Empty;
 
-    /// <summary>ISO 8601 timestamp of when the session started.</summary>
-    [JsonPropertyName("startTime")]
-    public DateTimeOffset StartTime { get; set; }
+    /// <summary>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public string CanvasId { get; set; } = string.Empty;
 
-    /// <summary>Short human-readable summary of the session, if known. Omitted when no summary has been generated.</summary>
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
+    /// <summary>Owning provider identifier.</summary>
+    [JsonPropertyName("extensionId")]
+    public string ExtensionId { get; set; } = string.Empty;
 
-    /// <summary>Absolute path to the session's current working directory.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string WorkingDirectory { get; set; } = string.Empty;
+    /// <summary>Host context supplied by the runtime.</summary>
+    [JsonPropertyName("host")]
+    public CanvasHostContext? Host { get; set; }
 
-    /// <summary>Public-facing workspace metadata for this session, or null if the session has no associated workspace. Excludes runtime-internal fields (GitHub IDs, summary count, internal flags).</summary>
-    [JsonPropertyName("workspace")]
-    public SessionMetadataSnapshotWorkspace? Workspace { get; set; }
+    /// <summary>Action input.</summary>
+    [JsonPropertyName("input")]
+    public JsonElement? Input { get; set; }
 
-    /// <summary>Absolute path to the session's workspace directory on disk, or null if the session has no associated workspace.</summary>
-    [JsonPropertyName("workspacePath")]
-    public string? WorkspacePath { get; set; }
-}
+    /// <summary>Canvas instance identifier.</summary>
+    [JsonPropertyName("instanceId")]
+    public string InstanceId { get; set; } = string.Empty;
+
+    /// <summary>Session context supplied by the runtime.</summary>
+    [JsonPropertyName("session")]
+    public CanvasSessionContext? Session { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionMetadataSnapshotRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the local session is currently processing a turn or background continuation.</summary>
+/// <summary>Opaque integrator-owned process launch profile for one extension entrypoint.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MetadataIsProcessingResult
-{
-    /// <summary>Whether the session is currently processing user/agent messages. False for non-local sessions (which don't run a local agentic loop). Reflects an in-flight turn or background continuation.</summary>
-    [JsonPropertyName("processing")]
-    public bool Processing { get; set; }
+public sealed class ExtensionLaunchProfile
+{
+    /// <summary>Opaque integrator-defined arguments passed to the executable. The runtime does not append the extension entrypoint.</summary>
+    [JsonPropertyName("args")]
+    public IList<string> Args { get => field ??= []; set; }
+
+    /// <summary>Opaque integrator-defined environment variables. Runtime-owned COPILOT_SDK_PATH, SESSION_ID, and COPILOT_EXTENSION_PARENT_PID values take precedence.</summary>
+    [JsonPropertyName("env")]
+    public IDictionary<string, string> Env { get => field ??= new Dictionary<string, string>(); set; }
+
+    /// <summary>Executable used to launch the extension entrypoint.</summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("executable")]
+    public string Executable { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>The launch profile for a supported entrypoint. Omit launch when the provider does not support the entrypoint.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionMetadataIsProcessingRequest
+public sealed class ExtensionLaunchProviderResolveResult
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Opaque launch profile, omitted when this provider does not support the entrypoint.</summary>
+    [JsonPropertyName("launch")]
+    public ExtensionLaunchProfile? Launch { get; set; }
 }
 
-/// <summary>Current activity flags for the session.</summary>
+/// <summary>A discovered extension entrypoint that the registered integrator may classify and resolve to an opaque launch profile.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionActivity
+public sealed class ExtensionLaunchProviderResolveRequest
 {
-    /// <summary>Whether an in-flight operation can currently be aborted.</summary>
-    [JsonPropertyName("abortable")]
-    public bool Abortable { get; set; }
+    /// <summary>Source-qualified extension identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Whether the session currently has active work, including running turns or tasks.</summary>
-    [JsonPropertyName("hasActiveWork")]
-    public bool HasActiveWork { get; set; }
+    /// <summary>Absolute path to the discovered extension entrypoint.</summary>
+    [JsonPropertyName("modulePath")]
+    public string ModulePath { get; set; } = string.Empty;
+
+    /// <summary>Human-readable extension name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Discovery source for the extension entrypoint.</summary>
+    [JsonPropertyName("source")]
+    public ExtensionSource Source { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Acknowledgement. Returning successfully simply means the SDK accepted the start frame; it does not imply the request will succeed.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionMetadataActivityRequest
+public sealed class LlmInferenceHttpRequestStartResult
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Token-usage breakdown for the session's current context window.</summary>
-public sealed class MetadataContextInfoResultContextInfo
+/// <summary>The head of an outbound model-layer HTTP request.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class LlmInferenceHttpRequestStartRequest
 {
-    /// <summary>Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%).</summary>
-    [JsonPropertyName("bufferTokens")]
-    public long BufferTokens { get; set; }
+    /// <summary>Stable identity of the agent trajectory that issued this request. Present when the request originates from an agent turn; absent for requests outside any agent context. This is the same identity used by lifecycle and bridged session events and remains constant across turns and retries.</summary>
+    [JsonPropertyName("agentId")]
+    public string? AgentId { get; set; }
 
-    /// <summary>Token count at which background compaction starts (configurable percentage of promptTokenLimit).</summary>
-    [JsonPropertyName("compactionThreshold")]
-    public long CompactionThreshold { get; set; }
+    /// <summary>Identity of the agent invocation (one agentic loop) that issued this request. It remains fixed across physical retries within the invocation and is distinct from the stable trajectory `agentId`. A caller-supplied invocation id always takes precedence (this covers auxiliary calls that have no model call id). Otherwise, first-party CAPI requests fall back to the runtime's agent task id — the same value the runtime emits as the `X-Agent-Task-Id` header — while custom-provider requests fall back to the model call id.</summary>
+    [JsonPropertyName("agentInvocationId")]
+    public string? AgentInvocationId { get; set; }
 
-    /// <summary>Tokens consumed by user/assistant/tool messages.</summary>
-    [JsonPropertyName("conversationTokens")]
-    public long ConversationTokens { get; set; }
+    /// <summary>HTTP request headers, preserving multiple values per name.</summary>
+    [JsonPropertyName("headers")]
+    public IDictionary<string, IList<string>> Headers { get => field ??= new Dictionary<string, IList<string>>(); set; }
 
-    /// <summary>Prompt token limit plus the model's full output token limit.</summary>
-    [JsonPropertyName("limit")]
-    public long Limit { get; set; }
+    /// <summary>Coarse classification of the interaction that produced this request. Open string for forward-compatibility; known values include `conversation-agent`, `conversation-subagent`, `conversation-sampling`, `conversation-background`, `conversation-compaction`, and `conversation-user`. Absent when the runtime did not classify the request. Comes from the runtime's per-request agent context independently of transport; on the CAPI transport the runtime derives the upstream `X-Interaction-Type` header from this same context.</summary>
+    [JsonPropertyName("interactionType")]
+    public string? InteractionType { get; set; }
 
-    /// <summary>Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools).</summary>
-    [JsonPropertyName("mcpToolsTokens")]
-    public long McpToolsTokens { get; set; }
+    /// <summary>HTTP method, e.g. GET, POST.</summary>
+    [JsonPropertyName("method")]
+    public string Method { get; set; } = string.Empty;
 
-    /// <summary>The model used for token counting.</summary>
-    [JsonPropertyName("modelName")]
-    public string ModelName { get; set; } = string.Empty;
+    /// <summary>Stable identity of the immediate parent trajectory. Present for child trajectories such as subagents and conversation-sampling requests; absent for root-agent and non-agent requests.</summary>
+    [JsonPropertyName("parentAgentId")]
+    public string? ParentAgentId { get; set; }
 
-    /// <summary>Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified).</summary>
-    [JsonPropertyName("promptTokenLimit")]
-    public long PromptTokenLimit { get; set; }
+    /// <summary>Opaque runtime-minted id, unique per in-flight request. The SDK uses this to correlate httpRequestChunk frames and to address its httpResponseStart / httpResponseChunk replies back to the runtime.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 
-    /// <summary>Tokens consumed by the system prompt.</summary>
-    [JsonPropertyName("systemTokens")]
-    public long SystemTokens { get; set; }
+    /// <summary>Id of the runtime session that triggered this request, when one is in scope. Absent for requests issued outside any session (e.g. startup model-catalog or capability resolution). This is a payload field — not a dispatch key — because the client-global API is registered process-wide rather than per session.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
 
-    /// <summary>Tokens consumed by tool definitions sent to the model (excludes deferred tools).</summary>
-    [JsonPropertyName("toolDefinitionsTokens")]
-    public long ToolDefinitionsTokens { get; set; }
+    /// <summary>Transport the runtime would otherwise use for this request. `http` (the default when absent) covers plain HTTP and SSE responses; `websocket` indicates a full-duplex message channel where each body chunk maps to one WebSocket message and the `binary` flag distinguishes text from binary frames. The SDK consumer uses this to decide whether to service the request with an HTTP client or a WebSocket client. It is the one piece of request metadata the consumer cannot reliably infer from the URL or headers alone.</summary>
+    [JsonPropertyName("transport")]
+    public LlmInferenceHttpRequestStartTransport? Transport { get; set; }
 
-    /// <summary>Sum of system, conversation and tool-definition tokens.</summary>
-    [JsonPropertyName("totalTokens")]
-    public long TotalTokens { get; set; }
+    /// <summary>Absolute request URL.</summary>
+    [JsonPropertyName("url")]
+    public string Url { get; set; } = string.Empty;
 }
 
-/// <summary>Token breakdown for the session's current context window, or null if uninitialized.</summary>
+/// <summary>Acknowledgement. The SDK is free to ignore the ack and treat chunk delivery as fire-and-forget.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MetadataContextInfoResult
+public sealed class LlmInferenceHttpRequestChunkResult
 {
-    /// <summary>Token breakdown for the current context window, or null if the session has not yet been initialized (no system prompt or tool metadata cached).</summary>
-    [JsonPropertyName("contextInfo")]
-    public MetadataContextInfoResultContextInfo? ContextInfo { get; set; }
 }
 
-/// <summary>Model identifier and token limits used to compute the context-info breakdown.</summary>
+/// <summary>A request body chunk or cancellation signal.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class MetadataContextInfoRequest
+public sealed class LlmInferenceHttpRequestChunkRequest
 {
-    /// <summary>Maximum output tokens allowed by the target model. Pass 0 if unknown.</summary>
-    [JsonPropertyName("outputTokenLimit")]
-    public long OutputTokenLimit { get; set; }
+    /// <summary>Identity of the agent invocation (one agentic loop) this body chunk belongs to, matching the `agentInvocationId` semantics on httpRequestStart. Carried per chunk so a persistent transport can attribute successive turns correctly: when a WebSocket connection is reused across turns, the httpRequestStart identity reflects only the turn that opened the connection, so each later turn stamps its own invocation id here. Absent when the runtime has no invocation context for the request, or on the plain-HTTP transport where every request has its own httpRequestStart.</summary>
+    [JsonPropertyName("agentInvocationId")]
+    public string? AgentInvocationId { get; set; }
 
-    /// <summary>Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default.</summary>
-    [JsonPropertyName("promptTokenLimit")]
-    public long PromptTokenLimit { get; set; }
+    /// <summary>When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.</summary>
+    [JsonPropertyName("binary")]
+    public bool? Binary { get; set; }
 
-    /// <summary>Model identifier used for tokenization. Omit to use the session default. Used both for token counting and to compute display values.</summary>
-    [JsonPropertyName("selectedModel")]
-    public string? SelectedModel { get; set; }
+    /// <summary>When true, the runtime is cancelling the in-flight request (e.g. upstream consumer aborted). `data` is ignored. Implies end-of-request.</summary>
+    [JsonPropertyName("cancel")]
+    public bool? Cancel { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Optional human-readable reason for the cancellation, propagated for logging.</summary>
+    [JsonPropertyName("cancelReason")]
+    public string? CancelReason { get; set; }
+
+    /// <summary>Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty.</summary>
+    [JsonPropertyName("data")]
+    public string Data { get; set; } = string.Empty;
+
+    /// <summary>When true, this is the final body chunk for the request. The SDK may rely on having received an end-marked chunk before treating the request body as complete.</summary>
+    [JsonPropertyName("end")]
+    public bool? End { get; set; }
+
+    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 }
 
-/// <summary>Successful compaction history for the session.</summary>
-public sealed class MetadataContextAttributionResultContextAttributionCompactions
+/// <summary>Client environment metadata describing the process that produced a telemetry event.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class GitHubTelemetryClientInfo
 {
-    /// <summary>Number of successful compactions in this session.</summary>
-    [JsonPropertyName("count")]
-    public long Count { get; set; }
+    /// <summary>Copilot CLI version string.</summary>
+    [JsonPropertyName("cli_version")]
+    public string CliVersion { get; set; } = string.Empty;
+
+    /// <summary>Name of the client application.</summary>
+    [JsonPropertyName("client_name")]
+    public string? ClientName { get; set; }
+
+    /// <summary>Type of client.</summary>
+    [JsonPropertyName("client_type")]
+    public string? ClientType { get; set; }
+
+    /// <summary>Copilot subscription plan, when known.</summary>
+    [JsonPropertyName("copilot_plan")]
+    public string? CopilotPlan { get; set; }
+
+    /// <summary>Number of logical CPU cores on the host.</summary>
+    [JsonPropertyName("cpu_count")]
+    public long? CpuCount { get; set; }
+
+    /// <summary>Distinct CPU model names for the host, comma-separated.</summary>
+    [JsonPropertyName("cpu_model")]
+    public string? CpuModel { get; set; }
+
+    /// <summary>Stable machine identifier for the device.</summary>
+    [JsonPropertyName("dev_device_id")]
+    public string? DevDeviceId { get; set; }
+
+    /// <summary>Whether the user is a GitHub/Microsoft staff member.</summary>
+    [JsonPropertyName("is_staff")]
+    public bool? IsStaff { get; set; }
+
+    /// <summary>Node.js runtime version string.</summary>
+    [JsonPropertyName("node_version")]
+    public string NodeVersion { get; set; } = string.Empty;
+
+    /// <summary>Operating system architecture (e.g. arm64, x64).</summary>
+    [JsonPropertyName("os_arch")]
+    public string OsArch { get; set; } = string.Empty;
+
+    /// <summary>Operating system platform (e.g. darwin, linux, win32).</summary>
+    [JsonPropertyName("os_platform")]
+    public string OsPlatform { get; set; } = string.Empty;
+
+    /// <summary>Operating system version string.</summary>
+    [JsonPropertyName("os_version")]
+    public string OsVersion { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for MetadataContextAttributionResultContextAttributionEntry operations.</summary>
-public sealed class MetadataContextAttributionResultContextAttributionEntry
+/// <summary>A single telemetry event in the runtime's native GitHub-shaped telemetry format, forwarded verbatim to opted-in hosts. The `restricted` flag on the enclosing GitHubTelemetryNotification distinguishes standard from restricted events; the payload shape is identical for both.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class GitHubTelemetryEvent
 {
-    /// <summary>Supplementary per-entry metadata (e.g. `messageCount`, `role`, `evictable`, `pluginSource`). Values are stringified; parse as needed and ignore unrecognized keys.</summary>
-    [JsonPropertyName("attributes")]
-    public IDictionary<string, string>? Attributes { get; set; }
+    /// <summary>Client environment metadata.</summary>
+    [JsonPropertyName("client")]
+    public GitHubTelemetryClientInfo? Client { get; set; }
 
-    /// <summary>Identifier for this entry, formed by joining its `kind` and source name (e.g. `tool:bash`, `skill:tmux`, `toolDefinition:bash`); unique within the snapshot. Use it to match the same entry across snapshots, to correlate with other APIs (skill/agent/MCP registries), and as the `parentId` target for nesting. Distinct from the human-facing `label`.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Copilot tracking ID for user-level attribution.</summary>
+    [JsonPropertyName("copilot_tracking_id")]
+    public string? CopilotTrackingId { get; set; }
 
-    /// <summary>Source category for this entry. Not a closed set — tolerate unknown values. Known values today: `skill`, `subagent`, `mcpServer`, `tool`, `system`, `toolDefinition`, `plugin`.</summary>
+    /// <summary>Timestamp when the event was created (ISO 8601 format).</summary>
+    [JsonPropertyName("created_at")]
+    public string? CreatedAt { get; set; }
+
+    /// <summary>Experiment assignment context.</summary>
+    [JsonPropertyName("exp_assignment_context")]
+    public string? ExpAssignmentContext { get; set; }
+
+    /// <summary>Feature flags enabled for this session, as a map from flag to value.</summary>
+    [JsonPropertyName("features")]
+    public IDictionary<string, string>? Features { get; set; }
+
+    /// <summary>Event type/kind (e.g. get_completion_with_tools_turn, tool_call_executed).</summary>
     [JsonPropertyName("kind")]
     public string Kind { get; set; } = string.Empty;
 
-    /// <summary>Human-readable display label, e.g. `bash` or `skill: tmux`. Presentation-only; may be localized/reformatted without notice — do not key off it.</summary>
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
+    /// <summary>Numeric metrics as a map from key to value.</summary>
+    [JsonPropertyName("metrics")]
+    public IDictionary<string, double> Metrics { get => field ??= new Dictionary<string, double>(); set; }
+
+    /// <summary>Reference to the model call that produced this event.</summary>
+    [JsonPropertyName("model_call_id")]
+    public string? ModelCallId { get; set; }
+
+    /// <summary>String-valued properties as a map from key to value.</summary>
+    [JsonPropertyName("properties")]
+    public IDictionary<string, string> Properties { get => field ??= new Dictionary<string, string>(); set; }
+
+    /// <summary>Session identifier the event belongs to.</summary>
+    [JsonPropertyName("session_id")]
+    public string? SessionId { get; set; }
+}
+
+/// <summary>Payload for a `gitHubTelemetry.event` notification: a single GitHub telemetry event the runtime forwards to a host connection that opted into telemetry forwarding during the `server.connect` handshake.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class GitHubTelemetryNotification
+{
+    /// <summary>The telemetry event, in the runtime's native GitHub-shaped telemetry format.</summary>
+    [JsonPropertyName("event")]
+    public GitHubTelemetryEvent Event { get => field ??= new(); set; }
+
+    /// <summary>Whether this is a restricted telemetry event (cli.restricted_telemetry). Hosts must route restricted events to first-party Microsoft stores only.</summary>
+    [JsonPropertyName("restricted")]
+    public bool Restricted { get; set; }
 
-    /// <summary>Optional `id` of the parent entry: e.g. a `plugin` entry parenting its `skill`/`mcpServer` entries, or the `system` entry parenting `toolDefinition` entries. Omitted for top-level entries.</summary>
-    [JsonPropertyName("parentId")]
-    public string? ParentId { get; set; }
+    /// <summary>Session the telemetry event belongs to, when it is session-scoped. Omitted for sessionless events (for example, `server.sendTelemetry` calls with no session id), which are still forwarded to opted-in connections.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
+}
 
-    /// <summary>Token count currently in context attributable to this entry.</summary>
-    [JsonPropertyName("tokens")]
-    public long Tokens { get; set; }
+/// <summary>SDK host response to a GitHub credential request.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(GitHubTokenAcquireResultToken), "token")]
+[JsonDerivedType(typeof(GitHubTokenAcquireResultCancelled), "cancelled")]
+public partial class GitHubTokenAcquireResult
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Per-source token attribution snapshot for the current context window. The heaviest individual messages are available separately via `metadata.getContextHeaviestMessages`.</summary>
-public sealed class MetadataContextAttributionResultContextAttribution
+
+/// <summary>The <c>token</c> variant of <see cref="GitHubTokenAcquireResult"/>.</summary>
+[Experimental(Diagnostics.Experimental)]
+public partial class GitHubTokenAcquireResultToken : GitHubTokenAcquireResult
 {
-    /// <summary>Successful compaction history for the session.</summary>
-    [JsonPropertyName("compactions")]
-    public MetadataContextAttributionResultContextAttributionCompactions Compactions { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "token";
 
-    /// <summary>Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`.</summary>
-    [JsonPropertyName("entries")]
-    public IList<MetadataContextAttributionResultContextAttributionEntry> Entries { get => field ??= []; set; }
+    /// <summary>GitHub access token acquired by the SDK host.</summary>
+    [JsonPropertyName("accessToken")]
+    public required string AccessToken { get; set; }
 
-    /// <summary>Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share.</summary>
-    [JsonPropertyName("totalTokens")]
-    public long TotalTokens { get; set; }
+    /// <summary>Remaining token lifetime in seconds when callback execution completes. It must exceed the one-hour preflight refresh threshold.</summary>
+    [JsonPropertyName("expiresIn")]
+    public required long ExpiresIn { get; set; }
+
+    /// <summary>OAuth token type. Defaults to bearer when omitted.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("tokenType")]
+    public string? TokenType { get; set; }
 }
 
-/// <summary>Per-source attribution breakdown for the session's current context window, or null if uninitialized.</summary>
+/// <summary>The <c>cancelled</c> variant of <see cref="GitHubTokenAcquireResult"/>.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MetadataContextAttributionResult
+public partial class GitHubTokenAcquireResultCancelled : GitHubTokenAcquireResult
 {
-    /// <summary>Per-source context-window attribution, or null if the session has not yet been initialized (no system prompt or tool metadata cached).</summary>
-    [JsonPropertyName("contextAttribution")]
-    public MetadataContextAttributionResultContextAttribution? ContextAttribution { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "cancelled";
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Asks the SDK client to acquire a GitHub access token from an opaque callback registration.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionMetadataGetContextAttributionRequest
+public sealed class GitHubTokenAcquireRequest
 {
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Effective GitHub host for which the callback must return a token.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
+
+    /// <summary>Why the runtime is requesting a GitHub credential.</summary>
+    [JsonPropertyName("reason")]
+    public GitHubTokenAcquireReason Reason { get; set; }
+
+    /// <summary>Opaque identifier generated by the SDK for this callback registration.</summary>
+    [JsonPropertyName("registrationId")]
+    public string RegistrationId { get; set; } = string.Empty;
+
+    /// <summary>Session receiving the token. Absent only before a cloud session has been assigned its id.</summary>
     [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    public string? SessionId { get; set; }
 }
 
-/// <summary>A single large message currently in context.</summary>
+/// <summary>Resolved Anthropic adaptive-thinking capability for a model.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ContextHeaviestMessage
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct AdaptiveThinkingSupport : IEquatable<AdaptiveThinkingSupport>
 {
-    /// <summary>Stable identifier for this message within the snapshot.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Human-readable source label, e.g. `tool: bash` or `skill: tmux`. Presentation-only.</summary>
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
+    /// <summary>Initializes a new instance of the <see cref="AdaptiveThinkingSupport"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AdaptiveThinkingSupport"/>.</param>
+    [JsonConstructor]
+    public AdaptiveThinkingSupport(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Role of the chat message (`user`, `assistant`, or `tool`).</summary>
-    [JsonPropertyName("role")]
-    public string Role { get; set; } = string.Empty;
+    /// <summary>Gets the value associated with this <see cref="AdaptiveThinkingSupport"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Token count currently in context for this individual message.</summary>
-    [JsonPropertyName("tokens")]
-    public long Tokens { get; set; }
-}
+    /// <summary>The model does not accept thinking.type='adaptive'.</summary>
+    public static AdaptiveThinkingSupport Unsupported { get; } = new("unsupported");
 
-/// <summary>The heaviest individual messages in the session's context window, most-expensive first.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MetadataContextHeaviestMessagesResult
-{
-    /// <summary>Heaviest messages, most-expensive first.</summary>
-    [JsonPropertyName("messages")]
-    public IList<ContextHeaviestMessage> Messages { get => field ??= []; set; }
+    /// <summary>The model accepts adaptive thinking but also accepts thinking.type='enabled'.</summary>
+    public static AdaptiveThinkingSupport Optional { get; } = new("optional");
 
-    /// <summary>Total token count of the current context window, so callers can compute each message's share without a second call.</summary>
-    [JsonPropertyName("totalTokens")]
-    public long TotalTokens { get; set; }
-}
+    /// <summary>The model only accepts adaptive thinking and rejects thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8).</summary>
+    public static AdaptiveThinkingSupport Required { get; } = new("required");
 
-/// <summary>Parameters for the heaviest-messages query.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class MetadataContextHeaviestMessagesRequest
-{
-    /// <summary>Maximum number of messages to return, most-expensive first. Omit for the server default.</summary>
-    [JsonPropertyName("limit")]
-    public long? Limit { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="AdaptiveThinkingSupport"/> instances are equivalent.</summary>
+    public static bool operator ==(AdaptiveThinkingSupport left, AdaptiveThinkingSupport right) => left.Equals(right);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="AdaptiveThinkingSupport"/> instances are not equivalent.</summary>
+    public static bool operator !=(AdaptiveThinkingSupport left, AdaptiveThinkingSupport right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is AdaptiveThinkingSupport other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(AdaptiveThinkingSupport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{AdaptiveThinkingSupport}"/> for serializing <see cref="AdaptiveThinkingSupport"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<AdaptiveThinkingSupport>
+    {
+        /// <inheritdoc />
+        public override AdaptiveThinkingSupport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, AdaptiveThinkingSupport value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AdaptiveThinkingSupport));
+        }
+    }
 }
 
-/// <summary>Notify the session that its working directory context has changed. Emits a `session.context_changed` event so consumers (telemetry, OTel tracker, ACP, the timeline UI) can react. Use this when the host has detected a cwd/branch/repo change outside the session's normal lifecycle (e.g., after a shell command in interactive mode). For a local session, a report whose `cwd` diverges from the session's current working directory is ignored (the call still succeeds but records nothing and emits no event); move a local session's working directory via `metadata.setWorkingDirectory` instead.</summary>
+
+/// <summary>Model capability category for grouping in the model picker.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MetadataRecordContextChangeResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ModelPickerCategory : IEquatable<ModelPickerCategory>
 {
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ModelPickerCategory"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelPickerCategory"/>.</param>
+    [JsonConstructor]
+    public ModelPickerCategory(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ModelPickerCategory"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Lightweight model category optimized for faster, lower-cost interactions.</summary>
+    public static ModelPickerCategory Lightweight { get; } = new("lightweight");
+
+    /// <summary>Versatile model category suitable for a broad range of tasks.</summary>
+    public static ModelPickerCategory Versatile { get; } = new("versatile");
+
+    /// <summary>Powerful model category optimized for complex tasks.</summary>
+    public static ModelPickerCategory Powerful { get; } = new("powerful");
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelPickerCategory"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelPickerCategory left, ModelPickerCategory right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelPickerCategory"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelPickerCategory left, ModelPickerCategory right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ModelPickerCategory other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ModelPickerCategory other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{ModelPickerCategory}"/> for serializing <see cref="ModelPickerCategory"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ModelPickerCategory>
+    {
+        /// <inheritdoc />
+        public override ModelPickerCategory Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ModelPickerCategory value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelPickerCategory));
+        }
+    }
 }
 
-/// <summary>Updated working directory and git context. Emitted as the new payload of `session.context_changed`.</summary>
+
+/// <summary>Relative cost tier for token-based billing users.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionWorkingDirectoryContext
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ModelPickerPriceCategory : IEquatable<ModelPickerPriceCategory>
 {
-    /// <summary>Merge-base commit SHA (fork point from the remote default branch).</summary>
-    [JsonPropertyName("baseCommit")]
-    public string? BaseCommit { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Current git branch name.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="ModelPickerPriceCategory"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelPickerPriceCategory"/>.</param>
+    [JsonConstructor]
+    public ModelPickerPriceCategory(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Current working directory path.</summary>
-    [JsonPropertyName("cwd")]
-    public string Cwd { get; set; } = string.Empty;
+    /// <summary>Gets the value associated with this <see cref="ModelPickerPriceCategory"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Root directory of the git repository, resolved via git rev-parse.</summary>
-    [JsonPropertyName("gitRoot")]
-    public string? GitRoot { get; set; }
+    /// <summary>Lowest relative token cost tier.</summary>
+    public static ModelPickerPriceCategory Low { get; } = new("low");
 
-    /// <summary>Head commit of the current git branch.</summary>
-    [JsonPropertyName("headCommit")]
-    public string? HeadCommit { get; set; }
+    /// <summary>Medium relative token cost tier.</summary>
+    public static ModelPickerPriceCategory Medium { get; } = new("medium");
+
+    /// <summary>High relative token cost tier.</summary>
+    public static ModelPickerPriceCategory High { get; } = new("high");
 
-    /// <summary>Hosting platform type of the repository.</summary>
-    [JsonPropertyName("hostType")]
-    public SessionWorkingDirectoryContextHostType? HostType { get; set; }
+    /// <summary>Highest relative token cost tier.</summary>
+    public static ModelPickerPriceCategory VeryHigh { get; } = new("very_high");
 
-    /// <summary>Repository identifier derived from the git remote URL ("owner/name" for GitHub, "org/project/repo" for Azure DevOps).</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="ModelPickerPriceCategory"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelPickerPriceCategory left, ModelPickerPriceCategory right) => left.Equals(right);
 
-    /// <summary>Raw host string from the git remote URL (e.g. "github.com", "dev.azure.com").</summary>
-    [JsonPropertyName("repositoryHost")]
-    public string? RepositoryHost { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="ModelPickerPriceCategory"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelPickerPriceCategory left, ModelPickerPriceCategory right) => !(left == right);
 
-/// <summary>Updated working-directory/git context to record on the session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class MetadataRecordContextChangeRequest
-{
-    /// <summary>Updated working directory and git context. Emitted as the new payload of `session.context_changed`.</summary>
-    [JsonPropertyName("context")]
-    public SessionWorkingDirectoryContext Context { get => field ??= new(); set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ModelPickerPriceCategory other && Equals(other);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(ModelPickerPriceCategory other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Update the session's working directory. Used by the host when the user explicitly changes cwd (e.g., the `/cd` slash command). The host is responsible for any related side-effects (file index, etc.); it does NOT change the process working directory (a session's cwd is per-session, not process-global). For local sessions the runtime validates the target first (an absolute path that exists on disk) and re-bases the permission primary directory; a rejected validation fails the call before anything is mutated, persisted, or emitted. Location-scoped permission rules are then re-keyed to the new directory (best-effort). Remote sessions only record the path.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MetadataSetWorkingDirectoryResult
-{
-    /// <summary>Working directory after the update.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string WorkingDirectory { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Absolute path to set as the session's new working directory. For local sessions the path must be absolute and exist on disk: it is validated before any session state changes, and a failing validation rejects the call with nothing mutated, persisted, or emitted. Remote sessions record the path as-is.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class MetadataSetWorkingDirectoryRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Absolute path to set as the session's working directory. The runtime updates the session's recorded cwd so subsequent operations (shell tools, file lookups, telemetry) anchor to it.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string WorkingDirectory { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{ModelPickerPriceCategory}"/> for serializing <see cref="ModelPickerPriceCategory"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ModelPickerPriceCategory>
+    {
+        /// <inheritdoc />
+        public override ModelPickerPriceCategory Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ModelPickerPriceCategory value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelPickerPriceCategory));
+        }
+    }
 }
 
-/// <summary>Re-tokenize the session's existing messages against `modelId` and return the token totals. Useful for hosts that want an initial estimate of context usage on session resume, before the next agent turn fires `session.context_info_changed` events. Returns zeros for an empty session.</summary>
+
+/// <summary>Current policy state for this model.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class MetadataRecomputeContextTokensResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ModelPolicyState : IEquatable<ModelPolicyState>
 {
-    /// <summary>Tokens contributed by user/assistant/tool messages (excludes system/developer prompts).</summary>
-    [JsonPropertyName("messagesTokenCount")]
-    public long MessagesTokenCount { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Tokens contributed by system/developer prompt snapshots.</summary>
-    [JsonPropertyName("systemTokenCount")]
-    public long SystemTokenCount { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="ModelPolicyState"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelPolicyState"/>.</param>
+    [JsonConstructor]
+    public ModelPolicyState(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Sum of tokens across chat-context and system-context messages currently held by the session.</summary>
-    [JsonPropertyName("totalTokens")]
-    public long TotalTokens { get; set; }
-}
+    /// <summary>Gets the value associated with this <see cref="ModelPolicyState"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>Model identifier to use when re-tokenizing the session's existing messages.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class MetadataRecomputeContextTokensRequest
-{
-    /// <summary>Model identifier used for tokenization. The runtime token-counts both chat-context and system-context messages against this model.</summary>
-    [JsonPropertyName("modelId")]
-    public string ModelId { get; set; } = string.Empty;
+    /// <summary>The model is enabled by policy.</summary>
+    public static ModelPolicyState Enabled { get; } = new("enabled");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>The model is disabled by policy.</summary>
+    public static ModelPolicyState Disabled { get; } = new("disabled");
 
-/// <summary>Availability of built-in job tools surfaced to boundary consumers.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionSettingsBuiltInToolAvailabilitySnapshot
-{
-    /// <summary>Gets or sets the <c>createPullRequest</c> value.</summary>
-    [JsonPropertyName("createPullRequest")]
-    public bool? CreatePullRequest { get; set; }
+    /// <summary>No explicit policy is configured for the model.</summary>
+    public static ModelPolicyState Unconfigured { get; } = new("unconfigured");
 
-    /// <summary>Gets or sets the <c>reportProgress</c> value.</summary>
-    [JsonPropertyName("reportProgress")]
-    public bool? ReportProgress { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="ModelPolicyState"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelPolicyState left, ModelPolicyState right) => left.Equals(right);
 
-/// <summary>Redacted job settings for a session. The job nonce is excluded.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionSettingsJobSnapshot
-{
-    /// <summary>Gets or sets the <c>builtInToolAvailability</c> value.</summary>
-    [JsonPropertyName("builtInToolAvailability")]
-    public SessionSettingsBuiltInToolAvailabilitySnapshot? BuiltInToolAvailability { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="ModelPolicyState"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelPolicyState left, ModelPolicyState right) => !(left == right);
 
-    /// <summary>Gets or sets the <c>eventType</c> value.</summary>
-    [JsonPropertyName("eventType")]
-    public string? EventType { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ModelPolicyState other && Equals(other);
 
-    /// <summary>Gets or sets the <c>isTriggerJob</c> value.</summary>
-    [JsonPropertyName("isTriggerJob")]
-    public bool? IsTriggerJob { get; set; }
-}
+    /// <inheritdoc />
+    public bool Equals(ModelPolicyState other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Redacted model routing settings for a session.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionSettingsModelSnapshot
-{
-    /// <summary>Gets or sets the <c>callbackUrl</c> value.</summary>
-    [JsonPropertyName("callbackUrl")]
-    public string? CallbackUrl { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Gets or sets the <c>defaultReasoningEffort</c> value.</summary>
-    [JsonPropertyName("defaultReasoningEffort")]
-    public string? DefaultReasoningEffort { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Gets or sets the <c>instanceId</c> value.</summary>
-    [JsonPropertyName("instanceId")]
-    public string? InstanceId { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{ModelPolicyState}"/> for serializing <see cref="ModelPolicyState"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ModelPolicyState>
+    {
+        /// <inheritdoc />
+        public override ModelPolicyState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Gets or sets the <c>model</c> value.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ModelPolicyState value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelPolicyState));
+        }
+    }
 }
 
-/// <summary>Online-evaluation settings safe to expose across the SDK boundary.</summary>
+
+/// <summary>Server transport type: stdio, http, sse (deprecated), or memory.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionSettingsOnlineEvaluationSnapshot
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct DiscoveredMcpServerType : IEquatable<DiscoveredMcpServerType>
 {
-    /// <summary>Gets or sets the <c>disableOnlineEvaluation</c> value.</summary>
-    [JsonPropertyName("disableOnlineEvaluation")]
-    public bool? DisableOnlineEvaluation { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Gets or sets the <c>enableOnlineEvaluationOutputFile</c> value.</summary>
-    [JsonPropertyName("enableOnlineEvaluationOutputFile")]
-    public bool? EnableOnlineEvaluationOutputFile { get; set; }
-}
+    /// <summary>Initializes a new instance of the <see cref="DiscoveredMcpServerType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="DiscoveredMcpServerType"/>.</param>
+    [JsonConstructor]
+    public DiscoveredMcpServerType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Redacted repository and GitHub host settings for a session.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionSettingsRepoSnapshot
-{
-    /// <summary>Gets or sets the <c>branch</c> value.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
+    /// <summary>Gets the value associated with this <see cref="DiscoveredMcpServerType"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Gets or sets the <c>commit</c> value.</summary>
-    [JsonPropertyName("commit")]
-    public string? Commit { get; set; }
+    /// <summary>Server communicates over stdio with a local child process.</summary>
+    public static DiscoveredMcpServerType Stdio { get; } = new("stdio");
 
-    /// <summary>Gets or sets the <c>host</c> value.</summary>
-    [JsonPropertyName("host")]
-    public string? Host { get; set; }
+    /// <summary>Server communicates over streamable HTTP.</summary>
+    public static DiscoveredMcpServerType Http { get; } = new("http");
 
-    /// <summary>Gets or sets the <c>hostProtocol</c> value.</summary>
-    [JsonPropertyName("hostProtocol")]
-    public string? HostProtocol { get; set; }
+    /// <summary>Server communicates over Server-Sent Events (deprecated).</summary>
+    public static DiscoveredMcpServerType Sse { get; } = new("sse");
 
-    /// <summary>Gets or sets the <c>id</c> value.</summary>
-    [JsonPropertyName("id")]
-    public double? Id { get; set; }
+    /// <summary>Server is backed by an in-memory runtime implementation.</summary>
+    public static DiscoveredMcpServerType Memory { get; } = new("memory");
 
-    /// <summary>Gets or sets the <c>name</c> value.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="DiscoveredMcpServerType"/> instances are equivalent.</summary>
+    public static bool operator ==(DiscoveredMcpServerType left, DiscoveredMcpServerType right) => left.Equals(right);
 
-    /// <summary>Gets or sets the <c>ownerId</c> value.</summary>
-    [JsonPropertyName("ownerId")]
-    public double? OwnerId { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="DiscoveredMcpServerType"/> instances are not equivalent.</summary>
+    public static bool operator !=(DiscoveredMcpServerType left, DiscoveredMcpServerType right) => !(left == right);
 
-    /// <summary>Gets or sets the <c>ownerName</c> value.</summary>
-    [JsonPropertyName("ownerName")]
-    public string? OwnerName { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is DiscoveredMcpServerType other && Equals(other);
 
-    /// <summary>Gets or sets the <c>prCommitCount</c> value.</summary>
-    [JsonPropertyName("prCommitCount")]
-    public double? PrCommitCount { get; set; }
+    /// <inheritdoc />
+    public bool Equals(DiscoveredMcpServerType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Gets or sets the <c>readWrite</c> value.</summary>
-    [JsonPropertyName("readWrite")]
-    public bool? ReadWrite { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Gets or sets the <c>secretScanningUrl</c> value.</summary>
-    [JsonPropertyName("secretScanningUrl")]
-    public string? SecretScanningUrl { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Gets or sets the <c>serverUrl</c> value.</summary>
-    [JsonPropertyName("serverUrl")]
-    public string? ServerUrl { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{DiscoveredMcpServerType}"/> for serializing <see cref="DiscoveredMcpServerType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<DiscoveredMcpServerType>
+    {
+        /// <inheritdoc />
+        public override DiscoveredMcpServerType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, DiscoveredMcpServerType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DiscoveredMcpServerType));
+        }
+    }
 }
 
-/// <summary>Redacted validation and memory-tool settings for a session.</summary>
+
+/// <summary>A wire feature a caller can require of the catalog surface, negotiated per request. A grant means the runtime understands the feature's contract, not that the deployment has enabled the operation; typed unavailable results report availability separately.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionSettingsValidationSnapshot
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogCapability : IEquatable<CatalogCapability>
 {
-    /// <summary>Gets or sets the <c>advisoryEnabled</c> value.</summary>
-    [JsonPropertyName("advisoryEnabled")]
-    public bool? AdvisoryEnabled { get; set; }
-
-    /// <summary>Gets or sets the <c>codeqlEnabled</c> value.</summary>
-    [JsonPropertyName("codeqlEnabled")]
-    public bool? CodeqlEnabled { get; set; }
-
-    /// <summary>Gets or sets the <c>codeReviewEnabled</c> value.</summary>
-    [JsonPropertyName("codeReviewEnabled")]
-    public bool? CodeReviewEnabled { get; set; }
-
-    /// <summary>Gets or sets the <c>codeReviewModel</c> value.</summary>
-    [JsonPropertyName("codeReviewModel")]
-    public string? CodeReviewModel { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Gets or sets the <c>dependabotTimeout</c> value.</summary>
-    [JsonPropertyName("dependabotTimeout")]
-    public double? DependabotTimeout { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="CatalogCapability"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogCapability"/>.</param>
+    [JsonConstructor]
+    public CatalogCapability(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Gets or sets the <c>memoryStoreEnabled</c> value.</summary>
-    [JsonPropertyName("memoryStoreEnabled")]
-    public bool? MemoryStoreEnabled { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogCapability"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Gets or sets the <c>memoryVoteEnabled</c> value.</summary>
-    [JsonPropertyName("memoryVoteEnabled")]
-    public bool? MemoryVoteEnabled { get; set; }
+    /// <summary>Understands the current `application/mcp-server-card+json` media type.</summary>
+    public static CatalogCapability McpServerCard { get; } = new("mcp-server-card");
 
-    /// <summary>Gets or sets the <c>secretScanningEnabled</c> value.</summary>
-    [JsonPropertyName("secretScanningEnabled")]
-    public bool? SecretScanningEnabled { get; set; }
+    /// <summary>Understands the legacy `application/mcp-server+json` media type.</summary>
+    public static CatalogCapability LegacyMcpServerCard { get; } = new("legacy-mcp-server-card");
 
-    /// <summary>Gets or sets the <c>timeout</c> value.</summary>
-    [JsonPropertyName("timeout")]
-    public double? Timeout { get; set; }
-}
+    /// <summary>Understands `application/ai-skill` candidates as discovery-only and typed non-installable.</summary>
+    public static CatalogCapability AiSkillDiscovery { get; } = new("ai-skill-discovery");
 
-/// <summary>Redacted, serializable view of session runtime settings for SDK boundary consumers. Secrets and raw feature flags are intentionally excluded.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSettingsSnapshot
-{
-    /// <summary>Gets or sets the <c>clientName</c> value.</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
+    /// <summary>Understands side-effect-free MCP install-plan requests, results, and plan handles; `planning-unavailable` separately reports that planning is not enabled.</summary>
+    public static CatalogCapability McpInstallPlanning { get; } = new("mcp-install-planning");
 
-    /// <summary>Gets or sets the <c>job</c> value.</summary>
-    [JsonPropertyName("job")]
-    public SessionSettingsJobSnapshot Job { get => field ??= new(); set; }
+    /// <summary>Understands plans that enumerate every eligible transport rather than a single preferred one.</summary>
+    public static CatalogCapability MultipleTransportChoice { get; } = new("multiple-transport-choice");
 
-    /// <summary>Gets or sets the <c>model</c> value.</summary>
-    [JsonPropertyName("model")]
-    public SessionSettingsModelSnapshot Model { get => field ??= new(); set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogCapability"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogCapability left, CatalogCapability right) => left.Equals(right);
 
-    /// <summary>Gets or sets the <c>onlineEvaluation</c> value.</summary>
-    [JsonPropertyName("onlineEvaluation")]
-    public SessionSettingsOnlineEvaluationSnapshot OnlineEvaluation { get => field ??= new(); set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogCapability"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogCapability left, CatalogCapability right) => !(left == right);
 
-    /// <summary>Gets or sets the <c>repo</c> value.</summary>
-    [JsonPropertyName("repo")]
-    public SessionSettingsRepoSnapshot Repo { get => field ??= new(); set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogCapability other && Equals(other);
 
-    /// <summary>Gets or sets the <c>startTimeMs</c> value.</summary>
-    [JsonPropertyName("startTimeMs")]
-    public double? StartTimeMs { get; set; }
+    /// <inheritdoc />
+    public bool Equals(CatalogCapability other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Gets or sets the <c>timeoutMs</c> value.</summary>
-    [JsonPropertyName("timeoutMs")]
-    public double? TimeoutMs { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Gets or sets the <c>validation</c> value.</summary>
-    [JsonPropertyName("validation")]
-    public SessionSettingsValidationSnapshot Validation { get => field ??= new(); set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Gets or sets the <c>version</c> value.</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
-}
+    /// <summary>Provides a <see cref="JsonConverter{CatalogCapability}"/> for serializing <see cref="CatalogCapability"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogCapability>
+    {
+        /// <inheritdoc />
+        public override CatalogCapability Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSettingsSnapshotRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogCapability value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogCapability));
+        }
+    }
 }
 
-/// <summary>Result of evaluating a Rust-owned settings predicate.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSettingsEvaluatePredicateResult
-{
-    /// <summary>Gets or sets the <c>enabled</c> value.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-}
 
-/// <summary>Named Rust-owned settings predicate to evaluate for this session.</summary>
+/// <summary>Whether a planned configuration change would create or modify an entry.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSettingsEvaluatePredicateRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpPlanConfigurationOperation : IEquatable<McpPlanConfigurationOperation>
 {
-    /// <summary>Predicate name. The runtime owns the raw feature-flag names and composition logic.</summary>
-    [JsonPropertyName("name")]
-    public SessionSettingsPredicateName Name { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Tool name for tool-scoped predicates such as trivial-change handling.</summary>
-    [JsonPropertyName("toolName")]
-    public string? ToolName { get; set; }
-}
+    /// <summary>Initializes a new instance of the <see cref="McpPlanConfigurationOperation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpPlanConfigurationOperation"/>.</param>
+    [JsonConstructor]
+    public McpPlanConfigurationOperation(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Content-exclusion decision for one requested path.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ContentExclusionPathCheck
-{
-    /// <summary>Whether the session's complete content-exclusion policy excludes the path.</summary>
-    [JsonPropertyName("excluded")]
-    public bool Excluded { get; set; }
+    /// <summary>Gets the value associated with this <see cref="McpPlanConfigurationOperation"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>The path supplied by the caller.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-}
+    /// <summary>Creates a configuration entry that does not exist yet.</summary>
+    public static McpPlanConfigurationOperation Add { get; } = new("add");
 
-/// <summary>Batch content-exclusion result. Callers must fail closed when policy evaluation is unavailable.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ContentExclusionCheckPathsResult
-{
-    /// <summary>Whether the session's policy service was available for the complete batch. When false, checks is empty and callers must treat every requested path as excluded.</summary>
-    [JsonPropertyName("available")]
-    public bool Available { get; set; }
+    /// <summary>Modifies a configuration entry that already exists.</summary>
+    public static McpPlanConfigurationOperation Update { get; } = new("update");
 
-    /// <summary>Per-path decisions in request order. Empty when available is false.</summary>
-    [JsonPropertyName("checks")]
-    public IList<ContentExclusionPathCheck> Checks { get => field ??= []; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanConfigurationOperation"/> instances are equivalent.</summary>
+    public static bool operator ==(McpPlanConfigurationOperation left, McpPlanConfigurationOperation right) => left.Equals(right);
 
-/// <summary>Local file system absolute paths within the session working directory to check against its content-exclusion policy.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ContentExclusionCheckPathsRequest
-{
-    /// <summary>Local file system absolute paths within the session working directory to check. Results are returned in the same order, including duplicates.</summary>
-    [JsonPropertyName("paths")]
-    public IList<string> Paths { get => field ??= []; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanConfigurationOperation"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpPlanConfigurationOperation left, McpPlanConfigurationOperation right) => !(left == right);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpPlanConfigurationOperation other && Equals(other);
 
-/// <summary>Identifier of the spawned process, used to correlate streamed output and exit notifications.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ShellExecResult
-{
-    /// <summary>Unique identifier for tracking streamed output.</summary>
-    [JsonPropertyName("processId")]
-    public string ProcessId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(McpPlanConfigurationOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Shell command to run, with optional working directory and timeout in milliseconds.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ShellExecRequest
-{
-    /// <summary>Shell command to execute.</summary>
-    [JsonPropertyName("command")]
-    public string Command { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Working directory (defaults to session working directory).</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{McpPlanConfigurationOperation}"/> for serializing <see cref="McpPlanConfigurationOperation"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpPlanConfigurationOperation>
+    {
+        /// <inheritdoc />
+        public override McpPlanConfigurationOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Timeout in milliseconds (default: 30000).</summary>
-    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
-    [JsonPropertyName("timeout")]
-    public TimeSpan? Timeout { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpPlanConfigurationOperation value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpPlanConfigurationOperation));
+        }
+    }
 }
 
-/// <summary>Indicates whether the signal was delivered; false if the process was unknown or already exited.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ShellKillResult
-{
-    /// <summary>Whether the signal was sent successfully.</summary>
-    [JsonPropertyName("killed")]
-    public bool Killed { get; set; }
-}
 
-/// <summary>Identifier of a process previously returned by "shell.exec" and the signal to send.</summary>
+/// <summary>Configuration scope an MCP install plan targets.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ShellKillRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpPlanScope : IEquatable<McpPlanScope>
 {
-    /// <summary>Process identifier returned by shell.exec.</summary>
-    [JsonPropertyName("processId")]
-    public string ProcessId { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Initializes a new instance of the <see cref="McpPlanScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpPlanScope"/>.</param>
+    [JsonConstructor]
+    public McpPlanScope(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Signal to send (default: SIGTERM).</summary>
-    [JsonPropertyName("signal")]
-    public ShellKillSignal? Signal { get; set; }
-}
+    /// <summary>Gets the value associated with this <see cref="McpPlanScope"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>Result of a user-requested shell command.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class UserRequestedShellCommandResult
-{
-    /// <summary>Error output when the execution failed.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>The user's own MCP configuration.</summary>
+    public static McpPlanScope User { get; } = new("user");
 
-    /// <summary>Process exit code, when available.</summary>
-    [JsonPropertyName("exitCode")]
-    public long? ExitCode { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanScope"/> instances are equivalent.</summary>
+    public static bool operator ==(McpPlanScope left, McpPlanScope right) => left.Equals(right);
 
-    /// <summary>Captured command output.</summary>
-    [JsonPropertyName("output")]
-    public string Output { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpPlanScope left, McpPlanScope right) => !(left == right);
 
-    /// <summary>Whether the command completed successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpPlanScope other && Equals(other);
 
-    /// <summary>Tool call id emitted for the shell execution.</summary>
-    [JsonPropertyName("toolCallId")]
-    public string ToolCallId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(McpPlanScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>User-requested shell command and cancellation handle.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ShellExecuteUserRequestedRequest
-{
-    /// <summary>Shell command to execute.</summary>
-    [JsonPropertyName("command")]
-    public string Command { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Caller-provided cancellation handle for this execution.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{McpPlanScope}"/> for serializing <see cref="McpPlanScope"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpPlanScope>
+    {
+        /// <inheritdoc />
+        public override McpPlanScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpPlanScope value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpPlanScope));
+        }
+    }
 }
 
-/// <summary>Cancellation result for a user-requested shell command.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class CancelUserRequestedShellCommandResult
-{
-    /// <summary>Whether an in-flight execution was found and signalled to cancel.</summary>
-    [JsonPropertyName("cancelled")]
-    public bool Cancelled { get; set; }
-}
 
-/// <summary>User-requested shell execution cancellation handle.</summary>
+/// <summary>What policy decided for a planned server.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ShellCancelUserRequestedRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpPlanPolicyDecision : IEquatable<McpPlanPolicyDecision>
 {
-    /// <summary>Request ID previously passed to executeUserRequested.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Initializes a new instance of the <see cref="McpPlanPolicyDecision"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpPlanPolicyDecision"/>.</param>
+    [JsonConstructor]
+    public McpPlanPolicyDecision(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Post-compaction context window usage breakdown.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistoryCompactContextWindow
-{
-    /// <summary>Token count from non-system messages (user, assistant, tool).</summary>
-    [JsonPropertyName("conversationTokens")]
-    public long? ConversationTokens { get; set; }
+    /// <summary>Gets the value associated with this <see cref="McpPlanPolicyDecision"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Current total tokens in the context window (system + conversation + tool definitions).</summary>
-    [JsonPropertyName("currentTokens")]
-    public long CurrentTokens { get; set; }
+    /// <summary>Policy permits the server.</summary>
+    public static McpPlanPolicyDecision Allowed { get; } = new("allowed");
 
-    /// <summary>Current number of messages in the conversation.</summary>
-    [JsonPropertyName("messagesLength")]
-    public long MessagesLength { get; set; }
+    /// <summary>Policy forbids the server, so the plan cannot be applied.</summary>
+    public static McpPlanPolicyDecision Blocked { get; } = new("blocked");
 
-    /// <summary>Token count from system message(s).</summary>
-    [JsonPropertyName("systemTokens")]
-    public long? SystemTokens { get; set; }
+    /// <summary>Policy permits the server only after an explicit approval.</summary>
+    public static McpPlanPolicyDecision RequiresApproval { get; } = new("requires-approval");
 
-    /// <summary>Maximum token count for the model's context window.</summary>
-    [JsonPropertyName("tokenLimit")]
-    public long TokenLimit { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanPolicyDecision"/> instances are equivalent.</summary>
+    public static bool operator ==(McpPlanPolicyDecision left, McpPlanPolicyDecision right) => left.Equals(right);
 
-    /// <summary>Token count from tool definitions.</summary>
-    [JsonPropertyName("toolDefinitionsTokens")]
-    public long? ToolDefinitionsTokens { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanPolicyDecision"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpPlanPolicyDecision left, McpPlanPolicyDecision right) => !(left == right);
 
-/// <summary>Compaction outcome with the number of tokens and messages removed, summary text, and the resulting context window breakdown.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistoryCompactResult
-{
-    /// <summary>Post-compaction context window usage breakdown.</summary>
-    [JsonPropertyName("contextWindow")]
-    public HistoryCompactContextWindow? ContextWindow { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpPlanPolicyDecision other && Equals(other);
 
-    /// <summary>Number of messages removed during compaction.</summary>
-    [JsonPropertyName("messagesRemoved")]
-    public long MessagesRemoved { get; set; }
+    /// <inheritdoc />
+    public bool Equals(McpPlanPolicyDecision other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Whether compaction completed successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Summary text produced by compaction. Omitted when compaction did not produce a summary (e.g. failure path).</summary>
-    [JsonPropertyName("summaryContent")]
-    public string? SummaryContent { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Number of tokens freed by compaction.</summary>
-    [JsonPropertyName("tokensRemoved")]
-    public long TokensRemoved { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{McpPlanPolicyDecision}"/> for serializing <see cref="McpPlanPolicyDecision"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpPlanPolicyDecision>
+    {
+        /// <inheritdoc />
+        public override McpPlanPolicyDecision Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpPlanPolicyDecision value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpPlanPolicyDecision));
+        }
+    }
 }
 
-/// <summary>RPC data type for SessionHistoryCompact operations.</summary>
+
+/// <summary>Which authority produced a policy decision.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionHistoryCompactRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpPlanPolicySource : IEquatable<McpPlanPolicySource>
 {
-    /// <summary>Optional user-provided instructions to focus the compaction summary.</summary>
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MaxLength(4000)]
-    [JsonPropertyName("customInstructions")]
-    public string? CustomInstructions { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Context window token limit this compaction is targeting, recorded as the `tokenLimit` on the persisted `session.compaction_start` / `session.compaction_complete` events. Set it when the compaction targets a window other than the compacting model's own, e.g. switching to a model with a smaller context window: the compaction still runs on the current model, so the limit that motivated it would otherwise be lost. When absent, the events record the compacting model's own resolved limit. Attribution metadata only - it does not change how much the compaction removes.</summary>
-    [JsonPropertyName("tokenLimit")]
-    public long? TokenLimit { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="McpPlanPolicySource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpPlanPolicySource"/>.</param>
+    [JsonConstructor]
+    public McpPlanPolicySource(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>What initiated this compaction request, recorded as the `trigger` on the persisted `session.compaction_start` / `session.compaction_complete` events. When absent, the compaction is persisted without trigger attribution (initiator unknown).</summary>
-    [JsonPropertyName("trigger")]
-    public SessionHistoryCompactRequestTrigger? Trigger { get; set; }
-}
+    /// <summary>Gets the value associated with this <see cref="McpPlanPolicySource"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>RPC data type for SessionHistoryCompactRequestWithSession operations.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionHistoryCompactRequestWithSession
-{
-    /// <summary>Optional user-provided instructions to focus the compaction summary.</summary>
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MaxLength(4000)]
-    [JsonPropertyName("customInstructions")]
-    public string? CustomInstructions { get; set; }
+    /// <summary>No policy applied, so the server is permitted by default.</summary>
+    public static McpPlanPolicySource None { get; } = new("none");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>An enterprise allowlist evaluated the server.</summary>
+    public static McpPlanPolicySource EnterpriseAllowlist { get; } = new("enterprise-allowlist");
 
-    /// <summary>Context window token limit this compaction is targeting, recorded as the `tokenLimit` on the persisted `session.compaction_start` / `session.compaction_complete` events. Set it when the compaction targets a window other than the compacting model's own, e.g. switching to a model with a smaller context window: the compaction still runs on the current model, so the limit that motivated it would otherwise be lost. When absent, the events record the compacting model's own resolved limit. Attribution metadata only - it does not change how much the compaction removes.</summary>
-    [JsonPropertyName("tokenLimit")]
-    public long? TokenLimit { get; set; }
+    /// <summary>The registry the card came from evaluated the server.</summary>
+    public static McpPlanPolicySource RegistryPolicy { get; } = new("registry-policy");
 
-    /// <summary>What initiated this compaction request, recorded as the `trigger` on the persisted `session.compaction_start` / `session.compaction_complete` events. When absent, the compaction is persisted without trigger attribution (initiator unknown).</summary>
-    [JsonPropertyName("trigger")]
-    public SessionHistoryCompactRequestTrigger? Trigger { get; set; }
-}
+    /// <summary>Local trust settings evaluated the server.</summary>
+    public static McpPlanPolicySource LocalTrust { get; } = new("local-trust");
 
-/// <summary>Number of events that were removed by the truncation.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistoryTruncateResult
-{
-    /// <summary>Failure detail when checkpointCleanupFailed is true.</summary>
-    [JsonPropertyName("checkpointCleanupError")]
-    public string? CheckpointCleanupError { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanPolicySource"/> instances are equivalent.</summary>
+    public static bool operator ==(McpPlanPolicySource left, McpPlanPolicySource right) => left.Equals(right);
 
-    /// <summary>True when conversation truncation succeeded but post-truncation workspace checkpoint cleanup failed. History is already truncated; callers may still prune snapshots but should report a checkpoint-cleanup rather than a truncation failure.</summary>
-    [JsonPropertyName("checkpointCleanupFailed")]
-    public bool? CheckpointCleanupFailed { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanPolicySource"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpPlanPolicySource left, McpPlanPolicySource right) => !(left == right);
 
-    /// <summary>Number of events that were removed.</summary>
-    [JsonPropertyName("eventsRemoved")]
-    public long EventsRemoved { get; set; }
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpPlanPolicySource other && Equals(other);
 
-/// <summary>Identifier of the event to truncate to; this event and all later events are removed.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class HistoryTruncateRequest
-{
-    /// <summary>Event ID to truncate to. This event and all events after it are removed from the session.</summary>
-    [JsonPropertyName("eventId")]
-    public string EventId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(McpPlanPolicySource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{McpPlanPolicySource}"/> for serializing <see cref="McpPlanPolicySource"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpPlanPolicySource>
+    {
+        /// <inheritdoc />
+        public override McpPlanPolicySource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpPlanPolicySource value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpPlanPolicySource));
+        }
+    }
 }
 
-/// <summary>A root user turn that the session can rewind to.</summary>
+
+/// <summary>Canonical digest algorithm for a validated MCP card.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class HistoryRewindPoint
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CardDigestAlgorithm : IEquatable<CardDigestAlgorithm>
 {
-    /// <summary>Whether at least one file in this turn or a later turn can be restored.</summary>
-    [JsonPropertyName("canRestoreFiles")]
-    public bool CanRestoreFiles { get; set; }
-
-    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
-    [JsonPropertyName("eventId")]
-    public string EventId { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Number of unique files in this turn and all later turns that have captured changes.</summary>
-    [JsonPropertyName("fileCount")]
-    public long FileCount { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="CardDigestAlgorithm"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CardDigestAlgorithm"/>.</param>
+    [JsonConstructor]
+    public CardDigestAlgorithm(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Whether this turn was an automatically injected autopilot continuation.</summary>
-    [JsonPropertyName("isAutopilotContinuation")]
-    public bool IsAutopilotContinuation { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CardDigestAlgorithm"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Lines added by this turn's captured file changes.</summary>
-    [JsonPropertyName("linesAdded")]
-    public long LinesAdded { get; set; }
+    /// <summary>SHA-256 over RFC 8785 canonical JSON encoded as UTF-8.</summary>
+    public static CardDigestAlgorithm Sha256Rfc8785 { get; } = new("sha256-rfc8785");
 
-    /// <summary>Lines removed by this turn's captured file changes.</summary>
-    [JsonPropertyName("linesRemoved")]
-    public long LinesRemoved { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CardDigestAlgorithm"/> instances are equivalent.</summary>
+    public static bool operator ==(CardDigestAlgorithm left, CardDigestAlgorithm right) => left.Equals(right);
 
-    /// <summary>ISO timestamp of the user turn.</summary>
-    [JsonPropertyName("timestamp")]
-    public string Timestamp { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="CardDigestAlgorithm"/> instances are not equivalent.</summary>
+    public static bool operator !=(CardDigestAlgorithm left, CardDigestAlgorithm right) => !(left == right);
 
-    /// <summary>Whether this turn itself captured any file changes.</summary>
-    [JsonPropertyName("turnChangedFiles")]
-    public bool TurnChangedFiles { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CardDigestAlgorithm other && Equals(other);
 
-    /// <summary>User-visible message text for the turn.</summary>
-    [JsonPropertyName("userMessage")]
-    public string UserMessage { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(CardDigestAlgorithm other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Rewind points and file-change-tracking availability for the session.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistoryListRewindPointsResult
-{
-    /// <summary>Whether this session captured file changes from its first turn.</summary>
-    [JsonPropertyName("fileChangeTrackingEnabled")]
-    public bool FileChangeTrackingEnabled { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Root user turns in chronological order. Empty when `unavailableReason` is set.</summary>
-    [JsonPropertyName("points")]
-    public IList<HistoryRewindPoint> Points { get => field ??= []; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Why the listed points could not be produced, when applicable; the points list is empty whenever it is set. `unsupported-remote-session` is permanent for the session and comes with `fileChangeTrackingEnabled: false`. `session-busy` is transient and only ever reported by a session that *is* tracking (`fileChangeTrackingEnabled: true`), because the file-change captures cannot be read while work that may still mutate them is in flight; the same request succeeds once the session settles, so a client that wants points should retry rather than treat it as a failure. It is never `file-change-tracking-disabled`: an untracked local session still lists conversation-only points and reports that through `fileChangeTrackingEnabled: false`.</summary>
-    [JsonPropertyName("unavailableReason")]
-    public HistoryRewindUnavailableReason? UnavailableReason { get; set; }
-}
+    /// <summary>Provides a <see cref="JsonConverter{CardDigestAlgorithm}"/> for serializing <see cref="CardDigestAlgorithm"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CardDigestAlgorithm>
+    {
+        /// <inheritdoc />
+        public override CardDigestAlgorithm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionHistoryListRewindPointsRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CardDigestAlgorithm value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CardDigestAlgorithm));
+        }
+    }
 }
 
-/// <summary>A file that a conversation-and-files rewind would restore.</summary>
+
+/// <summary>JSON MCP card media type accepted for install planning.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class HistoryRewindFilePreview
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpServerCardMediaType : IEquatable<McpServerCardMediaType>
 {
-    /// <summary>Aggregate change made across the discarded turns.</summary>
-    [JsonPropertyName("changeType")]
-    public HistoryRewindChangeType ChangeType { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Lines added across the discarded turns.</summary>
-    [JsonPropertyName("linesAdded")]
-    public long LinesAdded { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="McpServerCardMediaType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpServerCardMediaType"/>.</param>
+    [JsonConstructor]
+    public McpServerCardMediaType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Lines removed across the discarded turns.</summary>
-    [JsonPropertyName("linesRemoved")]
-    public long LinesRemoved { get; set; }
+    /// <summary>Gets the value associated with this <see cref="McpServerCardMediaType"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Absolute path of the captured file.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-}
+    /// <summary>The current MCP server card media type.</summary>
+    public static McpServerCardMediaType ApplicationMcpServerCardJson { get; } = new("application/mcp-server-card+json");
 
-/// <summary>Files and aggregate changes for a prospective rewind.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistoryPreviewRewindResult
-{
-    /// <summary>Whether file restore is available for this session. This is authoritative: switch on it and read `reason` only when it is false.</summary>
-    [JsonPropertyName("available")]
-    public bool Available { get; set; }
+    /// <summary>The legacy MCP server card media type, accepted for compatibility.</summary>
+    public static McpServerCardMediaType ApplicationMcpServerJson { get; } = new("application/mcp-server+json");
 
-    /// <summary>Number of unique files in the preview.</summary>
-    [JsonPropertyName("fileCount")]
-    public long FileCount { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpServerCardMediaType"/> instances are equivalent.</summary>
+    public static bool operator ==(McpServerCardMediaType left, McpServerCardMediaType right) => left.Equals(right);
 
-    /// <summary>Files ordered by path.</summary>
-    [JsonPropertyName("files")]
-    public IList<HistoryRewindFilePreview> Files { get => field ??= []; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpServerCardMediaType"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpServerCardMediaType left, McpServerCardMediaType right) => !(left == right);
 
-    /// <summary>Why file restore is unavailable, when applicable. Populated only when `available` is false and never set when `available` is true.</summary>
-    [JsonPropertyName("reason")]
-    public HistoryRewindUnavailableReason? Reason { get; set; }
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpServerCardMediaType other && Equals(other);
 
-/// <summary>Event boundary to preview for conversation-and-files rewind.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class HistoryPreviewRewindRequest
-{
-    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
-    [JsonPropertyName("eventId")]
-    public string EventId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(McpServerCardMediaType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>A captured file that rewind intentionally left unchanged.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistorySkippedFileRestore
-{
-    /// <summary>Absolute path of the skipped file.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Reason the file was not restored.</summary>
-    [JsonPropertyName("reason")]
-    public HistoryFileRestoreSkipReason Reason { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{McpServerCardMediaType}"/> for serializing <see cref="McpServerCardMediaType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpServerCardMediaType>
+    {
+        /// <inheritdoc />
+        public override McpServerCardMediaType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpServerCardMediaType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpServerCardMediaType));
+        }
+    }
 }
 
-/// <summary>Structured outcome of a rewind request.</summary>
+
+/// <summary>Where a required value is applied when the planned server is launched.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class HistoryRewindResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpPlanValueCategory : IEquatable<McpPlanValueCategory>
 {
-    /// <summary>Failure detail. Set only for the failure and partial-failure outcomes (`files-rolled-back`, `rollback-incomplete`, `truncation-failed`, `checkpoint-cleanup-failed`, `snapshot-prune-failed`); omitted for `success` and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`).</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Number of persisted events removed by conversation truncation. Present only when truncation succeeded (outcomes `success`, `checkpoint-cleanup-failed`, and `snapshot-prune-failed`); omitted for every unavailable outcome (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`) and for `truncation-failed`, `files-rolled-back`, and `rollback-incomplete`.</summary>
-    [JsonPropertyName("eventsRemoved")]
-    public long? EventsRemoved { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="McpPlanValueCategory"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpPlanValueCategory"/>.</param>
+    [JsonConstructor]
+    public McpPlanValueCategory(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Overall rewind outcome. This discriminates the result: it governs which of the remaining fields are populated, so consumers must switch on it before reading `eventsRemoved`, `restoredFiles`, `skippedFiles`, or `error`. See each field for the outcomes that populate it.</summary>
-    [JsonPropertyName("outcome")]
-    public HistoryRewindOutcome Outcome { get; set; }
+    /// <summary>Gets the value associated with this <see cref="McpPlanValueCategory"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Absolute paths restored to their captured preimages. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.</summary>
-    [JsonPropertyName("restoredFiles")]
-    public IList<string> RestoredFiles { get => field ??= []; set; }
+    /// <summary>Set as an environment variable on the launched process.</summary>
+    public static McpPlanValueCategory EnvironmentVariable { get; } = new("environment-variable");
 
-    /// <summary>Captured files intentionally left unchanged. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.</summary>
-    [JsonPropertyName("skippedFiles")]
-    public IList<HistorySkippedFileRestore> SkippedFiles { get => field ??= []; set; }
-}
+    /// <summary>Passed to the runtime that launches the package.</summary>
+    public static McpPlanValueCategory RuntimeArgument { get; } = new("runtime-argument");
 
-/// <summary>Boundary and mode for rewinding session history.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class HistoryRewindRequest
-{
-    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
-    [JsonPropertyName("eventId")]
-    public string EventId { get; set; } = string.Empty;
+    /// <summary>Passed to the packaged server itself.</summary>
+    public static McpPlanValueCategory PackageArgument { get; } = new("package-argument");
 
-    /// <summary>Whether to rewind only conversation history or also restore captured files.</summary>
-    [JsonPropertyName("mode")]
-    public HistoryRewindMode Mode { get; set; }
+    /// <summary>Sent as a request header to a remote endpoint.</summary>
+    public static McpPlanValueCategory Header { get; } = new("header");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Substituted into the remote endpoint URL.</summary>
+    public static McpPlanValueCategory UrlVariable { get; } = new("url-variable");
 
-/// <summary>Indicates whether an in-progress background compaction was cancelled.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistoryCancelBackgroundCompactionResult
-{
-    /// <summary>Whether an in-progress background compaction was cancelled. False when no compaction was running, when the session is remote, or when the underlying processor was unavailable.</summary>
-    [JsonPropertyName("cancelled")]
-    public bool Cancelled { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanValueCategory"/> instances are equivalent.</summary>
+    public static bool operator ==(McpPlanValueCategory left, McpPlanValueCategory right) => left.Equals(right);
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionHistoryCancelBackgroundCompactionRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanValueCategory"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpPlanValueCategory left, McpPlanValueCategory right) => !(left == right);
 
-/// <summary>Indicates whether an in-progress manual compaction was aborted.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistoryAbortManualCompactionResult
-{
-    /// <summary>Whether an in-progress manual compaction was aborted. False when no manual compaction was running, when its abort controller was already aborted, or when the session is remote.</summary>
-    [JsonPropertyName("aborted")]
-    public bool Aborted { get; set; }
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpPlanValueCategory other && Equals(other);
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionHistoryAbortManualCompactionRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(McpPlanValueCategory other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Markdown summary of the conversation context (empty when not available).</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistorySummarizeForHandoffResult
-{
-    /// <summary>Markdown summary of the conversation context produced by an LLM. Empty string when there are no messages or when the session does not support local summarization.</summary>
-    [JsonPropertyName("summary")]
-    public string Summary { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionHistorySummarizeForHandoffRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>What a successful clear removed. A clear that could not be applied rejects instead of reporting a count.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class HistoryClearContextResult
-{
-    /// <summary>Number of non-system, non-developer messages that were removed from the conversation. Zero only when the window already held no conversation.</summary>
-    [JsonPropertyName("messagesCleared")]
-    public long MessagesCleared { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{McpPlanValueCategory}"/> for serializing <see cref="McpPlanValueCategory"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpPlanValueCategory>
+    {
+        /// <inheritdoc />
+        public override McpPlanValueCategory Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpPlanValueCategory value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpPlanValueCategory));
+        }
+    }
 }
 
-/// <summary>Parameters for clearing the conversation and seeding the window that replaces it.</summary>
+
+/// <summary>Scalar type a required value must conform to.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class HistoryClearContextRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpPlanScalarValueType : IEquatable<McpPlanScalarValueType>
 {
-    /// <summary>First user message of the fresh context window. Required: a cleared window holding only system and developer messages is not a conversation a model can answer, so every clear seeds the window it creates. Delivered by the enclosing turn driver once the agentic loop exits, which is why the call must be made from inside a tool handler.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Initializes a new instance of the <see cref="McpPlanScalarValueType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpPlanScalarValueType"/>.</param>
+    [JsonConstructor]
+    public McpPlanScalarValueType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>User-facing pending queue entry, with kind and display text for a queued message, slash command, or model change.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class QueuePendingItems
-{
-    /// <summary>Agent mode stored on this queued entry, as stamped when it was enqueued. Items without an explicit mode report interactive. This is not necessarily the mode that will constrain the turn: a plan or autopilot session applies its own write gate, continuation loop and permission posture to every drained item regardless of the mode stored here.</summary>
-    [JsonPropertyName("agentMode")]
-    public SendAgentMode AgentMode { get; set; }
+    /// <summary>Gets the value associated with this <see cref="McpPlanScalarValueType"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Human-readable text to display for this queue entry in the UI.</summary>
-    [JsonPropertyName("displayText")]
-    public string DisplayText { get; set; } = string.Empty;
+    /// <summary>Free text.</summary>
+    public static McpPlanScalarValueType String { get; } = new("string");
 
-    /// <summary>Stable opaque id for the canonical queued item. Batch rows share one id.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>A number.</summary>
+    public static McpPlanScalarValueType Number { get; } = new("number");
 
-    /// <summary>Whether this item is a queued user message or a queued slash command / model change.</summary>
-    [JsonPropertyName("kind")]
-    public QueuePendingItemsKind Kind { get; set; }
+    /// <summary>A boolean.</summary>
+    public static McpPlanScalarValueType Boolean { get; } = new("boolean");
+
+    /// <summary>A filesystem path.</summary>
+    public static McpPlanScalarValueType Path { get; } = new("path");
+
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanScalarValueType"/> instances are equivalent.</summary>
+    public static bool operator ==(McpPlanScalarValueType left, McpPlanScalarValueType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanScalarValueType"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpPlanScalarValueType left, McpPlanScalarValueType right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpPlanScalarValueType other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(McpPlanScalarValueType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{McpPlanScalarValueType}"/> for serializing <see cref="McpPlanScalarValueType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpPlanScalarValueType>
+    {
+        /// <inheritdoc />
+        public override McpPlanScalarValueType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpPlanScalarValueType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpPlanScalarValueType));
+        }
+    }
 }
 
-/// <summary>Snapshot of the session's pending queued items and immediate-steering messages.</summary>
+
+/// <summary>Discriminator for an enumerated required value.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class QueuePendingItemsResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpPlanEnumValueType : IEquatable<McpPlanEnumValueType>
 {
-    /// <summary>Pending queued items in submission order. Includes user messages, queued slash commands, and queued model changes; omits internal system items.</summary>
-    [JsonPropertyName("items")]
-    public IList<QueuePendingItems> Items { get => field ??= []; set; }
+    private readonly string? _value;
 
-    /// <summary>Display text for messages currently in the immediate steering queue (interjections sent during a running turn).</summary>
-    [JsonPropertyName("steeringMessages")]
-    public IList<string> SteeringMessages { get => field ??= []; set; }
-}
+    /// <summary>Initializes a new instance of the <see cref="McpPlanEnumValueType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpPlanEnumValueType"/>.</param>
+    [JsonConstructor]
+    public McpPlanEnumValueType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionQueuePendingItemsRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Gets the value associated with this <see cref="McpPlanEnumValueType"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>Internal snapshot of native queue state for local session orchestration.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueSnapshotResult
-{
-    /// <summary>Insertion orders for queued items, aligned with `items`.</summary>
-    [JsonPropertyName("itemOrders")]
-    public IList<long>? ItemOrders { get; set; }
+    /// <summary>One of a fixed, non-empty set of permitted values.</summary>
+    public static McpPlanEnumValueType Enum { get; } = new("enum");
 
-    /// <summary>User-facing pending items in FIFO order.</summary>
-    [JsonPropertyName("items")]
-    public IList<QueuePendingItems> Items { get => field ??= []; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanEnumValueType"/> instances are equivalent.</summary>
+    public static bool operator ==(McpPlanEnumValueType left, McpPlanEnumValueType right) => left.Equals(right);
 
-    /// <summary>Insertion orders for immediate steering messages, aligned with `steeringMessages`.</summary>
-    [JsonPropertyName("steeringMessageOrders")]
-    public IList<long>? SteeringMessageOrders { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanEnumValueType"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpPlanEnumValueType left, McpPlanEnumValueType right) => !(left == right);
 
-    /// <summary>Immediate steering messages waiting for an active turn.</summary>
-    [JsonPropertyName("steeringMessages")]
-    public IList<string> SteeringMessages { get => field ??= []; set; }
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpPlanEnumValueType other && Equals(other);
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionQueueSnapshotRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(McpPlanEnumValueType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Result of moving a queued item.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class QueueMoveItemResult
-{
-    /// <summary>True when the item changed position; false when it was already at the requested position.</summary>
-    [JsonPropertyName("changed")]
-    public bool Changed { get; set; }
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Parameters for moving a queued item by stable id.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueMoveItemRequest
-{
-    /// <summary>Stable opaque queued-item id.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{McpPlanEnumValueType}"/> for serializing <see cref="McpPlanEnumValueType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpPlanEnumValueType>
+    {
+        /// <inheritdoc />
+        public override McpPlanEnumValueType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Zero-based target position in the public visible queue. Values outside the queue clamp to an end.</summary>
-    [JsonPropertyName("toPosition")]
-    public long ToPosition { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpPlanEnumValueType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpPlanEnumValueType));
+        }
+    }
 }
 
-/// <summary>Result of inserting a queued message.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class QueueInsertAtResult
-{
-    /// <summary>Fresh stable opaque id assigned to the inserted item.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-}
 
-/// <summary>Serializable message fields accepted by queue.insertAt.</summary>
+/// <summary>Transport exposed by a locally launched package.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class QueueInsertMessage
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpPlanPackageTransport : IEquatable<McpPlanPackageTransport>
 {
-    /// <summary>Optional explicit agent mode. When omitted, the session's current mode is assigned.</summary>
-    [JsonPropertyName("agentMode")]
-    public SendAgentMode? AgentMode { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Optional attachments for the message.</summary>
-    [JsonPropertyName("attachments")]
-    public IList<Attachment>? Attachments { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="McpPlanPackageTransport"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpPlanPackageTransport"/>.</param>
+    [JsonConstructor]
+    public McpPlanPackageTransport(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Whether the message is billable.</summary>
-    [JsonPropertyName("billable")]
-    public bool? Billable { get; set; }
+    /// <summary>Gets the value associated with this <see cref="McpPlanPackageTransport"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Accepted for internal SendOptions compatibility but ignored; delivery is derived from current session activity.</summary>
-    [JsonPropertyName("delivery")]
-    public string? Delivery { get; set; }
+    /// <summary>A locally launched process spoken to over standard input and output.</summary>
+    public static McpPlanPackageTransport Stdio { get; } = new("stdio");
 
-    /// <summary>Optional user-facing display text.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanPackageTransport"/> instances are equivalent.</summary>
+    public static bool operator ==(McpPlanPackageTransport left, McpPlanPackageTransport right) => left.Equals(right);
 
-    /// <summary>Accepted for SendOptions compatibility but ignored; inserted items always use queued delivery semantics.</summary>
-    [JsonPropertyName("mode")]
-    public SendMode? Mode { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanPackageTransport"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpPlanPackageTransport left, McpPlanPackageTransport right) => !(left == right);
 
-    /// <summary>Accepted for SendOptions compatibility but ignored; the requested public position controls placement.</summary>
-    [JsonPropertyName("prepend")]
-    public bool? Prepend { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpPlanPackageTransport other && Equals(other);
 
-    /// <summary>The user message text.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(McpPlanPackageTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Per-turn request headers.</summary>
-    [JsonPropertyName("requestHeaders")]
-    public IDictionary<string, string>? RequestHeaders { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Required tool name for the turn, when any.</summary>
-    [JsonPropertyName("requiredTool")]
-    public string? RequiredTool { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Optional provenance source. `system` is rejected: it would hide the inserted row from `pendingItems` and make it unaddressable while still executing, so inserted items must stay visible.</summary>
-    [JsonPropertyName("source")]
-    public string? Source { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{McpPlanPackageTransport}"/> for serializing <see cref="McpPlanPackageTransport"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpPlanPackageTransport>
+    {
+        /// <inheritdoc />
+        public override McpPlanPackageTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Accepted for SendOptions compatibility but ignored; insertion scheduling is controlled by the queue drain state.</summary>
-    [JsonPropertyName("wait")]
-    public bool? Wait { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpPlanPackageTransport value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpPlanPackageTransport));
+        }
+    }
 }
 
-/// <summary>Parameters for inserting a queued message at a public visible position.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueInsertAtRequest
-{
-    /// <summary>Gets or sets the <c>message</c> value.</summary>
-    [JsonPropertyName("message")]
-    public QueueInsertMessage Message { get => field ??= new(); set; }
-
-    /// <summary>Zero-based position in the public visible queue. Values outside the queue clamp to an end.</summary>
-    [JsonPropertyName("position")]
-    public long Position { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>Result of removing a queued item.</summary>
+/// <summary>Transport exposed by a remote endpoint.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class QueueRemoveAtResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpPlanRemoteTransport : IEquatable<McpPlanRemoteTransport>
 {
-    /// <summary>True when the addressed item was removed.</summary>
-    [JsonPropertyName("removed")]
-    public bool Removed { get; set; }
-}
+    private readonly string? _value;
 
-/// <summary>Parameters for removing a queued item by stable id.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueRemoveAtRequest
-{
-    /// <summary>Gets or sets the <c>id</c> value.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Initializes a new instance of the <see cref="McpPlanRemoteTransport"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpPlanRemoteTransport"/>.</param>
+    [JsonConstructor]
+    public McpPlanRemoteTransport(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Gets the value associated with this <see cref="McpPlanRemoteTransport"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>Result of editing a queued message.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class QueueUpdateTextResult
-{
-    /// <summary>True when the stored text changed.</summary>
-    [JsonPropertyName("updated")]
-    public bool Updated { get; set; }
-}
+    /// <summary>An HTTP endpoint.</summary>
+    public static McpPlanRemoteTransport Http { get; } = new("http");
 
-/// <summary>Parameters for editing a single queued message.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueUpdateTextRequest
-{
-    /// <summary>Gets or sets the <c>displayPrompt</c> value.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>A streamable HTTP endpoint.</summary>
+    public static McpPlanRemoteTransport StreamableHttp { get; } = new("streamable-http");
 
-    /// <summary>Gets or sets the <c>id</c> value.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>A server-sent events endpoint.</summary>
+    public static McpPlanRemoteTransport Sse { get; } = new("sse");
 
-    /// <summary>Gets or sets the <c>prompt</c> value.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanRemoteTransport"/> instances are equivalent.</summary>
+    public static bool operator ==(McpPlanRemoteTransport left, McpPlanRemoteTransport right) => left.Equals(right);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="McpPlanRemoteTransport"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpPlanRemoteTransport left, McpPlanRemoteTransport right) => !(left == right);
 
-/// <summary>Result of duplicating a queued item.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class QueueDuplicateAtResult
-{
-    /// <summary>Fresh stable opaque id assigned to the duplicate.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is McpPlanRemoteTransport other && Equals(other);
 
-/// <summary>Parameters for duplicating a queued item.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueDuplicateAtRequest
-{
-    /// <summary>Gets or sets the <c>id</c> value.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(McpPlanRemoteTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Parameters for acquiring or releasing the queued-lane drain pause. Acquisition is exclusive and non-idempotent: `paused: true` against an already-paused session fails with `queue_already_paused`. The pause is never released automatically — it is not tied to the caller's lifetime, so a client that exits without sending `paused: false` leaves the lane frozen. Release is unowned: `paused: false` clears the pause for any caller, including one that never acquired it.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueSetDrainPausedRequest
-{
-    /// <summary>Gets or sets the <c>paused</c> value.</summary>
-    [JsonPropertyName("paused")]
-    public bool Paused { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{McpPlanRemoteTransport}"/> for serializing <see cref="McpPlanRemoteTransport"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<McpPlanRemoteTransport>
+    {
+        /// <inheritdoc />
+        public override McpPlanRemoteTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, McpPlanRemoteTransport value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpPlanRemoteTransport));
+        }
+    }
 }
 
-/// <summary>Result of trying to steer a queued message into a live turn.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class QueueSendNowResult
-{
-    /// <summary>True when the item was accepted into the steering lane; false when no main turn was live.</summary>
-    [JsonPropertyName("steered")]
-    public bool Steered { get; set; }
-}
 
-/// <summary>Parameters for steering a queued message into a live turn.</summary>
+/// <summary>Why capability and protocol-version negotiation refused a caller.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class QueueSendNowRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogNegotiationRefusedReason : IEquatable<CatalogNegotiationRefusedReason>
 {
-    /// <summary>Gets or sets the <c>id</c> value.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    private readonly string? _value;
 
-/// <summary>Whether the native queue has pending work.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueHasPendingResult
-{
-    /// <summary>True when queued or immediate native work is pending.</summary>
-    [JsonPropertyName("hasPending")]
-    public bool HasPending { get; set; }
-}
+    /// <summary>Initializes a new instance of the <see cref="CatalogNegotiationRefusedReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogNegotiationRefusedReason"/>.</param>
+    [JsonConstructor]
+    public CatalogNegotiationRefusedReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionQueueHasPendingRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Gets the value associated with this <see cref="CatalogNegotiationRefusedReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>Whether a deferred-idle drain should run.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueBeginDeferredIdleDrainResult
-{
-    /// <summary>True when the host should run finishDeferredIdleDrain asynchronously.</summary>
-    [JsonPropertyName("shouldDrain")]
-    public bool ShouldDrain { get; set; }
-}
+    /// <summary>The caller's protocol version is below the lowest this runtime serves.</summary>
+    public static CatalogNegotiationRefusedReason UnsupportedProtocolVersion { get; } = new("unsupported-protocol-version");
 
-/// <summary>Inputs for starting a deferred-idle drain.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueBeginDeferredIdleDrainRequest
-{
-    /// <summary>Whether the host still has active background work.</summary>
-    [JsonPropertyName("activeBackgroundWork")]
-    public bool ActiveBackgroundWork { get; set; }
+    /// <summary>The caller requires at least one capability this runtime cannot honour.</summary>
+    public static CatalogNegotiationRefusedReason UnsupportedCapability { get; } = new("unsupported-capability");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogNegotiationRefusedReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogNegotiationRefusedReason left, CatalogNegotiationRefusedReason right) => left.Equals(right);
 
-/// <summary>Action selected by the native deferred-idle drain.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueFinishDeferredIdleDrainResult
-{
-    /// <summary>Whether the deferred idle was caused by an aborted foreground turn.</summary>
-    [JsonPropertyName("aborted")]
-    public bool Aborted { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogNegotiationRefusedReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogNegotiationRefusedReason left, CatalogNegotiationRefusedReason right) => !(left == right);
 
-    /// <summary>One of none, processQueue, or emitSessionIdle.</summary>
-    [JsonPropertyName("action")]
-    public string Action { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogNegotiationRefusedReason other && Equals(other);
 
-/// <summary>Inputs for completing a deferred-idle drain.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueFinishDeferredIdleDrainRequest
-{
-    /// <summary>Whether the host still has active background work.</summary>
-    [JsonPropertyName("activeBackgroundWork")]
-    public bool ActiveBackgroundWork { get; set; }
+    /// <inheritdoc />
+    public bool Equals(CatalogNegotiationRefusedReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Whether native queued work remains.</summary>
-    [JsonPropertyName("hasPending")]
-    public bool HasPending { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>Inputs for marking session.idle deferred in native state.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueDeferSessionIdleRequest
-{
-    /// <summary>Whether the deferred idle was caused by an aborted foreground turn.</summary>
-    [JsonPropertyName("aborted")]
-    public bool Aborted { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{CatalogNegotiationRefusedReason}"/> for serializing <see cref="CatalogNegotiationRefusedReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogNegotiationRefusedReason>
+    {
+        /// <inheritdoc />
+        public override CatalogNegotiationRefusedReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogNegotiationRefusedReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogNegotiationRefusedReason));
+        }
+    }
 }
 
-/// <summary>Indicates whether a user-facing pending item was removed.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class QueueRemoveMostRecentResult
-{
-    /// <summary>True if a user-facing pending item was removed (LIFO across both queues); false when no removable items remained.</summary>
-    [JsonPropertyName("removed")]
-    public bool Removed { get; set; }
-}
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Which kind of opaque handle was presented.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionQueueRemoveMostRecentRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogHandleType : IEquatable<CatalogHandleType>
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    private readonly string? _value;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionQueueClearRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Initializes a new instance of the <see cref="CatalogHandleType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogHandleType"/>.</param>
+    [JsonConstructor]
+    public CatalogHandleType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Internal filter for consuming queued system notifications.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueConsumeSystemNotificationsRequest
-{
-    /// <summary>Opaque runtime-owned filter object.</summary>
-    [JsonPropertyName("filter")]
-    public JsonElement Filter { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogHandleType"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>A search candidate handle.</summary>
+    public static CatalogHandleType Candidate { get; } = new("candidate");
 
-/// <summary>Result of enqueueing the resume-pending wake item.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class QueueEnqueueResumePendingResult
-{
-    /// <summary>True when a wake item was newly queued.</summary>
-    [JsonPropertyName("queued")]
-    public bool Queued { get; set; }
-}
+    /// <summary>An install plan handle.</summary>
+    public static CatalogHandleType Plan { get; } = new("plan");
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionQueueEnqueueResumePendingRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogHandleType"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogHandleType left, CatalogHandleType right) => left.Equals(right);
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionQueueProcessRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogHandleType"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogHandleType left, CatalogHandleType right) => !(left == right);
 
-/// <summary>Batch of session events returned by a read, with cursor and continuation metadata.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class EventsReadResult
-{
-    /// <summary>Opaque cursor for the next read. Pass back unchanged in the next read.cursor to continue from where this read left off. Always present, even when no events were returned. For a backward read this cursor pages toward OLDER events; keep passing `direction: backward` with it (the cursor is also self-describing, so backward paging continues correctly).</summary>
-    [JsonPropertyName("cursor")]
-    public string Cursor { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogHandleType other && Equals(other);
 
-    /// <summary>Cursor status: 'ok' means the cursor was applied successfully; 'expired' means the cursor referred to an event that no longer exists in history (e.g. truncated or compacted away) and the read fell back to a boundary of the remaining history. For a forward read the fallback starts from the beginning of the remaining history; for a backward read it falls back to the tail (the newest window). Because the fallback page is a fresh boundary snapshot rather than a continuation of the requested cursor, it may overlap events the consumer has already rendered — a backward fallback to the tail in particular can repeat the newest window. On 'expired', consumers should reset or rebase their local pagination state (or deduplicate by event id) before continuing from the returned cursor rather than blindly appending/prepending the fallback page.</summary>
-    [JsonPropertyName("cursorStatus")]
-    public EventsCursorStatus CursorStatus { get; set; }
+    /// <inheritdoc />
+    public bool Equals(CatalogHandleType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Session events for this batch, merged into a single stream in creation order: durable (persisted) events and ephemeral events interleave exactly as they were emitted. Set `includeEphemeral: false` to receive only durable events. Ephemeral events are never replayable once pruned from the in-memory ring, so a consumer that needs them should keep reading with a non-zero `waitMs`. For a backward (tail-first) read, the returned window contains persisted events only, still in chronological (oldest-to-newest) append order.</summary>
-    [JsonPropertyName("events")]
-    public IList<SessionEvent> Events { get => field ??= []; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>True when more events are available in the read's direction. For a forward read, true means the batch returned `max` events and more are available immediately. For a backward read, true means older persisted events remain before the returned window.</summary>
-    [JsonPropertyName("hasMore")]
-    public bool HasMore { get; set; }
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>Cursor, batch size, and optional long-poll/filter parameters for reading session events.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class EventLogReadRequest
-{
-    /// <summary>Optional non-empty list of subagent identifiers. When provided, only events owned by one of these agents are returned; ownership recognizes the event envelope's agentId plus legacy data.agentId and data.parentToolCallId markers. This filter takes precedence over agentScope.</summary>
-    [JsonPropertyName("agentIds")]
-    public IList<string>? AgentIds { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{CatalogHandleType}"/> for serializing <see cref="CatalogHandleType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogHandleType>
+    {
+        /// <inheritdoc />
+        public override CatalogHandleType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Agent-scope filter: 'primary' returns only main-agent events plus events whose type starts with 'subagent.' (matching the typed-subscription default behavior); 'all' returns events from all agents (matching wildcard-subscription behavior). Default is 'all' to preserve wildcard semantics for catch-up callers.</summary>
-    [JsonPropertyName("agentScope")]
-    public EventsAgentScope? AgentScope { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogHandleType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogHandleType));
+        }
+    }
+}
 
-    /// <summary>Opaque cursor returned by a previous read. Omit on the first call to start from the beginning of the session's persisted history.</summary>
-    [JsonPropertyName("cursor")]
-    public string? Cursor { get; set; }
 
-    /// <summary>Direction to page through the session's persisted event history. 'forward' (default) pages from the cursor toward newer events (or from the start of history when no cursor is given). 'backward' enables tail-first reads: with no cursor it returns the NEWEST `max` events, and the returned cursor pages toward OLDER events on subsequent backward reads. Events within a returned batch are always in chronological (oldest-to-newest) order, even for a backward read. Backward reads cover PERSISTED history only; ephemeral events are never returned by a backward read. `direction` selects the INITIAL read only: the returned cursor is self-describing, so a continuation read pages in the cursor's own direction regardless of the `direction` passed alongside it — a forward cursor always pages forward and a backward cursor always pages backward. Pass the direction that matches the cursor to avoid confusion.</summary>
-    [JsonPropertyName("direction")]
-    public EventsReadDirection? Direction { get; set; }
+/// <summary>Why a presented handle was rejected.</summary>
+[Experimental(Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogHandleRejectionReason : IEquatable<CatalogHandleRejectionReason>
+{
+    private readonly string? _value;
 
-    /// <summary>When false, skip ephemeral events entirely and return only durable (persisted) events. History-backfill callers that discard ephemerals anyway should set this so the read is bounded by the durable log length instead of racing the ephemeral ring on a busy session. Defaults to true (ephemerals are interleaved with durable events in creation order). Ignored by backward reads, which always cover persisted history only.</summary>
-    [JsonPropertyName("includeEphemeral")]
-    public bool? IncludeEphemeral { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="CatalogHandleRejectionReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogHandleRejectionReason"/>.</param>
+    [JsonConstructor]
+    public CatalogHandleRejectionReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Maximum number of events to return in this batch (1–1000, default 200).</summary>
-    [JsonPropertyName("max")]
-    public long? Max { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogHandleRejectionReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The handle is unparseable, unknown, or was issued for a different operation.</summary>
+    public static CatalogHandleRejectionReason Invalid { get; } = new("invalid");
 
-    /// <summary>Either '*' to receive all event types, or a non-empty list of event types to receive.</summary>
-    [JsonPropertyName("types")]
-    public JsonElement? Types { get; set; }
+    /// <summary>The handle's time to live has elapsed.</summary>
+    public static CatalogHandleRejectionReason Stale { get; } = new("stale");
 
-    /// <summary>Milliseconds to wait for new events when the cursor is at the tail of history. 0 (default) returns immediately even if no events are available. Capped at 30000ms. Ephemeral events that arrive during the wait are delivered in this batch but are NOT replayable on a subsequent read (use a non-zero waitMs in your next call to capture future ephemerals as they happen). This applies to forward reads only: a backward read always returns immediately and ignores `waitMs`, because backward paging covers persisted history only while new events append at the tail (the opposite end from a backward page), so no blocking or ephemeral delivery can occur.</summary>
-    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
-    [JsonPropertyName("waitMs")]
-    public TimeSpan? Wait { get; set; }
-}
+    /// <summary>The handle has already been used, and handles are single-use.</summary>
+    public static CatalogHandleRejectionReason Replayed { get; } = new("replayed");
 
-/// <summary>Snapshot of the current tail cursor without returning any events. Use this when a consumer wants to subscribe to live events going forward without first paginating through the entire persisted history (which would happen if `read` were called without a cursor on a long-lived session).</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class EventLogTailResult
-{
-    /// <summary>Opaque cursor pointing at the current tail of the session's persisted-events history. Pass back to `read` to receive only events that arrive AFTER this snapshot. When the session has no events, this returns the same sentinel as an unset cursor (i.e. equivalent to omitting the cursor on a first read).</summary>
-    [JsonPropertyName("cursor")]
-    public string Cursor { get; set; } = string.Empty;
-}
+    /// <summary>The handle was issued by a different runtime instance.</summary>
+    public static CatalogHandleRejectionReason Foreign { get; } = new("foreign");
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionEventLogTailRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogHandleRejectionReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogHandleRejectionReason left, CatalogHandleRejectionReason right) => left.Equals(right);
 
-/// <summary>Opaque handle representing an event-type interest registration.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class RegisterEventInterestResult
-{
-    /// <summary>Opaque handle for this registration. Pass to releaseInterest to release. Each call to registerInterest produces a fresh handle, even when the same eventType is registered multiple times.</summary>
-    [JsonPropertyName("handle")]
-    public string Handle { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogHandleRejectionReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogHandleRejectionReason left, CatalogHandleRejectionReason right) => !(left == right);
 
-/// <summary>Event type to register consumer interest for, used by runtime gating logic.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class RegisterEventInterestParams
-{
-    /// <summary>The event type the consumer wants the runtime to treat as 'observed' for behavior-switching gating. Some runtime code paths inspect whether any consumer is interested in a specific event type and choose a different implementation accordingly (e.g. `mcp.oauth_required`: when interest is registered the runtime delegates interactive OAuth token acquisition to the consumer via `mcp.oauth_required` events; when no interest is registered the runtime still attempts non-interactive reconnect from cached or refreshable tokens, and only marks the server `needs-auth` if usable credentials are unavailable — it does not open a browser or start interactive OAuth without a consumer). SDK clients that long-poll events do NOT automatically appear as listeners to these gating checks — they must explicitly call `registerInterest` for each event type they want the runtime to count as having a consumer. Multiple registrations for the same event type from the same or different consumers are tracked independently and must each be released. See: `mcp.oauth_required`, `sampling.requested`, `auto_mode_switch.requested`, `session_limits_exhausted.requested`, `user_input.requested`, `elicitation.requested`, `command.queued`, `exit_plan_mode.requested`.</summary>
-    [JsonPropertyName("eventType")]
-    public string EventType { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogHandleRejectionReason other && Equals(other);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(CatalogHandleRejectionReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Indicates whether the operation succeeded.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class EventLogReleaseInterestResult
-{
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Opaque handle previously returned by `registerInterest` to release.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ReleaseEventInterestParams
-{
-    /// <summary>Handle returned by a previous `registerInterest` call. Idempotent: releasing an unknown or already-released handle is a no-op (returns success). When the last outstanding handle for an event type is released, the runtime reverts to its 'no consumer' code path for that event type.</summary>
-    [JsonPropertyName("handle")]
-    public string Handle { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{CatalogHandleRejectionReason}"/> for serializing <see cref="CatalogHandleRejectionReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogHandleRejectionReason>
+    {
+        /// <inheritdoc />
+        public override CatalogHandleRejectionReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogHandleRejectionReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogHandleRejectionReason));
+        }
+    }
 }
 
-/// <summary>Aggregated code change metrics.</summary>
+
+/// <summary>Which request field was rejected before any work was done.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UsageMetricsCodeChanges
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogInvalidRequestField : IEquatable<CatalogInvalidRequestField>
 {
-    /// <summary>Distinct file paths modified during the session.</summary>
-    [JsonPropertyName("filesModified")]
-    public IList<string> FilesModified { get => field ??= []; set; }
+    private readonly string? _value;
 
-    /// <summary>Number of distinct files modified.</summary>
-    [JsonPropertyName("filesModifiedCount")]
-    public long FilesModifiedCount { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="CatalogInvalidRequestField"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogInvalidRequestField"/>.</param>
+    [JsonConstructor]
+    public CatalogInvalidRequestField(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Total lines of code added.</summary>
-    [JsonPropertyName("linesAdded")]
-    public long LinesAdded { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogInvalidRequestField"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Total lines of code removed.</summary>
-    [JsonPropertyName("linesRemoved")]
-    public long LinesRemoved { get; set; }
-}
+    /// <summary>The search query was empty or longer than permitted.</summary>
+    public static CatalogInvalidRequestField Query { get; } = new("query");
 
-/// <summary>Request count and cost metrics for this model.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class UsageMetricsModelMetricRequests
-{
-    /// <summary>User-initiated premium request cost (with multiplier applied).</summary>
-    [JsonPropertyName("cost")]
-    public double Cost { get; set; }
+    /// <summary>The requested result count fell outside its permitted range.</summary>
+    public static CatalogInvalidRequestField Limit { get; } = new("limit");
 
-    /// <summary>Number of API requests made with this model.</summary>
-    [JsonPropertyName("count")]
-    public long Count { get; set; }
-}
+    /// <summary>The requested candidate kinds were empty or contained a duplicate.</summary>
+    public static CatalogInvalidRequestField Kinds { get; } = new("kinds");
 
-/// <summary>Per-model token-detail entry containing the accumulated token count for one token type.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class UsageMetricsModelMetricTokenDetail
-{
-    /// <summary>Accumulated token count for this token type.</summary>
-    [JsonPropertyName("tokenCount")]
-    public long TokenCount { get; set; }
-}
+    /// <summary>The negotiation block was missing or malformed.</summary>
+    public static CatalogInvalidRequestField Contract { get; } = new("contract");
 
-/// <summary>Token usage metrics for this model.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class UsageMetricsModelMetricUsage
-{
-    /// <summary>Total tokens read from prompt cache.</summary>
-    [JsonPropertyName("cacheReadTokens")]
-    public long CacheReadTokens { get; set; }
+    /// <summary>The plan source was missing or malformed.</summary>
+    public static CatalogInvalidRequestField Source { get; } = new("source");
 
-    /// <summary>Total tokens written to prompt cache.</summary>
-    [JsonPropertyName("cacheWriteTokens")]
-    public long CacheWriteTokens { get; set; }
+    /// <summary>The supplied card was missing its media type, URL, or data.</summary>
+    public static CatalogInvalidRequestField Card { get; } = new("card");
 
-    /// <summary>Total input tokens consumed.</summary>
-    [JsonPropertyName("inputTokens")]
-    public long InputTokens { get; set; }
+    /// <summary>The requested configuration scope is not one this runtime writes.</summary>
+    public static CatalogInvalidRequestField Scope { get; } = new("scope");
 
-    /// <summary>Total output tokens produced.</summary>
-    [JsonPropertyName("outputTokens")]
-    public long OutputTokens { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogInvalidRequestField"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogInvalidRequestField left, CatalogInvalidRequestField right) => left.Equals(right);
 
-    /// <summary>Total output tokens used for reasoning.</summary>
-    [JsonPropertyName("reasoningTokens")]
-    public long? ReasoningTokens { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogInvalidRequestField"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogInvalidRequestField left, CatalogInvalidRequestField right) => !(left == right);
 
-/// <summary>Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class UsageMetricsModelMetric
-{
-    /// <summary>Latest known prompt-cache expiration for this model. A timestamp in the past indicates that the observed cache has expired.</summary>
-    [JsonPropertyName("cacheExpiresAt")]
-    public DateTimeOffset? CacheExpiresAt { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogInvalidRequestField other && Equals(other);
 
-    /// <summary>Request count and cost metrics for this model.</summary>
-    [JsonPropertyName("requests")]
-    public UsageMetricsModelMetricRequests Requests { get => field ??= new(); set; }
+    /// <inheritdoc />
+    public bool Equals(CatalogInvalidRequestField other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Token count details per type.</summary>
-    [JsonPropertyName("tokenDetails")]
-    public IDictionary<string, UsageMetricsModelMetricTokenDetail>? TokenDetails { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Accumulated nano-AI units cost for this model.</summary>
-    [JsonPropertyName("totalNanoAiu")]
-    public double? TotalNanoAiu { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Token usage metrics for this model.</summary>
-    [JsonPropertyName("usage")]
-    public UsageMetricsModelMetricUsage Usage { get => field ??= new(); set; }
-}
+    /// <summary>Provides a <see cref="JsonConverter{CatalogInvalidRequestField}"/> for serializing <see cref="CatalogInvalidRequestField"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogInvalidRequestField>
+    {
+        /// <inheritdoc />
+        public override CatalogInvalidRequestField Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-/// <summary>Session-wide token-detail entry containing the accumulated token count for one token type.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class UsageMetricsTokenDetail
-{
-    /// <summary>Accumulated token count for this token type.</summary>
-    [JsonPropertyName("tokenCount")]
-    public long TokenCount { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogInvalidRequestField value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogInvalidRequestField));
+        }
+    }
 }
 
-/// <summary>Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.</summary>
+
+/// <summary>Why the catalog authority did not accept the caller's identity.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class UsageGetMetricsResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogAuthenticationRequiredReason : IEquatable<CatalogAuthenticationRequiredReason>
 {
-    /// <summary>Aggregated code change metrics.</summary>
-    [JsonPropertyName("codeChanges")]
-    public UsageMetricsCodeChanges CodeChanges { get => field ??= new(); set; }
+    private readonly string? _value;
 
-    /// <summary>Currently active model identifier.</summary>
-    [JsonPropertyName("currentModel")]
-    public string? CurrentModel { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="CatalogAuthenticationRequiredReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogAuthenticationRequiredReason"/>.</param>
+    [JsonConstructor]
+    public CatalogAuthenticationRequiredReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Input tokens from the most recent main-agent API call.</summary>
-    [JsonPropertyName("lastCallInputTokens")]
-    public long LastCallInputTokens { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogAuthenticationRequiredReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Output tokens from the most recent main-agent API call.</summary>
-    [JsonPropertyName("lastCallOutputTokens")]
-    public long LastCallOutputTokens { get; set; }
+    /// <summary>No credential was presented, so there is nothing to refresh and the caller must sign in.</summary>
+    public static CatalogAuthenticationRequiredReason NoCredential { get; } = new("no-credential");
 
-    /// <summary>Per-model token and request metrics, keyed by model identifier.</summary>
-    [JsonPropertyName("modelMetrics")]
-    public IDictionary<string, UsageMetricsModelMetric> ModelMetrics { get => field ??= new Dictionary<string, UsageMetricsModelMetric>(); set; }
+    /// <summary>A credential was presented and its lifetime has elapsed. A silent refresh is worth attempting before prompting anyone.</summary>
+    public static CatalogAuthenticationRequiredReason CredentialExpired { get; } = new("credential-expired");
 
-    /// <summary>ISO 8601 timestamp when the session started.</summary>
-    [JsonPropertyName("sessionStartTime")]
-    public DateTimeOffset SessionStartTime { get; set; }
+    /// <summary>A credential was presented and the authority refused it, for example because it was revoked, malformed, or issued for another audience. Refreshing the same rejected credential is not useful; the caller must sign in again.</summary>
+    public static CatalogAuthenticationRequiredReason CredentialRejected { get; } = new("credential-rejected");
 
-    /// <summary>Session-wide per-token-type accumulated token counts.</summary>
-    [JsonPropertyName("tokenDetails")]
-    public IDictionary<string, UsageMetricsTokenDetail>? TokenDetails { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogAuthenticationRequiredReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogAuthenticationRequiredReason left, CatalogAuthenticationRequiredReason right) => left.Equals(right);
 
-    /// <summary>Total time spent in model API calls (milliseconds).</summary>
-    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
-    [JsonPropertyName("totalApiDurationMs")]
-    public TimeSpan TotalApiDuration { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogAuthenticationRequiredReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogAuthenticationRequiredReason left, CatalogAuthenticationRequiredReason right) => !(left == right);
 
-    /// <summary>Session-wide accumulated nano-AI units cost.</summary>
-    [JsonPropertyName("totalNanoAiu")]
-    public double? TotalNanoAiu { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogAuthenticationRequiredReason other && Equals(other);
 
-    /// <summary>Total user-initiated premium request cost across all models (may be fractional due to multipliers).</summary>
-    [JsonPropertyName("totalPremiumRequestCost")]
-    public double TotalPremiumRequestCost { get; set; }
+    /// <inheritdoc />
+    public bool Equals(CatalogAuthenticationRequiredReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Raw count of user-initiated API requests.</summary>
-    [JsonPropertyName("totalUserRequests")]
-    public long TotalUserRequests { get; set; }
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionUsageGetMetricsRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{CatalogAuthenticationRequiredReason}"/> for serializing <see cref="CatalogAuthenticationRequiredReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogAuthenticationRequiredReason>
+    {
+        /// <inheritdoc />
+        public override CatalogAuthenticationRequiredReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-/// <summary>Prediction result. Available results include prediction details; unavailable results include an explicit reason.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SessionLimitPredictionResultAvailable), "available")]
-[JsonDerivedType(typeof(SessionLimitPredictionResultUnavailable), "unavailable")]
-public partial class SessionLimitPredictionResult
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogAuthenticationRequiredReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogAuthenticationRequiredReason));
+        }
+    }
 }
 
 
-/// <summary>Baseline data provenance for a prediction.</summary>
+/// <summary>Categorised network failure, low cardinality so it can be aggregated without carrying a URL.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionLimitPredictionBaselineData
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogNetworkFailureReason : IEquatable<CatalogNetworkFailureReason>
 {
-    /// <summary>End of the baseline data slice.</summary>
-    [JsonPropertyName("windowEnd")]
-    public string WindowEnd { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Start of the baseline data slice.</summary>
-    [JsonPropertyName("windowStart")]
-    public string WindowStart { get; set; } = string.Empty;
-}
+    /// <summary>Initializes a new instance of the <see cref="CatalogNetworkFailureReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogNetworkFailureReason"/>.</param>
+    [JsonConstructor]
+    public CatalogNetworkFailureReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Semantic usage tier and its AI-credit cap.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionLimitPredictionTierOption
-{
-    /// <summary>AI-credit cap for this tier.</summary>
-    [JsonPropertyName("cap")]
-    public double Cap { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogNetworkFailureReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Gets or sets the <c>tier</c> value.</summary>
-    [JsonPropertyName("tier")]
-    public SessionLimitPredictionTier Tier { get; set; }
-}
+    /// <summary>No network is available, so nothing was attempted.</summary>
+    public static CatalogNetworkFailureReason Offline { get; } = new("offline");
 
-/// <summary>Explainable AI-credit session-limit prediction.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionLimitPredictionDetails
-{
-    /// <summary>Baseline data provenance.</summary>
-    [JsonPropertyName("baselineData")]
-    public SessionLimitPredictionBaselineData BaselineData { get => field ??= new(); set; }
+    /// <summary>The authority's name could not be resolved.</summary>
+    public static CatalogNetworkFailureReason Dns { get; } = new("dns");
 
-    /// <summary>Client population used for the prediction.</summary>
-    [JsonPropertyName("clientType")]
-    public SessionLimitPredictionClientType ClientType { get; set; }
+    /// <summary>The request exceeded its time budget.</summary>
+    public static CatalogNetworkFailureReason Timeout { get; } = new("timeout");
 
-    /// <summary>Resolved model family when known.</summary>
-    [JsonPropertyName("family")]
-    public string? Family { get; set; }
+    /// <summary>The TLS handshake or certificate validation failed.</summary>
+    public static CatalogNetworkFailureReason Tls { get; } = new("tls");
 
-    /// <summary>Model identifier used for lookup.</summary>
-    [JsonPropertyName("modelId")]
-    public string ModelId { get; set; } = string.Empty;
+    /// <summary>The connection was refused or reset.</summary>
+    public static CatalogNetworkFailureReason ConnectionRefused { get; } = new("connection-refused");
 
-    /// <summary>Recommended maximum AI credits for this session.</summary>
-    [JsonPropertyName("recommendedCap")]
-    public double RecommendedCap { get; set; }
+    /// <summary>The authority returned a status the runtime treats as a failure.</summary>
+    public static CatalogNetworkFailureReason HttpStatus { get; } = new("http-status");
 
-    /// <summary>Tier chosen as the recommended cap.</summary>
-    [JsonPropertyName("recommendedTier")]
-    public SessionLimitPredictionTier RecommendedTier { get; set; }
+    /// <summary>The response exceeded the permitted size.</summary>
+    public static CatalogNetworkFailureReason ResponseTooLarge { get; } = new("response-too-large");
 
-    /// <summary>Baseline fallback level used to create the prediction.</summary>
-    [JsonPropertyName("source")]
-    public SessionLimitPredictionSource Source { get; set; }
+    /// <summary>A redirect was refused by the runtime's redirect policy.</summary>
+    public static CatalogNetworkFailureReason RedirectRejected { get; } = new("redirect-rejected");
 
-    /// <summary>Key matched at the source level, such as a model id, family id, or `global`.</summary>
-    [JsonPropertyName("sourceKey")]
-    public string SourceKey { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="CatalogNetworkFailureReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogNetworkFailureReason left, CatalogNetworkFailureReason right) => left.Equals(right);
 
-    /// <summary>Ordered usage tiers and their AI-credit caps.</summary>
-    [JsonPropertyName("tiers")]
-    public IList<SessionLimitPredictionTierOption> Tiers { get => field ??= []; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogNetworkFailureReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogNetworkFailureReason left, CatalogNetworkFailureReason right) => !(left == right);
 
-/// <summary>The <c>available</c> variant of <see cref="SessionLimitPredictionResult"/>.</summary>
-[Experimental(Diagnostics.Experimental)]
-public partial class SessionLimitPredictionResultAvailable : SessionLimitPredictionResult
-{
     /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "available";
+    public override bool Equals(object? obj) => obj is CatalogNetworkFailureReason other && Equals(other);
 
-    /// <summary>Predicted session limit details.</summary>
-    [JsonPropertyName("prediction")]
-    public required SessionLimitPredictionDetails Prediction { get; set; }
-}
+    /// <inheritdoc />
+    public bool Equals(CatalogNetworkFailureReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>The <c>unavailable</c> variant of <see cref="SessionLimitPredictionResult"/>.</summary>
-[Experimental(Diagnostics.Experimental)]
-public partial class SessionLimitPredictionResultUnavailable : SessionLimitPredictionResult
-{
     /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "unavailable";
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Reason no prediction is available.</summary>
-    [JsonPropertyName("reason")]
-    public required SessionLimitPredictionUnavailableReason Reason { get; set; }
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>RPC data type for SessionLimitPredictionPredict operations.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionLimitPredictionPredictRequest
-{
-    /// <summary>Client type to size for. Defaults to `cli-interactive`.</summary>
-    [JsonPropertyName("clientType")]
-    public SessionLimitPredictionClientType? ClientType { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{CatalogNetworkFailureReason}"/> for serializing <see cref="CatalogNetworkFailureReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogNetworkFailureReason>
+    {
+        /// <inheritdoc />
+        public override CatalogNetworkFailureReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Optional model identifier override. If omitted, the session's current model is used.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogNetworkFailureReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogNetworkFailureReason));
+        }
+    }
 }
 
-/// <summary>RPC data type for SessionLimitPredictionPredictRequestWithSession operations.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionLimitPredictionPredictRequestWithSession
-{
-    /// <summary>Client type to size for. Defaults to `cli-interactive`.</summary>
-    [JsonPropertyName("clientType")]
-    public SessionLimitPredictionClientType? ClientType { get; set; }
-
-    /// <summary>Optional model identifier override. If omitted, the session's current model is used.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>GitHub URL for the session and a flag indicating whether remote steering is enabled.</summary>
+/// <summary>Which hardened-fetch control refused a retrieval.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteEnableResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogUnsafeRetrievalReason : IEquatable<CatalogUnsafeRetrievalReason>
 {
-    /// <summary>Whether remote steering is enabled.</summary>
-    [JsonPropertyName("remoteSteerable")]
-    public bool RemoteSteerable { get; set; }
+    private readonly string? _value;
 
-    /// <summary>GitHub frontend URL for this session.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
-}
+    /// <summary>Initializes a new instance of the <see cref="CatalogUnsafeRetrievalReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogUnsafeRetrievalReason"/>.</param>
+    [JsonConstructor]
+    public CatalogUnsafeRetrievalReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Optional remote session mode ("off", "export", or "on"); defaults to enabling both export and remote steering.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class RemoteEnableRequest
-{
-    /// <summary>Per-session remote mode. "off" disables remote, "export" exports session events to GitHub without enabling remote steering, "on" enables both export and remote steering.</summary>
-    [JsonPropertyName("mode")]
-    public RemoteSessionMode? Mode { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogUnsafeRetrievalReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>The URL used a scheme the runtime refuses to fetch.</summary>
+    public static CatalogUnsafeRetrievalReason BlockedScheme { get; } = new("blocked-scheme");
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionRemoteDisableRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>The URL embedded credentials.</summary>
+    public static CatalogUnsafeRetrievalReason CredentialsInUrl { get; } = new("credentials-in-url");
 
-/// <summary>Persist a steerability change as a `session.remote_steerable_changed` event. Used by the host (CLI / SDK consumer) when it has just finished enabling or disabling steering on a remote exporter that the runtime does not directly own.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class RemoteNotifySteerableChangedResult
-{
-}
+    /// <summary>The URL resolved to a loopback, private, link-local, or cloud metadata address.</summary>
+    public static CatalogUnsafeRetrievalReason BlockedAddress { get; } = new("blocked-address");
 
-/// <summary>New remote-steerability state to persist as a `session.remote_steerable_changed` event.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class RemoteNotifySteerableChangedRequest
-{
-    /// <summary>Whether the session now supports remote steering via GitHub. The runtime persists this as a `session.remote_steerable_changed` event so resume/replay sees the up-to-date capability.</summary>
-    [JsonPropertyName("remoteSteerable")]
-    public bool RemoteSteerable { get; set; }
+    /// <summary>A redirect target resolved to a blocked address.</summary>
+    public static CatalogUnsafeRetrievalReason RedirectToBlockedAddress { get; } = new("redirect-to-blocked-address");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>The configured proxy policy refused the request.</summary>
+    public static CatalogUnsafeRetrievalReason ProxyRejected { get; } = new("proxy-rejected");
 
-/// <summary>Current sharing status and shareable GitHub URL for a session.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class VisibilityGetResult
-{
-    /// <summary>Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("shareUrl")]
-    public string? ShareUrl { get; set; }
+    /// <summary>The authority is not permitted for card retrieval.</summary>
+    public static CatalogUnsafeRetrievalReason HostNotPermitted { get; } = new("host-not-permitted");
 
-    /// <summary>Current sharing status. Absent when the session is not synced or the status could not be retrieved (e.g. the user is not authenticated).</summary>
-    [JsonPropertyName("status")]
-    public SessionVisibilityStatus? Status { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogUnsafeRetrievalReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogUnsafeRetrievalReason left, CatalogUnsafeRetrievalReason right) => left.Equals(right);
 
-    /// <summary>Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the session cannot be shared and `status`/`shareUrl` are absent.</summary>
-    [JsonPropertyName("synced")]
-    public bool Synced { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogUnsafeRetrievalReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogUnsafeRetrievalReason left, CatalogUnsafeRetrievalReason right) => !(left == right);
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionVisibilityGetRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogUnsafeRetrievalReason other && Equals(other);
 
-/// <summary>Effective sharing status and shareable GitHub URL after updating session visibility.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class VisibilitySetResult
-{
-    /// <summary>Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("shareUrl")]
-    public string? ShareUrl { get; set; }
+    /// <inheritdoc />
+    public bool Equals(CatalogUnsafeRetrievalReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Effective sharing status after the update. May differ from the requested status for task types that are already visible to repository readers by default. Absent when the update could not be applied (e.g. the session is not synced or the user is not authenticated).</summary>
-    [JsonPropertyName("status")]
-    public SessionVisibilityStatus? Status { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the visibility change could not be applied and `status`/`shareUrl` are absent.</summary>
-    [JsonPropertyName("synced")]
-    public bool Synced { get; set; }
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>Desired sharing status for the session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class VisibilitySetRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{CatalogUnsafeRetrievalReason}"/> for serializing <see cref="CatalogUnsafeRetrievalReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogUnsafeRetrievalReason>
+    {
+        /// <inheritdoc />
+        public override CatalogUnsafeRetrievalReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Sharing status to apply. "repo" makes the session visible to repository readers; "unshared" restricts it to the creator and collaborators.</summary>
-    [JsonPropertyName("status")]
-    public SessionVisibilityStatus Status { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogUnsafeRetrievalReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogUnsafeRetrievalReason));
+        }
+    }
 }
 
-/// <summary>Scheduled prompt entry with ID, timing (`intervalMs`, `cron`, or `at`), prompt text, recurrence, and next run time.</summary>
+
+/// <summary>Media type a catalog card is interpreted as.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ScheduleEntry
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogMediaType : IEquatable<CatalogMediaType>
 {
-    /// <summary>Absolute fire time (epoch milliseconds) for a one-shot calendar schedule.</summary>
-    [JsonPropertyName("at")]
-    public long? At { get; set; }
+    private readonly string? _value;
 
-    /// <summary>5-field cron expression for a recurring calendar schedule, evaluated in `tz`.</summary>
-    [JsonPropertyName("cron")]
-    public string? Cron { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="CatalogMediaType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogMediaType"/>.</param>
+    [JsonConstructor]
+    public CatalogMediaType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Display-only label for the prompt as shown in the UI (e.g. `/skill-name` for a skill-invocation schedule). The actual enqueued prompt is `prompt`.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogMediaType"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Sequential id assigned by the runtime within the session. Stable across resumes (rebuilt from the event log).</summary>
-    [JsonPropertyName("id")]
-    public long Id { get; set; }
+    /// <summary>The current MCP server card media type.</summary>
+    public static CatalogMediaType ApplicationMcpServerCardJson { get; } = new("application/mcp-server-card+json");
 
-    /// <summary>Interval between scheduled ticks, in milliseconds (relative-interval schedules).</summary>
-    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
-    [JsonPropertyName("intervalMs")]
-    public TimeSpan? Interval { get; set; }
+    /// <summary>The legacy MCP server card media type, accepted for compatibility.</summary>
+    public static CatalogMediaType ApplicationMcpServerJson { get; } = new("application/mcp-server+json");
 
-    /// <summary>ISO 8601 timestamp when the next tick is scheduled to fire.</summary>
-    [JsonPropertyName("nextRunAt")]
-    public DateTimeOffset NextRunAt { get; set; }
+    /// <summary>An AI skill card. Representable and searchable, but typed non-installable.</summary>
+    public static CatalogMediaType ApplicationAiSkill { get; } = new("application/ai-skill");
 
-    /// <summary>Prompt text that gets enqueued on every tick.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="CatalogMediaType"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogMediaType left, CatalogMediaType right) => left.Equals(right);
 
-    /// <summary>Whether the schedule re-arms after each tick (`/every`) or fires once (`/after`).</summary>
-    [JsonPropertyName("recurring")]
-    public bool Recurring { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogMediaType"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogMediaType left, CatalogMediaType right) => !(left == right);
 
-    /// <summary>True for a self-paced (`dynamic`) schedule: no fixed cadence; the model arms each next run via the `manage_schedule` `wakeup` action. `nextRunAt` is model-controlled.</summary>
-    [JsonPropertyName("selfPaced")]
-    public bool? SelfPaced { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogMediaType other && Equals(other);
 
-    /// <summary>IANA timezone the `cron` expression is evaluated in.</summary>
-    [JsonPropertyName("tz")]
-    public string? Tz { get; set; }
-}
+    /// <inheritdoc />
+    public bool Equals(CatalogMediaType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Snapshot of the currently active recurring prompts for this session.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ScheduleList
-{
-    /// <summary>Active scheduled prompts, ordered by id.</summary>
-    [JsonPropertyName("entries")]
-    public IList<ScheduleEntry> Entries { get => field ??= []; set; }
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionScheduleListRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionScheduleHydrateRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Provides a <see cref="JsonConverter{CatalogMediaType}"/> for serializing <see cref="CatalogMediaType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogMediaType>
+    {
+        /// <inheritdoc />
+        public override CatalogMediaType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-/// <summary>Whether the session currently has an active self-paced schedule.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ScheduleHasSelfPacedResult
-{
-    /// <summary>True when at least one active schedule is self-paced.</summary>
-    [JsonPropertyName("hasSelfPaced")]
-    public bool HasSelfPaced { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogMediaType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogMediaType));
+        }
+    }
 }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionScheduleHasSelfPacedRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>Result of registering or re-arming a scheduled prompt.</summary>
+/// <summary>How a card failed validation.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ScheduleAddResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogMalformedCardReason : IEquatable<CatalogMalformedCardReason>
 {
-    /// <summary>The registered or updated schedule entry.</summary>
-    [JsonPropertyName("entry")]
-    public ScheduleEntry? Entry { get; set; }
+    private readonly string? _value;
 
-    /// <summary>User-facing validation error, when registration failed.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-}
+    /// <summary>Initializes a new instance of the <see cref="CatalogMalformedCardReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogMalformedCardReason"/>.</param>
+    [JsonConstructor]
+    public CatalogMalformedCardReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Register a relative-interval scheduled prompt.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ScheduleAddRequest
-{
-    /// <summary>Optional display-only prompt label.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogMalformedCardReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Human-readable interval such as `30s`, `5m`, or `2h`.</summary>
-    [JsonPropertyName("interval")]
-    public string Interval { get; set; } = string.Empty;
+    /// <summary>The document is not well-formed JSON.</summary>
+    public static CatalogMalformedCardReason InvalidJson { get; } = new("invalid-json");
 
-    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>The document does not satisfy its media type's schema.</summary>
+    public static CatalogMalformedCardReason SchemaViolation { get; } = new("schema-violation");
 
-    /// <summary>Whether the schedule should re-arm after each tick. Defaults to true.</summary>
-    [JsonPropertyName("recurring")]
-    public bool? Recurring { get; set; }
+    /// <summary>The declared media type is not one this runtime understands.</summary>
+    public static CatalogMalformedCardReason UnsupportedMediaType { get; } = new("unsupported-media-type");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>A field the media type requires is absent.</summary>
+    public static CatalogMalformedCardReason MissingRequiredField { get; } = new("missing-required-field");
 
-/// <summary>Register a cron scheduled prompt.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ScheduleAddCronRequest
-{
-    /// <summary>5-field cron expression.</summary>
-    [JsonPropertyName("cron")]
-    public string Cron { get; set; } = string.Empty;
+    /// <summary>The document exceeded the permitted size.</summary>
+    public static CatalogMalformedCardReason SizeLimitExceeded { get; } = new("size-limit-exceeded");
 
-    /// <summary>Optional display-only prompt label.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogMalformedCardReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogMalformedCardReason left, CatalogMalformedCardReason right) => left.Equals(right);
 
-    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="CatalogMalformedCardReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogMalformedCardReason left, CatalogMalformedCardReason right) => !(left == right);
 
-    /// <summary>Whether the schedule should re-arm after each tick. Defaults to true.</summary>
-    [JsonPropertyName("recurring")]
-    public bool? Recurring { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogMalformedCardReason other && Equals(other);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(CatalogMalformedCardReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>IANA timezone for evaluating the cron expression.</summary>
-    [JsonPropertyName("tz")]
-    public string? Tz { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{CatalogMalformedCardReason}"/> for serializing <see cref="CatalogMalformedCardReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogMalformedCardReason>
+    {
+        /// <inheritdoc />
+        public override CatalogMalformedCardReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogMalformedCardReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogMalformedCardReason));
+        }
+    }
 }
 
-/// <summary>Register an absolute-time scheduled prompt.</summary>
+
+/// <summary>Which wire-contract rule an upstream response broke.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ScheduleAddAtRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogContractViolationReason : IEquatable<CatalogContractViolationReason>
 {
-    /// <summary>Epoch milliseconds when the prompt should fire.</summary>
-    [JsonPropertyName("at")]
-    public long At { get; set; }
-
-    /// <summary>Optional display-only prompt label.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Initializes a new instance of the <see cref="CatalogContractViolationReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogContractViolationReason"/>.</param>
+    [JsonConstructor]
+    public CatalogContractViolationReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Whether the schedule should re-arm after each tick. Defaults to false.</summary>
-    [JsonPropertyName("recurring")]
-    public bool? Recurring { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogContractViolationReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>A result carried both a URL and embedded data, when exactly one is permitted.</summary>
+    public static CatalogContractViolationReason BothUrlAndData { get; } = new("both-url-and-data");
 
-/// <summary>Register a self-paced scheduled prompt.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ScheduleAddSelfPacedRequest
-{
-    /// <summary>Optional display-only prompt label.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>A result carried neither a URL nor embedded data, when exactly one is required.</summary>
+    public static CatalogContractViolationReason NeitherUrlNorData { get; } = new("neither-url-nor-data");
 
-    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Two results claimed the same normalised identity.</summary>
+    public static CatalogContractViolationReason DuplicateIdentity { get; } = new("duplicate-identity");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>A result declared no media type, or one this contract does not model.</summary>
+    public static CatalogContractViolationReason UnknownMediaType { get; } = new("unknown-media-type");
 
-/// <summary>Re-arm a self-paced scheduled prompt.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ScheduleRearmSelfPacedRequest
-{
-    /// <summary>Epoch milliseconds when the prompt should next fire.</summary>
-    [JsonPropertyName("at")]
-    public long At { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogContractViolationReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogContractViolationReason left, CatalogContractViolationReason right) => left.Equals(right);
 
-    /// <summary>Id of the self-paced scheduled prompt.</summary>
-    [JsonPropertyName("id")]
-    public long Id { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogContractViolationReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogContractViolationReason left, CatalogContractViolationReason right) => !(left == right);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogContractViolationReason other && Equals(other);
 
-/// <summary>Remove a scheduled prompt by id. The result entry is omitted if the id was unknown.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ScheduleStopResult
-{
-    /// <summary>The removed entry, or omitted if no entry matched.</summary>
-    [JsonPropertyName("entry")]
-    public ScheduleEntry? Entry { get; set; }
-}
+    /// <inheritdoc />
+    public bool Equals(CatalogContractViolationReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Identifier of the scheduled prompt to remove.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class ScheduleStopRequest
-{
-    /// <summary>Id of the scheduled prompt to remove.</summary>
-    [JsonPropertyName("id")]
-    public long Id { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>A bearer token supplied by the SDK client for a BYOK provider. The runtime sets it as `Authorization: Bearer &lt;token&gt;` on the outbound request and does no caching; the SDK consumer owns token caching and refresh.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ProviderTokenAcquireResult
-{
-    /// <summary>The bearer token value (without the `Bearer ` prefix).</summary>
-    [JsonPropertyName("token")]
-    public string Token { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{CatalogContractViolationReason}"/> for serializing <see cref="CatalogContractViolationReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogContractViolationReason>
+    {
+        /// <inheritdoc />
+        public override CatalogContractViolationReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogContractViolationReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogContractViolationReason));
+        }
+    }
 }
 
-/// <summary>Asks the SDK client to acquire a bearer token for a BYOK provider whose config set `hasBearerTokenProvider: true`. Issued by the runtime before each outbound model request; the runtime does no caching, so this is sent once per request.</summary>
+
+/// <summary>Why no usable transport could be offered.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ProviderTokenAcquireRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogUnavailableTransportReason : IEquatable<CatalogUnavailableTransportReason>
 {
-    /// <summary>Name of the BYOK provider needing a token. For the legacy whole-session `provider` this is the implicit provider name; for named providers it is `NamedProviderConfig.name`.</summary>
-    [JsonPropertyName("providerName")]
-    public string ProviderName { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Initializes a new instance of the <see cref="CatalogUnavailableTransportReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogUnavailableTransportReason"/>.</param>
+    [JsonConstructor]
+    public CatalogUnavailableTransportReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Result returned by an extension factory closure.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class FactoryExecuteResult
-{
-    /// <summary>Factory result value.</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
-}
+    /// <summary>Gets the value associated with this <see cref="CatalogUnavailableTransportReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>Parameters sent to the owning extension to execute a factory closure.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class FactoryExecuteRequest
-{
-    /// <summary>Factory input value.</summary>
-    [JsonPropertyName("args")]
-    public JsonElement Args { get; set; }
+    /// <summary>The card advertises no transport this runtime can use.</summary>
+    public static CatalogUnavailableTransportReason NoEligibleTransport { get; } = new("no-eligible-transport");
 
-    /// <summary>Opaque token identifying this factory execution attempt.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
+    /// <summary>Every advertised transport is of a kind this runtime does not implement.</summary>
+    public static CatalogUnavailableTransportReason TransportNotSupported { get; } = new("transport-not-supported");
 
-    /// <summary>Registered factory name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Eligible remotes could not be enumerated, so no explicit choice can be offered.</summary>
+    public static CatalogUnavailableTransportReason RemoteEnumerationUnavailable { get; } = new("remote-enumeration-unavailable");
 
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="CatalogUnavailableTransportReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogUnavailableTransportReason left, CatalogUnavailableTransportReason right) => left.Equals(right);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogUnavailableTransportReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogUnavailableTransportReason left, CatalogUnavailableTransportReason right) => !(left == right);
 
-/// <summary>Parameters for cooperatively aborting a factory body.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class FactoryAbortRequest
-{
-    /// <summary>Factory run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogUnavailableTransportReason other && Equals(other);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(CatalogUnavailableTransportReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Describes a filesystem error.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsError
-{
-    /// <summary>Error classification.</summary>
-    [JsonPropertyName("code")]
-    public SessionFsErrorCode Code { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Free-form detail about the error, for logging/diagnostics.</summary>
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>File content as a UTF-8 string, or a filesystem error if the read failed.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsReadFileResult
-{
-    /// <summary>File content as UTF-8 string.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{CatalogUnavailableTransportReason}"/> for serializing <see cref="CatalogUnavailableTransportReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogUnavailableTransportReason>
+    {
+        /// <inheritdoc />
+        public override CatalogUnavailableTransportReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Describes a filesystem error.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsError? Error { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogUnavailableTransportReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogUnavailableTransportReason));
+        }
+    }
 }
 
-/// <summary>Path of the file to read from the client-provided session filesystem.</summary>
+
+/// <summary>Why a discoverable candidate cannot be installed.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsReadFileRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogNotInstallableReason : IEquatable<CatalogNotInstallableReason>
 {
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Initializes a new instance of the <see cref="CatalogNotInstallableReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogNotInstallableReason"/>.</param>
+    [JsonConstructor]
+    public CatalogNotInstallableReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>File path, content to write, and optional mode for the client-provided session filesystem.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsWriteFileRequest
-{
-    /// <summary>Content to write.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Gets the value associated with this <see cref="CatalogNotInstallableReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Optional POSIX-style mode for newly created files.</summary>
-    [JsonPropertyName("mode")]
-    public long? Mode { get; set; }
+    /// <summary>This kind of resource is not installable through this surface.</summary>
+    public static CatalogNotInstallableReason KindNotInstallable { get; } = new("kind-not-installable");
 
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>AI skills are discoverable but have no typed importer in this phase.</summary>
+    public static CatalogNotInstallableReason AiSkillNotInstallable { get; } = new("ai-skill-not-installable");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Policy forbids installing this candidate.</summary>
+    public static CatalogNotInstallableReason PolicyForbids { get; } = new("policy-forbids");
 
-/// <summary>File path, content to append, and optional mode for the client-provided session filesystem.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsAppendFileRequest
-{
-    /// <summary>Content to append.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="CatalogNotInstallableReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogNotInstallableReason left, CatalogNotInstallableReason right) => left.Equals(right);
 
-    /// <summary>Optional POSIX-style mode for newly created files.</summary>
-    [JsonPropertyName("mode")]
-    public long? Mode { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogNotInstallableReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogNotInstallableReason left, CatalogNotInstallableReason right) => !(left == right);
 
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogNotInstallableReason other && Equals(other);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(CatalogNotInstallableReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Indicates whether the requested path exists in the client-provided session filesystem.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsExistsResult
-{
-    /// <summary>Whether the path exists.</summary>
-    [JsonPropertyName("exists")]
-    public bool Exists { get; set; }
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Path to test for existence in the client-provided session filesystem.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsExistsRequest
-{
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{CatalogNotInstallableReason}"/> for serializing <see cref="CatalogNotInstallableReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogNotInstallableReason>
+    {
+        /// <inheritdoc />
+        public override CatalogNotInstallableReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogNotInstallableReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogNotInstallableReason));
+        }
+    }
 }
 
-/// <summary>Filesystem metadata for the requested path, or a filesystem error if the stat failed.</summary>
+
+/// <summary>Why a catalog operation is not available on this runtime.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsStatResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogUnavailableReason : IEquatable<CatalogUnavailableReason>
 {
-    /// <summary>ISO 8601 timestamp of creation.</summary>
-    [JsonPropertyName("birthtime")]
-    public DateTimeOffset Birthtime { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Describes a filesystem error.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsError? Error { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="CatalogUnavailableReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogUnavailableReason"/>.</param>
+    [JsonConstructor]
+    public CatalogUnavailableReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Whether the path is a directory.</summary>
-    [JsonPropertyName("isDirectory")]
-    public bool IsDirectory { get; set; }
+    /// <summary>Gets the value associated with this <see cref="CatalogUnavailableReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Whether the path is a file.</summary>
-    [JsonPropertyName("isFile")]
-    public bool IsFile { get; set; }
+    /// <summary>Bounded search is not wired up on this runtime build.</summary>
+    public static CatalogUnavailableReason SearchUnavailable { get; } = new("search-unavailable");
 
-    /// <summary>ISO 8601 timestamp of last modification.</summary>
-    [JsonPropertyName("mtime")]
-    public DateTimeOffset Mtime { get; set; }
+    /// <summary>Install planning is not wired up on this runtime build.</summary>
+    public static CatalogUnavailableReason PlanningUnavailable { get; } = new("planning-unavailable");
 
-    /// <summary>File size in bytes.</summary>
-    [JsonPropertyName("size")]
-    public long Size { get; set; }
-}
+    /// <summary>No catalog authority is configured for this runtime.</summary>
+    public static CatalogUnavailableReason AuthorityNotConfigured { get; } = new("authority-not-configured");
 
-/// <summary>Path whose metadata should be returned from the client-provided session filesystem.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsStatRequest
-{
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>The surface is disabled by policy on this runtime.</summary>
+    public static CatalogUnavailableReason DisabledByPolicy { get; } = new("disabled-by-policy");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogUnavailableReason"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogUnavailableReason left, CatalogUnavailableReason right) => left.Equals(right);
 
-/// <summary>Directory path to create in the client-provided session filesystem, with options for recursive creation and POSIX mode.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsMkdirRequest
-{
-    /// <summary>Optional POSIX-style mode for newly created directories.</summary>
-    [JsonPropertyName("mode")]
-    public long? Mode { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogUnavailableReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogUnavailableReason left, CatalogUnavailableReason right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogUnavailableReason other && Equals(other);
 
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(CatalogUnavailableReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Create parent directories as needed.</summary>
-    [JsonPropertyName("recursive")]
-    public bool? Recursive { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>Names of entries in the requested directory, or a filesystem error if the read failed.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsReaddirResult
-{
-    /// <summary>Entry names in the directory.</summary>
-    [JsonPropertyName("entries")]
-    public IList<string> Entries { get => field ??= []; set; }
+    /// <summary>Provides a <see cref="JsonConverter{CatalogUnavailableReason}"/> for serializing <see cref="CatalogUnavailableReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogUnavailableReason>
+    {
+        /// <inheritdoc />
+        public override CatalogUnavailableReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Describes a filesystem error.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsError? Error { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogUnavailableReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogUnavailableReason));
+        }
+    }
 }
 
-/// <summary>Directory path whose entries should be listed from the client-provided session filesystem.</summary>
+
+/// <summary>Persisted extension discovery source.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsReaddirRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct DiscoveredExtensionSource : IEquatable<DiscoveredExtensionSource>
 {
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Initializes a new instance of the <see cref="DiscoveredExtensionSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="DiscoveredExtensionSource"/>.</param>
+    [JsonConstructor]
+    public DiscoveredExtensionSource(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Directory entry returned by session filesystem `readdirWithTypes`, with name and entry type.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsReaddirWithTypesEntry
-{
-    /// <summary>Entry name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Gets the value associated with this <see cref="DiscoveredExtensionSource"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Entry type.</summary>
-    [JsonPropertyName("type")]
-    public SessionFsReaddirWithTypesEntryType Type { get; set; }
-}
+    /// <summary>Extension discovered from the user's extensions directory.</summary>
+    public static DiscoveredExtensionSource User { get; } = new("user");
 
-/// <summary>Entries in the requested directory paired with file/directory type information, or a filesystem error if the read failed.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsReaddirWithTypesResult
-{
-    /// <summary>Directory entries with type information.</summary>
-    [JsonPropertyName("entries")]
-    public IList<SessionFsReaddirWithTypesEntry> Entries { get => field ??= []; set; }
+    /// <summary>Extension contributed by an installed plugin.</summary>
+    public static DiscoveredExtensionSource Plugin { get; } = new("plugin");
 
-    /// <summary>Describes a filesystem error.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsError? Error { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="DiscoveredExtensionSource"/> instances are equivalent.</summary>
+    public static bool operator ==(DiscoveredExtensionSource left, DiscoveredExtensionSource right) => left.Equals(right);
 
-/// <summary>Directory path whose entries (with type information) should be listed from the client-provided session filesystem.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsReaddirWithTypesRequest
-{
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="DiscoveredExtensionSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(DiscoveredExtensionSource left, DiscoveredExtensionSource right) => !(left == right);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is DiscoveredExtensionSource other && Equals(other);
 
-/// <summary>Path to remove from the client-provided session filesystem, with options for recursive removal and force.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsRmRequest
-{
-    /// <summary>Ignore errors if the path does not exist.</summary>
-    [JsonPropertyName("force")]
-    public bool? Force { get; set; }
+    /// <inheritdoc />
+    public bool Equals(DiscoveredExtensionSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Remove directories and their contents recursively.</summary>
-    [JsonPropertyName("recursive")]
-    public bool? Recursive { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{DiscoveredExtensionSource}"/> for serializing <see cref="DiscoveredExtensionSource"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<DiscoveredExtensionSource>
+    {
+        /// <inheritdoc />
+        public override DiscoveredExtensionSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, DiscoveredExtensionSource value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DiscoveredExtensionSource));
+        }
+    }
 }
 
-/// <summary>Source and destination paths for renaming or moving an entry in the client-provided session filesystem.</summary>
+
+/// <summary>Effective extension loading and agent-management mode.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsRenameRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct DiscoveredExtensionMode : IEquatable<DiscoveredExtensionMode>
 {
-    /// <summary>Destination path using SessionFs conventions.</summary>
-    [JsonPropertyName("dest")]
-    public string Dest { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Initializes a new instance of the <see cref="DiscoveredExtensionMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="DiscoveredExtensionMode"/>.</param>
+    [JsonConstructor]
+    public DiscoveredExtensionMode(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Source path using SessionFs conventions.</summary>
-    [JsonPropertyName("src")]
-    public string Src { get; set; } = string.Empty;
-}
+    /// <summary>Gets the value associated with this <see cref="DiscoveredExtensionMode"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>Query results including rows, columns, and rows affected, or a filesystem error if execution failed.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsSqliteQueryResult
-{
-    /// <summary>Column names from the result set.</summary>
-    [JsonPropertyName("columns")]
-    public IList<string> Columns { get => field ??= []; set; }
+    /// <summary>Extensions are not loaded.</summary>
+    public static DiscoveredExtensionMode Disabled { get; } = new("disabled");
 
-    /// <summary>Describes a filesystem error.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsError? Error { get; set; }
+    /// <summary>Extensions are loaded, but the agent cannot create, reload, or manage them.</summary>
+    public static DiscoveredExtensionMode LoadOnly { get; } = new("load_only");
 
-    /// <summary>SQLite last_insert_rowid() value for INSERT.</summary>
-    [JsonPropertyName("lastInsertRowid")]
-    public long? LastInsertRowid { get; set; }
+    /// <summary>Extensions are loaded and the agent can create, reload, and manage them.</summary>
+    public static DiscoveredExtensionMode LoadAndAugment { get; } = new("load_and_augment");
 
-    /// <summary>For SELECT: array of row objects. For others: empty array.</summary>
-    [JsonPropertyName("rows")]
-    public IList<IDictionary<string, JsonElement>> Rows { get => field ??= []; set; }
+    /// <summary>Returns a value indicating whether two <see cref="DiscoveredExtensionMode"/> instances are equivalent.</summary>
+    public static bool operator ==(DiscoveredExtensionMode left, DiscoveredExtensionMode right) => left.Equals(right);
 
-    /// <summary>Number of rows affected (for INSERT/UPDATE/DELETE).</summary>
-    [JsonPropertyName("rowsAffected")]
-    public long RowsAffected { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="DiscoveredExtensionMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(DiscoveredExtensionMode left, DiscoveredExtensionMode right) => !(left == right);
 
-/// <summary>SQL query, query type, and optional bind parameters for executing a SQLite query against the per-session database. The provider applies its SQLite busy timeout for every call.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsSqliteQueryRequest
-{
-    /// <summary>Optional named bind parameters.</summary>
-    [JsonPropertyName("params")]
-    public IDictionary<string, JsonElement>? Params { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is DiscoveredExtensionMode other && Equals(other);
 
-    /// <summary>SQL query to execute.</summary>
-    [JsonPropertyName("query")]
-    public string Query { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(DiscoveredExtensionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>How to execute the query: 'exec' for DDL/multi-statement (no results), 'query' for SELECT (returns rows), 'run' for INSERT/UPDATE/DELETE (returns rowsAffected).</summary>
-    [JsonPropertyName("queryType")]
-    public SessionFsSqliteQueryType QueryType { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{DiscoveredExtensionMode}"/> for serializing <see cref="DiscoveredExtensionMode"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<DiscoveredExtensionMode>
+    {
+        /// <inheritdoc />
+        public override DiscoveredExtensionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, DiscoveredExtensionMode value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DiscoveredExtensionMode));
+        }
+    }
 }
 
-/// <summary>Classified SQLite transaction failure. busyOrLocked guarantees rollback; postCommitAmbiguous must never be retried.</summary>
+
+/// <summary>Whether an MCP server candidate can be planned for installation.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsSqliteTransactionError
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogMcpServerInstallability : IEquatable<CatalogMcpServerInstallability>
 {
-    /// <summary>Gets or sets the <c>errorClass</c> value.</summary>
-    [JsonPropertyName("errorClass")]
-    public SessionFsSqliteTransactionErrorClass ErrorClass { get; set; }
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="CatalogMcpServerInstallability"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogMcpServerInstallability"/>.</param>
+    [JsonConstructor]
+    public CatalogMcpServerInstallability(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="CatalogMcpServerInstallability"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Gets or sets the <c>message</c> value.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
-}
+    /// <summary>An install plan can be computed for this MCP server candidate.</summary>
+    public static CatalogMcpServerInstallability Installable { get; } = new("installable");
 
-/// <summary>Per-statement results, or a classified transaction error.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsSqliteTransactionResult
-{
-    /// <summary>Gets or sets the <c>error</c> value.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsSqliteTransactionError? Error { get; set; }
+    /// <summary>Policy forbids installing this MCP server candidate.</summary>
+    public static CatalogMcpServerInstallability NotInstallablePolicy { get; } = new("not-installable-policy");
 
-    /// <summary>Gets or sets the <c>results</c> value.</summary>
-    [JsonPropertyName("results")]
-    public IList<SessionFsSqliteQueryResult> Results { get => field ??= []; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogMcpServerInstallability"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogMcpServerInstallability left, CatalogMcpServerInstallability right) => left.Equals(right);
 
-/// <summary>One statement in an atomic SQLite transaction.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsSqliteTransactionStatement
-{
-    /// <summary>Optional named bind parameters.</summary>
-    [JsonPropertyName("params")]
-    public IDictionary<string, JsonElement>? Params { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="CatalogMcpServerInstallability"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogMcpServerInstallability left, CatalogMcpServerInstallability right) => !(left == right);
 
-    /// <summary>SQL statement to execute.</summary>
-    [JsonPropertyName("query")]
-    public string Query { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogMcpServerInstallability other && Equals(other);
 
-    /// <summary>How to execute the statement.</summary>
-    [JsonPropertyName("queryType")]
-    public SessionFsSqliteQueryType QueryType { get; set; }
-}
+    /// <inheritdoc />
+    public bool Equals(CatalogMcpServerInstallability other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Statements to execute atomically. Providers apply busy handling for every call.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsSqliteTransactionRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Gets or sets the <c>statements</c> value.</summary>
-    [JsonPropertyName("statements")]
-    public IList<SessionFsSqliteTransactionStatement> Statements { get => field ??= []; set; }
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>Indicates whether the per-session SQLite database already exists.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionFsSqliteExistsResult
-{
-    /// <summary>Whether the session database already exists.</summary>
-    [JsonPropertyName("exists")]
-    public bool Exists { get; set; }
-}
+    /// <summary>Provides a <see cref="JsonConverter{CatalogMcpServerInstallability}"/> for serializing <see cref="CatalogMcpServerInstallability"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogMcpServerInstallability>
+    {
+        /// <inheritdoc />
+        public override CatalogMcpServerInstallability Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-/// <summary>Identifies the target session.</summary>
-public sealed class SessionFsSqliteExistsRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogMcpServerInstallability value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogMcpServerInstallability));
+        }
+    }
 }
 
-/// <summary>Canvas open result returned by the provider.</summary>
+
+/// <summary>What kind of resource a catalog candidate describes.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CanvasProviderOpenResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct CatalogCandidateKind : IEquatable<CatalogCandidateKind>
 {
-    /// <summary>Provider-supplied status text.</summary>
-    [JsonPropertyName("status")]
-    public string? Status { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Provider-supplied title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="CatalogCandidateKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CatalogCandidateKind"/>.</param>
+    [JsonConstructor]
+    public CatalogCandidateKind(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>URL for web-rendered canvases.</summary>
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
-}
+    /// <summary>Gets the value associated with this <see cref="CatalogCandidateKind"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>Host capabilities.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class CanvasHostContextCapabilities
-{
-    /// <summary>Whether canvas rendering is supported.</summary>
-    [JsonPropertyName("canvases")]
-    public bool? Canvases { get; set; }
-}
+    /// <summary>An MCP server, which can be planned for installation.</summary>
+    public static CatalogCandidateKind McpServer { get; } = new("mcp-server");
 
-/// <summary>Host context supplied by the runtime.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class CanvasHostContext
-{
-    /// <summary>Host capabilities.</summary>
-    [JsonPropertyName("capabilities")]
-    public CanvasHostContextCapabilities? Capabilities { get; set; }
-}
+    /// <summary>An AI skill, which is discoverable but not installable through this surface.</summary>
+    public static CatalogCandidateKind AiSkill { get; } = new("ai-skill");
 
-/// <summary>Session context supplied by the runtime.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class CanvasSessionContext
-{
-    /// <summary>Active session working directory, when known.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="CatalogCandidateKind"/> instances are equivalent.</summary>
+    public static bool operator ==(CatalogCandidateKind left, CatalogCandidateKind right) => left.Equals(right);
 
-/// <summary>Canvas open parameters sent to the provider.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class CanvasProviderOpenRequest
-{
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public string CanvasId { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="CatalogCandidateKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(CatalogCandidateKind left, CatalogCandidateKind right) => !(left == right);
 
-    /// <summary>Owning provider identifier.</summary>
-    [JsonPropertyName("extensionId")]
-    public string ExtensionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CatalogCandidateKind other && Equals(other);
 
-    /// <summary>Host context supplied by the runtime.</summary>
-    [JsonPropertyName("host")]
-    public CanvasHostContext? Host { get; set; }
+    /// <inheritdoc />
+    public bool Equals(CatalogCandidateKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Canvas open input.</summary>
-    [JsonPropertyName("input")]
-    public JsonElement? Input { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Stable caller-supplied canvas instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Session context supplied by the runtime.</summary>
-    [JsonPropertyName("session")]
-    public CanvasSessionContext? Session { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{CatalogCandidateKind}"/> for serializing <see cref="CatalogCandidateKind"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<CatalogCandidateKind>
+    {
+        /// <inheritdoc />
+        public override CatalogCandidateKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, CatalogCandidateKind value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CatalogCandidateKind));
+        }
+    }
 }
 
-/// <summary>Canvas close parameters sent to the provider.</summary>
+
+/// <summary>Which tier this directory belongs to.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CanvasProviderCloseRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct SkillDiscoveryScope : IEquatable<SkillDiscoveryScope>
 {
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public string CanvasId { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Owning provider identifier.</summary>
-    [JsonPropertyName("extensionId")]
-    public string ExtensionId { get; set; } = string.Empty;
+    /// <summary>Initializes a new instance of the <see cref="SkillDiscoveryScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SkillDiscoveryScope"/>.</param>
+    [JsonConstructor]
+    public SkillDiscoveryScope(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Host context supplied by the runtime.</summary>
-    [JsonPropertyName("host")]
-    public CanvasHostContext? Host { get; set; }
+    /// <summary>Gets the value associated with this <see cref="SkillDiscoveryScope"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Canvas instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
+    /// <summary>A project's repository skill directory.</summary>
+    public static SkillDiscoveryScope Project { get; } = new("project");
 
-    /// <summary>Session context supplied by the runtime.</summary>
-    [JsonPropertyName("session")]
-    public CanvasSessionContext? Session { get; set; }
+    /// <summary>The user's personal Copilot skill directory.</summary>
+    public static SkillDiscoveryScope PersonalCopilot { get; } = new("personal-copilot");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>The user's personal agents skill directory.</summary>
+    public static SkillDiscoveryScope PersonalAgents { get; } = new("personal-agents");
 
-/// <summary>Canvas action invocation parameters sent to the provider.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class CanvasProviderInvokeActionRequest
-{
-    /// <summary>Action name to invoke.</summary>
-    [JsonPropertyName("actionName")]
-    public string ActionName { get; set; } = string.Empty;
+    /// <summary>A configured custom skill directory.</summary>
+    public static SkillDiscoveryScope Custom { get; } = new("custom");
 
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public string CanvasId { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="SkillDiscoveryScope"/> instances are equivalent.</summary>
+    public static bool operator ==(SkillDiscoveryScope left, SkillDiscoveryScope right) => left.Equals(right);
 
-    /// <summary>Owning provider identifier.</summary>
-    [JsonPropertyName("extensionId")]
-    public string ExtensionId { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="SkillDiscoveryScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(SkillDiscoveryScope left, SkillDiscoveryScope right) => !(left == right);
 
-    /// <summary>Host context supplied by the runtime.</summary>
-    [JsonPropertyName("host")]
-    public CanvasHostContext? Host { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is SkillDiscoveryScope other && Equals(other);
 
-    /// <summary>Action input.</summary>
-    [JsonPropertyName("input")]
-    public JsonElement? Input { get; set; }
+    /// <inheritdoc />
+    public bool Equals(SkillDiscoveryScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Canvas instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Session context supplied by the runtime.</summary>
-    [JsonPropertyName("session")]
-    public CanvasSessionContext? Session { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Provides a <see cref="JsonConverter{SkillDiscoveryScope}"/> for serializing <see cref="SkillDiscoveryScope"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<SkillDiscoveryScope>
+    {
+        /// <inheritdoc />
+        public override SkillDiscoveryScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-/// <summary>Acknowledgement. Returning successfully simply means the SDK accepted the start frame; it does not imply the request will succeed.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpRequestStartResult
-{
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, SkillDiscoveryScope value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SkillDiscoveryScope));
+        }
+    }
 }
 
-/// <summary>The head of an outbound model-layer HTTP request.</summary>
+
+/// <summary>Where the agent definition was loaded from.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpRequestStartRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct AgentInfoSource : IEquatable<AgentInfoSource>
 {
-    /// <summary>Stable identity of the agent trajectory that issued this request. Present when the request originates from an agent turn; absent for requests outside any agent context. This is the same identity used by lifecycle and bridged session events and remains constant across turns and retries.</summary>
-    [JsonPropertyName("agentId")]
-    public string? AgentId { get; set; }
-
-    /// <summary>Identity of the agent invocation (one agentic loop) that issued this request. It remains fixed across physical retries within the invocation and is distinct from the stable trajectory `agentId`. A caller-supplied invocation id always takes precedence (this covers auxiliary calls that have no model call id). Otherwise, first-party CAPI requests fall back to the runtime's agent task id — the same value the runtime emits as the `X-Agent-Task-Id` header — while custom-provider requests fall back to the model call id.</summary>
-    [JsonPropertyName("agentInvocationId")]
-    public string? AgentInvocationId { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Gets or sets the <c>headers</c> value.</summary>
-    [JsonPropertyName("headers")]
-    public IDictionary<string, IList<string>> Headers { get => field ??= new Dictionary<string, IList<string>>(); set; }
+    /// <summary>Initializes a new instance of the <see cref="AgentInfoSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentInfoSource"/>.</param>
+    [JsonConstructor]
+    public AgentInfoSource(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Coarse classification of the interaction that produced this request. Open string for forward-compatibility; known values include `conversation-agent`, `conversation-subagent`, `conversation-sampling`, `conversation-background`, `conversation-compaction`, and `conversation-user`. Absent when the runtime did not classify the request. Comes from the runtime's per-request agent context independently of transport; on the CAPI transport the runtime derives the upstream `X-Interaction-Type` header from this same context.</summary>
-    [JsonPropertyName("interactionType")]
-    public string? InteractionType { get; set; }
+    /// <summary>Gets the value associated with this <see cref="AgentInfoSource"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>HTTP method, e.g. GET, POST.</summary>
-    [JsonPropertyName("method")]
-    public string Method { get; set; } = string.Empty;
+    /// <summary>Agent loaded from the user's personal agent configuration.</summary>
+    public static AgentInfoSource User { get; } = new("user");
 
-    /// <summary>Stable identity of the immediate parent trajectory. Present for child trajectories such as subagents and conversation-sampling requests; absent for root-agent and non-agent requests.</summary>
-    [JsonPropertyName("parentAgentId")]
-    public string? ParentAgentId { get; set; }
+    /// <summary>Agent loaded from the current project's repository configuration.</summary>
+    public static AgentInfoSource Project { get; } = new("project");
 
-    /// <summary>Opaque runtime-minted id, unique per in-flight request. The SDK uses this to correlate httpRequestChunk frames and to address its httpResponseStart / httpResponseChunk replies back to the runtime.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Agent inherited from a parent project or workspace.</summary>
+    public static AgentInfoSource Inherited { get; } = new("inherited");
 
-    /// <summary>Id of the runtime session that triggered this request, when one is in scope. Absent for requests issued outside any session (e.g. startup model-catalog or capability resolution). This is a payload field — not a dispatch key — because the client-global API is registered process-wide rather than per session.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>Agent provided by a remote runtime or service.</summary>
+    public static AgentInfoSource Remote { get; } = new("remote");
 
-    /// <summary>Transport the runtime would otherwise use for this request. `http` (the default when absent) covers plain HTTP and SSE responses; `websocket` indicates a full-duplex message channel where each body chunk maps to one WebSocket message and the `binary` flag distinguishes text from binary frames. The SDK consumer uses this to decide whether to service the request with an HTTP client or a WebSocket client. It is the one piece of request metadata the consumer cannot reliably infer from the URL or headers alone.</summary>
-    [JsonPropertyName("transport")]
-    public LlmInferenceHttpRequestStartTransport? Transport { get; set; }
+    /// <summary>Agent contributed by an installed plugin.</summary>
+    public static AgentInfoSource Plugin { get; } = new("plugin");
 
-    /// <summary>Absolute request URL.</summary>
-    [JsonPropertyName("url")]
-    public string Url { get; set; } = string.Empty;
-}
+    /// <summary>Agent built into the Copilot runtime.</summary>
+    public static AgentInfoSource Builtin { get; } = new("builtin");
 
-/// <summary>Acknowledgement. The SDK is free to ignore the ack and treat chunk delivery as fire-and-forget.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpRequestChunkResult
-{
-}
+    /// <summary>Returns a value indicating whether two <see cref="AgentInfoSource"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentInfoSource left, AgentInfoSource right) => left.Equals(right);
 
-/// <summary>A request body chunk or cancellation signal.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpRequestChunkRequest
-{
-    /// <summary>Identity of the agent invocation (one agentic loop) this body chunk belongs to, matching the `agentInvocationId` semantics on httpRequestStart. Carried per chunk so a persistent transport can attribute successive turns correctly: when a WebSocket connection is reused across turns, the httpRequestStart identity reflects only the turn that opened the connection, so each later turn stamps its own invocation id here. Absent when the runtime has no invocation context for the request, or on the plain-HTTP transport where every request has its own httpRequestStart.</summary>
-    [JsonPropertyName("agentInvocationId")]
-    public string? AgentInvocationId { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="AgentInfoSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentInfoSource left, AgentInfoSource right) => !(left == right);
 
-    /// <summary>When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.</summary>
-    [JsonPropertyName("binary")]
-    public bool? Binary { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is AgentInfoSource other && Equals(other);
 
-    /// <summary>When true, the runtime is cancelling the in-flight request (e.g. upstream consumer aborted). `data` is ignored. Implies end-of-request.</summary>
-    [JsonPropertyName("cancel")]
-    public bool? Cancel { get; set; }
+    /// <inheritdoc />
+    public bool Equals(AgentInfoSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Optional human-readable reason for the cancellation, propagated for logging.</summary>
-    [JsonPropertyName("cancelReason")]
-    public string? CancelReason { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty.</summary>
-    [JsonPropertyName("data")]
-    public string Data { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>When true, this is the final body chunk for the request. The SDK may rely on having received an end-marked chunk before treating the request body as complete.</summary>
-    [JsonPropertyName("end")]
-    public bool? End { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{AgentInfoSource}"/> for serializing <see cref="AgentInfoSource"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<AgentInfoSource>
+    {
+        /// <inheritdoc />
+        public override AgentInfoSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, AgentInfoSource value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentInfoSource));
+        }
+    }
 }
 
-/// <summary>Client environment metadata describing the process that produced a telemetry event.</summary>
+
+/// <summary>Which tier this directory belongs to.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class GitHubTelemetryClientInfo
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct AgentDiscoveryPathScope : IEquatable<AgentDiscoveryPathScope>
 {
-    /// <summary>Copilot CLI version string.</summary>
-    [JsonPropertyName("cli_version")]
-    public string CliVersion { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Name of the client application.</summary>
-    [JsonPropertyName("client_name")]
-    public string? ClientName { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="AgentDiscoveryPathScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentDiscoveryPathScope"/>.</param>
+    [JsonConstructor]
+    public AgentDiscoveryPathScope(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Type of client.</summary>
-    [JsonPropertyName("client_type")]
-    public string? ClientType { get; set; }
+    /// <summary>Gets the value associated with this <see cref="AgentDiscoveryPathScope"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Copilot subscription plan, when known.</summary>
-    [JsonPropertyName("copilot_plan")]
-    public string? CopilotPlan { get; set; }
+    /// <summary>The user's personal agent configuration directory.</summary>
+    public static AgentDiscoveryPathScope User { get; } = new("user");
 
-    /// <summary>Stable machine identifier for the device.</summary>
-    [JsonPropertyName("dev_device_id")]
-    public string? DevDeviceId { get; set; }
+    /// <summary>A project's repository agent directory.</summary>
+    public static AgentDiscoveryPathScope Project { get; } = new("project");
 
-    /// <summary>Whether the user is a GitHub/Microsoft staff member.</summary>
-    [JsonPropertyName("is_staff")]
-    public bool? IsStaff { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="AgentDiscoveryPathScope"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentDiscoveryPathScope left, AgentDiscoveryPathScope right) => left.Equals(right);
 
-    /// <summary>Node.js runtime version string.</summary>
-    [JsonPropertyName("node_version")]
-    public string NodeVersion { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="AgentDiscoveryPathScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentDiscoveryPathScope left, AgentDiscoveryPathScope right) => !(left == right);
 
-    /// <summary>Operating system architecture (e.g. arm64, x64).</summary>
-    [JsonPropertyName("os_arch")]
-    public string OsArch { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is AgentDiscoveryPathScope other && Equals(other);
 
-    /// <summary>Operating system platform (e.g. darwin, linux, win32).</summary>
-    [JsonPropertyName("os_platform")]
-    public string OsPlatform { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(AgentDiscoveryPathScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Operating system version string.</summary>
-    [JsonPropertyName("os_version")]
-    public string OsVersion { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{AgentDiscoveryPathScope}"/> for serializing <see cref="AgentDiscoveryPathScope"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<AgentDiscoveryPathScope>
+    {
+        /// <inheritdoc />
+        public override AgentDiscoveryPathScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, AgentDiscoveryPathScope value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentDiscoveryPathScope));
+        }
+    }
 }
 
-/// <summary>A single telemetry event in the runtime's native GitHub-shaped telemetry format, forwarded verbatim to opted-in hosts. The `restricted` flag on the enclosing GitHubTelemetryNotification distinguishes standard from restricted events; the payload shape is identical for both.</summary>
+
+/// <summary>Where this source lives — used for UI grouping.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class GitHubTelemetryEvent
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct InstructionSourceLocation : IEquatable<InstructionSourceLocation>
 {
-    /// <summary>Client environment metadata.</summary>
-    [JsonPropertyName("client")]
-    public GitHubTelemetryClientInfo? Client { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Copilot tracking ID for user-level attribution.</summary>
-    [JsonPropertyName("copilot_tracking_id")]
-    public string? CopilotTrackingId { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="InstructionSourceLocation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="InstructionSourceLocation"/>.</param>
+    [JsonConstructor]
+    public InstructionSourceLocation(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Timestamp when the event was created (ISO 8601 format).</summary>
-    [JsonPropertyName("created_at")]
-    public string? CreatedAt { get; set; }
+    /// <summary>Gets the value associated with this <see cref="InstructionSourceLocation"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Experiment assignment context.</summary>
-    [JsonPropertyName("exp_assignment_context")]
-    public string? ExpAssignmentContext { get; set; }
+    /// <summary>Instructions live in user-level configuration.</summary>
+    public static InstructionSourceLocation User { get; } = new("user");
 
-    /// <summary>Feature flags enabled for this session, as a map from flag to value.</summary>
-    [JsonPropertyName("features")]
-    public IDictionary<string, string>? Features { get; set; }
+    /// <summary>Instructions live in repository-level configuration.</summary>
+    public static InstructionSourceLocation Repository { get; } = new("repository");
 
-    /// <summary>Event type/kind (e.g. get_completion_with_tools_turn, tool_call_executed).</summary>
-    [JsonPropertyName("kind")]
-    public string Kind { get; set; } = string.Empty;
+    /// <summary>Instructions live under the current working directory.</summary>
+    public static InstructionSourceLocation WorkingDirectory { get; } = new("working-directory");
 
-    /// <summary>Numeric metrics as a map from key to value.</summary>
-    [JsonPropertyName("metrics")]
-    public IDictionary<string, double> Metrics { get => field ??= new Dictionary<string, double>(); set; }
+    /// <summary>Instructions live in plugin-provided configuration.</summary>
+    public static InstructionSourceLocation Plugin { get; } = new("plugin");
+
+    /// <summary>Returns a value indicating whether two <see cref="InstructionSourceLocation"/> instances are equivalent.</summary>
+    public static bool operator ==(InstructionSourceLocation left, InstructionSourceLocation right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="InstructionSourceLocation"/> instances are not equivalent.</summary>
+    public static bool operator !=(InstructionSourceLocation left, InstructionSourceLocation right) => !(left == right);
 
-    /// <summary>Reference to the model call that produced this event.</summary>
-    [JsonPropertyName("model_call_id")]
-    public string? ModelCallId { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is InstructionSourceLocation other && Equals(other);
 
-    /// <summary>String-valued properties as a map from key to value.</summary>
-    [JsonPropertyName("properties")]
-    public IDictionary<string, string> Properties { get => field ??= new Dictionary<string, string>(); set; }
+    /// <inheritdoc />
+    public bool Equals(InstructionSourceLocation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Session identifier the event belongs to.</summary>
-    [JsonPropertyName("session_id")]
-    public string? SessionId { get; set; }
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Payload for a `gitHubTelemetry.event` notification: a single GitHub telemetry event the runtime forwards to a host connection that opted into telemetry forwarding during the `server.connect` handshake.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class GitHubTelemetryNotification
-{
-    /// <summary>The telemetry event, in the runtime's native GitHub-shaped telemetry format.</summary>
-    [JsonPropertyName("event")]
-    public GitHubTelemetryEvent Event { get => field ??= new(); set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Whether this is a restricted telemetry event (cli.restricted_telemetry). Hosts must route restricted events to first-party Microsoft stores only.</summary>
-    [JsonPropertyName("restricted")]
-    public bool Restricted { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{InstructionSourceLocation}"/> for serializing <see cref="InstructionSourceLocation"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<InstructionSourceLocation>
+    {
+        /// <inheritdoc />
+        public override InstructionSourceLocation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Session the telemetry event belongs to, when it is session-scoped. Omitted for sessionless events (for example, `server.sendTelemetry` calls with no session id), which are still forwarded to opted-in connections.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, InstructionSourceLocation value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionSourceLocation));
+        }
+    }
 }
 
-/// <summary>Resolved Anthropic adaptive-thinking capability for a model.</summary>
+
+/// <summary>Category of instruction source — used for merge logic.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AdaptiveThinkingSupport : IEquatable<AdaptiveThinkingSupport>
+public readonly struct InstructionSourceType : IEquatable<InstructionSourceType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AdaptiveThinkingSupport"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AdaptiveThinkingSupport"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="InstructionSourceType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="InstructionSourceType"/>.</param>
     [JsonConstructor]
-    public AdaptiveThinkingSupport(string value)
+    public InstructionSourceType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AdaptiveThinkingSupport"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="InstructionSourceType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The model does not accept thinking.type='adaptive'.</summary>
-    public static AdaptiveThinkingSupport Unsupported { get; } = new("unsupported");
+    /// <summary>Instructions loaded from the user's home configuration.</summary>
+    public static InstructionSourceType Home { get; } = new("home");
 
-    /// <summary>The model accepts adaptive thinking but also accepts thinking.type='enabled'.</summary>
-    public static AdaptiveThinkingSupport Optional { get; } = new("optional");
+    /// <summary>Instructions loaded from repository-scoped files.</summary>
+    public static InstructionSourceType Repo { get; } = new("repo");
 
-    /// <summary>The model only accepts adaptive thinking and rejects thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8).</summary>
-    public static AdaptiveThinkingSupport Required { get; } = new("required");
+    /// <summary>Instructions loaded from model-specific files.</summary>
+    public static InstructionSourceType Model { get; } = new("model");
 
-    /// <summary>Returns a value indicating whether two <see cref="AdaptiveThinkingSupport"/> instances are equivalent.</summary>
-    public static bool operator ==(AdaptiveThinkingSupport left, AdaptiveThinkingSupport right) => left.Equals(right);
+    /// <summary>Instructions loaded from VS Code instruction files.</summary>
+    public static InstructionSourceType Vscode { get; } = new("vscode");
 
-    /// <summary>Returns a value indicating whether two <see cref="AdaptiveThinkingSupport"/> instances are not equivalent.</summary>
-    public static bool operator !=(AdaptiveThinkingSupport left, AdaptiveThinkingSupport right) => !(left == right);
+    /// <summary>Instructions discovered from nested agent files.</summary>
+    public static InstructionSourceType NestedAgents { get; } = new("nested-agents");
+
+    /// <summary>Instructions inherited from child instruction files.</summary>
+    public static InstructionSourceType ChildInstructions { get; } = new("child-instructions");
+
+    /// <summary>Instructions supplied by an installed plugin.</summary>
+    public static InstructionSourceType Plugin { get; } = new("plugin");
+
+    /// <summary>Returns a value indicating whether two <see cref="InstructionSourceType"/> instances are equivalent.</summary>
+    public static bool operator ==(InstructionSourceType left, InstructionSourceType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="InstructionSourceType"/> instances are not equivalent.</summary>
+    public static bool operator !=(InstructionSourceType left, InstructionSourceType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AdaptiveThinkingSupport other && Equals(other);
+    public override bool Equals(object? obj) => obj is InstructionSourceType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AdaptiveThinkingSupport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(InstructionSourceType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15181,65 +21298,62 @@ public AdaptiveThinkingSupport(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AdaptiveThinkingSupport}"/> for serializing <see cref="AdaptiveThinkingSupport"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{InstructionSourceType}"/> for serializing <see cref="InstructionSourceType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AdaptiveThinkingSupport>
+    public sealed class Converter : JsonConverter<InstructionSourceType>
     {
         /// <inheritdoc />
-        public override AdaptiveThinkingSupport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override InstructionSourceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AdaptiveThinkingSupport value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, InstructionSourceType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AdaptiveThinkingSupport));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionSourceType));
         }
     }
 }
 
 
-/// <summary>Model capability category for grouping in the model picker.</summary>
+/// <summary>Whether the target is a single file or a directory of instruction files.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ModelPickerCategory : IEquatable<ModelPickerCategory>
+public readonly struct InstructionDiscoveryPathKind : IEquatable<InstructionDiscoveryPathKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ModelPickerCategory"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ModelPickerCategory"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="InstructionDiscoveryPathKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="InstructionDiscoveryPathKind"/>.</param>
     [JsonConstructor]
-    public ModelPickerCategory(string value)
+    public InstructionDiscoveryPathKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ModelPickerCategory"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="InstructionDiscoveryPathKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Lightweight model category optimized for faster, lower-cost interactions.</summary>
-    public static ModelPickerCategory Lightweight { get; } = new("lightweight");
-
-    /// <summary>Versatile model category suitable for a broad range of tasks.</summary>
-    public static ModelPickerCategory Versatile { get; } = new("versatile");
+    /// <summary>The target is a single instruction file.</summary>
+    public static InstructionDiscoveryPathKind File { get; } = new("file");
 
-    /// <summary>Powerful model category optimized for complex tasks.</summary>
-    public static ModelPickerCategory Powerful { get; } = new("powerful");
+    /// <summary>The target is a directory that holds instruction files.</summary>
+    public static InstructionDiscoveryPathKind Directory { get; } = new("directory");
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelPickerCategory"/> instances are equivalent.</summary>
-    public static bool operator ==(ModelPickerCategory left, ModelPickerCategory right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="InstructionDiscoveryPathKind"/> instances are equivalent.</summary>
+    public static bool operator ==(InstructionDiscoveryPathKind left, InstructionDiscoveryPathKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelPickerCategory"/> instances are not equivalent.</summary>
-    public static bool operator !=(ModelPickerCategory left, ModelPickerCategory right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="InstructionDiscoveryPathKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(InstructionDiscoveryPathKind left, InstructionDiscoveryPathKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ModelPickerCategory other && Equals(other);
+    public override bool Equals(object? obj) => obj is InstructionDiscoveryPathKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ModelPickerCategory other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(InstructionDiscoveryPathKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15247,68 +21361,68 @@ public ModelPickerCategory(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ModelPickerCategory}"/> for serializing <see cref="ModelPickerCategory"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{InstructionDiscoveryPathKind}"/> for serializing <see cref="InstructionDiscoveryPathKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ModelPickerCategory>
+    public sealed class Converter : JsonConverter<InstructionDiscoveryPathKind>
     {
         /// <inheritdoc />
-        public override ModelPickerCategory Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override InstructionDiscoveryPathKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ModelPickerCategory value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, InstructionDiscoveryPathKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelPickerCategory));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionDiscoveryPathKind));
         }
     }
 }
 
 
-/// <summary>Relative cost tier for token-based billing users.</summary>
+/// <summary>Which tier this target belongs to.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ModelPickerPriceCategory : IEquatable<ModelPickerPriceCategory>
+public readonly struct InstructionDiscoveryPathLocation : IEquatable<InstructionDiscoveryPathLocation>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ModelPickerPriceCategory"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ModelPickerPriceCategory"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="InstructionDiscoveryPathLocation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="InstructionDiscoveryPathLocation"/>.</param>
     [JsonConstructor]
-    public ModelPickerPriceCategory(string value)
+    public InstructionDiscoveryPathLocation(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ModelPickerPriceCategory"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="InstructionDiscoveryPathLocation"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Lowest relative token cost tier.</summary>
-    public static ModelPickerPriceCategory Low { get; } = new("low");
+    /// <summary>Instructions live in user-level configuration.</summary>
+    public static InstructionDiscoveryPathLocation User { get; } = new("user");
 
-    /// <summary>Medium relative token cost tier.</summary>
-    public static ModelPickerPriceCategory Medium { get; } = new("medium");
+    /// <summary>Instructions live in repository-level configuration.</summary>
+    public static InstructionDiscoveryPathLocation Repository { get; } = new("repository");
 
-    /// <summary>High relative token cost tier.</summary>
-    public static ModelPickerPriceCategory High { get; } = new("high");
+    /// <summary>Instructions live under the current working directory.</summary>
+    public static InstructionDiscoveryPathLocation WorkingDirectory { get; } = new("working-directory");
 
-    /// <summary>Highest relative token cost tier.</summary>
-    public static ModelPickerPriceCategory VeryHigh { get; } = new("very_high");
+    /// <summary>Instructions live in plugin-provided configuration.</summary>
+    public static InstructionDiscoveryPathLocation Plugin { get; } = new("plugin");
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelPickerPriceCategory"/> instances are equivalent.</summary>
-    public static bool operator ==(ModelPickerPriceCategory left, ModelPickerPriceCategory right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="InstructionDiscoveryPathLocation"/> instances are equivalent.</summary>
+    public static bool operator ==(InstructionDiscoveryPathLocation left, InstructionDiscoveryPathLocation right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelPickerPriceCategory"/> instances are not equivalent.</summary>
-    public static bool operator !=(ModelPickerPriceCategory left, ModelPickerPriceCategory right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="InstructionDiscoveryPathLocation"/> instances are not equivalent.</summary>
+    public static bool operator !=(InstructionDiscoveryPathLocation left, InstructionDiscoveryPathLocation right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ModelPickerPriceCategory other && Equals(other);
+    public override bool Equals(object? obj) => obj is InstructionDiscoveryPathLocation other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ModelPickerPriceCategory other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(InstructionDiscoveryPathLocation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15316,65 +21430,59 @@ public ModelPickerPriceCategory(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ModelPickerPriceCategory}"/> for serializing <see cref="ModelPickerPriceCategory"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{InstructionDiscoveryPathLocation}"/> for serializing <see cref="InstructionDiscoveryPathLocation"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ModelPickerPriceCategory>
+    public sealed class Converter : JsonConverter<InstructionDiscoveryPathLocation>
     {
         /// <inheritdoc />
-        public override ModelPickerPriceCategory Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override InstructionDiscoveryPathLocation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ModelPickerPriceCategory value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, InstructionDiscoveryPathLocation value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelPickerPriceCategory));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionDiscoveryPathLocation));
         }
     }
 }
 
 
-/// <summary>Current policy state for this model.</summary>
+/// <summary>Optional completion hint for the input (e.g. 'directory' for filesystem path completion).</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ModelPolicyState : IEquatable<ModelPolicyState>
+public readonly struct SlashCommandInputCompletion : IEquatable<SlashCommandInputCompletion>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ModelPolicyState"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ModelPolicyState"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SlashCommandInputCompletion"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SlashCommandInputCompletion"/>.</param>
     [JsonConstructor]
-    public ModelPolicyState(string value)
+    public SlashCommandInputCompletion(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ModelPolicyState"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SlashCommandInputCompletion"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The model is enabled by policy.</summary>
-    public static ModelPolicyState Enabled { get; } = new("enabled");
-
-    /// <summary>The model is disabled by policy.</summary>
-    public static ModelPolicyState Disabled { get; } = new("disabled");
-
-    /// <summary>No explicit policy is configured for the model.</summary>
-    public static ModelPolicyState Unconfigured { get; } = new("unconfigured");
+    /// <summary>Input should complete filesystem directories.</summary>
+    public static SlashCommandInputCompletion Directory { get; } = new("directory");
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelPolicyState"/> instances are equivalent.</summary>
-    public static bool operator ==(ModelPolicyState left, ModelPolicyState right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SlashCommandInputCompletion"/> instances are equivalent.</summary>
+    public static bool operator ==(SlashCommandInputCompletion left, SlashCommandInputCompletion right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelPolicyState"/> instances are not equivalent.</summary>
-    public static bool operator !=(ModelPolicyState left, ModelPolicyState right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SlashCommandInputCompletion"/> instances are not equivalent.</summary>
+    public static bool operator !=(SlashCommandInputCompletion left, SlashCommandInputCompletion right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ModelPolicyState other && Equals(other);
+    public override bool Equals(object? obj) => obj is SlashCommandInputCompletion other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ModelPolicyState other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SlashCommandInputCompletion other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15382,68 +21490,65 @@ public ModelPolicyState(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ModelPolicyState}"/> for serializing <see cref="ModelPolicyState"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SlashCommandInputCompletion}"/> for serializing <see cref="SlashCommandInputCompletion"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ModelPolicyState>
+    public sealed class Converter : JsonConverter<SlashCommandInputCompletion>
     {
         /// <inheritdoc />
-        public override ModelPolicyState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SlashCommandInputCompletion Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ModelPolicyState value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SlashCommandInputCompletion value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelPolicyState));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SlashCommandInputCompletion));
         }
     }
 }
 
 
-/// <summary>Server transport type: stdio, http, sse (deprecated), or memory.</summary>
+/// <summary>Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct DiscoveredMcpServerType : IEquatable<DiscoveredMcpServerType>
+public readonly struct SlashCommandKind : IEquatable<SlashCommandKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="DiscoveredMcpServerType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="DiscoveredMcpServerType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SlashCommandKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SlashCommandKind"/>.</param>
     [JsonConstructor]
-    public DiscoveredMcpServerType(string value)
+    public SlashCommandKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="DiscoveredMcpServerType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SlashCommandKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Server communicates over stdio with a local child process.</summary>
-    public static DiscoveredMcpServerType Stdio { get; } = new("stdio");
-
-    /// <summary>Server communicates over streamable HTTP.</summary>
-    public static DiscoveredMcpServerType Http { get; } = new("http");
+    /// <summary>Command implemented by the runtime.</summary>
+    public static SlashCommandKind Builtin { get; } = new("builtin");
 
-    /// <summary>Server communicates over Server-Sent Events (deprecated).</summary>
-    public static DiscoveredMcpServerType Sse { get; } = new("sse");
+    /// <summary>Command backed by a skill.</summary>
+    public static SlashCommandKind Skill { get; } = new("skill");
 
-    /// <summary>Server is backed by an in-memory runtime implementation.</summary>
-    public static DiscoveredMcpServerType Memory { get; } = new("memory");
+    /// <summary>Command registered by an SDK client or extension.</summary>
+    public static SlashCommandKind Client { get; } = new("client");
 
-    /// <summary>Returns a value indicating whether two <see cref="DiscoveredMcpServerType"/> instances are equivalent.</summary>
-    public static bool operator ==(DiscoveredMcpServerType left, DiscoveredMcpServerType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SlashCommandKind"/> instances are equivalent.</summary>
+    public static bool operator ==(SlashCommandKind left, SlashCommandKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="DiscoveredMcpServerType"/> instances are not equivalent.</summary>
-    public static bool operator !=(DiscoveredMcpServerType left, DiscoveredMcpServerType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SlashCommandKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(SlashCommandKind left, SlashCommandKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is DiscoveredMcpServerType other && Equals(other);
+    public override bool Equals(object? obj) => obj is SlashCommandKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(DiscoveredMcpServerType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SlashCommandKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15451,62 +21556,62 @@ public DiscoveredMcpServerType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{DiscoveredMcpServerType}"/> for serializing <see cref="DiscoveredMcpServerType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SlashCommandKind}"/> for serializing <see cref="SlashCommandKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<DiscoveredMcpServerType>
+    public sealed class Converter : JsonConverter<SlashCommandKind>
     {
         /// <inheritdoc />
-        public override DiscoveredMcpServerType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SlashCommandKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, DiscoveredMcpServerType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SlashCommandKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DiscoveredMcpServerType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SlashCommandKind));
         }
     }
 }
 
 
-/// <summary>Persisted extension discovery source.</summary>
+/// <summary>Path conventions used by this filesystem.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct DiscoveredExtensionSource : IEquatable<DiscoveredExtensionSource>
+public readonly struct SessionFsSetProviderConventions : IEquatable<SessionFsSetProviderConventions>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="DiscoveredExtensionSource"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="DiscoveredExtensionSource"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionFsSetProviderConventions"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionFsSetProviderConventions"/>.</param>
     [JsonConstructor]
-    public DiscoveredExtensionSource(string value)
+    public SessionFsSetProviderConventions(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="DiscoveredExtensionSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionFsSetProviderConventions"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Extension discovered from the user's extensions directory.</summary>
-    public static DiscoveredExtensionSource User { get; } = new("user");
+    /// <summary>Paths use Windows path conventions.</summary>
+    public static SessionFsSetProviderConventions Windows { get; } = new("windows");
 
-    /// <summary>Extension contributed by an installed plugin.</summary>
-    public static DiscoveredExtensionSource Plugin { get; } = new("plugin");
+    /// <summary>Paths use POSIX path conventions.</summary>
+    public static SessionFsSetProviderConventions Posix { get; } = new("posix");
 
-    /// <summary>Returns a value indicating whether two <see cref="DiscoveredExtensionSource"/> instances are equivalent.</summary>
-    public static bool operator ==(DiscoveredExtensionSource left, DiscoveredExtensionSource right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsSetProviderConventions"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionFsSetProviderConventions left, SessionFsSetProviderConventions right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="DiscoveredExtensionSource"/> instances are not equivalent.</summary>
-    public static bool operator !=(DiscoveredExtensionSource left, DiscoveredExtensionSource right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsSetProviderConventions"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionFsSetProviderConventions left, SessionFsSetProviderConventions right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is DiscoveredExtensionSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionFsSetProviderConventions other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(DiscoveredExtensionSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionFsSetProviderConventions other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15514,65 +21619,62 @@ public DiscoveredExtensionSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{DiscoveredExtensionSource}"/> for serializing <see cref="DiscoveredExtensionSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionFsSetProviderConventions}"/> for serializing <see cref="SessionFsSetProviderConventions"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<DiscoveredExtensionSource>
+    public sealed class Converter : JsonConverter<SessionFsSetProviderConventions>
     {
         /// <inheritdoc />
-        public override DiscoveredExtensionSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionFsSetProviderConventions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, DiscoveredExtensionSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionFsSetProviderConventions value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DiscoveredExtensionSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsSetProviderConventions));
         }
     }
 }
 
 
-/// <summary>Effective extension loading and agent-management mode.</summary>
+/// <summary>Repository host type.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct DiscoveredExtensionMode : IEquatable<DiscoveredExtensionMode>
+public readonly struct SessionContextHostType : IEquatable<SessionContextHostType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="DiscoveredExtensionMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="DiscoveredExtensionMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionContextHostType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionContextHostType"/>.</param>
     [JsonConstructor]
-    public DiscoveredExtensionMode(string value)
+    public SessionContextHostType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="DiscoveredExtensionMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionContextHostType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Extensions are not loaded.</summary>
-    public static DiscoveredExtensionMode Disabled { get; } = new("disabled");
-
-    /// <summary>Extensions are loaded, but the agent cannot create, reload, or manage them.</summary>
-    public static DiscoveredExtensionMode LoadOnly { get; } = new("load_only");
+    /// <summary>Session repository is hosted on GitHub.</summary>
+    public static SessionContextHostType GitHub { get; } = new("github");
 
-    /// <summary>Extensions are loaded and the agent can create, reload, and manage them.</summary>
-    public static DiscoveredExtensionMode LoadAndAugment { get; } = new("load_and_augment");
+    /// <summary>Session repository is hosted on Azure DevOps.</summary>
+    public static SessionContextHostType Ado { get; } = new("ado");
 
-    /// <summary>Returns a value indicating whether two <see cref="DiscoveredExtensionMode"/> instances are equivalent.</summary>
-    public static bool operator ==(DiscoveredExtensionMode left, DiscoveredExtensionMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionContextHostType"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionContextHostType left, SessionContextHostType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="DiscoveredExtensionMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(DiscoveredExtensionMode left, DiscoveredExtensionMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionContextHostType"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionContextHostType left, SessionContextHostType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is DiscoveredExtensionMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionContextHostType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(DiscoveredExtensionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionContextHostType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15580,68 +21682,68 @@ public DiscoveredExtensionMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{DiscoveredExtensionMode}"/> for serializing <see cref="DiscoveredExtensionMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionContextHostType}"/> for serializing <see cref="SessionContextHostType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<DiscoveredExtensionMode>
+    public sealed class Converter : JsonConverter<SessionContextHostType>
     {
         /// <inheritdoc />
-        public override DiscoveredExtensionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionContextHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, DiscoveredExtensionMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionContextHostType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DiscoveredExtensionMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionContextHostType));
         }
     }
 }
 
 
-/// <summary>Which tier this directory belongs to.</summary>
+/// <summary>What a remote host says one of its sessions is doing right now. Deliberately coarse: this is what a host can report for EVERY session in a catalogue listing, without a client subscribing to each one. AHP's `SessionSummary.status` is the source today; `input-needed` covers both a permission prompt and an `ask_user` question, since the summary does not say which.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SkillDiscoveryScope : IEquatable<SkillDiscoveryScope>
+public readonly struct RemoteSessionHostStatus : IEquatable<RemoteSessionHostStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SkillDiscoveryScope"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SkillDiscoveryScope"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="RemoteSessionHostStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="RemoteSessionHostStatus"/>.</param>
     [JsonConstructor]
-    public SkillDiscoveryScope(string value)
+    public RemoteSessionHostStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SkillDiscoveryScope"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="RemoteSessionHostStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A project's repository skill directory.</summary>
-    public static SkillDiscoveryScope Project { get; } = new("project");
+    /// <summary>No turn is running.</summary>
+    public static RemoteSessionHostStatus Idle { get; } = new("idle");
 
-    /// <summary>The user's personal Copilot skill directory.</summary>
-    public static SkillDiscoveryScope PersonalCopilot { get; } = new("personal-copilot");
+    /// <summary>A turn is running.</summary>
+    public static RemoteSessionHostStatus Working { get; } = new("working");
 
-    /// <summary>The user's personal agents skill directory.</summary>
-    public static SkillDiscoveryScope PersonalAgents { get; } = new("personal-agents");
+    /// <summary>The session is blocked on the user: a permission prompt or an `ask_user` question.</summary>
+    public static RemoteSessionHostStatus InputNeeded { get; } = new("input-needed");
 
-    /// <summary>A configured custom skill directory.</summary>
-    public static SkillDiscoveryScope Custom { get; } = new("custom");
+    /// <summary>The session ended its last turn in an error.</summary>
+    public static RemoteSessionHostStatus Error { get; } = new("error");
 
-    /// <summary>Returns a value indicating whether two <see cref="SkillDiscoveryScope"/> instances are equivalent.</summary>
-    public static bool operator ==(SkillDiscoveryScope left, SkillDiscoveryScope right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="RemoteSessionHostStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(RemoteSessionHostStatus left, RemoteSessionHostStatus right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SkillDiscoveryScope"/> instances are not equivalent.</summary>
-    public static bool operator !=(SkillDiscoveryScope left, SkillDiscoveryScope right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="RemoteSessionHostStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(RemoteSessionHostStatus left, RemoteSessionHostStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SkillDiscoveryScope other && Equals(other);
+    public override bool Equals(object? obj) => obj is RemoteSessionHostStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SkillDiscoveryScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(RemoteSessionHostStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15649,74 +21751,62 @@ public SkillDiscoveryScope(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SkillDiscoveryScope}"/> for serializing <see cref="SkillDiscoveryScope"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{RemoteSessionHostStatus}"/> for serializing <see cref="RemoteSessionHostStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SkillDiscoveryScope>
+    public sealed class Converter : JsonConverter<RemoteSessionHostStatus>
     {
         /// <inheritdoc />
-        public override SkillDiscoveryScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override RemoteSessionHostStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SkillDiscoveryScope value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, RemoteSessionHostStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SkillDiscoveryScope));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RemoteSessionHostStatus));
         }
     }
 }
 
 
-/// <summary>Where the agent definition was loaded from.</summary>
+/// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentInfoSource : IEquatable<AgentInfoSource>
+public readonly struct RemoteSessionMetadataTaskType : IEquatable<RemoteSessionMetadataTaskType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentInfoSource"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentInfoSource"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="RemoteSessionMetadataTaskType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="RemoteSessionMetadataTaskType"/>.</param>
     [JsonConstructor]
-    public AgentInfoSource(string value)
+    public RemoteSessionMetadataTaskType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentInfoSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="RemoteSessionMetadataTaskType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Agent loaded from the user's personal agent configuration.</summary>
-    public static AgentInfoSource User { get; } = new("user");
-
-    /// <summary>Agent loaded from the current project's repository configuration.</summary>
-    public static AgentInfoSource Project { get; } = new("project");
-
-    /// <summary>Agent inherited from a parent project or workspace.</summary>
-    public static AgentInfoSource Inherited { get; } = new("inherited");
-
-    /// <summary>Agent provided by a remote runtime or service.</summary>
-    public static AgentInfoSource Remote { get; } = new("remote");
-
-    /// <summary>Agent contributed by an installed plugin.</summary>
-    public static AgentInfoSource Plugin { get; } = new("plugin");
+    /// <summary>GitHub Copilot coding agent task.</summary>
+    public static RemoteSessionMetadataTaskType Cca { get; } = new("cca");
 
-    /// <summary>Agent built into the Copilot runtime.</summary>
-    public static AgentInfoSource Builtin { get; } = new("builtin");
+    /// <summary>CLI remote task.</summary>
+    public static RemoteSessionMetadataTaskType Cli { get; } = new("cli");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentInfoSource"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentInfoSource left, AgentInfoSource right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="RemoteSessionMetadataTaskType"/> instances are equivalent.</summary>
+    public static bool operator ==(RemoteSessionMetadataTaskType left, RemoteSessionMetadataTaskType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentInfoSource"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentInfoSource left, AgentInfoSource right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="RemoteSessionMetadataTaskType"/> instances are not equivalent.</summary>
+    public static bool operator !=(RemoteSessionMetadataTaskType left, RemoteSessionMetadataTaskType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentInfoSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is RemoteSessionMetadataTaskType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentInfoSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(RemoteSessionMetadataTaskType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15724,62 +21814,62 @@ public AgentInfoSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentInfoSource}"/> for serializing <see cref="AgentInfoSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{RemoteSessionMetadataTaskType}"/> for serializing <see cref="RemoteSessionMetadataTaskType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentInfoSource>
+    public sealed class Converter : JsonConverter<RemoteSessionMetadataTaskType>
     {
         /// <inheritdoc />
-        public override AgentInfoSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override RemoteSessionMetadataTaskType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentInfoSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, RemoteSessionMetadataTaskType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentInfoSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RemoteSessionMetadataTaskType));
         }
     }
 }
 
 
-/// <summary>Which tier this directory belongs to.</summary>
+/// <summary>Step status.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentDiscoveryPathScope : IEquatable<AgentDiscoveryPathScope>
+public readonly struct SessionsOpenProgressStatus : IEquatable<SessionsOpenProgressStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentDiscoveryPathScope"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentDiscoveryPathScope"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionsOpenProgressStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionsOpenProgressStatus"/>.</param>
     [JsonConstructor]
-    public AgentDiscoveryPathScope(string value)
+    public SessionsOpenProgressStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentDiscoveryPathScope"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionsOpenProgressStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The user's personal agent configuration directory.</summary>
-    public static AgentDiscoveryPathScope User { get; } = new("user");
+    /// <summary>The step has started and has not yet finished.</summary>
+    public static SessionsOpenProgressStatus InProgress { get; } = new("in-progress");
 
-    /// <summary>A project's repository agent directory.</summary>
-    public static AgentDiscoveryPathScope Project { get; } = new("project");
+    /// <summary>The step has completed successfully.</summary>
+    public static SessionsOpenProgressStatus Complete { get; } = new("complete");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentDiscoveryPathScope"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentDiscoveryPathScope left, AgentDiscoveryPathScope right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenProgressStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionsOpenProgressStatus left, SessionsOpenProgressStatus right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentDiscoveryPathScope"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentDiscoveryPathScope left, AgentDiscoveryPathScope right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenProgressStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionsOpenProgressStatus left, SessionsOpenProgressStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentDiscoveryPathScope other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionsOpenProgressStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentDiscoveryPathScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionsOpenProgressStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15787,68 +21877,74 @@ public AgentDiscoveryPathScope(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentDiscoveryPathScope}"/> for serializing <see cref="AgentDiscoveryPathScope"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionsOpenProgressStatus}"/> for serializing <see cref="SessionsOpenProgressStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentDiscoveryPathScope>
+    public sealed class Converter : JsonConverter<SessionsOpenProgressStatus>
     {
         /// <inheritdoc />
-        public override AgentDiscoveryPathScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionsOpenProgressStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentDiscoveryPathScope value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionsOpenProgressStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentDiscoveryPathScope));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionsOpenProgressStatus));
         }
     }
 }
 
 
-/// <summary>Where this source lives — used for UI grouping.</summary>
+/// <summary>Handoff step.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct InstructionSourceLocation : IEquatable<InstructionSourceLocation>
+public readonly struct SessionsOpenProgressStep : IEquatable<SessionsOpenProgressStep>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="InstructionSourceLocation"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="InstructionSourceLocation"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionsOpenProgressStep"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionsOpenProgressStep"/>.</param>
     [JsonConstructor]
-    public InstructionSourceLocation(string value)
+    public SessionsOpenProgressStep(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="InstructionSourceLocation"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionsOpenProgressStep"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Instructions live in user-level configuration.</summary>
-    public static InstructionSourceLocation User { get; } = new("user");
+    /// <summary>Loading the source session's events from the remote service.</summary>
+    public static SessionsOpenProgressStep LoadSession { get; } = new("load-session");
 
-    /// <summary>Instructions live in repository-level configuration.</summary>
-    public static InstructionSourceLocation Repository { get; } = new("repository");
+    /// <summary>Validating that the local repository matches the remote session's repository.</summary>
+    public static SessionsOpenProgressStep ValidateRepo { get; } = new("validate-repo");
 
-    /// <summary>Instructions live under the current working directory.</summary>
-    public static InstructionSourceLocation WorkingDirectory { get; } = new("working-directory");
+    /// <summary>Checking the local working tree for uncommitted changes that would block the handoff.</summary>
+    public static SessionsOpenProgressStep CheckChanges { get; } = new("check-changes");
 
-    /// <summary>Instructions live in plugin-provided configuration.</summary>
-    public static InstructionSourceLocation Plugin { get; } = new("plugin");
+    /// <summary>Checking out the branch associated with the remote session in the local working tree.</summary>
+    public static SessionsOpenProgressStep CheckoutBranch { get; } = new("checkout-branch");
 
-    /// <summary>Returns a value indicating whether two <see cref="InstructionSourceLocation"/> instances are equivalent.</summary>
-    public static bool operator ==(InstructionSourceLocation left, InstructionSourceLocation right) => left.Equals(right);
+    /// <summary>Creating the new local session and seeding it with the source session's events.</summary>
+    public static SessionsOpenProgressStep CreateSession { get; } = new("create-session");
 
-    /// <summary>Returns a value indicating whether two <see cref="InstructionSourceLocation"/> instances are not equivalent.</summary>
-    public static bool operator !=(InstructionSourceLocation left, InstructionSourceLocation right) => !(left == right);
+    /// <summary>Persisting the newly-created local session to disk.</summary>
+    public static SessionsOpenProgressStep SaveSession { get; } = new("save-session");
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenProgressStep"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionsOpenProgressStep left, SessionsOpenProgressStep right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenProgressStep"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionsOpenProgressStep left, SessionsOpenProgressStep right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is InstructionSourceLocation other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionsOpenProgressStep other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(InstructionSourceLocation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionsOpenProgressStep other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15856,77 +21952,71 @@ public InstructionSourceLocation(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{InstructionSourceLocation}"/> for serializing <see cref="InstructionSourceLocation"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionsOpenProgressStep}"/> for serializing <see cref="SessionsOpenProgressStep"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<InstructionSourceLocation>
+    public sealed class Converter : JsonConverter<SessionsOpenProgressStep>
     {
         /// <inheritdoc />
-        public override InstructionSourceLocation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionsOpenProgressStep Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, InstructionSourceLocation value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionsOpenProgressStep value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionSourceLocation));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionsOpenProgressStep));
         }
     }
 }
 
 
-/// <summary>Category of instruction source — used for merge logic.</summary>
+/// <summary>Outcome of the open request.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct InstructionSourceType : IEquatable<InstructionSourceType>
+public readonly struct SessionsOpenStatus : IEquatable<SessionsOpenStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="InstructionSourceType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="InstructionSourceType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionsOpenStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionsOpenStatus"/>.</param>
     [JsonConstructor]
-    public InstructionSourceType(string value)
+    public SessionsOpenStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="InstructionSourceType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionsOpenStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Instructions loaded from the user's home configuration.</summary>
-    public static InstructionSourceType Home { get; } = new("home");
-
-    /// <summary>Instructions loaded from repository-scoped files.</summary>
-    public static InstructionSourceType Repo { get; } = new("repo");
-
-    /// <summary>Instructions loaded from model-specific files.</summary>
-    public static InstructionSourceType Model { get; } = new("model");
+    /// <summary>A new session was created.</summary>
+    public static SessionsOpenStatus Created { get; } = new("created");
 
-    /// <summary>Instructions loaded from VS Code instruction files.</summary>
-    public static InstructionSourceType Vscode { get; } = new("vscode");
+    /// <summary>An existing session was loaded or reattached.</summary>
+    public static SessionsOpenStatus Resumed { get; } = new("resumed");
 
-    /// <summary>Instructions discovered from nested agent files.</summary>
-    public static InstructionSourceType NestedAgents { get; } = new("nested-agents");
+    /// <summary>No matching persisted session was found.</summary>
+    public static SessionsOpenStatus NotFound { get; } = new("not_found");
 
-    /// <summary>Instructions inherited from child instruction files.</summary>
-    public static InstructionSourceType ChildInstructions { get; } = new("child-instructions");
+    /// <summary>Connected to an existing remote session.</summary>
+    public static SessionsOpenStatus Connected { get; } = new("connected");
 
-    /// <summary>Instructions supplied by an installed plugin.</summary>
-    public static InstructionSourceType Plugin { get; } = new("plugin");
+    /// <summary>Remote session was handed off to a new local session.</summary>
+    public static SessionsOpenStatus HandedOff { get; } = new("handed_off");
 
-    /// <summary>Returns a value indicating whether two <see cref="InstructionSourceType"/> instances are equivalent.</summary>
-    public static bool operator ==(InstructionSourceType left, InstructionSourceType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionsOpenStatus left, SessionsOpenStatus right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="InstructionSourceType"/> instances are not equivalent.</summary>
-    public static bool operator !=(InstructionSourceType left, InstructionSourceType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionsOpenStatus left, SessionsOpenStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is InstructionSourceType other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionsOpenStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(InstructionSourceType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionsOpenStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15934,62 +22024,62 @@ public InstructionSourceType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{InstructionSourceType}"/> for serializing <see cref="InstructionSourceType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionsOpenStatus}"/> for serializing <see cref="SessionsOpenStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<InstructionSourceType>
+    public sealed class Converter : JsonConverter<SessionsOpenStatus>
     {
         /// <inheritdoc />
-        public override InstructionSourceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionsOpenStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, InstructionSourceType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionsOpenStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionSourceType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionsOpenStatus));
         }
     }
 }
 
 
-/// <summary>Whether the target is a single file or a directory of instruction files.</summary>
+/// <summary>Neutral SDK discriminator for the connected remote session kind.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct InstructionDiscoveryPathKind : IEquatable<InstructionDiscoveryPathKind>
+public readonly struct ConnectedRemoteSessionMetadataKind : IEquatable<ConnectedRemoteSessionMetadataKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="InstructionDiscoveryPathKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="InstructionDiscoveryPathKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ConnectedRemoteSessionMetadataKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ConnectedRemoteSessionMetadataKind"/>.</param>
     [JsonConstructor]
-    public InstructionDiscoveryPathKind(string value)
+    public ConnectedRemoteSessionMetadataKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="InstructionDiscoveryPathKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ConnectedRemoteSessionMetadataKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The target is a single instruction file.</summary>
-    public static InstructionDiscoveryPathKind File { get; } = new("file");
+    /// <summary>Remote CLI session.</summary>
+    public static ConnectedRemoteSessionMetadataKind RemoteSession { get; } = new("remote-session");
 
-    /// <summary>The target is a directory that holds instruction files.</summary>
-    public static InstructionDiscoveryPathKind Directory { get; } = new("directory");
+    /// <summary>GitHub Copilot coding agent session.</summary>
+    public static ConnectedRemoteSessionMetadataKind CodingAgent { get; } = new("coding-agent");
 
-    /// <summary>Returns a value indicating whether two <see cref="InstructionDiscoveryPathKind"/> instances are equivalent.</summary>
-    public static bool operator ==(InstructionDiscoveryPathKind left, InstructionDiscoveryPathKind right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ConnectedRemoteSessionMetadataKind"/> instances are equivalent.</summary>
+    public static bool operator ==(ConnectedRemoteSessionMetadataKind left, ConnectedRemoteSessionMetadataKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="InstructionDiscoveryPathKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(InstructionDiscoveryPathKind left, InstructionDiscoveryPathKind right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ConnectedRemoteSessionMetadataKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(ConnectedRemoteSessionMetadataKind left, ConnectedRemoteSessionMetadataKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is InstructionDiscoveryPathKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is ConnectedRemoteSessionMetadataKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(InstructionDiscoveryPathKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ConnectedRemoteSessionMetadataKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -15997,68 +22087,65 @@ public InstructionDiscoveryPathKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{InstructionDiscoveryPathKind}"/> for serializing <see cref="InstructionDiscoveryPathKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ConnectedRemoteSessionMetadataKind}"/> for serializing <see cref="ConnectedRemoteSessionMetadataKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<InstructionDiscoveryPathKind>
+    public sealed class Converter : JsonConverter<ConnectedRemoteSessionMetadataKind>
     {
         /// <inheritdoc />
-        public override InstructionDiscoveryPathKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ConnectedRemoteSessionMetadataKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, InstructionDiscoveryPathKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ConnectedRemoteSessionMetadataKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionDiscoveryPathKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ConnectedRemoteSessionMetadataKind));
         }
     }
 }
 
 
-/// <summary>Which tier this target belongs to.</summary>
+/// <summary>Which session sources to include. Defaults to `local` for backward compatibility.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct InstructionDiscoveryPathLocation : IEquatable<InstructionDiscoveryPathLocation>
+public readonly struct SessionSource : IEquatable<SessionSource>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="InstructionDiscoveryPathLocation"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="InstructionDiscoveryPathLocation"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionSource"/>.</param>
     [JsonConstructor]
-    public InstructionDiscoveryPathLocation(string value)
+    public SessionSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="InstructionDiscoveryPathLocation"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Instructions live in user-level configuration.</summary>
-    public static InstructionDiscoveryPathLocation User { get; } = new("user");
-
-    /// <summary>Instructions live in repository-level configuration.</summary>
-    public static InstructionDiscoveryPathLocation Repository { get; } = new("repository");
+    /// <summary>Return only local sessions.</summary>
+    public static SessionSource Local { get; } = new("local");
 
-    /// <summary>Instructions live under the current working directory.</summary>
-    public static InstructionDiscoveryPathLocation WorkingDirectory { get; } = new("working-directory");
+    /// <summary>Return only remote sessions.</summary>
+    public static SessionSource Remote { get; } = new("remote");
 
-    /// <summary>Instructions live in plugin-provided configuration.</summary>
-    public static InstructionDiscoveryPathLocation Plugin { get; } = new("plugin");
+    /// <summary>Return both local and remote sessions.</summary>
+    public static SessionSource All { get; } = new("all");
 
-    /// <summary>Returns a value indicating whether two <see cref="InstructionDiscoveryPathLocation"/> instances are equivalent.</summary>
-    public static bool operator ==(InstructionDiscoveryPathLocation left, InstructionDiscoveryPathLocation right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionSource"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionSource left, SessionSource right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="InstructionDiscoveryPathLocation"/> instances are not equivalent.</summary>
-    public static bool operator !=(InstructionDiscoveryPathLocation left, InstructionDiscoveryPathLocation right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionSource left, SessionSource right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is InstructionDiscoveryPathLocation other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(InstructionDiscoveryPathLocation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16066,59 +22153,71 @@ public InstructionDiscoveryPathLocation(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{InstructionDiscoveryPathLocation}"/> for serializing <see cref="InstructionDiscoveryPathLocation"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionSource}"/> for serializing <see cref="SessionSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<InstructionDiscoveryPathLocation>
+    public sealed class Converter : JsonConverter<SessionSource>
     {
         /// <inheritdoc />
-        public override InstructionDiscoveryPathLocation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, InstructionDiscoveryPathLocation value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionDiscoveryPathLocation));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionSource));
         }
     }
 }
 
 
-/// <summary>Optional completion hint for the input (e.g. 'directory' for filesystem path completion).</summary>
+/// <summary>Kind of attention required when status === "attention". Meaningful only when status === "attention".</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SlashCommandInputCompletion : IEquatable<SlashCommandInputCompletion>
+public readonly struct AgentRegistryLiveTargetEntryAttentionKind : IEquatable<AgentRegistryLiveTargetEntryAttentionKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SlashCommandInputCompletion"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SlashCommandInputCompletion"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLiveTargetEntryAttentionKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentRegistryLiveTargetEntryAttentionKind"/>.</param>
     [JsonConstructor]
-    public SlashCommandInputCompletion(string value)
+    public AgentRegistryLiveTargetEntryAttentionKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SlashCommandInputCompletion"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AgentRegistryLiveTargetEntryAttentionKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Input should complete filesystem directories.</summary>
-    public static SlashCommandInputCompletion Directory { get; } = new("directory");
+    /// <summary>Session is blocked on an unrecoverable error.</summary>
+    public static AgentRegistryLiveTargetEntryAttentionKind Error { get; } = new("error");
 
-    /// <summary>Returns a value indicating whether two <see cref="SlashCommandInputCompletion"/> instances are equivalent.</summary>
-    public static bool operator ==(SlashCommandInputCompletion left, SlashCommandInputCompletion right) => left.Equals(right);
+    /// <summary>Session is waiting for a tool-permission decision.</summary>
+    public static AgentRegistryLiveTargetEntryAttentionKind Permission { get; } = new("permission");
 
-    /// <summary>Returns a value indicating whether two <see cref="SlashCommandInputCompletion"/> instances are not equivalent.</summary>
-    public static bool operator !=(SlashCommandInputCompletion left, SlashCommandInputCompletion right) => !(left == right);
+    /// <summary>Session is waiting for the user to approve or reject a plan.</summary>
+    public static AgentRegistryLiveTargetEntryAttentionKind ExitPlan { get; } = new("exit_plan");
+
+    /// <summary>Session is waiting on an elicitation prompt.</summary>
+    public static AgentRegistryLiveTargetEntryAttentionKind Elicitation { get; } = new("elicitation");
+
+    /// <summary>Session is waiting for free-form user input.</summary>
+    public static AgentRegistryLiveTargetEntryAttentionKind UserInput { get; } = new("user_input");
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryAttentionKind"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentRegistryLiveTargetEntryAttentionKind left, AgentRegistryLiveTargetEntryAttentionKind right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryAttentionKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentRegistryLiveTargetEntryAttentionKind left, AgentRegistryLiveTargetEntryAttentionKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SlashCommandInputCompletion other && Equals(other);
+    public override bool Equals(object? obj) => obj is AgentRegistryLiveTargetEntryAttentionKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SlashCommandInputCompletion other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AgentRegistryLiveTargetEntryAttentionKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16126,65 +22225,62 @@ public SlashCommandInputCompletion(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SlashCommandInputCompletion}"/> for serializing <see cref="SlashCommandInputCompletion"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLiveTargetEntryAttentionKind}"/> for serializing <see cref="AgentRegistryLiveTargetEntryAttentionKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SlashCommandInputCompletion>
+    public sealed class Converter : JsonConverter<AgentRegistryLiveTargetEntryAttentionKind>
     {
         /// <inheritdoc />
-        public override SlashCommandInputCompletion Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AgentRegistryLiveTargetEntryAttentionKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SlashCommandInputCompletion value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AgentRegistryLiveTargetEntryAttentionKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SlashCommandInputCompletion));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLiveTargetEntryAttentionKind));
         }
     }
 }
 
 
-/// <summary>Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command.</summary>
+/// <summary>Process kind tag for the registry entry.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SlashCommandKind : IEquatable<SlashCommandKind>
+public readonly struct AgentRegistryLiveTargetEntryKind : IEquatable<AgentRegistryLiveTargetEntryKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SlashCommandKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SlashCommandKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLiveTargetEntryKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentRegistryLiveTargetEntryKind"/>.</param>
     [JsonConstructor]
-    public SlashCommandKind(string value)
+    public AgentRegistryLiveTargetEntryKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SlashCommandKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AgentRegistryLiveTargetEntryKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Command implemented by the runtime.</summary>
-    public static SlashCommandKind Builtin { get; } = new("builtin");
-
-    /// <summary>Command backed by a skill.</summary>
-    public static SlashCommandKind Skill { get; } = new("skill");
+    /// <summary>Interactive Copilot CLI exposing a UI server (legacy/normal CLI process).</summary>
+    public static AgentRegistryLiveTargetEntryKind UiServer { get; } = new("ui-server");
 
-    /// <summary>Command registered by an SDK client or extension.</summary>
-    public static SlashCommandKind Client { get; } = new("client");
+    /// <summary>Headless `--server --managed-server` child spawned by a controller.</summary>
+    public static AgentRegistryLiveTargetEntryKind ManagedServer { get; } = new("managed-server");
 
-    /// <summary>Returns a value indicating whether two <see cref="SlashCommandKind"/> instances are equivalent.</summary>
-    public static bool operator ==(SlashCommandKind left, SlashCommandKind right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryKind"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentRegistryLiveTargetEntryKind left, AgentRegistryLiveTargetEntryKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SlashCommandKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(SlashCommandKind left, SlashCommandKind right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentRegistryLiveTargetEntryKind left, AgentRegistryLiveTargetEntryKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SlashCommandKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is AgentRegistryLiveTargetEntryKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SlashCommandKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AgentRegistryLiveTargetEntryKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16192,62 +22288,62 @@ public SlashCommandKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SlashCommandKind}"/> for serializing <see cref="SlashCommandKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLiveTargetEntryKind}"/> for serializing <see cref="AgentRegistryLiveTargetEntryKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SlashCommandKind>
+    public sealed class Converter : JsonConverter<AgentRegistryLiveTargetEntryKind>
     {
         /// <inheritdoc />
-        public override SlashCommandKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AgentRegistryLiveTargetEntryKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SlashCommandKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AgentRegistryLiveTargetEntryKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SlashCommandKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLiveTargetEntryKind));
         }
     }
 }
 
 
-/// <summary>Path conventions used by this filesystem.</summary>
+/// <summary>How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionFsSetProviderConventions : IEquatable<SessionFsSetProviderConventions>
+public readonly struct AgentRegistryLiveTargetEntryLastTerminalEvent : IEquatable<AgentRegistryLiveTargetEntryLastTerminalEvent>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionFsSetProviderConventions"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionFsSetProviderConventions"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/>.</param>
     [JsonConstructor]
-    public SessionFsSetProviderConventions(string value)
+    public AgentRegistryLiveTargetEntryLastTerminalEvent(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionFsSetProviderConventions"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Paths use Windows path conventions.</summary>
-    public static SessionFsSetProviderConventions Windows { get; } = new("windows");
+    /// <summary>Last turn ended cleanly (model returned a final assistant message).</summary>
+    public static AgentRegistryLiveTargetEntryLastTerminalEvent TurnEnd { get; } = new("turn_end");
 
-    /// <summary>Paths use POSIX path conventions.</summary>
-    public static SessionFsSetProviderConventions Posix { get; } = new("posix");
+    /// <summary>Last turn was aborted (e.g. user interrupted).</summary>
+    public static AgentRegistryLiveTargetEntryLastTerminalEvent Abort { get; } = new("abort");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsSetProviderConventions"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionFsSetProviderConventions left, SessionFsSetProviderConventions right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentRegistryLiveTargetEntryLastTerminalEvent left, AgentRegistryLiveTargetEntryLastTerminalEvent right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsSetProviderConventions"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionFsSetProviderConventions left, SessionFsSetProviderConventions right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentRegistryLiveTargetEntryLastTerminalEvent left, AgentRegistryLiveTargetEntryLastTerminalEvent right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionFsSetProviderConventions other && Equals(other);
+    public override bool Equals(object? obj) => obj is AgentRegistryLiveTargetEntryLastTerminalEvent other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionFsSetProviderConventions other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AgentRegistryLiveTargetEntryLastTerminalEvent other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16255,62 +22351,68 @@ public SessionFsSetProviderConventions(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionFsSetProviderConventions}"/> for serializing <see cref="SessionFsSetProviderConventions"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLiveTargetEntryLastTerminalEvent}"/> for serializing <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionFsSetProviderConventions>
+    public sealed class Converter : JsonConverter<AgentRegistryLiveTargetEntryLastTerminalEvent>
     {
         /// <inheritdoc />
-        public override SessionFsSetProviderConventions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AgentRegistryLiveTargetEntryLastTerminalEvent Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionFsSetProviderConventions value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AgentRegistryLiveTargetEntryLastTerminalEvent value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsSetProviderConventions));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLiveTargetEntryLastTerminalEvent));
         }
     }
 }
 
 
-/// <summary>Repository host type.</summary>
+/// <summary>Coarse lifecycle status of the foreground session.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionContextHostType : IEquatable<SessionContextHostType>
+public readonly struct AgentRegistryLiveTargetEntryStatus : IEquatable<AgentRegistryLiveTargetEntryStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionContextHostType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionContextHostType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLiveTargetEntryStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentRegistryLiveTargetEntryStatus"/>.</param>
     [JsonConstructor]
-    public SessionContextHostType(string value)
+    public AgentRegistryLiveTargetEntryStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionContextHostType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AgentRegistryLiveTargetEntryStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Session repository is hosted on GitHub.</summary>
-    public static SessionContextHostType GitHub { get; } = new("github");
+    /// <summary>Session is actively processing a turn.</summary>
+    public static AgentRegistryLiveTargetEntryStatus Working { get; } = new("working");
 
-    /// <summary>Session repository is hosted on Azure DevOps.</summary>
-    public static SessionContextHostType Ado { get; } = new("ado");
+    /// <summary>Session is idle, waiting for input.</summary>
+    public static AgentRegistryLiveTargetEntryStatus Waiting { get; } = new("waiting");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionContextHostType"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionContextHostType left, SessionContextHostType right) => left.Equals(right);
+    /// <summary>Last turn completed successfully.</summary>
+    public static AgentRegistryLiveTargetEntryStatus Done { get; } = new("done");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionContextHostType"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionContextHostType left, SessionContextHostType right) => !(left == right);
+    /// <summary>Session needs user attention (see attentionKind for the specific reason).</summary>
+    public static AgentRegistryLiveTargetEntryStatus Attention { get; } = new("attention");
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentRegistryLiveTargetEntryStatus left, AgentRegistryLiveTargetEntryStatus right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentRegistryLiveTargetEntryStatus left, AgentRegistryLiveTargetEntryStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionContextHostType other && Equals(other);
+    public override bool Equals(object? obj) => obj is AgentRegistryLiveTargetEntryStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionContextHostType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AgentRegistryLiveTargetEntryStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16318,62 +22420,65 @@ public SessionContextHostType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionContextHostType}"/> for serializing <see cref="SessionContextHostType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLiveTargetEntryStatus}"/> for serializing <see cref="AgentRegistryLiveTargetEntryStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionContextHostType>
+    public sealed class Converter : JsonConverter<AgentRegistryLiveTargetEntryStatus>
     {
         /// <inheritdoc />
-        public override SessionContextHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AgentRegistryLiveTargetEntryStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionContextHostType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AgentRegistryLiveTargetEntryStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionContextHostType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLiveTargetEntryStatus));
         }
     }
 }
 
 
-/// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
+/// <summary>Categorized reason for log-open failure.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct RemoteSessionMetadataTaskType : IEquatable<RemoteSessionMetadataTaskType>
+public readonly struct AgentRegistryLogCaptureOpenErrorReason : IEquatable<AgentRegistryLogCaptureOpenErrorReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="RemoteSessionMetadataTaskType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="RemoteSessionMetadataTaskType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLogCaptureOpenErrorReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentRegistryLogCaptureOpenErrorReason"/>.</param>
     [JsonConstructor]
-    public RemoteSessionMetadataTaskType(string value)
+    public AgentRegistryLogCaptureOpenErrorReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="RemoteSessionMetadataTaskType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AgentRegistryLogCaptureOpenErrorReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>GitHub Copilot coding agent task.</summary>
-    public static RemoteSessionMetadataTaskType Cca { get; } = new("cca");
+    /// <summary>Filesystem permission denied opening the log file.</summary>
+    public static AgentRegistryLogCaptureOpenErrorReason Permission { get; } = new("permission");
 
-    /// <summary>CLI remote task.</summary>
-    public static RemoteSessionMetadataTaskType Cli { get; } = new("cli");
+    /// <summary>No space left on device.</summary>
+    public static AgentRegistryLogCaptureOpenErrorReason DiskFull { get; } = new("disk_full");
 
-    /// <summary>Returns a value indicating whether two <see cref="RemoteSessionMetadataTaskType"/> instances are equivalent.</summary>
-    public static bool operator ==(RemoteSessionMetadataTaskType left, RemoteSessionMetadataTaskType right) => left.Equals(right);
+    /// <summary>Other / uncategorized open failure.</summary>
+    public static AgentRegistryLogCaptureOpenErrorReason Other { get; } = new("other");
 
-    /// <summary>Returns a value indicating whether two <see cref="RemoteSessionMetadataTaskType"/> instances are not equivalent.</summary>
-    public static bool operator !=(RemoteSessionMetadataTaskType left, RemoteSessionMetadataTaskType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLogCaptureOpenErrorReason"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentRegistryLogCaptureOpenErrorReason left, AgentRegistryLogCaptureOpenErrorReason right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLogCaptureOpenErrorReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentRegistryLogCaptureOpenErrorReason left, AgentRegistryLogCaptureOpenErrorReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is RemoteSessionMetadataTaskType other && Equals(other);
+    public override bool Equals(object? obj) => obj is AgentRegistryLogCaptureOpenErrorReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(RemoteSessionMetadataTaskType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AgentRegistryLogCaptureOpenErrorReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16381,62 +22486,71 @@ public RemoteSessionMetadataTaskType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{RemoteSessionMetadataTaskType}"/> for serializing <see cref="RemoteSessionMetadataTaskType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLogCaptureOpenErrorReason}"/> for serializing <see cref="AgentRegistryLogCaptureOpenErrorReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<RemoteSessionMetadataTaskType>
+    public sealed class Converter : JsonConverter<AgentRegistryLogCaptureOpenErrorReason>
     {
         /// <inheritdoc />
-        public override RemoteSessionMetadataTaskType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AgentRegistryLogCaptureOpenErrorReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, RemoteSessionMetadataTaskType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AgentRegistryLogCaptureOpenErrorReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RemoteSessionMetadataTaskType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLogCaptureOpenErrorReason));
         }
     }
 }
 
 
-/// <summary>Step status.</summary>
+/// <summary>Which parameter field was invalid. Omitted when the rejection is not field-specific.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionsOpenProgressStatus : IEquatable<SessionsOpenProgressStatus>
+public readonly struct AgentRegistrySpawnValidationErrorField : IEquatable<AgentRegistrySpawnValidationErrorField>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionsOpenProgressStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionsOpenProgressStatus"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AgentRegistrySpawnValidationErrorField"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentRegistrySpawnValidationErrorField"/>.</param>
     [JsonConstructor]
-    public SessionsOpenProgressStatus(string value)
+    public AgentRegistrySpawnValidationErrorField(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionsOpenProgressStatus"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AgentRegistrySpawnValidationErrorField"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The step has started and has not yet finished.</summary>
-    public static SessionsOpenProgressStatus InProgress { get; } = new("in-progress");
+    /// <summary>The cwd parameter.</summary>
+    public static AgentRegistrySpawnValidationErrorField Cwd { get; } = new("cwd");
 
-    /// <summary>The step has completed successfully.</summary>
-    public static SessionsOpenProgressStatus Complete { get; } = new("complete");
+    /// <summary>The session name parameter.</summary>
+    public static AgentRegistrySpawnValidationErrorField Name { get; } = new("name");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenProgressStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionsOpenProgressStatus left, SessionsOpenProgressStatus right) => left.Equals(right);
+    /// <summary>The agentName parameter.</summary>
+    public static AgentRegistrySpawnValidationErrorField AgentName { get; } = new("agentName");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenProgressStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionsOpenProgressStatus left, SessionsOpenProgressStatus right) => !(left == right);
+    /// <summary>The model parameter.</summary>
+    public static AgentRegistrySpawnValidationErrorField Model { get; } = new("model");
+
+    /// <summary>The permissionMode parameter.</summary>
+    public static AgentRegistrySpawnValidationErrorField PermissionMode { get; } = new("permissionMode");
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnValidationErrorField"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentRegistrySpawnValidationErrorField left, AgentRegistrySpawnValidationErrorField right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnValidationErrorField"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentRegistrySpawnValidationErrorField left, AgentRegistrySpawnValidationErrorField right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionsOpenProgressStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is AgentRegistrySpawnValidationErrorField other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionsOpenProgressStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AgentRegistrySpawnValidationErrorField other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16444,74 +22558,74 @@ public SessionsOpenProgressStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionsOpenProgressStatus}"/> for serializing <see cref="SessionsOpenProgressStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AgentRegistrySpawnValidationErrorField}"/> for serializing <see cref="AgentRegistrySpawnValidationErrorField"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionsOpenProgressStatus>
+    public sealed class Converter : JsonConverter<AgentRegistrySpawnValidationErrorField>
     {
         /// <inheritdoc />
-        public override SessionsOpenProgressStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AgentRegistrySpawnValidationErrorField Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionsOpenProgressStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AgentRegistrySpawnValidationErrorField value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionsOpenProgressStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistrySpawnValidationErrorField));
         }
     }
 }
 
 
-/// <summary>Handoff step.</summary>
+/// <summary>Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionsOpenProgressStep : IEquatable<SessionsOpenProgressStep>
+public readonly struct AgentRegistrySpawnValidationErrorReason : IEquatable<AgentRegistrySpawnValidationErrorReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionsOpenProgressStep"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionsOpenProgressStep"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AgentRegistrySpawnValidationErrorReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentRegistrySpawnValidationErrorReason"/>.</param>
     [JsonConstructor]
-    public SessionsOpenProgressStep(string value)
+    public AgentRegistrySpawnValidationErrorReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionsOpenProgressStep"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AgentRegistrySpawnValidationErrorReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Loading the source session's events from the remote service.</summary>
-    public static SessionsOpenProgressStep LoadSession { get; } = new("load-session");
+    /// <summary>Provided cwd does not exist on disk.</summary>
+    public static AgentRegistrySpawnValidationErrorReason CwdNotFound { get; } = new("cwd-not-found");
 
-    /// <summary>Validating that the local repository matches the remote session's repository.</summary>
-    public static SessionsOpenProgressStep ValidateRepo { get; } = new("validate-repo");
+    /// <summary>Provided cwd exists but is not a directory.</summary>
+    public static AgentRegistrySpawnValidationErrorReason CwdNotDirectory { get; } = new("cwd-not-directory");
 
-    /// <summary>Checking the local working tree for uncommitted changes that would block the handoff.</summary>
-    public static SessionsOpenProgressStep CheckChanges { get; } = new("check-changes");
+    /// <summary>Session name failed validateSessionName.</summary>
+    public static AgentRegistrySpawnValidationErrorReason InvalidName { get; } = new("invalid-name");
 
-    /// <summary>Checking out the branch associated with the remote session in the local working tree.</summary>
-    public static SessionsOpenProgressStep CheckoutBranch { get; } = new("checkout-branch");
+    /// <summary>Requested agent name was not found in builtin or custom agents.</summary>
+    public static AgentRegistrySpawnValidationErrorReason UnknownAgent { get; } = new("unknown-agent");
 
-    /// <summary>Creating the new local session and seeding it with the source session's events.</summary>
-    public static SessionsOpenProgressStep CreateSession { get; } = new("create-session");
+    /// <summary>Requested model is not available to this session.</summary>
+    public static AgentRegistrySpawnValidationErrorReason UnknownModel { get; } = new("unknown-model");
 
-    /// <summary>Persisting the newly-created local session to disk.</summary>
-    public static SessionsOpenProgressStep SaveSession { get; } = new("save-session");
+    /// <summary>Caller asked for permissionMode='yolo' but the controller is not currently in allow-all mode.</summary>
+    public static AgentRegistrySpawnValidationErrorReason YoloNotAllowed { get; } = new("yolo-not-allowed");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenProgressStep"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionsOpenProgressStep left, SessionsOpenProgressStep right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnValidationErrorReason"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentRegistrySpawnValidationErrorReason left, AgentRegistrySpawnValidationErrorReason right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenProgressStep"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionsOpenProgressStep left, SessionsOpenProgressStep right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnValidationErrorReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentRegistrySpawnValidationErrorReason left, AgentRegistrySpawnValidationErrorReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionsOpenProgressStep other && Equals(other);
+    public override bool Equals(object? obj) => obj is AgentRegistrySpawnValidationErrorReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionsOpenProgressStep other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AgentRegistrySpawnValidationErrorReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16519,71 +22633,62 @@ public SessionsOpenProgressStep(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionsOpenProgressStep}"/> for serializing <see cref="SessionsOpenProgressStep"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AgentRegistrySpawnValidationErrorReason}"/> for serializing <see cref="AgentRegistrySpawnValidationErrorReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionsOpenProgressStep>
+    public sealed class Converter : JsonConverter<AgentRegistrySpawnValidationErrorReason>
     {
         /// <inheritdoc />
-        public override SessionsOpenProgressStep Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AgentRegistrySpawnValidationErrorReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionsOpenProgressStep value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AgentRegistrySpawnValidationErrorReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionsOpenProgressStep));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistrySpawnValidationErrorReason));
         }
     }
 }
 
 
-/// <summary>Outcome of the open request.</summary>
+/// <summary>Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionsOpenStatus : IEquatable<SessionsOpenStatus>
+public readonly struct AgentRegistrySpawnPermissionMode : IEquatable<AgentRegistrySpawnPermissionMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionsOpenStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionsOpenStatus"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AgentRegistrySpawnPermissionMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentRegistrySpawnPermissionMode"/>.</param>
     [JsonConstructor]
-    public SessionsOpenStatus(string value)
+    public AgentRegistrySpawnPermissionMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionsOpenStatus"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AgentRegistrySpawnPermissionMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A new session was created.</summary>
-    public static SessionsOpenStatus Created { get; } = new("created");
-
-    /// <summary>An existing session was loaded or reattached.</summary>
-    public static SessionsOpenStatus Resumed { get; } = new("resumed");
-
-    /// <summary>No matching persisted session was found.</summary>
-    public static SessionsOpenStatus NotFound { get; } = new("not_found");
-
-    /// <summary>Connected to an existing remote session.</summary>
-    public static SessionsOpenStatus Connected { get; } = new("connected");
+    /// <summary>Standard permission posture (prompts for each request).</summary>
+    public static AgentRegistrySpawnPermissionMode Default { get; } = new("default");
 
-    /// <summary>Remote session was handed off to a new local session.</summary>
-    public static SessionsOpenStatus HandedOff { get; } = new("handed_off");
+    /// <summary>Full allow-all (requires the controller-local session to currently be in allow-all mode).</summary>
+    public static AgentRegistrySpawnPermissionMode Yolo { get; } = new("yolo");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionsOpenStatus left, SessionsOpenStatus right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnPermissionMode"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentRegistrySpawnPermissionMode left, AgentRegistrySpawnPermissionMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionsOpenStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionsOpenStatus left, SessionsOpenStatus right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnPermissionMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentRegistrySpawnPermissionMode left, AgentRegistrySpawnPermissionMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionsOpenStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is AgentRegistrySpawnPermissionMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionsOpenStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AgentRegistrySpawnPermissionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16591,62 +22696,68 @@ public SessionsOpenStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionsOpenStatus}"/> for serializing <see cref="SessionsOpenStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AgentRegistrySpawnPermissionMode}"/> for serializing <see cref="AgentRegistrySpawnPermissionMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionsOpenStatus>
+    public sealed class Converter : JsonConverter<AgentRegistrySpawnPermissionMode>
     {
         /// <inheritdoc />
-        public override SessionsOpenStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AgentRegistrySpawnPermissionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionsOpenStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AgentRegistrySpawnPermissionMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionsOpenStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistrySpawnPermissionMode));
         }
     }
 }
 
 
-/// <summary>Neutral SDK discriminator for the connected remote session kind.</summary>
+/// <summary>The UI mode the agent was in when this message was sent. Defaults to the session's current mode.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ConnectedRemoteSessionMetadataKind : IEquatable<ConnectedRemoteSessionMetadataKind>
+public readonly struct SendAgentMode : IEquatable<SendAgentMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ConnectedRemoteSessionMetadataKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ConnectedRemoteSessionMetadataKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SendAgentMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SendAgentMode"/>.</param>
     [JsonConstructor]
-    public ConnectedRemoteSessionMetadataKind(string value)
+    public SendAgentMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ConnectedRemoteSessionMetadataKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SendAgentMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Remote CLI session.</summary>
-    public static ConnectedRemoteSessionMetadataKind RemoteSession { get; } = new("remote-session");
+    /// <summary>The agent is responding interactively to the user.</summary>
+    public static SendAgentMode Interactive { get; } = new("interactive");
 
-    /// <summary>GitHub Copilot coding agent session.</summary>
-    public static ConnectedRemoteSessionMetadataKind CodingAgent { get; } = new("coding-agent");
+    /// <summary>The agent is preparing a plan before making changes.</summary>
+    public static SendAgentMode Plan { get; } = new("plan");
 
-    /// <summary>Returns a value indicating whether two <see cref="ConnectedRemoteSessionMetadataKind"/> instances are equivalent.</summary>
-    public static bool operator ==(ConnectedRemoteSessionMetadataKind left, ConnectedRemoteSessionMetadataKind right) => left.Equals(right);
+    /// <summary>The agent is working autonomously toward task completion.</summary>
+    public static SendAgentMode Autopilot { get; } = new("autopilot");
 
-    /// <summary>Returns a value indicating whether two <see cref="ConnectedRemoteSessionMetadataKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(ConnectedRemoteSessionMetadataKind left, ConnectedRemoteSessionMetadataKind right) => !(left == right);
+    /// <summary>The agent is in shell-focused UI mode.</summary>
+    public static SendAgentMode Shell { get; } = new("shell");
+
+    /// <summary>Returns a value indicating whether two <see cref="SendAgentMode"/> instances are equivalent.</summary>
+    public static bool operator ==(SendAgentMode left, SendAgentMode right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="SendAgentMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(SendAgentMode left, SendAgentMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ConnectedRemoteSessionMetadataKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is SendAgentMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ConnectedRemoteSessionMetadataKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SendAgentMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16654,65 +22765,62 @@ public ConnectedRemoteSessionMetadataKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ConnectedRemoteSessionMetadataKind}"/> for serializing <see cref="ConnectedRemoteSessionMetadataKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SendAgentMode}"/> for serializing <see cref="SendAgentMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ConnectedRemoteSessionMetadataKind>
+    public sealed class Converter : JsonConverter<SendAgentMode>
     {
         /// <inheritdoc />
-        public override ConnectedRemoteSessionMetadataKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SendAgentMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ConnectedRemoteSessionMetadataKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SendAgentMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ConnectedRemoteSessionMetadataKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SendAgentMode));
         }
     }
 }
 
 
-/// <summary>Which session sources to include. Defaults to `local` for backward compatibility.</summary>
+/// <summary>How to deliver the message. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionSource : IEquatable<SessionSource>
+public readonly struct SendMode : IEquatable<SendMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionSource"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionSource"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SendMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SendMode"/>.</param>
     [JsonConstructor]
-    public SessionSource(string value)
+    public SendMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SendMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Return only local sessions.</summary>
-    public static SessionSource Local { get; } = new("local");
-
-    /// <summary>Return only remote sessions.</summary>
-    public static SessionSource Remote { get; } = new("remote");
+    /// <summary>Append the message to the normal session queue.</summary>
+    public static SendMode Enqueue { get; } = new("enqueue");
 
-    /// <summary>Return both local and remote sessions.</summary>
-    public static SessionSource All { get; } = new("all");
+    /// <summary>Interject the message during the in-progress turn.</summary>
+    public static SendMode Immediate { get; } = new("immediate");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionSource"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionSource left, SessionSource right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SendMode"/> instances are equivalent.</summary>
+    public static bool operator ==(SendMode left, SendMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionSource"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionSource left, SessionSource right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SendMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(SendMode left, SendMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is SendMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SendMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16720,71 +22828,65 @@ public SessionSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionSource}"/> for serializing <see cref="SessionSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SendMode}"/> for serializing <see cref="SendMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionSource>
+    public sealed class Converter : JsonConverter<SendMode>
     {
         /// <inheritdoc />
-        public override SessionSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SendMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SendMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SendMode));
         }
     }
 }
 
 
-/// <summary>Kind of attention required when status === "attention". Meaningful only when status === "attention".</summary>
+/// <summary>Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentRegistryLiveTargetEntryAttentionKind : IEquatable<AgentRegistryLiveTargetEntryAttentionKind>
+public readonly struct SessionLogLevel : IEquatable<SessionLogLevel>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLiveTargetEntryAttentionKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentRegistryLiveTargetEntryAttentionKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionLogLevel"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionLogLevel"/>.</param>
     [JsonConstructor]
-    public AgentRegistryLiveTargetEntryAttentionKind(string value)
+    public SessionLogLevel(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentRegistryLiveTargetEntryAttentionKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionLogLevel"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Session is blocked on an unrecoverable error.</summary>
-    public static AgentRegistryLiveTargetEntryAttentionKind Error { get; } = new("error");
-
-    /// <summary>Session is waiting for a tool-permission decision.</summary>
-    public static AgentRegistryLiveTargetEntryAttentionKind Permission { get; } = new("permission");
-
-    /// <summary>Session is waiting for the user to approve or reject a plan.</summary>
-    public static AgentRegistryLiveTargetEntryAttentionKind ExitPlan { get; } = new("exit_plan");
+    /// <summary>Informational message.</summary>
+    public static SessionLogLevel Info { get; } = new("info");
 
-    /// <summary>Session is waiting on an elicitation prompt.</summary>
-    public static AgentRegistryLiveTargetEntryAttentionKind Elicitation { get; } = new("elicitation");
+    /// <summary>Warning message that may require attention.</summary>
+    public static SessionLogLevel Warning { get; } = new("warning");
 
-    /// <summary>Session is waiting for free-form user input.</summary>
-    public static AgentRegistryLiveTargetEntryAttentionKind UserInput { get; } = new("user_input");
+    /// <summary>Error message describing a failure.</summary>
+    public static SessionLogLevel Error { get; } = new("error");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryAttentionKind"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentRegistryLiveTargetEntryAttentionKind left, AgentRegistryLiveTargetEntryAttentionKind right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionLogLevel"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionLogLevel left, SessionLogLevel right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryAttentionKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentRegistryLiveTargetEntryAttentionKind left, AgentRegistryLiveTargetEntryAttentionKind right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionLogLevel"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionLogLevel left, SessionLogLevel right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentRegistryLiveTargetEntryAttentionKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionLogLevel other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentRegistryLiveTargetEntryAttentionKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionLogLevel other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16792,62 +22894,80 @@ public AgentRegistryLiveTargetEntryAttentionKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLiveTargetEntryAttentionKind}"/> for serializing <see cref="AgentRegistryLiveTargetEntryAttentionKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionLogLevel}"/> for serializing <see cref="SessionLogLevel"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentRegistryLiveTargetEntryAttentionKind>
+    public sealed class Converter : JsonConverter<SessionLogLevel>
     {
         /// <inheritdoc />
-        public override AgentRegistryLiveTargetEntryAttentionKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionLogLevel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentRegistryLiveTargetEntryAttentionKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionLogLevel value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLiveTargetEntryAttentionKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLogLevel));
         }
     }
 }
 
 
-/// <summary>Process kind tag for the registry entry.</summary>
+/// <summary>Authentication type.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentRegistryLiveTargetEntryKind : IEquatable<AgentRegistryLiveTargetEntryKind>
+public readonly struct AuthInfoType : IEquatable<AuthInfoType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLiveTargetEntryKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentRegistryLiveTargetEntryKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AuthInfoType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AuthInfoType"/>.</param>
     [JsonConstructor]
-    public AgentRegistryLiveTargetEntryKind(string value)
+    public AuthInfoType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentRegistryLiveTargetEntryKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AuthInfoType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Interactive Copilot CLI exposing a UI server (legacy/normal CLI process).</summary>
-    public static AgentRegistryLiveTargetEntryKind UiServer { get; } = new("ui-server");
+    /// <summary>Authentication provided by a GitHub App HMAC credential.</summary>
+    public static AuthInfoType Hmac { get; } = new("hmac");
 
-    /// <summary>Headless `--server --managed-server` child spawned by a controller.</summary>
-    public static AgentRegistryLiveTargetEntryKind ManagedServer { get; } = new("managed-server");
+    /// <summary>Authentication resolved from environment-provided credentials.</summary>
+    public static AuthInfoType Env { get; } = new("env");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryKind"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentRegistryLiveTargetEntryKind left, AgentRegistryLiveTargetEntryKind right) => left.Equals(right);
+    /// <summary>Authentication from an interactive user sign-in.</summary>
+    public static AuthInfoType User { get; } = new("user");
+
+    /// <summary>Authentication delegated to the GitHub CLI.</summary>
+    public static AuthInfoType GhCli { get; } = new("gh-cli");
+
+    /// <summary>Authentication from an API key credential.</summary>
+    public static AuthInfoType ApiKey { get; } = new("api-key");
+
+    /// <summary>Authentication from a GitHub token.</summary>
+    public static AuthInfoType Token { get; } = new("token");
+
+    /// <summary>Authentication from an SDK GitHub token callback.</summary>
+    public static AuthInfoType TokenProvider { get; } = new("token-provider");
+
+    /// <summary>Authentication from a Copilot API token.</summary>
+    public static AuthInfoType CopilotApiToken { get; } = new("copilot-api-token");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentRegistryLiveTargetEntryKind left, AgentRegistryLiveTargetEntryKind right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="AuthInfoType"/> instances are equivalent.</summary>
+    public static bool operator ==(AuthInfoType left, AuthInfoType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AuthInfoType"/> instances are not equivalent.</summary>
+    public static bool operator !=(AuthInfoType left, AuthInfoType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentRegistryLiveTargetEntryKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is AuthInfoType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentRegistryLiveTargetEntryKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AuthInfoType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16855,62 +22975,68 @@ public AgentRegistryLiveTargetEntryKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLiveTargetEntryKind}"/> for serializing <see cref="AgentRegistryLiveTargetEntryKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AuthInfoType}"/> for serializing <see cref="AuthInfoType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentRegistryLiveTargetEntryKind>
+    public sealed class Converter : JsonConverter<AuthInfoType>
     {
         /// <inheritdoc />
-        public override AgentRegistryLiveTargetEntryKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AuthInfoType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentRegistryLiveTargetEntryKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AuthInfoType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLiveTargetEntryKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AuthInfoType));
         }
     }
 }
 
 
-/// <summary>How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.</summary>
+/// <summary>Source category for a collected debug bundle entry.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentRegistryLiveTargetEntryLastTerminalEvent : IEquatable<AgentRegistryLiveTargetEntryLastTerminalEvent>
+public readonly struct DebugCollectLogsSource : IEquatable<DebugCollectLogsSource>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="DebugCollectLogsSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="DebugCollectLogsSource"/>.</param>
     [JsonConstructor]
-    public AgentRegistryLiveTargetEntryLastTerminalEvent(string value)
+    public DebugCollectLogsSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="DebugCollectLogsSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Last turn ended cleanly (model returned a final assistant message).</summary>
-    public static AgentRegistryLiveTargetEntryLastTerminalEvent TurnEnd { get; } = new("turn_end");
+    /// <summary>Session event log.</summary>
+    public static DebugCollectLogsSource Events { get; } = new("events");
 
-    /// <summary>Last turn was aborted (e.g. user interrupted).</summary>
-    public static AgentRegistryLiveTargetEntryLastTerminalEvent Abort { get; } = new("abort");
+    /// <summary>Process log for the session.</summary>
+    public static DebugCollectLogsSource ProcessLog { get; } = new("process-log");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentRegistryLiveTargetEntryLastTerminalEvent left, AgentRegistryLiveTargetEntryLastTerminalEvent right) => left.Equals(right);
+    /// <summary>Interactive shell log for the session.</summary>
+    public static DebugCollectLogsSource ShellLog { get; } = new("shell-log");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentRegistryLiveTargetEntryLastTerminalEvent left, AgentRegistryLiveTargetEntryLastTerminalEvent right) => !(left == right);
+    /// <summary>Caller-provided diagnostic entry.</summary>
+    public static DebugCollectLogsSource Additional { get; } = new("additional");
+
+    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsSource"/> instances are equivalent.</summary>
+    public static bool operator ==(DebugCollectLogsSource left, DebugCollectLogsSource right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(DebugCollectLogsSource left, DebugCollectLogsSource right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentRegistryLiveTargetEntryLastTerminalEvent other && Equals(other);
+    public override bool Equals(object? obj) => obj is DebugCollectLogsSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentRegistryLiveTargetEntryLastTerminalEvent other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(DebugCollectLogsSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16918,68 +23044,62 @@ public AgentRegistryLiveTargetEntryLastTerminalEvent(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLiveTargetEntryLastTerminalEvent}"/> for serializing <see cref="AgentRegistryLiveTargetEntryLastTerminalEvent"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{DebugCollectLogsSource}"/> for serializing <see cref="DebugCollectLogsSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentRegistryLiveTargetEntryLastTerminalEvent>
+    public sealed class Converter : JsonConverter<DebugCollectLogsSource>
     {
         /// <inheritdoc />
-        public override AgentRegistryLiveTargetEntryLastTerminalEvent Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override DebugCollectLogsSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentRegistryLiveTargetEntryLastTerminalEvent value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, DebugCollectLogsSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLiveTargetEntryLastTerminalEvent));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DebugCollectLogsSource));
         }
     }
 }
 
 
-/// <summary>Coarse lifecycle status of the foreground session.</summary>
+/// <summary>Destination kind that was written.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentRegistryLiveTargetEntryStatus : IEquatable<AgentRegistryLiveTargetEntryStatus>
+public readonly struct DebugCollectLogsResultKind : IEquatable<DebugCollectLogsResultKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLiveTargetEntryStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentRegistryLiveTargetEntryStatus"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="DebugCollectLogsResultKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="DebugCollectLogsResultKind"/>.</param>
     [JsonConstructor]
-    public AgentRegistryLiveTargetEntryStatus(string value)
+    public DebugCollectLogsResultKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentRegistryLiveTargetEntryStatus"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="DebugCollectLogsResultKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Session is actively processing a turn.</summary>
-    public static AgentRegistryLiveTargetEntryStatus Working { get; } = new("working");
-
-    /// <summary>Session is idle, waiting for input.</summary>
-    public static AgentRegistryLiveTargetEntryStatus Waiting { get; } = new("waiting");
-
-    /// <summary>Last turn completed successfully.</summary>
-    public static AgentRegistryLiveTargetEntryStatus Done { get; } = new("done");
+    /// <summary>A .tgz archive was written.</summary>
+    public static DebugCollectLogsResultKind Archive { get; } = new("archive");
 
-    /// <summary>Session needs user attention (see attentionKind for the specific reason).</summary>
-    public static AgentRegistryLiveTargetEntryStatus Attention { get; } = new("attention");
+    /// <summary>A directory containing redacted files was written.</summary>
+    public static DebugCollectLogsResultKind Directory { get; } = new("directory");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentRegistryLiveTargetEntryStatus left, AgentRegistryLiveTargetEntryStatus right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsResultKind"/> instances are equivalent.</summary>
+    public static bool operator ==(DebugCollectLogsResultKind left, DebugCollectLogsResultKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLiveTargetEntryStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentRegistryLiveTargetEntryStatus left, AgentRegistryLiveTargetEntryStatus right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsResultKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(DebugCollectLogsResultKind left, DebugCollectLogsResultKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentRegistryLiveTargetEntryStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is DebugCollectLogsResultKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentRegistryLiveTargetEntryStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(DebugCollectLogsResultKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -16987,65 +23107,62 @@ public AgentRegistryLiveTargetEntryStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLiveTargetEntryStatus}"/> for serializing <see cref="AgentRegistryLiveTargetEntryStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{DebugCollectLogsResultKind}"/> for serializing <see cref="DebugCollectLogsResultKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentRegistryLiveTargetEntryStatus>
+    public sealed class Converter : JsonConverter<DebugCollectLogsResultKind>
     {
         /// <inheritdoc />
-        public override AgentRegistryLiveTargetEntryStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override DebugCollectLogsResultKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentRegistryLiveTargetEntryStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, DebugCollectLogsResultKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLiveTargetEntryStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DebugCollectLogsResultKind));
         }
     }
 }
 
 
-/// <summary>Categorized reason for log-open failure.</summary>
+/// <summary>Kind of caller-provided debug log entry.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentRegistryLogCaptureOpenErrorReason : IEquatable<AgentRegistryLogCaptureOpenErrorReason>
+public readonly struct DebugCollectLogsEntryKind : IEquatable<DebugCollectLogsEntryKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentRegistryLogCaptureOpenErrorReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentRegistryLogCaptureOpenErrorReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="DebugCollectLogsEntryKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="DebugCollectLogsEntryKind"/>.</param>
     [JsonConstructor]
-    public AgentRegistryLogCaptureOpenErrorReason(string value)
+    public DebugCollectLogsEntryKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentRegistryLogCaptureOpenErrorReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="DebugCollectLogsEntryKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Filesystem permission denied opening the log file.</summary>
-    public static AgentRegistryLogCaptureOpenErrorReason Permission { get; } = new("permission");
-
-    /// <summary>No space left on device.</summary>
-    public static AgentRegistryLogCaptureOpenErrorReason DiskFull { get; } = new("disk_full");
+    /// <summary>Include a single server-local file.</summary>
+    public static DebugCollectLogsEntryKind File { get; } = new("file");
 
-    /// <summary>Other / uncategorized open failure.</summary>
-    public static AgentRegistryLogCaptureOpenErrorReason Other { get; } = new("other");
+    /// <summary>Include files from a server-local directory recursively.</summary>
+    public static DebugCollectLogsEntryKind Directory { get; } = new("directory");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLogCaptureOpenErrorReason"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentRegistryLogCaptureOpenErrorReason left, AgentRegistryLogCaptureOpenErrorReason right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsEntryKind"/> instances are equivalent.</summary>
+    public static bool operator ==(DebugCollectLogsEntryKind left, DebugCollectLogsEntryKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistryLogCaptureOpenErrorReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentRegistryLogCaptureOpenErrorReason left, AgentRegistryLogCaptureOpenErrorReason right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsEntryKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(DebugCollectLogsEntryKind left, DebugCollectLogsEntryKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentRegistryLogCaptureOpenErrorReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is DebugCollectLogsEntryKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentRegistryLogCaptureOpenErrorReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(DebugCollectLogsEntryKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17053,71 +23170,62 @@ public AgentRegistryLogCaptureOpenErrorReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentRegistryLogCaptureOpenErrorReason}"/> for serializing <see cref="AgentRegistryLogCaptureOpenErrorReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{DebugCollectLogsEntryKind}"/> for serializing <see cref="DebugCollectLogsEntryKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentRegistryLogCaptureOpenErrorReason>
+    public sealed class Converter : JsonConverter<DebugCollectLogsEntryKind>
     {
         /// <inheritdoc />
-        public override AgentRegistryLogCaptureOpenErrorReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override DebugCollectLogsEntryKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentRegistryLogCaptureOpenErrorReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, DebugCollectLogsEntryKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistryLogCaptureOpenErrorReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DebugCollectLogsEntryKind));
         }
     }
 }
 
 
-/// <summary>Which parameter field was invalid. Omitted when the rejection is not field-specific.</summary>
+/// <summary>How a collected debug entry should be redacted before being staged.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentRegistrySpawnValidationErrorField : IEquatable<AgentRegistrySpawnValidationErrorField>
+public readonly struct DebugCollectLogsRedaction : IEquatable<DebugCollectLogsRedaction>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentRegistrySpawnValidationErrorField"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentRegistrySpawnValidationErrorField"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="DebugCollectLogsRedaction"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="DebugCollectLogsRedaction"/>.</param>
     [JsonConstructor]
-    public AgentRegistrySpawnValidationErrorField(string value)
+    public DebugCollectLogsRedaction(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentRegistrySpawnValidationErrorField"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="DebugCollectLogsRedaction"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The cwd parameter.</summary>
-    public static AgentRegistrySpawnValidationErrorField Cwd { get; } = new("cwd");
-
-    /// <summary>The session name parameter.</summary>
-    public static AgentRegistrySpawnValidationErrorField Name { get; } = new("name");
-
-    /// <summary>The agentName parameter.</summary>
-    public static AgentRegistrySpawnValidationErrorField AgentName { get; } = new("agentName");
-
-    /// <summary>The model parameter.</summary>
-    public static AgentRegistrySpawnValidationErrorField Model { get; } = new("model");
+    /// <summary>Redact the file as plain UTF-8 log text.</summary>
+    public static DebugCollectLogsRedaction PlainText { get; } = new("plain-text");
 
-    /// <summary>The permissionMode parameter.</summary>
-    public static AgentRegistrySpawnValidationErrorField PermissionMode { get; } = new("permissionMode");
+    /// <summary>Redact each non-empty line as a session event JSON object, falling back to plain-text redaction for malformed lines.</summary>
+    public static DebugCollectLogsRedaction EventsJsonl { get; } = new("events-jsonl");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnValidationErrorField"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentRegistrySpawnValidationErrorField left, AgentRegistrySpawnValidationErrorField right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsRedaction"/> instances are equivalent.</summary>
+    public static bool operator ==(DebugCollectLogsRedaction left, DebugCollectLogsRedaction right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnValidationErrorField"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentRegistrySpawnValidationErrorField left, AgentRegistrySpawnValidationErrorField right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsRedaction"/> instances are not equivalent.</summary>
+    public static bool operator !=(DebugCollectLogsRedaction left, DebugCollectLogsRedaction right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentRegistrySpawnValidationErrorField other && Equals(other);
+    public override bool Equals(object? obj) => obj is DebugCollectLogsRedaction other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentRegistrySpawnValidationErrorField other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(DebugCollectLogsRedaction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17125,74 +23233,65 @@ public AgentRegistrySpawnValidationErrorField(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentRegistrySpawnValidationErrorField}"/> for serializing <see cref="AgentRegistrySpawnValidationErrorField"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{DebugCollectLogsRedaction}"/> for serializing <see cref="DebugCollectLogsRedaction"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentRegistrySpawnValidationErrorField>
+    public sealed class Converter : JsonConverter<DebugCollectLogsRedaction>
     {
         /// <inheritdoc />
-        public override AgentRegistrySpawnValidationErrorField Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override DebugCollectLogsRedaction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentRegistrySpawnValidationErrorField value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, DebugCollectLogsRedaction value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistrySpawnValidationErrorField));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DebugCollectLogsRedaction));
         }
     }
 }
 
 
-/// <summary>Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.</summary>
+/// <summary>Cumulative resource ceiling that stopped a factory run.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentRegistrySpawnValidationErrorReason : IEquatable<AgentRegistrySpawnValidationErrorReason>
+public readonly struct FactoryRunFailureKind : IEquatable<FactoryRunFailureKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentRegistrySpawnValidationErrorReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentRegistrySpawnValidationErrorReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="FactoryRunFailureKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="FactoryRunFailureKind"/>.</param>
     [JsonConstructor]
-    public AgentRegistrySpawnValidationErrorReason(string value)
+    public FactoryRunFailureKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentRegistrySpawnValidationErrorReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="FactoryRunFailureKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Provided cwd does not exist on disk.</summary>
-    public static AgentRegistrySpawnValidationErrorReason CwdNotFound { get; } = new("cwd-not-found");
-
-    /// <summary>Provided cwd exists but is not a directory.</summary>
-    public static AgentRegistrySpawnValidationErrorReason CwdNotDirectory { get; } = new("cwd-not-directory");
-
-    /// <summary>Session name failed validateSessionName.</summary>
-    public static AgentRegistrySpawnValidationErrorReason InvalidName { get; } = new("invalid-name");
-
-    /// <summary>Requested agent name was not found in builtin or custom agents.</summary>
-    public static AgentRegistrySpawnValidationErrorReason UnknownAgent { get; } = new("unknown-agent");
+    /// <summary>The run admitted the approved maximum total number of subagents.</summary>
+    public static FactoryRunFailureKind MaxTotalSubagents { get; } = new("maxTotalSubagents");
 
-    /// <summary>Requested model is not available to this session.</summary>
-    public static AgentRegistrySpawnValidationErrorReason UnknownModel { get; } = new("unknown-model");
+    /// <summary>The run reached the approved accumulated active-execution time in seconds.</summary>
+    public static FactoryRunFailureKind TimeoutSeconds { get; } = new("timeoutSeconds");
 
-    /// <summary>Caller asked for permissionMode='yolo' but the controller is not currently in allow-all mode.</summary>
-    public static AgentRegistrySpawnValidationErrorReason YoloNotAllowed { get; } = new("yolo-not-allowed");
+    /// <summary>The run's settled subagent model usage exceeded the approved AI-credit ceiling, or no headroom remained for another subagent.</summary>
+    public static FactoryRunFailureKind MaxAiCredits { get; } = new("maxAiCredits");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnValidationErrorReason"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentRegistrySpawnValidationErrorReason left, AgentRegistrySpawnValidationErrorReason right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="FactoryRunFailureKind"/> instances are equivalent.</summary>
+    public static bool operator ==(FactoryRunFailureKind left, FactoryRunFailureKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnValidationErrorReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentRegistrySpawnValidationErrorReason left, AgentRegistrySpawnValidationErrorReason right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="FactoryRunFailureKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(FactoryRunFailureKind left, FactoryRunFailureKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentRegistrySpawnValidationErrorReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is FactoryRunFailureKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentRegistrySpawnValidationErrorReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(FactoryRunFailureKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17200,62 +23299,89 @@ public AgentRegistrySpawnValidationErrorReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentRegistrySpawnValidationErrorReason}"/> for serializing <see cref="AgentRegistrySpawnValidationErrorReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{FactoryRunFailureKind}"/> for serializing <see cref="FactoryRunFailureKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentRegistrySpawnValidationErrorReason>
+    public sealed class Converter : JsonConverter<FactoryRunFailureKind>
     {
         /// <inheritdoc />
-        public override AgentRegistrySpawnValidationErrorReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override FactoryRunFailureKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentRegistrySpawnValidationErrorReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, FactoryRunFailureKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistrySpawnValidationErrorReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryRunFailureKind));
         }
     }
 }
 
 
-/// <summary>Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.</summary>
+/// <summary>Execution-critical factory storage operation.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AgentRegistrySpawnPermissionMode : IEquatable<AgentRegistrySpawnPermissionMode>
+public readonly struct FactoryDurableOperation : IEquatable<FactoryDurableOperation>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AgentRegistrySpawnPermissionMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AgentRegistrySpawnPermissionMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="FactoryDurableOperation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="FactoryDurableOperation"/>.</param>
     [JsonConstructor]
-    public AgentRegistrySpawnPermissionMode(string value)
+    public FactoryDurableOperation(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AgentRegistrySpawnPermissionMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="FactoryDurableOperation"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Standard permission posture (prompts for each request).</summary>
-    public static AgentRegistrySpawnPermissionMode Default { get; } = new("default");
+    /// <summary>Creating the durable run and declared phases.</summary>
+    public static FactoryDurableOperation CreateRun { get; } = new("createRun");
 
-    /// <summary>Full allow-all (requires the controller-local session to currently be in allow-all mode).</summary>
-    public static AgentRegistrySpawnPermissionMode Yolo { get; } = new("yolo");
+    /// <summary>Persisting the transition to running.</summary>
+    public static FactoryDurableOperation MarkRunStarted { get; } = new("markRunStarted");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnPermissionMode"/> instances are equivalent.</summary>
-    public static bool operator ==(AgentRegistrySpawnPermissionMode left, AgentRegistrySpawnPermissionMode right) => left.Equals(right);
+    /// <summary>Persisting the terminal run envelope.</summary>
+    public static FactoryDurableOperation FinishRun { get; } = new("finishRun");
 
-    /// <summary>Returns a value indicating whether two <see cref="AgentRegistrySpawnPermissionMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(AgentRegistrySpawnPermissionMode left, AgentRegistrySpawnPermissionMode right) => !(left == right);
+    /// <summary>Persisting subagent admission accounting.</summary>
+    public static FactoryDurableOperation ReserveAgent { get; } = new("reserveAgent");
+
+    /// <summary>Rolling back an uncommitted subagent admission.</summary>
+    public static FactoryDurableOperation ReleaseAgent { get; } = new("releaseAgent");
+
+    /// <summary>Persisting an idempotent model-usage charge.</summary>
+    public static FactoryDurableOperation ChargeCredit { get; } = new("chargeCredit");
+
+    /// <summary>Persisting active execution time.</summary>
+    public static FactoryDurableOperation AddElapsed { get; } = new("addElapsed");
+
+    /// <summary>Reading the authoritative AI-credit total.</summary>
+    public static FactoryDurableOperation ReconcileCreditTotal { get; } = new("reconcileCreditTotal");
+
+    /// <summary>Reading a journal entry without treating storage failure as a cache miss.</summary>
+    public static FactoryDurableOperation JournalGet { get; } = new("journalGet");
+
+    /// <summary>Persisting a journal entry before reporting success.</summary>
+    public static FactoryDurableOperation JournalPut { get; } = new("journalPut");
+
+    /// <summary>Renewing the durable owner lease that proves this process still owns the run.</summary>
+    public static FactoryDurableOperation RefreshLease { get; } = new("refreshLease");
+
+    /// <summary>Returns a value indicating whether two <see cref="FactoryDurableOperation"/> instances are equivalent.</summary>
+    public static bool operator ==(FactoryDurableOperation left, FactoryDurableOperation right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="FactoryDurableOperation"/> instances are not equivalent.</summary>
+    public static bool operator !=(FactoryDurableOperation left, FactoryDurableOperation right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AgentRegistrySpawnPermissionMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is FactoryDurableOperation other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AgentRegistrySpawnPermissionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(FactoryDurableOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17263,68 +23389,74 @@ public AgentRegistrySpawnPermissionMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AgentRegistrySpawnPermissionMode}"/> for serializing <see cref="AgentRegistrySpawnPermissionMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{FactoryDurableOperation}"/> for serializing <see cref="FactoryDurableOperation"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AgentRegistrySpawnPermissionMode>
+    public sealed class Converter : JsonConverter<FactoryDurableOperation>
     {
         /// <inheritdoc />
-        public override AgentRegistrySpawnPermissionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override FactoryDurableOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AgentRegistrySpawnPermissionMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, FactoryDurableOperation value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentRegistrySpawnPermissionMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryDurableOperation));
         }
     }
 }
 
 
-/// <summary>The UI mode the agent was in when this message was sent. Defaults to the session's current mode.</summary>
+/// <summary>Current or terminal state of a factory run.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SendAgentMode : IEquatable<SendAgentMode>
+public readonly struct FactoryRunStatus : IEquatable<FactoryRunStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SendAgentMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SendAgentMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="FactoryRunStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="FactoryRunStatus"/>.</param>
     [JsonConstructor]
-    public SendAgentMode(string value)
+    public FactoryRunStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SendAgentMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="FactoryRunStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The agent is responding interactively to the user.</summary>
-    public static SendAgentMode Interactive { get; } = new("interactive");
+    /// <summary>The run was minted and is awaiting approval.</summary>
+    public static FactoryRunStatus Pending { get; } = new("pending");
 
-    /// <summary>The agent is preparing a plan before making changes.</summary>
-    public static SendAgentMode Plan { get; } = new("plan");
+    /// <summary>The run is executing.</summary>
+    public static FactoryRunStatus Running { get; } = new("running");
 
-    /// <summary>The agent is working autonomously toward task completion.</summary>
-    public static SendAgentMode Autopilot { get; } = new("autopilot");
+    /// <summary>The run completed successfully.</summary>
+    public static FactoryRunStatus Completed { get; } = new("completed");
 
-    /// <summary>The agent is in shell-focused UI mode.</summary>
-    public static SendAgentMode Shell { get; } = new("shell");
+    /// <summary>The run was interrupted while resource budget remained.</summary>
+    public static FactoryRunStatus Halted { get; } = new("halted");
 
-    /// <summary>Returns a value indicating whether two <see cref="SendAgentMode"/> instances are equivalent.</summary>
-    public static bool operator ==(SendAgentMode left, SendAgentMode right) => left.Equals(right);
+    /// <summary>The run was cancelled before completion.</summary>
+    public static FactoryRunStatus Cancelled { get; } = new("cancelled");
 
-    /// <summary>Returns a value indicating whether two <see cref="SendAgentMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(SendAgentMode left, SendAgentMode right) => !(left == right);
+    /// <summary>The factory body failed or reached a cumulative resource ceiling.</summary>
+    public static FactoryRunStatus Error { get; } = new("error");
+
+    /// <summary>Returns a value indicating whether two <see cref="FactoryRunStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(FactoryRunStatus left, FactoryRunStatus right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="FactoryRunStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(FactoryRunStatus left, FactoryRunStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SendAgentMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is FactoryRunStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SendAgentMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(FactoryRunStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17332,62 +23464,68 @@ public SendAgentMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SendAgentMode}"/> for serializing <see cref="SendAgentMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{FactoryRunStatus}"/> for serializing <see cref="FactoryRunStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SendAgentMode>
+    public sealed class Converter : JsonConverter<FactoryRunStatus>
     {
         /// <inheritdoc />
-        public override SendAgentMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override FactoryRunStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SendAgentMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, FactoryRunStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SendAgentMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryRunStatus));
         }
     }
 }
 
 
-/// <summary>How to deliver the message. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.</summary>
+/// <summary>Derived lifecycle state of a factory phase.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SendMode : IEquatable<SendMode>
+public readonly struct FactoryPhaseStatus : IEquatable<FactoryPhaseStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SendMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SendMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="FactoryPhaseStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="FactoryPhaseStatus"/>.</param>
     [JsonConstructor]
-    public SendMode(string value)
+    public FactoryPhaseStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SendMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="FactoryPhaseStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Append the message to the normal session queue.</summary>
-    public static SendMode Enqueue { get; } = new("enqueue");
+    /// <summary>The phase has not been entered yet.</summary>
+    public static FactoryPhaseStatus Pending { get; } = new("pending");
 
-    /// <summary>Interject the message during the in-progress turn.</summary>
-    public static SendMode Immediate { get; } = new("immediate");
+    /// <summary>The phase is currently entered and accumulating active time.</summary>
+    public static FactoryPhaseStatus Active { get; } = new("active");
 
-    /// <summary>Returns a value indicating whether two <see cref="SendMode"/> instances are equivalent.</summary>
-    public static bool operator ==(SendMode left, SendMode right) => left.Equals(right);
+    /// <summary>The phase was entered and has since been closed.</summary>
+    public static FactoryPhaseStatus Completed { get; } = new("completed");
 
-    /// <summary>Returns a value indicating whether two <see cref="SendMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(SendMode left, SendMode right) => !(left == right);
+    /// <summary>The phase was never entered because a later phase was entered or the run reached a terminal state.</summary>
+    public static FactoryPhaseStatus Skipped { get; } = new("skipped");
+
+    /// <summary>Returns a value indicating whether two <see cref="FactoryPhaseStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(FactoryPhaseStatus left, FactoryPhaseStatus right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="FactoryPhaseStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(FactoryPhaseStatus left, FactoryPhaseStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SendMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is FactoryPhaseStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SendMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(FactoryPhaseStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17395,65 +23533,62 @@ public SendMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SendMode}"/> for serializing <see cref="SendMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{FactoryPhaseStatus}"/> for serializing <see cref="FactoryPhaseStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SendMode>
+    public sealed class Converter : JsonConverter<FactoryPhaseStatus>
     {
         /// <inheritdoc />
-        public override SendMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override FactoryPhaseStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SendMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, FactoryPhaseStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SendMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryPhaseStatus));
         }
     }
 }
 
 
-/// <summary>Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".</summary>
+/// <summary>Kind of factory progress line.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionLogLevel : IEquatable<SessionLogLevel>
+public readonly struct FactoryLogLineKind : IEquatable<FactoryLogLineKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionLogLevel"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionLogLevel"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="FactoryLogLineKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="FactoryLogLineKind"/>.</param>
     [JsonConstructor]
-    public SessionLogLevel(string value)
+    public FactoryLogLineKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionLogLevel"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="FactoryLogLineKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Informational message.</summary>
-    public static SessionLogLevel Info { get; } = new("info");
-
-    /// <summary>Warning message that may require attention.</summary>
-    public static SessionLogLevel Warning { get; } = new("warning");
+    /// <summary>A narrator log line.</summary>
+    public static FactoryLogLineKind Log { get; } = new("log");
 
-    /// <summary>Error message describing a failure.</summary>
-    public static SessionLogLevel Error { get; } = new("error");
+    /// <summary>A named factory phase marker.</summary>
+    public static FactoryLogLineKind Phase { get; } = new("phase");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLogLevel"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionLogLevel left, SessionLogLevel right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="FactoryLogLineKind"/> instances are equivalent.</summary>
+    public static bool operator ==(FactoryLogLineKind left, FactoryLogLineKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLogLevel"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionLogLevel left, SessionLogLevel right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="FactoryLogLineKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(FactoryLogLineKind left, FactoryLogLineKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionLogLevel other && Equals(other);
+    public override bool Equals(object? obj) => obj is FactoryLogLineKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionLogLevel other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(FactoryLogLineKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17461,77 +23596,62 @@ public SessionLogLevel(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionLogLevel}"/> for serializing <see cref="SessionLogLevel"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{FactoryLogLineKind}"/> for serializing <see cref="FactoryLogLineKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionLogLevel>
+    public sealed class Converter : JsonConverter<FactoryLogLineKind>
     {
         /// <inheritdoc />
-        public override SessionLogLevel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override FactoryLogLineKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionLogLevel value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, FactoryLogLineKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLogLevel));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryLogLineKind));
         }
     }
 }
 
 
-/// <summary>Authentication type.</summary>
+/// <summary>Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AuthInfoType : IEquatable<AuthInfoType>
+public readonly struct WorkspacesWorkspaceDetailsHostType : IEquatable<WorkspacesWorkspaceDetailsHostType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AuthInfoType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AuthInfoType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="WorkspacesWorkspaceDetailsHostType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="WorkspacesWorkspaceDetailsHostType"/>.</param>
     [JsonConstructor]
-    public AuthInfoType(string value)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
-    }
-
-    /// <summary>Gets the value associated with this <see cref="AuthInfoType"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>Authentication provided by a GitHub App HMAC credential.</summary>
-    public static AuthInfoType Hmac { get; } = new("hmac");
-
-    /// <summary>Authentication resolved from environment-provided credentials.</summary>
-    public static AuthInfoType Env { get; } = new("env");
-
-    /// <summary>Authentication from an interactive user sign-in.</summary>
-    public static AuthInfoType User { get; } = new("user");
-
-    /// <summary>Authentication delegated to the GitHub CLI.</summary>
-    public static AuthInfoType GhCli { get; } = new("gh-cli");
+    public WorkspacesWorkspaceDetailsHostType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Authentication from an API key credential.</summary>
-    public static AuthInfoType ApiKey { get; } = new("api-key");
+    /// <summary>Gets the value associated with this <see cref="WorkspacesWorkspaceDetailsHostType"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Authentication from a GitHub token.</summary>
-    public static AuthInfoType Token { get; } = new("token");
+    /// <summary>Workspace repository is hosted on GitHub.</summary>
+    public static WorkspacesWorkspaceDetailsHostType GitHub { get; } = new("github");
 
-    /// <summary>Authentication from a Copilot API token.</summary>
-    public static AuthInfoType CopilotApiToken { get; } = new("copilot-api-token");
+    /// <summary>Workspace repository is hosted on Azure DevOps.</summary>
+    public static WorkspacesWorkspaceDetailsHostType Ado { get; } = new("ado");
 
-    /// <summary>Returns a value indicating whether two <see cref="AuthInfoType"/> instances are equivalent.</summary>
-    public static bool operator ==(AuthInfoType left, AuthInfoType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="WorkspacesWorkspaceDetailsHostType"/> instances are equivalent.</summary>
+    public static bool operator ==(WorkspacesWorkspaceDetailsHostType left, WorkspacesWorkspaceDetailsHostType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="AuthInfoType"/> instances are not equivalent.</summary>
-    public static bool operator !=(AuthInfoType left, AuthInfoType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="WorkspacesWorkspaceDetailsHostType"/> instances are not equivalent.</summary>
+    public static bool operator !=(WorkspacesWorkspaceDetailsHostType left, WorkspacesWorkspaceDetailsHostType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AuthInfoType other && Equals(other);
+    public override bool Equals(object? obj) => obj is WorkspacesWorkspaceDetailsHostType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AuthInfoType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(WorkspacesWorkspaceDetailsHostType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17539,68 +23659,68 @@ public AuthInfoType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AuthInfoType}"/> for serializing <see cref="AuthInfoType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{WorkspacesWorkspaceDetailsHostType}"/> for serializing <see cref="WorkspacesWorkspaceDetailsHostType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AuthInfoType>
+    public sealed class Converter : JsonConverter<WorkspacesWorkspaceDetailsHostType>
     {
         /// <inheritdoc />
-        public override AuthInfoType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override WorkspacesWorkspaceDetailsHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AuthInfoType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, WorkspacesWorkspaceDetailsHostType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AuthInfoType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspacesWorkspaceDetailsHostType));
         }
     }
 }
 
 
-/// <summary>Source category for a collected debug bundle entry.</summary>
+/// <summary>Type of change represented by this file diff.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct DebugCollectLogsSource : IEquatable<DebugCollectLogsSource>
+public readonly struct WorkspaceDiffFileChangeType : IEquatable<WorkspaceDiffFileChangeType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="DebugCollectLogsSource"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="DebugCollectLogsSource"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="WorkspaceDiffFileChangeType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="WorkspaceDiffFileChangeType"/>.</param>
     [JsonConstructor]
-    public DebugCollectLogsSource(string value)
+    public WorkspaceDiffFileChangeType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="DebugCollectLogsSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="WorkspaceDiffFileChangeType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Session event log.</summary>
-    public static DebugCollectLogsSource Events { get; } = new("events");
+    /// <summary>The file was added.</summary>
+    public static WorkspaceDiffFileChangeType Added { get; } = new("added");
 
-    /// <summary>Process log for the session.</summary>
-    public static DebugCollectLogsSource ProcessLog { get; } = new("process-log");
+    /// <summary>The file was modified.</summary>
+    public static WorkspaceDiffFileChangeType Modified { get; } = new("modified");
 
-    /// <summary>Interactive shell log for the session.</summary>
-    public static DebugCollectLogsSource ShellLog { get; } = new("shell-log");
+    /// <summary>The file was deleted.</summary>
+    public static WorkspaceDiffFileChangeType Deleted { get; } = new("deleted");
 
-    /// <summary>Caller-provided diagnostic entry.</summary>
-    public static DebugCollectLogsSource Additional { get; } = new("additional");
+    /// <summary>The file was renamed.</summary>
+    public static WorkspaceDiffFileChangeType Renamed { get; } = new("renamed");
 
-    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsSource"/> instances are equivalent.</summary>
-    public static bool operator ==(DebugCollectLogsSource left, DebugCollectLogsSource right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="WorkspaceDiffFileChangeType"/> instances are equivalent.</summary>
+    public static bool operator ==(WorkspaceDiffFileChangeType left, WorkspaceDiffFileChangeType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsSource"/> instances are not equivalent.</summary>
-    public static bool operator !=(DebugCollectLogsSource left, DebugCollectLogsSource right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="WorkspaceDiffFileChangeType"/> instances are not equivalent.</summary>
+    public static bool operator !=(WorkspaceDiffFileChangeType left, WorkspaceDiffFileChangeType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is DebugCollectLogsSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is WorkspaceDiffFileChangeType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(DebugCollectLogsSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(WorkspaceDiffFileChangeType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17608,62 +23728,65 @@ public DebugCollectLogsSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{DebugCollectLogsSource}"/> for serializing <see cref="DebugCollectLogsSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{WorkspaceDiffFileChangeType}"/> for serializing <see cref="WorkspaceDiffFileChangeType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<DebugCollectLogsSource>
+    public sealed class Converter : JsonConverter<WorkspaceDiffFileChangeType>
     {
         /// <inheritdoc />
-        public override DebugCollectLogsSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override WorkspaceDiffFileChangeType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, DebugCollectLogsSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, WorkspaceDiffFileChangeType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DebugCollectLogsSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspaceDiffFileChangeType));
         }
     }
 }
 
 
-/// <summary>Destination kind that was written.</summary>
+/// <summary>Diff mode requested by the client.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct DebugCollectLogsResultKind : IEquatable<DebugCollectLogsResultKind>
+public readonly struct WorkspaceDiffMode : IEquatable<WorkspaceDiffMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="DebugCollectLogsResultKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="DebugCollectLogsResultKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="WorkspaceDiffMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="WorkspaceDiffMode"/>.</param>
     [JsonConstructor]
-    public DebugCollectLogsResultKind(string value)
+    public WorkspaceDiffMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="DebugCollectLogsResultKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="WorkspaceDiffMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A .tgz archive was written.</summary>
-    public static DebugCollectLogsResultKind Archive { get; } = new("archive");
+    /// <summary>Return staged, unstaged, and untracked working tree changes.</summary>
+    public static WorkspaceDiffMode Unstaged { get; } = new("unstaged");
 
-    /// <summary>A directory containing redacted files was written.</summary>
-    public static DebugCollectLogsResultKind Directory { get; } = new("directory");
+    /// <summary>Return changes compared with the default branch.</summary>
+    public static WorkspaceDiffMode Branch { get; } = new("branch");
 
-    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsResultKind"/> instances are equivalent.</summary>
-    public static bool operator ==(DebugCollectLogsResultKind left, DebugCollectLogsResultKind right) => left.Equals(right);
+    /// <summary>Return the cumulative diff of files Copilot changed this session (used in non-git workspaces).</summary>
+    public static WorkspaceDiffMode Session { get; } = new("session");
 
-    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsResultKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(DebugCollectLogsResultKind left, DebugCollectLogsResultKind right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="WorkspaceDiffMode"/> instances are equivalent.</summary>
+    public static bool operator ==(WorkspaceDiffMode left, WorkspaceDiffMode right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="WorkspaceDiffMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(WorkspaceDiffMode left, WorkspaceDiffMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is DebugCollectLogsResultKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is WorkspaceDiffMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(DebugCollectLogsResultKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(WorkspaceDiffMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17671,62 +23794,65 @@ public DebugCollectLogsResultKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{DebugCollectLogsResultKind}"/> for serializing <see cref="DebugCollectLogsResultKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{WorkspaceDiffMode}"/> for serializing <see cref="WorkspaceDiffMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<DebugCollectLogsResultKind>
+    public sealed class Converter : JsonConverter<WorkspaceDiffMode>
     {
         /// <inheritdoc />
-        public override DebugCollectLogsResultKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override WorkspaceDiffMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, DebugCollectLogsResultKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, WorkspaceDiffMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DebugCollectLogsResultKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspaceDiffMode));
         }
     }
 }
 
 
-/// <summary>Kind of caller-provided debug log entry.</summary>
+/// <summary>Reason a rewind read (rewind points, file-restore preview, or session diff) could not be answered from the session's file-change captures.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct DebugCollectLogsEntryKind : IEquatable<DebugCollectLogsEntryKind>
+public readonly struct HistoryRewindUnavailableReason : IEquatable<HistoryRewindUnavailableReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="DebugCollectLogsEntryKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="DebugCollectLogsEntryKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="HistoryRewindUnavailableReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="HistoryRewindUnavailableReason"/>.</param>
     [JsonConstructor]
-    public DebugCollectLogsEntryKind(string value)
+    public HistoryRewindUnavailableReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="DebugCollectLogsEntryKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="HistoryRewindUnavailableReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Include a single server-local file.</summary>
-    public static DebugCollectLogsEntryKind File { get; } = new("file");
+    /// <summary>The session did not opt into file-change tracking before its first turn.</summary>
+    public static HistoryRewindUnavailableReason FileChangeTrackingDisabled { get; } = new("file-change-tracking-disabled");
 
-    /// <summary>Include files from a server-local directory recursively.</summary>
-    public static DebugCollectLogsEntryKind Directory { get; } = new("directory");
+    /// <summary>The session still has work that may mutate files or history. Transient: the same request succeeds once the session settles, so callers should retry rather than treat it as a failure.</summary>
+    public static HistoryRewindUnavailableReason SessionBusy { get; } = new("session-busy");
 
-    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsEntryKind"/> instances are equivalent.</summary>
-    public static bool operator ==(DebugCollectLogsEntryKind left, DebugCollectLogsEntryKind right) => left.Equals(right);
+    /// <summary>Remote-backed rewind routing is not supported.</summary>
+    public static HistoryRewindUnavailableReason UnsupportedRemoteSession { get; } = new("unsupported-remote-session");
 
-    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsEntryKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(DebugCollectLogsEntryKind left, DebugCollectLogsEntryKind right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindUnavailableReason"/> instances are equivalent.</summary>
+    public static bool operator ==(HistoryRewindUnavailableReason left, HistoryRewindUnavailableReason right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindUnavailableReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(HistoryRewindUnavailableReason left, HistoryRewindUnavailableReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is DebugCollectLogsEntryKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is HistoryRewindUnavailableReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(DebugCollectLogsEntryKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(HistoryRewindUnavailableReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17734,62 +23860,62 @@ public DebugCollectLogsEntryKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{DebugCollectLogsEntryKind}"/> for serializing <see cref="DebugCollectLogsEntryKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{HistoryRewindUnavailableReason}"/> for serializing <see cref="HistoryRewindUnavailableReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<DebugCollectLogsEntryKind>
+    public sealed class Converter : JsonConverter<HistoryRewindUnavailableReason>
     {
         /// <inheritdoc />
-        public override DebugCollectLogsEntryKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override HistoryRewindUnavailableReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, DebugCollectLogsEntryKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, HistoryRewindUnavailableReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DebugCollectLogsEntryKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryRewindUnavailableReason));
         }
     }
 }
 
 
-/// <summary>How a collected debug entry should be redacted before being staged.</summary>
+/// <summary>Whether task execution is synchronously awaited or managed in the background.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct DebugCollectLogsRedaction : IEquatable<DebugCollectLogsRedaction>
+public readonly struct TaskExecutionMode : IEquatable<TaskExecutionMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="DebugCollectLogsRedaction"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="DebugCollectLogsRedaction"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="TaskExecutionMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="TaskExecutionMode"/>.</param>
     [JsonConstructor]
-    public DebugCollectLogsRedaction(string value)
+    public TaskExecutionMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="DebugCollectLogsRedaction"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="TaskExecutionMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Redact the file as plain UTF-8 log text.</summary>
-    public static DebugCollectLogsRedaction PlainText { get; } = new("plain-text");
+    /// <summary>The task was started with synchronous waiting.</summary>
+    public static TaskExecutionMode Sync { get; } = new("sync");
 
-    /// <summary>Redact each non-empty line as a session event JSON object, falling back to plain-text redaction for malformed lines.</summary>
-    public static DebugCollectLogsRedaction EventsJsonl { get; } = new("events-jsonl");
+    /// <summary>The task is managed in the background.</summary>
+    public static TaskExecutionMode Background { get; } = new("background");
 
-    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsRedaction"/> instances are equivalent.</summary>
-    public static bool operator ==(DebugCollectLogsRedaction left, DebugCollectLogsRedaction right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="TaskExecutionMode"/> instances are equivalent.</summary>
+    public static bool operator ==(TaskExecutionMode left, TaskExecutionMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="DebugCollectLogsRedaction"/> instances are not equivalent.</summary>
-    public static bool operator !=(DebugCollectLogsRedaction left, DebugCollectLogsRedaction right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="TaskExecutionMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(TaskExecutionMode left, TaskExecutionMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is DebugCollectLogsRedaction other && Equals(other);
+    public override bool Equals(object? obj) => obj is TaskExecutionMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(DebugCollectLogsRedaction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(TaskExecutionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17797,65 +23923,71 @@ public DebugCollectLogsRedaction(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{DebugCollectLogsRedaction}"/> for serializing <see cref="DebugCollectLogsRedaction"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{TaskExecutionMode}"/> for serializing <see cref="TaskExecutionMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<DebugCollectLogsRedaction>
+    public sealed class Converter : JsonConverter<TaskExecutionMode>
     {
         /// <inheritdoc />
-        public override DebugCollectLogsRedaction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override TaskExecutionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, DebugCollectLogsRedaction value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, TaskExecutionMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DebugCollectLogsRedaction));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(TaskExecutionMode));
         }
     }
 }
 
 
-/// <summary>Cumulative resource ceiling that stopped a factory run.</summary>
+/// <summary>Current lifecycle status of the task.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct FactoryRunFailureKind : IEquatable<FactoryRunFailureKind>
+public readonly struct TaskStatus : IEquatable<TaskStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="FactoryRunFailureKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="FactoryRunFailureKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="TaskStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="TaskStatus"/>.</param>
     [JsonConstructor]
-    public FactoryRunFailureKind(string value)
+    public TaskStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="FactoryRunFailureKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="TaskStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The run admitted the approved maximum total number of subagents.</summary>
-    public static FactoryRunFailureKind MaxTotalSubagents { get; } = new("maxTotalSubagents");
+    /// <summary>The task is actively executing.</summary>
+    public static TaskStatus Running { get; } = new("running");
 
-    /// <summary>The run reached the approved accumulated active-execution time in seconds.</summary>
-    public static FactoryRunFailureKind TimeoutSeconds { get; } = new("timeoutSeconds");
+    /// <summary>The task is waiting for additional input.</summary>
+    public static TaskStatus Idle { get; } = new("idle");
 
-    /// <summary>The run's settled subagent model usage exceeded the approved AI-credit ceiling, or no headroom remained for another subagent.</summary>
-    public static FactoryRunFailureKind MaxAiCredits { get; } = new("maxAiCredits");
+    /// <summary>The task finished successfully.</summary>
+    public static TaskStatus Completed { get; } = new("completed");
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryRunFailureKind"/> instances are equivalent.</summary>
-    public static bool operator ==(FactoryRunFailureKind left, FactoryRunFailureKind right) => left.Equals(right);
+    /// <summary>The task finished with an error.</summary>
+    public static TaskStatus Failed { get; } = new("failed");
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryRunFailureKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(FactoryRunFailureKind left, FactoryRunFailureKind right) => !(left == right);
+    /// <summary>The task was cancelled before completion.</summary>
+    public static TaskStatus Cancelled { get; } = new("cancelled");
+
+    /// <summary>Returns a value indicating whether two <see cref="TaskStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(TaskStatus left, TaskStatus right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="TaskStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(TaskStatus left, TaskStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is FactoryRunFailureKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is TaskStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(FactoryRunFailureKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(TaskStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17863,86 +23995,62 @@ public FactoryRunFailureKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{FactoryRunFailureKind}"/> for serializing <see cref="FactoryRunFailureKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{TaskStatus}"/> for serializing <see cref="TaskStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<FactoryRunFailureKind>
+    public sealed class Converter : JsonConverter<TaskStatus>
     {
         /// <inheritdoc />
-        public override FactoryRunFailureKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override TaskStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, FactoryRunFailureKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, TaskStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryRunFailureKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(TaskStatus));
         }
     }
 }
 
 
-/// <summary>Execution-critical factory storage operation.</summary>
+/// <summary>Whether the shell runs inside a managed PTY session or as an independent background process.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct FactoryDurableOperation : IEquatable<FactoryDurableOperation>
+public readonly struct TaskShellInfoAttachmentMode : IEquatable<TaskShellInfoAttachmentMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="FactoryDurableOperation"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="FactoryDurableOperation"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="TaskShellInfoAttachmentMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="TaskShellInfoAttachmentMode"/>.</param>
     [JsonConstructor]
-    public FactoryDurableOperation(string value)
+    public TaskShellInfoAttachmentMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="FactoryDurableOperation"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="TaskShellInfoAttachmentMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Creating the durable run and declared phases.</summary>
-    public static FactoryDurableOperation CreateRun { get; } = new("createRun");
-
-    /// <summary>Persisting the transition to running.</summary>
-    public static FactoryDurableOperation MarkRunStarted { get; } = new("markRunStarted");
-
-    /// <summary>Persisting the terminal run envelope.</summary>
-    public static FactoryDurableOperation FinishRun { get; } = new("finishRun");
-
-    /// <summary>Persisting subagent admission accounting.</summary>
-    public static FactoryDurableOperation ReserveAgent { get; } = new("reserveAgent");
-
-    /// <summary>Rolling back an uncommitted subagent admission.</summary>
-    public static FactoryDurableOperation ReleaseAgent { get; } = new("releaseAgent");
-
-    /// <summary>Persisting an idempotent model-usage charge.</summary>
-    public static FactoryDurableOperation ChargeCredit { get; } = new("chargeCredit");
-
-    /// <summary>Persisting active execution time.</summary>
-    public static FactoryDurableOperation AddElapsed { get; } = new("addElapsed");
-
-    /// <summary>Reading the authoritative AI-credit total.</summary>
-    public static FactoryDurableOperation ReconcileCreditTotal { get; } = new("reconcileCreditTotal");
-
-    /// <summary>Reading a journal entry without treating storage failure as a cache miss.</summary>
-    public static FactoryDurableOperation JournalGet { get; } = new("journalGet");
+    /// <summary>The shell runs in a managed PTY session.</summary>
+    public static TaskShellInfoAttachmentMode Attached { get; } = new("attached");
 
-    /// <summary>Persisting a journal entry before reporting success.</summary>
-    public static FactoryDurableOperation JournalPut { get; } = new("journalPut");
+    /// <summary>The shell runs as an independent background process.</summary>
+    public static TaskShellInfoAttachmentMode Detached { get; } = new("detached");
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryDurableOperation"/> instances are equivalent.</summary>
-    public static bool operator ==(FactoryDurableOperation left, FactoryDurableOperation right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="TaskShellInfoAttachmentMode"/> instances are equivalent.</summary>
+    public static bool operator ==(TaskShellInfoAttachmentMode left, TaskShellInfoAttachmentMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryDurableOperation"/> instances are not equivalent.</summary>
-    public static bool operator !=(FactoryDurableOperation left, FactoryDurableOperation right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="TaskShellInfoAttachmentMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(TaskShellInfoAttachmentMode left, TaskShellInfoAttachmentMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is FactoryDurableOperation other && Equals(other);
+    public override bool Equals(object? obj) => obj is TaskShellInfoAttachmentMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(FactoryDurableOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(TaskShellInfoAttachmentMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -17950,74 +24058,62 @@ public FactoryDurableOperation(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{FactoryDurableOperation}"/> for serializing <see cref="FactoryDurableOperation"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{TaskShellInfoAttachmentMode}"/> for serializing <see cref="TaskShellInfoAttachmentMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<FactoryDurableOperation>
+    public sealed class Converter : JsonConverter<TaskShellInfoAttachmentMode>
     {
         /// <inheritdoc />
-        public override FactoryDurableOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override TaskShellInfoAttachmentMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, FactoryDurableOperation value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, TaskShellInfoAttachmentMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryDurableOperation));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(TaskShellInfoAttachmentMode));
         }
     }
 }
 
 
-/// <summary>Current or terminal state of a factory run.</summary>
+/// <summary>Consumer allowed to call an MCP tool.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct FactoryRunStatus : IEquatable<FactoryRunStatus>
+public readonly struct McpToolUiVisibility : IEquatable<McpToolUiVisibility>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="FactoryRunStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="FactoryRunStatus"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpToolUiVisibility"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpToolUiVisibility"/>.</param>
     [JsonConstructor]
-    public FactoryRunStatus(string value)
+    public McpToolUiVisibility(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="FactoryRunStatus"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpToolUiVisibility"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The run was minted and is awaiting approval.</summary>
-    public static FactoryRunStatus Pending { get; } = new("pending");
-
-    /// <summary>The run is executing.</summary>
-    public static FactoryRunStatus Running { get; } = new("running");
-
-    /// <summary>The run completed successfully.</summary>
-    public static FactoryRunStatus Completed { get; } = new("completed");
-
-    /// <summary>The run was interrupted while resource budget remained.</summary>
-    public static FactoryRunStatus Halted { get; } = new("halted");
-
-    /// <summary>The run was cancelled before completion.</summary>
-    public static FactoryRunStatus Cancelled { get; } = new("cancelled");
+    /// <summary>The model may call the tool.</summary>
+    public static McpToolUiVisibility Model { get; } = new("model");
 
-    /// <summary>The factory body failed or reached a cumulative resource ceiling.</summary>
-    public static FactoryRunStatus Error { get; } = new("error");
+    /// <summary>An MCP App view may call the tool.</summary>
+    public static McpToolUiVisibility App { get; } = new("app");
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryRunStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(FactoryRunStatus left, FactoryRunStatus right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpToolUiVisibility"/> instances are equivalent.</summary>
+    public static bool operator ==(McpToolUiVisibility left, McpToolUiVisibility right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryRunStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(FactoryRunStatus left, FactoryRunStatus right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpToolUiVisibility"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpToolUiVisibility left, McpToolUiVisibility right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is FactoryRunStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpToolUiVisibility other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(FactoryRunStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpToolUiVisibility other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18025,68 +24121,65 @@ public FactoryRunStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{FactoryRunStatus}"/> for serializing <see cref="FactoryRunStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpToolUiVisibility}"/> for serializing <see cref="McpToolUiVisibility"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<FactoryRunStatus>
+    public sealed class Converter : JsonConverter<McpToolUiVisibility>
     {
         /// <inheritdoc />
-        public override FactoryRunStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpToolUiVisibility Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, FactoryRunStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpToolUiVisibility value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryRunStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpToolUiVisibility));
         }
     }
 }
 
 
-/// <summary>Derived lifecycle state of a factory phase.</summary>
+/// <summary>Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct FactoryPhaseStatus : IEquatable<FactoryPhaseStatus>
+public readonly struct McpSamplingExecutionAction : IEquatable<McpSamplingExecutionAction>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="FactoryPhaseStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="FactoryPhaseStatus"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpSamplingExecutionAction"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpSamplingExecutionAction"/>.</param>
     [JsonConstructor]
-    public FactoryPhaseStatus(string value)
+    public McpSamplingExecutionAction(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="FactoryPhaseStatus"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpSamplingExecutionAction"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The phase has not been entered yet.</summary>
-    public static FactoryPhaseStatus Pending { get; } = new("pending");
-
-    /// <summary>The phase is currently entered and accumulating active time.</summary>
-    public static FactoryPhaseStatus Active { get; } = new("active");
+    /// <summary>The sampling inference completed and produced a result.</summary>
+    public static McpSamplingExecutionAction Success { get; } = new("success");
 
-    /// <summary>The phase was entered and has since been closed.</summary>
-    public static FactoryPhaseStatus Completed { get; } = new("completed");
+    /// <summary>The sampling inference failed or was rejected.</summary>
+    public static McpSamplingExecutionAction Failure { get; } = new("failure");
 
-    /// <summary>The phase was never entered because a later phase was entered or the run reached a terminal state.</summary>
-    public static FactoryPhaseStatus Skipped { get; } = new("skipped");
+    /// <summary>The sampling inference was cancelled before completion.</summary>
+    public static McpSamplingExecutionAction Cancelled { get; } = new("cancelled");
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryPhaseStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(FactoryPhaseStatus left, FactoryPhaseStatus right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpSamplingExecutionAction"/> instances are equivalent.</summary>
+    public static bool operator ==(McpSamplingExecutionAction left, McpSamplingExecutionAction right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryPhaseStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(FactoryPhaseStatus left, FactoryPhaseStatus right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpSamplingExecutionAction"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpSamplingExecutionAction left, McpSamplingExecutionAction right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is FactoryPhaseStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpSamplingExecutionAction other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(FactoryPhaseStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpSamplingExecutionAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18094,62 +24187,62 @@ public FactoryPhaseStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{FactoryPhaseStatus}"/> for serializing <see cref="FactoryPhaseStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpSamplingExecutionAction}"/> for serializing <see cref="McpSamplingExecutionAction"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<FactoryPhaseStatus>
+    public sealed class Converter : JsonConverter<McpSamplingExecutionAction>
     {
         /// <inheritdoc />
-        public override FactoryPhaseStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpSamplingExecutionAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, FactoryPhaseStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpSamplingExecutionAction value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryPhaseStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpSamplingExecutionAction));
         }
     }
 }
 
 
-/// <summary>Kind of factory progress line.</summary>
+/// <summary>How environment-variable values supplied to MCP servers are resolved. "direct" passes literal string values; "indirect" treats values as references (e.g. names of environment variables on the host) that the runtime resolves before launch. Defaults to the runtime's startup mode; clients that intentionally launch MCP servers with literal values (e.g. CLI prompt mode and ACP) set this to "direct".</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct FactoryLogLineKind : IEquatable<FactoryLogLineKind>
+public readonly struct McpSetEnvValueModeDetails : IEquatable<McpSetEnvValueModeDetails>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="FactoryLogLineKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="FactoryLogLineKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpSetEnvValueModeDetails"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpSetEnvValueModeDetails"/>.</param>
     [JsonConstructor]
-    public FactoryLogLineKind(string value)
+    public McpSetEnvValueModeDetails(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="FactoryLogLineKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpSetEnvValueModeDetails"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A narrator log line.</summary>
-    public static FactoryLogLineKind Log { get; } = new("log");
+    /// <summary>Treat MCP server environment values as literal strings.</summary>
+    public static McpSetEnvValueModeDetails Direct { get; } = new("direct");
 
-    /// <summary>A named factory phase marker.</summary>
-    public static FactoryLogLineKind Phase { get; } = new("phase");
+    /// <summary>Treat MCP server environment values as host-side references to resolve before launch.</summary>
+    public static McpSetEnvValueModeDetails Indirect { get; } = new("indirect");
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryLogLineKind"/> instances are equivalent.</summary>
-    public static bool operator ==(FactoryLogLineKind left, FactoryLogLineKind right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpSetEnvValueModeDetails"/> instances are equivalent.</summary>
+    public static bool operator ==(McpSetEnvValueModeDetails left, McpSetEnvValueModeDetails right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryLogLineKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(FactoryLogLineKind left, FactoryLogLineKind right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpSetEnvValueModeDetails"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpSetEnvValueModeDetails left, McpSetEnvValueModeDetails right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is FactoryLogLineKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpSetEnvValueModeDetails other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(FactoryLogLineKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpSetEnvValueModeDetails other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18157,62 +24250,62 @@ public FactoryLogLineKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{FactoryLogLineKind}"/> for serializing <see cref="FactoryLogLineKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpSetEnvValueModeDetails}"/> for serializing <see cref="McpSetEnvValueModeDetails"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<FactoryLogLineKind>
+    public sealed class Converter : JsonConverter<McpSetEnvValueModeDetails>
     {
         /// <inheritdoc />
-        public override FactoryLogLineKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpSetEnvValueModeDetails Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, FactoryLogLineKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpSetEnvValueModeDetails value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryLogLineKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpSetEnvValueModeDetails));
         }
     }
 }
 
 
-/// <summary>Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.</summary>
+/// <summary>OAuth grant type override for this login.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct WorkspacesWorkspaceDetailsHostType : IEquatable<WorkspacesWorkspaceDetailsHostType>
+public readonly struct McpOauthLoginGrantType : IEquatable<McpOauthLoginGrantType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="WorkspacesWorkspaceDetailsHostType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="WorkspacesWorkspaceDetailsHostType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpOauthLoginGrantType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpOauthLoginGrantType"/>.</param>
     [JsonConstructor]
-    public WorkspacesWorkspaceDetailsHostType(string value)
+    public McpOauthLoginGrantType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="WorkspacesWorkspaceDetailsHostType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpOauthLoginGrantType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Workspace repository is hosted on GitHub.</summary>
-    public static WorkspacesWorkspaceDetailsHostType GitHub { get; } = new("github");
+    /// <summary>Interactive browser-based OAuth flow using an authorization code, typically with PKCE.</summary>
+    public static McpOauthLoginGrantType AuthorizationCode { get; } = new("authorization_code");
 
-    /// <summary>Workspace repository is hosted on Azure DevOps.</summary>
-    public static WorkspacesWorkspaceDetailsHostType Ado { get; } = new("ado");
+    /// <summary>Headless OAuth flow where a confidential client authenticates directly with a client secret.</summary>
+    public static McpOauthLoginGrantType ClientCredentials { get; } = new("client_credentials");
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspacesWorkspaceDetailsHostType"/> instances are equivalent.</summary>
-    public static bool operator ==(WorkspacesWorkspaceDetailsHostType left, WorkspacesWorkspaceDetailsHostType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpOauthLoginGrantType"/> instances are equivalent.</summary>
+    public static bool operator ==(McpOauthLoginGrantType left, McpOauthLoginGrantType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspacesWorkspaceDetailsHostType"/> instances are not equivalent.</summary>
-    public static bool operator !=(WorkspacesWorkspaceDetailsHostType left, WorkspacesWorkspaceDetailsHostType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpOauthLoginGrantType"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpOauthLoginGrantType left, McpOauthLoginGrantType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is WorkspacesWorkspaceDetailsHostType other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpOauthLoginGrantType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(WorkspacesWorkspaceDetailsHostType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpOauthLoginGrantType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18220,68 +24313,65 @@ public WorkspacesWorkspaceDetailsHostType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{WorkspacesWorkspaceDetailsHostType}"/> for serializing <see cref="WorkspacesWorkspaceDetailsHostType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpOauthLoginGrantType}"/> for serializing <see cref="McpOauthLoginGrantType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<WorkspacesWorkspaceDetailsHostType>
+    public sealed class Converter : JsonConverter<McpOauthLoginGrantType>
     {
         /// <inheritdoc />
-        public override WorkspacesWorkspaceDetailsHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpOauthLoginGrantType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, WorkspacesWorkspaceDetailsHostType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpOauthLoginGrantType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspacesWorkspaceDetailsHostType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpOauthLoginGrantType));
         }
     }
 }
 
 
-/// <summary>Type of change represented by this file diff.</summary>
+/// <summary>Why a passive MCP OAuth probe determined authentication is needed.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct WorkspaceDiffFileChangeType : IEquatable<WorkspaceDiffFileChangeType>
+public readonly struct McpOauthProbeNeedsAuthReason : IEquatable<McpOauthProbeNeedsAuthReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="WorkspaceDiffFileChangeType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="WorkspaceDiffFileChangeType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpOauthProbeNeedsAuthReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpOauthProbeNeedsAuthReason"/>.</param>
     [JsonConstructor]
-    public WorkspaceDiffFileChangeType(string value)
+    public McpOauthProbeNeedsAuthReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="WorkspaceDiffFileChangeType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpOauthProbeNeedsAuthReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The file was added.</summary>
-    public static WorkspaceDiffFileChangeType Added { get; } = new("added");
-
-    /// <summary>The file was modified.</summary>
-    public static WorkspaceDiffFileChangeType Modified { get; } = new("modified");
+    /// <summary>No token was sent and the server requires authentication.</summary>
+    public static McpOauthProbeNeedsAuthReason Initial { get; } = new("initial");
 
-    /// <summary>The file was deleted.</summary>
-    public static WorkspaceDiffFileChangeType Deleted { get; } = new("deleted");
+    /// <summary>A cached token was sent and rejected.</summary>
+    public static McpOauthProbeNeedsAuthReason Refresh { get; } = new("refresh");
 
-    /// <summary>The file was renamed.</summary>
-    public static WorkspaceDiffFileChangeType Renamed { get; } = new("renamed");
+    /// <summary>The server returned a 403 insufficient_scope challenge, indicating additional scopes or audience are needed.</summary>
+    public static McpOauthProbeNeedsAuthReason Upscope { get; } = new("upscope");
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspaceDiffFileChangeType"/> instances are equivalent.</summary>
-    public static bool operator ==(WorkspaceDiffFileChangeType left, WorkspaceDiffFileChangeType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpOauthProbeNeedsAuthReason"/> instances are equivalent.</summary>
+    public static bool operator ==(McpOauthProbeNeedsAuthReason left, McpOauthProbeNeedsAuthReason right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspaceDiffFileChangeType"/> instances are not equivalent.</summary>
-    public static bool operator !=(WorkspaceDiffFileChangeType left, WorkspaceDiffFileChangeType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpOauthProbeNeedsAuthReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpOauthProbeNeedsAuthReason left, McpOauthProbeNeedsAuthReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is WorkspaceDiffFileChangeType other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpOauthProbeNeedsAuthReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(WorkspaceDiffFileChangeType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpOauthProbeNeedsAuthReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18289,65 +24379,65 @@ public WorkspaceDiffFileChangeType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{WorkspaceDiffFileChangeType}"/> for serializing <see cref="WorkspaceDiffFileChangeType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpOauthProbeNeedsAuthReason}"/> for serializing <see cref="McpOauthProbeNeedsAuthReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<WorkspaceDiffFileChangeType>
+    public sealed class Converter : JsonConverter<McpOauthProbeNeedsAuthReason>
     {
         /// <inheritdoc />
-        public override WorkspaceDiffFileChangeType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpOauthProbeNeedsAuthReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, WorkspaceDiffFileChangeType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpOauthProbeNeedsAuthReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspaceDiffFileChangeType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpOauthProbeNeedsAuthReason));
         }
     }
 }
 
 
-/// <summary>Diff mode requested by the client.</summary>
+/// <summary>Allowed values for the `McpAppsSetHostContextDetailsAvailableDisplayMode` enumeration.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct WorkspaceDiffMode : IEquatable<WorkspaceDiffMode>
+public readonly struct McpAppsSetHostContextDetailsAvailableDisplayMode : IEquatable<McpAppsSetHostContextDetailsAvailableDisplayMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="WorkspaceDiffMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="WorkspaceDiffMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/>.</param>
     [JsonConstructor]
-    public WorkspaceDiffMode(string value)
+    public McpAppsSetHostContextDetailsAvailableDisplayMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="WorkspaceDiffMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Return staged, unstaged, and untracked working tree changes.</summary>
-    public static WorkspaceDiffMode Unstaged { get; } = new("unstaged");
+    /// <summary>Rendered inline within the host conversation surface.</summary>
+    public static McpAppsSetHostContextDetailsAvailableDisplayMode Inline { get; } = new("inline");
 
-    /// <summary>Return changes compared with the default branch.</summary>
-    public static WorkspaceDiffMode Branch { get; } = new("branch");
+    /// <summary>Rendered as a fullscreen overlay.</summary>
+    public static McpAppsSetHostContextDetailsAvailableDisplayMode Fullscreen { get; } = new("fullscreen");
 
-    /// <summary>Return the cumulative diff of files Copilot changed this session (used in non-git workspaces).</summary>
-    public static WorkspaceDiffMode Session { get; } = new("session");
+    /// <summary>Rendered as a picture-in-picture floating panel.</summary>
+    public static McpAppsSetHostContextDetailsAvailableDisplayMode Pip { get; } = new("pip");
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspaceDiffMode"/> instances are equivalent.</summary>
-    public static bool operator ==(WorkspaceDiffMode left, WorkspaceDiffMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/> instances are equivalent.</summary>
+    public static bool operator ==(McpAppsSetHostContextDetailsAvailableDisplayMode left, McpAppsSetHostContextDetailsAvailableDisplayMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspaceDiffMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(WorkspaceDiffMode left, WorkspaceDiffMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpAppsSetHostContextDetailsAvailableDisplayMode left, McpAppsSetHostContextDetailsAvailableDisplayMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is WorkspaceDiffMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpAppsSetHostContextDetailsAvailableDisplayMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(WorkspaceDiffMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpAppsSetHostContextDetailsAvailableDisplayMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18355,65 +24445,65 @@ public WorkspaceDiffMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{WorkspaceDiffMode}"/> for serializing <see cref="WorkspaceDiffMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpAppsSetHostContextDetailsAvailableDisplayMode}"/> for serializing <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<WorkspaceDiffMode>
+    public sealed class Converter : JsonConverter<McpAppsSetHostContextDetailsAvailableDisplayMode>
     {
         /// <inheritdoc />
-        public override WorkspaceDiffMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpAppsSetHostContextDetailsAvailableDisplayMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, WorkspaceDiffMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpAppsSetHostContextDetailsAvailableDisplayMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspaceDiffMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsSetHostContextDetailsAvailableDisplayMode));
         }
     }
 }
 
 
-/// <summary>Reason a rewind read (rewind points, file-restore preview, or session diff) could not be answered from the session's file-change captures.</summary>
+/// <summary>Current display mode (SEP-1865).</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct HistoryRewindUnavailableReason : IEquatable<HistoryRewindUnavailableReason>
+public readonly struct McpAppsSetHostContextDetailsDisplayMode : IEquatable<McpAppsSetHostContextDetailsDisplayMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="HistoryRewindUnavailableReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="HistoryRewindUnavailableReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpAppsSetHostContextDetailsDisplayMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpAppsSetHostContextDetailsDisplayMode"/>.</param>
     [JsonConstructor]
-    public HistoryRewindUnavailableReason(string value)
+    public McpAppsSetHostContextDetailsDisplayMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="HistoryRewindUnavailableReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpAppsSetHostContextDetailsDisplayMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The session did not opt into file-change tracking before its first turn.</summary>
-    public static HistoryRewindUnavailableReason FileChangeTrackingDisabled { get; } = new("file-change-tracking-disabled");
+    /// <summary>Rendered inline within the host conversation surface.</summary>
+    public static McpAppsSetHostContextDetailsDisplayMode Inline { get; } = new("inline");
 
-    /// <summary>The session still has work that may mutate files or history. Transient: the same request succeeds once the session settles, so callers should retry rather than treat it as a failure.</summary>
-    public static HistoryRewindUnavailableReason SessionBusy { get; } = new("session-busy");
+    /// <summary>Rendered as a fullscreen overlay.</summary>
+    public static McpAppsSetHostContextDetailsDisplayMode Fullscreen { get; } = new("fullscreen");
 
-    /// <summary>Remote-backed rewind routing is not supported.</summary>
-    public static HistoryRewindUnavailableReason UnsupportedRemoteSession { get; } = new("unsupported-remote-session");
+    /// <summary>Rendered as a picture-in-picture floating panel.</summary>
+    public static McpAppsSetHostContextDetailsDisplayMode Pip { get; } = new("pip");
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindUnavailableReason"/> instances are equivalent.</summary>
-    public static bool operator ==(HistoryRewindUnavailableReason left, HistoryRewindUnavailableReason right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsDisplayMode"/> instances are equivalent.</summary>
+    public static bool operator ==(McpAppsSetHostContextDetailsDisplayMode left, McpAppsSetHostContextDetailsDisplayMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindUnavailableReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(HistoryRewindUnavailableReason left, HistoryRewindUnavailableReason right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsDisplayMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpAppsSetHostContextDetailsDisplayMode left, McpAppsSetHostContextDetailsDisplayMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is HistoryRewindUnavailableReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpAppsSetHostContextDetailsDisplayMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(HistoryRewindUnavailableReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpAppsSetHostContextDetailsDisplayMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18421,62 +24511,65 @@ public HistoryRewindUnavailableReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{HistoryRewindUnavailableReason}"/> for serializing <see cref="HistoryRewindUnavailableReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpAppsSetHostContextDetailsDisplayMode}"/> for serializing <see cref="McpAppsSetHostContextDetailsDisplayMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<HistoryRewindUnavailableReason>
+    public sealed class Converter : JsonConverter<McpAppsSetHostContextDetailsDisplayMode>
     {
         /// <inheritdoc />
-        public override HistoryRewindUnavailableReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpAppsSetHostContextDetailsDisplayMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, HistoryRewindUnavailableReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpAppsSetHostContextDetailsDisplayMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryRewindUnavailableReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsSetHostContextDetailsDisplayMode));
         }
     }
 }
 
 
-/// <summary>Whether task execution is synchronously awaited or managed in the background.</summary>
+/// <summary>Platform type for responsive design.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct TaskExecutionMode : IEquatable<TaskExecutionMode>
+public readonly struct McpAppsSetHostContextDetailsPlatform : IEquatable<McpAppsSetHostContextDetailsPlatform>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="TaskExecutionMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="TaskExecutionMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpAppsSetHostContextDetailsPlatform"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpAppsSetHostContextDetailsPlatform"/>.</param>
     [JsonConstructor]
-    public TaskExecutionMode(string value)
+    public McpAppsSetHostContextDetailsPlatform(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="TaskExecutionMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpAppsSetHostContextDetailsPlatform"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The task was started with synchronous waiting.</summary>
-    public static TaskExecutionMode Sync { get; } = new("sync");
+    /// <summary>Host runs in a web browser.</summary>
+    public static McpAppsSetHostContextDetailsPlatform Web { get; } = new("web");
 
-    /// <summary>The task is managed in the background.</summary>
-    public static TaskExecutionMode Background { get; } = new("background");
+    /// <summary>Host runs as a desktop application.</summary>
+    public static McpAppsSetHostContextDetailsPlatform Desktop { get; } = new("desktop");
 
-    /// <summary>Returns a value indicating whether two <see cref="TaskExecutionMode"/> instances are equivalent.</summary>
-    public static bool operator ==(TaskExecutionMode left, TaskExecutionMode right) => left.Equals(right);
+    /// <summary>Host runs on a mobile device.</summary>
+    public static McpAppsSetHostContextDetailsPlatform Mobile { get; } = new("mobile");
 
-    /// <summary>Returns a value indicating whether two <see cref="TaskExecutionMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(TaskExecutionMode left, TaskExecutionMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsPlatform"/> instances are equivalent.</summary>
+    public static bool operator ==(McpAppsSetHostContextDetailsPlatform left, McpAppsSetHostContextDetailsPlatform right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsPlatform"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpAppsSetHostContextDetailsPlatform left, McpAppsSetHostContextDetailsPlatform right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is TaskExecutionMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpAppsSetHostContextDetailsPlatform other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(TaskExecutionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpAppsSetHostContextDetailsPlatform other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18484,71 +24577,62 @@ public TaskExecutionMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{TaskExecutionMode}"/> for serializing <see cref="TaskExecutionMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpAppsSetHostContextDetailsPlatform}"/> for serializing <see cref="McpAppsSetHostContextDetailsPlatform"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<TaskExecutionMode>
+    public sealed class Converter : JsonConverter<McpAppsSetHostContextDetailsPlatform>
     {
         /// <inheritdoc />
-        public override TaskExecutionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpAppsSetHostContextDetailsPlatform Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, TaskExecutionMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpAppsSetHostContextDetailsPlatform value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(TaskExecutionMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsSetHostContextDetailsPlatform));
         }
     }
 }
 
 
-/// <summary>Current lifecycle status of the task.</summary>
+/// <summary>UI theme preference per SEP-1865.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct TaskStatus : IEquatable<TaskStatus>
+public readonly struct McpAppsSetHostContextDetailsTheme : IEquatable<McpAppsSetHostContextDetailsTheme>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="TaskStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="TaskStatus"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpAppsSetHostContextDetailsTheme"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpAppsSetHostContextDetailsTheme"/>.</param>
     [JsonConstructor]
-    public TaskStatus(string value)
+    public McpAppsSetHostContextDetailsTheme(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="TaskStatus"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpAppsSetHostContextDetailsTheme"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The task is actively executing.</summary>
-    public static TaskStatus Running { get; } = new("running");
-
-    /// <summary>The task is waiting for additional input.</summary>
-    public static TaskStatus Idle { get; } = new("idle");
-
-    /// <summary>The task finished successfully.</summary>
-    public static TaskStatus Completed { get; } = new("completed");
-
-    /// <summary>The task finished with an error.</summary>
-    public static TaskStatus Failed { get; } = new("failed");
+    /// <summary>Light UI theme.</summary>
+    public static McpAppsSetHostContextDetailsTheme Light { get; } = new("light");
 
-    /// <summary>The task was cancelled before completion.</summary>
-    public static TaskStatus Cancelled { get; } = new("cancelled");
+    /// <summary>Dark UI theme.</summary>
+    public static McpAppsSetHostContextDetailsTheme Dark { get; } = new("dark");
 
-    /// <summary>Returns a value indicating whether two <see cref="TaskStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(TaskStatus left, TaskStatus right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsTheme"/> instances are equivalent.</summary>
+    public static bool operator ==(McpAppsSetHostContextDetailsTheme left, McpAppsSetHostContextDetailsTheme right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="TaskStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(TaskStatus left, TaskStatus right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsTheme"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpAppsSetHostContextDetailsTheme left, McpAppsSetHostContextDetailsTheme right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is TaskStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpAppsSetHostContextDetailsTheme other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(TaskStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpAppsSetHostContextDetailsTheme other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18556,62 +24640,65 @@ public TaskStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{TaskStatus}"/> for serializing <see cref="TaskStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpAppsSetHostContextDetailsTheme}"/> for serializing <see cref="McpAppsSetHostContextDetailsTheme"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<TaskStatus>
+    public sealed class Converter : JsonConverter<McpAppsSetHostContextDetailsTheme>
     {
         /// <inheritdoc />
-        public override TaskStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpAppsSetHostContextDetailsTheme Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, TaskStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpAppsSetHostContextDetailsTheme value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(TaskStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsSetHostContextDetailsTheme));
         }
     }
 }
 
 
-/// <summary>Whether the shell runs inside a managed PTY session or as an independent background process.</summary>
+/// <summary>Allowed values for the `McpAppsHostContextDetailsAvailableDisplayMode` enumeration.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct TaskShellInfoAttachmentMode : IEquatable<TaskShellInfoAttachmentMode>
+public readonly struct McpAppsHostContextDetailsAvailableDisplayMode : IEquatable<McpAppsHostContextDetailsAvailableDisplayMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="TaskShellInfoAttachmentMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="TaskShellInfoAttachmentMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/>.</param>
     [JsonConstructor]
-    public TaskShellInfoAttachmentMode(string value)
+    public McpAppsHostContextDetailsAvailableDisplayMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="TaskShellInfoAttachmentMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The shell runs in a managed PTY session.</summary>
-    public static TaskShellInfoAttachmentMode Attached { get; } = new("attached");
+    /// <summary>Rendered inline within the host conversation surface.</summary>
+    public static McpAppsHostContextDetailsAvailableDisplayMode Inline { get; } = new("inline");
 
-    /// <summary>The shell runs as an independent background process.</summary>
-    public static TaskShellInfoAttachmentMode Detached { get; } = new("detached");
+    /// <summary>Rendered as a fullscreen overlay.</summary>
+    public static McpAppsHostContextDetailsAvailableDisplayMode Fullscreen { get; } = new("fullscreen");
 
-    /// <summary>Returns a value indicating whether two <see cref="TaskShellInfoAttachmentMode"/> instances are equivalent.</summary>
-    public static bool operator ==(TaskShellInfoAttachmentMode left, TaskShellInfoAttachmentMode right) => left.Equals(right);
+    /// <summary>Rendered as a picture-in-picture floating panel.</summary>
+    public static McpAppsHostContextDetailsAvailableDisplayMode Pip { get; } = new("pip");
 
-    /// <summary>Returns a value indicating whether two <see cref="TaskShellInfoAttachmentMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(TaskShellInfoAttachmentMode left, TaskShellInfoAttachmentMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/> instances are equivalent.</summary>
+    public static bool operator ==(McpAppsHostContextDetailsAvailableDisplayMode left, McpAppsHostContextDetailsAvailableDisplayMode right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpAppsHostContextDetailsAvailableDisplayMode left, McpAppsHostContextDetailsAvailableDisplayMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is TaskShellInfoAttachmentMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpAppsHostContextDetailsAvailableDisplayMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(TaskShellInfoAttachmentMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpAppsHostContextDetailsAvailableDisplayMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18619,62 +24706,65 @@ public TaskShellInfoAttachmentMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{TaskShellInfoAttachmentMode}"/> for serializing <see cref="TaskShellInfoAttachmentMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpAppsHostContextDetailsAvailableDisplayMode}"/> for serializing <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<TaskShellInfoAttachmentMode>
+    public sealed class Converter : JsonConverter<McpAppsHostContextDetailsAvailableDisplayMode>
     {
         /// <inheritdoc />
-        public override TaskShellInfoAttachmentMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpAppsHostContextDetailsAvailableDisplayMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, TaskShellInfoAttachmentMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpAppsHostContextDetailsAvailableDisplayMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(TaskShellInfoAttachmentMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsHostContextDetailsAvailableDisplayMode));
         }
     }
 }
 
 
-/// <summary>Consumer allowed to call an MCP tool.</summary>
+/// <summary>Current display mode (SEP-1865).</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpToolUiVisibility : IEquatable<McpToolUiVisibility>
+public readonly struct McpAppsHostContextDetailsDisplayMode : IEquatable<McpAppsHostContextDetailsDisplayMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpToolUiVisibility"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpToolUiVisibility"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpAppsHostContextDetailsDisplayMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpAppsHostContextDetailsDisplayMode"/>.</param>
     [JsonConstructor]
-    public McpToolUiVisibility(string value)
+    public McpAppsHostContextDetailsDisplayMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpToolUiVisibility"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpAppsHostContextDetailsDisplayMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The model may call the tool.</summary>
-    public static McpToolUiVisibility Model { get; } = new("model");
+    /// <summary>Rendered inline within the host conversation surface.</summary>
+    public static McpAppsHostContextDetailsDisplayMode Inline { get; } = new("inline");
 
-    /// <summary>An MCP App view may call the tool.</summary>
-    public static McpToolUiVisibility App { get; } = new("app");
+    /// <summary>Rendered as a fullscreen overlay.</summary>
+    public static McpAppsHostContextDetailsDisplayMode Fullscreen { get; } = new("fullscreen");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpToolUiVisibility"/> instances are equivalent.</summary>
-    public static bool operator ==(McpToolUiVisibility left, McpToolUiVisibility right) => left.Equals(right);
+    /// <summary>Rendered as a picture-in-picture floating panel.</summary>
+    public static McpAppsHostContextDetailsDisplayMode Pip { get; } = new("pip");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpToolUiVisibility"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpToolUiVisibility left, McpToolUiVisibility right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsDisplayMode"/> instances are equivalent.</summary>
+    public static bool operator ==(McpAppsHostContextDetailsDisplayMode left, McpAppsHostContextDetailsDisplayMode right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsDisplayMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpAppsHostContextDetailsDisplayMode left, McpAppsHostContextDetailsDisplayMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpToolUiVisibility other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpAppsHostContextDetailsDisplayMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpToolUiVisibility other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpAppsHostContextDetailsDisplayMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18682,65 +24772,65 @@ public McpToolUiVisibility(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpToolUiVisibility}"/> for serializing <see cref="McpToolUiVisibility"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpAppsHostContextDetailsDisplayMode}"/> for serializing <see cref="McpAppsHostContextDetailsDisplayMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpToolUiVisibility>
+    public sealed class Converter : JsonConverter<McpAppsHostContextDetailsDisplayMode>
     {
         /// <inheritdoc />
-        public override McpToolUiVisibility Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpAppsHostContextDetailsDisplayMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpToolUiVisibility value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpAppsHostContextDetailsDisplayMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpToolUiVisibility));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsHostContextDetailsDisplayMode));
         }
     }
 }
 
 
-/// <summary>Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.</summary>
+/// <summary>Platform type for responsive design.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpSamplingExecutionAction : IEquatable<McpSamplingExecutionAction>
+public readonly struct McpAppsHostContextDetailsPlatform : IEquatable<McpAppsHostContextDetailsPlatform>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpSamplingExecutionAction"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpSamplingExecutionAction"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpAppsHostContextDetailsPlatform"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpAppsHostContextDetailsPlatform"/>.</param>
     [JsonConstructor]
-    public McpSamplingExecutionAction(string value)
+    public McpAppsHostContextDetailsPlatform(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpSamplingExecutionAction"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpAppsHostContextDetailsPlatform"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The sampling inference completed and produced a result.</summary>
-    public static McpSamplingExecutionAction Success { get; } = new("success");
+    /// <summary>Host runs in a web browser.</summary>
+    public static McpAppsHostContextDetailsPlatform Web { get; } = new("web");
 
-    /// <summary>The sampling inference failed or was rejected.</summary>
-    public static McpSamplingExecutionAction Failure { get; } = new("failure");
+    /// <summary>Host runs as a desktop application.</summary>
+    public static McpAppsHostContextDetailsPlatform Desktop { get; } = new("desktop");
 
-    /// <summary>The sampling inference was cancelled before completion.</summary>
-    public static McpSamplingExecutionAction Cancelled { get; } = new("cancelled");
+    /// <summary>Host runs on a mobile device.</summary>
+    public static McpAppsHostContextDetailsPlatform Mobile { get; } = new("mobile");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpSamplingExecutionAction"/> instances are equivalent.</summary>
-    public static bool operator ==(McpSamplingExecutionAction left, McpSamplingExecutionAction right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsPlatform"/> instances are equivalent.</summary>
+    public static bool operator ==(McpAppsHostContextDetailsPlatform left, McpAppsHostContextDetailsPlatform right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="McpSamplingExecutionAction"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpSamplingExecutionAction left, McpSamplingExecutionAction right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsPlatform"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpAppsHostContextDetailsPlatform left, McpAppsHostContextDetailsPlatform right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpSamplingExecutionAction other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpAppsHostContextDetailsPlatform other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpSamplingExecutionAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpAppsHostContextDetailsPlatform other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18748,62 +24838,62 @@ public McpSamplingExecutionAction(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpSamplingExecutionAction}"/> for serializing <see cref="McpSamplingExecutionAction"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpAppsHostContextDetailsPlatform}"/> for serializing <see cref="McpAppsHostContextDetailsPlatform"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpSamplingExecutionAction>
+    public sealed class Converter : JsonConverter<McpAppsHostContextDetailsPlatform>
     {
         /// <inheritdoc />
-        public override McpSamplingExecutionAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpAppsHostContextDetailsPlatform Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpSamplingExecutionAction value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpAppsHostContextDetailsPlatform value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpSamplingExecutionAction));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsHostContextDetailsPlatform));
         }
     }
 }
 
 
-/// <summary>How environment-variable values supplied to MCP servers are resolved. "direct" passes literal string values; "indirect" treats values as references (e.g. names of environment variables on the host) that the runtime resolves before launch. Defaults to the runtime's startup mode; clients that intentionally launch MCP servers with literal values (e.g. CLI prompt mode and ACP) set this to "direct".</summary>
+/// <summary>UI theme preference per SEP-1865.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpSetEnvValueModeDetails : IEquatable<McpSetEnvValueModeDetails>
+public readonly struct McpAppsHostContextDetailsTheme : IEquatable<McpAppsHostContextDetailsTheme>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpSetEnvValueModeDetails"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpSetEnvValueModeDetails"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="McpAppsHostContextDetailsTheme"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpAppsHostContextDetailsTheme"/>.</param>
     [JsonConstructor]
-    public McpSetEnvValueModeDetails(string value)
+    public McpAppsHostContextDetailsTheme(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpSetEnvValueModeDetails"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpAppsHostContextDetailsTheme"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Treat MCP server environment values as literal strings.</summary>
-    public static McpSetEnvValueModeDetails Direct { get; } = new("direct");
+    /// <summary>Light UI theme.</summary>
+    public static McpAppsHostContextDetailsTheme Light { get; } = new("light");
 
-    /// <summary>Treat MCP server environment values as host-side references to resolve before launch.</summary>
-    public static McpSetEnvValueModeDetails Indirect { get; } = new("indirect");
+    /// <summary>Dark UI theme.</summary>
+    public static McpAppsHostContextDetailsTheme Dark { get; } = new("dark");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpSetEnvValueModeDetails"/> instances are equivalent.</summary>
-    public static bool operator ==(McpSetEnvValueModeDetails left, McpSetEnvValueModeDetails right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsTheme"/> instances are equivalent.</summary>
+    public static bool operator ==(McpAppsHostContextDetailsTheme left, McpAppsHostContextDetailsTheme right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="McpSetEnvValueModeDetails"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpSetEnvValueModeDetails left, McpSetEnvValueModeDetails right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsTheme"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpAppsHostContextDetailsTheme left, McpAppsHostContextDetailsTheme right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpSetEnvValueModeDetails other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpAppsHostContextDetailsTheme other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpSetEnvValueModeDetails other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpAppsHostContextDetailsTheme other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18811,62 +24901,62 @@ public McpSetEnvValueModeDetails(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpSetEnvValueModeDetails}"/> for serializing <see cref="McpSetEnvValueModeDetails"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpAppsHostContextDetailsTheme}"/> for serializing <see cref="McpAppsHostContextDetailsTheme"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpSetEnvValueModeDetails>
+    public sealed class Converter : JsonConverter<McpAppsHostContextDetailsTheme>
     {
         /// <inheritdoc />
-        public override McpSetEnvValueModeDetails Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpAppsHostContextDetailsTheme Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpSetEnvValueModeDetails value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpAppsHostContextDetailsTheme value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpSetEnvValueModeDetails));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsHostContextDetailsTheme));
         }
     }
 }
 
 
-/// <summary>OAuth grant type override for this login.</summary>
+/// <summary>Transport to be used for provider requests.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpOauthLoginGrantType : IEquatable<McpOauthLoginGrantType>
+public readonly struct ProviderEndpointTransport : IEquatable<ProviderEndpointTransport>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpOauthLoginGrantType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpOauthLoginGrantType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderEndpointTransport"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderEndpointTransport"/>.</param>
     [JsonConstructor]
-    public McpOauthLoginGrantType(string value)
+    public ProviderEndpointTransport(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpOauthLoginGrantType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderEndpointTransport"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Interactive browser-based OAuth flow using an authorization code, typically with PKCE.</summary>
-    public static McpOauthLoginGrantType AuthorizationCode { get; } = new("authorization_code");
+    /// <summary>HTTP request/streaming transport.</summary>
+    public static ProviderEndpointTransport Http { get; } = new("http");
 
-    /// <summary>Headless OAuth flow where a confidential client authenticates directly with a client secret.</summary>
-    public static McpOauthLoginGrantType ClientCredentials { get; } = new("client_credentials");
+    /// <summary>WebSocket transport.</summary>
+    public static ProviderEndpointTransport Websockets { get; } = new("websockets");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpOauthLoginGrantType"/> instances are equivalent.</summary>
-    public static bool operator ==(McpOauthLoginGrantType left, McpOauthLoginGrantType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointTransport"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderEndpointTransport left, ProviderEndpointTransport right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="McpOauthLoginGrantType"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpOauthLoginGrantType left, McpOauthLoginGrantType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointTransport"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderEndpointTransport left, ProviderEndpointTransport right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpOauthLoginGrantType other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderEndpointTransport other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpOauthLoginGrantType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderEndpointTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18874,65 +24964,65 @@ public McpOauthLoginGrantType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpOauthLoginGrantType}"/> for serializing <see cref="McpOauthLoginGrantType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderEndpointTransport}"/> for serializing <see cref="ProviderEndpointTransport"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpOauthLoginGrantType>
+    public sealed class Converter : JsonConverter<ProviderEndpointTransport>
     {
         /// <inheritdoc />
-        public override McpOauthLoginGrantType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderEndpointTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpOauthLoginGrantType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderEndpointTransport value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpOauthLoginGrantType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderEndpointTransport));
         }
     }
 }
 
 
-/// <summary>Allowed values for the `McpAppsSetHostContextDetailsAvailableDisplayMode` enumeration.</summary>
+/// <summary>Provider family. Matches the `type` field of a BYOK provider config.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpAppsSetHostContextDetailsAvailableDisplayMode : IEquatable<McpAppsSetHostContextDetailsAvailableDisplayMode>
+public readonly struct ProviderEndpointType : IEquatable<ProviderEndpointType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderEndpointType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderEndpointType"/>.</param>
     [JsonConstructor]
-    public McpAppsSetHostContextDetailsAvailableDisplayMode(string value)
+    public ProviderEndpointType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderEndpointType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Rendered inline within the host conversation surface.</summary>
-    public static McpAppsSetHostContextDetailsAvailableDisplayMode Inline { get; } = new("inline");
+    /// <summary>OpenAI-compatible endpoint (use the OpenAI client library).</summary>
+    public static ProviderEndpointType Openai { get; } = new("openai");
 
-    /// <summary>Rendered as a fullscreen overlay.</summary>
-    public static McpAppsSetHostContextDetailsAvailableDisplayMode Fullscreen { get; } = new("fullscreen");
+    /// <summary>Azure OpenAI endpoint (use the OpenAI client library with the Azure base URL).</summary>
+    public static ProviderEndpointType Azure { get; } = new("azure");
 
-    /// <summary>Rendered as a picture-in-picture floating panel.</summary>
-    public static McpAppsSetHostContextDetailsAvailableDisplayMode Pip { get; } = new("pip");
+    /// <summary>Anthropic endpoint (use the Anthropic client library).</summary>
+    public static ProviderEndpointType Anthropic { get; } = new("anthropic");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/> instances are equivalent.</summary>
-    public static bool operator ==(McpAppsSetHostContextDetailsAvailableDisplayMode left, McpAppsSetHostContextDetailsAvailableDisplayMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointType"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderEndpointType left, ProviderEndpointType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpAppsSetHostContextDetailsAvailableDisplayMode left, McpAppsSetHostContextDetailsAvailableDisplayMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointType"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderEndpointType left, ProviderEndpointType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpAppsSetHostContextDetailsAvailableDisplayMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderEndpointType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpAppsSetHostContextDetailsAvailableDisplayMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderEndpointType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -18940,65 +25030,62 @@ public McpAppsSetHostContextDetailsAvailableDisplayMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpAppsSetHostContextDetailsAvailableDisplayMode}"/> for serializing <see cref="McpAppsSetHostContextDetailsAvailableDisplayMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderEndpointType}"/> for serializing <see cref="ProviderEndpointType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpAppsSetHostContextDetailsAvailableDisplayMode>
+    public sealed class Converter : JsonConverter<ProviderEndpointType>
     {
         /// <inheritdoc />
-        public override McpAppsSetHostContextDetailsAvailableDisplayMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderEndpointType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpAppsSetHostContextDetailsAvailableDisplayMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderEndpointType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsSetHostContextDetailsAvailableDisplayMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderEndpointType));
         }
     }
 }
 
 
-/// <summary>Current display mode (SEP-1865).</summary>
+/// <summary>Wire API to be used, when required for the provider type.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpAppsSetHostContextDetailsDisplayMode : IEquatable<McpAppsSetHostContextDetailsDisplayMode>
+public readonly struct ProviderEndpointWireApi : IEquatable<ProviderEndpointWireApi>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpAppsSetHostContextDetailsDisplayMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpAppsSetHostContextDetailsDisplayMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderEndpointWireApi"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderEndpointWireApi"/>.</param>
     [JsonConstructor]
-    public McpAppsSetHostContextDetailsDisplayMode(string value)
+    public ProviderEndpointWireApi(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpAppsSetHostContextDetailsDisplayMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderEndpointWireApi"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Rendered inline within the host conversation surface.</summary>
-    public static McpAppsSetHostContextDetailsDisplayMode Inline { get; } = new("inline");
-
-    /// <summary>Rendered as a fullscreen overlay.</summary>
-    public static McpAppsSetHostContextDetailsDisplayMode Fullscreen { get; } = new("fullscreen");
-
-    /// <summary>Rendered as a picture-in-picture floating panel.</summary>
-    public static McpAppsSetHostContextDetailsDisplayMode Pip { get; } = new("pip");
+    /// <summary>Classic chat-completions request shape.</summary>
+    public static ProviderEndpointWireApi Completions { get; } = new("completions");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsDisplayMode"/> instances are equivalent.</summary>
-    public static bool operator ==(McpAppsSetHostContextDetailsDisplayMode left, McpAppsSetHostContextDetailsDisplayMode right) => left.Equals(right);
+    /// <summary>Newer responses request shape.</summary>
+    public static ProviderEndpointWireApi Responses { get; } = new("responses");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsDisplayMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpAppsSetHostContextDetailsDisplayMode left, McpAppsSetHostContextDetailsDisplayMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointWireApi"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderEndpointWireApi left, ProviderEndpointWireApi right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointWireApi"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderEndpointWireApi left, ProviderEndpointWireApi right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpAppsSetHostContextDetailsDisplayMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderEndpointWireApi other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpAppsSetHostContextDetailsDisplayMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderEndpointWireApi other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19006,65 +25093,62 @@ public McpAppsSetHostContextDetailsDisplayMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpAppsSetHostContextDetailsDisplayMode}"/> for serializing <see cref="McpAppsSetHostContextDetailsDisplayMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderEndpointWireApi}"/> for serializing <see cref="ProviderEndpointWireApi"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpAppsSetHostContextDetailsDisplayMode>
+    public sealed class Converter : JsonConverter<ProviderEndpointWireApi>
     {
         /// <inheritdoc />
-        public override McpAppsSetHostContextDetailsDisplayMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderEndpointWireApi Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpAppsSetHostContextDetailsDisplayMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderEndpointWireApi value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsSetHostContextDetailsDisplayMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderEndpointWireApi));
         }
     }
 }
 
 
-/// <summary>Platform type for responsive design.</summary>
+/// <summary>Provider transport. Defaults to "http".</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpAppsSetHostContextDetailsPlatform : IEquatable<McpAppsSetHostContextDetailsPlatform>
+public readonly struct ProviderConfigTransport : IEquatable<ProviderConfigTransport>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpAppsSetHostContextDetailsPlatform"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpAppsSetHostContextDetailsPlatform"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderConfigTransport"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderConfigTransport"/>.</param>
     [JsonConstructor]
-    public McpAppsSetHostContextDetailsPlatform(string value)
+    public ProviderConfigTransport(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpAppsSetHostContextDetailsPlatform"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderConfigTransport"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Host runs in a web browser.</summary>
-    public static McpAppsSetHostContextDetailsPlatform Web { get; } = new("web");
-
-    /// <summary>Host runs as a desktop application.</summary>
-    public static McpAppsSetHostContextDetailsPlatform Desktop { get; } = new("desktop");
+    /// <summary>HTTP request/streaming transport.</summary>
+    public static ProviderConfigTransport Http { get; } = new("http");
 
-    /// <summary>Host runs on a mobile device.</summary>
-    public static McpAppsSetHostContextDetailsPlatform Mobile { get; } = new("mobile");
+    /// <summary>WebSocket transport.</summary>
+    public static ProviderConfigTransport Websockets { get; } = new("websockets");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsPlatform"/> instances are equivalent.</summary>
-    public static bool operator ==(McpAppsSetHostContextDetailsPlatform left, McpAppsSetHostContextDetailsPlatform right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigTransport"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderConfigTransport left, ProviderConfigTransport right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsPlatform"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpAppsSetHostContextDetailsPlatform left, McpAppsSetHostContextDetailsPlatform right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigTransport"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderConfigTransport left, ProviderConfigTransport right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpAppsSetHostContextDetailsPlatform other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderConfigTransport other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpAppsSetHostContextDetailsPlatform other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderConfigTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19072,62 +25156,65 @@ public McpAppsSetHostContextDetailsPlatform(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpAppsSetHostContextDetailsPlatform}"/> for serializing <see cref="McpAppsSetHostContextDetailsPlatform"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigTransport}"/> for serializing <see cref="ProviderConfigTransport"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpAppsSetHostContextDetailsPlatform>
+    public sealed class Converter : JsonConverter<ProviderConfigTransport>
     {
         /// <inheritdoc />
-        public override McpAppsSetHostContextDetailsPlatform Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderConfigTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpAppsSetHostContextDetailsPlatform value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderConfigTransport value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsSetHostContextDetailsPlatform));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigTransport));
         }
     }
 }
 
 
-/// <summary>UI theme preference per SEP-1865.</summary>
+/// <summary>Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpAppsSetHostContextDetailsTheme : IEquatable<McpAppsSetHostContextDetailsTheme>
+public readonly struct ProviderConfigType : IEquatable<ProviderConfigType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpAppsSetHostContextDetailsTheme"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpAppsSetHostContextDetailsTheme"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderConfigType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderConfigType"/>.</param>
     [JsonConstructor]
-    public McpAppsSetHostContextDetailsTheme(string value)
+    public ProviderConfigType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpAppsSetHostContextDetailsTheme"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderConfigType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Light UI theme.</summary>
-    public static McpAppsSetHostContextDetailsTheme Light { get; } = new("light");
+    /// <summary>Generic OpenAI-compatible API.</summary>
+    public static ProviderConfigType Openai { get; } = new("openai");
 
-    /// <summary>Dark UI theme.</summary>
-    public static McpAppsSetHostContextDetailsTheme Dark { get; } = new("dark");
+    /// <summary>Azure OpenAI Service endpoint.</summary>
+    public static ProviderConfigType Azure { get; } = new("azure");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsTheme"/> instances are equivalent.</summary>
-    public static bool operator ==(McpAppsSetHostContextDetailsTheme left, McpAppsSetHostContextDetailsTheme right) => left.Equals(right);
+    /// <summary>Anthropic API endpoint.</summary>
+    public static ProviderConfigType Anthropic { get; } = new("anthropic");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsSetHostContextDetailsTheme"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpAppsSetHostContextDetailsTheme left, McpAppsSetHostContextDetailsTheme right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigType"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderConfigType left, ProviderConfigType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigType"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderConfigType left, ProviderConfigType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpAppsSetHostContextDetailsTheme other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderConfigType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpAppsSetHostContextDetailsTheme other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderConfigType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19135,65 +25222,62 @@ public McpAppsSetHostContextDetailsTheme(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpAppsSetHostContextDetailsTheme}"/> for serializing <see cref="McpAppsSetHostContextDetailsTheme"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigType}"/> for serializing <see cref="ProviderConfigType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpAppsSetHostContextDetailsTheme>
+    public sealed class Converter : JsonConverter<ProviderConfigType>
     {
         /// <inheritdoc />
-        public override McpAppsSetHostContextDetailsTheme Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderConfigType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpAppsSetHostContextDetailsTheme value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderConfigType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsSetHostContextDetailsTheme));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigType));
         }
     }
 }
 
 
-/// <summary>Allowed values for the `McpAppsHostContextDetailsAvailableDisplayMode` enumeration.</summary>
+/// <summary>Wire API format (openai/azure only). Defaults to "completions".</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpAppsHostContextDetailsAvailableDisplayMode : IEquatable<McpAppsHostContextDetailsAvailableDisplayMode>
+public readonly struct ProviderConfigWireApi : IEquatable<ProviderConfigWireApi>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderConfigWireApi"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderConfigWireApi"/>.</param>
     [JsonConstructor]
-    public McpAppsHostContextDetailsAvailableDisplayMode(string value)
+    public ProviderConfigWireApi(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderConfigWireApi"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Rendered inline within the host conversation surface.</summary>
-    public static McpAppsHostContextDetailsAvailableDisplayMode Inline { get; } = new("inline");
-
-    /// <summary>Rendered as a fullscreen overlay.</summary>
-    public static McpAppsHostContextDetailsAvailableDisplayMode Fullscreen { get; } = new("fullscreen");
+    /// <summary>OpenAI Chat Completions wire format.</summary>
+    public static ProviderConfigWireApi Completions { get; } = new("completions");
 
-    /// <summary>Rendered as a picture-in-picture floating panel.</summary>
-    public static McpAppsHostContextDetailsAvailableDisplayMode Pip { get; } = new("pip");
+    /// <summary>OpenAI Responses API wire format.</summary>
+    public static ProviderConfigWireApi Responses { get; } = new("responses");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/> instances are equivalent.</summary>
-    public static bool operator ==(McpAppsHostContextDetailsAvailableDisplayMode left, McpAppsHostContextDetailsAvailableDisplayMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigWireApi"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderConfigWireApi left, ProviderConfigWireApi right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpAppsHostContextDetailsAvailableDisplayMode left, McpAppsHostContextDetailsAvailableDisplayMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigWireApi"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderConfigWireApi left, ProviderConfigWireApi right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpAppsHostContextDetailsAvailableDisplayMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderConfigWireApi other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpAppsHostContextDetailsAvailableDisplayMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderConfigWireApi other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19201,65 +25285,62 @@ public McpAppsHostContextDetailsAvailableDisplayMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpAppsHostContextDetailsAvailableDisplayMode}"/> for serializing <see cref="McpAppsHostContextDetailsAvailableDisplayMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigWireApi}"/> for serializing <see cref="ProviderConfigWireApi"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpAppsHostContextDetailsAvailableDisplayMode>
+    public sealed class Converter : JsonConverter<ProviderConfigWireApi>
     {
         /// <inheritdoc />
-        public override McpAppsHostContextDetailsAvailableDisplayMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderConfigWireApi Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpAppsHostContextDetailsAvailableDisplayMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderConfigWireApi value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsHostContextDetailsAvailableDisplayMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigWireApi));
         }
     }
 }
 
 
-/// <summary>Current display mode (SEP-1865).</summary>
+/// <summary>Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpAppsHostContextDetailsDisplayMode : IEquatable<McpAppsHostContextDetailsDisplayMode>
+public readonly struct OptionsUpdateAdditionalContentExclusionPolicyScope : IEquatable<OptionsUpdateAdditionalContentExclusionPolicyScope>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpAppsHostContextDetailsDisplayMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpAppsHostContextDetailsDisplayMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/>.</param>
     [JsonConstructor]
-    public McpAppsHostContextDetailsDisplayMode(string value)
+    public OptionsUpdateAdditionalContentExclusionPolicyScope(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpAppsHostContextDetailsDisplayMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Rendered inline within the host conversation surface.</summary>
-    public static McpAppsHostContextDetailsDisplayMode Inline { get; } = new("inline");
-
-    /// <summary>Rendered as a fullscreen overlay.</summary>
-    public static McpAppsHostContextDetailsDisplayMode Fullscreen { get; } = new("fullscreen");
+    /// <summary>The content exclusion policy applies to the current repository.</summary>
+    public static OptionsUpdateAdditionalContentExclusionPolicyScope Repo { get; } = new("repo");
 
-    /// <summary>Rendered as a picture-in-picture floating panel.</summary>
-    public static McpAppsHostContextDetailsDisplayMode Pip { get; } = new("pip");
+    /// <summary>The content exclusion policy applies across all repositories.</summary>
+    public static OptionsUpdateAdditionalContentExclusionPolicyScope All { get; } = new("all");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsDisplayMode"/> instances are equivalent.</summary>
-    public static bool operator ==(McpAppsHostContextDetailsDisplayMode left, McpAppsHostContextDetailsDisplayMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances are equivalent.</summary>
+    public static bool operator ==(OptionsUpdateAdditionalContentExclusionPolicyScope left, OptionsUpdateAdditionalContentExclusionPolicyScope right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsDisplayMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpAppsHostContextDetailsDisplayMode left, McpAppsHostContextDetailsDisplayMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(OptionsUpdateAdditionalContentExclusionPolicyScope left, OptionsUpdateAdditionalContentExclusionPolicyScope right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpAppsHostContextDetailsDisplayMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is OptionsUpdateAdditionalContentExclusionPolicyScope other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpAppsHostContextDetailsDisplayMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(OptionsUpdateAdditionalContentExclusionPolicyScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19267,65 +25348,62 @@ public McpAppsHostContextDetailsDisplayMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpAppsHostContextDetailsDisplayMode}"/> for serializing <see cref="McpAppsHostContextDetailsDisplayMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateAdditionalContentExclusionPolicyScope}"/> for serializing <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpAppsHostContextDetailsDisplayMode>
+    public sealed class Converter : JsonConverter<OptionsUpdateAdditionalContentExclusionPolicyScope>
     {
         /// <inheritdoc />
-        public override McpAppsHostContextDetailsDisplayMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override OptionsUpdateAdditionalContentExclusionPolicyScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpAppsHostContextDetailsDisplayMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, OptionsUpdateAdditionalContentExclusionPolicyScope value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsHostContextDetailsDisplayMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateAdditionalContentExclusionPolicyScope));
         }
     }
 }
 
 
-/// <summary>Platform type for responsive design.</summary>
+/// <summary>Context tier for models with tiered pricing. The session uses this to derive effective `modelCapabilitiesOverrides` so compaction, truncation, token display, and request limits honor the selected tier.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpAppsHostContextDetailsPlatform : IEquatable<McpAppsHostContextDetailsPlatform>
+public readonly struct OptionsUpdateContextTier : IEquatable<OptionsUpdateContextTier>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpAppsHostContextDetailsPlatform"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpAppsHostContextDetailsPlatform"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateContextTier"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="OptionsUpdateContextTier"/>.</param>
     [JsonConstructor]
-    public McpAppsHostContextDetailsPlatform(string value)
+    public OptionsUpdateContextTier(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpAppsHostContextDetailsPlatform"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="OptionsUpdateContextTier"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Host runs in a web browser.</summary>
-    public static McpAppsHostContextDetailsPlatform Web { get; } = new("web");
-
-    /// <summary>Host runs as a desktop application.</summary>
-    public static McpAppsHostContextDetailsPlatform Desktop { get; } = new("desktop");
+    /// <summary>Use the model's default context tier and its standard token limits / pricing.</summary>
+    public static OptionsUpdateContextTier Default { get; } = new("default");
 
-    /// <summary>Host runs on a mobile device.</summary>
-    public static McpAppsHostContextDetailsPlatform Mobile { get; } = new("mobile");
+    /// <summary>Use the model's long-context tier (when available) so larger inputs are accepted and tier-specific pricing applies.</summary>
+    public static OptionsUpdateContextTier LongContext { get; } = new("long_context");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsPlatform"/> instances are equivalent.</summary>
-    public static bool operator ==(McpAppsHostContextDetailsPlatform left, McpAppsHostContextDetailsPlatform right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateContextTier"/> instances are equivalent.</summary>
+    public static bool operator ==(OptionsUpdateContextTier left, OptionsUpdateContextTier right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsPlatform"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpAppsHostContextDetailsPlatform left, McpAppsHostContextDetailsPlatform right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateContextTier"/> instances are not equivalent.</summary>
+    public static bool operator !=(OptionsUpdateContextTier left, OptionsUpdateContextTier right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpAppsHostContextDetailsPlatform other && Equals(other);
+    public override bool Equals(object? obj) => obj is OptionsUpdateContextTier other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpAppsHostContextDetailsPlatform other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(OptionsUpdateContextTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19333,62 +25411,62 @@ public McpAppsHostContextDetailsPlatform(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpAppsHostContextDetailsPlatform}"/> for serializing <see cref="McpAppsHostContextDetailsPlatform"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateContextTier}"/> for serializing <see cref="OptionsUpdateContextTier"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpAppsHostContextDetailsPlatform>
+    public sealed class Converter : JsonConverter<OptionsUpdateContextTier>
     {
         /// <inheritdoc />
-        public override McpAppsHostContextDetailsPlatform Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override OptionsUpdateContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpAppsHostContextDetailsPlatform value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, OptionsUpdateContextTier value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsHostContextDetailsPlatform));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateContextTier));
         }
     }
 }
 
 
-/// <summary>UI theme preference per SEP-1865.</summary>
+/// <summary>How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch).</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpAppsHostContextDetailsTheme : IEquatable<McpAppsHostContextDetailsTheme>
+public readonly struct OptionsUpdateEnvValueMode : IEquatable<OptionsUpdateEnvValueMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="McpAppsHostContextDetailsTheme"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="McpAppsHostContextDetailsTheme"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateEnvValueMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="OptionsUpdateEnvValueMode"/>.</param>
     [JsonConstructor]
-    public McpAppsHostContextDetailsTheme(string value)
+    public OptionsUpdateEnvValueMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpAppsHostContextDetailsTheme"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="OptionsUpdateEnvValueMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Light UI theme.</summary>
-    public static McpAppsHostContextDetailsTheme Light { get; } = new("light");
+    /// <summary>Pass MCP server environment values as literal strings.</summary>
+    public static OptionsUpdateEnvValueMode Direct { get; } = new("direct");
 
-    /// <summary>Dark UI theme.</summary>
-    public static McpAppsHostContextDetailsTheme Dark { get; } = new("dark");
+    /// <summary>Resolve MCP server environment values from host-side references.</summary>
+    public static OptionsUpdateEnvValueMode Indirect { get; } = new("indirect");
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsTheme"/> instances are equivalent.</summary>
-    public static bool operator ==(McpAppsHostContextDetailsTheme left, McpAppsHostContextDetailsTheme right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateEnvValueMode"/> instances are equivalent.</summary>
+    public static bool operator ==(OptionsUpdateEnvValueMode left, OptionsUpdateEnvValueMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="McpAppsHostContextDetailsTheme"/> instances are not equivalent.</summary>
-    public static bool operator !=(McpAppsHostContextDetailsTheme left, McpAppsHostContextDetailsTheme right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateEnvValueMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(OptionsUpdateEnvValueMode left, OptionsUpdateEnvValueMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpAppsHostContextDetailsTheme other && Equals(other);
+    public override bool Equals(object? obj) => obj is OptionsUpdateEnvValueMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpAppsHostContextDetailsTheme other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(OptionsUpdateEnvValueMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19396,62 +25474,65 @@ public McpAppsHostContextDetailsTheme(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpAppsHostContextDetailsTheme}"/> for serializing <see cref="McpAppsHostContextDetailsTheme"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateEnvValueMode}"/> for serializing <see cref="OptionsUpdateEnvValueMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpAppsHostContextDetailsTheme>
+    public sealed class Converter : JsonConverter<OptionsUpdateEnvValueMode>
     {
         /// <inheritdoc />
-        public override McpAppsHostContextDetailsTheme Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override OptionsUpdateEnvValueMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpAppsHostContextDetailsTheme value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, OptionsUpdateEnvValueMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpAppsHostContextDetailsTheme));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateEnvValueMode));
         }
     }
 }
 
 
-/// <summary>Transport to be used for provider requests.</summary>
+/// <summary>Reasoning summary mode for supported model clients.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ProviderEndpointTransport : IEquatable<ProviderEndpointTransport>
+public readonly struct OptionsUpdateReasoningSummary : IEquatable<OptionsUpdateReasoningSummary>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ProviderEndpointTransport"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ProviderEndpointTransport"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateReasoningSummary"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="OptionsUpdateReasoningSummary"/>.</param>
     [JsonConstructor]
-    public ProviderEndpointTransport(string value)
+    public OptionsUpdateReasoningSummary(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ProviderEndpointTransport"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="OptionsUpdateReasoningSummary"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>HTTP request/streaming transport.</summary>
-    public static ProviderEndpointTransport Http { get; } = new("http");
+    /// <summary>Do not request reasoning summaries from the model.</summary>
+    public static OptionsUpdateReasoningSummary None { get; } = new("none");
 
-    /// <summary>WebSocket transport.</summary>
-    public static ProviderEndpointTransport Websockets { get; } = new("websockets");
+    /// <summary>Request a concise summary of model reasoning.</summary>
+    public static OptionsUpdateReasoningSummary Concise { get; } = new("concise");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointTransport"/> instances are equivalent.</summary>
-    public static bool operator ==(ProviderEndpointTransport left, ProviderEndpointTransport right) => left.Equals(right);
+    /// <summary>Request a detailed summary of model reasoning.</summary>
+    public static OptionsUpdateReasoningSummary Detailed { get; } = new("detailed");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointTransport"/> instances are not equivalent.</summary>
-    public static bool operator !=(ProviderEndpointTransport left, ProviderEndpointTransport right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateReasoningSummary"/> instances are equivalent.</summary>
+    public static bool operator ==(OptionsUpdateReasoningSummary left, OptionsUpdateReasoningSummary right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateReasoningSummary"/> instances are not equivalent.</summary>
+    public static bool operator !=(OptionsUpdateReasoningSummary left, OptionsUpdateReasoningSummary right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ProviderEndpointTransport other && Equals(other);
+    public override bool Equals(object? obj) => obj is OptionsUpdateReasoningSummary other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ProviderEndpointTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(OptionsUpdateReasoningSummary other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19459,65 +25540,77 @@ public ProviderEndpointTransport(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ProviderEndpointTransport}"/> for serializing <see cref="ProviderEndpointTransport"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateReasoningSummary}"/> for serializing <see cref="OptionsUpdateReasoningSummary"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProviderEndpointTransport>
+    public sealed class Converter : JsonConverter<OptionsUpdateReasoningSummary>
     {
         /// <inheritdoc />
-        public override ProviderEndpointTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override OptionsUpdateReasoningSummary Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProviderEndpointTransport value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, OptionsUpdateReasoningSummary value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderEndpointTransport));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateReasoningSummary));
         }
     }
 }
 
 
-/// <summary>Provider family. Matches the `type` field of a BYOK provider config.</summary>
+/// <summary>Origin of the sandbox choice supplied by an internal client.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ProviderEndpointType : IEquatable<ProviderEndpointType>
+public readonly struct SandboxConfigSource : IEquatable<SandboxConfigSource>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ProviderEndpointType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ProviderEndpointType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SandboxConfigSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SandboxConfigSource"/>.</param>
     [JsonConstructor]
-    public ProviderEndpointType(string value)
+    public SandboxConfigSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ProviderEndpointType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SandboxConfigSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>OpenAI-compatible endpoint (use the OpenAI client library).</summary>
-    public static ProviderEndpointType Openai { get; } = new("openai");
+    /// <summary>The client applied the default because no sandbox preference was configured.</summary>
+    public static SandboxConfigSource NeverConfigured { get; } = new("never_configured");
 
-    /// <summary>Azure OpenAI endpoint (use the OpenAI client library with the Azure base URL).</summary>
-    public static ProviderEndpointType Azure { get; } = new("azure");
+    /// <summary>The user's persisted settings enabled the sandbox.</summary>
+    public static SandboxConfigSource UserEnabled { get; } = new("user_enabled");
 
-    /// <summary>Anthropic endpoint (use the Anthropic client library).</summary>
-    public static ProviderEndpointType Anthropic { get; } = new("anthropic");
+    /// <summary>The user's persisted settings disabled the sandbox.</summary>
+    public static SandboxConfigSource UserDisabled { get; } = new("user_disabled");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointType"/> instances are equivalent.</summary>
-    public static bool operator ==(ProviderEndpointType left, ProviderEndpointType right) => left.Equals(right);
+    /// <summary>A command-line flag selected the sandbox state for this session.</summary>
+    public static SandboxConfigSource SessionFlag { get; } = new("session_flag");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointType"/> instances are not equivalent.</summary>
-    public static bool operator !=(ProviderEndpointType left, ProviderEndpointType right) => !(left == right);
+    /// <summary>The user disabled the sandbox for the current session.</summary>
+    public static SandboxConfigSource SessionDisabled { get; } = new("session_disabled");
+
+    /// <summary>The client disabled the sandbox because the host cannot enforce it.</summary>
+    public static SandboxConfigSource UnsupportedHost { get; } = new("unsupported_host");
+
+    /// <summary>A repository policy selected the sandbox state.</summary>
+    public static SandboxConfigSource RepositoryPolicy { get; } = new("repository_policy");
+
+    /// <summary>Returns a value indicating whether two <see cref="SandboxConfigSource"/> instances are equivalent.</summary>
+    public static bool operator ==(SandboxConfigSource left, SandboxConfigSource right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="SandboxConfigSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(SandboxConfigSource left, SandboxConfigSource right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ProviderEndpointType other && Equals(other);
+    public override bool Equals(object? obj) => obj is SandboxConfigSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ProviderEndpointType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SandboxConfigSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19525,62 +25618,89 @@ public ProviderEndpointType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ProviderEndpointType}"/> for serializing <see cref="ProviderEndpointType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SandboxConfigSource}"/> for serializing <see cref="SandboxConfigSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProviderEndpointType>
+    public sealed class Converter : JsonConverter<SandboxConfigSource>
     {
         /// <inheritdoc />
-        public override ProviderEndpointType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SandboxConfigSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProviderEndpointType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SandboxConfigSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderEndpointType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SandboxConfigSource));
         }
     }
 }
 
 
-/// <summary>Wire API to be used, when required for the provider type.</summary>
+/// <summary>Session capability enabled for this session.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ProviderEndpointWireApi : IEquatable<ProviderEndpointWireApi>
+public readonly struct SessionCapability : IEquatable<SessionCapability>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ProviderEndpointWireApi"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ProviderEndpointWireApi"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionCapability"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionCapability"/>.</param>
     [JsonConstructor]
-    public ProviderEndpointWireApi(string value)
+    public SessionCapability(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ProviderEndpointWireApi"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionCapability"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Classic chat-completions request shape.</summary>
-    public static ProviderEndpointWireApi Completions { get; } = new("completions");
+    /// <summary>TUI-specific prompt hints such as keyboard shortcuts.</summary>
+    public static SessionCapability TuiHints { get; } = new("tui-hints");
 
-    /// <summary>Newer responses request shape.</summary>
-    public static ProviderEndpointWireApi Responses { get; } = new("responses");
+    /// <summary>Plan-mode handling and instructions.</summary>
+    public static SessionCapability PlanMode { get; } = new("plan-mode");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointWireApi"/> instances are equivalent.</summary>
-    public static bool operator ==(ProviderEndpointWireApi left, ProviderEndpointWireApi right) => left.Equals(right);
+    /// <summary>Memory tool and memories prompt section.</summary>
+    public static SessionCapability Memory { get; } = new("memory");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderEndpointWireApi"/> instances are not equivalent.</summary>
-    public static bool operator !=(ProviderEndpointWireApi left, ProviderEndpointWireApi right) => !(left == right);
+    /// <summary>Copilot CLI documentation tool and prompt section.</summary>
+    public static SessionCapability CliDocumentation { get; } = new("cli-documentation");
+
+    /// <summary>Interactive ask_user tool support.</summary>
+    public static SessionCapability AskUser { get; } = new("ask-user");
+
+    /// <summary>Interactive CLI identity and behavior.</summary>
+    public static SessionCapability InteractiveMode { get; } = new("interactive-mode");
+
+    /// <summary>Automatic hidden system notifications.</summary>
+    public static SessionCapability SystemNotifications { get; } = new("system-notifications");
+
+    /// <summary>SDK elicitation support.</summary>
+    public static SessionCapability Elicitation { get; } = new("elicitation");
+
+    /// <summary>Cross-session history tools and session-store SQL prompt/tool metadata.</summary>
+    public static SessionCapability SessionStore { get; } = new("session-store");
+
+    /// <summary>MCP Apps UI passthrough.</summary>
+    public static SessionCapability McpApps { get; } = new("mcp-apps");
+
+    /// <summary>Host-provided canvas rendering support.</summary>
+    public static SessionCapability CanvasRenderer { get; } = new("canvas-renderer");
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionCapability"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionCapability left, SessionCapability right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionCapability"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionCapability left, SessionCapability right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ProviderEndpointWireApi other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionCapability other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ProviderEndpointWireApi other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionCapability other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19588,62 +25708,62 @@ public ProviderEndpointWireApi(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ProviderEndpointWireApi}"/> for serializing <see cref="ProviderEndpointWireApi"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionCapability}"/> for serializing <see cref="SessionCapability"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProviderEndpointWireApi>
+    public sealed class Converter : JsonConverter<SessionCapability>
     {
         /// <inheritdoc />
-        public override ProviderEndpointWireApi Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionCapability Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProviderEndpointWireApi value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionCapability value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderEndpointWireApi));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionCapability));
         }
     }
 }
 
 
-/// <summary>Provider transport. Defaults to "http".</summary>
+/// <summary>Controls automatic non-interactive profile loading where supported. Explicit initScripts are unaffected.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ProviderConfigTransport : IEquatable<ProviderConfigTransport>
+public readonly struct ShellInitProfile : IEquatable<ShellInitProfile>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ProviderConfigTransport"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ProviderConfigTransport"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ShellInitProfile"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ShellInitProfile"/>.</param>
     [JsonConstructor]
-    public ProviderConfigTransport(string value)
+    public ShellInitProfile(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ProviderConfigTransport"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ShellInitProfile"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>HTTP request/streaming transport.</summary>
-    public static ProviderConfigTransport Http { get; } = new("http");
+    /// <summary>Disable automatic non-interactive profile loading. Explicit initScripts still run.</summary>
+    public static ShellInitProfile None { get; } = new("none");
 
-    /// <summary>WebSocket transport.</summary>
-    public static ProviderConfigTransport Websockets { get; } = new("websockets");
+    /// <summary>Allow automatic non-interactive profile loading when supported. Explicit initScripts still run.</summary>
+    public static ShellInitProfile NonInteractive { get; } = new("non-interactive");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigTransport"/> instances are equivalent.</summary>
-    public static bool operator ==(ProviderConfigTransport left, ProviderConfigTransport right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ShellInitProfile"/> instances are equivalent.</summary>
+    public static bool operator ==(ShellInitProfile left, ShellInitProfile right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigTransport"/> instances are not equivalent.</summary>
-    public static bool operator !=(ProviderConfigTransport left, ProviderConfigTransport right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ShellInitProfile"/> instances are not equivalent.</summary>
+    public static bool operator !=(ShellInitProfile left, ShellInitProfile right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ProviderConfigTransport other && Equals(other);
+    public override bool Equals(object? obj) => obj is ShellInitProfile other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ProviderConfigTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ShellInitProfile other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19651,65 +25771,62 @@ public ProviderConfigTransport(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigTransport}"/> for serializing <see cref="ProviderConfigTransport"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ShellInitProfile}"/> for serializing <see cref="ShellInitProfile"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProviderConfigTransport>
+    public sealed class Converter : JsonConverter<ShellInitProfile>
     {
         /// <inheritdoc />
-        public override ProviderConfigTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ShellInitProfile Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProviderConfigTransport value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ShellInitProfile value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigTransport));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShellInitProfile));
         }
     }
 }
 
 
-/// <summary>Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.</summary>
+/// <summary>Supported built-in shells for initialization scripts.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ProviderConfigType : IEquatable<ProviderConfigType>
+public readonly struct ShellInitScriptShell : IEquatable<ShellInitScriptShell>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ProviderConfigType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ProviderConfigType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ShellInitScriptShell"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ShellInitScriptShell"/>.</param>
     [JsonConstructor]
-    public ProviderConfigType(string value)
+    public ShellInitScriptShell(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ProviderConfigType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ShellInitScriptShell"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Generic OpenAI-compatible API.</summary>
-    public static ProviderConfigType Openai { get; } = new("openai");
-
-    /// <summary>Azure OpenAI Service endpoint.</summary>
-    public static ProviderConfigType Azure { get; } = new("azure");
+    /// <summary>Source the script in the built-in Bash shell on macOS and Linux.</summary>
+    public static ShellInitScriptShell Bash { get; } = new("bash");
 
-    /// <summary>Anthropic API endpoint.</summary>
-    public static ProviderConfigType Anthropic { get; } = new("anthropic");
+    /// <summary>Source the script in the built-in PowerShell shell on Windows.</summary>
+    public static ShellInitScriptShell Powershell { get; } = new("powershell");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigType"/> instances are equivalent.</summary>
-    public static bool operator ==(ProviderConfigType left, ProviderConfigType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ShellInitScriptShell"/> instances are equivalent.</summary>
+    public static bool operator ==(ShellInitScriptShell left, ShellInitScriptShell right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigType"/> instances are not equivalent.</summary>
-    public static bool operator !=(ProviderConfigType left, ProviderConfigType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ShellInitScriptShell"/> instances are not equivalent.</summary>
+    public static bool operator !=(ShellInitScriptShell left, ShellInitScriptShell right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ProviderConfigType other && Equals(other);
+    public override bool Equals(object? obj) => obj is ShellInitScriptShell other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ProviderConfigType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ShellInitScriptShell other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19717,62 +25834,62 @@ public ProviderConfigType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigType}"/> for serializing <see cref="ProviderConfigType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ShellInitScriptShell}"/> for serializing <see cref="ShellInitScriptShell"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProviderConfigType>
+    public sealed class Converter : JsonConverter<ShellInitScriptShell>
     {
         /// <inheritdoc />
-        public override ProviderConfigType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ShellInitScriptShell Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProviderConfigType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ShellInitScriptShell value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShellInitScriptShell));
         }
     }
 }
 
 
-/// <summary>Wire API format (openai/azure only). Defaults to "completions".</summary>
+/// <summary>Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ProviderConfigWireApi : IEquatable<ProviderConfigWireApi>
+public readonly struct OptionsUpdateToolFilterPrecedence : IEquatable<OptionsUpdateToolFilterPrecedence>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ProviderConfigWireApi"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ProviderConfigWireApi"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateToolFilterPrecedence"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="OptionsUpdateToolFilterPrecedence"/>.</param>
     [JsonConstructor]
-    public ProviderConfigWireApi(string value)
+    public OptionsUpdateToolFilterPrecedence(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ProviderConfigWireApi"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="OptionsUpdateToolFilterPrecedence"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>OpenAI Chat Completions wire format.</summary>
-    public static ProviderConfigWireApi Completions { get; } = new("completions");
+    /// <summary>If availableTools is set, it is the only constraint that applies (excludedTools is ignored). Preserves CLI / pre-existing client behavior. Default.</summary>
+    public static OptionsUpdateToolFilterPrecedence Available { get; } = new("available");
 
-    /// <summary>OpenAI Responses API wire format.</summary>
-    public static ProviderConfigWireApi Responses { get; } = new("responses");
+    /// <summary>A tool is enabled if and only if it matches the allowlist (or the allowlist is unset) AND it does not match the denylist. Makes 'all except X' expressible by combining the two lists.</summary>
+    public static OptionsUpdateToolFilterPrecedence Excluded { get; } = new("excluded");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigWireApi"/> instances are equivalent.</summary>
-    public static bool operator ==(ProviderConfigWireApi left, ProviderConfigWireApi right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateToolFilterPrecedence"/> instances are equivalent.</summary>
+    public static bool operator ==(OptionsUpdateToolFilterPrecedence left, OptionsUpdateToolFilterPrecedence right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigWireApi"/> instances are not equivalent.</summary>
-    public static bool operator !=(ProviderConfigWireApi left, ProviderConfigWireApi right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateToolFilterPrecedence"/> instances are not equivalent.</summary>
+    public static bool operator !=(OptionsUpdateToolFilterPrecedence left, OptionsUpdateToolFilterPrecedence right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ProviderConfigWireApi other && Equals(other);
+    public override bool Equals(object? obj) => obj is OptionsUpdateToolFilterPrecedence other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ProviderConfigWireApi other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(OptionsUpdateToolFilterPrecedence other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19780,62 +25897,68 @@ public ProviderConfigWireApi(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigWireApi}"/> for serializing <see cref="ProviderConfigWireApi"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateToolFilterPrecedence}"/> for serializing <see cref="OptionsUpdateToolFilterPrecedence"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProviderConfigWireApi>
+    public sealed class Converter : JsonConverter<OptionsUpdateToolFilterPrecedence>
     {
         /// <inheritdoc />
-        public override ProviderConfigWireApi Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override OptionsUpdateToolFilterPrecedence Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProviderConfigWireApi value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, OptionsUpdateToolFilterPrecedence value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigWireApi));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateToolFilterPrecedence));
         }
     }
 }
 
 
-/// <summary>Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.</summary>
+/// <summary>Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin (installed plugin), or session (session-state/&lt;id&gt;/extensions/).</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct OptionsUpdateAdditionalContentExclusionPolicyScope : IEquatable<OptionsUpdateAdditionalContentExclusionPolicyScope>
+public readonly struct ExtensionSource : IEquatable<ExtensionSource>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ExtensionSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ExtensionSource"/>.</param>
     [JsonConstructor]
-    public OptionsUpdateAdditionalContentExclusionPolicyScope(string value)
+    public ExtensionSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ExtensionSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The content exclusion policy applies to the current repository.</summary>
-    public static OptionsUpdateAdditionalContentExclusionPolicyScope Repo { get; } = new("repo");
+    /// <summary>Extension discovered from the current project's .github/extensions directory.</summary>
+    public static ExtensionSource Project { get; } = new("project");
 
-    /// <summary>The content exclusion policy applies across all repositories.</summary>
-    public static OptionsUpdateAdditionalContentExclusionPolicyScope All { get; } = new("all");
+    /// <summary>Extension discovered from the user's ~/.copilot/extensions directory.</summary>
+    public static ExtensionSource User { get; } = new("user");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances are equivalent.</summary>
-    public static bool operator ==(OptionsUpdateAdditionalContentExclusionPolicyScope left, OptionsUpdateAdditionalContentExclusionPolicyScope right) => left.Equals(right);
+    /// <summary>Extension contributed by an installed plugin.</summary>
+    public static ExtensionSource Plugin { get; } = new("plugin");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances are not equivalent.</summary>
-    public static bool operator !=(OptionsUpdateAdditionalContentExclusionPolicyScope left, OptionsUpdateAdditionalContentExclusionPolicyScope right) => !(left == right);
+    /// <summary>Extension discovered from the current session's state directory (loaded only for this session).</summary>
+    public static ExtensionSource Session { get; } = new("session");
+
+    /// <summary>Returns a value indicating whether two <see cref="ExtensionSource"/> instances are equivalent.</summary>
+    public static bool operator ==(ExtensionSource left, ExtensionSource right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ExtensionSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(ExtensionSource left, ExtensionSource right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is OptionsUpdateAdditionalContentExclusionPolicyScope other && Equals(other);
+    public override bool Equals(object? obj) => obj is ExtensionSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(OptionsUpdateAdditionalContentExclusionPolicyScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ExtensionSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19843,62 +25966,68 @@ public OptionsUpdateAdditionalContentExclusionPolicyScope(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateAdditionalContentExclusionPolicyScope}"/> for serializing <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ExtensionSource}"/> for serializing <see cref="ExtensionSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<OptionsUpdateAdditionalContentExclusionPolicyScope>
+    public sealed class Converter : JsonConverter<ExtensionSource>
     {
         /// <inheritdoc />
-        public override OptionsUpdateAdditionalContentExclusionPolicyScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ExtensionSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, OptionsUpdateAdditionalContentExclusionPolicyScope value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ExtensionSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateAdditionalContentExclusionPolicyScope));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExtensionSource));
         }
     }
 }
 
 
-/// <summary>Context tier for models with tiered pricing. The session uses this to derive effective `modelCapabilitiesOverrides` so compaction, truncation, token display, and request limits honor the selected tier.</summary>
+/// <summary>Current status: running, disabled, failed, or starting.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct OptionsUpdateContextTier : IEquatable<OptionsUpdateContextTier>
+public readonly struct ExtensionStatus : IEquatable<ExtensionStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateContextTier"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="OptionsUpdateContextTier"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ExtensionStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ExtensionStatus"/>.</param>
     [JsonConstructor]
-    public OptionsUpdateContextTier(string value)
+    public ExtensionStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="OptionsUpdateContextTier"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ExtensionStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Use the model's default context tier and its standard token limits / pricing.</summary>
-    public static OptionsUpdateContextTier Default { get; } = new("default");
+    /// <summary>The extension process is running.</summary>
+    public static ExtensionStatus Running { get; } = new("running");
 
-    /// <summary>Use the model's long-context tier (when available) so larger inputs are accepted and tier-specific pricing applies.</summary>
-    public static OptionsUpdateContextTier LongContext { get; } = new("long_context");
+    /// <summary>The extension is installed but disabled.</summary>
+    public static ExtensionStatus Disabled { get; } = new("disabled");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateContextTier"/> instances are equivalent.</summary>
-    public static bool operator ==(OptionsUpdateContextTier left, OptionsUpdateContextTier right) => left.Equals(right);
+    /// <summary>The extension failed to start or crashed.</summary>
+    public static ExtensionStatus Failed { get; } = new("failed");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateContextTier"/> instances are not equivalent.</summary>
-    public static bool operator !=(OptionsUpdateContextTier left, OptionsUpdateContextTier right) => !(left == right);
+    /// <summary>The extension process is starting.</summary>
+    public static ExtensionStatus Starting { get; } = new("starting");
+
+    /// <summary>Returns a value indicating whether two <see cref="ExtensionStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(ExtensionStatus left, ExtensionStatus right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ExtensionStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(ExtensionStatus left, ExtensionStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is OptionsUpdateContextTier other && Equals(other);
+    public override bool Equals(object? obj) => obj is ExtensionStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(OptionsUpdateContextTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ExtensionStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19906,62 +26035,65 @@ public OptionsUpdateContextTier(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateContextTier}"/> for serializing <see cref="OptionsUpdateContextTier"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ExtensionStatus}"/> for serializing <see cref="ExtensionStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<OptionsUpdateContextTier>
+    public sealed class Converter : JsonConverter<ExtensionStatus>
     {
         /// <inheritdoc />
-        public override OptionsUpdateContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ExtensionStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, OptionsUpdateContextTier value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ExtensionStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateContextTier));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExtensionStatus));
         }
     }
 }
 
 
-/// <summary>How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch).</summary>
+/// <summary>Type of GitHub reference.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct OptionsUpdateEnvValueMode : IEquatable<OptionsUpdateEnvValueMode>
+public readonly struct PushAttachmentGitHubReferenceType : IEquatable<PushAttachmentGitHubReferenceType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateEnvValueMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="OptionsUpdateEnvValueMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="PushAttachmentGitHubReferenceType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PushAttachmentGitHubReferenceType"/>.</param>
     [JsonConstructor]
-    public OptionsUpdateEnvValueMode(string value)
+    public PushAttachmentGitHubReferenceType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="OptionsUpdateEnvValueMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PushAttachmentGitHubReferenceType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Pass MCP server environment values as literal strings.</summary>
-    public static OptionsUpdateEnvValueMode Direct { get; } = new("direct");
+    /// <summary>GitHub issue reference.</summary>
+    public static PushAttachmentGitHubReferenceType Issue { get; } = new("issue");
 
-    /// <summary>Resolve MCP server environment values from host-side references.</summary>
-    public static OptionsUpdateEnvValueMode Indirect { get; } = new("indirect");
+    /// <summary>GitHub pull request reference.</summary>
+    public static PushAttachmentGitHubReferenceType Pr { get; } = new("pr");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateEnvValueMode"/> instances are equivalent.</summary>
-    public static bool operator ==(OptionsUpdateEnvValueMode left, OptionsUpdateEnvValueMode right) => left.Equals(right);
+    /// <summary>GitHub discussion reference.</summary>
+    public static PushAttachmentGitHubReferenceType Discussion { get; } = new("discussion");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateEnvValueMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(OptionsUpdateEnvValueMode left, OptionsUpdateEnvValueMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="PushAttachmentGitHubReferenceType"/> instances are equivalent.</summary>
+    public static bool operator ==(PushAttachmentGitHubReferenceType left, PushAttachmentGitHubReferenceType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="PushAttachmentGitHubReferenceType"/> instances are not equivalent.</summary>
+    public static bool operator !=(PushAttachmentGitHubReferenceType left, PushAttachmentGitHubReferenceType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is OptionsUpdateEnvValueMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is PushAttachmentGitHubReferenceType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(OptionsUpdateEnvValueMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PushAttachmentGitHubReferenceType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -19969,65 +26101,59 @@ public OptionsUpdateEnvValueMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateEnvValueMode}"/> for serializing <see cref="OptionsUpdateEnvValueMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PushAttachmentGitHubReferenceType}"/> for serializing <see cref="PushAttachmentGitHubReferenceType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<OptionsUpdateEnvValueMode>
+    public sealed class Converter : JsonConverter<PushAttachmentGitHubReferenceType>
     {
         /// <inheritdoc />
-        public override OptionsUpdateEnvValueMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PushAttachmentGitHubReferenceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, OptionsUpdateEnvValueMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PushAttachmentGitHubReferenceType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateEnvValueMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PushAttachmentGitHubReferenceType));
         }
     }
 }
 
 
-/// <summary>Reasoning summary mode for supported model clients.</summary>
+/// <summary>Custom input-format kind.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct OptionsUpdateReasoningSummary : IEquatable<OptionsUpdateReasoningSummary>
+public readonly struct BuiltinToolFormatType : IEquatable<BuiltinToolFormatType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateReasoningSummary"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="OptionsUpdateReasoningSummary"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="BuiltinToolFormatType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="BuiltinToolFormatType"/>.</param>
     [JsonConstructor]
-    public OptionsUpdateReasoningSummary(string value)
+    public BuiltinToolFormatType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="OptionsUpdateReasoningSummary"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="BuiltinToolFormatType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Do not request reasoning summaries from the model.</summary>
-    public static OptionsUpdateReasoningSummary None { get; } = new("none");
-
-    /// <summary>Request a concise summary of model reasoning.</summary>
-    public static OptionsUpdateReasoningSummary Concise { get; } = new("concise");
-
-    /// <summary>Request a detailed summary of model reasoning.</summary>
-    public static OptionsUpdateReasoningSummary Detailed { get; } = new("detailed");
+    /// <summary>The tool input is parsed with the supplied grammar.</summary>
+    public static BuiltinToolFormatType Grammar { get; } = new("grammar");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateReasoningSummary"/> instances are equivalent.</summary>
-    public static bool operator ==(OptionsUpdateReasoningSummary left, OptionsUpdateReasoningSummary right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="BuiltinToolFormatType"/> instances are equivalent.</summary>
+    public static bool operator ==(BuiltinToolFormatType left, BuiltinToolFormatType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateReasoningSummary"/> instances are not equivalent.</summary>
-    public static bool operator !=(OptionsUpdateReasoningSummary left, OptionsUpdateReasoningSummary right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="BuiltinToolFormatType"/> instances are not equivalent.</summary>
+    public static bool operator !=(BuiltinToolFormatType left, BuiltinToolFormatType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is OptionsUpdateReasoningSummary other && Equals(other);
+    public override bool Equals(object? obj) => obj is BuiltinToolFormatType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(OptionsUpdateReasoningSummary other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(BuiltinToolFormatType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20035,89 +26161,59 @@ public OptionsUpdateReasoningSummary(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateReasoningSummary}"/> for serializing <see cref="OptionsUpdateReasoningSummary"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{BuiltinToolFormatType}"/> for serializing <see cref="BuiltinToolFormatType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<OptionsUpdateReasoningSummary>
+    public sealed class Converter : JsonConverter<BuiltinToolFormatType>
     {
         /// <inheritdoc />
-        public override OptionsUpdateReasoningSummary Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override BuiltinToolFormatType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, OptionsUpdateReasoningSummary value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, BuiltinToolFormatType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateReasoningSummary));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(BuiltinToolFormatType));
         }
     }
 }
 
 
-/// <summary>Session capability enabled for this session.</summary>
+/// <summary>Root JSON Schema type for a built-in tool input.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionCapability : IEquatable<SessionCapability>
+public readonly struct BuiltinToolInputSchemaType : IEquatable<BuiltinToolInputSchemaType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionCapability"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionCapability"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="BuiltinToolInputSchemaType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="BuiltinToolInputSchemaType"/>.</param>
     [JsonConstructor]
-    public SessionCapability(string value)
+    public BuiltinToolInputSchemaType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionCapability"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="BuiltinToolInputSchemaType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>TUI-specific prompt hints such as keyboard shortcuts.</summary>
-    public static SessionCapability TuiHints { get; } = new("tui-hints");
-
-    /// <summary>Plan-mode handling and instructions.</summary>
-    public static SessionCapability PlanMode { get; } = new("plan-mode");
-
-    /// <summary>Memory tool and memories prompt section.</summary>
-    public static SessionCapability Memory { get; } = new("memory");
-
-    /// <summary>Copilot CLI documentation tool and prompt section.</summary>
-    public static SessionCapability CliDocumentation { get; } = new("cli-documentation");
-
-    /// <summary>Interactive ask_user tool support.</summary>
-    public static SessionCapability AskUser { get; } = new("ask-user");
-
-    /// <summary>Interactive CLI identity and behavior.</summary>
-    public static SessionCapability InteractiveMode { get; } = new("interactive-mode");
-
-    /// <summary>Automatic hidden system notifications.</summary>
-    public static SessionCapability SystemNotifications { get; } = new("system-notifications");
-
-    /// <summary>SDK elicitation support.</summary>
-    public static SessionCapability Elicitation { get; } = new("elicitation");
-
-    /// <summary>Cross-session history tools and session-store SQL prompt/tool metadata.</summary>
-    public static SessionCapability SessionStore { get; } = new("session-store");
-
-    /// <summary>MCP Apps UI passthrough.</summary>
-    public static SessionCapability McpApps { get; } = new("mcp-apps");
-
-    /// <summary>Host-provided canvas rendering support.</summary>
-    public static SessionCapability CanvasRenderer { get; } = new("canvas-renderer");
+    /// <summary>The tool accepts a JSON object.</summary>
+    public static BuiltinToolInputSchemaType Object { get; } = new("object");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionCapability"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionCapability left, SessionCapability right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="BuiltinToolInputSchemaType"/> instances are equivalent.</summary>
+    public static bool operator ==(BuiltinToolInputSchemaType left, BuiltinToolInputSchemaType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionCapability"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionCapability left, SessionCapability right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="BuiltinToolInputSchemaType"/> instances are not equivalent.</summary>
+    public static bool operator !=(BuiltinToolInputSchemaType left, BuiltinToolInputSchemaType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionCapability other && Equals(other);
+    public override bool Equals(object? obj) => obj is BuiltinToolInputSchemaType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionCapability other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(BuiltinToolInputSchemaType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20125,62 +26221,62 @@ public SessionCapability(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionCapability}"/> for serializing <see cref="SessionCapability"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{BuiltinToolInputSchemaType}"/> for serializing <see cref="BuiltinToolInputSchemaType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionCapability>
+    public sealed class Converter : JsonConverter<BuiltinToolInputSchemaType>
     {
         /// <inheritdoc />
-        public override SessionCapability Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override BuiltinToolInputSchemaType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionCapability value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, BuiltinToolInputSchemaType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionCapability));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(BuiltinToolInputSchemaType));
         }
     }
 }
 
 
-/// <summary>Controls automatic non-interactive profile loading where supported. Explicit initScripts are unaffected.</summary>
+/// <summary>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ShellInitProfile : IEquatable<ShellInitProfile>
+public readonly struct ExternalToolTextResultForLlmBinaryResultsForLlmType : IEquatable<ExternalToolTextResultForLlmBinaryResultsForLlmType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ShellInitProfile"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ShellInitProfile"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ExternalToolTextResultForLlmBinaryResultsForLlmType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ExternalToolTextResultForLlmBinaryResultsForLlmType"/>.</param>
     [JsonConstructor]
-    public ShellInitProfile(string value)
+    public ExternalToolTextResultForLlmBinaryResultsForLlmType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ShellInitProfile"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ExternalToolTextResultForLlmBinaryResultsForLlmType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Disable automatic non-interactive profile loading. Explicit initScripts still run.</summary>
-    public static ShellInitProfile None { get; } = new("none");
+    /// <summary>Binary image data.</summary>
+    public static ExternalToolTextResultForLlmBinaryResultsForLlmType Image { get; } = new("image");
 
-    /// <summary>Allow automatic non-interactive profile loading when supported. Explicit initScripts still run.</summary>
-    public static ShellInitProfile NonInteractive { get; } = new("non-interactive");
+    /// <summary>Other binary resource data.</summary>
+    public static ExternalToolTextResultForLlmBinaryResultsForLlmType Resource { get; } = new("resource");
 
-    /// <summary>Returns a value indicating whether two <see cref="ShellInitProfile"/> instances are equivalent.</summary>
-    public static bool operator ==(ShellInitProfile left, ShellInitProfile right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ExternalToolTextResultForLlmBinaryResultsForLlmType"/> instances are equivalent.</summary>
+    public static bool operator ==(ExternalToolTextResultForLlmBinaryResultsForLlmType left, ExternalToolTextResultForLlmBinaryResultsForLlmType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ShellInitProfile"/> instances are not equivalent.</summary>
-    public static bool operator !=(ShellInitProfile left, ShellInitProfile right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ExternalToolTextResultForLlmBinaryResultsForLlmType"/> instances are not equivalent.</summary>
+    public static bool operator !=(ExternalToolTextResultForLlmBinaryResultsForLlmType left, ExternalToolTextResultForLlmBinaryResultsForLlmType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ShellInitProfile other && Equals(other);
+    public override bool Equals(object? obj) => obj is ExternalToolTextResultForLlmBinaryResultsForLlmType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ShellInitProfile other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ExternalToolTextResultForLlmBinaryResultsForLlmType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20188,62 +26284,62 @@ public ShellInitProfile(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ShellInitProfile}"/> for serializing <see cref="ShellInitProfile"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ExternalToolTextResultForLlmBinaryResultsForLlmType}"/> for serializing <see cref="ExternalToolTextResultForLlmBinaryResultsForLlmType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ShellInitProfile>
+    public sealed class Converter : JsonConverter<ExternalToolTextResultForLlmBinaryResultsForLlmType>
     {
         /// <inheritdoc />
-        public override ShellInitProfile Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ExternalToolTextResultForLlmBinaryResultsForLlmType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ShellInitProfile value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ExternalToolTextResultForLlmBinaryResultsForLlmType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShellInitProfile));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExternalToolTextResultForLlmBinaryResultsForLlmType));
         }
     }
 }
 
 
-/// <summary>Supported built-in shells for initialization scripts.</summary>
+/// <summary>Theme variant this icon is intended for.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ShellInitScriptShell : IEquatable<ShellInitScriptShell>
+public readonly struct ExternalToolTextResultForLlmContentResourceLinkIconTheme : IEquatable<ExternalToolTextResultForLlmContentResourceLinkIconTheme>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ShellInitScriptShell"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ShellInitScriptShell"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ExternalToolTextResultForLlmContentResourceLinkIconTheme"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ExternalToolTextResultForLlmContentResourceLinkIconTheme"/>.</param>
     [JsonConstructor]
-    public ShellInitScriptShell(string value)
+    public ExternalToolTextResultForLlmContentResourceLinkIconTheme(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ShellInitScriptShell"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ExternalToolTextResultForLlmContentResourceLinkIconTheme"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Source the script in the built-in Bash shell on macOS and Linux.</summary>
-    public static ShellInitScriptShell Bash { get; } = new("bash");
+    /// <summary>Icon intended for light themes.</summary>
+    public static ExternalToolTextResultForLlmContentResourceLinkIconTheme Light { get; } = new("light");
 
-    /// <summary>Source the script in the built-in PowerShell shell on Windows.</summary>
-    public static ShellInitScriptShell Powershell { get; } = new("powershell");
+    /// <summary>Icon intended for dark themes.</summary>
+    public static ExternalToolTextResultForLlmContentResourceLinkIconTheme Dark { get; } = new("dark");
 
-    /// <summary>Returns a value indicating whether two <see cref="ShellInitScriptShell"/> instances are equivalent.</summary>
-    public static bool operator ==(ShellInitScriptShell left, ShellInitScriptShell right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ExternalToolTextResultForLlmContentResourceLinkIconTheme"/> instances are equivalent.</summary>
+    public static bool operator ==(ExternalToolTextResultForLlmContentResourceLinkIconTheme left, ExternalToolTextResultForLlmContentResourceLinkIconTheme right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ShellInitScriptShell"/> instances are not equivalent.</summary>
-    public static bool operator !=(ShellInitScriptShell left, ShellInitScriptShell right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ExternalToolTextResultForLlmContentResourceLinkIconTheme"/> instances are not equivalent.</summary>
+    public static bool operator !=(ExternalToolTextResultForLlmContentResourceLinkIconTheme left, ExternalToolTextResultForLlmContentResourceLinkIconTheme right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ShellInitScriptShell other && Equals(other);
+    public override bool Equals(object? obj) => obj is ExternalToolTextResultForLlmContentResourceLinkIconTheme other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ShellInitScriptShell other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ExternalToolTextResultForLlmContentResourceLinkIconTheme other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20251,62 +26347,71 @@ public ShellInitScriptShell(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ShellInitScriptShell}"/> for serializing <see cref="ShellInitScriptShell"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ExternalToolTextResultForLlmContentResourceLinkIconTheme}"/> for serializing <see cref="ExternalToolTextResultForLlmContentResourceLinkIconTheme"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ShellInitScriptShell>
+    public sealed class Converter : JsonConverter<ExternalToolTextResultForLlmContentResourceLinkIconTheme>
     {
         /// <inheritdoc />
-        public override ShellInitScriptShell Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ExternalToolTextResultForLlmContentResourceLinkIconTheme Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ShellInitScriptShell value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ExternalToolTextResultForLlmContentResourceLinkIconTheme value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShellInitScriptShell));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExternalToolTextResultForLlmContentResourceLinkIconTheme));
         }
     }
 }
 
 
-/// <summary>Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.</summary>
+/// <summary>Execution outcome classification.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct OptionsUpdateToolFilterPrecedence : IEquatable<OptionsUpdateToolFilterPrecedence>
+public readonly struct ToolResultType : IEquatable<ToolResultType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateToolFilterPrecedence"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="OptionsUpdateToolFilterPrecedence"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ToolResultType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ToolResultType"/>.</param>
     [JsonConstructor]
-    public OptionsUpdateToolFilterPrecedence(string value)
+    public ToolResultType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="OptionsUpdateToolFilterPrecedence"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ToolResultType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>If availableTools is set, it is the only constraint that applies (excludedTools is ignored). Preserves CLI / pre-existing client behavior. Default.</summary>
-    public static OptionsUpdateToolFilterPrecedence Available { get; } = new("available");
+    /// <summary>The tool completed successfully.</summary>
+    public static ToolResultType Success { get; } = new("success");
 
-    /// <summary>A tool is enabled if and only if it matches the allowlist (or the allowlist is unset) AND it does not match the denylist. Makes 'all except X' expressible by combining the two lists.</summary>
-    public static OptionsUpdateToolFilterPrecedence Excluded { get; } = new("excluded");
+    /// <summary>The tool failed.</summary>
+    public static ToolResultType Failure { get; } = new("failure");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateToolFilterPrecedence"/> instances are equivalent.</summary>
-    public static bool operator ==(OptionsUpdateToolFilterPrecedence left, OptionsUpdateToolFilterPrecedence right) => left.Equals(right);
+    /// <summary>The tool exceeded its execution timeout.</summary>
+    public static ToolResultType Timeout { get; } = new("timeout");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateToolFilterPrecedence"/> instances are not equivalent.</summary>
-    public static bool operator !=(OptionsUpdateToolFilterPrecedence left, OptionsUpdateToolFilterPrecedence right) => !(left == right);
+    /// <summary>The tool request was rejected before execution.</summary>
+    public static ToolResultType Rejected { get; } = new("rejected");
+
+    /// <summary>Permission policy denied the tool request.</summary>
+    public static ToolResultType Denied { get; } = new("denied");
+
+    /// <summary>Returns a value indicating whether two <see cref="ToolResultType"/> instances are equivalent.</summary>
+    public static bool operator ==(ToolResultType left, ToolResultType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ToolResultType"/> instances are not equivalent.</summary>
+    public static bool operator !=(ToolResultType left, ToolResultType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is OptionsUpdateToolFilterPrecedence other && Equals(other);
+    public override bool Equals(object? obj) => obj is ToolResultType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(OptionsUpdateToolFilterPrecedence other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ToolResultType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20314,68 +26419,62 @@ public OptionsUpdateToolFilterPrecedence(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateToolFilterPrecedence}"/> for serializing <see cref="OptionsUpdateToolFilterPrecedence"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ToolResultType}"/> for serializing <see cref="ToolResultType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<OptionsUpdateToolFilterPrecedence>
+    public sealed class Converter : JsonConverter<ToolResultType>
     {
         /// <inheritdoc />
-        public override OptionsUpdateToolFilterPrecedence Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ToolResultType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, OptionsUpdateToolFilterPrecedence value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ToolResultType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateToolFilterPrecedence));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ToolResultType));
         }
     }
 }
 
 
-/// <summary>Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin (installed plugin), or session (session-state/&lt;id&gt;/extensions/).</summary>
+/// <summary>Controls whether the runtime may defer loading an external tool definition.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ExtensionSource : IEquatable<ExtensionSource>
+public readonly struct ProtocolExternalToolDefer : IEquatable<ProtocolExternalToolDefer>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ExtensionSource"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ExtensionSource"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProtocolExternalToolDefer"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProtocolExternalToolDefer"/>.</param>
     [JsonConstructor]
-    public ExtensionSource(string value)
+    public ProtocolExternalToolDefer(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ExtensionSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProtocolExternalToolDefer"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Extension discovered from the current project's .github/extensions directory.</summary>
-    public static ExtensionSource Project { get; } = new("project");
-
-    /// <summary>Extension discovered from the user's ~/.copilot/extensions directory.</summary>
-    public static ExtensionSource User { get; } = new("user");
-
-    /// <summary>Extension contributed by an installed plugin.</summary>
-    public static ExtensionSource Plugin { get; } = new("plugin");
+    /// <summary>The runtime may defer the tool according to its tool-loading policy.</summary>
+    public static ProtocolExternalToolDefer Auto { get; } = new("auto");
 
-    /// <summary>Extension discovered from the current session's state directory (loaded only for this session).</summary>
-    public static ExtensionSource Session { get; } = new("session");
+    /// <summary>The runtime must include the tool without deferring it.</summary>
+    public static ProtocolExternalToolDefer Never { get; } = new("never");
 
-    /// <summary>Returns a value indicating whether two <see cref="ExtensionSource"/> instances are equivalent.</summary>
-    public static bool operator ==(ExtensionSource left, ExtensionSource right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ProtocolExternalToolDefer"/> instances are equivalent.</summary>
+    public static bool operator ==(ProtocolExternalToolDefer left, ProtocolExternalToolDefer right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ExtensionSource"/> instances are not equivalent.</summary>
-    public static bool operator !=(ExtensionSource left, ExtensionSource right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProtocolExternalToolDefer"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProtocolExternalToolDefer left, ProtocolExternalToolDefer right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ExtensionSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProtocolExternalToolDefer other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ExtensionSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProtocolExternalToolDefer other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20383,68 +26482,65 @@ public ExtensionSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ExtensionSource}"/> for serializing <see cref="ExtensionSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProtocolExternalToolDefer}"/> for serializing <see cref="ProtocolExternalToolDefer"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ExtensionSource>
+    public sealed class Converter : JsonConverter<ProtocolExternalToolDefer>
     {
         /// <inheritdoc />
-        public override ExtensionSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProtocolExternalToolDefer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ExtensionSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProtocolExternalToolDefer value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExtensionSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProtocolExternalToolDefer));
         }
     }
 }
 
 
-/// <summary>Current status: running, disabled, failed, or starting.</summary>
+/// <summary>Context tier override for matching subagents.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ExtensionStatus : IEquatable<ExtensionStatus>
+public readonly struct SubagentSettingsEntryContextTier : IEquatable<SubagentSettingsEntryContextTier>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ExtensionStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ExtensionStatus"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SubagentSettingsEntryContextTier"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SubagentSettingsEntryContextTier"/>.</param>
     [JsonConstructor]
-    public ExtensionStatus(string value)
+    public SubagentSettingsEntryContextTier(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ExtensionStatus"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SubagentSettingsEntryContextTier"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The extension process is running.</summary>
-    public static ExtensionStatus Running { get; } = new("running");
-
-    /// <summary>The extension is installed but disabled.</summary>
-    public static ExtensionStatus Disabled { get; } = new("disabled");
+    /// <summary>Inherit the parent session's effective context tier at dispatch time.</summary>
+    public static SubagentSettingsEntryContextTier Inherit { get; } = new("inherit");
 
-    /// <summary>The extension failed to start or crashed.</summary>
-    public static ExtensionStatus Failed { get; } = new("failed");
+    /// <summary>Use the model's default context window.</summary>
+    public static SubagentSettingsEntryContextTier Default { get; } = new("default");
 
-    /// <summary>The extension process is starting.</summary>
-    public static ExtensionStatus Starting { get; } = new("starting");
+    /// <summary>Pin the subagent to the long-context tier when supported.</summary>
+    public static SubagentSettingsEntryContextTier LongContext { get; } = new("long_context");
 
-    /// <summary>Returns a value indicating whether two <see cref="ExtensionStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(ExtensionStatus left, ExtensionStatus right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SubagentSettingsEntryContextTier"/> instances are equivalent.</summary>
+    public static bool operator ==(SubagentSettingsEntryContextTier left, SubagentSettingsEntryContextTier right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ExtensionStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(ExtensionStatus left, ExtensionStatus right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SubagentSettingsEntryContextTier"/> instances are not equivalent.</summary>
+    public static bool operator !=(SubagentSettingsEntryContextTier left, SubagentSettingsEntryContextTier right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ExtensionStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is SubagentSettingsEntryContextTier other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ExtensionStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SubagentSettingsEntryContextTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20452,65 +26548,59 @@ public ExtensionStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ExtensionStatus}"/> for serializing <see cref="ExtensionStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SubagentSettingsEntryContextTier}"/> for serializing <see cref="SubagentSettingsEntryContextTier"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ExtensionStatus>
+    public sealed class Converter : JsonConverter<SubagentSettingsEntryContextTier>
     {
         /// <inheritdoc />
-        public override ExtensionStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SubagentSettingsEntryContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ExtensionStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SubagentSettingsEntryContextTier value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExtensionStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SubagentSettingsEntryContextTier));
         }
     }
 }
 
 
-/// <summary>Type of GitHub reference.</summary>
+/// <summary>Defines the allowed values.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PushAttachmentGitHubReferenceType : IEquatable<PushAttachmentGitHubReferenceType>
+public readonly struct CommandsInvocationOrigin : IEquatable<CommandsInvocationOrigin>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PushAttachmentGitHubReferenceType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PushAttachmentGitHubReferenceType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="CommandsInvocationOrigin"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CommandsInvocationOrigin"/>.</param>
     [JsonConstructor]
-    public PushAttachmentGitHubReferenceType(string value)
+    public CommandsInvocationOrigin(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PushAttachmentGitHubReferenceType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="CommandsInvocationOrigin"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>GitHub issue reference.</summary>
-    public static PushAttachmentGitHubReferenceType Issue { get; } = new("issue");
-
-    /// <summary>GitHub pull request reference.</summary>
-    public static PushAttachmentGitHubReferenceType Pr { get; } = new("pr");
-
-    /// <summary>GitHub discussion reference.</summary>
-    public static PushAttachmentGitHubReferenceType Discussion { get; } = new("discussion");
+    /// <summary>Gets the <c>settings</c> value.</summary>
+    public static CommandsInvocationOrigin Settings { get; } = new("settings");
 
-    /// <summary>Returns a value indicating whether two <see cref="PushAttachmentGitHubReferenceType"/> instances are equivalent.</summary>
-    public static bool operator ==(PushAttachmentGitHubReferenceType left, PushAttachmentGitHubReferenceType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="CommandsInvocationOrigin"/> instances are equivalent.</summary>
+    public static bool operator ==(CommandsInvocationOrigin left, CommandsInvocationOrigin right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="PushAttachmentGitHubReferenceType"/> instances are not equivalent.</summary>
-    public static bool operator !=(PushAttachmentGitHubReferenceType left, PushAttachmentGitHubReferenceType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="CommandsInvocationOrigin"/> instances are not equivalent.</summary>
+    public static bool operator !=(CommandsInvocationOrigin left, CommandsInvocationOrigin right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PushAttachmentGitHubReferenceType other && Equals(other);
+    public override bool Equals(object? obj) => obj is CommandsInvocationOrigin other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PushAttachmentGitHubReferenceType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(CommandsInvocationOrigin other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20518,65 +26608,62 @@ public PushAttachmentGitHubReferenceType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PushAttachmentGitHubReferenceType}"/> for serializing <see cref="PushAttachmentGitHubReferenceType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{CommandsInvocationOrigin}"/> for serializing <see cref="CommandsInvocationOrigin"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PushAttachmentGitHubReferenceType>
+    public sealed class Converter : JsonConverter<CommandsInvocationOrigin>
     {
         /// <inheritdoc />
-        public override PushAttachmentGitHubReferenceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override CommandsInvocationOrigin Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PushAttachmentGitHubReferenceType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, CommandsInvocationOrigin value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PushAttachmentGitHubReferenceType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CommandsInvocationOrigin));
         }
     }
 }
 
 
-/// <summary>Context tier override for matching subagents.</summary>
+/// <summary>Whether a pending slash-command invocation effect was applied or cancelled by the host.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SubagentSettingsEntryContextTier : IEquatable<SubagentSettingsEntryContextTier>
+public readonly struct CommandsInvocationEffectOutcome : IEquatable<CommandsInvocationEffectOutcome>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SubagentSettingsEntryContextTier"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SubagentSettingsEntryContextTier"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="CommandsInvocationEffectOutcome"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="CommandsInvocationEffectOutcome"/>.</param>
     [JsonConstructor]
-    public SubagentSettingsEntryContextTier(string value)
+    public CommandsInvocationEffectOutcome(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SubagentSettingsEntryContextTier"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="CommandsInvocationEffectOutcome"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Inherit the parent session's effective context tier at dispatch time.</summary>
-    public static SubagentSettingsEntryContextTier Inherit { get; } = new("inherit");
-
-    /// <summary>Use the model's default context window.</summary>
-    public static SubagentSettingsEntryContextTier Default { get; } = new("default");
+    /// <summary>The host applied the pending invocation effect.</summary>
+    public static CommandsInvocationEffectOutcome Applied { get; } = new("applied");
 
-    /// <summary>Pin the subagent to the long-context tier when supported.</summary>
-    public static SubagentSettingsEntryContextTier LongContext { get; } = new("long_context");
+    /// <summary>The host cancelled the pending invocation effect, so any provisional state must be reverted.</summary>
+    public static CommandsInvocationEffectOutcome Cancelled { get; } = new("cancelled");
 
-    /// <summary>Returns a value indicating whether two <see cref="SubagentSettingsEntryContextTier"/> instances are equivalent.</summary>
-    public static bool operator ==(SubagentSettingsEntryContextTier left, SubagentSettingsEntryContextTier right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="CommandsInvocationEffectOutcome"/> instances are equivalent.</summary>
+    public static bool operator ==(CommandsInvocationEffectOutcome left, CommandsInvocationEffectOutcome right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SubagentSettingsEntryContextTier"/> instances are not equivalent.</summary>
-    public static bool operator !=(SubagentSettingsEntryContextTier left, SubagentSettingsEntryContextTier right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="CommandsInvocationEffectOutcome"/> instances are not equivalent.</summary>
+    public static bool operator !=(CommandsInvocationEffectOutcome left, CommandsInvocationEffectOutcome right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SubagentSettingsEntryContextTier other && Equals(other);
+    public override bool Equals(object? obj) => obj is CommandsInvocationEffectOutcome other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SubagentSettingsEntryContextTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(CommandsInvocationEffectOutcome other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20584,20 +26671,20 @@ public SubagentSettingsEntryContextTier(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SubagentSettingsEntryContextTier}"/> for serializing <see cref="SubagentSettingsEntryContextTier"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{CommandsInvocationEffectOutcome}"/> for serializing <see cref="CommandsInvocationEffectOutcome"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SubagentSettingsEntryContextTier>
+    public sealed class Converter : JsonConverter<CommandsInvocationEffectOutcome>
     {
         /// <inheritdoc />
-        public override SubagentSettingsEntryContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override CommandsInvocationEffectOutcome Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SubagentSettingsEntryContextTier value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, CommandsInvocationEffectOutcome value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SubagentSettingsEntryContextTier));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CommandsInvocationEffectOutcome));
         }
     }
 }
@@ -20629,20 +26716,80 @@ public UIElicitationResponseAction(string value)
     /// <summary>The user explicitly declined to provide the requested input.</summary>
     public static UIElicitationResponseAction Decline { get; } = new("decline");
 
-    /// <summary>The user dismissed the elicitation request.</summary>
-    public static UIElicitationResponseAction Cancel { get; } = new("cancel");
+    /// <summary>The user dismissed the elicitation request.</summary>
+    public static UIElicitationResponseAction Cancel { get; } = new("cancel");
+
+    /// <summary>Returns a value indicating whether two <see cref="UIElicitationResponseAction"/> instances are equivalent.</summary>
+    public static bool operator ==(UIElicitationResponseAction left, UIElicitationResponseAction right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="UIElicitationResponseAction"/> instances are not equivalent.</summary>
+    public static bool operator !=(UIElicitationResponseAction left, UIElicitationResponseAction right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is UIElicitationResponseAction other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(UIElicitationResponseAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{UIElicitationResponseAction}"/> for serializing <see cref="UIElicitationResponseAction"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<UIElicitationResponseAction>
+    {
+        /// <inheritdoc />
+        public override UIElicitationResponseAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, UIElicitationResponseAction value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UIElicitationResponseAction));
+        }
+    }
+}
+
+
+/// <summary>Structured MCP elicitation mode.</summary>
+[Experimental(Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct McpElicitationFormMode : IEquatable<McpElicitationFormMode>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="McpElicitationFormMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="McpElicitationFormMode"/>.</param>
+    [JsonConstructor]
+    public McpElicitationFormMode(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="McpElicitationFormMode"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Returns a value indicating whether two <see cref="UIElicitationResponseAction"/> instances are equivalent.</summary>
-    public static bool operator ==(UIElicitationResponseAction left, UIElicitationResponseAction right) => left.Equals(right);
+    /// <summary>Gets the <c>form</c> value.</summary>
+    public static McpElicitationFormMode Form { get; } = new("form");
 
-    /// <summary>Returns a value indicating whether two <see cref="UIElicitationResponseAction"/> instances are not equivalent.</summary>
-    public static bool operator !=(UIElicitationResponseAction left, UIElicitationResponseAction right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="McpElicitationFormMode"/> instances are equivalent.</summary>
+    public static bool operator ==(McpElicitationFormMode left, McpElicitationFormMode right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="McpElicitationFormMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(McpElicitationFormMode left, McpElicitationFormMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is UIElicitationResponseAction other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpElicitationFormMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(UIElicitationResponseAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(McpElicitationFormMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20650,20 +26797,20 @@ public UIElicitationResponseAction(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{UIElicitationResponseAction}"/> for serializing <see cref="UIElicitationResponseAction"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpElicitationFormMode}"/> for serializing <see cref="McpElicitationFormMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<UIElicitationResponseAction>
+    public sealed class Converter : JsonConverter<McpElicitationFormMode>
     {
         /// <inheritdoc />
-        public override UIElicitationResponseAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override McpElicitationFormMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, UIElicitationResponseAction value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpElicitationFormMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UIElicitationResponseAction));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpElicitationFormMode));
         }
     }
 }
@@ -20936,49 +27083,112 @@ public override void Write(Utf8JsonWriter writer, PermissionsConfigureAdditional
 }
 
 
-/// <summary>Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.</summary>
+/// <summary>Disposition of a permission request as observed by the responding client.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionsSetApproveAllSource : IEquatable<PermissionsSetApproveAllSource>
+public readonly struct PermissionDecisionOutcome : IEquatable<PermissionDecisionOutcome>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PermissionsSetApproveAllSource"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PermissionsSetApproveAllSource"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="PermissionDecisionOutcome"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionDecisionOutcome"/>.</param>
     [JsonConstructor]
-    public PermissionsSetApproveAllSource(string value)
+    public PermissionDecisionOutcome(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionsSetApproveAllSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionDecisionOutcome"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Allow-all was enabled from a CLI command-line flag.</summary>
-    public static PermissionsSetApproveAllSource CliFlag { get; } = new("cli_flag");
+    /// <summary>The request was approved automatically without a new human decision.</summary>
+    public static PermissionDecisionOutcome AutoApproved { get; } = new("auto_approved");
 
-    /// <summary>Allow-all was enabled by a slash command.</summary>
-    public static PermissionsSetApproveAllSource SlashCommand { get; } = new("slash_command");
+    /// <summary>The request was denied without an interactive user decision; source records why.</summary>
+    public static PermissionDecisionOutcome AutopilotDenied { get; } = new("autopilot_denied");
 
-    /// <summary>Allow-all was enabled by confirming autopilot behavior.</summary>
-    public static PermissionsSetApproveAllSource AutopilotConfirmation { get; } = new("autopilot_confirmation");
+    /// <summary>The response came from an interactive user prompt.</summary>
+    public static PermissionDecisionOutcome PromptedUser { get; } = new("prompted_user");
 
-    /// <summary>Allow-all was enabled through an RPC caller.</summary>
-    public static PermissionsSetApproveAllSource Rpc { get; } = new("rpc");
+    /// <summary>Returns a value indicating whether two <see cref="PermissionDecisionOutcome"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionDecisionOutcome left, PermissionDecisionOutcome right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsSetApproveAllSource"/> instances are equivalent.</summary>
-    public static bool operator ==(PermissionsSetApproveAllSource left, PermissionsSetApproveAllSource right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionDecisionOutcome"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionDecisionOutcome left, PermissionDecisionOutcome right) => !(left == right);
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsSetApproveAllSource"/> instances are not equivalent.</summary>
-    public static bool operator !=(PermissionsSetApproveAllSource left, PermissionsSetApproveAllSource right) => !(left == right);
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is PermissionDecisionOutcome other && Equals(other);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionsSetApproveAllSource other && Equals(other);
+    public bool Equals(PermissionDecisionOutcome other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
-    public bool Equals(PermissionsSetApproveAllSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{PermissionDecisionOutcome}"/> for serializing <see cref="PermissionDecisionOutcome"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<PermissionDecisionOutcome>
+    {
+        /// <inheritdoc />
+        public override PermissionDecisionOutcome Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, PermissionDecisionOutcome value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionDecisionOutcome));
+        }
+    }
+}
+
+
+/// <summary>Response capability available to the client when it settled a permission request.</summary>
+[Experimental(Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct PermissionResponseCapability : IEquatable<PermissionResponseCapability>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="PermissionResponseCapability"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionResponseCapability"/>.</param>
+    [JsonConstructor]
+    public PermissionResponseCapability(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="PermissionResponseCapability"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The client could ask a user for this decision.</summary>
+    public static PermissionResponseCapability Interactive { get; } = new("interactive");
+
+    /// <summary>The client could return an automated response but could not ask a user.</summary>
+    public static PermissionResponseCapability Headless { get; } = new("headless");
+
+    /// <summary>The client had no response path available.</summary>
+    public static PermissionResponseCapability None { get; } = new("none");
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionResponseCapability"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionResponseCapability left, PermissionResponseCapability right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionResponseCapability"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionResponseCapability left, PermissionResponseCapability right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is PermissionResponseCapability other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(PermissionResponseCapability other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -20986,65 +27196,140 @@ public PermissionsSetApproveAllSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionsSetApproveAllSource}"/> for serializing <see cref="PermissionsSetApproveAllSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionResponseCapability}"/> for serializing <see cref="PermissionResponseCapability"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionsSetApproveAllSource>
+    public sealed class Converter : JsonConverter<PermissionResponseCapability>
     {
         /// <inheritdoc />
-        public override PermissionsSetApproveAllSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PermissionResponseCapability Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionsSetApproveAllSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionResponseCapability value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsSetApproveAllSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionResponseCapability));
+        }
+    }
+}
+
+
+/// <summary>Controlled reason or actor responsible for a permission response.</summary>
+[Experimental(Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct PermissionDecisionSource : IEquatable<PermissionDecisionSource>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="PermissionDecisionSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionDecisionSource"/>.</param>
+    [JsonConstructor]
+    public PermissionDecisionSource(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="PermissionDecisionSource"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The response followed the assisted-approval judge recommendation.</summary>
+    public static PermissionDecisionSource AssistedApproval { get; } = new("assisted_approval");
+
+    /// <summary>A human supplied the response through an interactive prompt.</summary>
+    public static PermissionDecisionSource HumanResponse { get; } = new("human_response");
+
+    /// <summary>The host applied a standing policy or override rather than a judge recommendation or human decision.</summary>
+    public static PermissionDecisionSource HostPolicy { get; } = new("host_policy");
+
+    /// <summary>The host denied the request because no interactive user response was available.</summary>
+    public static PermissionDecisionSource UnattendedFallback { get; } = new("unattended_fallback");
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionDecisionSource"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionDecisionSource left, PermissionDecisionSource right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionDecisionSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionDecisionSource left, PermissionDecisionSource right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is PermissionDecisionSource other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(PermissionDecisionSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{PermissionDecisionSource}"/> for serializing <see cref="PermissionDecisionSource"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<PermissionDecisionSource>
+    {
+        /// <inheritdoc />
+        public override PermissionDecisionSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, PermissionDecisionSource value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionDecisionSource));
         }
     }
 }
 
 
-/// <summary>Current or requested allow-all mode.</summary>
+/// <summary>Client surface that submitted a permission response.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionsAllowAllMode : IEquatable<PermissionsAllowAllMode>
+public readonly struct PermissionDecisionSurface : IEquatable<PermissionDecisionSurface>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PermissionsAllowAllMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PermissionsAllowAllMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="PermissionDecisionSurface"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionDecisionSurface"/>.</param>
     [JsonConstructor]
-    public PermissionsAllowAllMode(string value)
+    public PermissionDecisionSurface(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionsAllowAllMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionDecisionSurface"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Permission requests follow the normal approval flow.</summary>
-    public static PermissionsAllowAllMode Off { get; } = new("off");
+    /// <summary>The interactive Copilot CLI terminal UI.</summary>
+    public static PermissionDecisionSurface Tui { get; } = new("tui");
+
+    /// <summary>The non-interactive Copilot CLI prompt mode.</summary>
+    public static PermissionDecisionSurface PromptMode { get; } = new("prompt_mode");
+
+    /// <summary>The Copilot App client.</summary>
+    public static PermissionDecisionSurface CopilotApp { get; } = new("copilot_app");
 
-    /// <summary>Tool, path, and URL permission requests are automatically approved.</summary>
-    public static PermissionsAllowAllMode On { get; } = new("on");
+    /// <summary>An Agent Client Protocol host.</summary>
+    public static PermissionDecisionSurface Acp { get; } = new("acp");
 
-    /// <summary>Permission requests follow the normal approval flow with an LLM advisory recommendation attached; clients may choose to auto-approve requests the judge evaluated as acceptable.</summary>
-    public static PermissionsAllowAllMode Auto { get; } = new("auto");
+    /// <summary>A generic Copilot SDK client.</summary>
+    public static PermissionDecisionSurface Sdk { get; } = new("sdk");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsAllowAllMode"/> instances are equivalent.</summary>
-    public static bool operator ==(PermissionsAllowAllMode left, PermissionsAllowAllMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionDecisionSurface"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionDecisionSurface left, PermissionDecisionSurface right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsAllowAllMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(PermissionsAllowAllMode left, PermissionsAllowAllMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionDecisionSurface"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionDecisionSurface left, PermissionDecisionSurface right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionsAllowAllMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionDecisionSurface other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionsAllowAllMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PermissionDecisionSurface other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -21052,20 +27337,20 @@ public PermissionsAllowAllMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionsAllowAllMode}"/> for serializing <see cref="PermissionsAllowAllMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionDecisionSurface}"/> for serializing <see cref="PermissionDecisionSurface"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionsAllowAllMode>
+    public sealed class Converter : JsonConverter<PermissionDecisionSurface>
     {
         /// <inheritdoc />
-        public override PermissionsAllowAllMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PermissionDecisionSurface Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionsAllowAllMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionDecisionSurface value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsAllowAllMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionDecisionSurface));
         }
     }
 }
@@ -21075,45 +27360,120 @@ public override void Write(Utf8JsonWriter writer, PermissionsAllowAllMode value,
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionsSetAllowAllSource : IEquatable<PermissionsSetAllowAllSource>
+public readonly struct PermissionsSetApproveAllSource : IEquatable<PermissionsSetApproveAllSource>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PermissionsSetAllowAllSource"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PermissionsSetAllowAllSource"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="PermissionsSetApproveAllSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionsSetApproveAllSource"/>.</param>
     [JsonConstructor]
-    public PermissionsSetAllowAllSource(string value)
+    public PermissionsSetApproveAllSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionsSetAllowAllSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionsSetApproveAllSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
     /// <summary>Allow-all was enabled from a CLI command-line flag.</summary>
-    public static PermissionsSetAllowAllSource CliFlag { get; } = new("cli_flag");
+    public static PermissionsSetApproveAllSource CliFlag { get; } = new("cli_flag");
 
     /// <summary>Allow-all was enabled by a slash command.</summary>
-    public static PermissionsSetAllowAllSource SlashCommand { get; } = new("slash_command");
+    public static PermissionsSetApproveAllSource SlashCommand { get; } = new("slash_command");
 
     /// <summary>Allow-all was enabled by confirming autopilot behavior.</summary>
-    public static PermissionsSetAllowAllSource AutopilotConfirmation { get; } = new("autopilot_confirmation");
+    public static PermissionsSetApproveAllSource AutopilotConfirmation { get; } = new("autopilot_confirmation");
+
+    /// <summary>Allow-all was enabled at startup by the `defaultPermissionMode` user setting.</summary>
+    public static PermissionsSetApproveAllSource UserSetting { get; } = new("user_setting");
 
     /// <summary>Allow-all was enabled through an RPC caller.</summary>
-    public static PermissionsSetAllowAllSource Rpc { get; } = new("rpc");
+    public static PermissionsSetApproveAllSource Rpc { get; } = new("rpc");
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionsSetApproveAllSource"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionsSetApproveAllSource left, PermissionsSetApproveAllSource right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionsSetApproveAllSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionsSetApproveAllSource left, PermissionsSetApproveAllSource right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is PermissionsSetApproveAllSource other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(PermissionsSetApproveAllSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{PermissionsSetApproveAllSource}"/> for serializing <see cref="PermissionsSetApproveAllSource"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<PermissionsSetApproveAllSource>
+    {
+        /// <inheritdoc />
+        public override PermissionsSetApproveAllSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, PermissionsSetApproveAllSource value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsSetApproveAllSource));
+        }
+    }
+}
+
+
+/// <summary>Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK callers.</summary>
+[Experimental(Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct PermissionModeSource : IEquatable<PermissionModeSource>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="PermissionModeSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionModeSource"/>.</param>
+    [JsonConstructor]
+    public PermissionModeSource(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="PermissionModeSource"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The mode was set from a CLI command-line flag.</summary>
+    public static PermissionModeSource CliFlag { get; } = new("cli_flag");
+
+    /// <summary>The mode was set by a slash command.</summary>
+    public static PermissionModeSource SlashCommand { get; } = new("slash_command");
+
+    /// <summary>The mode was set by confirming autopilot behavior.</summary>
+    public static PermissionModeSource AutopilotConfirmation { get; } = new("autopilot_confirmation");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsSetAllowAllSource"/> instances are equivalent.</summary>
-    public static bool operator ==(PermissionsSetAllowAllSource left, PermissionsSetAllowAllSource right) => left.Equals(right);
+    /// <summary>The mode was set at startup by the `defaultPermissionMode` user setting.</summary>
+    public static PermissionModeSource UserSetting { get; } = new("user_setting");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsSetAllowAllSource"/> instances are not equivalent.</summary>
-    public static bool operator !=(PermissionsSetAllowAllSource left, PermissionsSetAllowAllSource right) => !(left == right);
+    /// <summary>The mode was set through an RPC caller.</summary>
+    public static PermissionModeSource Rpc { get; } = new("rpc");
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionModeSource"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionModeSource left, PermissionModeSource right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionModeSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionModeSource left, PermissionModeSource right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionsSetAllowAllSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionModeSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionsSetAllowAllSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PermissionModeSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -21121,20 +27481,20 @@ public PermissionsSetAllowAllSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionsSetAllowAllSource}"/> for serializing <see cref="PermissionsSetAllowAllSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionModeSource}"/> for serializing <see cref="PermissionModeSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionsSetAllowAllSource>
+    public sealed class Converter : JsonConverter<PermissionModeSource>
     {
         /// <inheritdoc />
-        public override PermissionsSetAllowAllSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PermissionModeSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionsSetAllowAllSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionModeSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsSetAllowAllSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionModeSource));
         }
     }
 }
@@ -22933,49 +29293,112 @@ public override SessionFsSqliteTransactionErrorClass Read(ref Utf8JsonReader rea
         /// <inheritdoc />
         public override void Write(Utf8JsonWriter writer, SessionFsSqliteTransactionErrorClass value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsSqliteTransactionErrorClass));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsSqliteTransactionErrorClass));
+        }
+    }
+}
+
+
+/// <summary>Transport the runtime would otherwise use for this request. `http` (the default when absent) covers plain HTTP and SSE responses; `websocket` indicates a full-duplex message channel where each body chunk maps to one WebSocket message and the `binary` flag distinguishes text from binary frames. The SDK consumer uses this to decide whether to service the request with an HTTP client or a WebSocket client. It is the one piece of request metadata the consumer cannot reliably infer from the URL or headers alone.</summary>
+[Experimental(Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct LlmInferenceHttpRequestStartTransport : IEquatable<LlmInferenceHttpRequestStartTransport>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="LlmInferenceHttpRequestStartTransport"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="LlmInferenceHttpRequestStartTransport"/>.</param>
+    [JsonConstructor]
+    public LlmInferenceHttpRequestStartTransport(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="LlmInferenceHttpRequestStartTransport"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Plain HTTP or SSE response. Each body chunk is an opaque byte range; the response is a status line, headers, and a (possibly streamed) body.</summary>
+    public static LlmInferenceHttpRequestStartTransport Http { get; } = new("http");
+
+    /// <summary>Full-duplex WebSocket channel. Each body chunk maps to exactly one WebSocket message and the `binary` flag distinguishes text from binary frames; request and response chunks flow concurrently.</summary>
+    public static LlmInferenceHttpRequestStartTransport Websocket { get; } = new("websocket");
+
+    /// <summary>Returns a value indicating whether two <see cref="LlmInferenceHttpRequestStartTransport"/> instances are equivalent.</summary>
+    public static bool operator ==(LlmInferenceHttpRequestStartTransport left, LlmInferenceHttpRequestStartTransport right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="LlmInferenceHttpRequestStartTransport"/> instances are not equivalent.</summary>
+    public static bool operator !=(LlmInferenceHttpRequestStartTransport left, LlmInferenceHttpRequestStartTransport right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is LlmInferenceHttpRequestStartTransport other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(LlmInferenceHttpRequestStartTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{LlmInferenceHttpRequestStartTransport}"/> for serializing <see cref="LlmInferenceHttpRequestStartTransport"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<LlmInferenceHttpRequestStartTransport>
+    {
+        /// <inheritdoc />
+        public override LlmInferenceHttpRequestStartTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, LlmInferenceHttpRequestStartTransport value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(LlmInferenceHttpRequestStartTransport));
         }
     }
 }
 
 
-/// <summary>Transport the runtime would otherwise use for this request. `http` (the default when absent) covers plain HTTP and SSE responses; `websocket` indicates a full-duplex message channel where each body chunk maps to one WebSocket message and the `binary` flag distinguishes text from binary frames. The SDK consumer uses this to decide whether to service the request with an HTTP client or a WebSocket client. It is the one piece of request metadata the consumer cannot reliably infer from the URL or headers alone.</summary>
+/// <summary>Why the runtime is requesting a GitHub credential.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct LlmInferenceHttpRequestStartTransport : IEquatable<LlmInferenceHttpRequestStartTransport>
+public readonly struct GitHubTokenAcquireReason : IEquatable<GitHubTokenAcquireReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="LlmInferenceHttpRequestStartTransport"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="LlmInferenceHttpRequestStartTransport"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="GitHubTokenAcquireReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="GitHubTokenAcquireReason"/>.</param>
     [JsonConstructor]
-    public LlmInferenceHttpRequestStartTransport(string value)
+    public GitHubTokenAcquireReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="LlmInferenceHttpRequestStartTransport"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="GitHubTokenAcquireReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Plain HTTP or SSE response. Each body chunk is an opaque byte range; the response is a status line, headers, and a (possibly streamed) body.</summary>
-    public static LlmInferenceHttpRequestStartTransport Http { get; } = new("http");
+    /// <summary>The runtime is acquiring the registration's first credential.</summary>
+    public static GitHubTokenAcquireReason Initial { get; } = new("initial");
 
-    /// <summary>Full-duplex WebSocket channel. Each body chunk maps to exactly one WebSocket message and the `binary` flag distinguishes text from binary frames; request and response chunks flow concurrently.</summary>
-    public static LlmInferenceHttpRequestStartTransport Websocket { get; } = new("websocket");
+    /// <summary>The runtime is replacing a credential that is approaching expiry.</summary>
+    public static GitHubTokenAcquireReason Refresh { get; } = new("refresh");
 
-    /// <summary>Returns a value indicating whether two <see cref="LlmInferenceHttpRequestStartTransport"/> instances are equivalent.</summary>
-    public static bool operator ==(LlmInferenceHttpRequestStartTransport left, LlmInferenceHttpRequestStartTransport right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="GitHubTokenAcquireReason"/> instances are equivalent.</summary>
+    public static bool operator ==(GitHubTokenAcquireReason left, GitHubTokenAcquireReason right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="LlmInferenceHttpRequestStartTransport"/> instances are not equivalent.</summary>
-    public static bool operator !=(LlmInferenceHttpRequestStartTransport left, LlmInferenceHttpRequestStartTransport right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="GitHubTokenAcquireReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(GitHubTokenAcquireReason left, GitHubTokenAcquireReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is LlmInferenceHttpRequestStartTransport other && Equals(other);
+    public override bool Equals(object? obj) => obj is GitHubTokenAcquireReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(LlmInferenceHttpRequestStartTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(GitHubTokenAcquireReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -22983,20 +29406,20 @@ public LlmInferenceHttpRequestStartTransport(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{LlmInferenceHttpRequestStartTransport}"/> for serializing <see cref="LlmInferenceHttpRequestStartTransport"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{GitHubTokenAcquireReason}"/> for serializing <see cref="GitHubTokenAcquireReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<LlmInferenceHttpRequestStartTransport>
+    public sealed class Converter : JsonConverter<GitHubTokenAcquireReason>
     {
         /// <inheritdoc />
-        public override LlmInferenceHttpRequestStartTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override GitHubTokenAcquireReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, LlmInferenceHttpRequestStartTransport value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, GitHubTokenAcquireReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(LlmInferenceHttpRequestStartTransport));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(GitHubTokenAcquireReason));
         }
     }
 }
@@ -23024,17 +29447,26 @@ public async Task<PingResult> PingAsync(string? message = null, CancellationToke
     }
 
     /// <summary>Performs the SDK server connection handshake and validates the optional connection token. Marked internal because this is JSON-RPC transport plumbing invoked automatically by an SDK client's own `connect()` wrapper, not a user-facing method. Stays internal as long as the SDK client owns the handshake; would only become public if the SDK ever exposed the raw schema surface to consumers without a connection wrapper.</summary>
-    /// <param name="token">Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN.</param>
     /// <param name="enableGitHubTelemetryForwarding">Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the runtime forwards every internal telemetry event it emits — across all sessions, plus sessionless events — to this connection over the `gitHubTelemetry.event` notification. Regular events are also written to the runtime's normal GitHub/CTS path (dual-write); host-only compatibility events are forward-only and intentionally skip that path. Intended for first-party hosts that re-emit the events into their own telemetry stores. Both unrestricted and restricted events are forwarded, each tagged with a `restricted` discriminator; a backstop drops restricted events when restricted telemetry is disabled — using the process-global gate for ordinary events and an explicit session-scoped decision for host-only events.</param>
+    /// <param name="clientInfo">Identity of the integrating host. Optional; omit it to keep the default attribution.</param>
+    /// <param name="token">Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Handshake result reporting the server's protocol version and package version on success.</returns>
     [Experimental(Diagnostics.Experimental)]
-    internal async Task<ConnectResult> ConnectAsync(string? token = null, bool? enableGitHubTelemetryForwarding = null, CancellationToken cancellationToken = default)
+    internal async Task<ConnectResult> ConnectAsync(bool? enableGitHubTelemetryForwarding = null, ConnectClientInfo? clientInfo = null, string? token = null, CancellationToken cancellationToken = default)
     {
-        var request = new ConnectRequest { Token = token, EnableGitHubTelemetryForwarding = enableGitHubTelemetryForwarding };
+        var request = new ConnectRequest { EnableGitHubTelemetryForwarding = enableGitHubTelemetryForwarding, ClientInfo = clientInfo, Token = token };
         return await CopilotClient.InvokeRpcAsync<ConnectResult>(_rpc, "connect", [request], cancellationToken);
     }
 
+    /// <summary>Registers the calling SDK client as the per-entrypoint extension launch provider. Call before creating any sessions. When omitted, the runtime temporarily falls back to its built-in Node launcher for backward compatibility.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    [Experimental(Diagnostics.Experimental)]
+    public async Task RegisterExtensionLaunchProviderAsync(CancellationToken cancellationToken = default)
+    {
+        await CopilotClient.InvokeRpcAsync(_rpc, "registerExtensionLaunchProvider", [], cancellationToken);
+    }
+
     /// <summary>Models APIs.</summary>
     public ServerModelsApi Models =>
         field ??
@@ -23071,6 +29503,12 @@ internal async Task<ConnectResult> ConnectAsync(string? token = null, bool? enab
         Interlocked.CompareExchange(ref field, new(_rpc), null) ??
         field;
 
+    /// <summary>Catalog APIs.</summary>
+    public ServerCatalogApi Catalog =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
     /// <summary>Plugins APIs.</summary>
     public ServerPluginsApi Plugins =>
         field ??
@@ -23107,6 +29545,12 @@ internal async Task<ConnectResult> ConnectAsync(string? token = null, bool? enab
         Interlocked.CompareExchange(ref field, new(_rpc), null) ??
         field;
 
+    /// <summary>ManagedSettings APIs.</summary>
+    public ServerManagedSettingsApi ManagedSettings =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
     /// <summary>Runtime APIs.</summary>
     public ServerRuntimeApi Runtime =>
         field ??
@@ -23150,12 +29594,13 @@ internal ServerModelsApi(JsonRpc rpc)
     }
 
     /// <summary>Lists Copilot models available to the authenticated user.</summary>
-    /// <param name="gitHubToken">GitHub token for per-user model listing. When provided, resolves this token to determine the user's Copilot plan and available models instead of using the global auth.</param>
+    /// <param name="selectionId">Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used.</param>
+    /// <param name="gitHubToken">GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>List of Copilot models available to the resolved user, including capabilities and billing metadata.</returns>
-    public async Task<ModelList> ListAsync(string? gitHubToken = null, CancellationToken cancellationToken = default)
+    public async Task<ModelList> ListAsync(string? selectionId = null, string? gitHubToken = null, CancellationToken cancellationToken = default)
     {
-        var request = new ModelsListRequest { GitHubToken = gitHubToken };
+        var request = new ModelsListRequest { SelectionId = selectionId, GitHubToken = gitHubToken };
         return await CopilotClient.InvokeRpcAsync<ModelList>(_rpc, "models.list", [request], cancellationToken);
     }
 
@@ -23201,13 +29646,14 @@ internal ServerAccountApi(JsonRpc rpc)
         _rpc = rpc;
     }
 
-    /// <summary>Gets Copilot quota usage for the authenticated user or supplied GitHub token.</summary>
-    /// <param name="gitHubToken">GitHub token for per-user quota lookup. When provided, resolves this token to determine the user's quota instead of using the global auth.</param>
+    /// <summary>Gets Copilot quota usage for the current or opaquely selected authenticated user.</summary>
+    /// <param name="selectionId">Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used.</param>
+    /// <param name="gitHubToken">GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Quota usage snapshots for the resolved user, keyed by quota type.</returns>
-    public async Task<AccountGetQuotaResult> GetQuotaAsync(string? gitHubToken = null, CancellationToken cancellationToken = default)
+    public async Task<AccountGetQuotaResult> GetQuotaAsync(string? selectionId = null, string? gitHubToken = null, CancellationToken cancellationToken = default)
     {
-        var request = new AccountGetQuotaRequest { GitHubToken = gitHubToken };
+        var request = new AccountGetQuotaRequest { SelectionId = selectionId, GitHubToken = gitHubToken };
         return await CopilotClient.InvokeRpcAsync<AccountGetQuotaResult>(_rpc, "account.getQuota", [request], cancellationToken);
     }
 
@@ -23227,31 +29673,29 @@ public async Task<IList<AccountAllUsers>> GetAllUsersAsync(CancellationToken can
         return await CopilotClient.InvokeRpcAsync<IList<AccountAllUsers>>(_rpc, "account.getAllUsers", [], cancellationToken);
     }
 
-    /// <summary>Stores authentication credentials after successful login (e.g., device code flow).</summary>
+    /// <summary>Validates and stores authentication credentials. When login is omitted, resolves the authenticated user from the token before persistence.</summary>
     /// <param name="host">GitHub host URL.</param>
-    /// <param name="login">User login/username.</param>
     /// <param name="token">GitHub authentication token.</param>
+    /// <param name="login">User login/username. When omitted, the runtime validates the token and resolves the login from GitHub.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Result of a successful login; throws on failure.</returns>
-    public async Task<AccountLoginResult> LoginAsync(string host, string login, string token, CancellationToken cancellationToken = default)
+    public async Task<AccountLoginResult> LoginAsync(string host, string token, string? login = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(host);
-        ArgumentNullException.ThrowIfNull(login);
         ArgumentNullException.ThrowIfNull(token);
 
-        var request = new AccountLoginRequest { Host = host, Login = login, Token = token };
+        var request = new AccountLoginRequest { Host = host, Token = token, Login = login };
         return await CopilotClient.InvokeRpcAsync<AccountLoginResult>(_rpc, "account.login", [request], cancellationToken);
     }
 
     /// <summary>Removes user authentication from keychain and persisted state.</summary>
+    /// <param name="selectionId">Opaque account identifier returned by `account.getAllUsers`.</param>
     /// <param name="authInfo">Authentication information for the user to log out.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Logout result indicating if more users remain.</returns>
-    public async Task<AccountLogoutResult> LogoutAsync(AuthInfo authInfo, CancellationToken cancellationToken = default)
+    public async Task<AccountLogoutResult> LogoutAsync(string? selectionId = null, AuthInfo? authInfo = null, CancellationToken cancellationToken = default)
     {
-        ArgumentNullException.ThrowIfNull(authInfo);
-
-        var request = new AccountLogoutRequest { AuthInfo = authInfo };
+        var request = new AccountLogoutRequest { SelectionId = selectionId, AuthInfo = authInfo };
         return await CopilotClient.InvokeRpcAsync<AccountLogoutResult>(_rpc, "account.logout", [request], cancellationToken);
     }
 }
@@ -23301,6 +29745,21 @@ public async Task<McpDiscoverResult> DiscoverAsync(string? workingDirectory = nu
         return await CopilotClient.InvokeRpcAsync<McpDiscoverResult>(_rpc, "mcp.discover", [request], cancellationToken);
     }
 
+    /// <summary>Requests a side-effect-free MCP install plan from a catalog candidate handle or a caller-supplied card. This host-implemented server method is available through SDK/TUI hosts; standalone and C-ABI runtimes whose host does not implement server-method dispatch return JSON-RPC MethodNotFound. A runtime with planning available returns a normalised plan and opaque single-use plan handle; a runtime without it returns the typed planning-unavailable result. A completed plan reports resource identity, provenance, eligible transport choices, the user-scope target, required typed values and secret placeholders, the policy result, the configuration changes installing would make, and whether a reload would be needed. Planning never writes configuration, stores a secret, or reloads MCP servers, so abandoning a plan needs no call and leaves nothing behind.</summary>
+    /// <param name="contract">Protocol version and capabilities the caller requires.</param>
+    /// <param name="source">What to plan: either a candidate handle from a previous search, or a card supplied directly.</param>
+    /// <param name="scope">Configuration scope the plan targets. Defaults to user scope when omitted.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.</returns>
+    public async Task<McpPlanInstallResult> PlanInstallAsync(CatalogClientContract contract, McpPlanInstallSource source, McpPlanScope? scope = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(contract);
+        ArgumentNullException.ThrowIfNull(source);
+
+        var request = new McpPlanInstallRequest { Contract = contract, Source = source, Scope = scope };
+        return await CopilotClient.InvokeRpcAsync<McpPlanInstallResult>(_rpc, "mcp.planInstall", [request], cancellationToken);
+    }
+
     /// <summary>Config APIs.</summary>
     public ServerMcpConfigApi Config =>
         field ??
@@ -23436,6 +29895,34 @@ public async Task DisableAsync(IList<string> ids, CancellationToken cancellation
     }
 }
 
+/// <summary>Provides server-scoped Catalog APIs.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ServerCatalogApi
+{
+    private readonly JsonRpc _rpc;
+
+    internal ServerCatalogApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
+
+    /// <summary>Requests a bounded catalog search. This host-implemented server method is available through SDK/TUI hosts; standalone and C-ABI runtimes whose host does not implement server-method dispatch return JSON-RPC MethodNotFound. A runtime with search available returns inert candidate summaries, each with an opaque single-use handle scoped to this runtime instance; a runtime without it returns the typed search-unavailable result. Public authorities may be searched anonymously, while an authority that requires credentials yields the typed authentication-required result. All returned text, URLs, and package metadata are untrusted external data and can never trigger instructions, tools, or installation. Read-only: nothing is installed, configured, or persisted.</summary>
+    /// <param name="contract">Protocol version and capabilities the caller requires.</param>
+    /// <param name="query">Free-text search query. Never written to logs or telemetry.</param>
+    /// <param name="limit">Maximum number of candidates to return. Defaults to 10 when omitted.</param>
+    /// <param name="kinds">Restrict results to these candidate kinds. When omitted, every kind the runtime supports is searched.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.</returns>
+    public async Task<CatalogSearchResult> SearchAsync(CatalogClientContract contract, string query, int? limit = null, IList<CatalogCandidateKind>? kinds = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(contract);
+        ArgumentNullException.ThrowIfNull(query);
+
+        var request = new CatalogSearchRequest { Contract = contract, Query = query, Limit = limit, Kinds = kinds };
+        return await CopilotClient.InvokeRpcAsync<CatalogSearchResult>(_rpc, "catalog.search", [request], cancellationToken);
+    }
+}
+
 /// <summary>Provides server-scoped Plugins APIs.</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed class ServerPluginsApi
@@ -23522,6 +30009,12 @@ public async Task DisableAsync(IList<string> names, CancellationToken cancellati
         await CopilotClient.InvokeRpcAsync(_rpc, "plugins.disable", [request], cancellationToken);
     }
 
+    /// <summary>Builtin APIs.</summary>
+    public ServerPluginsBuiltinApi Builtin =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
     /// <summary>Marketplaces APIs.</summary>
     public ServerPluginsMarketplacesApi Marketplaces =>
         field ??
@@ -23529,6 +30022,29 @@ public async Task DisableAsync(IList<string> names, CancellationToken cancellati
         field;
 }
 
+/// <summary>Provides server-scoped PluginsBuiltin APIs.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ServerPluginsBuiltinApi
+{
+    private readonly JsonRpc _rpc;
+
+    internal ServerPluginsBuiltinApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
+
+    /// <summary>Replaces this server's trusted built-in plugin directories while no sessions are active.</summary>
+    /// <param name="paths">Complete replacement set of trusted built-in plugin directories. Every entry must be an absolute local filesystem path no longer than 4096 characters.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    public async Task SetAsync(IList<string> paths, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(paths);
+
+        var request = new PluginsBuiltinSetRequest { Paths = paths };
+        await CopilotClient.InvokeRpcAsync(_rpc, "plugins.builtin.set", [request], cancellationToken);
+    }
+}
+
 /// <summary>Provides server-scoped PluginsMarketplaces APIs.</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed class ServerPluginsMarketplacesApi
@@ -23659,6 +30175,18 @@ public async Task SetDisabledSkillsAsync(IList<string> disabledSkills, Cancellat
         var request = new SkillsConfigSetDisabledSkillsRequest { DisabledSkills = disabledSkills };
         await CopilotClient.InvokeRpcAsync(_rpc, "skills.config.setDisabledSkills", [request], cancellationToken);
     }
+
+    /// <summary>Atomically adds or removes one skill from the disabled list.</summary>
+    /// <param name="name">Name of the skill to add to or remove from the disabled list.</param>
+    /// <param name="disabled">True to disable the skill, false to enable it.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    public async Task SetSkillDisabledAsync(string name, bool disabled, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(name);
+
+        var request = new SkillsConfigSetSkillDisabledRequest { Name = name, Disabled = disabled };
+        await CopilotClient.InvokeRpcAsync(_rpc, "skills.config.setSkillDisabled", [request], cancellationToken);
+    }
 }
 
 /// <summary>Provides server-scoped Agents APIs.</summary>
@@ -23806,6 +30334,26 @@ public async Task<UserSettingsSetResult> SetAsync(object settings, CancellationT
     }
 }
 
+/// <summary>Provides server-scoped ManagedSettings APIs.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ServerManagedSettingsApi
+{
+    private readonly JsonRpc _rpc;
+
+    internal ServerManagedSettingsApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
+
+    /// <summary>Discovers device-managed settings from production MDM and managed-file sources, validates them against the runtime-owned managed-settings schema, and returns the canonical JSON without requiring a session.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Validated device-managed settings discovered before a session exists.</returns>
+    public async Task<ManagedSettingsReadResult> ReadAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsReadResult>(_rpc, "managedSettings.read", [], cancellationToken);
+    }
+}
+
 /// <summary>Provides server-scoped Runtime APIs.</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed class ServerRuntimeApi
@@ -23875,7 +30423,7 @@ public async Task<LlmInferenceSetProviderResult> SetProviderAsync(CancellationTo
     /// <summary>Delivers the response head (status + headers) for an in-flight request, correlated by the requestId the runtime supplied in httpRequestStart. Must be called exactly once per request before any httpResponseChunk frames.</summary>
     /// <param name="requestId">Matches the requestId from the originating httpRequestStart frame.</param>
     /// <param name="status">HTTP status code.</param>
-    /// <param name="headers">The headers parameter.</param>
+    /// <param name="headers">HTTP response headers, preserving multiple values per name.</param>
     /// <param name="statusText">Optional HTTP status reason phrase.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Whether the start frame was accepted.</returns>
@@ -24257,28 +30805,25 @@ public async Task<RemoteControlStatusResult> GetRemoteControlStatusAsync(Cancell
 
     /// <summary>Registers extension-provided tools on the given session, gated by an optional `enabled` callback. Returns an opaque unsubscribe function the caller must invoke to deregister the tools when the extension is torn down. Marked internal because `loader`, `enabled`, and the returned `unsubscribe` are in-process handles that cannot cross the JSON-RPC boundary. Disappears once extension discovery / launch / tool registration are owned by the runtime: SDK consumers will pass pure config (search paths, disabled ids) via `SessionOptions` and the runtime will resolve, launch, register, and tear down extensions itself.</summary>
     /// <param name="sessionId">Session to register extension tools on.</param>
-    /// <param name="loader">In-process ExtensionLoader handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, extension discovery/launch moves entirely into the runtime — the CLI passes pure config (search paths, disabled ids) via SessionOptions instead.</param>
     /// <param name="options">Optional registration options.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Handle for releasing the extension tool registration.</returns>
-    internal async Task<RegisterExtensionToolsResult> RegisterExtensionToolsOnSessionAsync(string sessionId, object loader, SessionsRegisterExtensionToolsOnSessionOptions? options = null, CancellationToken cancellationToken = default)
+    internal async Task<RegisterExtensionToolsResult> RegisterExtensionToolsOnSessionAsync(string sessionId, SessionsRegisterExtensionToolsOnSessionOptions? options = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(sessionId);
-        ArgumentNullException.ThrowIfNull(loader);
 
-        var request = new RegisterExtensionToolsParams { SessionId = sessionId, Loader = CopilotClient.ToJsonElementForWire(loader)!.Value, Options = options };
+        var request = new RegisterExtensionToolsParams { SessionId = sessionId, Options = options };
         return await CopilotClient.InvokeRpcAsync<RegisterExtensionToolsResult>(_rpc, "sessions.registerExtensionToolsOnSession", [request], cancellationToken);
     }
 
     /// <summary>Attaches (or detaches) an in-process ExtensionController delegate for the given session, used by shared-API surfaces that need to query or modify the session's extension state. Pass `controller: undefined` to detach. Marked internal because the controller is an in-process object that cannot cross the JSON-RPC boundary. Disappears alongside `registerExtensionToolsOnSession`: once the runtime owns extension management, the public surface exposes list/enable/disable/reload as dedicated RPCs served by the runtime.</summary>
     /// <param name="sessionId">Session to attach the extension controller delegate to.</param>
-    /// <param name="controller">In-process ExtensionController delegate (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. The post-SDK extension surface exposes list/enable/disable/reload via dedicated RPCs served by the runtime.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    internal async Task ConfigureSessionExtensionsAsync(string sessionId, object? controller = null, CancellationToken cancellationToken = default)
+    internal async Task ConfigureSessionExtensionsAsync(string sessionId, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(sessionId);
 
-        var request = new ConfigureSessionExtensionsParams { SessionId = sessionId, Controller = CopilotClient.ToJsonElementForWire(controller) };
+        var request = new ConfigureSessionExtensionsParams { SessionId = sessionId };
         await CopilotClient.InvokeRpcAsync(_rpc, "sessions.configureSessionExtensions", [request], cancellationToken);
     }
 }
@@ -24722,13 +31267,112 @@ public async Task<SessionAuthStatus> GetStatusAsync(CancellationToken cancellati
     /// <param name="credentials">The new auth credentials to install on the session. When omitted or `undefined`, the call is a no-op and the session's existing credentials are preserved. The runtime installs the supplied value immediately for outbound model/API requests. When the credential carries a raw token (`token`, `env`, or `gh-cli`) but no `copilotUser`, the runtime additionally re-resolves `copilotUser` server-side (best-effort, asynchronously, after the synchronous install) so plan/quota/billing metadata regains fidelity; on resolution failure the verbatim credential remains installed. It does NOT otherwise validate the credential. Several variants carry secret material; treat this method's params as containing secrets at rest and in transit.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Indicates whether the credential update succeeded.</returns>
-    public async Task<SessionSetCredentialsResult> SetCredentialsAsync(AuthInfo? credentials = null, CancellationToken cancellationToken = default)
+    public async Task<SessionSetCredentialsResult> SetCredentialsAsync(SettableAuthInfo? credentials = null, CancellationToken cancellationToken = default)
     {
         _session.ThrowIfDisposed();
 
         var request = new SessionSetCredentialsParams { SessionId = _session.SessionId, Credentials = credentials };
         return await CopilotClient.InvokeRpcAsync<SessionSetCredentialsResult>(_session.Rpc, "session.gitHubAuth.setCredentials", [request], cancellationToken);
     }
+
+    /// <summary>Gets the current authentication information for internal session hosts.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Current authentication information, or null when no authentication is active.</returns>
+    internal async Task<AuthIdentity?> GetCurrentAuthInfoAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionGitHubAuthGetCurrentAuthInfoRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<AuthIdentity?>(_session.Rpc, "session.gitHubAuth.getCurrentAuthInfo", [request], cancellationToken);
+    }
+
+    /// <summary>Gets all authentication accounts available to the internal session host.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Authentication accounts available to the internal session host.</returns>
+    internal async Task<IList<SessionAuthStatus>> GetAllAuthAvailableAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionGitHubAuthGetAllAuthAvailableRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<IList<SessionAuthStatus>>(_session.Rpc, "session.gitHubAuth.getAllAuthAvailable", [request], cancellationToken);
+    }
+
+    /// <summary>Refreshes Copilot account metadata for the current authentication.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Current authentication information, or null when no authentication is active.</returns>
+    internal async Task<AuthIdentity?> RefreshCopilotUserAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionGitHubAuthRefreshCopilotUserRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<AuthIdentity?>(_session.Rpc, "session.gitHubAuth.refreshCopilotUser", [request], cancellationToken);
+    }
+
+    /// <summary>Logs in a GitHub user through the internal session host.</summary>
+    /// <param name="host">GitHub host URL.</param>
+    /// <param name="login">GitHub login.</param>
+    /// <param name="token">GitHub authentication token.</param>
+    /// <param name="persist">Whether to persist the token after login.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.</returns>
+    internal async Task<AuthInfo> LoginAsync(string host, string login, string token, bool? persist = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(host);
+        ArgumentNullException.ThrowIfNull(login);
+        ArgumentNullException.ThrowIfNull(token);
+        _session.ThrowIfDisposed();
+
+        var request = new SessionAuthLoginRequest { SessionId = _session.SessionId, Host = host, Login = login, Token = token, Persist = persist };
+        return await CopilotClient.InvokeRpcAsync<AuthInfo>(_session.Rpc, "session.gitHubAuth.login", [request], cancellationToken);
+    }
+
+    /// <summary>Switches the session to another available authentication.</summary>
+    /// <param name="authInfo">Authentication information to activate.</param>
+    /// <param name="token">Optional token paired with the authentication information.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task SwitchToAuthAsync(AuthInfo authInfo, string? token = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(authInfo);
+        _session.ThrowIfDisposed();
+
+        var request = new SessionAuthSwitchRequest { SessionId = _session.SessionId, AuthInfo = authInfo, Token = token };
+        await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.gitHubAuth.switchToAuth", [request], cancellationToken);
+    }
+
+    /// <summary>Logs out the session's current GitHub authentication.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Whether the current authentication was logged out.</returns>
+    internal async Task<bool> LogoutAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionGitHubAuthLogoutRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<bool>(_session.Rpc, "session.gitHubAuth.logout", [request], cancellationToken);
+    }
+
+    /// <summary>Logs out a specific GitHub authentication.</summary>
+    /// <param name="authInfo">Authentication information to log out.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Whether the requested authentication was logged out.</returns>
+    internal async Task<bool> LogoutUserAsync(AuthInfo authInfo, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(authInfo);
+        _session.ThrowIfDisposed();
+
+        var request = new SessionAuthLogoutUserRequest { SessionId = _session.SessionId, AuthInfo = authInfo };
+        return await CopilotClient.InvokeRpcAsync<bool>(_session.Rpc, "session.gitHubAuth.logoutUser", [request], cancellationToken);
+    }
+
+    /// <summary>Gets validation errors from the most recent authentication attempt.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Validation errors from the most recent authentication attempt.</returns>
+    internal async Task<IList<AuthValidationError>> LastAuthErrorsAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionGitHubAuthLastAuthErrorsRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<IList<AuthValidationError>>(_session.Rpc, "session.gitHubAuth.lastAuthErrors", [request], cancellationToken);
+    }
 }
 
 /// <summary>Provides session-scoped Debug APIs.</summary>
@@ -24825,6 +31469,12 @@ public async Task CloseAsync(string instanceId, CancellationToken cancellationTo
         field ??
         Interlocked.CompareExchange(ref field, new(_session), null) ??
         field;
+
+    /// <summary>Provider APIs.</summary>
+    public CanvasProviderApi Provider =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_session), null) ??
+        field;
 }
 
 /// <summary>Provides session-scoped CanvasAction APIs.</summary>
@@ -24855,6 +31505,46 @@ public async Task<CanvasActionInvokeResult> InvokeAsync(string instanceId, strin
     }
 }
 
+/// <summary>Provides session-scoped CanvasProvider APIs.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class CanvasProviderApi
+{
+    private readonly CopilotSession _session;
+
+    internal CanvasProviderApi(CopilotSession session)
+    {
+        _session = session;
+    }
+
+    /// <summary>Registers an internal canvas provider connection and its contributions.</summary>
+    /// <param name="connectionId">Connection identifier for callback routing.</param>
+    /// <param name="info">Provider metadata supplied by the host.</param>
+    /// <param name="canvases">Canvas contributions supplied by the provider.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task RegisterAsync(string connectionId, object info, IList<object?> canvases, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(connectionId);
+        ArgumentNullException.ThrowIfNull(info);
+        ArgumentNullException.ThrowIfNull(canvases);
+        _session.ThrowIfDisposed();
+
+        var request = new CanvasProviderRegisterRequest { SessionId = _session.SessionId, ConnectionId = connectionId, Info = CopilotClient.ToJsonElementForWire(info)!.Value, Canvases = canvases.Select(static v => CopilotClient.ToJsonElementForWire(v)!.Value).ToList() };
+        await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.canvas.provider.register", [request], cancellationToken);
+    }
+
+    /// <summary>Unregisters an internal canvas provider connection.</summary>
+    /// <param name="connectionId">Connection identifier to unregister.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task UnregisterAsync(string connectionId, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(connectionId);
+        _session.ThrowIfDisposed();
+
+        var request = new CanvasProviderUnregisterRequest { SessionId = _session.SessionId, ConnectionId = connectionId };
+        await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.canvas.provider.unregister", [request], cancellationToken);
+    }
+}
+
 /// <summary>Provides session-scoped Factory APIs.</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed class FactoryApi
@@ -24910,13 +31600,16 @@ public async Task<FactoryRunResult> GetRunAsync(string runId, CancellationToken
     }
 
     /// <summary>Lists durable factory runs for this session in creation order.</summary>
+    /// <param name="afterSeq">Exclusive forward cursor.</param>
+    /// <param name="beforeSeq">Exclusive backward cursor.</param>
+    /// <param name="limit">Maximum terminal runs to return. Defaults to 200 and is capped at 500.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Factory runs in durable creation order.</returns>
-    public async Task<FactoryListRunsResult> ListRunsAsync(CancellationToken cancellationToken = default)
+    /// <returns>A page of factory runs in durable creation order.</returns>
+    public async Task<FactoryListRunsResult> ListRunsAsync(long? afterSeq = null, long? beforeSeq = null, int? limit = null, CancellationToken cancellationToken = default)
     {
         _session.ThrowIfDisposed();
 
-        var request = new FactoryListRunsRequest { SessionId = _session.SessionId };
+        var request = new FactoryListRunsRequest { SessionId = _session.SessionId, AfterSeq = afterSeq, BeforeSeq = beforeSeq, Limit = limit };
         return await CopilotClient.InvokeRpcAsync<FactoryListRunsResult>(_session.Rpc, "session.factory.listRuns", [request], cancellationToken);
     }
 
@@ -25083,18 +31776,43 @@ public async Task<CurrentModel> GetCurrentAsync(CancellationToken cancellationTo
     /// <param name="verbosity">Output verbosity level to request for supported models.</param>
     /// <param name="modelCapabilities">Override individual model capabilities resolved by the runtime.</param>
     /// <param name="contextTier">Explicit context tier for the selected model. `"default"` / `"long_context"` apply the requested tier; omit this field to use normal model behavior with no explicit tier.</param>
+    /// <param name="source">Origin to record on the effective `session.model_change` event. Defaults to `sdk` when omitted.</param>
     /// <param name="deferIfModelChangeQueued">When true, defer this switch (enqueue it) if another model change is already queued, even when no turn is active — so it drains last (FIFO) and wins over the already-queued change. Intended for genuine user-initiated model selections; internal restore/reapply switches omit it and apply immediately when no turn is active. When no other model change is queued this has no effect (a switch still applies immediately unless a turn is active).</param>
+    /// <param name="compactionDecision">Explicit response to a model-switch compaction preflight. Omit to request a confirmation projection when compaction is necessary.</param>
+    /// <param name="runCompactionPreflight">When true, evaluate context-window compaction policy before applying the switch.</param>
+    /// <param name="repoScope">Optional repository settings scope to persist after the switch commits.</param>
+    /// <param name="modelChangeScope">Settings scope used when persisting the selected model.</param>
+    /// <param name="requireAvailable">Require the target to be currently available and enabled before applying the switch.</param>
+    /// <param name="pickerPersistence">Optional settings context and explicit-override flags used to persist a picker selection.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>The model identifier active on the session after the switch.</returns>
-    public async Task<ModelSwitchToResult> SwitchToAsync(string modelId, string? reasoningEffort = null, ReasoningSummary? reasoningSummary = null, Verbosity? verbosity = null, ModelCapabilitiesOverride? modelCapabilities = null, ContextTier? contextTier = null, bool? deferIfModelChangeQueued = null, CancellationToken cancellationToken = default)
+    public async Task<ModelSwitchToResult> SwitchToAsync(string modelId, string? reasoningEffort = null, ReasoningSummary? reasoningSummary = null, Verbosity? verbosity = null, ModelCapabilitiesOverride? modelCapabilities = null, ContextTier? contextTier = null, ModelChangeSource? source = null, bool? deferIfModelChangeQueued = null, string? compactionDecision = null, bool? runCompactionPreflight = null, string? repoScope = null, string? modelChangeScope = null, bool? requireAvailable = null, ModelPickerPersistenceRequest? pickerPersistence = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(modelId);
         _session.ThrowIfDisposed();
 
-        var request = new ModelSwitchToRequest { SessionId = _session.SessionId, ModelId = modelId, ReasoningEffort = reasoningEffort, ReasoningSummary = reasoningSummary, Verbosity = verbosity, ModelCapabilities = modelCapabilities, ContextTier = contextTier, DeferIfModelChangeQueued = deferIfModelChangeQueued };
+        var request = new ModelSwitchToRequest { SessionId = _session.SessionId, ModelId = modelId, ReasoningEffort = reasoningEffort, ReasoningSummary = reasoningSummary, Verbosity = verbosity, ModelCapabilities = modelCapabilities, ContextTier = contextTier, Source = source, DeferIfModelChangeQueued = deferIfModelChangeQueued, CompactionDecision = compactionDecision, RunCompactionPreflight = runCompactionPreflight, RepoScope = repoScope, ModelChangeScope = modelChangeScope, RequireAvailable = requireAvailable, PickerPersistence = pickerPersistence };
         return await CopilotClient.InvokeRpcAsync<ModelSwitchToResult>(_session.Rpc, "session.model.switchTo", [request], cancellationToken);
     }
 
+    /// <summary>Resolves and applies organization-managed and repository model overlays.</summary>
+    /// <param name="deviceManagedModel">Model required by device-managed policy, when configured.</param>
+    /// <param name="serverManagedModel">Model required by server-managed policy, when configured.</param>
+    /// <param name="repoModel">Model selected by repository settings, when configured.</param>
+    /// <param name="repoReasoningEffort">Reasoning effort selected by repository settings, when configured.</param>
+    /// <param name="repoContextTier">Context tier selected by repository settings, when configured.</param>
+    /// <param name="cliModel">Model explicitly selected by the CLI, when provided.</param>
+    /// <param name="deferredResume">Whether the overlay is being applied while resuming a deferred session.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The model identifier active on the session after the switch.</returns>
+    internal async Task<ModelSwitchToResult> ApplyStartupOverlayAsync(string? deviceManagedModel = null, string? serverManagedModel = null, string? repoModel = null, string? repoReasoningEffort = null, string? repoContextTier = null, string? cliModel = null, bool? deferredResume = null, CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new ModelApplyStartupOverlayRequest { SessionId = _session.SessionId, DeviceManagedModel = deviceManagedModel, ServerManagedModel = serverManagedModel, RepoModel = repoModel, RepoReasoningEffort = repoReasoningEffort, RepoContextTier = repoContextTier, CliModel = cliModel, DeferredResume = deferredResume };
+        return await CopilotClient.InvokeRpcAsync<ModelSwitchToResult>(_session.Rpc, "session.model.applyStartupOverlay", [request], cancellationToken);
+    }
+
     /// <summary>Updates the session's reasoning effort without changing the selected model.</summary>
     /// <param name="reasoningEffort">Reasoning effort level to apply to the currently selected model. The host is responsible for validating the value against the model's supported levels before calling.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
@@ -25145,13 +31863,24 @@ public async Task<SessionMode> GetAsync(CancellationToken cancellationToken = de
 
     /// <summary>Sets the current agent interaction mode.</summary>
     /// <param name="mode">The session mode the agent is operating in.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    public async Task SetAsync(SessionMode mode, CancellationToken cancellationToken = default)
+    /// <param name="inheritPlanBaseFromSessionId">Session whose plan-mode base state should be inherited.</param>
+    /// <param name="planModelConfigured">Whether a dedicated plan model is configured.</param>
+    /// <param name="planModel">Dedicated model to use in plan mode, when configured.</param>
+    /// <param name="planReasoningEffort">Reasoning effort to use with the dedicated plan model.</param>
+    /// <param name="planContextTier">Context tier to use with the dedicated plan model.</param>
+    /// <param name="compactionDecision">Explicit response to a model-switch compaction preflight.</param>
+    /// <param name="restorePlanModel">Whether leaving plan mode should restore the session's previous model.</param>
+    /// <param name="persistPlanSelection">Whether the selected plan model should be persisted.</param>
+    /// <param name="pickerSettingsContext">Settings context used when persisting the selected plan model.</param>
+    /// <param name="planExitAction">Action to perform when leaving plan mode.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.</returns>
+    public async Task<ModeSetResult> SetAsync(SessionMode mode, string? inheritPlanBaseFromSessionId = null, bool? planModelConfigured = null, string? planModel = null, string? planReasoningEffort = null, string? planContextTier = null, string? compactionDecision = null, bool? restorePlanModel = null, bool? persistPlanSelection = null, ModelPickerSettingsContext? pickerSettingsContext = null, string? planExitAction = null, CancellationToken cancellationToken = default)
     {
         _session.ThrowIfDisposed();
 
-        var request = new ModeSetRequest { SessionId = _session.SessionId, Mode = mode };
-        await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.mode.set", [request], cancellationToken);
+        var request = new ModeSetRequest { SessionId = _session.SessionId, Mode = mode, InheritPlanBaseFromSessionId = inheritPlanBaseFromSessionId, PlanModelConfigured = planModelConfigured, PlanModel = planModel, PlanReasoningEffort = planReasoningEffort, PlanContextTier = planContextTier, CompactionDecision = compactionDecision, RestorePlanModel = restorePlanModel, PersistPlanSelection = persistPlanSelection, PickerSettingsContext = pickerSettingsContext, PlanExitAction = planExitAction };
+        return await CopilotClient.InvokeRpcAsync<ModeSetResult>(_session.Rpc, "session.mode.set", [request], cancellationToken);
     }
 }
 
@@ -25659,7 +32388,7 @@ internal TasksApi(CopilotSession session)
     /// <summary>Starts a background agent task in the session.</summary>
     /// <param name="agentType">Type of agent to start (e.g., 'explore', 'task', 'general-purpose').</param>
     /// <param name="prompt">Task prompt for the agent.</param>
-    /// <param name="name">Short name for the agent, used to generate a human-readable ID.</param>
+    /// <param name="name">Friendly, non-unique name used when displaying the agent.</param>
     /// <param name="description">Short description of the task.</param>
     /// <param name="model">Optional model override.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
@@ -25947,16 +32676,25 @@ public async Task ReloadAsync(CancellationToken cancellationToken = default)
         await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.mcp.reload", [request], cancellationToken);
     }
 
+    /// <summary>Releases any turns waiting on an in-flight MCP load without cancelling the load, letting the agent proceed while MCP servers finish connecting in the background. No-op when no MCP load is in flight or waiting turns were already released.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Result of moving in-flight MCP loading to the background.</returns>
+    public async Task<MoveMcpLoadingToBackgroundResult> MoveLoadingToBackgroundAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionMcpMoveLoadingToBackgroundRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<MoveMcpLoadingToBackgroundResult>(_session.Rpc, "session.mcp.moveLoadingToBackground", [request], cancellationToken);
+    }
+
     /// <summary>Reloads MCP server connections for the session with an explicit host-provided configuration.</summary>
-    /// <param name="config">Opaque runtime MCP reload configuration. Marked internal: an in-process runtime shape (reloadMcpServers throws over the wire).</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>MCP server startup filtering result.</returns>
-    internal async Task<McpStartServersResult> ReloadWithConfigAsync(object config, CancellationToken cancellationToken = default)
+    internal async Task<McpStartServersResult> ReloadWithConfigAsync(CancellationToken cancellationToken = default)
     {
-        ArgumentNullException.ThrowIfNull(config);
         _session.ThrowIfDisposed();
 
-        var request = new McpReloadWithConfigRequest { SessionId = _session.SessionId, Config = CopilotClient.ToJsonElementForWire(config)!.Value };
+        var request = new McpReloadWithConfigRequest { SessionId = _session.SessionId };
         return await CopilotClient.InvokeRpcAsync<McpStartServersResult>(_session.Rpc, "session.mcp.reloadWithConfig", [request], cancellationToken);
     }
 
@@ -26016,15 +32754,13 @@ public async Task<McpRemoveGitHubResult> RemoveGitHubAsync(CancellationToken can
     }
 
     /// <summary>Configures the built-in GitHub MCP server for the session's current auth context.</summary>
-    /// <param name="authInfo">Opaque runtime auth info for GitHub MCP configuration. Marked internal: an in-process runtime shape (configureGitHubMcp is a no-op over the wire).</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Result of configuring GitHub MCP.</returns>
-    internal async Task<McpConfigureGitHubResult> ConfigureGitHubAsync(object authInfo, CancellationToken cancellationToken = default)
+    internal async Task<McpConfigureGitHubResult> ConfigureGitHubAsync(CancellationToken cancellationToken = default)
     {
-        ArgumentNullException.ThrowIfNull(authInfo);
         _session.ThrowIfDisposed();
 
-        var request = new McpConfigureGitHubRequest { SessionId = _session.SessionId, AuthInfo = CopilotClient.ToJsonElementForWire(authInfo)!.Value };
+        var request = new McpConfigureGitHubRequest { SessionId = _session.SessionId };
         return await CopilotClient.InvokeRpcAsync<McpConfigureGitHubResult>(_session.Rpc, "session.mcp.configureGitHub", [request], cancellationToken);
     }
 
@@ -26068,19 +32804,13 @@ public async Task StopServerAsync(string serverName, CancellationToken cancellat
 
     /// <summary>Registers a pre-connected external MCP client (e.g. IDE) on the session's host. The caller retains lifecycle ownership of the client and transport. Marked internal because the `client` and `transport` arguments are in-process MCP SDK instances that cannot be serialized across the JSON-RPC boundary; once the CLI moves on top of the SDK, external clients will be expressed as transport configs the runtime can construct itself.</summary>
     /// <param name="serverName">Logical server name for the external client.</param>
-    /// <param name="client">In-process MCP Client instance. Marked internal: cannot be serialized across the JSON-RPC boundary.</param>
-    /// <param name="transport">In-process MCP Transport instance. Marked internal: cannot be serialized across the JSON-RPC boundary.</param>
-    /// <param name="config">In-process server config (MCPServerConfig) paired with the in-process client/transport. Marked internal alongside its companions.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    internal async Task RegisterExternalClientAsync(string serverName, object client, object transport, object config, CancellationToken cancellationToken = default)
+    internal async Task RegisterExternalClientAsync(string serverName, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(serverName);
-        ArgumentNullException.ThrowIfNull(client);
-        ArgumentNullException.ThrowIfNull(transport);
-        ArgumentNullException.ThrowIfNull(config);
         _session.ThrowIfDisposed();
 
-        var request = new McpRegisterExternalClientRequest { SessionId = _session.SessionId, ServerName = serverName, Client = CopilotClient.ToJsonElementForWire(client)!.Value, Transport = CopilotClient.ToJsonElementForWire(transport)!.Value, Config = CopilotClient.ToJsonElementForWire(config)!.Value };
+        var request = new McpRegisterExternalClientRequest { SessionId = _session.SessionId, ServerName = serverName };
         await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.mcp.registerExternalClient", [request], cancellationToken);
     }
 
@@ -26192,6 +32922,19 @@ public async Task<McpOauthLoginResult> LoginAsync(string serverName, bool? force
         return await CopilotClient.InvokeRpcAsync<McpOauthLoginResult>(_session.Rpc, "session.mcp.oauth.login", [request], cancellationToken);
     }
 
+    /// <summary>Passively probes a configured remote MCP server to classify whether OAuth is required or a cached/override token is accepted. Does not start OAuth, emit pending OAuth requests, or mutate MCP connection state.</summary>
+    /// <param name="serverName">Name of the configured remote MCP server to probe.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Passive MCP OAuth probe result. `authenticated` means the server accepted the probe request while an OAuth-origin access token was attached; it does not prove the server required or independently validated that token. The probe does not make a second unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are reserved for API-call failures.</returns>
+    public async Task<McpOauthProbeResult> ProbeAsync(string serverName, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(serverName);
+        _session.ThrowIfDisposed();
+
+        var request = new McpOauthProbeRequest { SessionId = _session.SessionId, ServerName = serverName };
+        return await CopilotClient.InvokeRpcAsync<McpOauthProbeResult>(_session.Rpc, "session.mcp.oauth.probe", [request], cancellationToken);
+    }
+
     /// <summary>Responds to a pending MCP OAuth authorization request by its request id.</summary>
     /// <param name="requestId">OAuth request identifier from the mcp.oauth_required event.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
@@ -26490,10 +33233,12 @@ internal OptionsApi(CopilotSession session)
     /// <param name="shellInitProfile">Use shell.initProfile instead. Shell init profile (`None` or `NonInteractive`).</param>
     /// <param name="shellProcessFlags">PowerShell process flags applied to built-in and user-requested shell commands.</param>
     /// <param name="sandboxConfig">Resolved sandbox configuration.</param>
+    /// <param name="sandboxConfigSource">Origin of the sandbox choice. The runtime uses this only for internal telemetry provenance; managed policy is derived independently.</param>
     /// <param name="logInteractiveShells">Whether interactive shell sessions are logged.</param>
     /// <param name="envValueMode">How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch).</param>
     /// <param name="allowAllMcpServerInstructions">Whether to include instructions from every MCP server in the system prompt instead of only allowlisted servers.</param>
     /// <param name="skillDirectories">Additional directories to search for skills.</param>
+    /// <param name="includedBuiltinSkills">Built-in skill names to include in this session. When specified, only these runtime-bundled skills are available. Skills from other sources with the same name remain available. Set to null to remove the allowlist restriction.</param>
     /// <param name="disabledSkills">Skill IDs that should be excluded from this session.</param>
     /// <param name="enableOnDemandInstructionDiscovery">Whether to discover custom instructions on demand after successful file views (AGENTS.md / CLAUDE.md / .github/copilot-instructions.md surfacing). Combined with `skipCustomInstructions`.</param>
     /// <param name="maxInlineBinaryBytes">Maximum decoded byte size of a single model-facing binary tool result (e.g. an image) persisted inline in session events and re-presented to the model on later turns / resume. Larger results are persisted as a metadata-only marker and shown to the model as a short text note. Defaults to 10 MB.</param>
@@ -26526,11 +33271,11 @@ internal OptionsApi(CopilotSession session)
     /// <param name="sessionLimits">Optional session limits. Pass null to clear the session limits.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Indicates whether the session options patch was applied successfully.</returns>
-    public async Task<SessionUpdateOptionsResult> UpdateAsync(string? model = null, ModelCapabilitiesOverride? modelCapabilitiesOverrides = null, string? reasoningEffort = null, OptionsUpdateReasoningSummary? reasoningSummary = null, Verbosity? verbosity = null, string? clientName = null, string? lspClientName = null, string? integrationId = null, IDictionary<string, bool>? featureFlags = null, bool? isExperimentalMode = null, ProviderConfig? provider = null, CapiSessionOptions? capi = null, string? workingDirectory = null, IList<string>? availableTools = null, IList<string>? excludedTools = null, IList<string>? includedBuiltinAgents = null, IList<string>? excludedBuiltinAgents = null, OptionsUpdateToolFilterPrecedence? toolFilterPrecedence = null, bool? enableScriptSafety = null, ShellOptions? shell = null, string? shellInitProfile = null, IList<string>? shellProcessFlags = null, SandboxConfig? sandboxConfig = null, bool? logInteractiveShells = null, OptionsUpdateEnvValueMode? envValueMode = null, bool? allowAllMcpServerInstructions = null, IList<string>? skillDirectories = null, IList<string>? disabledSkills = null, bool? enableOnDemandInstructionDiscovery = null, long? maxInlineBinaryBytes = null, IList<SessionInstalledPlugin>? installedPlugins = null, bool? customAgentsLocalOnly = null, bool? suppressCustomAgentPrompt = null, bool? skipCustomInstructions = null, IList<string>? disabledInstructionSources = null, bool? coauthorEnabled = null, string? trajectoryFile = null, bool? enableStreaming = null, string? copilotUrl = null, bool? askUserDisabled = null, bool? continueOnAutoMode = null, bool? runningInInteractiveMode = null, bool? enableReasoningSummaries = null, string? agentContext = null, string? eventsLogDirectory = null, bool? eventsLogIncludesSubagents = null, IList<OptionsUpdateAdditionalContentExclusionPolicy>? additionalContentExclusionPolicies = null, bool? manageScheduleEnabled = null, IList<SessionCapability>? sessionCapabilities = null, bool? skipEmbeddingRetrieval = null, string? organizationCustomInstructions = null, bool? enableFileHooks = null, bool? enableHostGitOperations = null, bool? enableSessionStore = null, bool? enableSkills = null, OptionsUpdateContextTier? contextTier = null, SessionLimitsConfig? sessionLimits = null, CancellationToken cancellationToken = default)
+    public async Task<SessionUpdateOptionsResult> UpdateAsync(string? model = null, ModelCapabilitiesOverride? modelCapabilitiesOverrides = null, string? reasoningEffort = null, OptionsUpdateReasoningSummary? reasoningSummary = null, Verbosity? verbosity = null, string? clientName = null, string? lspClientName = null, string? integrationId = null, IDictionary<string, bool>? featureFlags = null, bool? isExperimentalMode = null, ProviderConfig? provider = null, CapiSessionOptions? capi = null, string? workingDirectory = null, IList<string>? availableTools = null, IList<string>? excludedTools = null, IList<string>? includedBuiltinAgents = null, IList<string>? excludedBuiltinAgents = null, OptionsUpdateToolFilterPrecedence? toolFilterPrecedence = null, bool? enableScriptSafety = null, ShellOptions? shell = null, string? shellInitProfile = null, IList<string>? shellProcessFlags = null, SandboxConfig? sandboxConfig = null, SandboxConfigSource? sandboxConfigSource = null, bool? logInteractiveShells = null, OptionsUpdateEnvValueMode? envValueMode = null, bool? allowAllMcpServerInstructions = null, IList<string>? skillDirectories = null, IList<string>? includedBuiltinSkills = null, IList<string>? disabledSkills = null, bool? enableOnDemandInstructionDiscovery = null, long? maxInlineBinaryBytes = null, IList<SessionInstalledPlugin>? installedPlugins = null, bool? customAgentsLocalOnly = null, bool? suppressCustomAgentPrompt = null, bool? skipCustomInstructions = null, IList<string>? disabledInstructionSources = null, bool? coauthorEnabled = null, string? trajectoryFile = null, bool? enableStreaming = null, string? copilotUrl = null, bool? askUserDisabled = null, bool? continueOnAutoMode = null, bool? runningInInteractiveMode = null, bool? enableReasoningSummaries = null, string? agentContext = null, string? eventsLogDirectory = null, bool? eventsLogIncludesSubagents = null, IList<OptionsUpdateAdditionalContentExclusionPolicy>? additionalContentExclusionPolicies = null, bool? manageScheduleEnabled = null, IList<SessionCapability>? sessionCapabilities = null, bool? skipEmbeddingRetrieval = null, string? organizationCustomInstructions = null, bool? enableFileHooks = null, bool? enableHostGitOperations = null, bool? enableSessionStore = null, bool? enableSkills = null, OptionsUpdateContextTier? contextTier = null, SessionLimitsConfig? sessionLimits = null, CancellationToken cancellationToken = default)
     {
         _session.ThrowIfDisposed();
 
-        var request = new SessionUpdateOptionsParams { SessionId = _session.SessionId, Model = model, ModelCapabilitiesOverrides = modelCapabilitiesOverrides, ReasoningEffort = reasoningEffort, ReasoningSummary = reasoningSummary, Verbosity = verbosity, ClientName = clientName, LspClientName = lspClientName, IntegrationId = integrationId, FeatureFlags = featureFlags, IsExperimentalMode = isExperimentalMode, Provider = provider, Capi = capi, WorkingDirectory = workingDirectory, AvailableTools = availableTools, ExcludedTools = excludedTools, IncludedBuiltinAgents = includedBuiltinAgents, ExcludedBuiltinAgents = excludedBuiltinAgents, ToolFilterPrecedence = toolFilterPrecedence, EnableScriptSafety = enableScriptSafety, Shell = shell, ShellInitProfile = shellInitProfile, ShellProcessFlags = shellProcessFlags, SandboxConfig = sandboxConfig, LogInteractiveShells = logInteractiveShells, EnvValueMode = envValueMode, AllowAllMcpServerInstructions = allowAllMcpServerInstructions, SkillDirectories = skillDirectories, DisabledSkills = disabledSkills, EnableOnDemandInstructionDiscovery = enableOnDemandInstructionDiscovery, MaxInlineBinaryBytes = maxInlineBinaryBytes, InstalledPlugins = installedPlugins, CustomAgentsLocalOnly = customAgentsLocalOnly, SuppressCustomAgentPrompt = suppressCustomAgentPrompt, SkipCustomInstructions = skipCustomInstructions, DisabledInstructionSources = disabledInstructionSources, CoauthorEnabled = coauthorEnabled, TrajectoryFile = trajectoryFile, EnableStreaming = enableStreaming, CopilotUrl = copilotUrl, AskUserDisabled = askUserDisabled, ContinueOnAutoMode = continueOnAutoMode, RunningInInteractiveMode = runningInInteractiveMode, EnableReasoningSummaries = enableReasoningSummaries, AgentContext = agentContext, EventsLogDirectory = eventsLogDirectory, EventsLogIncludesSubagents = eventsLogIncludesSubagents, AdditionalContentExclusionPolicies = additionalContentExclusionPolicies, ManageScheduleEnabled = manageScheduleEnabled, SessionCapabilities = sessionCapabilities, SkipEmbeddingRetrieval = skipEmbeddingRetrieval, OrganizationCustomInstructions = organizationCustomInstructions, EnableFileHooks = enableFileHooks, EnableHostGitOperations = enableHostGitOperations, EnableSessionStore = enableSessionStore, EnableSkills = enableSkills, ContextTier = contextTier, SessionLimits = sessionLimits };
+        var request = new SessionUpdateOptionsParams { SessionId = _session.SessionId, Model = model, ModelCapabilitiesOverrides = modelCapabilitiesOverrides, ReasoningEffort = reasoningEffort, ReasoningSummary = reasoningSummary, Verbosity = verbosity, ClientName = clientName, LspClientName = lspClientName, IntegrationId = integrationId, FeatureFlags = featureFlags, IsExperimentalMode = isExperimentalMode, Provider = provider, Capi = capi, WorkingDirectory = workingDirectory, AvailableTools = availableTools, ExcludedTools = excludedTools, IncludedBuiltinAgents = includedBuiltinAgents, ExcludedBuiltinAgents = excludedBuiltinAgents, ToolFilterPrecedence = toolFilterPrecedence, EnableScriptSafety = enableScriptSafety, Shell = shell, ShellInitProfile = shellInitProfile, ShellProcessFlags = shellProcessFlags, SandboxConfig = sandboxConfig, SandboxConfigSource = sandboxConfigSource, LogInteractiveShells = logInteractiveShells, EnvValueMode = envValueMode, AllowAllMcpServerInstructions = allowAllMcpServerInstructions, SkillDirectories = skillDirectories, IncludedBuiltinSkills = includedBuiltinSkills, DisabledSkills = disabledSkills, EnableOnDemandInstructionDiscovery = enableOnDemandInstructionDiscovery, MaxInlineBinaryBytes = maxInlineBinaryBytes, InstalledPlugins = installedPlugins, CustomAgentsLocalOnly = customAgentsLocalOnly, SuppressCustomAgentPrompt = suppressCustomAgentPrompt, SkipCustomInstructions = skipCustomInstructions, DisabledInstructionSources = disabledInstructionSources, CoauthorEnabled = coauthorEnabled, TrajectoryFile = trajectoryFile, EnableStreaming = enableStreaming, CopilotUrl = copilotUrl, AskUserDisabled = askUserDisabled, ContinueOnAutoMode = continueOnAutoMode, RunningInInteractiveMode = runningInInteractiveMode, EnableReasoningSummaries = enableReasoningSummaries, AgentContext = agentContext, EventsLogDirectory = eventsLogDirectory, EventsLogIncludesSubagents = eventsLogIncludesSubagents, AdditionalContentExclusionPolicies = additionalContentExclusionPolicies, ManageScheduleEnabled = manageScheduleEnabled, SessionCapabilities = sessionCapabilities, SkipEmbeddingRetrieval = skipEmbeddingRetrieval, OrganizationCustomInstructions = organizationCustomInstructions, EnableFileHooks = enableFileHooks, EnableHostGitOperations = enableHostGitOperations, EnableSessionStore = enableSessionStore, EnableSkills = enableSkills, ContextTier = contextTier, SessionLimits = sessionLimits };
         return await CopilotClient.InvokeRpcAsync<SessionUpdateOptionsResult>(_session.Rpc, "session.options.update", [request], cancellationToken);
     }
 }
@@ -26641,6 +33386,57 @@ internal ToolsApi(CopilotSession session)
         _session = session;
     }
 
+    /// <summary>Executes one tool from the session's currently offered tool set through the native invocation pipeline.</summary>
+    /// <param name="name">Name of the currently offered tool to execute.</param>
+    /// <param name="arguments">Arguments supplied to the tool.</param>
+    /// <param name="toolCallId">Optional identifier used to correlate this invocation with its tool call.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Canonical result returned by a session tool.</returns>
+    public async Task<JsonElement> ExecuteAsync(string name, object arguments, string? toolCallId = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(arguments);
+        _session.ThrowIfDisposed();
+
+        var request = new ToolsExecuteRequest { SessionId = _session.SessionId, Name = name, Arguments = CopilotClient.ToJsonElementForWire(arguments)!.Value, ToolCallId = toolCallId };
+        return await CopilotClient.InvokeRpcAsync<JsonElement>(_session.Rpc, "session.tools.execute", [request], cancellationToken);
+    }
+
+    /// <summary>Returns the Rust-owned built-in tool descriptors used to construct the session's offered tool set.</summary>
+    /// <param name="noViewLineNumbers">Whether line numbers should be omitted from the view tool descriptor.</param>
+    /// <param name="reduceUserIntervention">Whether descriptors should favor fewer user-intervention prompts.</param>
+    /// <param name="includeAuthor">Whether tool descriptors should include authoring metadata.</param>
+    /// <param name="skillEmbeddingEnabled">Whether semantic skill lookup is available.</param>
+    /// <param name="shellConfig">Shell-specific names and description lines for shell tools.</param>
+    /// <param name="shellAsyncOnlyEnabled">Whether shell commands may only run asynchronously.</param>
+    /// <param name="shellSupportsPowerShell7Syntax">Whether the configured shell supports PowerShell 7 syntax.</param>
+    /// <param name="shellTimeoutMs">Default shell timeout in milliseconds.</param>
+    /// <param name="backgroundTaskNotificationsEnabled">Whether background task completion notifications are enabled.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Rust-owned built-in tool descriptors for the session.</returns>
+    public async Task<ToolsGetBuiltinDescriptorsResult> GetBuiltinDescriptorsAsync(bool? noViewLineNumbers = null, bool? reduceUserIntervention = null, bool? includeAuthor = null, bool? skillEmbeddingEnabled = null, ToolsShellDescriptorConfig? shellConfig = null, bool? shellAsyncOnlyEnabled = null, bool? shellSupportsPowerShell7Syntax = null, double? shellTimeoutMs = null, bool? backgroundTaskNotificationsEnabled = null, CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new ToolsGetBuiltinDescriptorsRequest { SessionId = _session.SessionId, NoViewLineNumbers = noViewLineNumbers, ReduceUserIntervention = reduceUserIntervention, IncludeAuthor = includeAuthor, SkillEmbeddingEnabled = skillEmbeddingEnabled, ShellConfig = shellConfig, ShellAsyncOnlyEnabled = shellAsyncOnlyEnabled, ShellSupportsPowerShell7Syntax = shellSupportsPowerShell7Syntax, ShellTimeoutMs = shellTimeoutMs, BackgroundTaskNotificationsEnabled = backgroundTaskNotificationsEnabled };
+        return await CopilotClient.InvokeRpcAsync<ToolsGetBuiltinDescriptorsResult>(_session.Rpc, "session.tools.getBuiltinDescriptors", [request], cancellationToken);
+    }
+
+    /// <summary>Projects a completed task_complete tool call into its label-safe session event payload.</summary>
+    /// <param name="toolArgs">Arguments supplied to the completed task_complete tool call.</param>
+    /// <param name="finalResult">Final expanded result returned by the task_complete tool.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Task completion notification with summary from the agent.</returns>
+    public async Task<TaskCompleteData> TaskCompleteEventDataAsync(object toolArgs, ToolResultExpanded finalResult, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(toolArgs);
+        ArgumentNullException.ThrowIfNull(finalResult);
+        _session.ThrowIfDisposed();
+
+        var request = new ToolsTaskCompleteEventDataRequest { SessionId = _session.SessionId, ToolArgs = CopilotClient.ToJsonElementForWire(toolArgs)!.Value, FinalResult = finalResult };
+        return await CopilotClient.InvokeRpcAsync<TaskCompleteData>(_session.Rpc, "session.tools.taskCompleteEventData", [request], cancellationToken);
+    }
+
     /// <summary>Provides the result for a pending external tool call.</summary>
     /// <param name="requestId">Request ID of the pending tool call.</param>
     /// <param name="result">Tool call result (string or expanded result object).</param>
@@ -26678,6 +33474,19 @@ public async Task<ToolsGetCurrentMetadataResult> GetCurrentMetadataAsync(Cancell
         return await CopilotClient.InvokeRpcAsync<ToolsGetCurrentMetadataResult>(_session.Rpc, "session.tools.getCurrentMetadata", [request], cancellationToken);
     }
 
+    /// <summary>Atomically replaces the complete externally implemented tool list supplied by the calling connection. Built-in, MCP/plugin, extension-discovered, subagent, and tools supplied by other connections remain unchanged.</summary>
+    /// <param name="tools">Complete replacement list for the calling connection.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Empty result after replacing the calling connection's externally implemented tools.</returns>
+    public async Task<ToolsSetResult> SetAsync(IList<ProtocolExternalToolDefinition> tools, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(tools);
+        _session.ThrowIfDisposed();
+
+        var request = new ToolsSetRequest { SessionId = _session.SessionId, Tools = tools };
+        return await CopilotClient.InvokeRpcAsync<ToolsSetResult>(_session.Rpc, "session.tools.set", [request], cancellationToken);
+    }
+
     /// <summary>Updates the current session's live subagent settings after user settings change. The persisted user settings remain the source of truth for future sessions.</summary>
     /// <param name="subagents">Subagent settings to apply, or null to clear the live session override.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
@@ -26717,17 +33526,32 @@ public async Task<CommandList> ListAsync(SessionCommandsListRequest? request = n
     /// <summary>Invokes a slash command in the session.</summary>
     /// <param name="name">Command name. Leading slashes are stripped and the name is matched case-insensitively.</param>
     /// <param name="input">Raw input after the command name.</param>
+    /// <param name="origin">Optional client surface that initiated the invocation.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Result of invoking the slash command (text output, prompt to send to the agent, completion, or subcommand selection).</returns>
-    public async Task<SlashCommandInvocationResult> InvokeAsync(string name, string? input = null, CancellationToken cancellationToken = default)
+    public async Task<SlashCommandInvocationResult> InvokeAsync(string name, string? input = null, CommandsInvocationOrigin? origin = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(name);
         _session.ThrowIfDisposed();
 
-        var request = new CommandsInvokeRequest { SessionId = _session.SessionId, Name = name, Input = input };
+        var request = new CommandsInvokeRequest { SessionId = _session.SessionId, Name = name, Input = input, Origin = origin };
         return await CopilotClient.InvokeRpcAsync<SlashCommandInvocationResult>(_session.Rpc, "session.commands.invoke", [request], cancellationToken);
     }
 
+    /// <summary>Finalizes persistence associated with a client-applied slash-command effect.</summary>
+    /// <param name="effect">The slash-command result object that produced the pending effect, echoed back unchanged.</param>
+    /// <param name="outcome">Whether the host applied or cancelled the pending invocation effect.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Whether finalizing the invocation effect succeeded, and the failure reason when it did not.</returns>
+    internal async Task<CommandsFinalizeInvocationEffectResult> FinalizeInvocationEffectAsync(CommandsFinalizeInvocationEffectRequestEffect effect, CommandsInvocationEffectOutcome outcome, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(effect);
+        _session.ThrowIfDisposed();
+
+        var request = new CommandsFinalizeInvocationEffectRequest { SessionId = _session.SessionId, Effect = effect, Outcome = outcome };
+        return await CopilotClient.InvokeRpcAsync<CommandsFinalizeInvocationEffectResult>(_session.Rpc, "session.commands.finalizeInvocationEffect", [request], cancellationToken);
+    }
+
     /// <summary>Reports completion of a pending client-handled slash command.</summary>
     /// <param name="requestId">Request ID from the command invocation event.</param>
     /// <param name="error">Error message if the command handler failed.</param>
@@ -26834,31 +33658,32 @@ internal UiApi(CopilotSession session)
 
     /// <summary>Runs a transient no-tools model query against the current conversation context.</summary>
     /// <param name="question">Question to answer from the current conversation context.</param>
-    /// <param name="onChunk">In-process streaming callback `(text) =&gt; void` invoked with each token as the model emits it. Marked internal: excluded from the public SDK surface. In a process-separated SDK this is replaced by a streaming RPC that yields chunks and a final answer.</param>
-    /// <param name="abortSignal">In-process `AbortSignal` forwarded to the model client to cancel an in-flight request. Marked internal: excluded from the public SDK surface. Replaced by an explicit cancellation token + cancel RPC in the SDK migration.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Transient answer generated from current conversation context.</returns>
-    public async Task<UIEphemeralQueryResult> EphemeralQueryAsync(string question, object? onChunk = null, object? abortSignal = null, CancellationToken cancellationToken = default)
+    /// <returns>Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs.</returns>
+    public async Task<UIEphemeralQueryResult> EphemeralQueryAsync(string question, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(question);
         _session.ThrowIfDisposed();
 
-        var request = new UIEphemeralQueryRequest { SessionId = _session.SessionId, Question = question, OnChunk = CopilotClient.ToJsonElementForWire(onChunk), AbortSignal = CopilotClient.ToJsonElementForWire(abortSignal) };
+        var request = new UIEphemeralQueryRequest { SessionId = _session.SessionId, Question = question };
         return await CopilotClient.InvokeRpcAsync<UIEphemeralQueryResult>(_session.Rpc, "session.ui.ephemeralQuery", [request], cancellationToken);
     }
 
     /// <summary>Requests structured input from a UI-capable client.</summary>
     /// <param name="message">Message describing what information is needed from the user.</param>
     /// <param name="requestedSchema">JSON Schema describing the form fields to present to the user.</param>
+    /// <param name="mode">Elicitation mode. Omitted and form are equivalent for structured elicitation.</param>
+    /// <param name="_meta">MCP request metadata.</param>
+    /// <param name="task">MCP task metadata.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>The elicitation response (accept with form values, decline, or cancel).</returns>
-    public async Task<UIElicitationResponse> ElicitationAsync(string message, UIElicitationSchema requestedSchema, CancellationToken cancellationToken = default)
+    public async Task<UIElicitationResponse> ElicitationAsync(string message, UIElicitationSchema requestedSchema, McpElicitationFormMode? mode = null, UIElicitationRequestMeta? _meta = null, McpTaskMetadata? task = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(message);
         ArgumentNullException.ThrowIfNull(requestedSchema);
         _session.ThrowIfDisposed();
 
-        var request = new UIElicitationRequest { SessionId = _session.SessionId, Message = message, RequestedSchema = requestedSchema };
+        var request = new UIElicitationRequest { SessionId = _session.SessionId, Message = message, RequestedSchema = requestedSchema, Mode = mode, Meta = _meta, Task = task };
         return await CopilotClient.InvokeRpcAsync<UIElicitationResponse>(_session.Rpc, "session.ui.elicitation", [request], cancellationToken);
     }
 
@@ -27006,15 +33831,16 @@ public async Task<PermissionsConfigureResult> ConfigureAsync(bool? approveAllToo
     /// <summary>Provides a decision for a pending tool permission request.</summary>
     /// <param name="requestId">Request ID of the pending permission request.</param>
     /// <param name="result">The client's response to the pending permission prompt.</param>
+    /// <param name="decisionContext">Optional informational context describing how and where this response was made. Omit it to preserve legacy behavior without attributing an origin.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Indicates whether the permission decision was applied; false when the request was already resolved.</returns>
-    public async Task<PermissionRequestResult> HandlePendingPermissionRequestAsync(string requestId, PermissionDecision result, CancellationToken cancellationToken = default)
+    public async Task<PermissionRequestResult> HandlePendingPermissionRequestAsync(string requestId, PermissionDecision result, PermissionDecisionContext? decisionContext = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(requestId);
         ArgumentNullException.ThrowIfNull(result);
         _session.ThrowIfDisposed();
 
-        var request = new PermissionDecisionRequest { SessionId = _session.SessionId, RequestId = requestId, Result = result };
+        var request = new PermissionDecisionRequest { SessionId = _session.SessionId, RequestId = requestId, Result = result, DecisionContext = decisionContext };
         return await CopilotClient.InvokeRpcAsync<PermissionRequestResult>(_session.Rpc, "session.permissions.handlePendingPermissionRequest", [request], cancellationToken);
     }
 
@@ -27042,30 +33868,29 @@ public async Task<PermissionsSetApproveAllResult> SetApproveAllAsync(bool enable
         return await CopilotClient.InvokeRpcAsync<PermissionsSetApproveAllResult>(_session.Rpc, "session.permissions.setApproveAll", [request], cancellationToken);
     }
 
-    /// <summary>Sets the allow-all permission mode for the session. Used by attach-mode clients (e.g. LocalRpcSession's `/allow-all` forwarder) to flip the target session's permission state. The `on` mode swaps in unrestricted path and URL managers and emits `session.permissions_changed` on transition; the `auto` mode keeps normal prompt paths active while attaching LLM safety recommendations. The result returns the authoritative post-mutation state so callers can update their local mirrors without racing the `session.permissions_changed` notification on the same wire.</summary>
-    /// <param name="mode">Allow-all mode to apply. `on` enables full allow-all; `auto` enables advisory LLM auto-approval; `off` disables both.</param>
-    /// <param name="enabled">Legacy full allow-all toggle. Prefer `mode`; when `mode` is omitted, `enabled: true` is treated as `mode: "on"` and any other value is treated as `mode: "off"`.</param>
-    /// <param name="model">Optional model id for the `auto` mode auto-approval LLM judging. Only meaningful when `mode` is `auto`; ignored otherwise. When omitted, the session resolves a default judge model: `gpt-5.5` for CAPI sessions and the session's active model for BYOK sessions.</param>
-    /// <param name="source">Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.</param>
+    /// <summary>Sets the permission mode for the session. `manual` follows the normal approval flow, `assisted` attaches LLM safety recommendations, and `allow-all` automatically approves permission requests. The result returns the authoritative post-mutation mode so callers can update local state without racing the `session.permissions_changed` notification.</summary>
+    /// <param name="mode">Permission mode to apply.</param>
+    /// <param name="assistedApprovalModel">Optional judge model id for assisted mode. When omitted, the session resolves the provider default: `gpt-5.5` for CAPI sessions and the active session model for BYOK sessions.</param>
+    /// <param name="source">Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK callers.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Indicates whether the operation succeeded and reports the post-mutation state.</returns>
-    public async Task<AllowAllPermissionSetResult> SetAllowAllAsync(PermissionsAllowAllMode? mode = null, bool? enabled = null, string? model = null, PermissionsSetAllowAllSource? source = null, CancellationToken cancellationToken = default)
+    /// <returns>Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode.</returns>
+    public async Task<PermissionsSetModeResult> SetModeAsync(PermissionMode mode, string? assistedApprovalModel = null, PermissionModeSource? source = null, CancellationToken cancellationToken = default)
     {
         _session.ThrowIfDisposed();
 
-        var request = new PermissionsSetAllowAllRequest { SessionId = _session.SessionId, Mode = mode, Enabled = enabled, Model = model, Source = source };
-        return await CopilotClient.InvokeRpcAsync<AllowAllPermissionSetResult>(_session.Rpc, "session.permissions.setAllowAll", [request], cancellationToken);
+        var request = new PermissionsSetModeRequest { SessionId = _session.SessionId, Mode = mode, AssistedApprovalModel = assistedApprovalModel, Source = source };
+        return await CopilotClient.InvokeRpcAsync<PermissionsSetModeResult>(_session.Rpc, "session.permissions.setMode", [request], cancellationToken);
     }
 
-    /// <summary>Returns the current allow-all permission mode for the session.</summary>
+    /// <summary>Returns the current permission mode for the session.</summary>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Current allow-all permission mode.</returns>
-    public async Task<AllowAllPermissionState> GetAllowAllAsync(CancellationToken cancellationToken = default)
+    /// <returns>Current permission mode.</returns>
+    public async Task<PermissionsGetModeResult> GetModeAsync(CancellationToken cancellationToken = default)
     {
         _session.ThrowIfDisposed();
 
-        var request = new PermissionsGetAllowAllRequest { SessionId = _session.SessionId };
-        return await CopilotClient.InvokeRpcAsync<AllowAllPermissionState>(_session.Rpc, "session.permissions.getAllowAll", [request], cancellationToken);
+        var request = new PermissionsGetModeRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<PermissionsGetModeResult>(_session.Rpc, "session.permissions.getMode", [request], cancellationToken);
     }
 
     /// <summary>Adds or removes session-scoped or location-scoped permission rules.</summary>
@@ -27167,8 +33992,8 @@ public async Task<PermissionPathsList> ListAsync(CancellationToken cancellationT
         return await CopilotClient.InvokeRpcAsync<PermissionPathsList>(_session.Rpc, "session.permissions.paths.list", [request], cancellationToken);
     }
 
-    /// <summary>Adds a directory to the session's allow-list.</summary>
-    /// <param name="path">Directory to add to the allow-list. The runtime resolves and validates the path before adding.</param>
+    /// <summary>Adds a directory to the session's allow-list and activates conventional skill and agent definitions under it.</summary>
+    /// <param name="path">Directory to add to the allow-list. The runtime resolves and validates the path before adding, then loads conventional `.github/skills/` and `.github/agents/` definitions under it when their subsystem gates are enabled. Adding the directory is therefore also a trust decision for configuration stored there.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Indicates whether the operation succeeded.</returns>
     public async Task<PermissionsPathsAddResult> AddAsync(string path, CancellationToken cancellationToken = default)
@@ -27756,7 +34581,7 @@ public async Task<QueueMoveItemResult> MoveItemAsync(string id, long toPosition,
 
     /// <summary>Inserts a new queued message at a public visible position.</summary>
     /// <param name="position">Zero-based position in the public visible queue. Values outside the queue clamp to an end.</param>
-    /// <param name="message">The message parameter.</param>
+    /// <param name="message">Queued message contents and delivery metadata.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Result of inserting a queued message.</returns>
     public async Task<QueueInsertAtResult> InsertAtAsync(long position, QueueInsertMessage message, CancellationToken cancellationToken = default)
@@ -27769,7 +34594,7 @@ public async Task<QueueInsertAtResult> InsertAtAsync(long position, QueueInsertM
     }
 
     /// <summary>Removes an addressable queued item by its stable id.</summary>
-    /// <param name="id">The id parameter.</param>
+    /// <param name="id">Stable opaque ID of the queued item to remove.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Result of removing a queued item.</returns>
     public async Task<QueueRemoveAtResult> RemoveAtAsync(string id, CancellationToken cancellationToken = default)
@@ -27782,9 +34607,9 @@ public async Task<QueueRemoveAtResult> RemoveAtAsync(string id, CancellationToke
     }
 
     /// <summary>Updates the text of an addressable single-message queue item.</summary>
-    /// <param name="id">The id parameter.</param>
-    /// <param name="prompt">The prompt parameter.</param>
-    /// <param name="displayPrompt">The displayPrompt parameter.</param>
+    /// <param name="id">Stable opaque ID of the queued item to edit.</param>
+    /// <param name="prompt">Replacement prompt sent to the model.</param>
+    /// <param name="displayPrompt">Optional replacement prompt displayed to the user.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Result of editing a queued message.</returns>
     public async Task<QueueUpdateTextResult> UpdateTextAsync(string id, string prompt, string? displayPrompt = null, CancellationToken cancellationToken = default)
@@ -27798,7 +34623,7 @@ public async Task<QueueUpdateTextResult> UpdateTextAsync(string id, string promp
     }
 
     /// <summary>Duplicates an addressable queued item immediately after its source.</summary>
-    /// <param name="id">The id parameter.</param>
+    /// <param name="id">Stable opaque ID of the queued item to duplicate.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Result of duplicating a queued item.</returns>
     public async Task<QueueDuplicateAtResult> DuplicateAtAsync(string id, CancellationToken cancellationToken = default)
@@ -27811,7 +34636,7 @@ public async Task<QueueDuplicateAtResult> DuplicateAtAsync(string id, Cancellati
     }
 
     /// <summary>Acquires or releases the queued-lane drain pause.</summary>
-    /// <param name="paused">The paused parameter.</param>
+    /// <param name="paused">Whether queued-lane draining should be paused.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     public async Task SetDrainPausedAsync(bool paused, CancellationToken cancellationToken = default)
     {
@@ -27822,7 +34647,7 @@ public async Task SetDrainPausedAsync(bool paused, CancellationToken cancellatio
     }
 
     /// <summary>Moves an addressable queued message into the live turn's steering lane.</summary>
-    /// <param name="id">The id parameter.</param>
+    /// <param name="id">Stable opaque ID of the queued item to steer into the live turn.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Result of trying to steer a queued message into a live turn.</returns>
     public async Task<QueueSendNowResult> SendNowAsync(string id, CancellationToken cancellationToken = default)
@@ -28528,6 +35353,17 @@ public static void RegisterClientSessionApiHandlers(JsonRpc rpc, Func<string, Cl
     }
 }
 
+/// <summary>Handles `extensionLaunchProvider` client global API methods.</summary>
+[Experimental(Diagnostics.Experimental)]
+public interface IExtensionLaunchProviderHandler
+{
+    /// <summary>Asks the registered SDK client to resolve an opaque process launch profile for one discovered extension entrypoint immediately before launch or reload. The provider must respond within 15 seconds.</summary>
+    /// <param name="request">A discovered extension entrypoint that the registered integrator may classify and resolve to an opaque launch profile.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The launch profile for a supported entrypoint. Omit launch when the provider does not support the entrypoint.</returns>
+    Task<ExtensionLaunchProviderResolveResult> ResolveAsync(ExtensionLaunchProviderResolveRequest request, CancellationToken cancellationToken = default);
+}
+
 /// <summary>Handles `llmInference` client global API methods.</summary>
 [Experimental(Diagnostics.Experimental)]
 public interface ILlmInferenceHandler
@@ -28554,14 +35390,31 @@ public interface IGitHubTelemetryHandler
     Task EventAsync(GitHubTelemetryNotification request, CancellationToken cancellationToken = default);
 }
 
+/// <summary>Handles `gitHubToken` client global API methods.</summary>
+[Experimental(Diagnostics.Experimental)]
+public interface IGitHubTokenHandler
+{
+    /// <summary>Asks the SDK client to mint a GitHub access token for a session whose configuration supplied a GitHub token provider. The runtime acquires the initial token during bootstrap and refreshes it during expiry preflight when one hour or less remains.</summary>
+    /// <param name="request">Asks the SDK client to acquire a GitHub access token from an opaque callback registration.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>SDK host response to a GitHub credential request.</returns>
+    Task<GitHubTokenAcquireResult> GetTokenAsync(GitHubTokenAcquireRequest request, CancellationToken cancellationToken = default);
+}
+
 /// <summary>Provides all client global API handler groups for a connection.</summary>
 public sealed class ClientGlobalApiHandlers
 {
+    /// <summary>Optional handler for ExtensionLaunchProvider client global API methods.</summary>
+    public IExtensionLaunchProviderHandler? ExtensionLaunchProvider { get; set; }
+
     /// <summary>Optional handler for LlmInference client global API methods.</summary>
     public ILlmInferenceHandler? LlmInference { get; set; }
 
     /// <summary>Optional handler for GitHubTelemetry client global API methods.</summary>
     public IGitHubTelemetryHandler? GitHubTelemetry { get; set; }
+
+    /// <summary>Optional handler for GitHubToken client global API methods.</summary>
+    public IGitHubTokenHandler? GitHubToken { get; set; }
 }
 
 /// <summary>Registers client global API handlers on a JSON-RPC connection.</summary>
@@ -28575,6 +35428,11 @@ internal static class ClientGlobalApiRegistration
     /// </summary>
     public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiHandlers handlers)
     {
+        rpc.SetLocalRpcMethod("extensionLaunchProvider.resolve", (Func<ExtensionLaunchProviderResolveRequest, CancellationToken, ValueTask<ExtensionLaunchProviderResolveResult>>)(async (request, cancellationToken) =>
+        {
+            var handler = handlers.ExtensionLaunchProvider ?? throw new InvalidOperationException("No extensionLaunchProvider client-global handler registered");
+            return await handler.ResolveAsync(request, cancellationToken);
+        }), singleObjectParam: true);
         rpc.SetLocalRpcMethod("llmInference.httpRequestStart", (Func<LlmInferenceHttpRequestStartRequest, CancellationToken, ValueTask<LlmInferenceHttpRequestStartResult>>)(async (request, cancellationToken) =>
         {
             var handler = handlers.LlmInference ?? throw new InvalidOperationException("No llmInference client-global handler registered");
@@ -28590,6 +35448,11 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
             var handler = handlers.GitHubTelemetry ?? throw new InvalidOperationException("No gitHubTelemetry client-global handler registered");
             await handler.EventAsync(request, cancellationToken);
         }), singleObjectParam: true);
+        rpc.SetLocalRpcMethod("gitHubToken.getToken", (Func<GitHubTokenAcquireRequest, CancellationToken, ValueTask<GitHubTokenAcquireResult>>)(async (request, cancellationToken) =>
+        {
+            var handler = handlers.GitHubToken ?? throw new InvalidOperationException("No gitHubToken client-global handler registered");
+            return await handler.GetTokenAsync(request, cancellationToken);
+        }), singleObjectParam: true);
     }
 }
 
@@ -28605,6 +35468,10 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.AbortData), TypeInfoPropertyName = "SessionEventsAbortData")]
 [JsonSerializable(typeof(GitHub.Copilot.AbortEvent), TypeInfoPropertyName = "SessionEventsAbortEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.AbortReason), TypeInfoPropertyName = "SessionEventsAbortReason")]
+[JsonSerializable(typeof(GitHub.Copilot.AgentInterruptedActivity), TypeInfoPropertyName = "SessionEventsAgentInterruptedActivity")]
+[JsonSerializable(typeof(GitHub.Copilot.AgentInterruptedCancelPhase), TypeInfoPropertyName = "SessionEventsAgentInterruptedCancelPhase")]
+[JsonSerializable(typeof(GitHub.Copilot.AgentInterruptedData), TypeInfoPropertyName = "SessionEventsAgentInterruptedData")]
+[JsonSerializable(typeof(GitHub.Copilot.AgentInterruptedEvent), TypeInfoPropertyName = "SessionEventsAgentInterruptedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantIdleData), TypeInfoPropertyName = "SessionEventsAssistantIdleData")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantIdleEvent), TypeInfoPropertyName = "SessionEventsAssistantIdleEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantIntentData), TypeInfoPropertyName = "SessionEventsAssistantIntentData")]
@@ -28613,6 +35480,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.AssistantMessageDeltaData), TypeInfoPropertyName = "SessionEventsAssistantMessageDeltaData")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantMessageDeltaEvent), TypeInfoPropertyName = "SessionEventsAssistantMessageDeltaEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantMessageEvent), TypeInfoPropertyName = "SessionEventsAssistantMessageEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.AssistantMessageReasoningBlocks), TypeInfoPropertyName = "SessionEventsAssistantMessageReasoningBlocks")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantMessageServerTools), TypeInfoPropertyName = "SessionEventsAssistantMessageServerTools")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantMessageStartData), TypeInfoPropertyName = "SessionEventsAssistantMessageStartData")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantMessageStartEvent), TypeInfoPropertyName = "SessionEventsAssistantMessageStartEvent")]
@@ -28639,6 +35507,9 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.AssistantUsageCopilotUsageTokenDetail), TypeInfoPropertyName = "SessionEventsAssistantUsageCopilotUsageTokenDetail")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantUsageData), TypeInfoPropertyName = "SessionEventsAssistantUsageData")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantUsageEvent), TypeInfoPropertyName = "SessionEventsAssistantUsageEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.AssistantUsageTransport), TypeInfoPropertyName = "SessionEventsAssistantUsageTransport")]
+[JsonSerializable(typeof(GitHub.Copilot.AssistedApprovalJudgeFailureReason), TypeInfoPropertyName = "SessionEventsAssistedApprovalJudgeFailureReason")]
+[JsonSerializable(typeof(GitHub.Copilot.AssistedApprovalRecommendation), TypeInfoPropertyName = "SessionEventsAssistedApprovalRecommendation")]
 [JsonSerializable(typeof(GitHub.Copilot.Attachment), TypeInfoPropertyName = "SessionEventsAttachment")]
 [JsonSerializable(typeof(GitHub.Copilot.AttachmentBlob), TypeInfoPropertyName = "SessionEventsAttachmentBlob")]
 [JsonSerializable(typeof(GitHub.Copilot.AttachmentDirectory), TypeInfoPropertyName = "SessionEventsAttachmentDirectory")]
@@ -28662,8 +35533,6 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.AttachmentSelectionDetails), TypeInfoPropertyName = "SessionEventsAttachmentSelectionDetails")]
 [JsonSerializable(typeof(GitHub.Copilot.AttachmentSelectionDetailsEnd), TypeInfoPropertyName = "SessionEventsAttachmentSelectionDetailsEnd")]
 [JsonSerializable(typeof(GitHub.Copilot.AttachmentSelectionDetailsStart), TypeInfoPropertyName = "SessionEventsAttachmentSelectionDetailsStart")]
-[JsonSerializable(typeof(GitHub.Copilot.AutoApprovalJudgeFailureReason), TypeInfoPropertyName = "SessionEventsAutoApprovalJudgeFailureReason")]
-[JsonSerializable(typeof(GitHub.Copilot.AutoApprovalRecommendation), TypeInfoPropertyName = "SessionEventsAutoApprovalRecommendation")]
 [JsonSerializable(typeof(GitHub.Copilot.AutoModeResolvedReasoningBucket), TypeInfoPropertyName = "SessionEventsAutoModeResolvedReasoningBucket")]
 [JsonSerializable(typeof(GitHub.Copilot.AutoModeSwitchCompletedData), TypeInfoPropertyName = "SessionEventsAutoModeSwitchCompletedData")]
 [JsonSerializable(typeof(GitHub.Copilot.AutoModeSwitchCompletedEvent), TypeInfoPropertyName = "SessionEventsAutoModeSwitchCompletedEvent")]
@@ -28727,6 +35596,11 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.ExternalToolRequestedEvent), TypeInfoPropertyName = "SessionEventsExternalToolRequestedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.FactoryPermissionOperation), TypeInfoPropertyName = "SessionEventsFactoryPermissionOperation")]
 [JsonSerializable(typeof(GitHub.Copilot.FactoryPermissionPhase), TypeInfoPropertyName = "SessionEventsFactoryPermissionPhase")]
+[JsonSerializable(typeof(GitHub.Copilot.FactoryRunSettledData), TypeInfoPropertyName = "SessionEventsFactoryRunSettledData")]
+[JsonSerializable(typeof(GitHub.Copilot.FactoryRunSettledEvent), TypeInfoPropertyName = "SessionEventsFactoryRunSettledEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.FactoryRunSettledStatus), TypeInfoPropertyName = "SessionEventsFactoryRunSettledStatus")]
+[JsonSerializable(typeof(GitHub.Copilot.FactoryRunStartedData), TypeInfoPropertyName = "SessionEventsFactoryRunStartedData")]
+[JsonSerializable(typeof(GitHub.Copilot.FactoryRunStartedEvent), TypeInfoPropertyName = "SessionEventsFactoryRunStartedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.FactoryRunUpdatedData), TypeInfoPropertyName = "SessionEventsFactoryRunUpdatedData")]
 [JsonSerializable(typeof(GitHub.Copilot.FactoryRunUpdatedEvent), TypeInfoPropertyName = "SessionEventsFactoryRunUpdatedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.GitHubMcpToolConfig), TypeInfoPropertyName = "SessionEventsGitHubMcpToolConfig")]
@@ -28778,20 +35652,25 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallFailureRequestFingerprint), TypeInfoPropertyName = "SessionEventsModelCallFailureRequestFingerprint")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallFailureSource), TypeInfoPropertyName = "SessionEventsModelCallFailureSource")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallFailureTransport), TypeInfoPropertyName = "SessionEventsModelCallFailureTransport")]
+[JsonSerializable(typeof(GitHub.Copilot.ModelCallFinishedData), TypeInfoPropertyName = "SessionEventsModelCallFinishedData")]
+[JsonSerializable(typeof(GitHub.Copilot.ModelCallFinishedEvent), TypeInfoPropertyName = "SessionEventsModelCallFinishedEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.ModelCallFinishedOutcome), TypeInfoPropertyName = "SessionEventsModelCallFinishedOutcome")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallStartData), TypeInfoPropertyName = "SessionEventsModelCallStartData")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallStartEvent), TypeInfoPropertyName = "SessionEventsModelCallStartEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.ModelChangeSource), TypeInfoPropertyName = "SessionEventsModelChangeSource")]
 [JsonSerializable(typeof(GitHub.Copilot.OmittedBinaryOmittedReason), TypeInfoPropertyName = "SessionEventsOmittedBinaryOmittedReason")]
 [JsonSerializable(typeof(GitHub.Copilot.OmittedBinaryResult), TypeInfoPropertyName = "SessionEventsOmittedBinaryResult")]
 [JsonSerializable(typeof(GitHub.Copilot.OmittedBinaryType), TypeInfoPropertyName = "SessionEventsOmittedBinaryType")]
 [JsonSerializable(typeof(GitHub.Copilot.PendingMessagesModifiedData), TypeInfoPropertyName = "SessionEventsPendingMessagesModifiedData")]
 [JsonSerializable(typeof(GitHub.Copilot.PendingMessagesModifiedEvent), TypeInfoPropertyName = "SessionEventsPendingMessagesModifiedEvent")]
-[JsonSerializable(typeof(GitHub.Copilot.PermissionAllowAllMode), TypeInfoPropertyName = "SessionEventsPermissionAllowAllMode")]
-[JsonSerializable(typeof(GitHub.Copilot.PermissionAutoApproval), TypeInfoPropertyName = "SessionEventsPermissionAutoApproval")]
+[JsonSerializable(typeof(GitHub.Copilot.PermissionAssistedApproval), TypeInfoPropertyName = "SessionEventsPermissionAssistedApproval")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionCompletedData), TypeInfoPropertyName = "SessionEventsPermissionCompletedData")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionCompletedEvent), TypeInfoPropertyName = "SessionEventsPermissionCompletedEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.PermissionMode), TypeInfoPropertyName = "SessionEventsPermissionMode")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequest), TypeInfoPropertyName = "SessionEventsPermissionPromptRequest")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequestCommands), TypeInfoPropertyName = "SessionEventsPermissionPromptRequestCommands")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequestCustomTool), TypeInfoPropertyName = "SessionEventsPermissionPromptRequestCustomTool")]
+[JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequestExtensionEnvAccess), TypeInfoPropertyName = "SessionEventsPermissionPromptRequestExtensionEnvAccess")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequestExtensionManagement), TypeInfoPropertyName = "SessionEventsPermissionPromptRequestExtensionManagement")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequestExtensionPermissionAccess), TypeInfoPropertyName = "SessionEventsPermissionPromptRequestExtensionPermissionAccess")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequestFactory), TypeInfoPropertyName = "SessionEventsPermissionPromptRequestFactory")]
@@ -28803,8 +35682,10 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequestRead), TypeInfoPropertyName = "SessionEventsPermissionPromptRequestRead")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequestUrl), TypeInfoPropertyName = "SessionEventsPermissionPromptRequestUrl")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionPromptRequestWrite), TypeInfoPropertyName = "SessionEventsPermissionPromptRequestWrite")]
+[JsonSerializable(typeof(GitHub.Copilot.PermissionRecommendation), TypeInfoPropertyName = "SessionEventsPermissionRecommendation")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequest), TypeInfoPropertyName = "SessionEventsPermissionRequest")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestCustomTool), TypeInfoPropertyName = "SessionEventsPermissionRequestCustomTool")]
+[JsonSerializable(typeof(GitHub.Copilot.PermissionRequestExtensionEnvAccess), TypeInfoPropertyName = "SessionEventsPermissionRequestExtensionEnvAccess")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestExtensionManagement), TypeInfoPropertyName = "SessionEventsPermissionRequestExtensionManagement")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestExtensionPermissionAccess), TypeInfoPropertyName = "SessionEventsPermissionRequestExtensionPermissionAccess")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestFactory), TypeInfoPropertyName = "SessionEventsPermissionRequestFactory")]
@@ -28813,6 +35694,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestMemory), TypeInfoPropertyName = "SessionEventsPermissionRequestMemory")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestMemoryAction), TypeInfoPropertyName = "SessionEventsPermissionRequestMemoryAction")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestMemoryDirection), TypeInfoPropertyName = "SessionEventsPermissionRequestMemoryDirection")]
+[JsonSerializable(typeof(GitHub.Copilot.PermissionRequestMemoryScope), TypeInfoPropertyName = "SessionEventsPermissionRequestMemoryScope")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestRead), TypeInfoPropertyName = "SessionEventsPermissionRequestRead")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestShell), TypeInfoPropertyName = "SessionEventsPermissionRequestShell")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRequestShellCommand), TypeInfoPropertyName = "SessionEventsPermissionRequestShellCommand")]
@@ -28828,11 +35710,15 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.PersistedBinaryImageType), TypeInfoPropertyName = "SessionEventsPersistedBinaryImageType")]
 [JsonSerializable(typeof(GitHub.Copilot.PersistedBinaryResult), TypeInfoPropertyName = "SessionEventsPersistedBinaryResult")]
 [JsonSerializable(typeof(GitHub.Copilot.PlanChangedOperation), TypeInfoPropertyName = "SessionEventsPlanChangedOperation")]
+[JsonSerializable(typeof(GitHub.Copilot.PromptCacheBreakData), TypeInfoPropertyName = "SessionEventsPromptCacheBreakData")]
+[JsonSerializable(typeof(GitHub.Copilot.PromptCacheBreakEvent), TypeInfoPropertyName = "SessionEventsPromptCacheBreakEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.ReasoningSummary), TypeInfoPropertyName = "SessionEventsReasoningSummary")]
 [JsonSerializable(typeof(GitHub.Copilot.SamplingCompletedData), TypeInfoPropertyName = "SessionEventsSamplingCompletedData")]
 [JsonSerializable(typeof(GitHub.Copilot.SamplingCompletedEvent), TypeInfoPropertyName = "SessionEventsSamplingCompletedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.SamplingRequestedData), TypeInfoPropertyName = "SessionEventsSamplingRequestedData")]
 [JsonSerializable(typeof(GitHub.Copilot.SamplingRequestedEvent), TypeInfoPropertyName = "SessionEventsSamplingRequestedEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.SandboxDecisionData), TypeInfoPropertyName = "SessionEventsSandboxDecisionData")]
+[JsonSerializable(typeof(GitHub.Copilot.SandboxDecisionEvent), TypeInfoPropertyName = "SessionEventsSandboxDecisionEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.ScheduleOrigin), TypeInfoPropertyName = "SessionEventsScheduleOrigin")]
 [JsonSerializable(typeof(GitHub.Copilot.SessionEvent), TypeInfoPropertyName = "SessionEventsSessionEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.SessionLimitsConfig), TypeInfoPropertyName = "SessionEventsSessionLimitsConfig")]
@@ -28843,6 +35729,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.SessionLimitsExhaustedResponse), TypeInfoPropertyName = "SessionEventsSessionLimitsExhaustedResponse")]
 [JsonSerializable(typeof(GitHub.Copilot.SessionLimitsExhaustedResponseAction), TypeInfoPropertyName = "SessionEventsSessionLimitsExhaustedResponseAction")]
 [JsonSerializable(typeof(GitHub.Copilot.SessionMode), TypeInfoPropertyName = "SessionEventsSessionMode")]
+[JsonSerializable(typeof(GitHub.Copilot.ShutdownAgentMetric), TypeInfoPropertyName = "SessionEventsShutdownAgentMetric")]
 [JsonSerializable(typeof(GitHub.Copilot.ShutdownCodeChanges), TypeInfoPropertyName = "SessionEventsShutdownCodeChanges")]
 [JsonSerializable(typeof(GitHub.Copilot.ShutdownModelMetric), TypeInfoPropertyName = "SessionEventsShutdownModelMetric")]
 [JsonSerializable(typeof(GitHub.Copilot.ShutdownModelMetricRequests), TypeInfoPropertyName = "SessionEventsShutdownModelMetricRequests")]
@@ -28925,6 +35812,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.ToolSearchActivatedEvent), TypeInfoPropertyName = "SessionEventsToolSearchActivatedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.ToolUserRequestedData), TypeInfoPropertyName = "SessionEventsToolUserRequestedData")]
 [JsonSerializable(typeof(GitHub.Copilot.ToolUserRequestedEvent), TypeInfoPropertyName = "SessionEventsToolUserRequestedEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.UIEphemeralQueryPhase), TypeInfoPropertyName = "SessionEventsUIEphemeralQueryPhase")]
 [JsonSerializable(typeof(GitHub.Copilot.UserInputCompletedData), TypeInfoPropertyName = "SessionEventsUserInputCompletedData")]
 [JsonSerializable(typeof(GitHub.Copilot.UserInputCompletedEvent), TypeInfoPropertyName = "SessionEventsUserInputCompletedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.UserInputRequestedData), TypeInfoPropertyName = "SessionEventsUserInputRequestedData")]
@@ -28936,6 +35824,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.UserToolSessionApproval), TypeInfoPropertyName = "SessionEventsUserToolSessionApproval")]
 [JsonSerializable(typeof(GitHub.Copilot.UserToolSessionApprovalCommands), TypeInfoPropertyName = "SessionEventsUserToolSessionApprovalCommands")]
 [JsonSerializable(typeof(GitHub.Copilot.UserToolSessionApprovalCustomTool), TypeInfoPropertyName = "SessionEventsUserToolSessionApprovalCustomTool")]
+[JsonSerializable(typeof(GitHub.Copilot.UserToolSessionApprovalExtensionEnvAccess), TypeInfoPropertyName = "SessionEventsUserToolSessionApprovalExtensionEnvAccess")]
 [JsonSerializable(typeof(GitHub.Copilot.UserToolSessionApprovalExtensionManagement), TypeInfoPropertyName = "SessionEventsUserToolSessionApprovalExtensionManagement")]
 [JsonSerializable(typeof(GitHub.Copilot.UserToolSessionApprovalExtensionPermissionAccess), TypeInfoPropertyName = "SessionEventsUserToolSessionApprovalExtensionPermissionAccess")]
 [JsonSerializable(typeof(GitHub.Copilot.UserToolSessionApprovalFactory), TypeInfoPropertyName = "SessionEventsUserToolSessionApprovalFactory")]
@@ -28973,11 +35862,14 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(AgentSetPromptRequest))]
 [JsonSerializable(typeof(AgentsDiscoverRequest))]
 [JsonSerializable(typeof(AgentsGetDiscoveryPathsRequest))]
-[JsonSerializable(typeof(AllowAllPermissionSetResult))]
-[JsonSerializable(typeof(AllowAllPermissionState))]
+[JsonSerializable(typeof(AuthIdentity))]
 [JsonSerializable(typeof(AuthInfo))]
+[JsonSerializable(typeof(AuthValidationError))]
 [JsonSerializable(typeof(BuiltInModelCatalog))]
 [JsonSerializable(typeof(BuiltInModelCatalogEntry))]
+[JsonSerializable(typeof(BuiltinToolDescriptor))]
+[JsonSerializable(typeof(BuiltinToolFormat))]
+[JsonSerializable(typeof(BuiltinToolInputSchema))]
 [JsonSerializable(typeof(CancelUserRequestedShellCommandResult))]
 [JsonSerializable(typeof(CanvasAction))]
 [JsonSerializable(typeof(CanvasActionInvokeRequest))]
@@ -28992,9 +35884,23 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(CanvasProviderInvokeActionRequest))]
 [JsonSerializable(typeof(CanvasProviderOpenRequest))]
 [JsonSerializable(typeof(CanvasProviderOpenResult))]
+[JsonSerializable(typeof(CanvasProviderRegisterRequest))]
+[JsonSerializable(typeof(CanvasProviderUnregisterRequest))]
 [JsonSerializable(typeof(CanvasSessionContext))]
 [JsonSerializable(typeof(CapiSessionOptions))]
+[JsonSerializable(typeof(CardDigest))]
+[JsonSerializable(typeof(CatalogAiSkillCandidateProvenance))]
+[JsonSerializable(typeof(CatalogCandidate))]
+[JsonSerializable(typeof(CatalogCandidateSource))]
+[JsonSerializable(typeof(CatalogClientContract))]
+[JsonSerializable(typeof(CatalogMcpServerCandidateProvenance))]
+[JsonSerializable(typeof(CatalogNegotiatedContract))]
+[JsonSerializable(typeof(CatalogSearchRequest))]
+[JsonSerializable(typeof(CatalogSearchResult))]
 [JsonSerializable(typeof(CommandList))]
+[JsonSerializable(typeof(CommandsFinalizeInvocationEffectRequest))]
+[JsonSerializable(typeof(CommandsFinalizeInvocationEffectRequestEffect))]
+[JsonSerializable(typeof(CommandsFinalizeInvocationEffectResult))]
 [JsonSerializable(typeof(CommandsHandlePendingCommandRequest))]
 [JsonSerializable(typeof(CommandsHandlePendingCommandResult))]
 [JsonSerializable(typeof(CommandsInvokeRequest))]
@@ -29004,6 +35910,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(CompletionsRequestRequest))]
 [JsonSerializable(typeof(CompletionsRequestResult))]
 [JsonSerializable(typeof(ConfigureSessionExtensionsParams))]
+[JsonSerializable(typeof(ConnectClientInfo))]
 [JsonSerializable(typeof(ConnectRemoteSessionParams))]
 [JsonSerializable(typeof(ConnectRequest))]
 [JsonSerializable(typeof(ConnectResult))]
@@ -29045,9 +35952,15 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(ExecuteCommandParams))]
 [JsonSerializable(typeof(ExecuteCommandResult))]
 [JsonSerializable(typeof(Extension))]
+[JsonSerializable(typeof(ExtensionLaunchProfile))]
+[JsonSerializable(typeof(ExtensionLaunchProviderResolveRequest))]
+[JsonSerializable(typeof(ExtensionLaunchProviderResolveResult))]
 [JsonSerializable(typeof(ExtensionList))]
 [JsonSerializable(typeof(ExtensionsDisableRequest))]
 [JsonSerializable(typeof(ExtensionsEnableRequest))]
+[JsonSerializable(typeof(ExternalToolTextResultForLlmBinaryResultsForLlm))]
+[JsonSerializable(typeof(ExternalToolTextResultForLlmContent))]
+[JsonSerializable(typeof(ExternalToolTextResultForLlmContentResourceLinkIcon))]
 [JsonSerializable(typeof(FactoryAbortRequest))]
 [JsonSerializable(typeof(FactoryAckResult))]
 [JsonSerializable(typeof(FactoryAgentOptions))]
@@ -29089,6 +36002,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHubTelemetryClientInfo))]
 [JsonSerializable(typeof(GitHubTelemetryEvent))]
 [JsonSerializable(typeof(GitHubTelemetryNotification))]
+[JsonSerializable(typeof(GitHubTokenAcquireRequest))]
+[JsonSerializable(typeof(GitHubTokenAcquireResult))]
 [JsonSerializable(typeof(HandlePendingToolCallRequest))]
 [JsonSerializable(typeof(HandlePendingToolCallResult))]
 [JsonSerializable(typeof(HistoryAbortManualCompactionResult))]
@@ -29110,6 +36025,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(HistoryTruncateResult))]
 [JsonSerializable(typeof(IDictionary<string, JsonElement>))]
 [JsonSerializable(typeof(IList<AccountAllUsers>))]
+[JsonSerializable(typeof(IList<AuthValidationError>))]
+[JsonSerializable(typeof(IList<SessionAuthStatus>))]
 [JsonSerializable(typeof(InstalledPlugin))]
 [JsonSerializable(typeof(InstalledPluginInfo))]
 [JsonSerializable(typeof(InstructionDiscoveryPath))]
@@ -29134,6 +36051,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(LogRequest))]
 [JsonSerializable(typeof(LogResult))]
 [JsonSerializable(typeof(LspInitializeRequest))]
+[JsonSerializable(typeof(ManagedSettingsReadResult))]
 [JsonSerializable(typeof(MarketplaceAddResult))]
 [JsonSerializable(typeof(MarketplaceBrowseResult))]
 [JsonSerializable(typeof(MarketplaceInfo))]
@@ -29174,11 +36092,13 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(McpExecuteSamplingParams))]
 [JsonSerializable(typeof(McpExecuteSamplingRequest))]
 [JsonSerializable(typeof(McpExecuteSamplingResult))]
+[JsonSerializable(typeof(McpFailedServer))]
 [JsonSerializable(typeof(McpFilteredServer))]
 [JsonSerializable(typeof(McpHeadersHandlePendingHeadersRefreshRequest))]
 [JsonSerializable(typeof(McpHeadersHandlePendingHeadersRefreshRequestRequest))]
 [JsonSerializable(typeof(McpHeadersHandlePendingHeadersRefreshRequestResult))]
 [JsonSerializable(typeof(McpHostState))]
+[JsonSerializable(typeof(McpInstallPlan))]
 [JsonSerializable(typeof(McpIsServerRunningRequest))]
 [JsonSerializable(typeof(McpIsServerRunningResult))]
 [JsonSerializable(typeof(McpListToolsRequest))]
@@ -29189,8 +36109,21 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(McpOauthLoginRequest))]
 [JsonSerializable(typeof(McpOauthLoginResult))]
 [JsonSerializable(typeof(McpOauthPendingRequestResponse))]
+[JsonSerializable(typeof(McpOauthProbeRequest))]
+[JsonSerializable(typeof(McpOauthProbeResult))]
 [JsonSerializable(typeof(McpOauthRespondRequest))]
 [JsonSerializable(typeof(McpOauthRespondResult))]
+[JsonSerializable(typeof(McpPlanConfigurationChange))]
+[JsonSerializable(typeof(McpPlanInstallRequest))]
+[JsonSerializable(typeof(McpPlanInstallResult))]
+[JsonSerializable(typeof(McpPlanInstallSource))]
+[JsonSerializable(typeof(McpPlanPolicyResult))]
+[JsonSerializable(typeof(McpPlanProvenance))]
+[JsonSerializable(typeof(McpPlanRequiredValue))]
+[JsonSerializable(typeof(McpPlanResourceIdentity))]
+[JsonSerializable(typeof(McpPlanSecretPlaceholder))]
+[JsonSerializable(typeof(McpPlanTarget))]
+[JsonSerializable(typeof(McpPlanTransportChoice))]
 [JsonSerializable(typeof(McpRegisterExternalClientRequest))]
 [JsonSerializable(typeof(McpReloadWithConfigRequest))]
 [JsonSerializable(typeof(McpRemoveGitHubResult))]
@@ -29208,6 +36141,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(McpRestartServerRequest))]
 [JsonSerializable(typeof(McpSamplingExecutionResult))]
 [JsonSerializable(typeof(McpServer))]
+[JsonSerializable(typeof(McpServerCardReference))]
 [JsonSerializable(typeof(McpServerFailureInfo))]
 [JsonSerializable(typeof(McpServerList))]
 [JsonSerializable(typeof(McpServerNeedsAuthInfo))]
@@ -29216,11 +36150,13 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(McpStartServerRequest))]
 [JsonSerializable(typeof(McpStartServersResult))]
 [JsonSerializable(typeof(McpStopServerRequest))]
+[JsonSerializable(typeof(McpTaskMetadata))]
 [JsonSerializable(typeof(McpToolUi))]
 [JsonSerializable(typeof(McpTools))]
 [JsonSerializable(typeof(McpUnregisterExternalClientRequest))]
 [JsonSerializable(typeof(MetadataContextAttributionResult))]
 [JsonSerializable(typeof(MetadataContextAttributionResultContextAttribution))]
+[JsonSerializable(typeof(MetadataContextAttributionResultContextAttributionCategories))]
 [JsonSerializable(typeof(MetadataContextAttributionResultContextAttributionCompactions))]
 [JsonSerializable(typeof(MetadataContextAttributionResultContextAttributionEntry))]
 [JsonSerializable(typeof(MetadataContextHeaviestMessagesRequest))]
@@ -29238,7 +36174,9 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(MetadataSnapshotRemoteMetadata))]
 [JsonSerializable(typeof(MetadataSnapshotRemoteMetadataRepository))]
 [JsonSerializable(typeof(ModeSetRequest))]
+[JsonSerializable(typeof(ModeSetResult))]
 [JsonSerializable(typeof(Model))]
+[JsonSerializable(typeof(ModelApplyStartupOverlayRequest))]
 [JsonSerializable(typeof(ModelBilling))]
 [JsonSerializable(typeof(ModelBillingPromo))]
 [JsonSerializable(typeof(ModelBillingTokenPrices))]
@@ -29252,12 +36190,19 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(ModelCapabilitiesOverrideSupports))]
 [JsonSerializable(typeof(ModelCapabilitiesSupports))]
 [JsonSerializable(typeof(ModelList))]
+[JsonSerializable(typeof(ModelMessage))]
+[JsonSerializable(typeof(ModelPickerPersistenceRequest))]
+[JsonSerializable(typeof(ModelPickerSettingsContext))]
+[JsonSerializable(typeof(ModelPickerSettingsContextEnvironment))]
 [JsonSerializable(typeof(ModelPolicy))]
 [JsonSerializable(typeof(ModelSetReasoningEffortRequest))]
 [JsonSerializable(typeof(ModelSetReasoningEffortResult))]
+[JsonSerializable(typeof(ModelSwitchConfirmation))]
 [JsonSerializable(typeof(ModelSwitchToRequest))]
 [JsonSerializable(typeof(ModelSwitchToResult))]
+[JsonSerializable(typeof(ModelWarningText))]
 [JsonSerializable(typeof(ModelsListRequest))]
+[JsonSerializable(typeof(MoveMcpLoadingToBackgroundResult))]
 [JsonSerializable(typeof(NameGetResult))]
 [JsonSerializable(typeof(NameSetAutoRequest))]
 [JsonSerializable(typeof(NameSetAutoResult))]
@@ -29272,6 +36217,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(PermissionDecision))]
 [JsonSerializable(typeof(PermissionDecisionApproveForLocationApproval))]
 [JsonSerializable(typeof(PermissionDecisionApproveForSessionApproval))]
+[JsonSerializable(typeof(PermissionDecisionContext))]
 [JsonSerializable(typeof(PermissionDecisionRequest))]
 [JsonSerializable(typeof(PermissionLocationAddToolApprovalParams))]
 [JsonSerializable(typeof(PermissionLocationApplyParams))]
@@ -29297,7 +36243,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(PermissionsConfigureParams))]
 [JsonSerializable(typeof(PermissionsConfigureResult))]
 [JsonSerializable(typeof(PermissionsFolderTrustAddTrustedResult))]
-[JsonSerializable(typeof(PermissionsGetAllowAllRequest))]
+[JsonSerializable(typeof(PermissionsGetModeRequest))]
+[JsonSerializable(typeof(PermissionsGetModeResult))]
 [JsonSerializable(typeof(PermissionsLocationsAddToolApprovalDetails))]
 [JsonSerializable(typeof(PermissionsLocationsAddToolApprovalResult))]
 [JsonSerializable(typeof(PermissionsModifyRulesParams))]
@@ -29309,9 +36256,10 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(PermissionsPendingRequestsRequest))]
 [JsonSerializable(typeof(PermissionsResetSessionApprovalsRequest))]
 [JsonSerializable(typeof(PermissionsResetSessionApprovalsResult))]
-[JsonSerializable(typeof(PermissionsSetAllowAllRequest))]
 [JsonSerializable(typeof(PermissionsSetApproveAllRequest))]
 [JsonSerializable(typeof(PermissionsSetApproveAllResult))]
+[JsonSerializable(typeof(PermissionsSetModeRequest))]
+[JsonSerializable(typeof(PermissionsSetModeResult))]
 [JsonSerializable(typeof(PermissionsSetRequiredRequest))]
 [JsonSerializable(typeof(PermissionsSetRequiredResult))]
 [JsonSerializable(typeof(PermissionsUrlsSetUnrestrictedModeResult))]
@@ -29330,6 +36278,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(PluginUpdateAllEntry))]
 [JsonSerializable(typeof(PluginUpdateAllResult))]
 [JsonSerializable(typeof(PluginUpdateResult))]
+[JsonSerializable(typeof(PluginsBuiltinSetRequest))]
 [JsonSerializable(typeof(PluginsDisableRequest))]
 [JsonSerializable(typeof(PluginsEnableRequest))]
 [JsonSerializable(typeof(PluginsInstallRequest))]
@@ -29339,6 +36288,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(PluginsMarketplacesRemoveRequest))]
 [JsonSerializable(typeof(PluginsUninstallRequest))]
 [JsonSerializable(typeof(PluginsUpdateRequest))]
+[JsonSerializable(typeof(ProtocolExternalToolDefinition))]
 [JsonSerializable(typeof(ProviderAddRequest))]
 [JsonSerializable(typeof(ProviderAddResult))]
 [JsonSerializable(typeof(ProviderConfig))]
@@ -29403,6 +36353,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(RemoteSessionMetadataValue))]
 [JsonSerializable(typeof(RunOptions))]
 [JsonSerializable(typeof(SandboxConfig))]
+[JsonSerializable(typeof(SandboxConfigAuth))]
 [JsonSerializable(typeof(SandboxConfigUserPolicy))]
 [JsonSerializable(typeof(SandboxConfigUserPolicyExperimental))]
 [JsonSerializable(typeof(SandboxConfigUserPolicyExperimentalSeatbelt))]
@@ -29440,7 +36391,10 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionAgentListRequest))]
 [JsonSerializable(typeof(SessionAgentListRequestWithSession))]
 [JsonSerializable(typeof(SessionAgentReloadRequest))]
+[JsonSerializable(typeof(SessionAuthLoginRequest))]
+[JsonSerializable(typeof(SessionAuthLogoutUserRequest))]
 [JsonSerializable(typeof(SessionAuthStatus))]
+[JsonSerializable(typeof(SessionAuthSwitchRequest))]
 [JsonSerializable(typeof(SessionBulkDeleteResult))]
 [JsonSerializable(typeof(SessionCancelAllBackgroundAgentsRequest))]
 [JsonSerializable(typeof(SessionCanvasListOpenRequest))]
@@ -29482,7 +36436,12 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionFsStatRequest))]
 [JsonSerializable(typeof(SessionFsStatResult))]
 [JsonSerializable(typeof(SessionFsWriteFileRequest))]
+[JsonSerializable(typeof(SessionGitHubAuthGetAllAuthAvailableRequest))]
+[JsonSerializable(typeof(SessionGitHubAuthGetCurrentAuthInfoRequest))]
 [JsonSerializable(typeof(SessionGitHubAuthGetStatusRequest))]
+[JsonSerializable(typeof(SessionGitHubAuthLastAuthErrorsRequest))]
+[JsonSerializable(typeof(SessionGitHubAuthLogoutRequest))]
+[JsonSerializable(typeof(SessionGitHubAuthRefreshCopilotUserRequest))]
 [JsonSerializable(typeof(SessionHistoryAbortManualCompactionRequest))]
 [JsonSerializable(typeof(SessionHistoryCancelBackgroundCompactionRequest))]
 [JsonSerializable(typeof(SessionHistoryCompactRequest))]
@@ -29503,6 +36462,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionLoadDeferredRepoHooksResult))]
 [JsonSerializable(typeof(SessionMcpAppsGetHostContextRequest))]
 [JsonSerializable(typeof(SessionMcpListRequest))]
+[JsonSerializable(typeof(SessionMcpMoveLoadingToBackgroundRequest))]
 [JsonSerializable(typeof(SessionMcpReloadRequest))]
 [JsonSerializable(typeof(SessionMcpRemoveGitHubRequest))]
 [JsonSerializable(typeof(SessionMetadataActivityRequest))]
@@ -29621,7 +36581,9 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionsStartRemoteControlRequest))]
 [JsonSerializable(typeof(SessionsStopRemoteControlRequest))]
 [JsonSerializable(typeof(SessionsTransferRemoteControlRequest))]
+[JsonSerializable(typeof(SettableAuthInfo))]
 [JsonSerializable(typeof(ShellCancelUserRequestedRequest))]
+[JsonSerializable(typeof(ShellCredentials))]
 [JsonSerializable(typeof(ShellExecRequest))]
 [JsonSerializable(typeof(ShellExecResult))]
 [JsonSerializable(typeof(ShellExecuteUserRequestedRequest))]
@@ -29635,6 +36597,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SkillDiscoveryPathList))]
 [JsonSerializable(typeof(SkillList))]
 [JsonSerializable(typeof(SkillsConfigSetDisabledSkillsRequest))]
+[JsonSerializable(typeof(SkillsConfigSetSkillDisabledRequest))]
 [JsonSerializable(typeof(SkillsDisableRequest))]
 [JsonSerializable(typeof(SkillsDiscoverRequest))]
 [JsonSerializable(typeof(SkillsEnableRequest))]
@@ -29646,8 +36609,13 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SlashCommandInput))]
 [JsonSerializable(typeof(SlashCommandInputChoice))]
 [JsonSerializable(typeof(SlashCommandInvocationResult))]
+[JsonSerializable(typeof(SlashCommandInvocationResultSetModelRevertOnCancel))]
+[JsonSerializable(typeof(SlashCommandModelPickerDialog))]
 [JsonSerializable(typeof(SlashCommandSelectSubcommandOption))]
+[JsonSerializable(typeof(SlashCommandTimelineEntry))]
 [JsonSerializable(typeof(SubagentSettingsEntry))]
+[JsonSerializable(typeof(TaskCompleteData))]
+[JsonSerializable(typeof(TaskCompletionDecision))]
 [JsonSerializable(typeof(TaskInfo))]
 [JsonSerializable(typeof(TaskList))]
 [JsonSerializable(typeof(TaskProgressLine))]
@@ -29671,12 +36639,23 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(TelemetrySetFeatureOverridesRequest))]
 [JsonSerializable(typeof(Tool))]
 [JsonSerializable(typeof(ToolList))]
+[JsonSerializable(typeof(ToolResultExpanded))]
+[JsonSerializable(typeof(ToolResultNewMessage))]
+[JsonSerializable(typeof(ToolsExecuteRequest))]
+[JsonSerializable(typeof(ToolsGetBuiltinDescriptorsRequest))]
+[JsonSerializable(typeof(ToolsGetBuiltinDescriptorsResult))]
 [JsonSerializable(typeof(ToolsGetCurrentMetadataResult))]
 [JsonSerializable(typeof(ToolsInitializeAndValidateResult))]
 [JsonSerializable(typeof(ToolsListRequest))]
+[JsonSerializable(typeof(ToolsSetRequest))]
+[JsonSerializable(typeof(ToolsSetResult))]
+[JsonSerializable(typeof(ToolsShellDescriptorConfig))]
+[JsonSerializable(typeof(ToolsTaskCompleteEventDataRequest))]
 [JsonSerializable(typeof(ToolsUpdateSubagentSettingsResult))]
 [JsonSerializable(typeof(UIElicitationRequest))]
+[JsonSerializable(typeof(UIElicitationRequestMeta))]
 [JsonSerializable(typeof(UIElicitationResponse))]
+[JsonSerializable(typeof(UIElicitationResponseMeta))]
 [JsonSerializable(typeof(UIElicitationResult))]
 [JsonSerializable(typeof(UIElicitationSchema))]
 [JsonSerializable(typeof(UIEphemeralQueryRequest))]
@@ -29698,6 +36677,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(UpdateSubagentSettingsRequest))]
 [JsonSerializable(typeof(UpdateSubagentSettingsRequestSubagents))]
 [JsonSerializable(typeof(UsageGetMetricsResult))]
+[JsonSerializable(typeof(UsageMetricsAgentMetric))]
 [JsonSerializable(typeof(UsageMetricsCodeChanges))]
 [JsonSerializable(typeof(UsageMetricsModelMetric))]
 [JsonSerializable(typeof(UsageMetricsModelMetricRequests))]
diff --git a/dotnet/src/Generated/SessionEvents.cs b/dotnet/src/Generated/SessionEvents.cs
index 6b81a4770d..bb2f3f9979 100644
--- a/dotnet/src/Generated/SessionEvents.cs
+++ b/dotnet/src/Generated/SessionEvents.cs
@@ -25,6 +25,7 @@ namespace GitHub.Copilot;
     TypeDiscriminatorPropertyName = "type",
     IgnoreUnrecognizedTypeDiscriminators = true)]
 [JsonDerivedType(typeof(AbortEvent), "abort")]
+[JsonDerivedType(typeof(AgentInterruptedEvent), "agent.interrupted")]
 [JsonDerivedType(typeof(AssistantIdleEvent), "assistant.idle")]
 [JsonDerivedType(typeof(AssistantIntentEvent), "assistant.intent")]
 [JsonDerivedType(typeof(AssistantMessageEvent), "assistant.message")]
@@ -52,6 +53,8 @@ namespace GitHub.Copilot;
 [JsonDerivedType(typeof(ExitPlanModeRequestedEvent), "exit_plan_mode.requested")]
 [JsonDerivedType(typeof(ExternalToolCompletedEvent), "external_tool.completed")]
 [JsonDerivedType(typeof(ExternalToolRequestedEvent), "external_tool.requested")]
+[JsonDerivedType(typeof(FactoryRunSettledEvent), "factory.run_settled")]
+[JsonDerivedType(typeof(FactoryRunStartedEvent), "factory.run_started")]
 [JsonDerivedType(typeof(FactoryRunUpdatedEvent), "factory.run_updated")]
 [JsonDerivedType(typeof(HookEndEvent), "hook.end")]
 [JsonDerivedType(typeof(HookProgressEvent), "hook.progress")]
@@ -65,12 +68,15 @@ namespace GitHub.Copilot;
 [JsonDerivedType(typeof(McpResourcesListChangedEvent), "mcp.resources.list_changed")]
 [JsonDerivedType(typeof(McpToolsListChangedEvent), "mcp.tools.list_changed")]
 [JsonDerivedType(typeof(ModelCallFailureEvent), "model.call_failure")]
+[JsonDerivedType(typeof(ModelCallFinishedEvent), "model.call_finished")]
 [JsonDerivedType(typeof(ModelCallStartEvent), "model.call_start")]
 [JsonDerivedType(typeof(PendingMessagesModifiedEvent), "pending_messages.modified")]
 [JsonDerivedType(typeof(PermissionCompletedEvent), "permission.completed")]
 [JsonDerivedType(typeof(PermissionRequestedEvent), "permission.requested")]
+[JsonDerivedType(typeof(PromptCacheBreakEvent), "prompt_cache_break")]
 [JsonDerivedType(typeof(SamplingCompletedEvent), "sampling.completed")]
 [JsonDerivedType(typeof(SamplingRequestedEvent), "sampling.requested")]
+[JsonDerivedType(typeof(SandboxDecisionEvent), "sandbox.decision")]
 [JsonDerivedType(typeof(SessionLimitsExhaustedCompletedEvent), "session_limits_exhausted.completed")]
 [JsonDerivedType(typeof(SessionLimitsExhaustedRequestedEvent), "session_limits_exhausted.requested")]
 [JsonDerivedType(typeof(SessionAutoModeResolvedEvent), "session.auto_mode_resolved")]
@@ -136,6 +142,7 @@ namespace GitHub.Copilot;
 [JsonDerivedType(typeof(ToolExecutionProgressEvent), "tool.execution_progress")]
 [JsonDerivedType(typeof(ToolExecutionStartEvent), "tool.execution_start")]
 [JsonDerivedType(typeof(ToolUserRequestedEvent), "tool.user_requested")]
+[JsonDerivedType(typeof(UiEphemeralQueryEvent), "ui.ephemeral_query")]
 [JsonDerivedType(typeof(UserInputCompletedEvent), "user_input.completed")]
 [JsonDerivedType(typeof(UserInputRequestedEvent), "user_input.requested")]
 [JsonDerivedType(typeof(UserMessageEvent), "user.message")]
@@ -376,8 +383,9 @@ public sealed partial class SessionSessionLimitsChangedEvent : SessionEvent
     public required SessionSessionLimitsChangedData Data { get; set; }
 }
 
-/// <summary>Permissions change details carrying the aggregate allow-all transition.</summary>
+/// <summary>Permission-mode transition details.</summary>
 /// <remarks>Represents the <c>session.permissions_changed</c> event.</remarks>
+[Experimental(Diagnostics.Experimental)]
 public sealed partial class SessionPermissionsChangedEvent : SessionEvent
 {
     /// <inheritdoc />
@@ -623,6 +631,19 @@ public sealed partial class AssistantTurnRetryEvent : SessionEvent
     public required AssistantTurnRetryData Data { get; set; }
 }
 
+/// <summary>Metadata for work the user interrupted while the agent was running.</summary>
+/// <remarks>Represents the <c>agent.interrupted</c> event.</remarks>
+public sealed partial class AgentInterruptedEvent : SessionEvent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "agent.interrupted";
+
+    /// <summary>The <c>agent.interrupted</c> event payload.</summary>
+    [JsonPropertyName("data")]
+    public required AgentInterruptedData Data { get; set; }
+}
+
 /// <summary>Agent intent description for current activity or plan.</summary>
 /// <remarks>Represents the <c>assistant.intent</c> event.</remarks>
 public sealed partial class AssistantIntentEvent : SessionEvent
@@ -779,6 +800,19 @@ public sealed partial class AssistantUsageEvent : SessionEvent
     public required AssistantUsageData Data { get; set; }
 }
 
+/// <summary>A detected loss of a previously cached prompt prefix.</summary>
+/// <remarks>Represents the <c>prompt_cache_break</c> event.</remarks>
+public sealed partial class PromptCacheBreakEvent : SessionEvent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "prompt_cache_break";
+
+    /// <summary>The <c>prompt_cache_break</c> event payload.</summary>
+    [JsonPropertyName("data")]
+    public required PromptCacheBreakData Data { get; set; }
+}
+
 /// <summary>Failed LLM API call metadata for telemetry.</summary>
 /// <remarks>Represents the <c>model.call_failure</c> event.</remarks>
 public sealed partial class ModelCallFailureEvent : SessionEvent
@@ -792,6 +826,19 @@ public sealed partial class ModelCallFailureEvent : SessionEvent
     public required ModelCallFailureData Data { get; set; }
 }
 
+/// <summary>Final lifecycle outcome for one logical model dispatch. A logical dispatch may include internal reconnect or fallback work, so event count is not provider HTTP-request count.</summary>
+/// <remarks>Represents the <c>model.call_finished</c> event.</remarks>
+public sealed partial class ModelCallFinishedEvent : SessionEvent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "model.call_finished";
+
+    /// <summary>The <c>model.call_finished</c> event payload.</summary>
+    [JsonPropertyName("data")]
+    public required ModelCallFinishedData Data { get; set; }
+}
+
 /// <summary>Model API dispatch metadata for internal telemetry.</summary>
 /// <remarks>Represents the <c>model.call_start</c> event.</remarks>
 public sealed partial class ModelCallStartEvent : SessionEvent
@@ -909,6 +956,19 @@ public sealed partial class SkillInvokedEvent : SessionEvent
     public required SkillInvokedData Data { get; set; }
 }
 
+/// <summary>Payload of `sandbox.decision`, a bounded governance record of what the process sandbox was configured to do and whether it took effect. Discriminated by `kind`.</summary>
+/// <remarks>Represents the <c>sandbox.decision</c> event.</remarks>
+public sealed partial class SandboxDecisionEvent : SessionEvent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "sandbox.decision";
+
+    /// <summary>The <c>sandbox.decision</c> event payload.</summary>
+    [JsonPropertyName("data")]
+    public required SandboxDecisionData Data { get; set; }
+}
+
 /// <summary>Sub-agent startup details including parent tool call and agent information.</summary>
 /// <remarks>Represents the <c>subagent.started</c> event.</remarks>
 public sealed partial class SubagentStartedEvent : SessionEvent
@@ -1222,6 +1282,20 @@ public sealed partial class SessionCustomNotificationEvent : SessionEvent
     public required SessionCustomNotificationData Data { get; set; }
 }
 
+/// <summary>Ordered output and terminal state for a transient query that does not modify conversation history.</summary>
+/// <remarks>Represents the <c>ui.ephemeral_query</c> event.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public sealed partial class UiEphemeralQueryEvent : SessionEvent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "ui.ephemeral_query";
+
+    /// <summary>The <c>ui.ephemeral_query</c> event payload.</summary>
+    [JsonPropertyName("data")]
+    public required UiEphemeralQueryData Data { get; set; }
+}
+
 /// <summary>External tool invocation request for client-side tool execution.</summary>
 /// <remarks>Represents the <c>external_tool.requested</c> event.</remarks>
 public sealed partial class ExternalToolRequestedEvent : SessionEvent
@@ -1353,7 +1427,7 @@ public sealed partial class SessionAutoModeResolvedEvent : SessionEvent
     public required SessionAutoModeResolvedData Data { get; set; }
 }
 
-/// <summary>Enterprise managed-settings resolution: the effective managed settings the session applied and where they came from, so SDK clients can show users what is enterprise-managed and by which authority. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted; for a session-independent pull, use the SDK `getManagedSettings()` API, which returns the identical payload. Managed settings have a single authoritative source, so the highest-authority present layer (server &gt; device) wins wholesale; `bypassPermissionsDisabled` is deny-wins across layers. Marked experimental while the managed-settings surface stabilizes.</summary>
+/// <summary>Enterprise managed-settings resolution: the effective managed settings the session applied and which channels contributed, so SDK clients can show users what is enterprise-managed. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted. Device values take precedence over server values per ordinary key, while permissions compose restrictively across device, server, and SDK-client layers. The account-scoped `getManagedSettings()` API does not include session-local client injection. Marked experimental while the managed-settings surface stabilizes.</summary>
 /// <remarks>Represents the <c>session.managed_settings_resolved</c> event.</remarks>
 [Experimental(Diagnostics.Experimental)]
 public sealed partial class SessionManagedSettingsResolvedEvent : SessionEvent
@@ -1473,6 +1547,34 @@ public sealed partial class FactoryRunUpdatedEvent : SessionEvent
     public required FactoryRunUpdatedData Data { get; set; }
 }
 
+/// <summary>Ephemeral signal that a factory run attempt began executing.</summary>
+/// <remarks>Represents the <c>factory.run_started</c> event.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public sealed partial class FactoryRunStartedEvent : SessionEvent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "factory.run_started";
+
+    /// <summary>The <c>factory.run_started</c> event payload.</summary>
+    [JsonPropertyName("data")]
+    public required FactoryRunStartedData Data { get; set; }
+}
+
+/// <summary>Ephemeral signal that a factory run reached a terminal status.</summary>
+/// <remarks>Represents the <c>factory.run_settled</c> event.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public sealed partial class FactoryRunSettledEvent : SessionEvent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "factory.run_settled";
+
+    /// <summary>The <c>factory.run_settled</c> event payload.</summary>
+    [JsonPropertyName("data")]
+    public required FactoryRunSettledData Data { get; set; }
+}
+
 /// <summary>Payload of `session.skills_loaded` listing resolved skill metadata.</summary>
 /// <remarks>Represents the <c>session.skills_loaded</c> event.</remarks>
 public sealed partial class SessionSkillsLoadedEvent : SessionEvent
@@ -1900,6 +2002,11 @@ public sealed partial class SessionIdleData
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("aborted")]
     public bool? Aborted { get; set; }
+
+    /// <summary>The session mode the agent was operating in when it went idle, when the mode is known. Lets turn-scoped consumers distinguish an autopilot continuation boundary (where the agent keeps working after this idle) from a genuine turn completion.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mode")]
+    public SessionMode? Mode { get; set; }
 }
 
 /// <summary>Session title change payload containing the new display title.</summary>
@@ -2087,6 +2194,11 @@ public sealed partial class SessionModelChangeData
     [JsonPropertyName("reasoningSummary")]
     public ReasoningSummary? ReasoningSummary { get; set; }
 
+    /// <summary>Origin of the effective model change, when known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("source")]
+    public ModelChangeSource? Source { get; set; }
+
     /// <summary>Output verbosity level after the model change, if applicable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("verbosity")]
@@ -2113,28 +2225,25 @@ public sealed partial class SessionSessionLimitsChangedData
     public SessionLimitsConfig? SessionLimits { get; set; }
 }
 
-/// <summary>Permissions change details carrying the aggregate allow-all transition.</summary>
+/// <summary>Permission-mode transition details.</summary>
+[Experimental(Diagnostics.Experimental)]
 public sealed partial class SessionPermissionsChangedData
 {
-    /// <summary>Allow-all mode after the change.</summary>
+    /// <summary>Explicit LLM judge model override used by assisted mode; omitted when the provider default applies.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("allowAllPermissionMode")]
-    public PermissionAllowAllMode? AllowAllPermissionMode { get; set; }
+    [JsonPropertyName("assistedApprovalModel")]
+    public string? AssistedApprovalModel { get; set; }
 
-    /// <summary>Aggregate allow-all flag after the change.</summary>
-    [JsonPropertyName("allowAllPermissions")]
-    public required bool AllowAllPermissions { get; set; }
-
-    /// <summary>Allow-all mode before the change.</summary>
+    /// <summary>Permission mode after the change.</summary>
     [Experimental(Diagnostics.Experimental)]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("previousAllowAllPermissionMode")]
-    public PermissionAllowAllMode? PreviousAllowAllPermissionMode { get; set; }
+    [JsonPropertyName("mode")]
+    public required PermissionMode Mode { get; set; }
 
-    /// <summary>Aggregate allow-all flag before the change.</summary>
-    [JsonPropertyName("previousAllowAllPermissions")]
-    public required bool PreviousAllowAllPermissions { get; set; }
+    /// <summary>Permission mode before the change.</summary>
+    [Experimental(Diagnostics.Experimental)]
+    [JsonPropertyName("previousMode")]
+    public required PermissionMode PreviousMode { get; set; }
 }
 
 /// <summary>Plan file operation details indicating what changed.</summary>
@@ -2250,6 +2359,11 @@ public sealed partial class SessionSnapshotRewindData
 /// <summary>Session termination metrics including usage statistics, code changes, and shutdown reason.</summary>
 public sealed partial class SessionShutdownData
 {
+    /// <summary>Per-agent usage breakdown, keyed by agent instance identifier. The main conversation uses the stable key `main`.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("agentMetrics")]
+    public IDictionary<string, ShutdownAgentMetric>? AgentMetrics { get; set; }
+
     /// <summary>Aggregate code change metrics for the session.</summary>
     [JsonPropertyName("codeChanges")]
     public required ShutdownCodeChanges CodeChanges { get; set; }
@@ -2333,6 +2447,12 @@ public sealed partial class SessionUsageCheckpointData
     [JsonPropertyName("modelCacheState")]
     internal UsageCheckpointModelCacheState[]? ModelCacheState { get; set; }
 
+    /// <summary>Internal per-conversation prompt-cache-break detector baselines restored on resume.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("promptCacheBreakState")]
+    internal JsonElement[]? PromptCacheBreakState { get; set; }
+
     /// <summary>Session-wide accumulated nano-AI units cost at checkpoint time.</summary>
     [JsonPropertyName("totalNanoAiu")]
     public required double TotalNanoAiu { get; set; }
@@ -2668,6 +2788,11 @@ public sealed partial class UserMessageData
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("transformedContent")]
     public string? TransformedContent { get; set; }
+
+    /// <summary>The agent-loop turn ID that consumed this message; absent when no agent-loop turn consumed it.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("turnId")]
+    public string? TurnId { get; set; }
 }
 
 /// <summary>Empty payload; the event signals that the pending message queue has changed.</summary>
@@ -2711,6 +2836,74 @@ public sealed partial class AssistantTurnRetryData
     public required string TurnId { get; set; }
 }
 
+/// <summary>Metadata for work the user interrupted while the agent was running.</summary>
+public sealed partial class AgentInterruptedData
+{
+    /// <summary>What the agent was doing when the user interrupted it.</summary>
+    [JsonPropertyName("activity")]
+    public required AgentInterruptedActivity Activity { get; set; }
+
+    /// <summary>For an interrupted model call: the provider endpoint the request targeted.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("apiEndpoint")]
+    public string? ApiEndpoint { get; set; }
+
+    /// <summary>For an interrupted model call: whether the user interrupted before any token arrived or while the response was streaming.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cancelPhase")]
+    public AgentInterruptedCancelPhase? CancelPhase { get; set; }
+
+    /// <summary>How long the interrupted work had been running, in milliseconds.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("elapsedMs")]
+    public required TimeSpan Elapsed { get; set; }
+
+    /// <summary>For an interrupted background-agent batch: how many background sub-agents the stop swept. Counts accepted cancellations, so an agent cancelled as a cascade of its interrupted parent is covered by that parent rather than counted again.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("interruptedAgentCount")]
+    public long? InterruptedAgentCount { get; set; }
+
+    /// <summary>For an interrupted model call: the model the request targeted.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+
+    /// <summary>For a mid-stream interrupt: the observed time to first observable output, in milliseconds. Deliberately distinct from the `ttftMs` reported on a successful model call, which measures time to first stream event.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("outputTtftMs")]
+    public TimeSpan? OutputTtft { get; set; }
+
+    /// <summary>For an interrupted model call: the reasoning effort the request asked for.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
+
+    /// <summary>Subset of `toolNames` whose tool metadata marks the tool name as safe to record unhashed in telemetry.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("safeToolNames")]
+    public string[]? SafeToolNames { get; set; }
+
+    /// <summary>Tool call identifiers that were still running.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("toolCallIds")]
+    public string[]? ToolCallIds { get; set; }
+
+    /// <summary>Names of the tools that were still running. More than one when the model requested a parallel fan-out.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("toolNames")]
+    public string[]? ToolNames { get; set; }
+
+    /// <summary>For an interrupted model call: the transport the request used.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("transport")]
+    public ModelCallFailureTransport? Transport { get; set; }
+
+    /// <summary>Zero-based agentic-loop iteration the interrupt landed in.</summary>
+    [JsonPropertyName("turn")]
+    public required long Turn { get; set; }
+}
+
 /// <summary>Agent intent description for current activity or plan.</summary>
 public sealed partial class AssistantIntentData
 {
@@ -2746,7 +2939,7 @@ public sealed partial class AssistantReasoningData
     [JsonPropertyName("reasoningId")]
     public required string ReasoningId { get; set; }
 
-    /// <summary>Gets or sets the <c>rte</c> value.</summary>
+    /// <summary>Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("rte")]
     public bool? Rte { get; set; }
@@ -2865,6 +3058,11 @@ public sealed partial class AssistantMessageData
     [JsonPropertyName("phase")]
     public string? Phase { get; set; }
 
+    /// <summary>Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping. `reasoningText` and `reasoningOpaque` are a lossy derived view of these blocks, retained for display.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningBlocks")]
+    public AssistantMessageReasoningBlocks? ReasoningBlocks { get; set; }
+
     /// <summary>Opaque/encrypted extended thinking data from Anthropic models. Session-bound and stripped on resume.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("reasoningOpaque")]
@@ -2885,7 +3083,7 @@ public sealed partial class AssistantMessageData
     [JsonPropertyName("requestId")]
     public string? RequestId { get; set; }
 
-    /// <summary>Gets or sets the <c>rte</c> value.</summary>
+    /// <summary>Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("rte")]
     public bool? Rte { get; set; }
@@ -2970,6 +3168,11 @@ public sealed partial class AssistantIdleData
 /// <summary>LLM API call usage metrics including tokens, costs, quotas, and billing information.</summary>
 public sealed partial class AssistantUsageData
 {
+    /// <summary>Number of accepted speculative prediction tokens.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("acceptedPredictionTokens")]
+    public long? AcceptedPredictionTokens { get; set; }
+
     /// <summary>Completion ID from the model provider (e.g., chatcmpl-abc123).</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("apiCallId")]
@@ -2986,6 +3189,12 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("availableToolCount")]
     internal long? AvailableToolCount { get; set; }
 
+    /// <summary>Whether the provider reported prompt-cache usage details for this call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("cacheDetailsReported")]
+    internal bool? CacheDetailsReported { get; set; }
+
     /// <summary>Updated prompt-cache expiration for this model call. Present only when the call establishes or refreshes known cache state.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("cacheExpiresAt")]
@@ -2996,6 +3205,12 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("cacheReadTokens")]
     public long? CacheReadTokens { get; set; }
 
+    /// <summary>Effective prompt-cache lifetime in seconds for this call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("cacheTtlSeconds")]
+    internal long? CacheTtlSeconds { get; set; }
+
     /// <summary>Number of tokens written to prompt cache.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("cacheWriteTokens")]
@@ -3028,6 +3243,12 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("finishReason")]
     public string? FinishReason { get; set; }
 
+    /// <summary>How the prompt-cache frontier was determined for this call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("frontierSource")]
+    internal string? FrontierSource { get; set; }
+
     /// <summary>What initiated this API call (e.g., "sub-agent", "mcp-sampling"); absent for user-initiated calls.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("initiator")]
@@ -3049,6 +3270,26 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("interTokenLatencyMs")]
     public TimeSpan? InterTokenLatency { get; set; }
 
+    /// <summary>Whether Auto mode was selected for this model call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("isAuto")]
+    public bool? IsAuto { get; set; }
+
+    /// <summary>Whether this model call used a bring-your-own-key provider.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("isByok")]
+    public bool? IsByok { get; set; }
+
+    /// <summary>Requested maximum output tokens used for this model call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("maxOutputTokens")]
+    public long? MaxOutputTokens { get; set; }
+
+    /// <summary>Effective maximum prompt-token limit used for this model call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("maxPromptTokens")]
+    public long? MaxPromptTokens { get; set; }
+
     /// <summary>Model identifier used for this API call.</summary>
     [JsonPropertyName("model")]
     public required string Model { get; set; }
@@ -3064,6 +3305,12 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("outputTokens")]
     public long? OutputTokens { get; set; }
 
+    /// <summary>Time to first observable model output in milliseconds. Includes text, reasoning, and tool-call output; only available for streaming requests that produce observable output.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("outputTtftMs")]
+    public TimeSpan? OutputTtft { get; set; }
+
     /// <summary>Parent tool call ID when this usage originates from a sub-agent.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
 #if NET5_0_OR_GREATER
@@ -3089,12 +3336,22 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("reasoningEffort")]
     public string? ReasoningEffort { get; set; }
 
+    /// <summary>Reasoning summary mode used for this model call, if applicable.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningSummary")]
+    public ReasoningSummary? ReasoningSummary { get; set; }
+
     /// <summary>Number of output tokens used for reasoning (e.g., chain-of-thought).</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("reasoningTokens")]
     public long? ReasoningTokens { get; set; }
 
-    /// <summary>Gets or sets the <c>rte</c> value.</summary>
+    /// <summary>Number of rejected speculative prediction tokens.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("rejectedPredictionTokens")]
+    public long? RejectedPredictionTokens { get; set; }
+
+    /// <summary>Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("rte")]
     public bool? Rte { get; set; }
@@ -3121,6 +3378,141 @@ public sealed partial class AssistantUsageData
     [JsonInclude]
     [JsonPropertyName("toolTokenCount")]
     internal long? ToolTokenCount { get; set; }
+
+    /// <summary>Transport used for this model call (http or websocket).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("transport")]
+    public AssistantUsageTransport? Transport { get; set; }
+}
+
+/// <summary>A detected loss of a previously cached prompt prefix.</summary>
+public sealed partial class PromptCacheBreakData
+{
+    /// <summary>Request state whose cached prefix fell short.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("afterRequest")]
+    internal JsonElement? AfterRequest { get; set; }
+
+    /// <summary>Name of the sub-agent whose conversation broke, stamped by the parent bridge.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("agentName")]
+    internal string? AgentName { get; set; }
+
+    /// <summary>Request state that established the prior cache frontier.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("beforeRequest")]
+    internal JsonElement? BeforeRequest { get; set; }
+
+    /// <summary>Names of the cache-configuration fields that changed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("cacheConfigChangedFields")]
+    internal string[]? CacheConfigChangedFields { get; set; }
+
+    /// <summary>All reasons that contributed to the cache break, ordered by precedence.</summary>
+    [JsonPropertyName("contributingReasons")]
+    public required string[] ContributingReasons { get; set; }
+
+    /// <summary>Prior cached prompt frontier in tokens.</summary>
+    [JsonPropertyName("frontierTokens")]
+    public required long FrontierTokens { get; set; }
+
+    /// <summary>Model that held the prior cache frontier, when the call changed models.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("modelFrom")]
+    internal string? ModelFrom { get; set; }
+
+    /// <summary>Model this call targeted, when the call changed models.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("modelTo")]
+    internal string? ModelTo { get; set; }
+
+    /// <summary>The highest-precedence reason for the cache break.</summary>
+    [JsonPropertyName("primaryReason")]
+    public required string PrimaryReason { get; set; }
+
+    /// <summary>Fraction of the prior cache frontier that survived.</summary>
+    [JsonPropertyName("retentionRatio")]
+    public required double RetentionRatio { get; set; }
+
+    /// <summary>Index of the first conversation message whose content changed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("rewriteMessageIndex")]
+    internal long? RewriteMessageIndex { get; set; }
+
+    /// <summary>Shape of the history rewrite, for example whether the history grew or shrank.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("rewriteShape")]
+    internal string? RewriteShape { get; set; }
+
+    /// <summary>Subsystems that announced a history rewrite before this call, for example compaction or truncation.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("rewriteSource")]
+    internal string[]? RewriteSource { get; set; }
+
+    /// <summary>Cached prefix tokens lost since the prior call.</summary>
+    [JsonPropertyName("shortfallTokens")]
+    public required long ShortfallTokens { get; set; }
+
+    /// <summary>Number of cached prefix tokens that survived.</summary>
+    [JsonPropertyName("survivedTokens")]
+    public required long SurvivedTokens { get; set; }
+
+    /// <summary>Names of the system-prompt segments whose content changed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("systemSegmentsChanged")]
+    internal string[]? SystemSegmentsChanged { get; set; }
+
+    /// <summary>Telemetry-safe names of tools added since the prior call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("toolsAdded")]
+    internal string[]? ToolsAdded { get; set; }
+
+    /// <summary>Raw names of tools added since the prior call, restricted because a tool name can be user-authored.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("toolsAddedRaw")]
+    internal string[]? ToolsAddedRaw { get; set; }
+
+    /// <summary>Telemetry-safe names of tools whose definition changed since the prior call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("toolsRedefined")]
+    internal string[]? ToolsRedefined { get; set; }
+
+    /// <summary>Raw names of tools redefined since the prior call, restricted because a tool name can be user-authored.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("toolsRedefinedRaw")]
+    internal string[]? ToolsRedefinedRaw { get; set; }
+
+    /// <summary>Telemetry-safe names of tools removed since the prior call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("toolsRemoved")]
+    internal string[]? ToolsRemoved { get; set; }
+
+    /// <summary>Raw names of tools removed since the prior call, restricted because a tool name can be user-authored.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("toolsRemovedRaw")]
+    internal string[]? ToolsRemovedRaw { get; set; }
+
+    /// <summary>Whether the tool list kept its members but changed their order.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("toolsReordered")]
+    internal bool? ToolsReordered { get; set; }
 }
 
 /// <summary>Failed LLM API call metadata for telemetry.</summary>
@@ -3172,6 +3564,11 @@ public sealed partial class ModelCallFailureData
     [JsonPropertyName("initiator")]
     public string? Initiator { get; set; }
 
+    /// <summary>Authoritative interaction classification for the failed call, matching `assistant.usage.interactionType` (for example `conversation-agent`, `conversation-subagent`, or `conversation-sampling`). Absent when the producer cannot classify the interaction.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("interactionType")]
+    public string? InteractionType { get; set; }
+
     /// <summary>Whether the session selected Auto mode for the failed call.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("isAuto")]
@@ -3218,7 +3615,7 @@ public sealed partial class ModelCallFailureData
     [JsonPropertyName("requestFingerprint")]
     public ModelCallFailureRequestFingerprint? RequestFingerprint { get; set; }
 
-    /// <summary>Gets or sets the <c>rte</c> value.</summary>
+    /// <summary>Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("rte")]
     public bool? Rte { get; set; }
@@ -3243,6 +3640,37 @@ public sealed partial class ModelCallFailureData
     public ModelCallFailureTransport? Transport { get; set; }
 }
 
+/// <summary>Final lifecycle outcome for one logical model dispatch. A logical dispatch may include internal reconnect or fallback work, so event count is not provider HTTP-request count.</summary>
+public sealed partial class ModelCallFinishedData
+{
+    /// <summary>Whether an accepted successful response requested the exact name and command semantics of a built-in file edit tool, including an external tool explicitly replacing that built-in name. Absent when the logical dispatch did not produce an accepted response.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("containsBuiltInFileEditRequest")]
+    public bool? ContainsBuiltInFileEditRequest { get; set; }
+
+    /// <summary>Monotonic elapsed time spent in the logical model dispatch, including any internal transport reconnect or fallback and excluding orchestrator retry backoff, tool execution, confirmations, and post-response processing.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("dispatchDurationMs")]
+    public required TimeSpan DispatchDuration { get; set; }
+
+    /// <summary>Version of the built-in file-edit semantic classifier used for this event.</summary>
+    [JsonPropertyName("editClassifierVersion")]
+    public required long EditClassifierVersion { get; set; }
+
+    /// <summary>Identifier of the user interaction that owns the model dispatch, matching assistant.turn_start.interactionId when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("interactionId")]
+    public string? InteractionId { get; set; }
+
+    /// <summary>Final outcome after post-response acceptance processing.</summary>
+    [JsonPropertyName("outcome")]
+    public required ModelCallFinishedOutcome Outcome { get; set; }
+
+    /// <summary>Agent-loop iteration within the interaction that initiated the model dispatch.</summary>
+    [JsonPropertyName("turnId")]
+    public required string TurnId { get; set; }
+}
+
 /// <summary>Model API dispatch metadata for internal telemetry.</summary>
 public sealed partial class ModelCallStartData
 {
@@ -3324,7 +3752,7 @@ public sealed partial class ToolExecutionStartData
     [JsonPropertyName("parentToolCallId")]
     public string? ParentToolCallId { get; set; }
 
-    /// <summary>Gets or sets the <c>rte</c> value.</summary>
+    /// <summary>Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("rte")]
     public bool? Rte { get; set; }
@@ -3420,7 +3848,7 @@ public sealed partial class ToolExecutionCompleteData
     [JsonPropertyName("result")]
     public ToolExecutionCompleteResult? Result { get; set; }
 
-    /// <summary>Gets or sets the <c>rte</c> value.</summary>
+    /// <summary>Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("rte")]
     public bool? Rte { get; set; }
@@ -3517,6 +3945,9 @@ public sealed partial class SkillInvokedData
     public SkillInvokedTrigger? Trigger { get; set; }
 }
 
+/// <summary>Payload of `sandbox.decision`, a bounded governance record of what the process sandbox was configured to do and whether it took effect. Discriminated by `kind`.</summary>
+public sealed partial class SandboxDecisionData { }
+
 /// <summary>Sub-agent startup details including parent tool call and agent information.</summary>
 public sealed partial class SubagentStartedData
 {
@@ -3532,6 +3963,11 @@ public sealed partial class SubagentStartedData
     [JsonPropertyName("agentName")]
     public required string AgentName { get; set; }
 
+    /// <summary>Root id of the factory run that spawned this sub-agent, when it was spawned by one.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("factoryRunId")]
+    public string? FactoryRunId { get; set; }
+
     /// <summary>Model the sub-agent will run with, when known at start.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("model")]
@@ -3553,12 +3989,42 @@ public sealed partial class SubagentCompletedData
     [JsonPropertyName("agentName")]
     public required string AgentName { get; set; }
 
+    /// <summary>Whether the sub-agent was torn down by cancellation - its own abort, or an ancestor being killed - instead of finishing its work. Cancellation is not a failure, so the run still reports completion; this distinguishes a torn-down sub-agent from one that ran to the end.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cancelled")]
+    public bool? Cancelled { get; set; }
+
+    /// <summary>Whether the first model actually dispatched matched the user's configured preference.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("configuredModelMatchesActual")]
+    public bool? ConfiguredModelMatchesActual { get; set; }
+
+    /// <summary>Concrete model the user configured for this sub-agent via `/subagents`, when present.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("configuredModelPreference")]
+    public string? ConfiguredModelPreference { get; set; }
+
     /// <summary>Wall-clock duration of the sub-agent execution in milliseconds.</summary>
     [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("durationMs")]
     public TimeSpan? Duration { get; set; }
 
+    /// <summary>Whether the explicit task-call model matched the user's configured preference.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("explicitModelMatchesPreference")]
+    public bool? ExplicitModelMatchesPreference { get; set; }
+
+    /// <summary>Explicit model supplied by the parent agent on the task call, when present.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("explicitModelOverride")]
+    public string? ExplicitModelOverride { get; set; }
+
+    /// <summary>First model for which the sub-agent started an inference request, when one was dispatched.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("firstDispatchedModel")]
+    public string? FirstDispatchedModel { get; set; }
+
     /// <summary>Model used by the sub-agent.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("model")]
@@ -3590,6 +4056,16 @@ public sealed partial class SubagentFailedData
     [JsonPropertyName("agentName")]
     public required string AgentName { get; set; }
 
+    /// <summary>Whether the first model actually dispatched matched the user's configured preference.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("configuredModelMatchesActual")]
+    public bool? ConfiguredModelMatchesActual { get; set; }
+
+    /// <summary>Concrete model the user configured for this sub-agent via `/subagents`, when present.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("configuredModelPreference")]
+    public string? ConfiguredModelPreference { get; set; }
+
     /// <summary>Wall-clock duration of the sub-agent execution in milliseconds.</summary>
     [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -3600,13 +4076,28 @@ public sealed partial class SubagentFailedData
     [JsonPropertyName("error")]
     public required string Error { get; set; }
 
-    /// <summary>Model selected for the sub-agent, when known.</summary>
+    /// <summary>Whether the explicit task-call model matched the user's configured preference.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    [JsonPropertyName("explicitModelMatchesPreference")]
+    public bool? ExplicitModelMatchesPreference { get; set; }
 
-    /// <summary>Tool call ID of the parent tool invocation that spawned this sub-agent.</summary>
-    [JsonPropertyName("toolCallId")]
+    /// <summary>Explicit model supplied by the parent agent on the task call, when present.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("explicitModelOverride")]
+    public string? ExplicitModelOverride { get; set; }
+
+    /// <summary>First model for which the sub-agent started an inference request, when one was dispatched.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("firstDispatchedModel")]
+    public string? FirstDispatchedModel { get; set; }
+
+    /// <summary>Model selected for the sub-agent, when known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+
+    /// <summary>Tool call ID of the parent tool invocation that spawned this sub-agent.</summary>
+    [JsonPropertyName("toolCallId")]
     public required string ToolCallId { get; set; }
 
     /// <summary>Total tokens (input + output) consumed before the sub-agent failed.</summary>
@@ -4053,6 +4544,34 @@ public sealed partial class SessionCustomNotificationData
     public long? Version { get; set; }
 }
 
+/// <summary>Ordered output and terminal state for a transient query that does not modify conversation history.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed partial class UiEphemeralQueryData
+{
+    /// <summary>Full response text, present for the `completed` phase.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("answer")]
+    public string? Answer { get; set; }
+
+    /// <summary>Ordered text delta, present for the `chunk` phase.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("chunk")]
+    public string? Chunk { get; set; }
+
+    /// <summary>Model or transport failure message, present for the `failed` phase.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Current query lifecycle phase.</summary>
+    [JsonPropertyName("phase")]
+    public required UIEphemeralQueryPhase Phase { get; set; }
+
+    /// <summary>Runtime-minted query identifier.</summary>
+    [JsonPropertyName("requestId")]
+    public required string RequestId { get; set; }
+}
+
 /// <summary>External tool invocation request for client-side tool execution.</summary>
 public sealed partial class ExternalToolRequestedData
 {
@@ -4061,6 +4580,11 @@ public sealed partial class ExternalToolRequestedData
     [JsonPropertyName("arguments")]
     public JsonElement? Arguments { get; set; }
 
+    /// <summary>Stable provider identity captured with an extension-owned tool definition; hosts use it to route the request to the same provider that was offered to the model.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { get; set; }
+
     /// <summary>Unique identifier for this request; used to respond via session.respondToExternalTool().</summary>
     [JsonPropertyName("requestId")]
     public required string RequestId { get; set; }
@@ -4278,7 +4802,7 @@ public sealed partial class SessionAutoModeResolvedData
     public bool? StickyOverride { get; set; }
 }
 
-/// <summary>Enterprise managed-settings resolution: the effective managed settings the session applied and where they came from, so SDK clients can show users what is enterprise-managed and by which authority. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted; for a session-independent pull, use the SDK `getManagedSettings()` API, which returns the identical payload. Managed settings have a single authoritative source, so the highest-authority present layer (server &gt; device) wins wholesale; `bypassPermissionsDisabled` is deny-wins across layers. Marked experimental while the managed-settings surface stabilizes.</summary>
+/// <summary>Enterprise managed-settings resolution: the effective managed settings the session applied and which channels contributed, so SDK clients can show users what is enterprise-managed. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted. Device values take precedence over server values per ordinary key, while permissions compose restrictively across device, server, and SDK-client layers. The account-scoped `getManagedSettings()` API does not include session-local client injection. Marked experimental while the managed-settings surface stabilizes.</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed partial class SessionManagedSettingsResolvedData
 {
@@ -4286,7 +4810,12 @@ public sealed partial class SessionManagedSettingsResolvedData
     [JsonPropertyName("bypassPermissionsDisabled")]
     public required bool BypassPermissionsDisabled { get; set; }
 
-    /// <summary>Whether the device (MDM/plist/registry/file) managed-settings layer was present.</summary>
+    /// <summary>Whether a session-local permissions layer injected by the SDK host was present.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("clientManaged")]
+    public bool? ClientManaged { get; set; }
+
+    /// <summary>Whether an actual device MDM/plist/registry/file managed-settings layer was present.</summary>
     [JsonPropertyName("deviceManaged")]
     public required bool DeviceManaged { get; set; }
 
@@ -4298,11 +4827,16 @@ public sealed partial class SessionManagedSettingsResolvedData
     [JsonPropertyName("managedKeys")]
     public required string[] ManagedKeys { get; set; }
 
-    /// <summary>Whether server and device each supplied a permission allowlist, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.</summary>
+    /// <summary>Whether at least two managed sources supplied permission allowlists, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("permissionsAllowIntersected")]
     public bool? PermissionsAllowIntersected { get; set; }
 
+    /// <summary>Whether the effective sandbox policy forces the sandbox on *only* because managed policy could not be determined, rather than because the policy requires it. Lets clients tell a user whose `--no-sandbox` was overridden that the sandbox stayed on as a fail-closed fallback, instead of attributing it to an administrator who set no such policy.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("sandboxEnabledByUndeterminedPolicy")]
+    public bool? SandboxEnabledByUndeterminedPolicy { get; set; }
+
     /// <summary>Whether the server (account/org) managed-settings layer was present.</summary>
     [JsonPropertyName("serverManaged")]
     public required bool ServerManaged { get; set; }
@@ -4312,7 +4846,7 @@ public sealed partial class SessionManagedSettingsResolvedData
     [JsonPropertyName("settings")]
     public JsonElement? Settings { get; set; }
 
-    /// <summary>Which channel supplied the effective managed settings (the winning layer), or `none` when no policy is in force.</summary>
+    /// <summary>Channel summary: `server`, `device`, or `client` when exactly one channel contributed; `mixed` when multiple channels contributed; otherwise `none`. Consult the per-channel booleans for exact provenance.</summary>
     [JsonPropertyName("source")]
     public required ManagedSettingsResolvedSource Source { get; set; }
 }
@@ -4367,6 +4901,11 @@ public sealed partial class ExitPlanModeRequestedData
     [JsonPropertyName("actions")]
     public required ExitPlanModeAction[] Actions { get; set; }
 
+    /// <summary>Model the session had selected when the plan was authored, when one is known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+
     /// <summary>Full content of the plan file.</summary>
     [JsonPropertyName("planContent")]
     public required string PlanContent { get; set; }
@@ -4433,9 +4972,56 @@ public sealed partial class FactoryRunUpdatedData
     [JsonPropertyName("revision")]
     public required long Revision { get; set; }
 
-    /// <summary>Gets or sets the <c>runId</c> value.</summary>
+    /// <summary>Factory run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
+}
+
+/// <summary>Ephemeral signal that a factory run attempt began executing.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed partial class FactoryRunStartedData
+{
+    /// <summary>Attempt number this start committed; a resumed run increments it.</summary>
+    [JsonPropertyName("attempt")]
+    public required long Attempt { get; set; }
+
+    /// <summary>Name of the factory this run executes. Low cardinality by construction.</summary>
+    [JsonPropertyName("factoryName")]
+    public required string FactoryName { get; set; }
+
+    /// <summary>Identifier of the factory run that started.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
+}
+
+/// <summary>Ephemeral signal that a factory run reached a terminal status.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed partial class FactoryRunSettledData
+{
+    /// <summary>AI credits this run consumed, in nano-AIU.</summary>
+    [JsonPropertyName("consumedNanoAiu")]
+    public required long ConsumedNanoAiu { get; set; }
+
+    /// <summary>Subagents this run consumed against its limits.</summary>
+    [JsonPropertyName("consumedSubagents")]
+    public required long ConsumedSubagents { get; set; }
+
+    /// <summary>Active milliseconds accumulated across every attempt of this run.</summary>
+    [JsonPropertyName("elapsedMs")]
+    public required long ElapsedMs { get; set; }
+
+    /// <summary>Typed failure class recorded on the run, when it failed with one (e.g. `factory_limit_reached`).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("failureType")]
+    public string? FailureType { get; set; }
+
+    /// <summary>Identifier of the factory run that settled.</summary>
     [JsonPropertyName("runId")]
     public required string RunId { get; set; }
+
+    /// <summary>Terminal status the run committed.</summary>
+    [JsonPropertyName("status")]
+    public required FactoryRunSettledStatus Status { get; set; }
 }
 
 /// <summary>Payload of `session.skills_loaded` listing resolved skill metadata.</summary>
@@ -4786,23 +5372,6 @@ public sealed partial class HandoffRepository
     public required string Owner { get; set; }
 }
 
-/// <summary>Aggregate code change metrics for the session.</summary>
-/// <remarks>Nested data type for <c>ShutdownCodeChanges</c>.</remarks>
-public sealed partial class ShutdownCodeChanges
-{
-    /// <summary>List of file paths that were modified during the session.</summary>
-    [JsonPropertyName("filesModified")]
-    public required string[] FilesModified { get; set; }
-
-    /// <summary>Total number of lines added during the session.</summary>
-    [JsonPropertyName("linesAdded")]
-    public required long LinesAdded { get; set; }
-
-    /// <summary>Total number of lines removed during the session.</summary>
-    [JsonPropertyName("linesRemoved")]
-    public required long LinesRemoved { get; set; }
-}
-
 /// <summary>Request count and cost metrics.</summary>
 /// <remarks>Nested data type for <c>ShutdownModelMetricRequests</c>.</remarks>
 public sealed partial class ShutdownModelMetricRequests
@@ -4879,6 +5448,51 @@ public sealed partial class ShutdownModelMetric
     public required ShutdownModelMetricUsage Usage { get; set; }
 }
 
+/// <summary>Usage attributed to one agent instance at session shutdown.</summary>
+/// <remarks>Nested data type for <c>ShutdownAgentMetric</c>.</remarks>
+public sealed partial class ShutdownAgentMetric
+{
+    /// <summary>Human-readable label for this subagent invocation, copied from the originating `subagent.started` event. For task-tool subagents this is the invocation's task description rather than the agent's configured display name, so group by `agentName` for stable per-agent labels.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("agentDisplayName")]
+    public string? AgentDisplayName { get; set; }
+
+    /// <summary>Configured agent name, when this is a subagent.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("agentName")]
+    public string? AgentName { get; set; }
+
+    /// <summary>Per-model usage for this agent, keyed by model identifier.</summary>
+    [JsonPropertyName("modelMetrics")]
+    public required IDictionary<string, ShutdownModelMetric> ModelMetrics { get; set; }
+
+    /// <summary>Time spent in model API calls by this agent, in milliseconds.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("totalApiDurationMs")]
+    public required TimeSpan TotalApiDuration { get; set; }
+
+    /// <summary>Accumulated nano-AI units cost for this agent.</summary>
+    [JsonPropertyName("totalNanoAiu")]
+    public required double TotalNanoAiu { get; set; }
+}
+
+/// <summary>Aggregate code change metrics for the session.</summary>
+/// <remarks>Nested data type for <c>ShutdownCodeChanges</c>.</remarks>
+public sealed partial class ShutdownCodeChanges
+{
+    /// <summary>List of file paths that were modified during the session.</summary>
+    [JsonPropertyName("filesModified")]
+    public required string[] FilesModified { get; set; }
+
+    /// <summary>Total number of lines added during the session.</summary>
+    [JsonPropertyName("linesAdded")]
+    public required long LinesAdded { get; set; }
+
+    /// <summary>Total number of lines removed during the session.</summary>
+    [JsonPropertyName("linesRemoved")]
+    public required long LinesRemoved { get; set; }
+}
+
 /// <summary>A session-wide shutdown token-type entry storing the accumulated token count.</summary>
 /// <remarks>Nested data type for <c>ShutdownTokenDetail</c>.</remarks>
 public sealed partial class ShutdownTokenDetail
@@ -5691,31 +6305,46 @@ public sealed partial class Citations
     public required CitationSpan[] Spans { get; set; }
 }
 
+/// <summary>Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping.</summary>
+/// <remarks>Nested data type for <c>AssistantMessageReasoningBlocks</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public sealed partial class AssistantMessageReasoningBlocks
+{
+    /// <summary>Provider-native reasoning content blocks (e.g. Anthropic `thinking` / `redacted_thinking`) preserved verbatim, in order. A single response can carry several, each signed over the content preceding it, so dropping or reordering any of them invalidates the rest.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("blocks")]
+    public JsonElement[]? Blocks { get; set; }
+
+    /// <summary>Model provider that produced these reasoning blocks.</summary>
+    [JsonPropertyName("provider")]
+    public required string Provider { get; set; }
+}
+
 /// <summary>Neutral provider-tagged server-side tool-use payload (tool search, advisor) for verbatim round-tripping.</summary>
 /// <remarks>Nested data type for <c>AssistantMessageServerTools</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
 public sealed partial class AssistantMessageServerTools
 {
-    /// <summary>Gets or sets the <c>advisorModel</c> value.</summary>
+    /// <summary>Advisor model identifier associated with the server-tool payload.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("advisorModel")]
     public string? AdvisorModel { get; set; }
 
-    /// <summary>Gets or sets the <c>functionCallNamespaces</c> value.</summary>
+    /// <summary>Provider function-call namespaces keyed by function-call identifier.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("functionCallNamespaces")]
     public IDictionary<string, string>? FunctionCallNamespaces { get; set; }
 
-    /// <summary>Gets or sets the <c>items</c> value.</summary>
+    /// <summary>Provider-native server-tool call and output items preserved verbatim for replay.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("items")]
     public JsonElement[]? Items { get; set; }
 
-    /// <summary>Gets or sets the <c>provider</c> value.</summary>
+    /// <summary>Model provider that produced this server-tool payload.</summary>
     [JsonPropertyName("provider")]
     public required string Provider { get; set; }
 
-    /// <summary>Gets or sets the <c>rawContentBlocks</c> value.</summary>
+    /// <summary>Raw provider content blocks retained for verbatim round-tripping.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("rawContentBlocks")]
     public JsonElement[]? RawContentBlocks { get; set; }
@@ -6523,22 +7152,22 @@ public partial class ToolExecutionCompleteContent
 /// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUICsp</c>.</remarks>
 public sealed partial class ToolExecutionCompleteUIResourceMetaUICsp
 {
-    /// <summary>Gets or sets the <c>baseUriDomains</c> value.</summary>
+    /// <summary>Domains the UI resource may use as document base URIs.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("baseUriDomains")]
     public string[]? BaseUriDomains { get; set; }
 
-    /// <summary>Gets or sets the <c>connectDomains</c> value.</summary>
+    /// <summary>Domains the UI resource may connect to.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("connectDomains")]
     public string[]? ConnectDomains { get; set; }
 
-    /// <summary>Gets or sets the <c>frameDomains</c> value.</summary>
+    /// <summary>Domains the UI resource may embed as nested frames.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("frameDomains")]
     public string[]? FrameDomains { get; set; }
 
-    /// <summary>Gets or sets the <c>resourceDomains</c> value.</summary>
+    /// <summary>Domains from which the UI resource may load scripts, styles, images, and other resources.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("resourceDomains")]
     public string[]? ResourceDomains { get; set; }
@@ -6602,7 +7231,7 @@ public sealed partial class ToolExecutionCompleteUIResourceMetaUI
     [JsonPropertyName("csp")]
     public ToolExecutionCompleteUIResourceMetaUICsp? Csp { get; set; }
 
-    /// <summary>Gets or sets the <c>domain</c> value.</summary>
+    /// <summary>Optional dedicated origin for the rendered MCP Apps UI resource.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("domain")]
     public string? Domain { get; set; }
@@ -6612,7 +7241,7 @@ public sealed partial class ToolExecutionCompleteUIResourceMetaUI
     [JsonPropertyName("permissions")]
     public ToolExecutionCompleteUIResourceMetaUIPermissions? Permissions { get; set; }
 
-    /// <summary>Gets or sets the <c>prefersBorder</c> value.</summary>
+    /// <summary>Whether the host should render a border around the MCP Apps UI resource.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("prefersBorder")]
     public bool? PrefersBorder { get; set; }
@@ -6789,7 +7418,7 @@ public sealed partial class SystemNotificationAgentCompleted : SystemNotificatio
     [JsonIgnore]
     public override string Type => "agent_completed";
 
-    /// <summary>Unique identifier of the background agent.</summary>
+    /// <summary>Unique task identifier.</summary>
     [JsonPropertyName("agentId")]
     public required string AgentId { get; set; }
 
@@ -6802,6 +7431,11 @@ public sealed partial class SystemNotificationAgentCompleted : SystemNotificatio
     [JsonPropertyName("description")]
     public string? Description { get; set; }
 
+    /// <summary>Friendly, non-unique name intended for display.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
+
     /// <summary>The full prompt given to the background agent.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("prompt")]
@@ -6820,7 +7454,7 @@ public sealed partial class SystemNotificationAgentIdle : SystemNotification
     [JsonIgnore]
     public override string Type => "agent_idle";
 
-    /// <summary>Unique identifier of the background agent.</summary>
+    /// <summary>Unique task identifier.</summary>
     [JsonPropertyName("agentId")]
     public required string AgentId { get; set; }
 
@@ -6832,6 +7466,11 @@ public sealed partial class SystemNotificationAgentIdle : SystemNotification
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("description")]
     public string? Description { get; set; }
+
+    /// <summary>Friendly, non-unique name intended for display.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
 }
 
 /// <summary>System notification metadata for a new inbox message, including entry ID, sender details, and summary.</summary>
@@ -7229,6 +7868,12 @@ public sealed partial class PermissionRequestMcp : PermissionRequest
     [JsonPropertyName("args")]
     public JsonElement? Args { get; set; }
 
+    /// <summary>Advisory runtime permission recommendation. The SDK host remains responsible for deciding the request and may reject it.</summary>
+    [Experimental(Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("permissionRecommendation")]
+    public PermissionRecommendation? PermissionRecommendation { get; set; }
+
     /// <summary>Whether this MCP tool is read-only (no side effects).</summary>
     [JsonPropertyName("readOnly")]
     public required bool ReadOnly { get; set; }
@@ -7297,6 +7942,31 @@ public override bool? ManagedApprovalRequired
     public required string Url { get; set; }
 }
 
+/// <summary>Assisted-approval judge information attached to a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request.</summary>
+/// <remarks>Nested data type for <c>PermissionAssistedApproval</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public sealed partial class PermissionAssistedApproval
+{
+    /// <summary>Classified cause of an `error` recommendation. Absent for every other recommendation.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("failureReason")]
+    public AssistedApprovalJudgeFailureReason? FailureReason { get; set; }
+
+    /// <summary>Model id that produced the recommendation, when the judge was consulted and reported one. Absent for `excluded` (the judge was not consulted) and for failures that occurred before a model was selected.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+
+    /// <summary>Human-readable reason for the judge's recommendation, when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
+
+    /// <summary>The assisted-approval safety judge's outcome for this request.</summary>
+    [JsonPropertyName("recommendation")]
+    public required AssistedApprovalRecommendation Recommendation { get; set; }
+}
+
 /// <summary>Memory operation permission request.</summary>
 /// <remarks>The <c>memory</c> variant of <see cref="PermissionRequest"/>.</remarks>
 public sealed partial class PermissionRequestMemory : PermissionRequest
@@ -7310,6 +7980,12 @@ public sealed partial class PermissionRequestMemory : PermissionRequest
     [JsonPropertyName("action")]
     public PermissionRequestMemoryAction? Action { get; set; }
 
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
+    [Experimental(Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
+
     /// <summary>Source references for the stored fact (store only).</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("citations")]
@@ -7329,6 +8005,16 @@ public sealed partial class PermissionRequestMemory : PermissionRequest
     [JsonPropertyName("reason")]
     public string? Reason { get; set; }
 
+    /// <summary>Repository name with owner associated with the stored memory (store only).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("repoNwo")]
+    public string? RepoNwo { get; set; }
+
+    /// <summary>Scope of the stored memory (store only).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("scope")]
+    public PermissionRequestMemoryScope? Scope { get; set; }
+
     /// <summary>Topic or subject of the memory (store only).</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("subject")]
@@ -7353,6 +8039,11 @@ public sealed partial class PermissionRequestCustomTool : PermissionRequest
     [JsonPropertyName("args")]
     public JsonElement? Args { get; set; }
 
+    /// <summary>Whether the tool declared that permission may be skipped unless a deny rule matches.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("skipPermission")]
+    public bool? SkipPermission { get; set; }
+
     /// <summary>Tool call ID that triggered this permission request.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("toolCallId")]
@@ -7448,22 +8139,22 @@ public sealed partial class PermissionRequestFactory : PermissionRequest
     [JsonPropertyName("canPersistApproval")]
     public required bool CanPersistApproval { get; set; }
 
-    /// <summary>Gets or sets the <c>declaredMaxAiCredits</c> value.</summary>
+    /// <summary>Factory-declared AI-credit limit before any run/resume caller override is applied.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("declaredMaxAiCredits")]
     public double? DeclaredMaxAiCredits { get; set; }
 
-    /// <summary>Gets or sets the <c>declaredMaxConcurrentSubagents</c> value.</summary>
+    /// <summary>Factory-declared concurrent-subagent limit before any run/resume caller override is applied.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("declaredMaxConcurrentSubagents")]
     public long? DeclaredMaxConcurrentSubagents { get; set; }
 
-    /// <summary>Gets or sets the <c>declaredMaxTotalSubagents</c> value.</summary>
+    /// <summary>Factory-declared total-subagent limit before any run/resume caller override is applied.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("declaredMaxTotalSubagents")]
     public long? DeclaredMaxTotalSubagents { get; set; }
 
-    /// <summary>Gets or sets the <c>declaredTimeoutSeconds</c> value.</summary>
+    /// <summary>Factory-declared active-time limit in seconds before any run/resume caller override is applied.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("declaredTimeoutSeconds")]
     public double? DeclaredTimeoutSeconds { get; set; }
@@ -7532,6 +8223,28 @@ public sealed partial class PermissionRequestExtensionPermissionAccess : Permiss
     public string? ToolCallId { get; set; }
 }
 
+/// <summary>Extension sensitive environment variable access request.</summary>
+/// <remarks>The <c>extension-env-access</c> variant of <see cref="PermissionRequest"/>.</remarks>
+public sealed partial class PermissionRequestExtensionEnvAccess : PermissionRequest
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-env-access";
+
+    /// <summary>Names of the sensitive environment variables the extension is requesting. Values never appear here.</summary>
+    [JsonPropertyName("environmentVariables")]
+    public required string[] EnvironmentVariables { get; set; }
+
+    /// <summary>Name of the extension requesting environment variable access.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
+
+    /// <summary>Tool call ID that triggered this permission request.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("toolCallId")]
+    public string? ToolCallId { get; set; }
+}
+
 /// <summary>Details of the permission being requested.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [JsonPolymorphic(
@@ -7548,6 +8261,7 @@ public sealed partial class PermissionRequestExtensionPermissionAccess : Permiss
 [JsonDerivedType(typeof(PermissionRequestExtensionManagement), "extension-management")]
 [JsonDerivedType(typeof(PermissionRequestFactory), "factory")]
 [JsonDerivedType(typeof(PermissionRequestExtensionPermissionAccess), "extension-permission-access")]
+[JsonDerivedType(typeof(PermissionRequestExtensionEnvAccess), "extension-env-access")]
 public partial class PermissionRequest
 {
     /// <summary>The type discriminator.</summary>
@@ -7561,31 +8275,6 @@ public partial class PermissionRequest
 }
 
 
-/// <summary>Auto-approval judge information attached to a permission request. Present (non-null) only when the session's allow-all mode is "auto"; its absence means auto mode was off and the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request.</summary>
-/// <remarks>Nested data type for <c>PermissionAutoApproval</c>.</remarks>
-[Experimental(Diagnostics.Experimental)]
-public sealed partial class PermissionAutoApproval
-{
-    /// <summary>Classified cause of an `error` recommendation. Absent for every other recommendation.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("failureReason")]
-    public AutoApprovalJudgeFailureReason? FailureReason { get; set; }
-
-    /// <summary>Model id that produced the recommendation, when the judge was consulted and reported one. Absent for `excluded` (the judge was not consulted) and for failures that occurred before a model was selected.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
-
-    /// <summary>Human-readable reason for the judge's recommendation, when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
-
-    /// <summary>The auto-approval safety judge's outcome for this request.</summary>
-    [JsonPropertyName("recommendation")]
-    public required AutoApprovalRecommendation Recommendation { get; set; }
-}
-
 /// <summary>Shell command permission prompt.</summary>
 /// <remarks>The <c>commands</c> variant of <see cref="PermissionPromptRequest"/>.</remarks>
 public sealed partial class PermissionPromptRequestCommands : PermissionPromptRequest
@@ -7594,11 +8283,11 @@ public sealed partial class PermissionPromptRequestCommands : PermissionPromptRe
     [JsonIgnore]
     public override string Kind => "commands";
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Whether the UI can offer session-wide approval for this command pattern.</summary>
     [JsonPropertyName("canOfferSessionApproval")]
@@ -7640,11 +8329,11 @@ public sealed partial class PermissionPromptRequestWrite : PermissionPromptReque
     [JsonIgnore]
     public override string Kind => "write";
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Whether the UI can offer session-wide approval for file write operations.</summary>
     [JsonPropertyName("canOfferSessionApproval")]
@@ -7686,11 +8375,11 @@ public sealed partial class PermissionPromptRequestRead : PermissionPromptReques
     [JsonIgnore]
     public override string Kind => "read";
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Human-readable description of why the file is being read.</summary>
     [JsonPropertyName("intention")]
@@ -7724,11 +8413,22 @@ public sealed partial class PermissionPromptRequestMcp : PermissionPromptRequest
     [JsonPropertyName("args")]
     public JsonElement? Args { get; set; }
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
+    [Experimental(Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
+
+    /// <summary>Whether the host may offer a server-wide "approve all tools from this server" blanket. Absent is treated as true; the runtime sends false when managed policy disables bypass-permissions mode, which forbids the server-wide escalation while still allowing per-tool approval.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("canOfferServerWideApproval")]
+    public bool? CanOfferServerWideApproval { get; set; }
+
+    /// <summary>Advisory runtime permission recommendation. The host remains responsible for deciding the request and may reject it.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("permissionRecommendation")]
+    public PermissionRecommendation? PermissionRecommendation { get; set; }
 
     /// <summary>Name of the MCP server providing the tool.</summary>
     [JsonPropertyName("serverName")]
@@ -7756,11 +8456,11 @@ public sealed partial class PermissionPromptRequestUrl : PermissionPromptRequest
     [JsonIgnore]
     public override string Kind => "url";
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Human-readable description of why the URL is being accessed.</summary>
     [JsonPropertyName("intention")]
@@ -7809,11 +8509,11 @@ public sealed partial class PermissionPromptRequestMemory : PermissionPromptRequ
     [JsonPropertyName("action")]
     public PermissionRequestMemoryAction? Action { get; set; }
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Source references for the stored fact (store only).</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -7858,11 +8558,11 @@ public sealed partial class PermissionPromptRequestCustomTool : PermissionPrompt
     [JsonPropertyName("args")]
     public JsonElement? Args { get; set; }
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Tool call ID that triggered this permission request.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -7890,11 +8590,11 @@ public sealed partial class PermissionPromptRequestPath : PermissionPromptReques
     [JsonPropertyName("accessKind")]
     public required PermissionPromptRequestPathAccessKind AccessKind { get; set; }
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>File paths that require explicit approval.</summary>
     [JsonPropertyName("paths")]
@@ -7914,11 +8614,11 @@ public sealed partial class PermissionPromptRequestHook : PermissionPromptReques
     [JsonIgnore]
     public override string Kind => "hook";
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Optional message from the hook explaining why confirmation is needed.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -7948,11 +8648,11 @@ public sealed partial class PermissionPromptRequestExtensionManagement : Permiss
     [JsonIgnore]
     public override string Kind => "extension-management";
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Name of the extension being managed.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -7981,32 +8681,32 @@ public sealed partial class PermissionPromptRequestFactory : PermissionPromptReq
     [JsonPropertyName("approvalKey")]
     public required string ApprovalKey { get; set; }
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Whether this factory is eligible for persistent approval.</summary>
     [JsonPropertyName("canPersistApproval")]
     public required bool CanPersistApproval { get; set; }
 
-    /// <summary>Gets or sets the <c>declaredMaxAiCredits</c> value.</summary>
+    /// <summary>Factory-declared AI-credit limit before any run/resume caller override is applied.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("declaredMaxAiCredits")]
     public double? DeclaredMaxAiCredits { get; set; }
 
-    /// <summary>Gets or sets the <c>declaredMaxConcurrentSubagents</c> value.</summary>
+    /// <summary>Factory-declared concurrent-subagent limit before any run/resume caller override is applied.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("declaredMaxConcurrentSubagents")]
     public long? DeclaredMaxConcurrentSubagents { get; set; }
 
-    /// <summary>Gets or sets the <c>declaredMaxTotalSubagents</c> value.</summary>
+    /// <summary>Factory-declared total-subagent limit before any run/resume caller override is applied.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("declaredMaxTotalSubagents")]
     public long? DeclaredMaxTotalSubagents { get; set; }
 
-    /// <summary>Gets or sets the <c>declaredTimeoutSeconds</c> value.</summary>
+    /// <summary>Factory-declared active-time limit in seconds before any run/resume caller override is applied.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("declaredTimeoutSeconds")]
     public double? DeclaredTimeoutSeconds { get; set; }
@@ -8066,11 +8766,11 @@ public sealed partial class PermissionPromptRequestExtensionPermissionAccess : P
     [JsonIgnore]
     public override string Kind => "extension-permission-access";
 
-    /// <summary>Auto-approval judge information for this request; present only when auto mode is enabled.</summary>
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
     [Experimental(Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoApproval")]
-    public PermissionAutoApproval? AutoApproval { get; set; }
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
 
     /// <summary>Capabilities the extension is requesting.</summary>
     [JsonPropertyName("capabilities")]
@@ -8086,6 +8786,34 @@ public sealed partial class PermissionPromptRequestExtensionPermissionAccess : P
     public string? ToolCallId { get; set; }
 }
 
+/// <summary>Extension sensitive environment variable access prompt.</summary>
+/// <remarks>The <c>extension-env-access</c> variant of <see cref="PermissionPromptRequest"/>.</remarks>
+public sealed partial class PermissionPromptRequestExtensionEnvAccess : PermissionPromptRequest
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-env-access";
+
+    /// <summary>Assisted-approval judge information for this request; present only in assisted mode.</summary>
+    [Experimental(Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("assistedApproval")]
+    public PermissionAssistedApproval? AssistedApproval { get; set; }
+
+    /// <summary>Names of the sensitive environment variables the extension is requesting. Values never appear here.</summary>
+    [JsonPropertyName("environmentVariables")]
+    public required string[] EnvironmentVariables { get; set; }
+
+    /// <summary>Name of the extension requesting environment variable access.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
+
+    /// <summary>Tool call ID that triggered this permission request.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("toolCallId")]
+    public string? ToolCallId { get; set; }
+}
+
 /// <summary>Derived user-facing permission prompt details for UI consumers.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [JsonPolymorphic(
@@ -8103,6 +8831,7 @@ public sealed partial class PermissionPromptRequestExtensionPermissionAccess : P
 [JsonDerivedType(typeof(PermissionPromptRequestExtensionManagement), "extension-management")]
 [JsonDerivedType(typeof(PermissionPromptRequestFactory), "factory")]
 [JsonDerivedType(typeof(PermissionPromptRequestExtensionPermissionAccess), "extension-permission-access")]
+[JsonDerivedType(typeof(PermissionPromptRequestExtensionEnvAccess), "extension-env-access")]
 public partial class PermissionPromptRequest
 {
     /// <summary>The type discriminator.</summary>
@@ -8118,6 +8847,11 @@ public sealed partial class PermissionResultApproved : PermissionResult
     /// <inheritdoc />
     [JsonIgnore]
     public override string Kind => "approved";
+
+    /// <summary>Whether a managed approval policy already handled this request.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("managedApprovalHandled")]
+    public bool? ManagedApprovalHandled { get; set; }
 }
 
 /// <summary>Session-scoped tool-approval rule for specific shell command identifiers.</summary>
@@ -8231,6 +8965,23 @@ public sealed partial class UserToolSessionApprovalExtensionPermissionAccess : U
     public required string ExtensionName { get; set; }
 }
 
+/// <summary>Session-scoped tool-approval rule for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.</summary>
+/// <remarks>The <c>extension-env-access</c> variant of <see cref="UserToolSessionApproval"/>.</remarks>
+public sealed partial class UserToolSessionApprovalExtensionEnvAccess : UserToolSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-env-access";
+
+    /// <summary>Names of the sensitive environment variables this approval covers. Values are never persisted.</summary>
+    [JsonPropertyName("environmentVariables")]
+    public required string[] EnvironmentVariables { get; set; }
+
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
+}
+
 /// <summary>The approval to add as a session-scoped rule.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [JsonPolymorphic(
@@ -8245,6 +8996,7 @@ public sealed partial class UserToolSessionApprovalExtensionPermissionAccess : U
 [JsonDerivedType(typeof(UserToolSessionApprovalExtensionManagement), "extension-management")]
 [JsonDerivedType(typeof(UserToolSessionApprovalFactory), "factory")]
 [JsonDerivedType(typeof(UserToolSessionApprovalExtensionPermissionAccess), "extension-permission-access")]
+[JsonDerivedType(typeof(UserToolSessionApprovalExtensionEnvAccess), "extension-env-access")]
 public partial class UserToolSessionApproval
 {
     /// <summary>The type discriminator.</summary>
@@ -8264,6 +9016,11 @@ public sealed partial class PermissionResultApprovedForSession : PermissionResul
     /// <summary>The approval to add as a session-scoped rule.</summary>
     [JsonPropertyName("approval")]
     public required UserToolSessionApproval Approval { get; set; }
+
+    /// <summary>Whether a managed approval policy already handled this request.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("managedApprovalHandled")]
+    public bool? ManagedApprovalHandled { get; set; }
 }
 
 /// <summary>Permission response variant that approves a request and persists the provided approval to a project location key.</summary>
@@ -8281,6 +9038,11 @@ public sealed partial class PermissionResultApprovedForLocation : PermissionResu
     /// <summary>The location key (git root or cwd) to persist the approval to.</summary>
     [JsonPropertyName("locationKey")]
     public required string LocationKey { get; set; }
+
+    /// <summary>Whether a managed approval policy already handled this request.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("managedApprovalHandled")]
+    public bool? ManagedApprovalHandled { get; set; }
 }
 
 /// <summary>Permission response variant indicating the request was cancelled before use, with an optional reason.</summary>
@@ -8564,6 +9326,11 @@ public sealed partial class SkillsLoadedSkill
     [JsonPropertyName("argumentHint")]
     public string? ArgumentHint { get; set; }
 
+    /// <summary>Canonical slash command name used to invoke the skill, without the leading '/'.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("commandName")]
+    public string? CommandName { get; set; }
+
     /// <summary>Description of what the skill does.</summary>
     [JsonPropertyName("description")]
     public required string Description { get; set; }
@@ -9035,23 +9802,87 @@ public override void Write(Utf8JsonWriter writer, Verbosity value, JsonSerialize
     }
 }
 
-/// <summary>Who created the schedule: `user` (an explicit user action such as `/every` or `/after`) or `model` (the agent via the `manage_schedule` tool). Gates whether a scheduled skill that opted out of model invocation may fire: only user-created schedules may.</summary>
+/// <summary>The session mode the agent is operating in.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ScheduleOrigin : IEquatable<ScheduleOrigin>
+public readonly struct SessionMode : IEquatable<SessionMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ScheduleOrigin"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ScheduleOrigin"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionMode"/>.</param>
     [JsonConstructor]
-    public ScheduleOrigin(string value)
+    public SessionMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ScheduleOrigin"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionMode"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The agent is responding interactively to the user.</summary>
+    public static SessionMode Interactive { get; } = new("interactive");
+
+    /// <summary>The agent is preparing a plan before making changes.</summary>
+    public static SessionMode Plan { get; } = new("plan");
+
+    /// <summary>The agent is working autonomously toward task completion.</summary>
+    public static SessionMode Autopilot { get; } = new("autopilot");
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionMode"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionMode left, SessionMode right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionMode left, SessionMode right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is SessionMode other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(SessionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{SessionMode}"/> for serializing <see cref="SessionMode"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<SessionMode>
+    {
+        /// <inheritdoc />
+        public override SessionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, SessionMode value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionMode));
+        }
+    }
+}
+
+/// <summary>Who created the schedule: `user` (an explicit user action such as `/every` or `/after`) or `model` (the agent via the `manage_schedule` tool). Gates whether a scheduled skill that opted out of model invocation may fire: only user-created schedules may.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ScheduleOrigin : IEquatable<ScheduleOrigin>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ScheduleOrigin"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ScheduleOrigin"/>.</param>
+    [JsonConstructor]
+    public ScheduleOrigin(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ScheduleOrigin"/>.</summary>
     public string Value => _value ?? string.Empty;
 
     /// <summary>The schedule was created by an explicit user action, such as `/every` or `/after`.</summary>
@@ -9227,45 +10058,69 @@ public override void Write(Utf8JsonWriter writer, AutopilotObjectiveChangedStatu
     }
 }
 
-/// <summary>The session mode the agent is operating in.</summary>
+/// <summary>Origin of an effective session model change.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionMode : IEquatable<SessionMode>
+public readonly struct ModelChangeSource : IEquatable<ModelChangeSource>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ModelChangeSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelChangeSource"/>.</param>
     [JsonConstructor]
-    public SessionMode(string value)
+    public ModelChangeSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ModelChangeSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The agent is responding interactively to the user.</summary>
-    public static SessionMode Interactive { get; } = new("interactive");
+    /// <summary>The user selected a model directly with `/model &lt;id&gt;`.</summary>
+    public static ModelChangeSource ModelCommand { get; } = new("model_command");
 
-    /// <summary>The agent is preparing a plan before making changes.</summary>
-    public static SessionMode Plan { get; } = new("plan");
+    /// <summary>The user selected the model with `/settings`.</summary>
+    public static ModelChangeSource SettingsCommand { get; } = new("settings_command");
 
-    /// <summary>The agent is working autonomously toward task completion.</summary>
-    public static SessionMode Autopilot { get; } = new("autopilot");
+    /// <summary>The user selected the model with the `/config` alias.</summary>
+    public static ModelChangeSource ConfigCommand { get; } = new("config_command");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionMode"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionMode left, SessionMode right) => left.Equals(right);
+    /// <summary>The user selected the model in the model picker, including the picker opened by bare `/model`.</summary>
+    public static ModelChangeSource ModelPicker { get; } = new("model_picker");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionMode left, SessionMode right) => !(left == right);
+    /// <summary>Organization-managed settings selected the model.</summary>
+    public static ModelChangeSource ManagedSettings { get; } = new("managed_settings");
+
+    /// <summary>Repository settings selected the model.</summary>
+    public static ModelChangeSource RepoSettings { get; } = new("repo_settings");
+
+    /// <summary>Startup model resolution selected the model.</summary>
+    public static ModelChangeSource Startup { get; } = new("startup");
+
+    /// <summary>Selecting an agent selected its configured model.</summary>
+    public static ModelChangeSource Agent { get; } = new("agent");
+
+    /// <summary>Entering, leaving, or reconfiguring plan mode selected the model.</summary>
+    public static ModelChangeSource PlanMode { get; } = new("plan_mode");
+
+    /// <summary>The runtime selected the model automatically, such as rate-limit recovery or refusal fallback.</summary>
+    public static ModelChangeSource Automatic { get; } = new("automatic");
+
+    /// <summary>An SDK or RPC caller selected the model.</summary>
+    public static ModelChangeSource Sdk { get; } = new("sdk");
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelChangeSource"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelChangeSource left, ModelChangeSource right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelChangeSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelChangeSource left, ModelChangeSource right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is ModelChangeSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ModelChangeSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -9273,64 +10128,64 @@ public SessionMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionMode}"/> for serializing <see cref="SessionMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ModelChangeSource}"/> for serializing <see cref="ModelChangeSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionMode>
+    public sealed class Converter : JsonConverter<ModelChangeSource>
     {
         /// <inheritdoc />
-        public override SessionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ModelChangeSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ModelChangeSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelChangeSource));
         }
     }
 }
 
-/// <summary>Allow-all mode for the session.</summary>
+/// <summary>Permission mode for the session.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionAllowAllMode : IEquatable<PermissionAllowAllMode>
+public readonly struct PermissionMode : IEquatable<PermissionMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PermissionAllowAllMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PermissionAllowAllMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="PermissionMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionMode"/>.</param>
     [JsonConstructor]
-    public PermissionAllowAllMode(string value)
+    public PermissionMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionAllowAllMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
     /// <summary>Permission requests follow the normal approval flow.</summary>
-    public static PermissionAllowAllMode Off { get; } = new("off");
+    public static PermissionMode Manual { get; } = new("manual");
 
-    /// <summary>Tool, path, and URL permission requests are automatically approved.</summary>
-    public static PermissionAllowAllMode On { get; } = new("on");
+    /// <summary>Permission requests include an LLM safety recommendation; clients may automatically approve requests judged acceptable.</summary>
+    public static PermissionMode Assisted { get; } = new("assisted");
 
-    /// <summary>Permission requests follow the normal approval flow with an LLM advisory recommendation attached; clients may choose to auto-approve requests the judge evaluated as acceptable.</summary>
-    public static PermissionAllowAllMode Auto { get; } = new("auto");
+    /// <summary>Tool, path, and URL permission requests are automatically approved.</summary>
+    public static PermissionMode AllowAll { get; } = new("allow-all");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionAllowAllMode"/> instances are equivalent.</summary>
-    public static bool operator ==(PermissionAllowAllMode left, PermissionAllowAllMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionMode"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionMode left, PermissionMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionAllowAllMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(PermissionAllowAllMode left, PermissionAllowAllMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionMode left, PermissionMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionAllowAllMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionAllowAllMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PermissionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -9338,20 +10193,20 @@ public PermissionAllowAllMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionAllowAllMode}"/> for serializing <see cref="PermissionAllowAllMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionMode}"/> for serializing <see cref="PermissionMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionAllowAllMode>
+    public sealed class Converter : JsonConverter<PermissionMode>
     {
         /// <inheritdoc />
-        public override PermissionAllowAllMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PermissionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionAllowAllMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionAllowAllMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionMode));
         }
     }
 }
@@ -9993,6 +10848,195 @@ public override void Write(Utf8JsonWriter writer, UserMessageDelivery value, Jso
     }
 }
 
+/// <summary>What the agent was doing when the user interrupted it.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct AgentInterruptedActivity : IEquatable<AgentInterruptedActivity>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="AgentInterruptedActivity"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentInterruptedActivity"/>.</param>
+    [JsonConstructor]
+    public AgentInterruptedActivity(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="AgentInterruptedActivity"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>A request to the model was open.</summary>
+    public static AgentInterruptedActivity ModelCall { get; } = new("model_call");
+
+    /// <summary>The turn was sleeping between retry attempts.</summary>
+    public static AgentInterruptedActivity RetryBackoff { get; } = new("retry_backoff");
+
+    /// <summary>One or more tools were executing.</summary>
+    public static AgentInterruptedActivity ToolCall { get; } = new("tool_call");
+
+    /// <summary>Background sub-agents were running while the main loop was idle.</summary>
+    public static AgentInterruptedActivity BackgroundAgent { get; } = new("background_agent");
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentInterruptedActivity"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentInterruptedActivity left, AgentInterruptedActivity right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentInterruptedActivity"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentInterruptedActivity left, AgentInterruptedActivity right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is AgentInterruptedActivity other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(AgentInterruptedActivity other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{AgentInterruptedActivity}"/> for serializing <see cref="AgentInterruptedActivity"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<AgentInterruptedActivity>
+    {
+        /// <inheritdoc />
+        public override AgentInterruptedActivity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, AgentInterruptedActivity value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentInterruptedActivity));
+        }
+    }
+}
+
+/// <summary>Where the interruption landed relative to the first streamed token.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct AgentInterruptedCancelPhase : IEquatable<AgentInterruptedCancelPhase>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="AgentInterruptedCancelPhase"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AgentInterruptedCancelPhase"/>.</param>
+    [JsonConstructor]
+    public AgentInterruptedCancelPhase(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="AgentInterruptedCancelPhase"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>No output had been produced when the request was cancelled.</summary>
+    public static AgentInterruptedCancelPhase PreFirstToken { get; } = new("pre_first_token");
+
+    /// <summary>The response was already streaming when the request was cancelled.</summary>
+    public static AgentInterruptedCancelPhase MidStream { get; } = new("mid_stream");
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentInterruptedCancelPhase"/> instances are equivalent.</summary>
+    public static bool operator ==(AgentInterruptedCancelPhase left, AgentInterruptedCancelPhase right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AgentInterruptedCancelPhase"/> instances are not equivalent.</summary>
+    public static bool operator !=(AgentInterruptedCancelPhase left, AgentInterruptedCancelPhase right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is AgentInterruptedCancelPhase other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(AgentInterruptedCancelPhase other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{AgentInterruptedCancelPhase}"/> for serializing <see cref="AgentInterruptedCancelPhase"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<AgentInterruptedCancelPhase>
+    {
+        /// <inheritdoc />
+        public override AgentInterruptedCancelPhase Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, AgentInterruptedCancelPhase value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AgentInterruptedCancelPhase));
+        }
+    }
+}
+
+/// <summary>Transport used for a failed model call.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ModelCallFailureTransport : IEquatable<ModelCallFailureTransport>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ModelCallFailureTransport"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelCallFailureTransport"/>.</param>
+    [JsonConstructor]
+    public ModelCallFailureTransport(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ModelCallFailureTransport"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>HTTP transport, including SSE streams.</summary>
+    public static ModelCallFailureTransport Http { get; } = new("http");
+
+    /// <summary>WebSocket transport.</summary>
+    public static ModelCallFailureTransport Websocket { get; } = new("websocket");
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallFailureTransport"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelCallFailureTransport left, ModelCallFailureTransport right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallFailureTransport"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelCallFailureTransport left, ModelCallFailureTransport right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ModelCallFailureTransport other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ModelCallFailureTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{ModelCallFailureTransport}"/> for serializing <see cref="ModelCallFailureTransport"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ModelCallFailureTransport>
+    {
+        /// <inheritdoc />
+        public override ModelCallFailureTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ModelCallFailureTransport value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelCallFailureTransport));
+        }
+    }
+}
+
 /// <summary>Tool call type: "function" for standard tool calls, "custom" for grammar-based tool calls. Defaults to "function" when absent.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
@@ -10186,6 +11230,67 @@ public override void Write(Utf8JsonWriter writer, AssistantUsageApiEndpoint valu
     }
 }
 
+/// <summary>Transport used for a successful model call.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct AssistantUsageTransport : IEquatable<AssistantUsageTransport>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="AssistantUsageTransport"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AssistantUsageTransport"/>.</param>
+    [JsonConstructor]
+    public AssistantUsageTransport(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="AssistantUsageTransport"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>HTTP transport, including SSE streams.</summary>
+    public static AssistantUsageTransport Http { get; } = new("http");
+
+    /// <summary>WebSocket transport.</summary>
+    public static AssistantUsageTransport Websocket { get; } = new("websocket");
+
+    /// <summary>Returns a value indicating whether two <see cref="AssistantUsageTransport"/> instances are equivalent.</summary>
+    public static bool operator ==(AssistantUsageTransport left, AssistantUsageTransport right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AssistantUsageTransport"/> instances are not equivalent.</summary>
+    public static bool operator !=(AssistantUsageTransport left, AssistantUsageTransport right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is AssistantUsageTransport other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(AssistantUsageTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{AssistantUsageTransport}"/> for serializing <see cref="AssistantUsageTransport"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<AssistantUsageTransport>
+    {
+        /// <inheritdoc />
+        public override AssistantUsageTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, AssistantUsageTransport value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AssistantUsageTransport));
+        }
+    }
+}
+
 /// <summary>For HTTP 400 failures only: whether the response carried a structured CAPI error envelope (structured_error, a deterministic validation failure) or no error body (bodyless, the transient gateway/proxy signature). Absent for non-400 failures.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
@@ -10372,42 +11477,48 @@ public override void Write(Utf8JsonWriter writer, ModelCallFailureSource value,
     }
 }
 
-/// <summary>Transport used for a failed model call.</summary>
+/// <summary>Final outcome of one logical model dispatch after response acceptance processing.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ModelCallFailureTransport : IEquatable<ModelCallFailureTransport>
+public readonly struct ModelCallFinishedOutcome : IEquatable<ModelCallFinishedOutcome>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ModelCallFailureTransport"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ModelCallFailureTransport"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ModelCallFinishedOutcome"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelCallFinishedOutcome"/>.</param>
     [JsonConstructor]
-    public ModelCallFailureTransport(string value)
+    public ModelCallFinishedOutcome(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ModelCallFailureTransport"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ModelCallFinishedOutcome"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>HTTP transport, including SSE streams.</summary>
-    public static ModelCallFailureTransport Http { get; } = new("http");
+    /// <summary>The provider response was accepted for continued agent processing.</summary>
+    public static ModelCallFinishedOutcome Success { get; } = new("success");
 
-    /// <summary>WebSocket transport.</summary>
-    public static ModelCallFailureTransport Websocket { get; } = new("websocket");
+    /// <summary>The dispatch ended with a provider or transport error.</summary>
+    public static ModelCallFinishedOutcome Error { get; } = new("error");
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelCallFailureTransport"/> instances are equivalent.</summary>
-    public static bool operator ==(ModelCallFailureTransport left, ModelCallFailureTransport right) => left.Equals(right);
+    /// <summary>The dispatch was cancelled before an accepted response was produced.</summary>
+    public static ModelCallFinishedOutcome Cancelled { get; } = new("cancelled");
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelCallFailureTransport"/> instances are not equivalent.</summary>
-    public static bool operator !=(ModelCallFailureTransport left, ModelCallFailureTransport right) => !(left == right);
+    /// <summary>The provider response was rejected during post-response acceptance processing.</summary>
+    public static ModelCallFinishedOutcome Rejected { get; } = new("rejected");
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallFinishedOutcome"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelCallFinishedOutcome left, ModelCallFinishedOutcome right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallFinishedOutcome"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelCallFinishedOutcome left, ModelCallFinishedOutcome right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ModelCallFailureTransport other && Equals(other);
+    public override bool Equals(object? obj) => obj is ModelCallFinishedOutcome other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ModelCallFailureTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ModelCallFinishedOutcome other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -10415,20 +11526,20 @@ public ModelCallFailureTransport(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ModelCallFailureTransport}"/> for serializing <see cref="ModelCallFailureTransport"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ModelCallFinishedOutcome}"/> for serializing <see cref="ModelCallFinishedOutcome"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ModelCallFailureTransport>
+    public sealed class Converter : JsonConverter<ModelCallFinishedOutcome>
     {
         /// <inheritdoc />
-        public override ModelCallFailureTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ModelCallFinishedOutcome Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ModelCallFailureTransport value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ModelCallFinishedOutcome value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelCallFailureTransport));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelCallFinishedOutcome));
         }
     }
 }
@@ -11138,23 +12249,82 @@ public SystemNotificationFactoryCompletedStatus(string value)
     /// <summary>The factory was halted.</summary>
     public static SystemNotificationFactoryCompletedStatus Halted { get; } = new("halted");
 
-    /// <summary>The factory was cancelled.</summary>
-    public static SystemNotificationFactoryCompletedStatus Cancelled { get; } = new("cancelled");
+    /// <summary>The factory was cancelled.</summary>
+    public static SystemNotificationFactoryCompletedStatus Cancelled { get; } = new("cancelled");
+
+    /// <summary>The factory failed.</summary>
+    public static SystemNotificationFactoryCompletedStatus Error { get; } = new("error");
+
+    /// <summary>Returns a value indicating whether two <see cref="SystemNotificationFactoryCompletedStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(SystemNotificationFactoryCompletedStatus left, SystemNotificationFactoryCompletedStatus right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="SystemNotificationFactoryCompletedStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(SystemNotificationFactoryCompletedStatus left, SystemNotificationFactoryCompletedStatus right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is SystemNotificationFactoryCompletedStatus other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(SystemNotificationFactoryCompletedStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{SystemNotificationFactoryCompletedStatus}"/> for serializing <see cref="SystemNotificationFactoryCompletedStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<SystemNotificationFactoryCompletedStatus>
+    {
+        /// <inheritdoc />
+        public override SystemNotificationFactoryCompletedStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, SystemNotificationFactoryCompletedStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SystemNotificationFactoryCompletedStatus));
+        }
+    }
+}
+
+/// <summary>Advisory recommendation the runtime attaches to a permission request whose origin it can vouch for by construction. Unlike the auto-approval judge this does not depend on auto mode and does not evaluate what the tool call does; its absence simply means the runtime has no opinion and the request follows the host's normal approval flow.</summary>
+[Experimental(Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct PermissionRecommendation : IEquatable<PermissionRecommendation>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="PermissionRecommendation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionRecommendation"/>.</param>
+    [JsonConstructor]
+    public PermissionRecommendation(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="PermissionRecommendation"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>The factory failed.</summary>
-    public static SystemNotificationFactoryCompletedStatus Error { get; } = new("error");
+    /// <summary>The runtime vouches for the request's origin and recommends approving it without prompting. The host still owns the decision and may deny it; deny rules, managed policy, and the auto-approval safety judge all outrank this recommendation.</summary>
+    public static PermissionRecommendation Approve { get; } = new("approve");
 
-    /// <summary>Returns a value indicating whether two <see cref="SystemNotificationFactoryCompletedStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(SystemNotificationFactoryCompletedStatus left, SystemNotificationFactoryCompletedStatus right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionRecommendation"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionRecommendation left, PermissionRecommendation right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SystemNotificationFactoryCompletedStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(SystemNotificationFactoryCompletedStatus left, SystemNotificationFactoryCompletedStatus right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionRecommendation"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionRecommendation left, PermissionRecommendation right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SystemNotificationFactoryCompletedStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionRecommendation other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SystemNotificationFactoryCompletedStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PermissionRecommendation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -11162,20 +12332,20 @@ public SystemNotificationFactoryCompletedStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SystemNotificationFactoryCompletedStatus}"/> for serializing <see cref="SystemNotificationFactoryCompletedStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionRecommendation}"/> for serializing <see cref="PermissionRecommendation"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SystemNotificationFactoryCompletedStatus>
+    public sealed class Converter : JsonConverter<PermissionRecommendation>
     {
         /// <inheritdoc />
-        public override SystemNotificationFactoryCompletedStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PermissionRecommendation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SystemNotificationFactoryCompletedStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionRecommendation value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SystemNotificationFactoryCompletedStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionRecommendation));
         }
     }
 }
@@ -11241,42 +12411,52 @@ public override void Write(Utf8JsonWriter writer, PermissionRequestMemoryAction
     }
 }
 
-/// <summary>Vote direction (vote only).</summary>
+/// <summary>Why the assisted-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs.</summary>
+[Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionRequestMemoryDirection : IEquatable<PermissionRequestMemoryDirection>
+public readonly struct AssistedApprovalJudgeFailureReason : IEquatable<AssistedApprovalJudgeFailureReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PermissionRequestMemoryDirection"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PermissionRequestMemoryDirection"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AssistedApprovalJudgeFailureReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AssistedApprovalJudgeFailureReason"/>.</param>
     [JsonConstructor]
-    public PermissionRequestMemoryDirection(string value)
+    public AssistedApprovalJudgeFailureReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionRequestMemoryDirection"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AssistedApprovalJudgeFailureReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Vote that the memory is useful or accurate.</summary>
-    public static PermissionRequestMemoryDirection Upvote { get; } = new("upvote");
+    /// <summary>The judge model call exceeded its deadline.</summary>
+    public static AssistedApprovalJudgeFailureReason Timeout { get; } = new("timeout");
 
-    /// <summary>Vote that the memory is incorrect or outdated.</summary>
-    public static PermissionRequestMemoryDirection Downvote { get; } = new("downvote");
+    /// <summary>The judge model call was cancelled before it returned.</summary>
+    public static AssistedApprovalJudgeFailureReason Abort { get; } = new("abort");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionRequestMemoryDirection"/> instances are equivalent.</summary>
-    public static bool operator ==(PermissionRequestMemoryDirection left, PermissionRequestMemoryDirection right) => left.Equals(right);
+    /// <summary>The judge model call completed but returned no content.</summary>
+    public static AssistedApprovalJudgeFailureReason EmptyResponse { get; } = new("empty_response");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionRequestMemoryDirection"/> instances are not equivalent.</summary>
-    public static bool operator !=(PermissionRequestMemoryDirection left, PermissionRequestMemoryDirection right) => !(left == right);
+    /// <summary>The judge model call failed (for example a transport, authentication, or rate-limit error).</summary>
+    public static AssistedApprovalJudgeFailureReason ModelError { get; } = new("model_error");
+
+    /// <summary>The judge model replied, but the reply carried no ALLOW/DENY verdict.</summary>
+    public static AssistedApprovalJudgeFailureReason ParseError { get; } = new("parse_error");
+
+    /// <summary>Returns a value indicating whether two <see cref="AssistedApprovalJudgeFailureReason"/> instances are equivalent.</summary>
+    public static bool operator ==(AssistedApprovalJudgeFailureReason left, AssistedApprovalJudgeFailureReason right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AssistedApprovalJudgeFailureReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(AssistedApprovalJudgeFailureReason left, AssistedApprovalJudgeFailureReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionRequestMemoryDirection other && Equals(other);
+    public override bool Equals(object? obj) => obj is AssistedApprovalJudgeFailureReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionRequestMemoryDirection other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AssistedApprovalJudgeFailureReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -11284,60 +12464,67 @@ public PermissionRequestMemoryDirection(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionRequestMemoryDirection}"/> for serializing <see cref="PermissionRequestMemoryDirection"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AssistedApprovalJudgeFailureReason}"/> for serializing <see cref="AssistedApprovalJudgeFailureReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionRequestMemoryDirection>
+    public sealed class Converter : JsonConverter<AssistedApprovalJudgeFailureReason>
     {
         /// <inheritdoc />
-        public override PermissionRequestMemoryDirection Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AssistedApprovalJudgeFailureReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionRequestMemoryDirection value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AssistedApprovalJudgeFailureReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionRequestMemoryDirection));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AssistedApprovalJudgeFailureReason));
         }
     }
 }
 
-/// <summary>Operation gated by a factory permission request.</summary>
+/// <summary>Outcome of the assisted-approval safety judge for a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request.</summary>
+[Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct FactoryPermissionOperation : IEquatable<FactoryPermissionOperation>
+public readonly struct AssistedApprovalRecommendation : IEquatable<AssistedApprovalRecommendation>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="FactoryPermissionOperation"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="FactoryPermissionOperation"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AssistedApprovalRecommendation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AssistedApprovalRecommendation"/>.</param>
     [JsonConstructor]
-    public FactoryPermissionOperation(string value)
+    public AssistedApprovalRecommendation(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="FactoryPermissionOperation"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AssistedApprovalRecommendation"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Running a registered factory, which spends subagents, active time, and AI credits under the approved limits.</summary>
-    public static FactoryPermissionOperation Run { get; } = new("run");
+    /// <summary>The judge evaluated the request and recommends automatically approving it.</summary>
+    public static AssistedApprovalRecommendation Approve { get; } = new("approve");
 
-    /// <summary>Authoring a factory, which writes JavaScript into a session-scoped extension and loads it.</summary>
-    public static FactoryPermissionOperation Author { get; } = new("author");
+    /// <summary>The judge evaluated the request and does not recommend automatically approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision.</summary>
+    public static AssistedApprovalRecommendation RequireApproval { get; } = new("requireApproval");
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryPermissionOperation"/> instances are equivalent.</summary>
-    public static bool operator ==(FactoryPermissionOperation left, FactoryPermissionOperation right) => left.Equals(right);
+    /// <summary>Assisted mode is enabled, but this request category is never automatically approvable (for example, sandbox-bypass requests), so the judge was not consulted.</summary>
+    public static AssistedApprovalRecommendation Excluded { get; } = new("excluded");
 
-    /// <summary>Returns a value indicating whether two <see cref="FactoryPermissionOperation"/> instances are not equivalent.</summary>
-    public static bool operator !=(FactoryPermissionOperation left, FactoryPermissionOperation right) => !(left == right);
+    /// <summary>The judge was consulted but did not return a usable recommendation, so the request requires explicit approval.</summary>
+    public static AssistedApprovalRecommendation Error { get; } = new("error");
+
+    /// <summary>Returns a value indicating whether two <see cref="AssistedApprovalRecommendation"/> instances are equivalent.</summary>
+    public static bool operator ==(AssistedApprovalRecommendation left, AssistedApprovalRecommendation right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AssistedApprovalRecommendation"/> instances are not equivalent.</summary>
+    public static bool operator !=(AssistedApprovalRecommendation left, AssistedApprovalRecommendation right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is FactoryPermissionOperation other && Equals(other);
+    public override bool Equals(object? obj) => obj is AssistedApprovalRecommendation other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(FactoryPermissionOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AssistedApprovalRecommendation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -11345,70 +12532,121 @@ public FactoryPermissionOperation(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{FactoryPermissionOperation}"/> for serializing <see cref="FactoryPermissionOperation"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AssistedApprovalRecommendation}"/> for serializing <see cref="AssistedApprovalRecommendation"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<FactoryPermissionOperation>
+    public sealed class Converter : JsonConverter<AssistedApprovalRecommendation>
     {
         /// <inheritdoc />
-        public override FactoryPermissionOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AssistedApprovalRecommendation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, FactoryPermissionOperation value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AssistedApprovalRecommendation value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryPermissionOperation));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AssistedApprovalRecommendation));
         }
     }
 }
 
-/// <summary>Why the auto-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs.</summary>
-[Experimental(Diagnostics.Experimental)]
+/// <summary>Vote direction (vote only).</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AutoApprovalJudgeFailureReason : IEquatable<AutoApprovalJudgeFailureReason>
+public readonly struct PermissionRequestMemoryDirection : IEquatable<PermissionRequestMemoryDirection>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AutoApprovalJudgeFailureReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AutoApprovalJudgeFailureReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="PermissionRequestMemoryDirection"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionRequestMemoryDirection"/>.</param>
     [JsonConstructor]
-    public AutoApprovalJudgeFailureReason(string value)
+    public PermissionRequestMemoryDirection(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AutoApprovalJudgeFailureReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionRequestMemoryDirection"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The judge model call exceeded its deadline.</summary>
-    public static AutoApprovalJudgeFailureReason Timeout { get; } = new("timeout");
+    /// <summary>Vote that the memory is useful or accurate.</summary>
+    public static PermissionRequestMemoryDirection Upvote { get; } = new("upvote");
 
-    /// <summary>The judge model call was cancelled before it returned.</summary>
-    public static AutoApprovalJudgeFailureReason Abort { get; } = new("abort");
+    /// <summary>Vote that the memory is incorrect or outdated.</summary>
+    public static PermissionRequestMemoryDirection Downvote { get; } = new("downvote");
 
-    /// <summary>The judge model call completed but returned no content.</summary>
-    public static AutoApprovalJudgeFailureReason EmptyResponse { get; } = new("empty_response");
+    /// <summary>Returns a value indicating whether two <see cref="PermissionRequestMemoryDirection"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionRequestMemoryDirection left, PermissionRequestMemoryDirection right) => left.Equals(right);
 
-    /// <summary>The judge model call failed (for example a transport, authentication, or rate-limit error).</summary>
-    public static AutoApprovalJudgeFailureReason ModelError { get; } = new("model_error");
+    /// <summary>Returns a value indicating whether two <see cref="PermissionRequestMemoryDirection"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionRequestMemoryDirection left, PermissionRequestMemoryDirection right) => !(left == right);
 
-    /// <summary>The judge model replied, but the reply carried no ALLOW/DENY verdict.</summary>
-    public static AutoApprovalJudgeFailureReason ParseError { get; } = new("parse_error");
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is PermissionRequestMemoryDirection other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(PermissionRequestMemoryDirection other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{PermissionRequestMemoryDirection}"/> for serializing <see cref="PermissionRequestMemoryDirection"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<PermissionRequestMemoryDirection>
+    {
+        /// <inheritdoc />
+        public override PermissionRequestMemoryDirection Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, PermissionRequestMemoryDirection value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionRequestMemoryDirection));
+        }
+    }
+}
+
+/// <summary>Scope of a stored memory.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct PermissionRequestMemoryScope : IEquatable<PermissionRequestMemoryScope>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="PermissionRequestMemoryScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionRequestMemoryScope"/>.</param>
+    [JsonConstructor]
+    public PermissionRequestMemoryScope(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="PermissionRequestMemoryScope"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Store the memory for the current repository.</summary>
+    public static PermissionRequestMemoryScope Repository { get; } = new("repository");
 
-    /// <summary>Returns a value indicating whether two <see cref="AutoApprovalJudgeFailureReason"/> instances are equivalent.</summary>
-    public static bool operator ==(AutoApprovalJudgeFailureReason left, AutoApprovalJudgeFailureReason right) => left.Equals(right);
+    /// <summary>Store the memory for the current user.</summary>
+    public static PermissionRequestMemoryScope User { get; } = new("user");
 
-    /// <summary>Returns a value indicating whether two <see cref="AutoApprovalJudgeFailureReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(AutoApprovalJudgeFailureReason left, AutoApprovalJudgeFailureReason right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionRequestMemoryScope"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionRequestMemoryScope left, PermissionRequestMemoryScope right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionRequestMemoryScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionRequestMemoryScope left, PermissionRequestMemoryScope right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AutoApprovalJudgeFailureReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionRequestMemoryScope other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AutoApprovalJudgeFailureReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PermissionRequestMemoryScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -11416,67 +12654,60 @@ public AutoApprovalJudgeFailureReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AutoApprovalJudgeFailureReason}"/> for serializing <see cref="AutoApprovalJudgeFailureReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionRequestMemoryScope}"/> for serializing <see cref="PermissionRequestMemoryScope"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AutoApprovalJudgeFailureReason>
+    public sealed class Converter : JsonConverter<PermissionRequestMemoryScope>
     {
         /// <inheritdoc />
-        public override AutoApprovalJudgeFailureReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PermissionRequestMemoryScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AutoApprovalJudgeFailureReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionRequestMemoryScope value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutoApprovalJudgeFailureReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionRequestMemoryScope));
         }
     }
 }
 
-/// <summary>Outcome of the auto-approval safety judge for a permission request. Present only when auto mode is enabled; its absence means the judge did not evaluate the request (auto mode was off).</summary>
-[Experimental(Diagnostics.Experimental)]
+/// <summary>Operation gated by a factory permission request.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AutoApprovalRecommendation : IEquatable<AutoApprovalRecommendation>
+public readonly struct FactoryPermissionOperation : IEquatable<FactoryPermissionOperation>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AutoApprovalRecommendation"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AutoApprovalRecommendation"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="FactoryPermissionOperation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="FactoryPermissionOperation"/>.</param>
     [JsonConstructor]
-    public AutoApprovalRecommendation(string value)
+    public FactoryPermissionOperation(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AutoApprovalRecommendation"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="FactoryPermissionOperation"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The judge evaluated the request and recommends automatically approving it.</summary>
-    public static AutoApprovalRecommendation Approve { get; } = new("approve");
-
-    /// <summary>The judge evaluated the request and does not recommend auto-approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision.</summary>
-    public static AutoApprovalRecommendation RequireApproval { get; } = new("requireApproval");
-
-    /// <summary>Auto mode is enabled, but this request category is never auto-approvable (for example, sandbox-bypass requests), so the judge was not consulted.</summary>
-    public static AutoApprovalRecommendation Excluded { get; } = new("excluded");
+    /// <summary>Running a registered factory, which spends subagents, active time, and AI credits under the approved limits.</summary>
+    public static FactoryPermissionOperation Run { get; } = new("run");
 
-    /// <summary>The judge was consulted but did not return a usable recommendation, so the request requires explicit approval.</summary>
-    public static AutoApprovalRecommendation Error { get; } = new("error");
+    /// <summary>Authoring a factory, which writes JavaScript into a session-scoped extension and loads it.</summary>
+    public static FactoryPermissionOperation Author { get; } = new("author");
 
-    /// <summary>Returns a value indicating whether two <see cref="AutoApprovalRecommendation"/> instances are equivalent.</summary>
-    public static bool operator ==(AutoApprovalRecommendation left, AutoApprovalRecommendation right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="FactoryPermissionOperation"/> instances are equivalent.</summary>
+    public static bool operator ==(FactoryPermissionOperation left, FactoryPermissionOperation right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="AutoApprovalRecommendation"/> instances are not equivalent.</summary>
-    public static bool operator !=(AutoApprovalRecommendation left, AutoApprovalRecommendation right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="FactoryPermissionOperation"/> instances are not equivalent.</summary>
+    public static bool operator !=(FactoryPermissionOperation left, FactoryPermissionOperation right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AutoApprovalRecommendation other && Equals(other);
+    public override bool Equals(object? obj) => obj is FactoryPermissionOperation other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AutoApprovalRecommendation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(FactoryPermissionOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -11484,20 +12715,20 @@ public AutoApprovalRecommendation(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AutoApprovalRecommendation}"/> for serializing <see cref="AutoApprovalRecommendation"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{FactoryPermissionOperation}"/> for serializing <see cref="FactoryPermissionOperation"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AutoApprovalRecommendation>
+    public sealed class Converter : JsonConverter<FactoryPermissionOperation>
     {
         /// <inheritdoc />
-        public override AutoApprovalRecommendation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override FactoryPermissionOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AutoApprovalRecommendation value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, FactoryPermissionOperation value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutoApprovalRecommendation));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryPermissionOperation));
         }
     }
 }
@@ -11947,6 +13178,77 @@ public override void Write(Utf8JsonWriter writer, McpHeadersRefreshCompletedOutc
     }
 }
 
+/// <summary>Lifecycle phase for a Rust-owned ephemeral query stream.</summary>
+[Experimental(Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct UIEphemeralQueryPhase : IEquatable<UIEphemeralQueryPhase>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="UIEphemeralQueryPhase"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="UIEphemeralQueryPhase"/>.</param>
+    [JsonConstructor]
+    public UIEphemeralQueryPhase(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="UIEphemeralQueryPhase"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The ephemeral query stream has begun.</summary>
+    public static UIEphemeralQueryPhase Started { get; } = new("started");
+
+    /// <summary>A partial result chunk was produced by the stream.</summary>
+    public static UIEphemeralQueryPhase Chunk { get; } = new("chunk");
+
+    /// <summary>The ephemeral query stream finished successfully.</summary>
+    public static UIEphemeralQueryPhase Completed { get; } = new("completed");
+
+    /// <summary>The ephemeral query stream ended with an error.</summary>
+    public static UIEphemeralQueryPhase Failed { get; } = new("failed");
+
+    /// <summary>The ephemeral query stream was cancelled before completing.</summary>
+    public static UIEphemeralQueryPhase Aborted { get; } = new("aborted");
+
+    /// <summary>Returns a value indicating whether two <see cref="UIEphemeralQueryPhase"/> instances are equivalent.</summary>
+    public static bool operator ==(UIEphemeralQueryPhase left, UIEphemeralQueryPhase right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="UIEphemeralQueryPhase"/> instances are not equivalent.</summary>
+    public static bool operator !=(UIEphemeralQueryPhase left, UIEphemeralQueryPhase right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is UIEphemeralQueryPhase other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(UIEphemeralQueryPhase other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{UIEphemeralQueryPhase}"/> for serializing <see cref="UIEphemeralQueryPhase"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<UIEphemeralQueryPhase>
+    {
+        /// <inheritdoc />
+        public override UIEphemeralQueryPhase Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, UIEphemeralQueryPhase value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UIEphemeralQueryPhase));
+        }
+    }
+}
+
 /// <summary>The user's auto-mode-switch choice.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
@@ -12142,7 +13444,7 @@ public override void Write(Utf8JsonWriter writer, AutoModeResolvedReasoningBucke
     }
 }
 
-/// <summary>Which channel supplied the effective enterprise managed settings (highest-authority present layer wins wholesale).</summary>
+/// <summary>Summary of which managed-settings channels contributed to the effective session policy. Use the per-channel booleans for exact provenance.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
 public readonly struct ManagedSettingsResolvedSource : IEquatable<ManagedSettingsResolvedSource>
@@ -12161,13 +13463,19 @@ public ManagedSettingsResolvedSource(string value)
     /// <summary>Gets the value associated with this <see cref="ManagedSettingsResolvedSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Account/org policy self-fetched from the GitHub managed-settings endpoint (higher authority).</summary>
+    /// <summary>Only the server/account channel contributed.</summary>
     public static ManagedSettingsResolvedSource Server { get; } = new("server");
 
-    /// <summary>Device-level MDM policy discovered from plist/registry/file (lower authority).</summary>
+    /// <summary>Only the device MDM/plist/registry/file channel contributed.</summary>
     public static ManagedSettingsResolvedSource Device { get; } = new("device");
 
-    /// <summary>No managed policy is in force (no layer contributed).</summary>
+    /// <summary>Only session-local SDK-host injection contributed.</summary>
+    public static ManagedSettingsResolvedSource Client { get; } = new("client");
+
+    /// <summary>More than one channel contributed. Ordinary keys resolve device over server per key, while permissions compose restrictively across all present layers.</summary>
+    public static ManagedSettingsResolvedSource Mixed { get; } = new("mixed");
+
+    /// <summary>No managed policy is in force (no channel contributed).</summary>
     public static ManagedSettingsResolvedSource None { get; } = new("none");
 
     /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsResolvedSource"/> instances are equivalent.</summary>
@@ -12283,14 +13591,14 @@ public ManagedSettingsEnforcedEscalation(string value)
     /// <summary>Gets the value associated with this <see cref="ManagedSettingsEnforcedEscalation"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Full allow-all ("/allow-all on") permissions — auto-approving tools, paths, and URLs.</summary>
+    /// <summary>Full allow-all permissions — automatically approving tools, paths, and URLs.</summary>
     public static ManagedSettingsEnforcedEscalation AllowAll { get; } = new("allow_all");
 
-    /// <summary>Auto-approval of all tool permission requests.</summary>
+    /// <summary>Automatic approval of all tool permission requests.</summary>
     public static ManagedSettingsEnforcedEscalation ApproveAll { get; } = new("approve_all");
 
-    /// <summary>Advisory auto-approval ("/allow-all auto") mode — keeps normal prompt paths and adds LLM-advised approval, distinct from full allow-all.</summary>
-    public static ManagedSettingsEnforcedEscalation AutoApproval { get; } = new("auto_approval");
+    /// <summary>Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all.</summary>
+    public static ManagedSettingsEnforcedEscalation AssistedApproval { get; } = new("assisted_approval");
 
     /// <summary>Unrestricted filesystem access outside the session's allowed directories.</summary>
     public static ManagedSettingsEnforcedEscalation UnrestrictedPaths { get; } = new("unrestricted_paths");
@@ -12298,6 +13606,9 @@ public ManagedSettingsEnforcedEscalation(string value)
     /// <summary>Unrestricted URL fetch access.</summary>
     public static ManagedSettingsEnforcedEscalation UnrestrictedUrls { get; } = new("unrestricted_urls");
 
+    /// <summary>A server-wide MCP "Always Allow" (or `--allow-tool &lt;server&gt;`) blanket that would auto-approve every tool from an MCP server. Capped to per-tool approval; each tool still prompts.</summary>
+    public static ManagedSettingsEnforcedEscalation ServerWideMcpApproval { get; } = new("server_wide_mcp_approval");
+
     /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsEnforcedEscalation"/> instances are equivalent.</summary>
     public static bool operator ==(ManagedSettingsEnforcedEscalation left, ManagedSettingsEnforcedEscalation right) => left.Equals(right);
 
@@ -12401,6 +13712,73 @@ public override void Write(Utf8JsonWriter writer, ExitPlanModeAction value, Json
     }
 }
 
+/// <summary>Terminal status a factory run committed. A settled run is never `pending` or `running`, so those two members of the run-status domain are deliberately absent.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct FactoryRunSettledStatus : IEquatable<FactoryRunSettledStatus>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="FactoryRunSettledStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="FactoryRunSettledStatus"/>.</param>
+    [JsonConstructor]
+    public FactoryRunSettledStatus(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="FactoryRunSettledStatus"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The factory body resolved and its result was committed.</summary>
+    public static FactoryRunSettledStatus Completed { get; } = new("completed");
+
+    /// <summary>The run was stopped by a limit, an approval refusal or another policy decision.</summary>
+    public static FactoryRunSettledStatus Halted { get; } = new("halted");
+
+    /// <summary>The run was cancelled by its caller or by session disposal.</summary>
+    public static FactoryRunSettledStatus Cancelled { get; } = new("cancelled");
+
+    /// <summary>The run failed, with `failureType` carrying the class when it has one.</summary>
+    public static FactoryRunSettledStatus Error { get; } = new("error");
+
+    /// <summary>Returns a value indicating whether two <see cref="FactoryRunSettledStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(FactoryRunSettledStatus left, FactoryRunSettledStatus right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="FactoryRunSettledStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(FactoryRunSettledStatus left, FactoryRunSettledStatus right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is FactoryRunSettledStatus other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(FactoryRunSettledStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{FactoryRunSettledStatus}"/> for serializing <see cref="FactoryRunSettledStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<FactoryRunSettledStatus>
+    {
+        /// <inheritdoc />
+        public override FactoryRunSettledStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, FactoryRunSettledStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FactoryRunSettledStatus));
+        }
+    }
+}
+
 /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
@@ -12828,6 +14206,8 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
     DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
 [JsonSerializable(typeof(AbortData))]
 [JsonSerializable(typeof(AbortEvent))]
+[JsonSerializable(typeof(AgentInterruptedData))]
+[JsonSerializable(typeof(AgentInterruptedEvent))]
 [JsonSerializable(typeof(AssistantIdleData))]
 [JsonSerializable(typeof(AssistantIdleEvent))]
 [JsonSerializable(typeof(AssistantIntentData))]
@@ -12836,6 +14216,7 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(AssistantMessageDeltaData))]
 [JsonSerializable(typeof(AssistantMessageDeltaEvent))]
 [JsonSerializable(typeof(AssistantMessageEvent))]
+[JsonSerializable(typeof(AssistantMessageReasoningBlocks))]
 [JsonSerializable(typeof(AssistantMessageServerTools))]
 [JsonSerializable(typeof(AssistantMessageStartData))]
 [JsonSerializable(typeof(AssistantMessageStartEvent))]
@@ -12932,6 +14313,10 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(ExternalToolRequestedData))]
 [JsonSerializable(typeof(ExternalToolRequestedEvent))]
 [JsonSerializable(typeof(FactoryPermissionPhase))]
+[JsonSerializable(typeof(FactoryRunSettledData))]
+[JsonSerializable(typeof(FactoryRunSettledEvent))]
+[JsonSerializable(typeof(FactoryRunStartedData))]
+[JsonSerializable(typeof(FactoryRunStartedEvent))]
 [JsonSerializable(typeof(FactoryRunUpdatedData))]
 [JsonSerializable(typeof(FactoryRunUpdatedEvent))]
 [JsonSerializable(typeof(GitHubMcpToolConfig))]
@@ -12971,17 +14356,20 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(ModelCallFailureData))]
 [JsonSerializable(typeof(ModelCallFailureEvent))]
 [JsonSerializable(typeof(ModelCallFailureRequestFingerprint))]
+[JsonSerializable(typeof(ModelCallFinishedData))]
+[JsonSerializable(typeof(ModelCallFinishedEvent))]
 [JsonSerializable(typeof(ModelCallStartData))]
 [JsonSerializable(typeof(ModelCallStartEvent))]
 [JsonSerializable(typeof(OmittedBinaryResult))]
 [JsonSerializable(typeof(PendingMessagesModifiedData))]
 [JsonSerializable(typeof(PendingMessagesModifiedEvent))]
-[JsonSerializable(typeof(PermissionAutoApproval))]
+[JsonSerializable(typeof(PermissionAssistedApproval))]
 [JsonSerializable(typeof(PermissionCompletedData))]
 [JsonSerializable(typeof(PermissionCompletedEvent))]
 [JsonSerializable(typeof(PermissionPromptRequest))]
 [JsonSerializable(typeof(PermissionPromptRequestCommands))]
 [JsonSerializable(typeof(PermissionPromptRequestCustomTool))]
+[JsonSerializable(typeof(PermissionPromptRequestExtensionEnvAccess))]
 [JsonSerializable(typeof(PermissionPromptRequestExtensionManagement))]
 [JsonSerializable(typeof(PermissionPromptRequestExtensionPermissionAccess))]
 [JsonSerializable(typeof(PermissionPromptRequestFactory))]
@@ -12994,6 +14382,7 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(PermissionPromptRequestWrite))]
 [JsonSerializable(typeof(PermissionRequest))]
 [JsonSerializable(typeof(PermissionRequestCustomTool))]
+[JsonSerializable(typeof(PermissionRequestExtensionEnvAccess))]
 [JsonSerializable(typeof(PermissionRequestExtensionManagement))]
 [JsonSerializable(typeof(PermissionRequestExtensionPermissionAccess))]
 [JsonSerializable(typeof(PermissionRequestFactory))]
@@ -13022,10 +14411,14 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(PermissionRule))]
 [JsonSerializable(typeof(PersistedBinaryImage))]
 [JsonSerializable(typeof(PersistedBinaryResult))]
+[JsonSerializable(typeof(PromptCacheBreakData))]
+[JsonSerializable(typeof(PromptCacheBreakEvent))]
 [JsonSerializable(typeof(SamplingCompletedData))]
 [JsonSerializable(typeof(SamplingCompletedEvent))]
 [JsonSerializable(typeof(SamplingRequestedData))]
 [JsonSerializable(typeof(SamplingRequestedEvent))]
+[JsonSerializable(typeof(SandboxDecisionData))]
+[JsonSerializable(typeof(SandboxDecisionEvent))]
 [JsonSerializable(typeof(SessionAutoModeResolvedData))]
 [JsonSerializable(typeof(SessionAutoModeResolvedEvent))]
 [JsonSerializable(typeof(SessionAutopilotObjectiveChangedData))]
@@ -13131,6 +14524,7 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(SessionWarningEvent))]
 [JsonSerializable(typeof(SessionWorkspaceFileChangedData))]
 [JsonSerializable(typeof(SessionWorkspaceFileChangedEvent))]
+[JsonSerializable(typeof(ShutdownAgentMetric))]
 [JsonSerializable(typeof(ShutdownCodeChanges))]
 [JsonSerializable(typeof(ShutdownModelMetric))]
 [JsonSerializable(typeof(ShutdownModelMetricRequests))]
@@ -13204,6 +14598,8 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(ToolSearchActivatedEvent))]
 [JsonSerializable(typeof(ToolUserRequestedData))]
 [JsonSerializable(typeof(ToolUserRequestedEvent))]
+[JsonSerializable(typeof(UiEphemeralQueryData))]
+[JsonSerializable(typeof(UiEphemeralQueryEvent))]
 [JsonSerializable(typeof(UsageCheckpointModelCacheState))]
 [JsonSerializable(typeof(UserInputCompletedData))]
 [JsonSerializable(typeof(UserInputCompletedEvent))]
@@ -13214,6 +14610,7 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(UserToolSessionApproval))]
 [JsonSerializable(typeof(UserToolSessionApprovalCommands))]
 [JsonSerializable(typeof(UserToolSessionApprovalCustomTool))]
+[JsonSerializable(typeof(UserToolSessionApprovalExtensionEnvAccess))]
 [JsonSerializable(typeof(UserToolSessionApprovalExtensionManagement))]
 [JsonSerializable(typeof(UserToolSessionApprovalExtensionPermissionAccess))]
 [JsonSerializable(typeof(UserToolSessionApprovalFactory))]
diff --git a/dotnet/src/GitHubTokenProvider.cs b/dotnet/src/GitHubTokenProvider.cs
new file mode 100644
index 0000000000..3a79d09662
--- /dev/null
+++ b/dotnet/src/GitHubTokenProvider.cs
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace GitHub.Copilot;
+
+/// <summary>Why the runtime is requesting a GitHub token.</summary>
+[Experimental(Diagnostics.Experimental)]
+public enum GitHubTokenRequestReason
+{
+    /// <summary>The session needs its initial token.</summary>
+    Initial,
+
+    /// <summary>The session needs a refreshed token.</summary>
+    Refresh,
+}
+
+/// <summary>Arguments passed to a session-scoped GitHub token provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class GitHubTokenProviderArgs
+{
+    /// <summary>Gets the effective GitHub host for which a token is needed.</summary>
+    public required string Host { get; init; }
+
+    /// <summary>
+    /// Gets the session receiving the token, or <see langword="null"/> before a
+    /// cloud session has been assigned an identifier.
+    /// </summary>
+    public string? SessionId { get; init; }
+
+    /// <summary>Gets whether the runtime needs an initial or refreshed token.</summary>
+    public required GitHubTokenRequestReason Reason { get; init; }
+}
+
+/// <summary>A GitHub access token returned by a session-scoped provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class GitHubToken
+{
+    /// <summary>Gets or sets the GitHub access token.</summary>
+    public required string AccessToken { get; set; }
+
+    /// <summary>Gets or sets the OAuth token type. The runtime defaults it to <c>bearer</c>.</summary>
+    public string? TokenType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the required positive number of seconds remaining when the
+    /// callback completes. Production GitHub tokens typically last eight hours.
+    /// </summary>
+    public required long ExpiresIn { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+        => $"{nameof(GitHubToken)} {{ {nameof(TokenType)} = {TokenType}, {nameof(ExpiresIn)} = {ExpiresIn}, {nameof(AccessToken)} = <redacted> }}";
+}
+
+/// <summary>The result returned by a session-scoped GitHub token provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class GitHubTokenProviderResult
+{
+    /// <summary>Gets whether token acquisition was cancelled.</summary>
+    public bool Cancelled { get; private init; }
+
+    /// <summary>Gets the acquired token, if acquisition was not cancelled.</summary>
+    public GitHubToken? Token { get; private init; }
+
+    /// <summary>Creates a successful token result.</summary>
+    public static GitHubTokenProviderResult FromToken(GitHubToken token)
+    {
+        ArgumentNullException.ThrowIfNull(token);
+        return new() { Token = token };
+    }
+
+    /// <summary>Creates a cancelled result.</summary>
+    public static GitHubTokenProviderResult Cancel() => new() { Cancelled = true };
+}
diff --git a/dotnet/src/JsonRpc.cs b/dotnet/src/JsonRpc.cs
index 36289d2e68..c5c444ea70 100644
--- a/dotnet/src/JsonRpc.cs
+++ b/dotnet/src/JsonRpc.cs
@@ -548,7 +548,11 @@ private async Task HandleIncomingMethodAsync(string methodName, JsonElement mess
 
                 if (requestId.HasValue)
                 {
-                    await SendResultResponseAsync(requestId.Value, result, cancellationToken).ConfigureAwait(false);
+                    await SendResultResponseAsync(
+                        requestId.Value,
+                        result,
+                        registration.ResultType,
+                        cancellationToken).ConfigureAwait(false);
                 }
             }
             catch (Exception ex) when (ex is not OperationCanceledException)
@@ -772,18 +776,20 @@ private static bool TryGetPropertyCaseInsensitive(JsonElement obj, string name,
         return doc.RootElement.Clone();
     }
 
-    private async Task SendResultResponseAsync(JsonElement id, object? result, CancellationToken cancellationToken)
+    private async Task SendResultResponseAsync(
+        JsonElement id,
+        object? result,
+        Type? declaredResultType,
+        CancellationToken cancellationToken)
     {
         try
         {
-            // Convert the result to a JsonElement using the runtime type, looked up via
-            // the merged resolver. Source-gen serialization of an `object`-typed property
-            // would otherwise have no way to find metadata for the actual response type
-            // (e.g. SystemMessageTransformRpcResponse, SessionFsReadFileResult, ...).
+            // Prefer the handler's declared result type so polymorphic base types emit
+            // their discriminator. Fall back to the runtime type for untyped handlers.
             JsonElement? resultElement = null;
             if (result is not null)
             {
-                var typeInfo = _serializerOptions.GetTypeInfo(result.GetType());
+                var typeInfo = _serializerOptions.GetTypeInfo(declaredResultType ?? result.GetType());
                 resultElement = JsonSerializer.SerializeToElement(result, typeInfo);
             }
 
@@ -863,6 +869,11 @@ public MethodRegistration(Delegate handler, bool singleObjectParam)
             {
                 ValueTaskAsTaskMethod = GetMethodFromGenericMethodDefinition(returnType, s_valueTaskAsTask);
                 TaskResultGetter = GetMethodFromGenericMethodDefinition(ValueTaskAsTaskMethod.ReturnType, s_taskGetResult);
+                ResultType = returnType.GetGenericArguments()[0];
+            }
+            else if (returnType != typeof(void) && returnType != typeof(Task) && returnType != typeof(ValueTask))
+            {
+                ResultType = returnType;
             }
         }
 
@@ -871,6 +882,7 @@ public MethodRegistration(Delegate handler, bool singleObjectParam)
         public ParameterInfo[] Parameters { get; }
         public MethodInfo? ValueTaskAsTaskMethod { get; }
         public MethodInfo? TaskResultGetter { get; }
+        public Type? ResultType { get; }
     }
 
     private static MethodInfo GetMethodFromGenericMethodDefinition(Type specializedType, MethodInfo genericMethodDefinition)
diff --git a/dotnet/src/PermissionDecision.cs b/dotnet/src/PermissionDecision.cs
index 54e1237917..3eb1d0e08a 100644
--- a/dotnet/src/PermissionDecision.cs
+++ b/dotnet/src/PermissionDecision.cs
@@ -43,4 +43,13 @@ public static PermissionDecision Reject(string? feedback = null) =>
     /// connected client to answer instead.
     /// </summary>
     public static PermissionDecision NoResult() => new PermissionDecisionNoResult();
+
+    /// <summary>
+    /// Optional provenance describing how and where this decision was made.
+    /// This is never serialized as part of the decision itself: the SDK forwards
+    /// it to the runtime as a sibling of <c>result</c> so that auto-approval
+    /// telemetry can be attributed correctly.
+    /// </summary>
+    [JsonIgnore]
+    public PermissionDecisionContext? DecisionContext { get; set; }
 }
diff --git a/dotnet/src/PermissionHandlers.cs b/dotnet/src/PermissionHandlers.cs
index d990ca6534..6ff3abbda3 100644
--- a/dotnet/src/PermissionHandlers.cs
+++ b/dotnet/src/PermissionHandlers.cs
@@ -27,6 +27,9 @@ private static bool RequiresManagedApproval(PermissionRequest request)
             return true;
         }
 
+        // Only reached for a request that did not deserialize into a generated
+        // variant. Keep this list in sync with the PermissionRequest discriminators
+        // so a known kind is never treated as requiring managed approval.
         return request.GetType() == typeof(PermissionRequest)
             && request.Kind is not ("shell"
                 or "write"
@@ -37,6 +40,8 @@ private static bool RequiresManagedApproval(PermissionRequest request)
                 or "custom-tool"
                 or "hook"
                 or "extension-management"
-                or "extension-permission-access");
+                or "factory"
+                or "extension-permission-access"
+                or "extension-env-access");
     }
 }
diff --git a/dotnet/src/Session.cs b/dotnet/src/Session.cs
index 7c34ded166..7d076d14b0 100644
--- a/dotnet/src/Session.cs
+++ b/dotnet/src/Session.cs
@@ -82,6 +82,7 @@ private sealed record EventSubscription(Type EventType, Action<SessionEvent> Han
     private IReadOnlyList<OpenCanvasInstance> _openCanvases = Array.Empty<OpenCanvasInstance>();
 
     private int _isDisposed;
+    private string? _gitHubTokenProviderRegistrationId;
 
     /// <summary>
     /// Channel that serializes event dispatch. <see cref="DispatchEvent"/> enqueues;
@@ -203,6 +204,19 @@ internal void RemoveFromClient()
         ((ICollection<KeyValuePair<string, CopilotSession>>)_parentClient._sessions).Remove(new(SessionId, this));
     }
 
+    internal void SetGitHubTokenProviderRegistration(string registrationId)
+    {
+        _gitHubTokenProviderRegistrationId = registrationId;
+    }
+
+    internal void ReleaseGitHubTokenProviderRegistration()
+    {
+        if (Interlocked.Exchange(ref _gitHubTokenProviderRegistrationId, null) is { } registrationId)
+        {
+            _parentClient.UnregisterGitHubTokenProvider(registrationId);
+        }
+    }
+
     internal void StartProcessingEvents()
     {
         _ = ProcessEventsAsync();
@@ -357,7 +371,7 @@ void Handler(SessionEvent evt)
                     }
                     break;
 
-                case SessionIdleEvent:
+                case SessionIdleEvent idleEvent when idleEvent.Data.Mode != SessionMode.Autopilot:
                     LoggingHelpers.LogTiming(_logger, LogLevel.Debug, null,
                         "CopilotSession.SendAndWaitAsync idle received. Elapsed={Elapsed}, SessionId={SessionId}",
                         totalTimestamp,
@@ -954,7 +968,7 @@ private async Task ExecutePermissionAndRespondAsync(string requestId, Permission
                 return;
             }
             var responseRpcTimestamp = Stopwatch.GetTimestamp();
-            await Rpc.Permissions.HandlePendingPermissionRequestAsync(requestId, decision);
+            await Rpc.Permissions.HandlePendingPermissionRequestAsync(requestId, decision, decision.DecisionContext);
             LoggingHelpers.LogTiming(_logger, LogLevel.Debug, null,
                 "CopilotSession.ExecutePermissionAndRespondAsync response sent successfully. Elapsed={Elapsed}, SessionId={SessionId}, RequestId={RequestId}",
                 responseRpcTimestamp,
@@ -1364,7 +1378,10 @@ public async Task<ElicitationResult> ElicitAsync(ElicitationParams elicitationPa
                 Required = elicitationParams.RequestedSchema.Required
             };
 
-            var result = await session.Rpc.Ui.ElicitationAsync(elicitationParams.Message, schema, cancellationToken);
+            var result = await session.Rpc.Ui.ElicitationAsync(
+                elicitationParams.Message,
+                schema,
+                cancellationToken: cancellationToken);
             return new ElicitationResult
             {
                 Action = result.Action,
@@ -1388,7 +1405,7 @@ public async Task<bool> ConfirmAsync(string message, CancellationToken cancellat
                 Required = ["confirmed"]
             };
 
-            var result = await session.Rpc.Ui.ElicitationAsync(message, schema, cancellationToken);
+            var result = await session.Rpc.Ui.ElicitationAsync(message, schema, cancellationToken: cancellationToken);
             if (result.Action == UIElicitationResponseAction.Accept
                 && result.Content != null
                 && result.Content.TryGetValue("confirmed", out var val))
@@ -1422,7 +1439,7 @@ public async Task<bool> ConfirmAsync(string message, CancellationToken cancellat
                 Required = ["selection"]
             };
 
-            var result = await session.Rpc.Ui.ElicitationAsync(message, schema, cancellationToken);
+            var result = await session.Rpc.Ui.ElicitationAsync(message, schema, cancellationToken: cancellationToken);
             if (result.Action == UIElicitationResponseAction.Accept
                 && result.Content != null
                 && result.Content.TryGetValue("selection", out var val))
@@ -1457,7 +1474,7 @@ public async Task<bool> ConfirmAsync(string message, CancellationToken cancellat
                 Required = ["value"]
             };
 
-            var result = await session.Rpc.Ui.ElicitationAsync(message, schema, cancellationToken);
+            var result = await session.Rpc.Ui.ElicitationAsync(message, schema, cancellationToken: cancellationToken);
             if (result.Action == UIElicitationResponseAction.Accept
                 && result.Content != null
                 && result.Content.TryGetValue("value", out var val))
@@ -1830,14 +1847,14 @@ public async Task SetModelAsync(string model, SetModelOptions options, Cancellat
         ThrowIfDisposed();
 
         await Rpc.Model.SwitchToAsync(
-            model,
-            options.ReasoningEffort,
-            options.ReasoningSummary,
-            null,
-            options.ModelCapabilities,
-            options.ContextTier,
-            null,
-            cancellationToken);
+            modelId: model,
+            reasoningEffort: options.ReasoningEffort,
+            reasoningSummary: options.ReasoningSummary,
+            verbosity: null,
+            modelCapabilities: options.ModelCapabilities,
+            contextTier: options.ContextTier,
+            source: null,
+            cancellationToken: cancellationToken);
     }
 
     /// <summary>
@@ -1933,6 +1950,7 @@ await InvokeRpcAsync<object>(
         }
         finally
         {
+            ReleaseGitHubTokenProviderRegistration();
             RemoveFromClient();
             GC.SuppressFinalize(this);
         }
diff --git a/dotnet/src/Types.cs b/dotnet/src/Types.cs
index a6a1a8c4eb..6ed05e3064 100644
--- a/dotnet/src/Types.cs
+++ b/dotnet/src/Types.cs
@@ -309,6 +309,7 @@ private CopilotClientOptions(CopilotClientOptions? other)
         Connection = other.Connection;
         WorkingDirectory = other.WorkingDirectory;
         BaseDirectory = other.BaseDirectory;
+        BuiltinPluginDirectories = other.BuiltinPluginDirectories is null ? null : [.. other.BuiltinPluginDirectories];
         Environment = other.Environment;
         GitHubToken = other.GitHubToken;
         Logger = other.Logger;
@@ -358,6 +359,13 @@ private CopilotClientOptions(CopilotClientOptions? other)
     /// </summary>
     public string? BaseDirectory { get; set; }
 
+    /// <summary>
+    /// Absolute paths to trusted plugin directories bundled by the host.
+    /// When non-empty, the complete set is registered with the runtime during
+    /// startup before sessions can be created.
+    /// </summary>
+    public IList<string>? BuiltinPluginDirectories { get; set; }
+
     /// <summary>
     /// Log level for the Copilot runtime. Use the well-known values on
     /// <see cref="CopilotLogLevel"/> (<see cref="CopilotLogLevel.None"/>,
@@ -3044,6 +3052,70 @@ public sealed class GitHubMcpToolConfig
     public bool? DisableFormDeferral { get; set; }
 }
 
+/// <summary>Well-known managed bypass-permissions policies.</summary>
+public static class DisableBypassPermissionsModes
+{
+    /// <summary>Turns off bypass-permissions mode entirely.</summary>
+    public const string Disable = "disable";
+
+    /// <summary>Permits automatic bypass but blocks full allow-all.</summary>
+    public const string AllowAutoOnly = "allow-auto-only";
+}
+
+/// <summary>
+/// Permission rules injected as a managed-settings layer at session bootstrap.
+/// All fields are optional; omitted fields impose no constraint from this layer.
+/// </summary>
+/// <remarks>
+/// This layer composes restrictively with any server- or device-level managed
+/// settings: <see cref="Deny"/> and <see cref="Ask"/> rules are unioned across
+/// layers, every present <see cref="Allow"/> list must admit a tool for it to be
+/// allowed, and <see cref="DisableBypassPermissionsMode"/> policies compose to
+/// the most restrictive setting.
+/// </remarks>
+public sealed class ManagedSettingsPermissions
+{
+    /// <summary>
+    /// Restricts bypass-permissions mode for the session regardless of other
+    /// layers. See <see cref="DisableBypassPermissionsModes"/> for well-known
+    /// values. Unknown values are forwarded so newer runtime policies fail closed.
+    /// Serialized as <c>disableBypassPermissionsMode</c>.
+    /// </summary>
+    [JsonPropertyName("disableBypassPermissionsMode")]
+    public string? DisableBypassPermissionsMode { get; set; }
+
+    /// <summary>Tool-permission patterns that are always denied.</summary>
+    [JsonPropertyName("deny")]
+    public IList<string>? Deny { get; set; }
+
+    /// <summary>Tool-permission patterns that require an explicit ask.</summary>
+    [JsonPropertyName("ask")]
+    public IList<string>? Ask { get; set; }
+
+    /// <summary>Tool-permission patterns that are allowed without prompting.</summary>
+    [JsonPropertyName("allow")]
+    public IList<string>? Allow { get; set; }
+}
+
+/// <summary>
+/// Managed-settings layer injected at session startup. Currently carries only a
+/// <see cref="Permissions"/> object.
+/// </summary>
+/// <remarks>
+/// This layer is startup-only and is not persisted with the session. It must be
+/// re-supplied on <see cref="CopilotClient.ResumeSessionAsync"/> to remain in
+/// effect; omitting it on resume clears the previously injected layer. It can be
+/// combined with <see cref="SessionConfigBase.EnableManagedSettings"/>. Older
+/// runtimes may ignore this additive field, so hosts must not rely on injected
+/// policy until they ship a compatible runtime.
+/// </remarks>
+public sealed class ManagedSettings
+{
+    /// <summary>Permission rules for this managed-settings layer.</summary>
+    [JsonPropertyName("permissions")]
+    public ManagedSettingsPermissions? Permissions { get; set; }
+}
+
 /// <summary>
 /// Shared configuration properties for creating or resuming a Copilot session.
 /// Use <see cref="SessionConfig"/> when creating a new session, or
@@ -3070,7 +3142,10 @@ protected SessionConfigBase(SessionConfigBase? other)
         DefaultAgent = other.DefaultAgent;
         Agent = other.Agent;
         DisabledSkills = other.DisabledSkills is not null ? [.. other.DisabledSkills] : null;
+        IncludedBuiltinSkills = other.IncludedBuiltinSkills is not null ? [.. other.IncludedBuiltinSkills] : null;
+        DisabledMcpServers = other.DisabledMcpServers is not null ? [.. other.DisabledMcpServers] : null;
         EnableCitations = other.EnableCitations;
+        EnableFileChangeTracking = other.EnableFileChangeTracking;
         EnableConfigDiscovery = other.EnableConfigDiscovery;
         SkipEmbeddingRetrieval = other.SkipEmbeddingRetrieval;
         EmbeddingCacheStorage = other.EmbeddingCacheStorage;
@@ -3132,9 +3207,11 @@ protected SessionConfigBase(SessionConfigBase? other)
         ContextTier = other.ContextTier;
         CreateSessionFsProvider = other.CreateSessionFsProvider;
         GitHubToken = other.GitHubToken;
+        GitHubTokenProvider = other.GitHubTokenProvider;
         RemoteSession = other.RemoteSession;
         ExpAssignments = other.ExpAssignments;
         EnableManagedSettings = other.EnableManagedSettings;
+        ManagedSettings = other.ManagedSettings;
 #pragma warning disable GHCP001
         Canvases = other.Canvases is not null ? [.. other.Canvases] : null;
         RequestCanvasRenderer = other.RequestCanvasRenderer;
@@ -3197,6 +3274,17 @@ protected SessionConfigBase(SessionConfigBase? other)
     [Experimental(Diagnostics.Experimental)]
     public bool? EnableCitations { get; set; }
 
+    /// <summary>
+    /// Opts in to capturing file changes for session rewind and cumulative
+    /// session diff.
+    /// </summary>
+    /// <remarks>
+    /// On create, capture starts with the first turn. On resume, tracking can be
+    /// enabled only when the session still has a valid baseline; earlier untracked
+    /// changes cannot be reconstructed.
+    /// </remarks>
+    public bool? EnableFileChangeTracking { get; set; }
+
     /// <summary>
     /// Override the default configuration directory location.
     /// When specified, the session will use this directory for storing config and state.
@@ -3266,6 +3354,14 @@ protected SessionConfigBase(SessionConfigBase? other)
     /// </summary>
     public bool? EnableSkills { get; set; }
 
+    /// <summary>
+    /// Built-in skill names to include in the session. In
+    /// <see cref="CopilotClientMode.Empty"/>, omitting this option excludes all
+    /// runtime-bundled skills; specifying names opts those built-ins back in.
+    /// Skills from other sources remain eligible.
+    /// </summary>
+    public IList<string>? IncludedBuiltinSkills { get; set; }
+
     /// <summary>
     /// Custom tool declarations available to the language model during the session.
     /// Declarations backed by an <see cref="AIFunction"/> are invoked automatically; declarations without one
@@ -3500,6 +3596,13 @@ protected SessionConfigBase(SessionConfigBase? other)
     /// <summary>List of skill names to disable.</summary>
     public IList<string>? DisabledSkills { get; set; }
 
+    /// <summary>
+    /// Exact MCP server names to disable for this session. Disabled servers are not
+    /// started or authenticated on create or cold resume; a resident resume cannot
+    /// stop servers that are already running.
+    /// </summary>
+    public IList<string>? DisabledMcpServers { get; set; }
+
     /// <summary>
     /// Infinite session configuration for persistent workspaces and automatic compaction.
     /// When enabled (default), sessions automatically manage context limits and persist state.
@@ -3556,6 +3659,16 @@ protected SessionConfigBase(SessionConfigBase? other)
     /// </summary>
     public string? GitHubToken { get; set; }
 
+    /// <summary>
+    /// Gets or sets a callback that acquires session-scoped GitHub tokens on
+    /// demand. Initial cancellation, callback errors, and invalid token responses
+    /// reject session creation or resume instead of falling back to ambient
+    /// authentication. This cannot be combined with <see cref="GitHubToken"/>.
+    /// </summary>
+    [Experimental(Diagnostics.Experimental)]
+    [JsonIgnore]
+    public Func<GitHubTokenProviderArgs, Task<GitHubTokenProviderResult>>? GitHubTokenProvider { get; set; }
+
     /// <summary>
     /// Per-session remote behavior control:
     /// <list type="bullet">
@@ -3593,6 +3706,17 @@ protected SessionConfigBase(SessionConfigBase? other)
     /// </summary>
     public bool? EnableManagedSettings { get; set; }
 
+    /// <summary>
+    /// Optional managed-settings layer injected at session bootstrap. Currently
+    /// carries a permissions object that composes restrictively with any
+    /// server- or device-level managed settings. This layer is startup-only and
+    /// is not persisted: it must be re-supplied on resume to remain in effect,
+    /// and omitting it on resume clears the previously injected layer. Can be
+    /// combined with <see cref="EnableManagedSettings"/>. Serialized on the wire
+    /// as <c>managedSettings</c>.
+    /// </summary>
+    public ManagedSettings? ManagedSettings { get; set; }
+
 #pragma warning disable GHCP001
     /// <summary>
     /// Canvas declarations advertised by this connection. The runtime forwards
diff --git a/dotnet/test/E2E/BuiltinToolsE2ETests.cs b/dotnet/test/E2E/BuiltinToolsE2ETests.cs
index 5fc0314171..37067ecc60 100644
--- a/dotnet/test/E2E/BuiltinToolsE2ETests.cs
+++ b/dotnet/test/E2E/BuiltinToolsE2ETests.cs
@@ -2,6 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
+using GitHub.Copilot.Test.Harness;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -111,9 +112,21 @@ public async Task Should_Create_A_New_File()
         Assert.Contains("Created by test", msg?.Data.Content ?? string.Empty);
     }
 
+    // TODO(cli-1.0.81-2): the grep and glob built-in tools shell out to the CLI's
+    // bundled ripgrep, which the runtime cannot locate when it is loaded in-process
+    // over FFI ("Failed to execute ripgrep: No such file or directory"). The tool
+    // then returns an error the recorded snapshots do not cover. Re-enable once the
+    // in-process runtime resolves its bundled binaries.
+    private static bool RipgrepUnavailable => E2ETestContext.UsesInProcessTransport;
+
     [Fact]
     public async Task Should_Search_For_Patterns_In_Files()
     {
+        if (RipgrepUnavailable)
+        {
+            return;
+        }
+
         await File.WriteAllTextAsync(Path.Join(Ctx.WorkDir, "data.txt"), "apple\nbanana\napricot\ncherry\n");
         var session = await CreateSessionAsync();
         var msg = await session.SendAndWaitAsync(new MessageOptions
@@ -128,6 +141,11 @@ public async Task Should_Search_For_Patterns_In_Files()
     [Fact]
     public async Task Should_Find_Files_By_Pattern()
     {
+        if (RipgrepUnavailable)
+        {
+            return;
+        }
+
         Directory.CreateDirectory(Path.Join(Ctx.WorkDir, "src"));
         await File.WriteAllTextAsync(Path.Join(Ctx.WorkDir, "src", "index.ts"), "export const index = 1;");
         await File.WriteAllTextAsync(Path.Join(Ctx.WorkDir, "README.md"), "# Readme");
diff --git a/dotnet/test/E2E/ClientE2ETests.cs b/dotnet/test/E2E/ClientE2ETests.cs
index d166223d65..b6bdfd90fd 100644
--- a/dotnet/test/E2E/ClientE2ETests.cs
+++ b/dotnet/test/E2E/ClientE2ETests.cs
@@ -11,6 +11,9 @@ namespace GitHub.Copilot.Test.E2E;
 // Other test classes should instead inherit from E2ETestBase
 public class ClientE2ETests(E2ETestFixture fixture) : IClassFixture<E2ETestFixture>
 {
+    private const string FailingCliScript =
+        "process.stderr.write('nonexistent test flag on stderr\\n'); process.exit(1);";
+
     private E2ETestContext Ctx => fixture.Ctx;
 
     [Theory]
@@ -177,11 +180,14 @@ public async Task Should_Not_Throw_When_Disposing_Session_After_Stopping_Client(
     [InlineData(false)]  // TCP transport
     public async Task Should_Report_Error_With_Stderr_When_CLI_Fails_To_Start(bool useStdio)
     {
+        var cliPath = Path.Join(Ctx.WorkDir, $"failing-cli-{Guid.NewGuid():N}.js");
+        await File.WriteAllTextAsync(cliPath, FailingCliScript);
+
         var client = new CopilotClient(new CopilotClientOptions
         {
             Connection = useStdio
-                ? RuntimeConnection.ForStdio(args: ["--nonexistent-flag-for-testing"])
-                : RuntimeConnection.ForTcp(args: ["--nonexistent-flag-for-testing"])
+                ? RuntimeConnection.ForStdio(path: cliPath)
+                : RuntimeConnection.ForTcp(path: cliPath)
         });
 
         var ex = await Assert.ThrowsAsync<IOException>(() => client.StartAsync());
diff --git a/dotnet/test/E2E/RewindE2ETests.cs b/dotnet/test/E2E/RewindE2ETests.cs
new file mode 100644
index 0000000000..75aa328abe
--- /dev/null
+++ b/dotnet/test/E2E/RewindE2ETests.cs
@@ -0,0 +1,84 @@
+// Copyright (c) GitHub, Inc.
+// Licensed under the MIT License.
+
+using GitHub.Copilot.Rpc;
+using GitHub.Copilot.Test.Harness;
+
+using Xunit;
+using Xunit.Abstractions;
+
+namespace GitHub.Copilot.Test.E2E;
+
+public class RewindE2ETests(E2ETestFixture fixture, ITestOutputHelper output)
+    : E2ETestBase(fixture, "rewind", output)
+{
+    private const string FileName = "rewind-sdk.txt";
+    private const string FileContent = "SDK rewind content";
+
+    [Fact]
+    public async Task Should_Restore_Tracked_File_And_Conversation()
+    {
+        var filePath = Path.Join(Ctx.WorkDir, FileName);
+        await using var session = await CreateSessionAsync(new SessionConfig
+        {
+            Model = "claude-sonnet-4.5",
+            EnableFileChangeTracking = true,
+        });
+
+        var response = await session.SendAndWaitAsync(
+            new MessageOptions
+            {
+                Prompt = $"Use the create tool to create {FileName} containing exactly {FileContent}. "
+                    + "After the tool succeeds, reply with exactly SDK_REWIND_DONE.",
+            },
+            TimeSpan.FromSeconds(30));
+
+        Assert.Equal("SDK_REWIND_DONE", response?.Data.Content);
+        Assert.True(File.Exists(filePath));
+        Assert.Equal(FileContent, await File.ReadAllTextAsync(filePath));
+
+        HistoryListRewindPointsResult? rewindPoints = null;
+        await TestHelper.WaitForConditionAsync(
+            async () =>
+            {
+                rewindPoints = await session.Rpc.History.ListRewindPointsAsync();
+                return rewindPoints.UnavailableReason is null
+                    && rewindPoints.Points.Count == 1
+                    && rewindPoints.Points[0].CanRestoreFiles
+                    && rewindPoints.Points[0].FileCount == 1;
+            },
+            timeout: TimeSpan.FromSeconds(10),
+            timeoutMessage: "Timed out waiting for a restorable file rewind point.",
+            pollInterval: TimeSpan.FromMilliseconds(100));
+
+        Assert.NotNull(rewindPoints);
+        Assert.True(rewindPoints.FileChangeTrackingEnabled);
+        var rewindPoint = Assert.Single(rewindPoints.Points);
+        Assert.True(rewindPoint.CanRestoreFiles);
+        Assert.Equal(1, rewindPoint.FileCount);
+
+        var preview = await session.Rpc.History.PreviewRewindAsync(rewindPoint.EventId);
+        Assert.True(preview.Available);
+        var previewFile = Assert.Single(preview.Files);
+        Assert.Equal(
+            Path.GetFullPath(filePath),
+            Path.GetFullPath(previewFile.Path),
+            OperatingSystem.IsWindows() ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal);
+
+        var rewind = await session.Rpc.History.RewindAsync(
+            rewindPoint.EventId,
+            HistoryRewindMode.ConversationAndFiles);
+
+        Assert.Equal(HistoryRewindOutcome.Success, rewind.Outcome);
+        Assert.True(rewind.EventsRemoved > 0);
+        var restoredFile = Assert.Single(rewind.RestoredFiles);
+        Assert.Equal(
+            Path.GetFullPath(filePath),
+            Path.GetFullPath(restoredFile),
+            OperatingSystem.IsWindows() ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal);
+        Assert.False(File.Exists(filePath));
+
+        var events = await session.GetEventsAsync();
+        Assert.DoesNotContain(events, sessionEvent => sessionEvent.Id.ToString() == rewindPoint.EventId);
+    }
+}
diff --git a/dotnet/test/E2E/RpcServerMiscE2ETests.cs b/dotnet/test/E2E/RpcServerMiscE2ETests.cs
index 29e560100e..20993e2ec0 100644
--- a/dotnet/test/E2E/RpcServerMiscE2ETests.cs
+++ b/dotnet/test/E2E/RpcServerMiscE2ETests.cs
@@ -92,7 +92,7 @@ public async Task Should_Login_List_GetCurrentAuth_And_Logout_Account()
             var initial = await client.Rpc.Account.GetCurrentAuthAsync();
             Assert.Null(initial.AuthInfo);
 
-            var loginResult = await client.Rpc.Account.LoginAsync("https://github.com", login, token);
+            var loginResult = await client.Rpc.Account.LoginAsync("https://github.com", token, login);
             Assert.NotNull(loginResult);
 
             var current = await client.Rpc.Account.GetCurrentAuthAsync();
@@ -111,7 +111,7 @@ user.AuthInfo is AuthInfoUser userAuth
                 Assert.Equal(token, account.Token);
             }
 
-            var logout = await client.Rpc.Account.LogoutAsync(authInfo);
+            var logout = await client.Rpc.Account.LogoutAsync(authInfo: authInfo);
             Assert.False(logout.HasMoreUsers);
 
             var afterLogout = await client.Rpc.Account.GetCurrentAuthAsync();
diff --git a/dotnet/test/E2E/RpcSessionStateE2ETests.cs b/dotnet/test/E2E/RpcSessionStateE2ETests.cs
index 6dce3c250f..803c1c602b 100644
--- a/dotnet/test/E2E/RpcSessionStateE2ETests.cs
+++ b/dotnet/test/E2E/RpcSessionStateE2ETests.cs
@@ -451,7 +451,7 @@ public async Task Should_Set_Auth_Credentials()
         });
         var login = $"sdk-rpc-{Guid.NewGuid():N}";
 
-        var setCredentials = await session.Rpc.GitHubAuth.SetCredentialsAsync(new AuthInfoUser
+        var setCredentials = await session.Rpc.GitHubAuth.SetCredentialsAsync(new SettableAuthInfoUser
         {
             CopilotUser = new CopilotUserResponse
             {
diff --git a/dotnet/test/E2E/RpcSessionStateExtrasE2ETests.cs b/dotnet/test/E2E/RpcSessionStateExtrasE2ETests.cs
index 28ec9b7cfe..72663c35a4 100644
--- a/dotnet/test/E2E/RpcSessionStateExtrasE2ETests.cs
+++ b/dotnet/test/E2E/RpcSessionStateExtrasE2ETests.cs
@@ -12,7 +12,7 @@ namespace GitHub.Copilot.Test.E2E;
 /// <summary>
 /// E2E coverage for session-scoped RPC methods that were previously untested:
 /// completions, model.list, metadata.activity/context attribution/heaviest messages,
-/// permissions.getAllowAll/setAllowAll, plan.readSqlTodos, provider.add,
+/// permissions.getMode/setMode, plan.readSqlTodos, provider.add,
 /// telemetry.getEngagementId, tools.getCurrentMetadata/updateSubagentSettings,
 /// session visibility, and the session-scoped plugins.reload.
 /// </summary>
@@ -158,22 +158,22 @@ public async Task Should_Get_And_Set_AllowAll_Permissions()
 
         try
         {
-            var initial = await session.Rpc.Permissions.GetAllowAllAsync();
-            Assert.False(initial.Enabled, "Allow-all should be disabled on a fresh session.");
+            var initial = await session.Rpc.Permissions.GetModeAsync();
+            Assert.Equal(PermissionMode.Manual, initial.Mode);
 
-            var enable = await session.Rpc.Permissions.SetAllowAllAsync(enabled: true);
+            var enable = await session.Rpc.Permissions.SetModeAsync(PermissionMode.AllowAll);
             Assert.True(enable.Success);
-            Assert.True(enable.Enabled);
-            Assert.True((await session.Rpc.Permissions.GetAllowAllAsync()).Enabled);
+            Assert.Equal(PermissionMode.AllowAll, enable.Mode);
+            Assert.Equal(PermissionMode.AllowAll, (await session.Rpc.Permissions.GetModeAsync()).Mode);
 
-            var disable = await session.Rpc.Permissions.SetAllowAllAsync(enabled: false);
+            var disable = await session.Rpc.Permissions.SetModeAsync(PermissionMode.Manual);
             Assert.True(disable.Success);
-            Assert.False(disable.Enabled);
-            Assert.False((await session.Rpc.Permissions.GetAllowAllAsync()).Enabled);
+            Assert.Equal(PermissionMode.Manual, disable.Mode);
+            Assert.Equal(PermissionMode.Manual, (await session.Rpc.Permissions.GetModeAsync()).Mode);
         }
         finally
         {
-            await session.Rpc.Permissions.SetAllowAllAsync(enabled: false);
+            await session.Rpc.Permissions.SetModeAsync(PermissionMode.Manual);
         }
     }
 
diff --git a/dotnet/test/E2E/RpcUiEphemeralQueryE2ETests.cs b/dotnet/test/E2E/RpcUiEphemeralQueryE2ETests.cs
index 76043fd73c..a6b7877868 100644
--- a/dotnet/test/E2E/RpcUiEphemeralQueryE2ETests.cs
+++ b/dotnet/test/E2E/RpcUiEphemeralQueryE2ETests.cs
@@ -19,7 +19,10 @@ namespace GitHub.Copilot.Test.E2E;
 public class RpcUiEphemeralQueryE2ETests(E2ETestFixture fixture, ITestOutputHelper output)
     : E2ETestBase(fixture, "rpc_ui_ephemeral_query", output)
 {
-    [Fact]
+    // TODO(cli-1.0.81-2): CLI 1.0.81-5 still fails session.ui.ephemeralQuery against the
+    // recorded snapshot on macOS ("Failed to get response from the AI model"). Re-enable
+    // once the runtime fix ships.
+    [Fact(Skip = "Blocked on CLI 1.0.81-5 session.ui.ephemeralQuery regression on macOS")]
     public async Task Should_Answer_Ephemeral_Query()
     {
         await using var session = await CreateSessionAsync();
diff --git a/dotnet/test/E2E/SessionFsE2ETests.cs b/dotnet/test/E2E/SessionFsE2ETests.cs
index cc02b5abfa..146e47d808 100644
--- a/dotnet/test/E2E/SessionFsE2ETests.cs
+++ b/dotnet/test/E2E/SessionFsE2ETests.cs
@@ -337,6 +337,8 @@ await session.SendAndWaitAsync(new MessageOptions
             var messages = await session.GetEventsAsync();
             var toolResult = FindToolCallResult(messages, "get_big_string");
             Assert.NotNull(toolResult);
+            // Windows reports the spilled file path with backslash separators.
+            toolResult = toolResult!.Replace('\\', '/');
             Assert.Contains($"{SessionFsConfig.SessionStatePath}/temp/", toolResult);
 
             var match = System.Text.RegularExpressions.Regex.Match(
diff --git a/dotnet/test/Harness/E2ETestContext.cs b/dotnet/test/Harness/E2ETestContext.cs
index af34de6ec7..0080cbc609 100644
--- a/dotnet/test/Harness/E2ETestContext.cs
+++ b/dotnet/test/Harness/E2ETestContext.cs
@@ -13,6 +13,7 @@ namespace GitHub.Copilot.Test.Harness;
 public sealed class E2ETestContext : IAsyncDisposable
 {
     private const string DefaultGitHubToken = "fake-token-for-e2e-tests";
+    private static readonly TimeSpan s_gracefulClientStopTimeout = TimeSpan.FromSeconds(30);
 
     public string HomeDir { get; }
     public string WorkDir { get; }
@@ -39,6 +40,12 @@ private E2ETestContext(string homeDir, string workDir, string proxyUrl, ReplayPr
 
     public static async Task<E2ETestContext> CreateAsync()
     {
+        // A previous in-process context may have left this process's cwd inside a work
+        // directory that has since been deleted. getcwd() then fails, which breaks
+        // Process.Start below while it resolves the proxy executable. Repoint the cwd at
+        // the ambient value first; SetCurrentDirectory succeeds even if the old cwd is gone.
+        InProcessEnvIsolation.RestoreAmbientWorkingDirectory();
+
         var repoRoot = FindRepoRoot();
 
         var homeDir = Path.Combine(Path.GetTempPath(), $"copilot-test-config-{Guid.NewGuid()}");
@@ -477,6 +484,14 @@ public async ValueTask DisposeAsync()
         var isCI = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"));
         try { await _proxy.StopAsync(skipWritingCache: isCI); } catch (Exception ex) when (IsTransientCleanupException(ex)) { errors.Add(ex); }
 
+        // The in-process worker inherits this process's cwd, so ApplyInProcessEnvironment
+        // may have pointed it at WorkDir. The assembly-level isolation attribute only
+        // restores it around tests that actually execute, so a statically skipped test
+        // can leave the cwd inside a directory this method is about to delete. Every
+        // later Process.Start would then fail resolving its executable because getcwd()
+        // returns ENOENT. Repoint the cwd before deleting anything.
+        InProcessEnvIsolation.RestoreAmbientWorkingDirectory();
+
         try { await DeleteDirectoryAsync(HomeDir); } catch (Exception ex) when (IsTransientCleanupException(ex)) { errors.Add(ex); }
         try { await DeleteDirectoryAsync(WorkDir); } catch (Exception ex) when (IsTransientCleanupException(ex)) { errors.Add(ex); }
 
@@ -549,7 +564,6 @@ private static bool IsInProcess(RuntimeConnection? connection)
         return false;
     }
 
-    // Inproc holds the session-store SQLite handle in-process; graceful StopAsync releases it so the temp-dir delete succeeds on Windows.
     private static async Task StopClientForCleanupAsync(CopilotClient client)
     {
         var isInProcess = string.Equals(
@@ -558,7 +572,21 @@ private static async Task StopClientForCleanupAsync(CopilotClient client)
             StringComparison.OrdinalIgnoreCase);
         if (isInProcess)
         {
-            await client.StopAsync();
+            var gracefulStop = client.StopAsync();
+            try
+            {
+                await gracefulStop.WaitAsync(s_gracefulClientStopTimeout);
+            }
+            catch (TimeoutException)
+            {
+                Console.Error.WriteLine(
+                    $"Graceful in-process client cleanup exceeded {s_gracefulClientStopTimeout}; forcing shutdown.");
+                await client.ForceStopAsync();
+
+                // Disposing the connection completes any session.destroy RPC that
+                // blocked graceful cleanup. Observe that task before continuing.
+                await gracefulStop.WaitAsync(s_gracefulClientStopTimeout);
+            }
         }
         else
         {
diff --git a/dotnet/test/Harness/InProcessEnvIsolation.cs b/dotnet/test/Harness/InProcessEnvIsolation.cs
index af06001eda..e7a9c98235 100644
--- a/dotnet/test/Harness/InProcessEnvIsolation.cs
+++ b/dotnet/test/Harness/InProcessEnvIsolation.cs
@@ -67,6 +67,14 @@ public static void NeutralizeAmbientCredentials()
     public static void SetWorkingDirectory(string path) =>
         Directory.SetCurrentDirectory(path);
 
+    // Repoints the process working directory at its load-time value. Callers must not
+    // read Directory.GetCurrentDirectory() first: an in-process test can chdir into a
+    // temp work dir that the harness then deletes, so getcwd() would throw
+    // FileNotFoundException. SetCurrentDirectory to an absolute path succeeds
+    // regardless of whether the old cwd still exists.
+    public static void RestoreAmbientWorkingDirectory() =>
+        Directory.SetCurrentDirectory(s_ambientCwd);
+
     public static void RestoreAmbient()
     {
         // Unconditionally repoint the process cwd at its load-time value. We must
@@ -74,7 +82,7 @@ public static void RestoreAmbient()
         // chdir into a temp work dir that the harness then deletes, so getcwd()
         // would throw FileNotFoundException. SetCurrentDirectory to an absolute
         // path succeeds regardless of whether the old cwd still exists.
-        Directory.SetCurrentDirectory(s_ambientCwd);
+        RestoreAmbientWorkingDirectory();
 
         foreach (DictionaryEntry entry in Environment.GetEnvironmentVariables())
         {
diff --git a/dotnet/test/Unit/ClientSessionLifetimeTests.cs b/dotnet/test/Unit/ClientSessionLifetimeTests.cs
index a30e6d3030..b61546c650 100644
--- a/dotnet/test/Unit/ClientSessionLifetimeTests.cs
+++ b/dotnet/test/Unit/ClientSessionLifetimeTests.cs
@@ -3,6 +3,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 #if NET8_0_OR_GREATER
+using System.Collections.Concurrent;
 using System.Net;
 using System.Net.Sockets;
 using System.Diagnostics;
@@ -10,6 +11,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.Json;
+using GitHub.Copilot.Rpc;
 using Xunit;
 
 namespace GitHub.Copilot.Test.Unit;
@@ -18,6 +20,192 @@ public sealed class ClientSessionLifetimeTests
 {
     private sealed record RpcRequestRecord(string Method, JsonElement Params);
 
+    [Theory]
+    [InlineData("static")]
+    [InlineData("")]
+    public async Task GitHubTokenProvider_Is_Mutually_Exclusive_With_Static_Token(string staticToken)
+    {
+        await using var client = new CopilotClient();
+        var config = new SessionConfig
+        {
+            GitHubToken = staticToken,
+            GitHubTokenProvider = _ => Task.FromResult(GitHubTokenProviderResult.Cancel())
+        };
+
+        var error = await Assert.ThrowsAsync<ArgumentException>(() => client.CreateSessionAsync(config));
+
+        Assert.Contains("cannot be used together", error.Message);
+    }
+
+    [Fact]
+    public async Task GitHubTokenProvider_Is_Released_When_Session_Is_Deleted()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            GitHubTokenProvider = _ => Task.FromResult(GitHubTokenProviderResult.Cancel())
+        });
+        var registrationId = Assert.Single(server.Requests, request => request.Method == "session.create")
+            .Params.GetProperty("gitHubTokenProviderRegistrationId").GetString();
+
+        await client.DeleteSessionAsync(session.SessionId);
+
+        var error = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("gitHubToken.getToken", TokenRequest(registrationId)));
+        Assert.Contains("Unknown GitHub token provider registration ID", error.Message);
+        await session.DisposeAsync();
+    }
+
+    [Fact]
+    public async Task GitHubTokenProvider_Is_Serialized_And_Maps_Callbacks()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        GitHubTokenProviderArgs? callbackArgs = null;
+        var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            GitHubTokenProvider = args =>
+            {
+                callbackArgs = args;
+                return Task.FromResult(GitHubTokenProviderResult.FromToken(new GitHubToken
+                {
+                    AccessToken = "secret-token",
+                    TokenType = "bearer",
+                    ExpiresIn = 8 * 60 * 60
+                }));
+            }
+        });
+        var request = Assert.Single(server.Requests, request => request.Method == "session.create");
+        var registrationId = request.Params.GetProperty("gitHubTokenProviderRegistrationId").GetString();
+        Assert.False(string.IsNullOrEmpty(registrationId));
+        Assert.False(request.Params.TryGetProperty("gitHubToken", out _));
+
+        var result = await server.SendRequestAsync("gitHubToken.getToken", new Dictionary<string, object?>
+        {
+            ["registrationId"] = registrationId,
+            ["host"] = "github.example.com",
+            ["sessionId"] = session.SessionId,
+            ["reason"] = "refresh"
+        });
+
+        Assert.True(result.TryGetProperty("kind", out var kind), result.ToString());
+        Assert.Equal("token", kind.GetString());
+        Assert.Equal("secret-token", result.GetProperty("accessToken").GetString());
+        Assert.Equal(8 * 60 * 60, result.GetProperty("expiresIn").GetInt64());
+        Assert.NotNull(callbackArgs);
+        Assert.Equal("github.example.com", callbackArgs.Host);
+        Assert.Equal(session.SessionId, callbackArgs.SessionId);
+        Assert.Equal(GitHubTokenRequestReason.Refresh, callbackArgs.Reason);
+        Assert.DoesNotContain("secret-token", new GitHubToken
+        {
+            AccessToken = "secret-token",
+            ExpiresIn = 8 * 60 * 60
+        }.ToString());
+
+        await session.DisposeAsync();
+        var error = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("gitHubToken.getToken", new Dictionary<string, object?>
+            {
+                ["registrationId"] = registrationId,
+                ["host"] = "github.com",
+                ["reason"] = "initial"
+            }));
+        Assert.Contains("Unknown GitHub token provider registration ID", error.Message);
+
+        server.ClearRequests();
+        var resumed = await client.ResumeSessionAsync("resumed-session", new ResumeSessionConfig
+        {
+            GitHubTokenProvider = _ => Task.FromResult(GitHubTokenProviderResult.Cancel())
+        });
+        var resumeRequest = Assert.Single(server.Requests, request => request.Method == "session.resume");
+        Assert.False(string.IsNullOrEmpty(
+            resumeRequest.Params.GetProperty("gitHubTokenProviderRegistrationId").GetString()));
+        await resumed.DisposeAsync();
+    }
+
+    [Fact]
+    public async Task GitHubTokenProvider_Handles_Cancellation_Errors_And_Rollback()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var cancelledSession = await client.CreateSessionAsync(new SessionConfig
+        {
+            GitHubTokenProvider = _ => Task.FromResult(GitHubTokenProviderResult.Cancel())
+        });
+        var cancelledId = Assert.Single(server.Requests, request => request.Method == "session.create")
+            .Params.GetProperty("gitHubTokenProviderRegistrationId").GetString();
+        var cancelled = await server.SendRequestAsync("gitHubToken.getToken", TokenRequest(cancelledId));
+        Assert.True(cancelled.TryGetProperty("kind", out var cancelledKind), cancelled.ToString());
+        Assert.Equal("cancelled", cancelledKind.GetString());
+        await cancelledSession.DisposeAsync();
+
+        server.ClearRequests();
+        var providerSession = await client.CreateSessionAsync(new SessionConfig
+        {
+            GitHubTokenProvider = _ => Task.FromException<GitHubTokenProviderResult>(
+                new InvalidOperationException("provider failed"))
+        });
+        var providerId = Assert.Single(server.Requests, request => request.Method == "session.create")
+            .Params.GetProperty("gitHubTokenProviderRegistrationId").GetString();
+        var callbackError = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("gitHubToken.getToken", TokenRequest(providerId)));
+        Assert.Contains("provider failed", callbackError.Message);
+        await providerSession.DisposeAsync();
+
+        server.ClearRequests();
+        server.FailSessionCreate();
+        await Assert.ThrowsAsync<IOException>(() => client.CreateSessionAsync(new SessionConfig
+        {
+            GitHubTokenProvider = _ => Task.FromResult(GitHubTokenProviderResult.Cancel())
+        }));
+        var rolledBackId = Assert.Single(server.Requests, request => request.Method == "session.create")
+            .Params.GetProperty("gitHubTokenProviderRegistrationId").GetString();
+        var rollbackError = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("gitHubToken.getToken", TokenRequest(rolledBackId)));
+        Assert.Contains("Unknown GitHub token provider registration ID", rollbackError.Message);
+    }
+
+    [Fact]
+    public async Task GitHubTokenProvider_Resume_Replaces_Ownership()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var first = await client.CreateSessionAsync(new SessionConfig
+        {
+            SessionId = "replacement-session",
+            GitHubTokenProvider = _ => Task.FromResult(GitHubTokenProviderResult.Cancel())
+        });
+        var firstId = Assert.Single(server.Requests, request => request.Method == "session.create")
+            .Params.GetProperty("gitHubTokenProviderRegistrationId").GetString();
+
+        await first.DisposeAsync();
+        await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("gitHubToken.getToken", TokenRequest(firstId)));
+
+        server.ClearRequests();
+        var resumed = await client.ResumeSessionAsync("replacement-session", new ResumeSessionConfig
+        {
+            GitHubTokenProvider = _ => Task.FromResult(GitHubTokenProviderResult.Cancel())
+        });
+        var secondId = Assert.Single(server.Requests, request => request.Method == "session.resume")
+            .Params.GetProperty("gitHubTokenProviderRegistrationId").GetString();
+
+        var result = await server.SendRequestAsync("gitHubToken.getToken", TokenRequest(secondId));
+        Assert.Equal("cancelled", result.GetProperty("kind").GetString());
+
+        await resumed.DisposeAsync();
+        await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("gitHubToken.getToken", TokenRequest(secondId)));
+    }
+
+    private static Dictionary<string, object?> TokenRequest(string? registrationId) => new()
+    {
+        ["registrationId"] = registrationId,
+        ["host"] = "github.com",
+        ["reason"] = "initial"
+    };
+
     [Fact]
     public async Task StopAsync_Requests_Runtime_Shutdown_For_Owned_Process()
     {
@@ -182,6 +370,27 @@ public async Task StopAsync_Keeps_Session_Rooted_Until_Destroy_Completes()
         AssertSessionCount(client, sessions: 0);
     }
 
+    [Fact]
+    public async Task ForceStopAsync_Unblocks_StopAsync_When_Session_Destroy_Hangs()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        server.DelayDestroy();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+
+        _ = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var stopTask = client.StopAsync();
+        await server.DestroyStarted;
+
+        await client.ForceStopAsync();
+        await stopTask.WaitAsync(TimeSpan.FromSeconds(5));
+
+        AssertSessionCount(client, sessions: 0);
+    }
+
     [Fact]
     public async Task ResumeSessionAsync_Throws_When_Same_Client_Already_Tracks_Session()
     {
@@ -287,6 +496,179 @@ public async Task SessionRequests_Serialize_AdditionalDirectories()
             value => Assert.Equal("/repo/resumed", value.GetString()));
     }
 
+    [Fact]
+    public async Task SessionRequests_Serialize_Terminal_Tools()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var terminalTool = CopilotTool.DefineTool(
+            (Func<string>)(() => "done"),
+            new CopilotToolOptions { IsTerminal = true });
+        var plainTool = CopilotTool.DefineTool((Func<string>)(() => "continue"));
+
+        await using var created = await client.CreateSessionAsync(new SessionConfig
+        {
+            Tools = [terminalTool, plainTool],
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var createRequest = Assert.Single(server.Requests, request => request.Method == "session.create");
+        var createTools = createRequest.Params.GetProperty("tools");
+        Assert.True(createTools[0].GetProperty("isTerminal").GetBoolean());
+        Assert.False(createTools[1].TryGetProperty("isTerminal", out _));
+
+        server.ClearRequests();
+
+        await using var resumed = await client.ResumeSessionAsync("resume-with-terminal-tool", new ResumeSessionConfig
+        {
+            Tools = [terminalTool],
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var resumeRequest = Assert.Single(server.Requests, request => request.Method == "session.resume");
+        Assert.True(resumeRequest.Params.GetProperty("tools")[0].GetProperty("isTerminal").GetBoolean());
+    }
+
+    [Fact]
+    public async Task EmptyMode_Create_Sends_Empty_IncludedBuiltinSkills()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            Mode = CopilotClientMode.Empty,
+            BaseDirectory = Path.GetTempPath(),
+        });
+
+        await using var created = await client.CreateSessionAsync(new SessionConfig
+        {
+            AvailableTools = [],
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var update = Assert.Single(server.Requests, request => request.Method == "session.options.update");
+        Assert.True(update.Params.TryGetProperty("includedBuiltinSkills", out var skills));
+        Assert.Equal(JsonValueKind.Array, skills.ValueKind);
+        Assert.Equal(0, skills.GetArrayLength());
+        // Adjacent unconditional plugin isolation is still present.
+        Assert.True(update.Params.TryGetProperty("installedPlugins", out var plugins));
+        Assert.Equal(0, plugins.GetArrayLength());
+    }
+
+    [Fact]
+    public async Task EmptyMode_Resume_Sends_Empty_IncludedBuiltinSkills()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            Mode = CopilotClientMode.Empty,
+            BaseDirectory = Path.GetTempPath(),
+        });
+
+        await using var resumed = await client.ResumeSessionAsync("resume-empty-skills", new ResumeSessionConfig
+        {
+            AvailableTools = [],
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var update = Assert.Single(server.Requests, request => request.Method == "session.options.update");
+        Assert.True(update.Params.TryGetProperty("includedBuiltinSkills", out var skills));
+        Assert.Equal(JsonValueKind.Array, skills.ValueKind);
+        Assert.Equal(0, skills.GetArrayLength());
+    }
+
+    [Fact]
+    public async Task EmptyMode_Resume_Preserves_Explicit_IncludedBuiltinSkills()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            Mode = CopilotClientMode.Empty,
+            BaseDirectory = Path.GetTempPath(),
+        });
+
+        await using var resumed = await client.ResumeSessionAsync("resume-selected-skills", new ResumeSessionConfig
+        {
+            AvailableTools = [],
+            IncludedBuiltinSkills = ["code-review"],
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var update = Assert.Single(server.Requests, request => request.Method == "session.options.update");
+        var skills = update.Params.GetProperty("includedBuiltinSkills");
+        Assert.Equal(["code-review"], skills.EnumerateArray().Select(value => value.GetString()));
+    }
+
+    [Fact]
+    public async Task EmptyMode_Create_With_EnableSkills_Still_Sends_Empty_IncludedBuiltinSkills()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            Mode = CopilotClientMode.Empty,
+            BaseDirectory = Path.GetTempPath(),
+        });
+
+        // Caller opts into their own custom skills. Runtime-bundled built-ins must
+        // still be excluded: the empty post-patch cannot be weakened by the caller.
+        await using var created = await client.CreateSessionAsync(new SessionConfig
+        {
+            AvailableTools = [],
+            EnableSkills = true,
+            SkillDirectories = [Path.Combine(Path.GetTempPath(), "skills")],
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var update = Assert.Single(server.Requests, request => request.Method == "session.options.update");
+        Assert.True(update.Params.TryGetProperty("includedBuiltinSkills", out var skills));
+        Assert.Equal(JsonValueKind.Array, skills.ValueKind);
+        Assert.Equal(0, skills.GetArrayLength());
+    }
+
+    [Fact]
+    public async Task EmptyMode_Create_Preserves_Explicit_IncludedBuiltinSkills()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            Mode = CopilotClientMode.Empty,
+            BaseDirectory = Path.GetTempPath(),
+        });
+
+        await using var created = await client.CreateSessionAsync(new SessionConfig
+        {
+            AvailableTools = [],
+            IncludedBuiltinSkills = ["code-review"],
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var update = Assert.Single(server.Requests, request => request.Method == "session.options.update");
+        var skills = update.Params.GetProperty("includedBuiltinSkills");
+        Assert.Equal(["code-review"], skills.EnumerateArray().Select(value => value.GetString()));
+    }
+
+    [Fact]
+    public async Task CopilotCliMode_Create_Does_Not_Inject_IncludedBuiltinSkills()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+
+        await using var created = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        // In the default copilot-cli mode with no overridable options set, no
+        // options patch is sent at all, so the field is never injected.
+        Assert.DoesNotContain(server.Requests, request =>
+            request.Method == "session.options.update"
+            && request.Params.TryGetProperty("includedBuiltinSkills", out _));
+    }
+
     [Fact]
     public async Task CreateSessionAsync_Registers_McpAuth_Interest_Only_When_Handler_Configured()
     {
@@ -447,6 +829,66 @@ public async Task Generated_Session_Rpc_Throws_When_Session_Disposed()
         await Assert.ThrowsAsync<ObjectDisposedException>(() => session.Rpc.Model.GetCurrentAsync());
     }
 
+    [Fact]
+    public async Task SendAndWaitAsync_Skips_Autopilot_Continuation_Idle()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var sendTask = session.SendAndWaitAsync(new MessageOptions { Prompt = "keep going" });
+        await WaitForRequestAsync(server, "session.send");
+
+        var continuationIdleProcessed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        using var subscription = session.On<SessionIdleEvent>(idle =>
+        {
+            if (idle.Data.Mode == SessionMode.Autopilot)
+            {
+                continuationIdleProcessed.TrySetResult();
+            }
+        });
+
+        DispatchEvent(session, new AssistantMessageEvent
+        {
+            Id = Guid.NewGuid(),
+            Data = new AssistantMessageData
+            {
+                Content = "intermediate",
+                MessageId = "assistant-1"
+            }
+        });
+        DispatchEvent(session, new SessionIdleEvent
+        {
+            Id = Guid.NewGuid(),
+            Data = new SessionIdleData { Mode = SessionMode.Autopilot }
+        });
+
+        await continuationIdleProcessed.Task.WaitAsync(TimeSpan.FromSeconds(5));
+        Assert.False(sendTask.IsCompleted);
+
+        DispatchEvent(session, new AssistantMessageEvent
+        {
+            Id = Guid.NewGuid(),
+            Data = new AssistantMessageData
+            {
+                Content = "final",
+                MessageId = "assistant-2"
+            }
+        });
+        DispatchEvent(session, new SessionIdleEvent
+        {
+            Id = Guid.NewGuid(),
+            Data = new SessionIdleData { Mode = SessionMode.Interactive }
+        });
+
+        var result = await sendTask.WaitAsync(TimeSpan.FromSeconds(5));
+        Assert.NotNull(result);
+        Assert.Equal("final", result.Data.Content);
+    }
+
     [MethodImpl(MethodImplOptions.NoInlining)]
     private static async Task<WeakReference<CopilotSession>> CreateDroppedSessionAsync(CopilotClient client)
     {
@@ -482,6 +924,322 @@ private static int GetPrivateDictionaryCount(CopilotClient client, string fieldN
         return (int)count.GetValue(dictionary)!;
     }
 
+    [Fact]
+    public async Task CreateSessionAsync_Serializes_ManagedSettings_Permissions()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+        var permissionInvocation = new TaskCompletionSource<PermissionInvocation>(
+            TaskCreationOptions.RunContinuationsAsynchronously);
+
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            ManagedSettings = new ManagedSettings
+            {
+                Permissions = new ManagedSettingsPermissions
+                {
+                    DisableBypassPermissionsMode = DisableBypassPermissionsModes.Disable,
+                    Deny = ["shell(rm*)"],
+                    Ask = ["write"],
+                    Allow = []
+                }
+            },
+            OnPermissionRequest = (_, invocation) =>
+            {
+                permissionInvocation.TrySetResult(invocation);
+                return Task.FromResult(PermissionDecision.NoResult());
+            }
+        });
+
+        var request = Assert.Single(server.Requests, request => request.Method == "session.create");
+        Assert.False(request.Params.TryGetProperty("enableManagedSettings", out _));
+        var permissions = request.Params.GetProperty("managedSettings").GetProperty("permissions");
+        Assert.Equal("disable", permissions.GetProperty("disableBypassPermissionsMode").GetString());
+        Assert.Equal("shell(rm*)", Assert.Single(permissions.GetProperty("deny").EnumerateArray()).GetString());
+        Assert.Equal("write", Assert.Single(permissions.GetProperty("ask").EnumerateArray()).GetString());
+        Assert.Empty(permissions.GetProperty("allow").EnumerateArray());
+
+        DispatchEvent(session, new PermissionRequestedEvent
+        {
+            Data = new PermissionRequestedData
+            {
+                PermissionRequest = new PermissionRequest { Kind = "read" },
+                RequestId = "managed-permission"
+            }
+        });
+        var invocation = await permissionInvocation.Task.WaitAsync(TimeSpan.FromSeconds(5));
+        Assert.True(invocation.ManagedSettingsEnabled);
+    }
+
+    [Fact]
+    public async Task CreateSessionAsync_Serializes_Future_ManagedSettings_Bypass_Mode()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            ManagedSettings = new ManagedSettings
+            {
+                Permissions = new ManagedSettingsPermissions
+                {
+                    DisableBypassPermissionsMode = "future-fail-closed-mode"
+                }
+            },
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var request = Assert.Single(server.Requests, request => request.Method == "session.create");
+        var permissions = request.Params.GetProperty("managedSettings").GetProperty("permissions");
+        Assert.Equal(
+            "future-fail-closed-mode",
+            permissions.GetProperty("disableBypassPermissionsMode").GetString());
+    }
+
+    [Fact]
+    public async Task PermissionResponse_Forwards_DecisionContext_As_Sibling_Of_Result()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = (_, _) => Task.FromResult<PermissionDecision>(
+                new PermissionDecisionApproveOnce
+                {
+                    DecisionContext = new PermissionDecisionContext
+                    {
+                        Outcome = PermissionDecisionOutcome.AutoApproved,
+                        Source = PermissionDecisionSource.HostPolicy,
+                        Surface = PermissionDecisionSurface.Sdk
+                    }
+                })
+        });
+
+        DispatchEvent(session, new PermissionRequestedEvent
+        {
+            Data = new PermissionRequestedData
+            {
+                PermissionRequest = new PermissionRequest { Kind = "read" },
+                RequestId = "req-with-context"
+            }
+        });
+
+        var request = await WaitForRequestAsync(server, "session.permissions.handlePendingPermissionRequest");
+
+        Assert.True(request.Params.TryGetProperty("decisionContext", out var decisionContext));
+        Assert.Equal("auto_approved", decisionContext.GetProperty("outcome").GetString());
+        Assert.Equal("host_policy", decisionContext.GetProperty("source").GetString());
+        Assert.Equal("sdk", decisionContext.GetProperty("surface").GetString());
+
+        var result = request.Params.GetProperty("result");
+        Assert.Equal("approve-once", result.GetProperty("kind").GetString());
+        Assert.False(result.TryGetProperty("decisionContext", out _));
+    }
+
+    [Fact]
+    public async Task PermissionResponse_Omits_DecisionContext_When_Not_Supplied()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = (_, _) => Task.FromResult(PermissionDecision.ApproveOnce())
+        });
+
+        DispatchEvent(session, new PermissionRequestedEvent
+        {
+            Data = new PermissionRequestedData
+            {
+                PermissionRequest = new PermissionRequest { Kind = "read" },
+                RequestId = "req-no-context"
+            }
+        });
+
+        var request = await WaitForRequestAsync(server, "session.permissions.handlePendingPermissionRequest");
+
+        Assert.False(request.Params.TryGetProperty("decisionContext", out _));
+        var result = request.Params.GetProperty("result");
+        Assert.Equal("approve-once", result.GetProperty("kind").GetString());
+        Assert.False(result.TryGetProperty("decisionContext", out _));
+    }
+
+    [Fact]
+    public async Task PermissionResponse_Uses_Latest_Context_When_Reassigned()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = (_, _) =>
+            {
+                var decision = new PermissionDecisionApproveOnce
+                {
+                    DecisionContext = new PermissionDecisionContext
+                    {
+                        Outcome = PermissionDecisionOutcome.PromptedUser,
+                        Source = PermissionDecisionSource.HumanResponse,
+                        Surface = PermissionDecisionSurface.Tui
+                    }
+                };
+                decision.DecisionContext = new PermissionDecisionContext
+                {
+                    Outcome = PermissionDecisionOutcome.AutoApproved,
+                    Source = PermissionDecisionSource.HostPolicy,
+                    Surface = PermissionDecisionSurface.Sdk
+                };
+                return Task.FromResult<PermissionDecision>(decision);
+            }
+        });
+
+        DispatchEvent(session, new PermissionRequestedEvent
+        {
+            Data = new PermissionRequestedData
+            {
+                PermissionRequest = new PermissionRequest { Kind = "read" },
+                RequestId = "req-replace-context"
+            }
+        });
+
+        var request = await WaitForRequestAsync(server, "session.permissions.handlePendingPermissionRequest");
+
+        var decisionContext = request.Params.GetProperty("decisionContext");
+        Assert.Equal("auto_approved", decisionContext.GetProperty("outcome").GetString());
+        Assert.Equal("host_policy", decisionContext.GetProperty("source").GetString());
+        Assert.Equal("sdk", decisionContext.GetProperty("surface").GetString());
+    }
+
+    [Fact]
+    public async Task PermissionResponse_Is_Suppressed_For_NoResult_Even_With_Context()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+
+        var handlerInvoked = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = (_, _) =>
+            {
+                handlerInvoked.TrySetResult();
+                return Task.FromResult<PermissionDecision>(
+                    new PermissionDecisionNoResult
+                    {
+                        DecisionContext = new PermissionDecisionContext
+                        {
+                            Outcome = PermissionDecisionOutcome.PromptedUser,
+                            Source = PermissionDecisionSource.HumanResponse,
+                            Surface = PermissionDecisionSurface.Sdk
+                        }
+                    });
+            }
+        });
+
+        DispatchEvent(session, new PermissionRequestedEvent
+        {
+            Data = new PermissionRequestedData
+            {
+                PermissionRequest = new PermissionRequest { Kind = "read" },
+                RequestId = "req-no-result"
+            }
+        });
+
+        await handlerInvoked.Task.WaitAsync(TimeSpan.FromSeconds(5));
+        // Give the send path a chance to (incorrectly) fire before asserting suppression.
+        await Task.Delay(200);
+
+        Assert.DoesNotContain(server.Requests, request => request.Method == "session.permissions.handlePendingPermissionRequest");
+    }
+
+    [Fact]
+    public async Task PermissionResponse_Never_Nests_DecisionContext_Inside_Result()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = (_, _) => Task.FromResult<PermissionDecision>(
+                new PermissionDecisionReject
+                {
+                    Feedback = "denied by policy",
+                    DecisionContext = new PermissionDecisionContext
+                    {
+                        Outcome = PermissionDecisionOutcome.AutopilotDenied,
+                        Source = PermissionDecisionSource.HostPolicy,
+                        Surface = PermissionDecisionSurface.Sdk
+                    }
+                })
+        });
+
+        DispatchEvent(session, new PermissionRequestedEvent
+        {
+            Data = new PermissionRequestedData
+            {
+                PermissionRequest = new PermissionRequest { Kind = "read" },
+                RequestId = "req-reject-context"
+            }
+        });
+
+        var request = await WaitForRequestAsync(server, "session.permissions.handlePendingPermissionRequest");
+
+        var result = request.Params.GetProperty("result");
+        Assert.Equal("reject", result.GetProperty("kind").GetString());
+        Assert.Equal("denied by policy", result.GetProperty("feedback").GetString());
+        // The context provenance must never be serialized inside the decision itself.
+        Assert.False(result.TryGetProperty("decisionContext", out _));
+        // It is forwarded as a sibling instead.
+        Assert.True(request.Params.TryGetProperty("decisionContext", out _));
+    }
+
+    [Fact]
+    public async Task CreateSessionAsync_Omits_ManagedSettings_When_Unset()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+
+        var request = Assert.Single(server.Requests, request => request.Method == "session.create");
+        Assert.False(request.Params.TryGetProperty("managedSettings", out _));
+    }
+
+    [Fact]
+    public async Task ResumeSessionAsync_Serializes_ManagedSettings_Permissions()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+
+        await using var session = await client.ResumeSessionAsync("session-managed", new ResumeSessionConfig
+        {
+            ManagedSettings = new ManagedSettings
+            {
+                Permissions = new ManagedSettingsPermissions
+                {
+                    Deny = ["shell(rm*)"]
+                }
+            },
+            OnPermissionRequest = PermissionHandler.ApproveAll,
+            OnEvent = _ => { }
+        });
+
+        var request = Assert.Single(server.Requests, request => request.Method == "session.resume");
+        var permissions = request.Params.GetProperty("managedSettings").GetProperty("permissions");
+        Assert.Equal("shell(rm*)", Assert.Single(permissions.GetProperty("deny").EnumerateArray()).GetString());
+    }
+
     private static void DispatchEvent(CopilotSession session, SessionEvent evt)
     {
         var method = typeof(CopilotSession).GetMethod("DispatchEvent", BindingFlags.Instance | BindingFlags.NonPublic)
@@ -547,9 +1305,13 @@ private sealed class FakeCopilotServer : IAsyncDisposable
         private readonly Task _serverTask;
         private readonly List<RpcRequestRecord> _requests = [];
         private readonly object _requestsLock = new();
+        private readonly ConcurrentDictionary<int, TaskCompletionSource<JsonElement>> _pendingRequests = new();
+        private NetworkStream? _stream;
+        private int _nextRequestId;
         private string? _lastSessionId;
         private bool _delayDestroy;
         private bool _failRuntimeShutdown;
+        private bool _failSessionCreate;
 
         private FakeCopilotServer(TcpListener listener)
         {
@@ -611,6 +1373,31 @@ public void FailRuntimeShutdown()
             _failRuntimeShutdown = true;
         }
 
+        public void FailSessionCreate()
+        {
+            _failSessionCreate = true;
+        }
+
+        public async Task<JsonElement> SendRequestAsync(string method, Dictionary<string, object?> parameters)
+        {
+            var stream = _stream ?? throw new InvalidOperationException("Client is not connected.");
+            var id = Interlocked.Increment(ref _nextRequestId);
+            var completion = new TaskCompletionSource<JsonElement>(TaskCreationOptions.RunContinuationsAsynchronously);
+            if (!_pendingRequests.TryAdd(id, completion))
+            {
+                throw new InvalidOperationException("Failed to track callback request.");
+            }
+
+            await WriteMessageAsync(stream, new Dictionary<string, object?>
+            {
+                ["jsonrpc"] = "2.0",
+                ["id"] = id,
+                ["method"] = method,
+                ["params"] = parameters
+            }, _cts.Token);
+            return await completion.Task.WaitAsync(_cts.Token);
+        }
+
         public async ValueTask DisposeAsync()
         {
             _allowDestroy.TrySetResult();
@@ -633,16 +1420,37 @@ private async Task RunAsync()
         {
             using var tcpClient = await _listener.AcceptTcpClientAsync(_cts.Token);
             using var stream = tcpClient.GetStream();
+            _stream = stream;
 
             while (!_cts.Token.IsCancellationRequested)
             {
-                using var request = await ReadMessageAsync(stream, _cts.Token);
-                if (request is null)
+                using var message = await ReadMessageAsync(stream, _cts.Token);
+                if (message is null)
                 {
                     return;
                 }
 
-                await HandleRequestAsync(stream, request.RootElement, _cts.Token);
+                var root = message.RootElement;
+                if (root.TryGetProperty("method", out _))
+                {
+                    await HandleRequestAsync(stream, root, _cts.Token);
+                    continue;
+                }
+
+                if (root.TryGetProperty("id", out var responseId)
+                    && responseId.TryGetInt32(out var id)
+                    && _pendingRequests.TryRemove(id, out var completion))
+                {
+                    if (root.TryGetProperty("error", out var error))
+                    {
+                        completion.TrySetException(new InvalidOperationException(
+                            error.GetProperty("message").GetString()));
+                    }
+                    else
+                    {
+                        completion.TrySetResult(root.GetProperty("result").Clone());
+                    }
+                }
             }
         }
 
@@ -678,6 +1486,21 @@ private async Task HandleRequestAsync(Stream stream, JsonElement request, Cancel
             {
                 _requests.Add(new RpcRequestRecord(method!, paramsElement));
             }
+            if (method == "session.create" && _failSessionCreate)
+            {
+                _failSessionCreate = false;
+                await WriteMessageAsync(stream, new Dictionary<string, object?>
+                {
+                    ["jsonrpc"] = "2.0",
+                    ["id"] = id,
+                    ["error"] = new Dictionary<string, object?>
+                    {
+                        ["code"] = -32000,
+                        ["message"] = "session create failed"
+                    }
+                }, cancellationToken);
+                return;
+            }
             object? result = method switch
             {
                 "connect" => new Dictionary<string, object?>
@@ -696,10 +1519,18 @@ private async Task HandleRequestAsync(Stream stream, JsonElement request, Cancel
                 {
                     ["messageId"] = "message-1"
                 },
+                "session.options.update" => new Dictionary<string, object?>
+                {
+                    ["success"] = true
+                },
                 "session.mcp.oauth.handlePendingRequest" => new Dictionary<string, object?>
                 {
                     ["success"] = true
                 },
+                "session.permissions.handlePendingPermissionRequest" => new Dictionary<string, object?>
+                {
+                    ["success"] = true
+                },
                 "session.delete" => new Dictionary<string, object?>
                 {
                     ["success"] = true
diff --git a/dotnet/test/Unit/CloneTests.cs b/dotnet/test/Unit/CloneTests.cs
index ad8b0644e9..4bacdfe33d 100644
--- a/dotnet/test/Unit/CloneTests.cs
+++ b/dotnet/test/Unit/CloneTests.cs
@@ -20,6 +20,7 @@ public void CopilotClientOptions_Clone_CopiesAllProperties()
             GitHubToken = "ghp_test",
             UseLoggedInUser = false,
             BaseDirectory = "/custom/copilot/home",
+            BuiltinPluginDirectories = ["/plugins/core", "/plugins/github"],
             EnableRemoteSessions = true,
             SessionIdleTimeoutSeconds = 600,
         };
@@ -33,6 +34,8 @@ public void CopilotClientOptions_Clone_CopiesAllProperties()
         Assert.Equal(original.GitHubToken, clone.GitHubToken);
         Assert.Equal(original.UseLoggedInUser, clone.UseLoggedInUser);
         Assert.Equal(original.BaseDirectory, clone.BaseDirectory);
+        Assert.Equal(original.BuiltinPluginDirectories, clone.BuiltinPluginDirectories);
+        Assert.NotSame(original.BuiltinPluginDirectories, clone.BuiltinPluginDirectories);
         Assert.Equal(original.EnableRemoteSessions, clone.EnableRemoteSessions);
         Assert.Equal(original.SessionIdleTimeoutSeconds, clone.SessionIdleTimeoutSeconds);
     }
@@ -78,6 +81,7 @@ public void SessionConfig_Clone_CopiesAllProperties()
             AdditionalDirectories = ["/shared", "/generated"],
             Streaming = true,
             EnableCitations = true,
+            EnableFileChangeTracking = true,
             EnableSessionTelemetry = false,
             EnableExperimentalMode = true,
             EnableOnDemandInstructionDiscovery = true,
@@ -100,6 +104,7 @@ public void SessionConfig_Clone_CopiesAllProperties()
             SkillDirectories = ["/skills"],
             InstructionDirectories = ["/instructions"],
             DisabledSkills = ["skill1"],
+            DisabledMcpServers = ["server1"],
             PluginDirectories = ["/plugins"],
             LargeOutput = new LargeToolOutputConfig { Enabled = true, MaxSizeBytes = 2048, OutputDirectory = "/tmp/out" },
             Memory = new MemoryConfiguration { Enabled = true },
@@ -124,6 +129,7 @@ public void SessionConfig_Clone_CopiesAllProperties()
         Assert.Equal(original.AdditionalDirectories, clone.AdditionalDirectories);
         Assert.Equal(original.Streaming, clone.Streaming);
         Assert.Equal(original.EnableCitations, clone.EnableCitations);
+        Assert.Equal(original.EnableFileChangeTracking, clone.EnableFileChangeTracking);
         Assert.Equal(original.EnableSessionTelemetry, clone.EnableSessionTelemetry);
         Assert.Equal(original.EnableExperimentalMode, clone.EnableExperimentalMode);
         Assert.Equal(original.EnableOnDemandInstructionDiscovery, clone.EnableOnDemandInstructionDiscovery);
@@ -140,6 +146,7 @@ public void SessionConfig_Clone_CopiesAllProperties()
         Assert.Equal(original.SkillDirectories, clone.SkillDirectories);
         Assert.Equal(original.InstructionDirectories, clone.InstructionDirectories);
         Assert.Equal(original.DisabledSkills, clone.DisabledSkills);
+        Assert.Equal(original.DisabledMcpServers, clone.DisabledMcpServers);
         Assert.Equal(original.PluginDirectories, clone.PluginDirectories);
         Assert.Same(original.LargeOutput, clone.LargeOutput);
         Assert.Same(original.Memory, clone.Memory);
@@ -162,6 +169,7 @@ public void SessionConfig_Clone_CollectionsAreIndependent()
             SkillDirectories = ["/skills"],
             InstructionDirectories = ["/instructions"],
             DisabledSkills = ["skill1"],
+            DisabledMcpServers = ["server1"],
         };
 
         var clone = original.Clone();
@@ -176,6 +184,7 @@ public void SessionConfig_Clone_CollectionsAreIndependent()
         clone.SkillDirectories!.Add("/more");
         clone.InstructionDirectories!.Add("/more-instructions");
         clone.DisabledSkills!.Add("skill99");
+        clone.DisabledMcpServers!.Add("server99");
 
         // Original is unaffected
         Assert.Single(original.AvailableTools!);
@@ -187,6 +196,7 @@ public void SessionConfig_Clone_CollectionsAreIndependent()
         Assert.Single(original.SkillDirectories!);
         Assert.Single(original.InstructionDirectories!);
         Assert.Single(original.DisabledSkills!);
+        Assert.Single(original.DisabledMcpServers!);
     }
 
     [Fact]
@@ -214,6 +224,7 @@ public void ResumeSessionConfig_Clone_CollectionsAreIndependent()
             SkillDirectories = ["/skills"],
             InstructionDirectories = ["/instructions"],
             DisabledSkills = ["skill1"],
+            DisabledMcpServers = ["server1"],
         };
 
         var clone = original.Clone();
@@ -228,6 +239,7 @@ public void ResumeSessionConfig_Clone_CollectionsAreIndependent()
         clone.SkillDirectories!.Add("/more");
         clone.InstructionDirectories!.Add("/more-instructions");
         clone.DisabledSkills!.Add("skill99");
+        clone.DisabledMcpServers!.Add("server99");
 
         // Original is unaffected
         Assert.Single(original.AvailableTools!);
@@ -239,6 +251,7 @@ public void ResumeSessionConfig_Clone_CollectionsAreIndependent()
         Assert.Single(original.SkillDirectories!);
         Assert.Single(original.InstructionDirectories!);
         Assert.Single(original.DisabledSkills!);
+        Assert.Single(original.DisabledMcpServers!);
     }
 
     [Fact]
@@ -299,6 +312,7 @@ public void Clone_WithNullCollections_ReturnsNullCollections()
         Assert.Null(clone.SkillDirectories);
         Assert.Null(clone.InstructionDirectories);
         Assert.Null(clone.DisabledSkills);
+        Assert.Null(clone.DisabledMcpServers);
         Assert.Null(clone.Tools);
         Assert.Null(clone.DefaultAgent);
         Assert.True(clone.IncludeSubAgentStreamingEvents);
diff --git a/dotnet/test/Unit/CopilotToolTests.cs b/dotnet/test/Unit/CopilotToolTests.cs
index c3f5861492..19fa6258be 100644
--- a/dotnet/test/Unit/CopilotToolTests.cs
+++ b/dotnet/test/Unit/CopilotToolTests.cs
@@ -34,6 +34,28 @@ public void DefineTool_Sets_Name_Description_And_Copilot_Metadata()
         Assert.Equal(CopilotToolDefer.Auto, defer);
     }
 
+    [Fact]
+    public void DefineTool_Sets_IsTerminal_Metadata()
+    {
+        var function = CopilotTool.DefineTool(
+            ReturnsOk,
+            new CopilotToolOptions
+            {
+                IsTerminal = true
+            });
+
+        Assert.True(function.AdditionalProperties.TryGetValue("is_terminal", out var isTerminal));
+        Assert.True((bool)isTerminal!);
+    }
+
+    [Fact]
+    public void DefineTool_Omits_IsTerminal_When_Not_Set()
+    {
+        var function = CopilotTool.DefineTool(ReturnsOk);
+
+        Assert.False(function.AdditionalProperties.ContainsKey("is_terminal"));
+    }
+
     [Fact]
     public void DefineTool_Omits_Copilot_Metadata_When_Flags_Are_False()
     {
diff --git a/dotnet/test/Unit/GitHubTelemetryTests.cs b/dotnet/test/Unit/GitHubTelemetryTests.cs
index 24e633387e..a4a241e38d 100644
--- a/dotnet/test/Unit/GitHubTelemetryTests.cs
+++ b/dotnet/test/Unit/GitHubTelemetryTests.cs
@@ -17,6 +17,60 @@ namespace GitHub.Copilot.Test.Unit;
 
 public sealed class GitHubTelemetryTests
 {
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task BuiltinPluginDirectories_Default_Or_Empty_Does_Not_Call_Rpc(bool useEmpty)
+    {
+        await using var server = await FakeTelemetryServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            BuiltinPluginDirectories = useEmpty ? [] : null,
+        });
+
+        await client.StartAsync();
+
+        Assert.Equal(0, server.BuiltinPluginSetCount);
+    }
+
+    [Fact]
+    public async Task BuiltinPluginDirectories_Are_Set_Once_Before_Start_Completes()
+    {
+        var paths = new[]
+        {
+            Path.GetFullPath(Path.Join("plugins", "core")),
+            Path.GetFullPath(Path.Join("plugins", "github")),
+        };
+        await using var server = await FakeTelemetryServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            BuiltinPluginDirectories = paths,
+        });
+
+        await client.StartAsync();
+
+        Assert.Equal(1, server.BuiltinPluginSetCount);
+        var payload = server.LastBuiltinPluginParams
+            ?? throw new InvalidOperationException("plugins.builtin.set was not captured.");
+        Assert.Collection(
+            payload.GetProperty("paths").EnumerateArray(),
+            value => Assert.Equal(paths[0], value.GetString()),
+            value => Assert.Equal(paths[1], value.GetString()));
+    }
+
+    [Fact]
+    public void BuiltinPluginDirectories_Reject_Relative_Paths()
+    {
+        var exception = Assert.Throws<ArgumentException>(() => new CopilotClient(new CopilotClientOptions
+        {
+            BuiltinPluginDirectories = ["plugins/core"],
+        }));
+
+        Assert.Contains("absolute paths", exception.Message);
+    }
+
     [Fact]
     public async Task CreateSession_Opts_Into_Forwarding_When_Handler_Provided()
     {
@@ -266,6 +320,10 @@ public string Url
 
         public JsonElement? LastConnectParams { get; private set; }
 
+        public JsonElement? LastBuiltinPluginParams { get; private set; }
+
+        public int BuiltinPluginSetCount { get; private set; }
+
         public static Task<FakeTelemetryServer> StartAsync()
         {
             var listener = new TcpListener(IPAddress.Loopback, 0);
@@ -347,6 +405,7 @@ private async Task HandleRequestAsync(Stream stream, JsonElement request, Cancel
             object? result = method switch
             {
                 "connect" => CaptureConnect(request),
+                "plugins.builtin.set" => CaptureBuiltinPluginDirectories(request),
                 "session.create" => CaptureCreate(request),
                 "session.resume" => CaptureResume(request),
                 "session.send" => new Dictionary<string, object?> { ["messageId"] = "message-1" },
@@ -375,6 +434,13 @@ private async Task HandleRequestAsync(Stream stream, JsonElement request, Cancel
             };
         }
 
+        private Dictionary<string, object?> CaptureBuiltinPluginDirectories(JsonElement request)
+        {
+            BuiltinPluginSetCount++;
+            LastBuiltinPluginParams = request.TryGetProperty("params", out var p) ? p.Clone() : null;
+            return new Dictionary<string, object?>();
+        }
+
         private Dictionary<string, object?> CaptureCreate(JsonElement request)
         {
             LastCreateParams = request.TryGetProperty("params", out var p) ? p.Clone() : null;
diff --git a/dotnet/test/Unit/SerializationTests.cs b/dotnet/test/Unit/SerializationTests.cs
index acad44f19c..6edf168093 100644
--- a/dotnet/test/Unit/SerializationTests.cs
+++ b/dotnet/test/Unit/SerializationTests.cs
@@ -411,12 +411,14 @@ public void SessionRequests_CanSerializePluginDirectoriesAndLargeOutput_WithSdkO
             createRequestType,
             ("SessionId", "session-id"),
             ("PluginDirectories", pluginDirs),
+            ("DisabledMcpServers", new List<string> { "local-files", "remote-github" }),
             ("LargeOutput", largeOutput));
 
         var createJson = JsonSerializer.Serialize(createRequest, createRequestType, options);
         using var createDocument = JsonDocument.Parse(createJson);
         var createRoot = createDocument.RootElement;
         Assert.Equal("/tmp/plugins/a", createRoot.GetProperty("pluginDirectories")[0].GetString());
+        Assert.Equal("local-files", createRoot.GetProperty("disabledMcpServers")[0].GetString());
         Assert.Equal("/tmp/plugins/b", createRoot.GetProperty("pluginDirectories")[1].GetString());
         var createLargeOutput = createRoot.GetProperty("largeOutput");
         Assert.True(createLargeOutput.GetProperty("enabled").GetBoolean());
@@ -428,12 +430,14 @@ public void SessionRequests_CanSerializePluginDirectoriesAndLargeOutput_WithSdkO
             resumeRequestType,
             ("SessionId", "session-id"),
             ("PluginDirectories", pluginDirs),
+            ("DisabledMcpServers", new List<string> { "local-files", "remote-github" }),
             ("LargeOutput", largeOutput));
 
         var resumeJson = JsonSerializer.Serialize(resumeRequest, resumeRequestType, options);
         using var resumeDocument = JsonDocument.Parse(resumeJson);
         var resumeRoot = resumeDocument.RootElement;
         Assert.Equal("/tmp/plugins/a", resumeRoot.GetProperty("pluginDirectories")[0].GetString());
+        Assert.Equal("local-files", resumeRoot.GetProperty("disabledMcpServers")[0].GetString());
         var resumeLargeOutput = resumeRoot.GetProperty("largeOutput");
         Assert.True(resumeLargeOutput.GetProperty("enabled").GetBoolean());
         Assert.Equal(1024, resumeLargeOutput.GetProperty("maxSizeBytes").GetInt64());
@@ -479,6 +483,7 @@ public void SessionRequests_CanSerializeCitationAgentExclusionAndLimits_WithSdkO
             createRequestType,
             ("SessionId", "session-id"),
             ("EnableCitations", true),
+            ("EnableFileChangeTracking", true),
             ("ExcludedBuiltInAgents", excludedAgents),
             ("SessionLimits", new SessionLimitsConfig { MaxAiCredits = 12.5 }));
 
@@ -486,6 +491,7 @@ public void SessionRequests_CanSerializeCitationAgentExclusionAndLimits_WithSdkO
         using var createDocument = JsonDocument.Parse(createJson);
         var createRoot = createDocument.RootElement;
         Assert.True(createRoot.GetProperty("enableCitations").GetBoolean());
+        Assert.True(createRoot.GetProperty("enableFileChangeTracking").GetBoolean());
         Assert.Equal("explore", createRoot.GetProperty("excludedBuiltinAgents")[0].GetString());
         Assert.Equal(12.5, createRoot.GetProperty("sessionLimits").GetProperty("maxAiCredits").GetDouble());
 
@@ -494,6 +500,7 @@ public void SessionRequests_CanSerializeCitationAgentExclusionAndLimits_WithSdkO
             resumeRequestType,
             ("SessionId", "session-id"),
             ("EnableCitations", true),
+            ("EnableFileChangeTracking", true),
             ("ExcludedBuiltInAgents", excludedAgents),
             ("SessionLimits", new SessionLimitsConfig { MaxAiCredits = 7.25 }));
 
@@ -501,6 +508,7 @@ public void SessionRequests_CanSerializeCitationAgentExclusionAndLimits_WithSdkO
         using var resumeDocument = JsonDocument.Parse(resumeJson);
         var resumeRoot = resumeDocument.RootElement;
         Assert.True(resumeRoot.GetProperty("enableCitations").GetBoolean());
+        Assert.True(resumeRoot.GetProperty("enableFileChangeTracking").GetBoolean());
         Assert.Equal("task", resumeRoot.GetProperty("excludedBuiltinAgents")[1].GetString());
         Assert.Equal(7.25, resumeRoot.GetProperty("sessionLimits").GetProperty("maxAiCredits").GetDouble());
     }
diff --git a/dotnet/test/Unit/SessionEventSerializationTests.cs b/dotnet/test/Unit/SessionEventSerializationTests.cs
index 64e28a5aee..326ac3f3c7 100644
--- a/dotnet/test/Unit/SessionEventSerializationTests.cs
+++ b/dotnet/test/Unit/SessionEventSerializationTests.cs
@@ -368,4 +368,65 @@ public void McpOauthRequiredData_Preserves_Static_Client_Secret()
         Assert.NotNull(authEvent.Data.StaticClientConfig);
         Assert.Equal("static-secret", authEvent.Data.StaticClientConfig.ClientSecret);
     }
+
+    [Fact]
+    public void ManagedSettingsResolvedData_Preserves_Client_Provenance()
+    {
+        Assert.Equal("server", ManagedSettingsResolvedSource.Server.Value);
+        Assert.Equal("device", ManagedSettingsResolvedSource.Device.Value);
+        Assert.Equal("client", ManagedSettingsResolvedSource.Client.Value);
+        Assert.Equal("mixed", ManagedSettingsResolvedSource.Mixed.Value);
+        Assert.Equal("none", ManagedSettingsResolvedSource.None.Value);
+
+        const string clientJson = """
+            {
+              "id": "11111111-1111-1111-1111-111111111111",
+              "timestamp": "2026-03-15T21:26:54.987Z",
+              "parentId": null,
+              "type": "session.managed_settings_resolved",
+              "data": {
+                "source": "client",
+                "serverManaged": false,
+                "deviceManaged": false,
+                "clientManaged": true,
+                "failClosed": false,
+                "bypassPermissionsDisabled": true,
+                "managedKeys": ["permissions"]
+              }
+            }
+            """;
+
+        var clientEvent = Assert.IsType<SessionManagedSettingsResolvedEvent>(
+            SessionEvent.FromJson(clientJson));
+        Assert.Equal(ManagedSettingsResolvedSource.Client, clientEvent.Data.Source);
+        Assert.True(clientEvent.Data.ClientManaged);
+        using (var document = JsonDocument.Parse(clientEvent.ToJson()))
+        {
+            Assert.True(document.RootElement.GetProperty("data").GetProperty("clientManaged").GetBoolean());
+        }
+
+        const string mixedJson = """
+            {
+              "id": "22222222-2222-2222-2222-222222222222",
+              "timestamp": "2026-03-15T21:26:54.987Z",
+              "parentId": null,
+              "type": "session.managed_settings_resolved",
+              "data": {
+                "source": "mixed",
+                "serverManaged": true,
+                "deviceManaged": true,
+                "failClosed": false,
+                "bypassPermissionsDisabled": true,
+                "managedKeys": ["permissions"]
+              }
+            }
+            """;
+
+        var mixedEvent = Assert.IsType<SessionManagedSettingsResolvedEvent>(
+            SessionEvent.FromJson(mixedJson));
+        Assert.Equal(ManagedSettingsResolvedSource.Mixed, mixedEvent.Data.Source);
+        Assert.Null(mixedEvent.Data.ClientManaged);
+        using var mixedDocument = JsonDocument.Parse(mixedEvent.ToJson());
+        Assert.False(mixedDocument.RootElement.GetProperty("data").TryGetProperty("clientManaged", out _));
+    }
 }
diff --git a/go/README.md b/go/README.md
index d8588699c4..ddd74b91aa 100644
--- a/go/README.md
+++ b/go/README.md
@@ -222,6 +222,7 @@ Event types: `SessionLifecycleCreated`, `SessionLifecycleDeleted`, `SessionLifec
 - `InfiniteSessions` (\*InfiniteSessionConfig): Automatic context compaction configuration
 - `WorkingDirectory` (string): Working directory for the session (default: runtime process working directory)
 - `EnableSessionStore` (\*bool): Enables the cross-session store for search and retrieval across sessions. When unset in `ModeCopilotCli`, the runtime default applies (enabled). In `ModeEmpty`, defaults to disabled.
+- `GitHubTokenProvider` (GitHubTokenProvider): Acquires session-scoped GitHub tokens on demand. Return `GitHubTokenResult` with a positive `ExpiresIn` value (production GitHub tokens typically use `8 * 60 * 60` seconds), or `GitHubTokenCancelled`. Cannot be combined with `GitHubToken`.
 - `OnPermissionRequest` (PermissionHandlerFunc): Optional handler called before each tool execution to approve or deny it. When nil, permission requests are emitted as events and left pending for manual resolution. `copilot.PermissionHandler.ApproveAll` approves requests when managed settings are disabled and returns an error when `EnableManagedSettings` is true. Custom handlers can inspect `RequiresManagedApproval()` for human-facing confirmation logic. See [Permission Handling](#permission-handling) section.
 - `OnUserInputRequest` (UserInputHandler): Handler for user input requests from the agent (enables ask_user tool). See [User Input Requests](#user-input-requests) section.
 - `Hooks` (\*SessionHooks): Hook handlers for session lifecycle events. See [Session Hooks](#session-hooks) section.
@@ -237,6 +238,24 @@ Event types: `SessionLifecycleCreated`, `SessionLifecycleDeleted`, `SessionLifec
 - `Streaming` (*bool): Enable streaming delta events (nil = runtime default)
 - `Commands` ([]CommandDefinition): Slash-commands. See [Commands](#commands) section.
 - `OnElicitationRequest` (ElicitationHandler): Elicitation handler. See [Elicitation Requests](#elicitation-requests-serverclient) section.
+- `GitHubTokenProvider` (GitHubTokenProvider): Replaces the session-scoped token provider when resuming. Cannot be combined with `GitHubToken`.
+
+```go
+session, err := client.CreateSession(ctx, &copilot.SessionConfig{
+    GitHubTokenProvider: func(args copilot.GitHubTokenProviderArgs) (*copilot.GitHubTokenProviderResult, error) {
+        token, err := acquireToken(args.Host)
+        if err != nil {
+            return nil, err
+        }
+        return copilot.GitHubTokenResult(&copilot.GitHubToken{
+            AccessToken: token,
+            ExpiresIn:   8 * 60 * 60,
+        }), nil
+    },
+})
+```
+
+Initial acquisition runs during session creation or resume. Cancellation, provider errors, and invalid token responses reject that operation instead of falling back to ambient authentication. Idle sessions refresh only before their next credential-consuming operation; there is no background refresh timer.
 
 ### Session
 
diff --git a/go/client.go b/go/client.go
index eb95130300..4e44696a55 100644
--- a/go/client.go
+++ b/go/client.go
@@ -38,6 +38,7 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
@@ -144,19 +145,23 @@ func validateEnvironmentOptions(connection RuntimeConnection, opts *ClientOption
 //	}
 //	defer client.Stop()
 type Client struct {
-	options          ClientOptions
-	process          *exec.Cmd
-	client           *jsonrpc2.Client
-	actualPort       int
-	actualHost       string
-	state            connectionState
-	sessions         map[string]*Session
-	sessionsMux      sync.Mutex
-	isExternalServer bool
-	conn             net.Conn // stores net.Conn for external TCP connections
-	useStdio         bool     // resolved value from options
-	useInProcess     bool     // true for InProcessConnection (FFI transport)
-	ffiHost          inProcessHost
+	options                 ClientOptions
+	process                 *exec.Cmd
+	client                  *jsonrpc2.Client
+	actualPort              int
+	actualHost              string
+	state                   connectionState
+	sessions                map[string]*Session
+	sessionsMux             sync.Mutex
+	gitHubTokenProviders    map[string]GitHubTokenProvider
+	gitHubTokenProvidersMux sync.RWMutex
+	sessionOperations       map[string]*sessionOperation
+	sessionOperationsMux    sync.Mutex
+	isExternalServer        bool
+	conn                    net.Conn // stores net.Conn for external TCP connections
+	useStdio                bool     // resolved value from options
+	useInProcess            bool     // true for InProcessConnection (FFI transport)
+	ffiHost                 inProcessHost
 	// resolved process options for the spawned runtime (zero values for URIConnection)
 	cliPath            string
 	cliArgs            []string
@@ -188,6 +193,11 @@ type Client struct {
 	internalRPC *rpc.InternalServerRPC
 }
 
+type sessionOperation struct {
+	mutex sync.Mutex
+	users int
+}
+
 // NewClient creates a new Copilot runtime client with the given options.
 //
 // If options is nil, default options are used (spawns the bundled runtime over
@@ -214,17 +224,24 @@ func NewClient(options *ClientOptions) *Client {
 	opts := ClientOptions{}
 
 	client := &Client{
-		options:          opts,
-		state:            stateDisconnected,
-		sessions:         make(map[string]*Session),
-		actualHost:       "localhost",
-		isExternalServer: false,
-		useStdio:         true,
+		options:              opts,
+		state:                stateDisconnected,
+		sessions:             make(map[string]*Session),
+		gitHubTokenProviders: make(map[string]GitHubTokenProvider),
+		actualHost:           "localhost",
+		isExternalServer:     false,
+		useStdio:             true,
 	}
 
 	if options != nil {
 		opts = *options
 	}
+	for _, path := range opts.BuiltinPluginDirectories {
+		if !filepath.IsAbs(path) {
+			panic(fmt.Sprintf("BuiltinPluginDirectories must contain only absolute paths: %s", path))
+		}
+	}
+	opts.BuiltinPluginDirectories = append([]string(nil), opts.BuiltinPluginDirectories...)
 
 	// Resolve the connection. An explicit connection always wins; otherwise
 	// honor the same process/environment override as the other SDKs.
@@ -453,6 +470,21 @@ func (c *Client) Start(ctx context.Context) error {
 		return errors.Join(err, killErr)
 	}
 
+	if len(c.options.BuiltinPluginDirectories) > 0 {
+		if _, err := c.client.Request(ctx, "plugins.builtin.set", map[string]any{
+			"paths": c.options.BuiltinPluginDirectories,
+		}); err != nil {
+			c.client.Stop()
+			c.client = nil
+			c.conn = nil
+			c.RPC = nil
+			c.internalRPC = nil
+			killErr := c.killProcess()
+			c.state = stateError
+			return errors.Join(err, killErr)
+		}
+	}
+
 	// If a session filesystem provider was configured, register it.
 	if c.options.SessionFS != nil {
 		req := &rpc.SessionFSSetProviderRequest{
@@ -526,6 +558,7 @@ func (c *Client) Stop() error {
 	c.sessionsMux.Lock()
 	c.sessions = make(map[string]*Session)
 	c.sessionsMux.Unlock()
+	c.clearGitHubTokenProviders()
 
 	c.startStopMux.Lock()
 	defer c.startStopMux.Unlock()
@@ -641,6 +674,7 @@ func (c *Client) ForceStop() {
 	c.sessionsMux.Lock()
 	c.sessions = make(map[string]*Session)
 	c.sessionsMux.Unlock()
+	c.clearGitHubTokenProviders()
 
 	c.startStopMux.Lock()
 	defer c.startStopMux.Unlock()
@@ -750,10 +784,17 @@ func extractTransformCallbacks(config *SystemMessageConfig) (*SystemMessageConfi
 	return wireConfig, callbacks
 }
 
+func hasManagedSettings(enableManagedSettings *bool, managedSettings *ManagedSettings) bool {
+	return (enableManagedSettings != nil && *enableManagedSettings) || managedSettings != nil
+}
+
 func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Session, error) {
 	if config == nil {
 		config = &SessionConfig{}
 	}
+	if config.GitHubToken != "" && config.GitHubTokenProvider != nil {
+		return nil, fmt.Errorf("GitHubToken and GitHubTokenProvider cannot be used together")
+	}
 
 	if err := c.ensureConnected(ctx); err != nil {
 		return nil, err
@@ -761,6 +802,14 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 
 	c.applyConfigDefaultsForMode(config)
 
+	registrationID := c.registerGitHubTokenProvider(config.GitHubTokenProvider)
+	registrationTransferred := false
+	defer func() {
+		if !registrationTransferred {
+			c.unregisterGitHubTokenProvider(registrationID)
+		}
+	}()
+
 	req := createSessionRequest{}
 	req.Model = config.Model
 	req.ClientName = config.ClientName
@@ -795,6 +844,7 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 	req.Models = config.Models
 	req.EnableSessionTelemetry = config.EnableSessionTelemetry
 	req.EnableCitations = config.EnableCitations
+	req.EnableFileChangeTracking = config.EnableFileChangeTracking
 	req.SessionLimits = config.SessionLimits
 	req.IsExperimentalMode = config.EnableExperimentalMode
 	req.SkipCustomInstructions = config.SkipCustomInstructions
@@ -814,11 +864,15 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 	req.PluginDirectories = config.PluginDirectories
 	req.InstructionDirectories = config.InstructionDirectories
 	req.DisabledSkills = config.DisabledSkills
+	if config.DisabledMCPServers != nil {
+		req.DisabledMCPServers = &config.DisabledMCPServers
+	}
 	req.InfiniteSessions = config.InfiniteSessions
 	req.LargeOutput = config.LargeOutput
 	req.ToolSearch = config.ToolSearch
 	req.Memory = config.Memory
 	req.GitHubToken = config.GitHubToken
+	req.GitHubTokenProviderRegistrationID = registrationID
 	req.RemoteSession = config.RemoteSession
 	req.Cloud = config.Cloud
 	req.Canvases = config.Canvases
@@ -830,6 +884,7 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 	req.ExtensionInfo = config.ExtensionInfo
 	req.ExpAssignments = config.ExpAssignments
 	req.EnableManagedSettings = config.EnableManagedSettings
+	req.ManagedSettings = config.ManagedSettings
 
 	if len(config.Commands) > 0 {
 		cmds := make([]wireCommand, 0, len(config.Commands))
@@ -914,7 +969,7 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 			sessionID,
 			c.client,
 			"",
-			config.EnableManagedSettings != nil && *config.EnableManagedSettings,
+			hasManagedSettings(config.EnableManagedSettings, config.ManagedSettings),
 		)
 
 		s.registerTools(config.Tools)
@@ -1068,10 +1123,17 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 		CustomAgentsLocalOnly:  config.CustomAgentsLocalOnly,
 		CoauthorEnabled:        config.CoauthorEnabled,
 		ManageScheduleEnabled:  config.ManageScheduleEnabled,
+		IncludedBuiltinSkills:  config.IncludedBuiltinSkills,
 	}); err != nil {
 		return nil, err
 	}
 
+	if registrationID != "" {
+		session.setGitHubTokenProviderRegistrationRelease(func() {
+			c.unregisterGitHubTokenProvider(registrationID)
+		})
+		registrationTransferred = true
+	}
 	return session, nil
 }
 
@@ -1099,9 +1161,15 @@ func (c *Client) ResumeSession(ctx context.Context, sessionID string, config *Re
 //	    Tools: []copilot.Tool{myNewTool},
 //	})
 func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string, config *ResumeSessionConfig) (*Session, error) {
+	unlockSession := c.lockSessionOperation(sessionID)
+	defer unlockSession()
+
 	if config == nil {
 		config = &ResumeSessionConfig{}
 	}
+	if config.GitHubToken != "" && config.GitHubTokenProvider != nil {
+		return nil, fmt.Errorf("GitHubToken and GitHubTokenProvider cannot be used together")
+	}
 
 	if err := c.ensureConnected(ctx); err != nil {
 		return nil, err
@@ -1109,6 +1177,14 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 
 	c.applyResumeDefaultsForMode(config)
 
+	registrationID := c.registerGitHubTokenProvider(config.GitHubTokenProvider)
+	registrationTransferred := false
+	defer func() {
+		if !registrationTransferred {
+			c.unregisterGitHubTokenProvider(registrationID)
+		}
+	}()
+
 	var req resumeSessionRequest
 	req.SessionID = sessionID
 	req.ClientName = config.ClientName
@@ -1140,6 +1216,7 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 	req.ToolFilterPrecedence = precedence
 	req.ExcludedBuiltInAgents = config.ExcludedBuiltInAgents
 	req.EnableCitations = config.EnableCitations
+	req.EnableFileChangeTracking = config.EnableFileChangeTracking
 	req.SessionLimits = config.SessionLimits
 	if config.Streaming != nil {
 		req.Streaming = config.Streaming
@@ -1193,11 +1270,15 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 	req.PluginDirectories = config.PluginDirectories
 	req.InstructionDirectories = config.InstructionDirectories
 	req.DisabledSkills = config.DisabledSkills
+	if config.DisabledMCPServers != nil {
+		req.DisabledMCPServers = &config.DisabledMCPServers
+	}
 	req.InfiniteSessions = config.InfiniteSessions
 	req.LargeOutput = config.LargeOutput
 	req.ToolSearch = config.ToolSearch
 	req.Memory = config.Memory
 	req.GitHubToken = config.GitHubToken
+	req.GitHubTokenProviderRegistrationID = registrationID
 	req.RemoteSession = config.RemoteSession
 	req.Canvases = config.Canvases
 	req.OpenCanvases = config.OpenCanvases
@@ -1209,6 +1290,7 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 	req.ExtensionInfo = config.ExtensionInfo
 	req.ExpAssignments = config.ExpAssignments
 	req.EnableManagedSettings = config.EnableManagedSettings
+	req.ManagedSettings = config.ManagedSettings
 	if config.OnPermissionRequest != nil {
 		req.RequestPermission = Bool(true)
 	}
@@ -1244,7 +1326,7 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 		sessionID,
 		c.client,
 		"",
-		config.EnableManagedSettings != nil && *config.EnableManagedSettings,
+		hasManagedSettings(config.EnableManagedSettings, config.ManagedSettings),
 	)
 
 	session.registerTools(config.Tools)
@@ -1282,22 +1364,31 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 	}
 
 	c.sessionsMux.Lock()
+	replacedSession := c.sessions[sessionID]
 	c.sessions[sessionID] = session
 	c.sessionsMux.Unlock()
 
+	restoreReplacedSession := func() {
+		c.sessionsMux.Lock()
+		if current := c.sessions[sessionID]; current == nil || current == session {
+			if replacedSession != nil {
+				c.sessions[sessionID] = replacedSession
+			} else {
+				delete(c.sessions, sessionID)
+			}
+		}
+		c.sessionsMux.Unlock()
+	}
+
 	if c.options.SessionFS != nil {
 		if config.CreateSessionFSProvider == nil {
-			c.sessionsMux.Lock()
-			delete(c.sessions, sessionID)
-			c.sessionsMux.Unlock()
+			restoreReplacedSession()
 			return nil, fmt.Errorf("CreateSessionFSProvider is required in session config when SessionFS is enabled in client options")
 		}
 		provider := config.CreateSessionFSProvider(session)
 		if c.options.SessionFS.Capabilities != nil && c.options.SessionFS.Capabilities.Sqlite {
 			if _, ok := provider.(SessionFSSqliteProvider); !ok {
-				c.sessionsMux.Lock()
-				delete(c.sessions, sessionID)
-				c.sessionsMux.Unlock()
+				restoreReplacedSession()
 				return nil, fmt.Errorf("SessionFS capabilities declare SQLite support but the provider does not implement SessionFSSqliteProvider")
 			}
 		}
@@ -1306,17 +1397,13 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 
 	result, err := c.client.Request(ctx, "session.resume", req)
 	if err != nil {
-		c.sessionsMux.Lock()
-		delete(c.sessions, sessionID)
-		c.sessionsMux.Unlock()
+		restoreReplacedSession()
 		return nil, fmt.Errorf("failed to resume session: %w", err)
 	}
 
 	var response resumeSessionResponse
 	if err := json.Unmarshal(result, &response); err != nil {
-		c.sessionsMux.Lock()
-		delete(c.sessions, sessionID)
-		c.sessionsMux.Unlock()
+		restoreReplacedSession()
 		return nil, fmt.Errorf("failed to unmarshal response: %w", err)
 	}
 
@@ -1325,9 +1412,7 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 			"sessionId": sessionID,
 			"eventType": "mcp.oauth_required",
 		}); err != nil {
-			c.sessionsMux.Lock()
-			delete(c.sessions, sessionID)
-			c.sessionsMux.Unlock()
+			restoreReplacedSession()
 			return nil, err
 		}
 	}
@@ -1341,10 +1426,21 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 		CustomAgentsLocalOnly:  config.CustomAgentsLocalOnly,
 		CoauthorEnabled:        config.CoauthorEnabled,
 		ManageScheduleEnabled:  config.ManageScheduleEnabled,
+		IncludedBuiltinSkills:  config.IncludedBuiltinSkills,
 	}); err != nil {
+		restoreReplacedSession()
 		return nil, err
 	}
 
+	if registrationID != "" {
+		session.setGitHubTokenProviderRegistrationRelease(func() {
+			c.unregisterGitHubTokenProvider(registrationID)
+		})
+		registrationTransferred = true
+	}
+	if replacedSession != nil && replacedSession != session {
+		replacedSession.releaseGitHubTokenProviderRegistration()
+	}
 	return session, nil
 }
 
@@ -1436,6 +1532,9 @@ func (c *Client) GetSessionMetadata(ctx context.Context, sessionID string) (*Ses
 //	    log.Fatal(err)
 //	}
 func (c *Client) DeleteSession(ctx context.Context, sessionID string) error {
+	unlockSession := c.lockSessionOperation(sessionID)
+	defer unlockSession()
+
 	if err := c.ensureConnected(ctx); err != nil {
 		return err
 	}
@@ -1460,8 +1559,12 @@ func (c *Client) DeleteSession(ctx context.Context, sessionID string) error {
 
 	// Remove from local sessions map if present
 	c.sessionsMux.Lock()
+	session := c.sessions[sessionID]
 	delete(c.sessions, sessionID)
 	c.sessionsMux.Unlock()
+	if session != nil {
+		session.releaseGitHubTokenProviderRegistration()
+	}
 
 	return nil
 }
@@ -2003,15 +2106,7 @@ func (c *Client) startCLIServer(ctx context.Context) error {
 		// Create JSON-RPC client immediately
 		c.client = jsonrpc2.NewClient(stdin, stdout)
 		c.client.SetProcessDone(c.processDone, c.processErrorPtr)
-		c.client.SetOnClose(func() {
-			// Run in a goroutine to avoid deadlocking with Stop/ForceStop,
-			// which hold startStopMux while waiting for readLoop to finish.
-			go func() {
-				c.startStopMux.Lock()
-				defer c.startStopMux.Unlock()
-				c.state = stateDisconnected
-			}()
-		})
+		c.client.SetOnClose(c.handleConnectionClose)
 		c.RPC = rpc.NewServerRPC(c.client)
 		c.internalRPC = rpc.NewInternalServerRPC(c.client)
 		c.setupNotificationHandler()
@@ -2130,15 +2225,7 @@ func (c *Client) startInProcess(ctx context.Context) error {
 	}
 
 	c.client = jsonrpc2.NewClient(host.Writer(), host.Reader())
-	c.client.SetOnClose(func() {
-		// Run in a goroutine to avoid deadlocking with Stop/ForceStop, which hold
-		// startStopMux while waiting for readLoop to finish.
-		go func() {
-			c.startStopMux.Lock()
-			defer c.startStopMux.Unlock()
-			c.state = stateDisconnected
-		}()
-	})
+	c.client.SetOnClose(c.handleConnectionClose)
 	c.RPC = rpc.NewServerRPC(c.client)
 	c.internalRPC = rpc.NewInternalServerRPC(c.client)
 	c.setupNotificationHandler()
@@ -2288,13 +2375,7 @@ func (c *Client) connectViaTCP(ctx context.Context) error {
 	if c.processDone != nil {
 		c.client.SetProcessDone(c.processDone, c.processErrorPtr)
 	}
-	c.client.SetOnClose(func() {
-		go func() {
-			c.startStopMux.Lock()
-			defer c.startStopMux.Unlock()
-			c.state = stateDisconnected
-		}()
-	})
+	c.client.SetOnClose(c.handleConnectionClose)
 	c.RPC = rpc.NewServerRPC(c.client)
 	c.internalRPC = rpc.NewInternalServerRPC(c.client)
 	c.setupNotificationHandler()
@@ -2325,8 +2406,10 @@ func (c *Client) setupNotificationHandler() {
 	// payload's sessionId. Always register the global handlers so the generated
 	// hooks.invoke handler is wired to our dispatcher.
 	handlers := &rpc.ClientGlobalAPIHandlers{
-		Hooks: &hooksAdapter{client: c},
+		Hooks:       &hooksAdapter{client: c},
+		GitHubToken: &gitHubTokenAdapter{client: c},
 	}
+
 	if c.options.RequestHandler != nil {
 		handlers.LlmInference = newCopilotRequestAdapter(c.options.RequestHandler, func() *rpc.ServerLlmInferenceAPI {
 			if c.RPC == nil {
@@ -2341,6 +2424,107 @@ func (c *Client) setupNotificationHandler() {
 	rpc.RegisterClientGlobalAPIHandlers(c.client, handlers)
 }
 
+func (c *Client) registerGitHubTokenProvider(provider GitHubTokenProvider) string {
+	if provider == nil {
+		return ""
+	}
+	registrationID := uuid.NewString()
+	c.gitHubTokenProvidersMux.Lock()
+	if c.gitHubTokenProviders == nil {
+		c.gitHubTokenProviders = make(map[string]GitHubTokenProvider)
+	}
+	c.gitHubTokenProviders[registrationID] = provider
+	c.gitHubTokenProvidersMux.Unlock()
+	return registrationID
+}
+
+func (c *Client) unregisterGitHubTokenProvider(registrationID string) {
+	if registrationID == "" {
+		return
+	}
+	c.gitHubTokenProvidersMux.Lock()
+	delete(c.gitHubTokenProviders, registrationID)
+	c.gitHubTokenProvidersMux.Unlock()
+}
+
+func (c *Client) clearGitHubTokenProviders() {
+	c.gitHubTokenProvidersMux.Lock()
+	c.gitHubTokenProviders = make(map[string]GitHubTokenProvider)
+	c.gitHubTokenProvidersMux.Unlock()
+}
+
+func (c *Client) handleConnectionClose() {
+	c.clearGitHubTokenProviders()
+	// Avoid deadlocking with Stop/ForceStop, which hold startStopMux while
+	// waiting for the JSON-RPC read loop to finish.
+	go func() {
+		c.startStopMux.Lock()
+		defer c.startStopMux.Unlock()
+		c.state = stateDisconnected
+	}()
+}
+
+func (c *Client) lockSessionOperation(sessionID string) func() {
+	c.sessionOperationsMux.Lock()
+	if c.sessionOperations == nil {
+		c.sessionOperations = make(map[string]*sessionOperation)
+	}
+	operation := c.sessionOperations[sessionID]
+	if operation == nil {
+		operation = &sessionOperation{}
+		c.sessionOperations[sessionID] = operation
+	}
+	operation.users++
+	c.sessionOperationsMux.Unlock()
+
+	operation.mutex.Lock()
+	return func() {
+		operation.mutex.Unlock()
+		c.sessionOperationsMux.Lock()
+		operation.users--
+		if operation.users == 0 {
+			delete(c.sessionOperations, sessionID)
+		}
+		c.sessionOperationsMux.Unlock()
+	}
+}
+
+type gitHubTokenAdapter struct {
+	client *Client
+}
+
+func (a *gitHubTokenAdapter) GetToken(request *rpc.GitHubTokenAcquireRequest) (rpc.GitHubTokenAcquireResult, error) {
+	if request == nil {
+		return nil, fmt.Errorf("missing GitHub token acquire request")
+	}
+	a.client.gitHubTokenProvidersMux.RLock()
+	provider := a.client.gitHubTokenProviders[request.RegistrationID]
+	a.client.gitHubTokenProvidersMux.RUnlock()
+	if provider == nil {
+		return nil, fmt.Errorf("unknown GitHub token provider registration ID %q", request.RegistrationID)
+	}
+
+	result, err := provider(GitHubTokenProviderArgs{
+		Host:      request.Host,
+		SessionID: request.SessionID,
+		Reason:    request.Reason,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if result != nil && result.Cancelled {
+		return &rpc.GitHubTokenAcquireResultCancelled{}, nil
+	}
+	if result == nil || result.Token == nil {
+		return nil, fmt.Errorf("GitHub token provider returned neither a token nor cancellation")
+	}
+	return &rpc.GitHubTokenAcquireResultToken{
+		AccessToken: result.Token.AccessToken,
+		TokenType:   result.Token.TokenType,
+		ExpiresIn:   result.Token.ExpiresIn,
+	}, nil
+}
+
 // gitHubTelemetryAdapter adapts the OnGitHubTelemetry option to the generated
 // rpc.GitHubTelemetryHandler interface.
 type gitHubTelemetryAdapter struct {
diff --git a/go/client_test.go b/go/client_test.go
index 14131bc4ce..c6ab0808cb 100644
--- a/go/client_test.go
+++ b/go/client_test.go
@@ -139,6 +139,200 @@ func TestClient_URLParsing(t *testing.T) {
 	})
 }
 
+func TestClient_BuiltinPluginDirectories(t *testing.T) {
+	t.Run("default and empty do not call RPC", func(t *testing.T) {
+		for _, paths := range [][]string{nil, []string{}} {
+			t.Run(fmt.Sprintf("len=%d", len(paths)), func(t *testing.T) {
+				url, requests, cleanup := newStartupRPCServer(t)
+				defer cleanup()
+
+				client := NewClient(&ClientOptions{
+					Connection:               URIConnection{URL: url},
+					BuiltinPluginDirectories: paths,
+				})
+				if err := client.Start(t.Context()); err != nil {
+					t.Fatalf("Start failed: %v", err)
+				}
+				defer client.ForceStop()
+
+				if got := countMethod(requests(), "plugins.builtin.set"); got != 0 {
+					t.Fatalf("plugins.builtin.set call count = %d, want 0", got)
+				}
+			})
+		}
+	})
+
+	t.Run("configured paths call RPC once", func(t *testing.T) {
+		url, requests, cleanup := newStartupRPCServer(t)
+		defer cleanup()
+		cwd, err := os.Getwd()
+		if err != nil {
+			t.Fatalf("Getwd failed: %v", err)
+		}
+		paths := []string{
+			filepath.Join(cwd, "plugins", "core"),
+			filepath.Join(cwd, "plugins", "github"),
+		}
+
+		client := NewClient(&ClientOptions{
+			Connection:               URIConnection{URL: url},
+			BuiltinPluginDirectories: paths,
+		})
+		if err := client.Start(t.Context()); err != nil {
+			t.Fatalf("Start failed: %v", err)
+		}
+		defer client.ForceStop()
+
+		var calls []startupRPCRequest
+		for _, request := range requests() {
+			if request.Method == "plugins.builtin.set" {
+				calls = append(calls, request)
+			}
+		}
+		if len(calls) != 1 {
+			t.Fatalf("plugins.builtin.set call count = %d, want 1", len(calls))
+		}
+		var payload struct {
+			Paths []string `json:"paths"`
+		}
+		if err := json.Unmarshal(calls[0].Params, &payload); err != nil {
+			t.Fatalf("decode plugins.builtin.set params: %v", err)
+		}
+		if !reflect.DeepEqual(payload.Paths, paths) {
+			t.Fatalf("paths = %v, want %v", payload.Paths, paths)
+		}
+	})
+
+	t.Run("relative path panics", func(t *testing.T) {
+		defer func() {
+			if recovered := recover(); recovered == nil {
+				t.Fatal("expected NewClient to panic")
+			}
+		}()
+		NewClient(&ClientOptions{BuiltinPluginDirectories: []string{"plugins/core"}})
+	})
+
+	t.Run("startup RPC failure clears transport for reconnect", func(t *testing.T) {
+		url, _, cleanup := newStartupRPCServerWithBuiltinFailure(t, true)
+		defer cleanup()
+		cwd, err := os.Getwd()
+		if err != nil {
+			t.Fatalf("Getwd failed: %v", err)
+		}
+		client := NewClient(&ClientOptions{
+			Connection:               URIConnection{URL: url},
+			BuiltinPluginDirectories: []string{filepath.Join(cwd, "plugins", "core")},
+		})
+
+		if err := client.Start(t.Context()); err == nil {
+			t.Fatal("Start unexpectedly succeeded")
+		}
+		if client.client != nil {
+			t.Fatal("client transport was not cleared after startup RPC failure")
+		}
+		if client.conn != nil {
+			t.Fatal("connection was not cleared after startup RPC failure")
+		}
+		if client.RPC != nil {
+			t.Fatal("typed RPC client was not cleared after startup RPC failure")
+		}
+		if client.internalRPC != nil {
+			t.Fatal("internal RPC client was not cleared after startup RPC failure")
+		}
+
+		if err := client.Start(t.Context()); err != nil {
+			t.Fatalf("second Start failed: %v", err)
+		}
+		defer client.ForceStop()
+	})
+}
+
+type startupRPCRequest struct {
+	Method string
+	Params json.RawMessage
+}
+
+func newStartupRPCServer(t *testing.T) (string, func() []startupRPCRequest, func()) {
+	return newStartupRPCServerWithBuiltinFailure(t, false)
+}
+
+func newStartupRPCServerWithBuiltinFailure(t *testing.T, failFirstBuiltin bool) (string, func() []startupRPCRequest, func()) {
+	t.Helper()
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("listen: %v", err)
+	}
+
+	var mux sync.Mutex
+	var requests []startupRPCRequest
+	serverReady := make(chan *jsonrpc2.Client, 8)
+	var builtinSetCount int
+	go func() {
+		for {
+			conn, acceptErr := listener.Accept()
+			if acceptErr != nil {
+				return
+			}
+			server := jsonrpc2.NewClient(conn, conn)
+			record := func(method string, params json.RawMessage) {
+				mux.Lock()
+				requests = append(requests, startupRPCRequest{
+					Method: method,
+					Params: append(json.RawMessage(nil), params...),
+				})
+				mux.Unlock()
+			}
+			server.SetRequestHandler("connect", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+				record("connect", params)
+				return []byte(`{"ok":true,"protocolVersion":3,"version":"test"}`), nil
+			})
+			server.SetRequestHandler("plugins.builtin.set", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+				record("plugins.builtin.set", params)
+				mux.Lock()
+				builtinSetCount++
+				shouldFail := failFirstBuiltin && builtinSetCount == 1
+				mux.Unlock()
+				if shouldFail {
+					return nil, &jsonrpc2.Error{Code: -32000, Message: "builtin registration failed"}
+				}
+				return []byte(`{}`), nil
+			})
+			server.Start()
+			serverReady <- server
+		}
+	}()
+
+	snapshot := func() []startupRPCRequest {
+		mux.Lock()
+		defer mux.Unlock()
+		return append([]startupRPCRequest(nil), requests...)
+	}
+	cleanup := func() {
+		listener.Close()
+		for {
+			select {
+			case server := <-serverReady:
+				server.Stop()
+			case <-time.After(time.Second):
+				return
+			default:
+				return
+			}
+		}
+	}
+	return listener.Addr().String(), snapshot, cleanup
+}
+
+func countMethod(requests []startupRPCRequest, method string) int {
+	count := 0
+	for _, request := range requests {
+		if request.Method == method {
+			count++
+		}
+	}
+	return count
+}
+
 func TestClient_StopRequestsRuntimeShutdownForOwnedProcess(t *testing.T) {
 	rpcClient, server, shutdownCalled := newRuntimeShutdownRpcPair(t)
 	client := &Client{
@@ -398,14 +592,15 @@ func TestClient_ForwardsNewSessionOptionsToSessionRequests(t *testing.T) {
 	})
 
 	_, err := client.CreateSession(t.Context(), &SessionConfig{
-		ExcludedBuiltInAgents: []string{"explore"},
-		EnableCitations:       Bool(true),
-		SessionLimits:         &rpc.SessionLimitsConfig{MaxAiCredits: float64Ptr(30)},
+		ExcludedBuiltInAgents:    []string{"explore"},
+		EnableCitations:          Bool(true),
+		EnableFileChangeTracking: Bool(true),
+		SessionLimits:            &rpc.SessionLimitsConfig{MaxAiCredits: float64Ptr(30)},
 	})
 	if err != nil {
 		t.Fatalf("CreateSession failed: %v", err)
 	}
-	assertNewSessionOptions(t, <-createParams, true, "explore", 30)
+	assertNewSessionOptions(t, <-createParams, true, true, "explore", 30)
 
 	resumeParams := make(chan json.RawMessage, 1)
 	server.SetRequestHandler("session.resume", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
@@ -414,14 +609,15 @@ func TestClient_ForwardsNewSessionOptionsToSessionRequests(t *testing.T) {
 	})
 
 	_, err = client.ResumeSessionWithOptions(t.Context(), "resumed-options", &ResumeSessionConfig{
-		ExcludedBuiltInAgents: []string{"task"},
-		EnableCitations:       Bool(false),
-		SessionLimits:         &rpc.SessionLimitsConfig{MaxAiCredits: float64Ptr(15)},
+		ExcludedBuiltInAgents:    []string{"task"},
+		EnableCitations:          Bool(false),
+		EnableFileChangeTracking: Bool(false),
+		SessionLimits:            &rpc.SessionLimitsConfig{MaxAiCredits: float64Ptr(15)},
 	})
 	if err != nil {
 		t.Fatalf("ResumeSessionWithOptions failed: %v", err)
 	}
-	assertNewSessionOptions(t, <-resumeParams, false, "task", 15)
+	assertNewSessionOptions(t, <-resumeParams, false, false, "task", 15)
 }
 
 func assertCapiEnableWebSocketResponses(t *testing.T, params json.RawMessage) {
@@ -445,6 +641,7 @@ func assertNewSessionOptions(
 	t *testing.T,
 	params json.RawMessage,
 	expectedCitations bool,
+	expectedFileChangeTracking bool,
 	expectedAgent string,
 	expectedCredits float64,
 ) {
@@ -457,6 +654,9 @@ func assertNewSessionOptions(
 	if decoded["enableCitations"] != expectedCitations {
 		t.Fatalf("expected enableCitations=%v, got %v", expectedCitations, decoded["enableCitations"])
 	}
+	if decoded["enableFileChangeTracking"] != expectedFileChangeTracking {
+		t.Fatalf("expected enableFileChangeTracking=%v, got %v", expectedFileChangeTracking, decoded["enableFileChangeTracking"])
+	}
 	agents, ok := decoded["excludedBuiltinAgents"].([]any)
 	if !ok || len(agents) != 1 || agents[0] != expectedAgent {
 		t.Fatalf("expected excludedBuiltinAgents=[%q], got %#v", expectedAgent, decoded["excludedBuiltinAgents"])
@@ -1103,9 +1303,11 @@ func TestSessionRequests_PluginDirectoriesAndLargeOutput(t *testing.T) {
 		"outputDir":    "/tmp/large-output",
 	}
 	expectedPluginDirs := []any{"/tmp/plugins/a", "/tmp/plugins/b"}
+	expectedDisabledMCPServers := []any{"local-files", "remote-github"}
+	disabledMCPServers := []string{"local-files", "remote-github"}
 
 	t.Run("create includes pluginDirectories and largeOutput in JSON when set", func(t *testing.T) {
-		req := createSessionRequest{PluginDirectories: pluginDirs, LargeOutput: largeOutput}
+		req := createSessionRequest{PluginDirectories: pluginDirs, DisabledMCPServers: &disabledMCPServers, LargeOutput: largeOutput}
 		data, err := json.Marshal(req)
 		if err != nil {
 			t.Fatalf("Failed to marshal: %v", err)
@@ -1117,13 +1319,16 @@ func TestSessionRequests_PluginDirectoriesAndLargeOutput(t *testing.T) {
 		if !reflect.DeepEqual(m["pluginDirectories"], expectedPluginDirs) {
 			t.Errorf("Expected pluginDirectories %v, got %v", expectedPluginDirs, m["pluginDirectories"])
 		}
+		if !reflect.DeepEqual(m["disabledMcpServers"], expectedDisabledMCPServers) {
+			t.Errorf("Expected disabledMcpServers %v, got %v", expectedDisabledMCPServers, m["disabledMcpServers"])
+		}
 		if !reflect.DeepEqual(m["largeOutput"], expectedLargeOutput) {
 			t.Errorf("Expected largeOutput %v, got %v", expectedLargeOutput, m["largeOutput"])
 		}
 	})
 
 	t.Run("resume includes pluginDirectories and largeOutput in JSON when set", func(t *testing.T) {
-		req := resumeSessionRequest{SessionID: "s1", PluginDirectories: pluginDirs, LargeOutput: largeOutput}
+		req := resumeSessionRequest{SessionID: "s1", PluginDirectories: pluginDirs, DisabledMCPServers: &disabledMCPServers, LargeOutput: largeOutput}
 		data, err := json.Marshal(req)
 		if err != nil {
 			t.Fatalf("Failed to marshal: %v", err)
@@ -1135,11 +1340,36 @@ func TestSessionRequests_PluginDirectoriesAndLargeOutput(t *testing.T) {
 		if !reflect.DeepEqual(m["pluginDirectories"], expectedPluginDirs) {
 			t.Errorf("Expected pluginDirectories %v, got %v", expectedPluginDirs, m["pluginDirectories"])
 		}
+		if !reflect.DeepEqual(m["disabledMcpServers"], expectedDisabledMCPServers) {
+			t.Errorf("Expected disabledMcpServers %v, got %v", expectedDisabledMCPServers, m["disabledMcpServers"])
+		}
 		if !reflect.DeepEqual(m["largeOutput"], expectedLargeOutput) {
 			t.Errorf("Expected largeOutput %v, got %v", expectedLargeOutput, m["largeOutput"])
 		}
 	})
 
+	t.Run("create and resume include explicit empty disabledMcpServers", func(t *testing.T) {
+		emptyDisabledMCPServers := []string{}
+		requests := []any{
+			createSessionRequest{DisabledMCPServers: &emptyDisabledMCPServers},
+			resumeSessionRequest{SessionID: "s1", DisabledMCPServers: &emptyDisabledMCPServers},
+		}
+
+		for _, request := range requests {
+			data, err := json.Marshal(request)
+			if err != nil {
+				t.Fatalf("Failed to marshal: %v", err)
+			}
+			var m map[string]any
+			if err := json.Unmarshal(data, &m); err != nil {
+				t.Fatalf("Failed to unmarshal: %v", err)
+			}
+			if value, ok := m["disabledMcpServers"]; !ok || !reflect.DeepEqual(value, []any{}) {
+				t.Errorf("Expected explicit empty disabledMcpServers, got %v", value)
+			}
+		}
+	})
+
 	t.Run("create omits pluginDirectories and largeOutput when nil", func(t *testing.T) {
 		req := createSessionRequest{}
 		data, err := json.Marshal(req)
@@ -1153,10 +1383,28 @@ func TestSessionRequests_PluginDirectoriesAndLargeOutput(t *testing.T) {
 		if _, ok := m["pluginDirectories"]; ok {
 			t.Errorf("Expected pluginDirectories to be omitted")
 		}
+		if _, ok := m["disabledMcpServers"]; ok {
+			t.Error("Expected disabledMcpServers to be omitted")
+		}
 		if _, ok := m["largeOutput"]; ok {
 			t.Errorf("Expected largeOutput to be omitted")
 		}
 	})
+
+	t.Run("resume omits disabledMcpServers when nil", func(t *testing.T) {
+		req := resumeSessionRequest{SessionID: "s1"}
+		data, err := json.Marshal(req)
+		if err != nil {
+			t.Fatalf("Failed to marshal: %v", err)
+		}
+		var m map[string]any
+		if err := json.Unmarshal(data, &m); err != nil {
+			t.Fatalf("Failed to unmarshal: %v", err)
+		}
+		if _, ok := m["disabledMcpServers"]; ok {
+			t.Error("Expected disabledMcpServers to be omitted")
+		}
+	})
 }
 
 func TestSessionRequests_Memory(t *testing.T) {
@@ -1891,6 +2139,175 @@ func TestClient_MCPAuthInterestRegistration(t *testing.T) {
 	})
 }
 
+func findRequest(requests []recordedRequest, method string) (recordedRequest, bool) {
+	for _, r := range requests {
+		if r.Method == method {
+			return r, true
+		}
+	}
+	return recordedRequest{}, false
+}
+
+func TestClient_EmptyModeIncludedBuiltinSkills(t *testing.T) {
+	t.Run("create post-patch sends empty includedBuiltinSkills", func(t *testing.T) {
+		client, requests, cleanup := newInMemoryClientWithOptions(t, &ClientOptions{
+			Mode:          ModeEmpty,
+			BaseDirectory: "/tmp/copilot-test",
+		})
+		defer cleanup()
+
+		session, err := client.CreateSession(t.Context(), &SessionConfig{
+			OnPermissionRequest: PermissionHandler.ApproveAll,
+			OnEvent:             func(SessionEvent) {},
+			AvailableTools:      []string{},
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		defer session.Disconnect()
+
+		update, ok := findRequest(requests.snapshot(), "session.options.update")
+		if !ok {
+			t.Fatalf("expected session.options.update in %+v", requests.snapshot())
+		}
+		skills, present := update.Params["includedBuiltinSkills"]
+		if !present {
+			t.Fatalf("expected includedBuiltinSkills in patch, got %+v", update.Params)
+		}
+		if arr, isArr := skills.([]any); !isArr || len(arr) != 0 {
+			t.Fatalf("expected includedBuiltinSkills=[], got %#v", skills)
+		}
+	})
+
+	t.Run("resume post-patch sends empty includedBuiltinSkills", func(t *testing.T) {
+		client, requests, cleanup := newInMemoryClientWithOptions(t, &ClientOptions{
+			Mode:          ModeEmpty,
+			BaseDirectory: "/tmp/copilot-test",
+		})
+		defer cleanup()
+
+		session, err := client.ResumeSession(t.Context(), "session-empty", &ResumeSessionConfig{
+			OnPermissionRequest: PermissionHandler.ApproveAll,
+			OnEvent:             func(SessionEvent) {},
+			AvailableTools:      []string{},
+		})
+		if err != nil {
+			t.Fatalf("ResumeSession failed: %v", err)
+		}
+		defer session.Disconnect()
+
+		update, ok := findRequest(requests.snapshot(), "session.options.update")
+		if !ok {
+			t.Fatalf("expected session.options.update in %+v", requests.snapshot())
+		}
+		if arr, isArr := update.Params["includedBuiltinSkills"].([]any); !isArr || len(arr) != 0 {
+			t.Fatalf("expected includedBuiltinSkills=[], got %#v", update.Params["includedBuiltinSkills"])
+		}
+	})
+
+	t.Run("resume preserves explicit built-in skill allowlist", func(t *testing.T) {
+		client, requests, cleanup := newInMemoryClientWithOptions(t, &ClientOptions{
+			Mode:          ModeEmpty,
+			BaseDirectory: "/tmp/copilot-test",
+		})
+		defer cleanup()
+
+		session, err := client.ResumeSessionWithOptions(t.Context(), "resume-skills", &ResumeSessionConfig{
+			OnPermissionRequest:   PermissionHandler.ApproveAll,
+			AvailableTools:        []string{},
+			IncludedBuiltinSkills: []string{"code-review"},
+		})
+		if err != nil {
+			t.Fatalf("ResumeSessionWithOptions failed: %v", err)
+		}
+		defer session.Disconnect()
+
+		update, ok := findRequest(requests.snapshot(), "session.options.update")
+		if !ok {
+			t.Fatalf("expected session.options.update in %+v", requests.snapshot())
+		}
+		skills, ok := update.Params["includedBuiltinSkills"].([]any)
+		if !ok || len(skills) != 1 || skills[0] != "code-review" {
+			t.Fatalf("expected includedBuiltinSkills=[code-review], got %#v", update.Params["includedBuiltinSkills"])
+		}
+	})
+
+	t.Run("caller opting into custom skills keeps includedBuiltinSkills empty", func(t *testing.T) {
+		client, requests, cleanup := newInMemoryClientWithOptions(t, &ClientOptions{
+			Mode:          ModeEmpty,
+			BaseDirectory: "/tmp/copilot-test",
+		})
+		defer cleanup()
+
+		session, err := client.CreateSession(t.Context(), &SessionConfig{
+			OnPermissionRequest: PermissionHandler.ApproveAll,
+			OnEvent:             func(SessionEvent) {},
+			AvailableTools:      []string{},
+			EnableSkills:        Bool(true),
+			SkillDirectories:    []string{"/tmp/custom-skills"},
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		defer session.Disconnect()
+
+		update, ok := findRequest(requests.snapshot(), "session.options.update")
+		if !ok {
+			t.Fatalf("expected session.options.update in %+v", requests.snapshot())
+		}
+		if arr, isArr := update.Params["includedBuiltinSkills"].([]any); !isArr || len(arr) != 0 {
+			t.Fatalf("expected includedBuiltinSkills=[], got %#v", update.Params["includedBuiltinSkills"])
+		}
+	})
+
+	t.Run("explicit built-in skill allowlist is preserved in empty mode", func(t *testing.T) {
+		client, requests, cleanup := newInMemoryClientWithOptions(t, &ClientOptions{
+			Mode:          ModeEmpty,
+			BaseDirectory: "/tmp/copilot-test",
+		})
+		defer cleanup()
+
+		session, err := client.CreateSession(t.Context(), &SessionConfig{
+			OnPermissionRequest:   PermissionHandler.ApproveAll,
+			AvailableTools:        []string{},
+			IncludedBuiltinSkills: []string{"code-review"},
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		defer session.Disconnect()
+
+		update, ok := findRequest(requests.snapshot(), "session.options.update")
+		if !ok {
+			t.Fatalf("expected session.options.update in %+v", requests.snapshot())
+		}
+		skills, ok := update.Params["includedBuiltinSkills"].([]any)
+		if !ok || len(skills) != 1 || skills[0] != "code-review" {
+			t.Fatalf("expected includedBuiltinSkills=[code-review], got %#v", update.Params["includedBuiltinSkills"])
+		}
+	})
+
+	t.Run("copilot-cli mode does not inject includedBuiltinSkills", func(t *testing.T) {
+		client, requests, cleanup := newInMemoryClient(t)
+		defer cleanup()
+
+		session, err := client.CreateSession(t.Context(), &SessionConfig{
+			OnPermissionRequest: PermissionHandler.ApproveAll,
+			OnEvent:             func(SessionEvent) {},
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		defer session.Disconnect()
+
+		for _, r := range requests.snapshot() {
+			if _, present := r.Params["includedBuiltinSkills"]; present {
+				t.Fatalf("did not expect includedBuiltinSkills in %s params %+v", r.Method, r.Params)
+			}
+		}
+	})
+}
+
 type recordedRequest struct {
 	Method string
 	Params map[string]any
@@ -1923,13 +2340,18 @@ func (r *requestRecorder) clear() {
 
 func newInMemoryClient(t *testing.T) (*Client, *requestRecorder, func()) {
 	t.Helper()
+	return newInMemoryClientWithOptions(t, &ClientOptions{})
+}
+
+func newInMemoryClientWithOptions(t *testing.T, opts *ClientOptions) (*Client, *requestRecorder, func()) {
+	t.Helper()
 
 	stdinR, stdinW := io.Pipe()
 	stdoutR, stdoutW := io.Pipe()
 	rpcClient := jsonrpc2.NewClient(stdinW, stdoutR)
 	rpcClient.Start()
 
-	client := NewClient(&ClientOptions{})
+	client := NewClient(opts)
 	client.client = rpcClient
 	client.RPC = rpc.NewServerRPC(rpcClient)
 	client.state = stateConnected
@@ -2228,7 +2650,7 @@ func TestResumeSessionRequest_Commands(t *testing.T) {
 		req := resumeSessionRequest{
 			SessionID: "s1",
 			Commands: []wireCommand{
-				{Name: "deploy", Description: "Deploy the app"},
+				{Name: "deploy"},
 			},
 		}
 		data, err := json.Marshal(req)
@@ -2250,6 +2672,9 @@ func TestResumeSessionRequest_Commands(t *testing.T) {
 		if cmd0["name"] != "deploy" {
 			t.Errorf("Expected command name 'deploy', got %v", cmd0["name"])
 		}
+		if description, ok := cmd0["description"]; !ok || description != "" {
+			t.Errorf("Expected empty command description, got %v", description)
+		}
 	})
 
 	t.Run("omits commands from JSON when empty", func(t *testing.T) {
@@ -3478,3 +3903,219 @@ func TestResumeSessionRequest_ExpAssignments(t *testing.T) {
 		}
 	})
 }
+
+func TestIsTerminal(t *testing.T) {
+	t.Run("IsTerminal is serialized in tool definition", func(t *testing.T) {
+		tool := Tool{
+			Name:        "clear_context",
+			Description: "Clear the conversation",
+			IsTerminal:  true,
+			Handler:     func(_ ToolInvocation) (ToolResult, error) { return ToolResult{}, nil },
+		}
+		data, err := json.Marshal(tool)
+		if err != nil {
+			t.Fatalf("Failed to marshal: %v", err)
+		}
+		var m map[string]any
+		if err := json.Unmarshal(data, &m); err != nil {
+			t.Fatalf("Failed to unmarshal: %v", err)
+		}
+		if m["isTerminal"] != true {
+			t.Errorf("Expected isTerminal to be true, got %v", m["isTerminal"])
+		}
+	})
+
+	t.Run("IsTerminal is omitted when false", func(t *testing.T) {
+		tool := Tool{Name: "plain", Description: "A plain tool"}
+		data, err := json.Marshal(tool)
+		if err != nil {
+			t.Fatalf("Failed to marshal: %v", err)
+		}
+		var m map[string]any
+		if err := json.Unmarshal(data, &m); err != nil {
+			t.Fatalf("Failed to unmarshal: %v", err)
+		}
+		if _, ok := m["isTerminal"]; ok {
+			t.Error("Expected isTerminal to be omitted when false")
+		}
+	})
+}
+
+func TestSessionRequests_ManagedSettings(t *testing.T) {
+	settings := &ManagedSettings{
+		Permissions: &ManagedSettingsPermissions{
+			DisableBypassPermissionsMode: DisableBypassPermissionsModeDisable,
+			Deny:                         []string{"Shell(git push)"},
+			Ask:                          []string{"Domain(publish.example)"},
+			Allow:                        []string{"Read(**)"},
+		},
+	}
+
+	expectedPermissions := map[string]any{
+		"disableBypassPermissionsMode": "disable",
+		"deny":                         []any{"Shell(git push)"},
+		"ask":                          []any{"Domain(publish.example)"},
+		"allow":                        []any{"Read(**)"},
+	}
+
+	t.Run("direct injection enables managed safeguards", func(t *testing.T) {
+		if !hasManagedSettings(nil, settings) {
+			t.Fatal("expected injected managed settings to enable managed safeguards")
+		}
+		if hasManagedSettings(nil, nil) {
+			t.Fatal("expected an ordinary session to remain unmanaged")
+		}
+	})
+
+	t.Run("includes managedSettings on create when set", func(t *testing.T) {
+		req := createSessionRequest{EnableManagedSettings: Bool(true), ManagedSettings: settings}
+		data, err := json.Marshal(req)
+		if err != nil {
+			t.Fatalf("Failed to marshal: %v", err)
+		}
+		var m map[string]any
+		if err := json.Unmarshal(data, &m); err != nil {
+			t.Fatalf("Failed to unmarshal: %v", err)
+		}
+		if m["enableManagedSettings"] != true {
+			t.Errorf("Expected enableManagedSettings true, got %v", m["enableManagedSettings"])
+		}
+		ms, ok := m["managedSettings"].(map[string]any)
+		if !ok {
+			t.Fatalf("Expected managedSettings object, got %v", m["managedSettings"])
+		}
+		perms, ok := ms["permissions"].(map[string]any)
+		if !ok {
+			t.Fatalf("Expected permissions object, got %v", ms["permissions"])
+		}
+		if !reflect.DeepEqual(perms, expectedPermissions) {
+			t.Errorf("permissions mismatch:\n got: %#v\nwant: %#v", perms, expectedPermissions)
+		}
+	})
+
+	t.Run("includes managedSettings on resume when set", func(t *testing.T) {
+		req := resumeSessionRequest{SessionID: "s1", ManagedSettings: settings}
+		data, err := json.Marshal(req)
+		if err != nil {
+			t.Fatalf("Failed to marshal: %v", err)
+		}
+		var m map[string]any
+		if err := json.Unmarshal(data, &m); err != nil {
+			t.Fatalf("Failed to unmarshal: %v", err)
+		}
+		if _, ok := m["managedSettings"].(map[string]any); !ok {
+			t.Fatalf("Expected managedSettings object, got %v", m["managedSettings"])
+		}
+	})
+
+	t.Run("accepts future bypass-permissions modes", func(t *testing.T) {
+		req := createSessionRequest{ManagedSettings: &ManagedSettings{
+			Permissions: &ManagedSettingsPermissions{
+				DisableBypassPermissionsMode: DisableBypassPermissionsMode("future-fail-closed-mode"),
+			},
+		}}
+		data, err := json.Marshal(req)
+		if err != nil {
+			t.Fatalf("Failed to marshal: %v", err)
+		}
+		var m map[string]any
+		if err := json.Unmarshal(data, &m); err != nil {
+			t.Fatalf("Failed to unmarshal: %v", err)
+		}
+		perms := m["managedSettings"].(map[string]any)["permissions"].(map[string]any)
+		if perms["disableBypassPermissionsMode"] != "future-fail-closed-mode" {
+			t.Errorf("Expected future mode preserved, got %v", perms["disableBypassPermissionsMode"])
+		}
+	})
+
+	t.Run("omits managedSettings when nil", func(t *testing.T) {
+		req := createSessionRequest{}
+		data, _ := json.Marshal(req)
+		var m map[string]any
+		json.Unmarshal(data, &m)
+		if _, ok := m["managedSettings"]; ok {
+			t.Error("Expected managedSettings to be omitted when nil")
+		}
+	})
+
+	t.Run("preserves explicit empty permission arrays", func(t *testing.T) {
+		// A non-nil empty allow list is restrictive: it admits no operations.
+		// Preserve field presence while still omitting nil slices.
+		req := createSessionRequest{ManagedSettings: &ManagedSettings{
+			Permissions: &ManagedSettingsPermissions{
+				DisableBypassPermissionsMode: DisableBypassPermissionsModeDisable,
+				Deny:                         []string{},
+				Ask:                          []string{},
+				Allow:                        []string{},
+			},
+		}}
+		data, err := json.Marshal(req)
+		if err != nil {
+			t.Fatalf("Failed to marshal: %v", err)
+		}
+		var m map[string]any
+		json.Unmarshal(data, &m)
+		perms := m["managedSettings"].(map[string]any)["permissions"].(map[string]any)
+		if perms["disableBypassPermissionsMode"] != "disable" {
+			t.Errorf("Expected disableBypassPermissionsMode preserved, got %v", perms["disableBypassPermissionsMode"])
+		}
+		for _, key := range []string{"deny", "ask", "allow"} {
+			if value, ok := perms[key].([]any); !ok || len(value) != 0 {
+				t.Errorf("Expected %s to be an explicit empty array, got %v", key, perms[key])
+			}
+		}
+	})
+
+	t.Run("distinguishes explicit empty allow from an absent allow", func(t *testing.T) {
+		// Security-critical: a present empty allow list admits nothing, while an
+		// absent allow list imposes no allow restriction. The wire output must
+		// tell these apart per-field, so an explicit empty slice serializes as
+		// `[]` while a nil slice is omitted entirely.
+		req := createSessionRequest{ManagedSettings: &ManagedSettings{
+			Permissions: &ManagedSettingsPermissions{
+				Allow: []string{}, // present but empty: admit nothing
+				// Deny and Ask left nil: no such restriction supplied.
+			},
+		}}
+		data, err := json.Marshal(req)
+		if err != nil {
+			t.Fatalf("Failed to marshal: %v", err)
+		}
+		var m map[string]any
+		json.Unmarshal(data, &m)
+		perms := m["managedSettings"].(map[string]any)["permissions"].(map[string]any)
+
+		allow, ok := perms["allow"].([]any)
+		if !ok || len(allow) != 0 {
+			t.Errorf("Expected allow to be an explicit empty array, got %v", perms["allow"])
+		}
+		if _, present := perms["deny"]; present {
+			t.Errorf("Expected deny to be omitted when nil, got %v", perms["deny"])
+		}
+		if _, present := perms["ask"]; present {
+			t.Errorf("Expected ask to be omitted when nil, got %v", perms["ask"])
+		}
+	})
+
+	t.Run("distinguishes explicit empty arrays on resume", func(t *testing.T) {
+		req := resumeSessionRequest{SessionID: "s1", ManagedSettings: &ManagedSettings{
+			Permissions: &ManagedSettingsPermissions{
+				Deny:  []string{},
+				Ask:   []string{},
+				Allow: []string{},
+			},
+		}}
+		data, err := json.Marshal(req)
+		if err != nil {
+			t.Fatalf("Failed to marshal: %v", err)
+		}
+		var m map[string]any
+		json.Unmarshal(data, &m)
+		perms := m["managedSettings"].(map[string]any)["permissions"].(map[string]any)
+		for _, key := range []string{"deny", "ask", "allow"} {
+			if value, ok := perms[key].([]any); !ok || len(value) != 0 {
+				t.Errorf("Expected %s to be an explicit empty array on resume, got %v", key, perms[key])
+			}
+		}
+	})
+}
diff --git a/go/github_token_provider.go b/go/github_token_provider.go
new file mode 100644
index 0000000000..8f1233b7cd
--- /dev/null
+++ b/go/github_token_provider.go
@@ -0,0 +1,84 @@
+package copilot
+
+import (
+	"fmt"
+
+	"github.com/github/copilot-sdk/go/rpc"
+)
+
+// GitHubTokenRequestReason describes why the runtime needs a GitHub token.
+//
+// Experimental: GitHubTokenRequestReason may change or be removed.
+type GitHubTokenRequestReason = rpc.GitHubTokenAcquireReason
+
+const (
+	// GitHubTokenRequestReasonInitial indicates the session needs its initial token.
+	GitHubTokenRequestReasonInitial = rpc.GitHubTokenAcquireReasonInitial
+	// GitHubTokenRequestReasonRefresh indicates the session needs a refreshed token.
+	GitHubTokenRequestReasonRefresh = rpc.GitHubTokenAcquireReasonRefresh
+)
+
+// GitHubTokenProviderArgs contains the context for a GitHub token request.
+//
+// Experimental: GitHubTokenProviderArgs may change or be removed.
+type GitHubTokenProviderArgs struct {
+	// Host is the effective GitHub host for which a token is needed.
+	Host string
+	// SessionID identifies the session receiving the token. It is nil before a
+	// cloud session has been assigned an ID.
+	SessionID *string
+	// Reason indicates whether this is the initial token or a refresh.
+	Reason GitHubTokenRequestReason
+}
+
+// GitHubToken contains a GitHub access token returned by a provider.
+//
+// Experimental: GitHubToken may change or be removed.
+type GitHubToken struct {
+	// AccessToken is the GitHub access token.
+	AccessToken string
+	// TokenType is the OAuth token type. The runtime defaults it to "bearer".
+	TokenType *string
+	// ExpiresIn is the required positive number of seconds remaining when the
+	// callback completes. Production GitHub tokens typically last eight hours.
+	ExpiresIn int64
+}
+
+// String returns a redacted description that never includes the access token.
+func (t GitHubToken) String() string {
+	tokenType := ""
+	if t.TokenType != nil {
+		tokenType = *t.TokenType
+	}
+	return fmt.Sprintf("GitHubToken{TokenType:%q, ExpiresIn:%d, AccessToken:<redacted>}", tokenType, t.ExpiresIn)
+}
+
+// GoString returns a redacted Go-syntax description that never includes the access token.
+func (t GitHubToken) GoString() string {
+	return t.String()
+}
+
+// GitHubTokenProviderResult is the result of a GitHub token request.
+//
+// Experimental: GitHubTokenProviderResult may change or be removed.
+type GitHubTokenProviderResult struct {
+	Cancelled bool
+	Token     *GitHubToken
+}
+
+// GitHubTokenResult returns a successful token-provider result.
+func GitHubTokenResult(token *GitHubToken) *GitHubTokenProviderResult {
+	return &GitHubTokenProviderResult{Token: token}
+}
+
+// GitHubTokenCancelled returns a result indicating that token acquisition was cancelled.
+func GitHubTokenCancelled() *GitHubTokenProviderResult {
+	return &GitHubTokenProviderResult{Cancelled: true}
+}
+
+// GitHubTokenProvider acquires session-scoped GitHub tokens on demand. Initial
+// cancellation, errors, and invalid token responses reject session creation or
+// resume instead of falling back to ambient authentication.
+//
+// Experimental: GitHubTokenProvider may change or be removed.
+type GitHubTokenProvider func(args GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error)
diff --git a/go/github_token_provider_test.go b/go/github_token_provider_test.go
new file mode 100644
index 0000000000..f00837379f
--- /dev/null
+++ b/go/github_token_provider_test.go
@@ -0,0 +1,344 @@
+package copilot
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/github/copilot-sdk/go/internal/jsonrpc2"
+	"github.com/github/copilot-sdk/go/rpc"
+)
+
+func TestGitHubTokenProviderConfigValidation(t *testing.T) {
+	provider := func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+		return GitHubTokenCancelled(), nil
+	}
+
+	if _, err := NewClient(nil).CreateSession(t.Context(), &SessionConfig{
+		GitHubToken:         "static",
+		GitHubTokenProvider: provider,
+	}); err == nil || !strings.Contains(err.Error(), "cannot be used together") {
+		t.Fatalf("CreateSession error = %v", err)
+	}
+	if _, err := NewClient(nil).ResumeSession(t.Context(), "session", &ResumeSessionConfig{
+		GitHubToken:         "static",
+		GitHubTokenProvider: provider,
+	}); err == nil || !strings.Contains(err.Error(), "cannot be used together") {
+		t.Fatalf("ResumeSession error = %v", err)
+	}
+}
+
+func TestGitHubTokenProviderCreateRequestAndCallback(t *testing.T) {
+	rpcClient, server, _ := newRuntimeShutdownRpcPair(t)
+	t.Cleanup(server.Stop)
+	client := &Client{
+		client:   rpcClient,
+		RPC:      rpc.NewServerRPC(rpcClient),
+		sessions: make(map[string]*Session),
+	}
+	client.setupNotificationHandler()
+
+	var createParams json.RawMessage
+	server.SetRequestHandler("session.create", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		createParams = append(json.RawMessage(nil), params...)
+		sessionID := sessionIDFromParams(t, params)
+		return []byte(`{"sessionId":"` + sessionID + `","workspacePath":"/workspace"}`), nil
+	})
+	server.SetRequestHandler("session.destroy", func(json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		return []byte(`{}`), nil
+	})
+
+	var gotArgs GitHubTokenProviderArgs
+	session, err := client.CreateSession(t.Context(), &SessionConfig{
+		GitHubTokenProvider: func(args GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+			gotArgs = args
+			return GitHubTokenResult(&GitHubToken{
+				AccessToken: "secret-token",
+				TokenType:   String("bearer"),
+				ExpiresIn:   8 * 60 * 60,
+			}), nil
+		},
+	})
+	if err != nil {
+		t.Fatalf("CreateSession failed: %v", err)
+	}
+
+	var wire struct {
+		RegistrationID string `json:"gitHubTokenProviderRegistrationId"`
+		GitHubToken    string `json:"gitHubToken"`
+	}
+	if err := json.Unmarshal(createParams, &wire); err != nil {
+		t.Fatal(err)
+	}
+	if wire.RegistrationID == "" {
+		t.Fatal("gitHubTokenProviderRegistrationId was not serialized")
+	}
+	if wire.GitHubToken != "" {
+		t.Fatal("static gitHubToken should not be serialized")
+	}
+
+	sessionID := session.SessionID
+	raw, rpcErr := server.Request(t.Context(), "gitHubToken.getToken", &rpc.GitHubTokenAcquireRequest{
+		RegistrationID: wire.RegistrationID,
+		Host:           "github.example.com",
+		SessionID:      &sessionID,
+		Reason:         rpc.GitHubTokenAcquireReasonRefresh,
+	})
+	if rpcErr != nil {
+		t.Fatalf("getToken failed: %v", rpcErr)
+	}
+	var tokenResult struct {
+		Kind        string `json:"kind"`
+		AccessToken string `json:"accessToken"`
+		ExpiresIn   int64  `json:"expiresIn"`
+	}
+	if err := json.Unmarshal(raw, &tokenResult); err != nil {
+		t.Fatal(err)
+	}
+	if tokenResult.Kind != "token" || tokenResult.AccessToken != "secret-token" || tokenResult.ExpiresIn != 8*60*60 {
+		t.Fatalf("unexpected token result: %+v", tokenResult)
+	}
+	if gotArgs.Host != "github.example.com" || gotArgs.SessionID == nil ||
+		*gotArgs.SessionID != sessionID || gotArgs.Reason != GitHubTokenRequestReasonRefresh {
+		t.Fatalf("unexpected callback args: %+v", gotArgs)
+	}
+
+	if err := session.Disconnect(); err != nil {
+		t.Fatal(err)
+	}
+	if len(client.gitHubTokenProviders) != 0 {
+		t.Fatal("provider registration was not removed on disconnect")
+	}
+	if _, rpcErr := server.Request(t.Context(), "gitHubToken.getToken", &rpc.GitHubTokenAcquireRequest{
+		RegistrationID: wire.RegistrationID,
+		Host:           "github.com",
+		Reason:         rpc.GitHubTokenAcquireReasonInitial,
+	}); rpcErr == nil {
+		t.Fatal("unknown registration ID should return a handler error")
+	}
+
+	var resumeParams json.RawMessage
+	server.SetRequestHandler("session.resume", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		resumeParams = append(json.RawMessage(nil), params...)
+		return []byte(`{"sessionId":"resumed-session","workspacePath":"/workspace"}`), nil
+	})
+	resumed, err := client.ResumeSession(t.Context(), "resumed-session", &ResumeSessionConfig{
+		GitHubTokenProvider: func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+			return GitHubTokenCancelled(), nil
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := json.Unmarshal(resumeParams, &wire); err != nil {
+		t.Fatal(err)
+	}
+	if wire.RegistrationID == "" {
+		t.Fatal("resume did not serialize gitHubTokenProviderRegistrationId")
+	}
+	if err := resumed.Disconnect(); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestGitHubTokenProviderResultsErrorsAndRollback(t *testing.T) {
+	client := &Client{}
+	adapter := &gitHubTokenAdapter{client: client}
+
+	cancelID := client.registerGitHubTokenProvider(func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+		return GitHubTokenCancelled(), nil
+	})
+	result, err := adapter.GetToken(&rpc.GitHubTokenAcquireRequest{RegistrationID: cancelID})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, ok := result.(*rpc.GitHubTokenAcquireResultCancelled); !ok {
+		t.Fatalf("result type = %T", result)
+	}
+
+	sentinel := errors.New("provider failed")
+	errorID := client.registerGitHubTokenProvider(func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+		return nil, sentinel
+	})
+	if _, err := adapter.GetToken(&rpc.GitHubTokenAcquireRequest{RegistrationID: errorID}); !errors.Is(err, sentinel) {
+		t.Fatalf("provider error = %v", err)
+	}
+
+	rpcClient, server, _ := newRuntimeShutdownRpcPair(t)
+	t.Cleanup(server.Stop)
+	rollbackClient := &Client{
+		client:   rpcClient,
+		RPC:      rpc.NewServerRPC(rpcClient),
+		sessions: make(map[string]*Session),
+	}
+	server.SetRequestHandler("session.create", func(json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		return nil, &jsonrpc2.Error{Code: -32000, Message: "create failed"}
+	})
+	if _, err := rollbackClient.CreateSession(t.Context(), &SessionConfig{
+		GitHubTokenProvider: func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+			return GitHubTokenCancelled(), nil
+		},
+	}); err == nil {
+		t.Fatal("expected create failure")
+	}
+	if len(rollbackClient.gitHubTokenProviders) != 0 {
+		t.Fatal("provider registration was not rolled back")
+	}
+}
+
+func TestGitHubTokenStringRedactsAccessToken(t *testing.T) {
+	token := GitHubToken{AccessToken: "secret-token", ExpiresIn: 28_800}
+
+	if got := fmt.Sprintf("%v %#v", token, token); strings.Contains(got, token.AccessToken) {
+		t.Fatalf("GitHubToken formatting exposed the access token: %s", got)
+	}
+}
+
+func TestGitHubTokenProviderCleanupOnDisconnectError(t *testing.T) {
+	rpcClient, server, _ := newRuntimeShutdownRpcPair(t)
+	t.Cleanup(server.Stop)
+	server.SetRequestHandler("session.destroy", func(json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		return nil, &jsonrpc2.Error{Code: -32000, Message: "destroy failed"}
+	})
+	client := &Client{}
+	registrationID := client.registerGitHubTokenProvider(func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+		return GitHubTokenCancelled(), nil
+	})
+	session := newSession("cleanup-session", rpcClient, "", false)
+	session.setGitHubTokenProviderRegistrationRelease(func() {
+		client.unregisterGitHubTokenProvider(registrationID)
+	})
+
+	if err := session.Disconnect(); err == nil || !strings.Contains(err.Error(), "destroy failed") {
+		t.Fatalf("Disconnect error = %v", err)
+	}
+	if len(client.gitHubTokenProviders) != 0 {
+		t.Fatal("provider registration was not removed after disconnect failed")
+	}
+}
+
+func TestGitHubTokenProviderReleaseBeforeOwnershipTransfer(t *testing.T) {
+	client := &Client{}
+	registrationID := client.registerGitHubTokenProvider(func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+		return GitHubTokenCancelled(), nil
+	})
+	session := &Session{}
+
+	session.releaseGitHubTokenProviderRegistration()
+	session.setGitHubTokenProviderRegistrationRelease(func() {
+		client.unregisterGitHubTokenProvider(registrationID)
+	})
+
+	if len(client.gitHubTokenProviders) != 0 {
+		t.Fatal("provider registration was not removed after a pending session had already been retired")
+	}
+}
+
+func TestGitHubTokenProviderCleanupOnDelete(t *testing.T) {
+	rpcClient, server, _ := newRuntimeShutdownRpcPair(t)
+	t.Cleanup(server.Stop)
+	server.SetRequestHandler("session.delete", func(json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		return []byte(`{"success":true}`), nil
+	})
+	client := &Client{
+		client:   rpcClient,
+		sessions: make(map[string]*Session),
+		state:    stateConnected,
+	}
+	registrationID := client.registerGitHubTokenProvider(func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+		return GitHubTokenCancelled(), nil
+	})
+	session := newSession("delete-session", rpcClient, "", false)
+	session.setGitHubTokenProviderRegistrationRelease(func() {
+		client.unregisterGitHubTokenProvider(registrationID)
+	})
+	client.sessions[session.SessionID] = session
+
+	if err := client.DeleteSession(t.Context(), session.SessionID); err != nil {
+		t.Fatal(err)
+	}
+	if len(client.gitHubTokenProviders) != 0 {
+		t.Fatal("provider registration was not removed after session deletion")
+	}
+}
+
+func TestSessionOperationsSerializeBySessionID(t *testing.T) {
+	client := &Client{}
+	unlockFirst := client.lockSessionOperation("same-session")
+	sameSessionAcquired := make(chan struct{})
+	go func() {
+		unlock := client.lockSessionOperation("same-session")
+		close(sameSessionAcquired)
+		unlock()
+	}()
+
+	select {
+	case <-sameSessionAcquired:
+		t.Fatal("same-session operation was not serialized")
+	case <-time.After(25 * time.Millisecond):
+	}
+
+	otherSessionAcquired := make(chan struct{})
+	go func() {
+		unlock := client.lockSessionOperation("other-session")
+		close(otherSessionAcquired)
+		unlock()
+	}()
+	select {
+	case <-otherSessionAcquired:
+	case <-time.After(time.Second):
+		t.Fatal("different-session operation was unnecessarily blocked")
+	}
+
+	unlockFirst()
+	select {
+	case <-sameSessionAcquired:
+	case <-time.After(time.Second):
+		t.Fatal("same-session operation did not proceed after release")
+	}
+}
+
+func TestGitHubTokenProvidersClearedOnConnectionClose(t *testing.T) {
+	client := &Client{state: stateConnected}
+	client.registerGitHubTokenProvider(func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+		return GitHubTokenCancelled(), nil
+	})
+
+	client.handleConnectionClose()
+
+	if len(client.gitHubTokenProviders) != 0 {
+		t.Fatal("provider registrations were not cleared after connection closure")
+	}
+}
+
+func TestGitHubTokenProviderConcurrentRegistrationsAreIsolated(t *testing.T) {
+	client := &Client{}
+	adapter := &gitHubTokenAdapter{client: client}
+	idA := client.registerGitHubTokenProvider(func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+		return GitHubTokenResult(&GitHubToken{AccessToken: "a", ExpiresIn: 1}), nil
+	})
+	idB := client.registerGitHubTokenProvider(func(GitHubTokenProviderArgs) (*GitHubTokenProviderResult, error) {
+		return GitHubTokenResult(&GitHubToken{AccessToken: "b", ExpiresIn: 1}), nil
+	})
+
+	var wg sync.WaitGroup
+	for id, want := range map[string]string{idA: "a", idB: "b"} {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			result, err := adapter.GetToken(&rpc.GitHubTokenAcquireRequest{RegistrationID: id})
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			if got := result.(*rpc.GitHubTokenAcquireResultToken).AccessToken; got != want {
+				t.Errorf("token = %q, want %q", got, want)
+			}
+		}()
+	}
+	wg.Wait()
+}
diff --git a/go/inprocess_disabled.go b/go/inprocess_disabled.go
index b86ed5ca36..d0626a74d3 100644
--- a/go/inprocess_disabled.go
+++ b/go/inprocess_disabled.go
@@ -6,6 +6,8 @@ import "errors"
 
 const inProcessAvailable = false
 
+var errInProcessUnavailable = errors.New("in-process transport unavailable")
+
 func createInProcessHost(string, inProcessHostConfig) (inProcessHost, error) {
-	return nil, errors.New("in-process transport unavailable")
+	return nil, errInProcessUnavailable
 }
diff --git a/go/internal/e2e/abort_e2e_test.go b/go/internal/e2e/abort_e2e_test.go
index 0953456888..569518bca7 100644
--- a/go/internal/e2e/abort_e2e_test.go
+++ b/go/internal/e2e/abort_e2e_test.go
@@ -32,6 +32,7 @@ func TestAbortE2E(t *testing.T) {
 		var mu sync.Mutex
 		var events []copilot.SessionEvent
 		firstDelta := make(chan *copilot.AssistantMessageDeltaData, 1)
+		sessionIdle := make(chan struct{}, 1)
 
 		session.On(func(event copilot.SessionEvent) {
 			mu.Lock()
@@ -43,6 +44,12 @@ func TestAbortE2E(t *testing.T) {
 				default:
 				}
 			}
+			if _, ok := event.Data.(*copilot.SessionIdleData); ok {
+				select {
+				case sessionIdle <- struct{}{}:
+				default:
+				}
+			}
 		})
 
 		// Fire-and-forget — we'll abort before it finishes
@@ -67,6 +74,11 @@ func TestAbortE2E(t *testing.T) {
 		if err := session.Abort(t.Context()); err != nil {
 			t.Fatalf("Abort failed: %v", err)
 		}
+		select {
+		case <-sessionIdle:
+		case <-time.After(60 * time.Second):
+			t.Fatal("Timed out waiting for session to become idle after abort")
+		}
 
 		mu.Lock()
 		snapshot := make([]copilot.SessionEvent, len(events))
@@ -85,33 +97,15 @@ func TestAbortE2E(t *testing.T) {
 			t.Error("Expected at least one assistant.message_delta event before abort")
 		}
 
-		// Session should be usable after abort. Wait for the specific recovery
-		// message rather than racing against a late idle from the aborted turn.
-		recoveryReceived := make(chan *copilot.AssistantMessageData, 1)
-		session.On(func(event copilot.SessionEvent) {
-			if d, ok := event.Data.(*copilot.AssistantMessageData); ok {
-				if strings.Contains(strings.ToLower(d.Content), "abort_recovery_ok") {
-					select {
-					case recoveryReceived <- d:
-					default:
-					}
-				}
-			}
+		// Session should be usable after abort.
+		msg, err := session.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Say 'abort_recovery_ok'.",
 		})
-
-		go func() {
-			_, _ = session.Send(t.Context(), copilot.MessageOptions{
-				Prompt: "Say 'abort_recovery_ok'.",
-			})
-		}()
-
-		select {
-		case msg := <-recoveryReceived:
-			if !strings.Contains(strings.ToLower(msg.Content), "abort_recovery_ok") {
-				t.Errorf("Expected recovery message to contain 'abort_recovery_ok', got %q", msg.Content)
-			}
-		case <-time.After(60 * time.Second):
-			t.Fatal("Timed out waiting for recovery message after abort")
+		if err != nil {
+			t.Fatalf("Recovery SendAndWait failed after abort: %v", err)
+		}
+		if content := assistantContent(t, msg); !strings.Contains(strings.ToLower(content), "abort_recovery_ok") {
+			t.Errorf("Expected recovery message to contain 'abort_recovery_ok', got %q", content)
 		}
 	})
 
@@ -144,6 +138,16 @@ func TestAbortE2E(t *testing.T) {
 		}
 		t.Cleanup(func() { _ = session.Disconnect() })
 
+		sessionIdle := make(chan struct{}, 1)
+		session.On(func(event copilot.SessionEvent) {
+			if _, ok := event.Data.(*copilot.SessionIdleData); ok {
+				select {
+				case sessionIdle <- struct{}{}:
+				default:
+				}
+			}
+		})
+
 		// Fire-and-forget
 		go func() {
 			_, _ = session.Send(t.Context(), copilot.MessageOptions{
@@ -172,33 +176,21 @@ func TestAbortE2E(t *testing.T) {
 		case releaseTool <- "RELEASED_AFTER_ABORT":
 		default:
 		}
-
-		// Session should be usable after abort
-		recoveryReceived := make(chan *copilot.AssistantMessageData, 1)
-		session.On(func(event copilot.SessionEvent) {
-			if d, ok := event.Data.(*copilot.AssistantMessageData); ok {
-				if strings.Contains(d.Content, "tool_abort_recovery_ok") {
-					select {
-					case recoveryReceived <- d:
-					default:
-					}
-				}
-			}
-		})
-
-		go func() {
-			_, _ = session.Send(t.Context(), copilot.MessageOptions{
-				Prompt: "Say 'tool_abort_recovery_ok'.",
-			})
-		}()
-
 		select {
-		case msg := <-recoveryReceived:
-			if !strings.Contains(msg.Content, "tool_abort_recovery_ok") {
-				t.Errorf("Expected recovery message to contain 'tool_abort_recovery_ok', got %q", msg.Content)
-			}
+		case <-sessionIdle:
 		case <-time.After(60 * time.Second):
-			t.Fatal("Timed out waiting for recovery message after abort")
+			t.Fatal("Timed out waiting for session to become idle after tool abort")
+		}
+
+		// Session should be usable after abort.
+		msg, err := session.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Say 'tool_abort_recovery_ok'.",
+		})
+		if err != nil {
+			t.Fatalf("Recovery SendAndWait failed after tool abort: %v", err)
+		}
+		if content := assistantContent(t, msg); !strings.Contains(content, "tool_abort_recovery_ok") {
+			t.Errorf("Expected recovery message to contain 'tool_abort_recovery_ok', got %q", content)
 		}
 	})
 }
diff --git a/go/internal/e2e/github_telemetry_e2e_test.go b/go/internal/e2e/github_telemetry_e2e_test.go
index aa26ba31f2..6e1a36383f 100644
--- a/go/internal/e2e/github_telemetry_e2e_test.go
+++ b/go/internal/e2e/github_telemetry_e2e_test.go
@@ -12,6 +12,11 @@ import (
 
 func TestGitHubTelemetryE2E(t *testing.T) {
 	t.Run("should forward github telemetry for a live session", func(t *testing.T) {
+		// TODO(cli-1.0.81-2): CLI 1.0.81-2 does not forward GitHub telemetry notifications
+		// over the in-process (FFI) host, mirroring the existing telemetry-configuration
+		// limitation. Still covered by the default (stdio) transport.
+		testharness.SkipIfInProcess(t, "GitHub telemetry forwarding is not honored in-process")
+
 		ctx := testharness.NewTestContext(t)
 		ctx.ConfigureForTest(t)
 
diff --git a/go/internal/e2e/mcp_and_agents_e2e_test.go b/go/internal/e2e/mcp_and_agents_e2e_test.go
index 71a152ecaf..0cc57810ed 100644
--- a/go/internal/e2e/mcp_and_agents_e2e_test.go
+++ b/go/internal/e2e/mcp_and_agents_e2e_test.go
@@ -88,11 +88,6 @@ func TestMCPServersE2E(t *testing.T) {
 		}
 		sessionID := session1.SessionID
 
-		_, err = session1.SendAndWait(t.Context(), copilot.MessageOptions{Prompt: "What is 1+1?"})
-		if err != nil {
-			t.Fatalf("Failed to send message: %v", err)
-		}
-
 		// Resume with MCP servers
 		mcpServers := testMCPServers(t, "test-server")
 
diff --git a/go/internal/e2e/rewind_e2e_test.go b/go/internal/e2e/rewind_e2e_test.go
new file mode 100644
index 0000000000..b15e546eb1
--- /dev/null
+++ b/go/internal/e2e/rewind_e2e_test.go
@@ -0,0 +1,152 @@
+package e2e
+
+import (
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"testing"
+	"time"
+
+	copilot "github.com/github/copilot-sdk/go"
+	"github.com/github/copilot-sdk/go/internal/e2e/testharness"
+	"github.com/github/copilot-sdk/go/rpc"
+)
+
+const (
+	rewindFileName    = "rewind-sdk.txt"
+	rewindFileContent = "SDK rewind content"
+)
+
+func TestRewindE2E(t *testing.T) {
+	ctx := testharness.NewTestContext(t)
+	client := ctx.NewClient()
+	t.Cleanup(func() { client.ForceStop() })
+
+	t.Run("should restore tracked file and conversation", func(t *testing.T) {
+		ctx.ConfigureForTest(t)
+		filePath := filepath.Join(ctx.WorkDir, rewindFileName)
+		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			Model:                    "claude-sonnet-4.5",
+			EnableFileChangeTracking: copilot.Bool(true),
+			OnPermissionRequest:      copilot.PermissionHandler.ApproveAll,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		defer session.Disconnect()
+
+		response, err := session.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Use the create tool to create " + rewindFileName + " containing exactly " +
+				rewindFileContent + ". After the tool succeeds, reply with exactly SDK_REWIND_DONE.",
+		})
+		if err != nil {
+			t.Fatalf("SendAndWait failed: %v", err)
+		}
+		responseData, ok := response.Data.(*copilot.AssistantMessageData)
+		if !ok || responseData.Content != "SDK_REWIND_DONE" {
+			t.Fatalf("Expected SDK_REWIND_DONE response, got %+v", response)
+		}
+		content, err := os.ReadFile(filePath)
+		if err != nil {
+			t.Fatalf("Failed to read created file: %v", err)
+		}
+		if string(content) != rewindFileContent {
+			t.Fatalf("Expected file content %q, got %q", rewindFileContent, content)
+		}
+
+		rewindPoints := waitForRewindPoints(t, session)
+		if !rewindPoints.FileChangeTrackingEnabled {
+			t.Fatal("Expected file change tracking to be enabled")
+		}
+		if len(rewindPoints.Points) != 1 {
+			t.Fatalf("Expected one rewind point, got %+v", rewindPoints.Points)
+		}
+		rewindPoint := rewindPoints.Points[0]
+		if !rewindPoint.CanRestoreFiles || rewindPoint.FileCount != 1 {
+			t.Fatalf("Expected one restorable file, got %+v", rewindPoint)
+		}
+
+		preview, err := session.RPC.History.PreviewRewind(t.Context(), &rpc.HistoryPreviewRewindRequest{
+			EventID: rewindPoint.EventID,
+		})
+		if err != nil {
+			t.Fatalf("PreviewRewind failed: %v", err)
+		}
+		if !preview.Available || len(preview.Files) != 1 {
+			t.Fatalf("Expected one available preview file, got %+v", preview)
+		}
+		assertSameRewindPath(t, filePath, preview.Files[0].Path)
+
+		rewind, err := session.RPC.History.Rewind(t.Context(), &rpc.HistoryRewindRequest{
+			EventID: rewindPoint.EventID,
+			Mode:    rpc.HistoryRewindModeConversationAndFiles,
+		})
+		if err != nil {
+			t.Fatalf("Rewind failed: %v", err)
+		}
+		if rewind.Outcome != rpc.HistoryRewindOutcomeSuccess {
+			t.Fatalf("Expected successful rewind, got %+v", rewind)
+		}
+		if rewind.EventsRemoved == nil || *rewind.EventsRemoved < 1 {
+			t.Fatalf("Expected rewind to remove events, got %+v", rewind)
+		}
+		if len(rewind.RestoredFiles) != 1 {
+			t.Fatalf("Expected one restored file, got %+v", rewind.RestoredFiles)
+		}
+		assertSameRewindPath(t, filePath, rewind.RestoredFiles[0])
+		if _, err := os.Stat(filePath); !os.IsNotExist(err) {
+			t.Fatalf("Expected rewound file to be removed, stat error: %v", err)
+		}
+
+		events, err := session.GetEvents(t.Context())
+		if err != nil {
+			t.Fatalf("GetEvents failed: %v", err)
+		}
+		for _, event := range events {
+			if event.ID == rewindPoint.EventID {
+				t.Fatalf("Expected rewound event %q to be removed", rewindPoint.EventID)
+			}
+		}
+	})
+}
+
+func waitForRewindPoints(t *testing.T, session *copilot.Session) *rpc.HistoryListRewindPointsResult {
+	t.Helper()
+	deadline := time.Now().Add(10 * time.Second)
+	for {
+		result, err := session.RPC.History.ListRewindPoints(t.Context())
+		if err != nil {
+			t.Fatalf("ListRewindPoints failed: %v", err)
+		}
+		if result.UnavailableReason == nil {
+			return result
+		}
+		if time.Now().After(deadline) {
+			t.Fatalf("Timed out waiting for rewind points: %s", *result.UnavailableReason)
+		}
+		time.Sleep(100 * time.Millisecond)
+	}
+}
+
+func assertSameRewindPath(t *testing.T, expected, actual string) {
+	t.Helper()
+	expectedPath, err := filepath.Abs(expected)
+	if err != nil {
+		t.Fatalf("Failed to resolve expected path: %v", err)
+	}
+	actualPath, err := filepath.Abs(actual)
+	if err != nil {
+		t.Fatalf("Failed to resolve actual path: %v", err)
+	}
+
+	expectedPath = filepath.Clean(expectedPath)
+	actualPath = filepath.Clean(actualPath)
+	if runtime.GOOS == "windows" {
+		if !strings.EqualFold(expectedPath, actualPath) {
+			t.Fatalf("Expected path %q, got %q", expectedPath, actualPath)
+		}
+	} else if expectedPath != actualPath {
+		t.Fatalf("Expected path %q, got %q", expectedPath, actualPath)
+	}
+}
diff --git a/go/internal/e2e/rpc_server_misc_e2e_test.go b/go/internal/e2e/rpc_server_misc_e2e_test.go
index 37ec57e1ba..9607994676 100644
--- a/go/internal/e2e/rpc_server_misc_e2e_test.go
+++ b/go/internal/e2e/rpc_server_misc_e2e_test.go
@@ -131,7 +131,7 @@ func TestRpcServerMisc(t *testing.T) {
 
 		login, err := client.RPC.Account.Login(t.Context(), &rpc.AccountLoginRequest{
 			Host:  "https://github.com",
-			Login: "go-account-user",
+			Login: rpcPtr("go-account-user"),
 			Token: "go-account-token",
 		})
 		if err != nil {
diff --git a/go/internal/e2e/rpc_session_state_e2e_test.go b/go/internal/e2e/rpc_session_state_e2e_test.go
index 4046ab97fe..88673a9ba9 100644
--- a/go/internal/e2e/rpc_session_state_e2e_test.go
+++ b/go/internal/e2e/rpc_session_state_e2e_test.go
@@ -566,6 +566,10 @@ func TestRPCSessionStateE2E(t *testing.T) {
 	})
 
 	t.Run("should update options and initialize session services", func(t *testing.T) {
+		// TODO(cli-1.0.81-2): under CLI 1.0.81-2 this subtest issues model traffic before the
+		// replaying proxy is configured, so the proxy rejects it with "not yet initialized".
+		// Re-enable once the runtime restores the previous option-update ordering.
+		t.Skip("blocked on CLI 1.0.81-2 session option/service initialization ordering")
 		initialDirectory := createUniqueRPCWorkDirectory(t, ctx, "rpc-session-state-initial")
 		optionsDirectory := createUniqueRPCWorkDirectory(t, ctx, "rpc-session-state-options")
 		featureName := "rpc-session-state-" + randomHex(t)
diff --git a/go/internal/e2e/rpc_session_state_extras_e2e_test.go b/go/internal/e2e/rpc_session_state_extras_e2e_test.go
index 1e33e8a8bc..99dc0b7572 100644
--- a/go/internal/e2e/rpc_session_state_extras_e2e_test.go
+++ b/go/internal/e2e/rpc_session_state_extras_e2e_test.go
@@ -70,45 +70,45 @@ func TestRpcSessionStateExtras(t *testing.T) {
 		session := createPortedSession(t, client, nil)
 		defer session.Disconnect()
 		defer func() {
-			_, _ = session.RPC.Permissions.SetAllowAll(t.Context(), &rpc.PermissionsSetAllowAllRequest{Enabled: copilot.Bool(false)})
+			_, _ = session.RPC.Permissions.SetMode(t.Context(), &rpc.PermissionsSetModeRequest{Mode: rpc.PermissionModeManual})
 		}()
 
-		initial, err := session.RPC.Permissions.GetAllowAll(t.Context())
+		initial, err := session.RPC.Permissions.GetMode(t.Context())
 		if err != nil {
-			t.Fatalf("Permissions.GetAllowAll initial failed: %v", err)
+			t.Fatalf("Permissions.GetMode initial failed: %v", err)
 		}
-		if initial.Enabled {
-			t.Fatal("Allow-all should be disabled on a fresh session")
+		if initial.Mode != rpc.PermissionModeManual {
+			t.Fatalf("Expected manual mode on a fresh session, got %q", initial.Mode)
 		}
 
-		enable, err := session.RPC.Permissions.SetAllowAll(t.Context(), &rpc.PermissionsSetAllowAllRequest{Enabled: copilot.Bool(true)})
+		enable, err := session.RPC.Permissions.SetMode(t.Context(), &rpc.PermissionsSetModeRequest{Mode: rpc.PermissionModeAllowAll})
 		if err != nil {
-			t.Fatalf("Permissions.SetAllowAll(true) failed: %v", err)
+			t.Fatalf("Permissions.SetMode(allow-all) failed: %v", err)
 		}
-		if !enable.Success || !enable.Enabled {
-			t.Fatalf("Expected successful enable, got %+v", enable)
+		if !enable.Success || enable.Mode != rpc.PermissionModeAllowAll {
+			t.Fatalf("Expected successful allow-all mode change, got %+v", enable)
 		}
-		afterEnable, err := session.RPC.Permissions.GetAllowAll(t.Context())
+		afterEnable, err := session.RPC.Permissions.GetMode(t.Context())
 		if err != nil {
-			t.Fatalf("Permissions.GetAllowAll after enable failed: %v", err)
+			t.Fatalf("Permissions.GetMode after allow-all failed: %v", err)
 		}
-		if !afterEnable.Enabled {
-			t.Fatal("Expected allow-all to be enabled")
+		if afterEnable.Mode != rpc.PermissionModeAllowAll {
+			t.Fatalf("Expected allow-all mode, got %q", afterEnable.Mode)
 		}
 
-		disable, err := session.RPC.Permissions.SetAllowAll(t.Context(), &rpc.PermissionsSetAllowAllRequest{Enabled: copilot.Bool(false)})
+		disable, err := session.RPC.Permissions.SetMode(t.Context(), &rpc.PermissionsSetModeRequest{Mode: rpc.PermissionModeManual})
 		if err != nil {
-			t.Fatalf("Permissions.SetAllowAll(false) failed: %v", err)
+			t.Fatalf("Permissions.SetMode(manual) failed: %v", err)
 		}
-		if !disable.Success || disable.Enabled {
-			t.Fatalf("Expected successful disable, got %+v", disable)
+		if !disable.Success || disable.Mode != rpc.PermissionModeManual {
+			t.Fatalf("Expected successful manual mode change, got %+v", disable)
 		}
-		afterDisable, err := session.RPC.Permissions.GetAllowAll(t.Context())
+		afterDisable, err := session.RPC.Permissions.GetMode(t.Context())
 		if err != nil {
-			t.Fatalf("Permissions.GetAllowAll after disable failed: %v", err)
+			t.Fatalf("Permissions.GetMode after manual failed: %v", err)
 		}
-		if afterDisable.Enabled {
-			t.Fatal("Expected allow-all to be disabled")
+		if afterDisable.Mode != rpc.PermissionModeManual {
+			t.Fatalf("Expected manual mode, got %q", afterDisable.Mode)
 		}
 	})
 
diff --git a/go/internal/e2e/rpc_tasks_and_handlers_e2e_test.go b/go/internal/e2e/rpc_tasks_and_handlers_e2e_test.go
index 0267f8d042..648855e5a3 100644
--- a/go/internal/e2e/rpc_tasks_and_handlers_e2e_test.go
+++ b/go/internal/e2e/rpc_tasks_and_handlers_e2e_test.go
@@ -127,6 +127,7 @@ func TestRPCTasksAndHandlersE2E(t *testing.T) {
 	})
 
 	t.Run("should report implemented error for invalid task agent model", func(t *testing.T) {
+		ctx.ConfigureForTest(t)
 		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
 			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
 		})
diff --git a/go/internal/e2e/rpc_ui_ephemeral_query_e2e_test.go b/go/internal/e2e/rpc_ui_ephemeral_query_e2e_test.go
index 2669faea9a..a431aaee04 100644
--- a/go/internal/e2e/rpc_ui_ephemeral_query_e2e_test.go
+++ b/go/internal/e2e/rpc_ui_ephemeral_query_e2e_test.go
@@ -14,6 +14,11 @@ func TestRpcUiEphemeralQuery(t *testing.T) {
 	t.Cleanup(func() { client.ForceStop() })
 
 	t.Run("should_answer_ephemeral_query", func(t *testing.T) {
+		// TODO(cli-1.0.81-2): CLI 1.0.81-5 still fails session.ui.ephemeralQuery against the
+		// recorded snapshot on macOS ("Failed to get response from the AI model"). Re-enable
+		// once the runtime fix ships.
+		t.Skip("blocked on CLI 1.0.81-5 session.ui.ephemeralQuery regression on macOS")
+
 		ctx.ConfigureForTest(t)
 		session := createPortedSession(t, client, nil)
 		defer session.Disconnect()
diff --git a/go/internal/e2e/session_e2e_test.go b/go/internal/e2e/session_e2e_test.go
index 440a303483..cf39b6784c 100644
--- a/go/internal/e2e/session_e2e_test.go
+++ b/go/internal/e2e/session_e2e_test.go
@@ -448,6 +448,10 @@ func TestSessionE2E(t *testing.T) {
 	})
 
 	t.Run("should resume a session using a new client", func(t *testing.T) {
+		// TODO(cli-1.0.81-2): resuming a session over the in-process transport no longer
+		// routes model traffic through COPILOT_API_URL, so the CLI reaches the real
+		// api.githubcopilot.com and macOS rejects the proxy certificate with an EKU error.
+		testharness.SkipIfInProcessOnMacOS(t, "session resume ignores COPILOT_API_URL")
 		ctx.ConfigureForTest(t)
 
 		// Create initial session
diff --git a/go/internal/e2e/session_fs_e2e_test.go b/go/internal/e2e/session_fs_e2e_test.go
index 3ba91c7993..4236e8e529 100644
--- a/go/internal/e2e/session_fs_e2e_test.go
+++ b/go/internal/e2e/session_fs_e2e_test.go
@@ -196,6 +196,8 @@ func TestSessionFSE2E(t *testing.T) {
 			t.Fatalf("Failed to get messages: %v", err)
 		}
 		toolResult := findToolCallResult(messages, "get_big_string")
+		// Windows reports the spilled file with backslash separators.
+		toolResult = strings.ReplaceAll(toolResult, "\\", "/")
 		if !strings.Contains(toolResult, sessionStatePath+"/temp/") {
 			t.Fatalf("Expected tool result to reference %s/temp/, got %q", sessionStatePath, toolResult)
 		}
diff --git a/go/internal/e2e/session_fs_sqlite_e2e_test.go b/go/internal/e2e/session_fs_sqlite_e2e_test.go
index 20cd777834..8042614496 100644
--- a/go/internal/e2e/session_fs_sqlite_e2e_test.go
+++ b/go/internal/e2e/session_fs_sqlite_e2e_test.go
@@ -3,6 +3,7 @@ package e2e
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"sort"
 	"strings"
 	"sync"
@@ -54,7 +55,7 @@ func (p *inMemorySqliteProvider) ReadFile(path string) (string, error) {
 	defer p.mu.Unlock()
 	content, ok := p.files[path]
 	if !ok {
-		return "", fmt.Errorf("file not found: %s", path)
+		return "", fmt.Errorf("%s: %w", path, os.ErrNotExist)
 	}
 	return content, nil
 }
@@ -97,7 +98,7 @@ func (p *inMemorySqliteProvider) Stat(path string) (*copilot.SessionFSFileInfo,
 			IsFile: true, IsDirectory: false, Size: int64(len(content)), Mtime: now, Birthtime: now,
 		}, nil
 	}
-	return nil, fmt.Errorf("not found: %s", path)
+	return nil, fmt.Errorf("%s: %w", path, os.ErrNotExist)
 }
 
 func (p *inMemorySqliteProvider) MakeDirectory(path string, recursive bool, mode *int) error {
diff --git a/go/internal/e2e/streaming_fidelity_e2e_test.go b/go/internal/e2e/streaming_fidelity_e2e_test.go
index 7f6d4fba8e..23b1d91a46 100644
--- a/go/internal/e2e/streaming_fidelity_e2e_test.go
+++ b/go/internal/e2e/streaming_fidelity_e2e_test.go
@@ -142,6 +142,10 @@ func TestStreamingFidelityE2E(t *testing.T) {
 	})
 
 	t.Run("should produce deltas after session resume", func(t *testing.T) {
+		// TODO(cli-1.0.81-2): resuming a session over the in-process transport no longer
+		// routes model traffic through COPILOT_API_URL, so the CLI reaches the real
+		// api.githubcopilot.com and macOS rejects the proxy certificate with an EKU error.
+		testharness.SkipIfInProcessOnMacOS(t, "session resume ignores COPILOT_API_URL")
 		ctx.ConfigureForTest(t)
 
 		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
@@ -212,6 +216,10 @@ func TestStreamingFidelityE2E(t *testing.T) {
 	})
 
 	t.Run("should not produce deltas after session resume with streaming disabled", func(t *testing.T) {
+		// TODO(cli-1.0.81-2): resuming a session over the in-process transport no longer
+		// routes model traffic through COPILOT_API_URL, so the CLI reaches the real
+		// api.githubcopilot.com and macOS rejects the proxy certificate with an EKU error.
+		testharness.SkipIfInProcessOnMacOS(t, "session resume ignores COPILOT_API_URL")
 		ctx.ConfigureForTest(t)
 
 		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
diff --git a/go/internal/e2e/testharness/context.go b/go/internal/e2e/testharness/context.go
index 03ebf24cbf..037265f9de 100644
--- a/go/internal/e2e/testharness/context.go
+++ b/go/internal/e2e/testharness/context.go
@@ -114,6 +114,16 @@ func SkipIfInProcess(t *testing.T, reason string) {
 	}
 }
 
+// SkipIfInProcessOnMacOS skips the test when E2E tests run under the in-process
+// (FFI) transport on macOS. Coverage is retained over stdio on every OS and
+// in-process on Linux and Windows.
+func SkipIfInProcessOnMacOS(t *testing.T, reason string) {
+	t.Helper()
+	if isInProcessTransport() && runtime.GOOS == "darwin" {
+		t.Skipf("unsupported over the in-process (FFI) transport on macOS: %s", reason)
+	}
+}
+
 // NewTestContext creates a new test context with isolated directories and a replaying proxy.
 func NewTestContext(t *testing.T) *TestContext {
 	t.Helper()
diff --git a/go/mode_empty.go b/go/mode_empty.go
index 6057b2661f..6e238c58c4 100644
--- a/go/mode_empty.go
+++ b/go/mode_empty.go
@@ -225,7 +225,8 @@ func (c *Client) applyResumeDefaultsForMode(config *ResumeSessionConfig) {
 // updateSessionOptionsForMode applies the per-mode safe-defaults patch via
 // session.options.update after create/resume succeeds. In empty mode the
 // four overridable feature flags default to safe values; caller values win.
-// installedPlugins=[] is unconditional in empty mode.
+// installedPlugins=[] is unconditional in empty mode. IncludedBuiltinSkills
+// defaults to [] but callers can explicitly allow selected runtime-bundled skills.
 func (c *Client) updateSessionOptionsForMode(ctx context.Context, session *Session, base optBackInFields) error {
 	patch := &rpc.SessionUpdateOptionsParams{}
 	hasAny := false
@@ -255,6 +256,11 @@ func (c *Client) updateSessionOptionsForMode(ctx context.Context, session *Sessi
 			patch.ManageScheduleEnabled = &f
 		}
 		patch.InstalledPlugins = []rpc.SessionInstalledPlugin{}
+		if base.IncludedBuiltinSkills != nil {
+			patch.IncludedBuiltinSkills = base.IncludedBuiltinSkills
+		} else {
+			patch.IncludedBuiltinSkills = []string{}
+		}
 		hasAny = true
 	} else {
 		if base.SkipCustomInstructions != nil {
@@ -273,6 +279,10 @@ func (c *Client) updateSessionOptionsForMode(ctx context.Context, session *Sessi
 			patch.ManageScheduleEnabled = base.ManageScheduleEnabled
 			hasAny = true
 		}
+		if base.IncludedBuiltinSkills != nil {
+			patch.IncludedBuiltinSkills = base.IncludedBuiltinSkills
+			hasAny = true
+		}
 	}
 	if !hasAny {
 		return nil
@@ -297,4 +307,5 @@ type optBackInFields struct {
 	CustomAgentsLocalOnly  *bool
 	CoauthorEnabled        *bool
 	ManageScheduleEnabled  *bool
+	IncludedBuiltinSkills  []string
 }
diff --git a/go/permission_context_test.go b/go/permission_context_test.go
new file mode 100644
index 0000000000..16c6d2d592
--- /dev/null
+++ b/go/permission_context_test.go
@@ -0,0 +1,260 @@
+package copilot
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"testing"
+	"time"
+
+	"github.com/github/copilot-sdk/go/internal/jsonrpc2"
+	"github.com/github/copilot-sdk/go/rpc"
+)
+
+// runPermissionExchange drives executePermissionAndRespond with the supplied
+// handler and captures the raw JSON-RPC request frame the SDK emits (if any).
+// The second return value reports whether a request was sent at all, so tests
+// can assert that no-result decisions suppress the response entirely.
+func runPermissionExchange(t *testing.T, handler PermissionHandlerFunc) (frame []byte, sent bool) {
+	t.Helper()
+
+	stdinR, stdinW := io.Pipe()
+	stdoutR, stdoutW := io.Pipe()
+	t.Cleanup(func() {
+		stdinR.Close()
+		stdinW.Close()
+		stdoutR.Close()
+		stdoutW.Close()
+	})
+
+	client := jsonrpc2.NewClient(stdinW, stdoutR)
+	client.Start()
+	t.Cleanup(client.Stop)
+
+	session := &Session{
+		SessionID: "session-1",
+		client:    client,
+		RPC:       rpc.NewSessionRPC(client, "session-1"),
+	}
+
+	frameCh := make(chan []byte, 1)
+	go func() {
+		captured, err := readTestJSONRPCFrame(stdinR)
+		if err != nil {
+			return
+		}
+		var request struct {
+			ID json.RawMessage `json:"id"`
+		}
+		_ = json.Unmarshal(captured, &request)
+		// Publish the captured frame before unblocking the RPC round trip so a
+		// sent response is always observable before executePermissionAndRespond
+		// returns.
+		frameCh <- captured
+		response := map[string]any{
+			"jsonrpc": "2.0",
+			"id":      json.RawMessage(request.ID),
+			"result":  map[string]any{"applied": true},
+		}
+		data, _ := json.Marshal(response)
+		_, _ = fmt.Fprintf(stdoutW, "Content-Length: %d\r\n\r\n%s", len(data), data)
+	}()
+
+	done := make(chan struct{})
+	go func() {
+		session.executePermissionAndRespond("permission-1", nil, handler)
+		close(done)
+	}()
+
+	select {
+	case captured := <-frameCh:
+		return captured, true
+	case <-done:
+		select {
+		case captured := <-frameCh:
+			return captured, true
+		default:
+			return nil, false
+		}
+	case <-time.After(2 * time.Second):
+		t.Fatal("timed out waiting for permission response")
+		return nil, false
+	}
+}
+
+// paramsOf extracts the top-level params object from a JSON-RPC request frame.
+func paramsOf(t *testing.T, frame []byte) map[string]json.RawMessage {
+	t.Helper()
+	var request struct {
+		Method string                     `json:"method"`
+		Params map[string]json.RawMessage `json:"params"`
+	}
+	if err := json.Unmarshal(frame, &request); err != nil {
+		t.Fatalf("failed to unmarshal request frame: %v", err)
+	}
+	if request.Method != "session.permissions.handlePendingPermissionRequest" {
+		t.Fatalf("unexpected method %q", request.Method)
+	}
+	return request.Params
+}
+
+func sampleDecisionContext() *rpc.PermissionDecisionContext {
+	return &rpc.PermissionDecisionContext{
+		Outcome: PermissionDecisionOutcomeAutoApproved,
+		Source:  PermissionDecisionSourceHostPolicy,
+		Surface: PermissionDecisionSurfaceSDK,
+	}
+}
+
+func TestPermissionDecisionContextForwardedAsSiblingOfResult(t *testing.T) {
+	frame, sent := runPermissionExchange(t, func(PermissionRequest, PermissionInvocation) (rpc.PermissionDecision, error) {
+		return NewAttributedPermissionResult(&rpc.PermissionDecisionApproveOnce{}, sampleDecisionContext()), nil
+	})
+	if !sent {
+		t.Fatal("expected a permission response to be sent")
+	}
+
+	params := paramsOf(t, frame)
+
+	// decisionContext must be a top-level sibling of result.
+	rawContext, ok := params["decisionContext"]
+	if !ok {
+		t.Fatal("expected decisionContext to be present as a top-level sibling of result")
+	}
+	var context rpc.PermissionDecisionContext
+	if err := json.Unmarshal(rawContext, &context); err != nil {
+		t.Fatalf("failed to unmarshal decisionContext: %v", err)
+	}
+	if context.Outcome != PermissionDecisionOutcomeAutoApproved ||
+		context.Source != PermissionDecisionSourceHostPolicy ||
+		context.Surface != PermissionDecisionSurfaceSDK {
+		t.Fatalf("unexpected decisionContext contents: %#v", context)
+	}
+
+	// result must exist and must NOT contain a nested decisionContext.
+	rawResult, ok := params["result"]
+	if !ok {
+		t.Fatal("expected result to be present")
+	}
+	var result map[string]json.RawMessage
+	if err := json.Unmarshal(rawResult, &result); err != nil {
+		t.Fatalf("failed to unmarshal result: %v", err)
+	}
+	if _, nested := result["decisionContext"]; nested {
+		t.Fatal("decisionContext must not be nested inside result")
+	}
+}
+
+func TestPermissionDecisionContextOmittedWithoutAttribution(t *testing.T) {
+	frame, sent := runPermissionExchange(t, func(PermissionRequest, PermissionInvocation) (rpc.PermissionDecision, error) {
+		return &rpc.PermissionDecisionApproveOnce{}, nil
+	})
+	if !sent {
+		t.Fatal("expected a permission response to be sent")
+	}
+
+	params := paramsOf(t, frame)
+	if _, ok := params["decisionContext"]; ok {
+		t.Fatal("expected decisionContext to be absent when no context is supplied")
+	}
+	if _, ok := params["result"]; !ok {
+		t.Fatal("expected result to be present")
+	}
+}
+
+func TestAttributedResultReplacesRatherThanNests(t *testing.T) {
+	first := &rpc.PermissionDecisionContext{
+		Outcome: PermissionDecisionOutcomePromptedUser,
+		Source:  PermissionDecisionSourceHumanResponse,
+		Surface: PermissionDecisionSurfaceTui,
+	}
+	second := sampleDecisionContext()
+
+	wrapped := NewAttributedPermissionResult(NewAttributedPermissionResult(&rpc.PermissionDecisionApproveOnce{}, first), second)
+
+	if wrapped.DecisionContext != second {
+		t.Fatalf("expected the second context to replace the first, got %#v", wrapped.DecisionContext)
+	}
+	// The underlying decision must be the plain approve-once, not another wrapper.
+	if _, ok := wrapped.PermissionDecision.(*rpc.PermissionDecisionApproveOnce); !ok {
+		t.Fatalf("expected unwrapped decision to be *rpc.PermissionDecisionApproveOnce, got %T", wrapped.PermissionDecision)
+	}
+
+	frame, sent := runPermissionExchange(t, func(PermissionRequest, PermissionInvocation) (rpc.PermissionDecision, error) {
+		return wrapped, nil
+	})
+	if !sent {
+		t.Fatal("expected a permission response to be sent")
+	}
+	params := paramsOf(t, frame)
+	rawContext, ok := params["decisionContext"]
+	if !ok {
+		t.Fatal("expected decisionContext to be present")
+	}
+	var context rpc.PermissionDecisionContext
+	if err := json.Unmarshal(rawContext, &context); err != nil {
+		t.Fatalf("failed to unmarshal decisionContext: %v", err)
+	}
+	if context.Surface != PermissionDecisionSurfaceSDK {
+		t.Fatalf("expected replaced surface %q, got %q", PermissionDecisionSurfaceSDK, context.Surface)
+	}
+}
+
+func TestAttributedNoResultStillSuppressesResponse(t *testing.T) {
+	frame, sent := runPermissionExchange(t, func(PermissionRequest, PermissionInvocation) (rpc.PermissionDecision, error) {
+		return NewAttributedPermissionResult(&rpc.PermissionDecisionNoResult{}, sampleDecisionContext()), nil
+	})
+	if sent {
+		t.Fatalf("expected no response to be sent for an attributed no-result decision, got frame: %s", frame)
+	}
+}
+
+// A handler may dereference the wrapper and return it by value. The embedded
+// interface promotes its methods to the value type, so the value form also
+// satisfies rpc.PermissionDecision and must be unwrapped identically to the
+// pointer form -- otherwise the wrapper itself is sent as result and the
+// context is silently dropped.
+func TestValueFormAttributedResultIsUnwrapped(t *testing.T) {
+	frame, sent := runPermissionExchange(t, func(PermissionRequest, PermissionInvocation) (rpc.PermissionDecision, error) {
+		return *NewAttributedPermissionResult(&rpc.PermissionDecisionApproveOnce{}, sampleDecisionContext()), nil
+	})
+	if !sent {
+		t.Fatal("expected a permission response to be sent")
+	}
+
+	params := paramsOf(t, frame)
+
+	if _, ok := params["decisionContext"]; !ok {
+		t.Fatal("expected decisionContext to be forwarded for a value-form attributed result")
+	}
+
+	var result map[string]json.RawMessage
+	if err := json.Unmarshal(params["result"], &result); err != nil {
+		t.Fatalf("failed to unmarshal result: %v", err)
+	}
+	if _, nested := result["decisionContext"]; nested {
+		t.Fatal("decisionContext must not be nested inside result")
+	}
+	if _, leaked := result["PermissionDecision"]; leaked {
+		t.Fatal("the wrapper leaked into result instead of being unwrapped")
+	}
+}
+
+func TestAttributedResultReplacesContextOnValueForm(t *testing.T) {
+	first := sampleDecisionContext()
+	second := &rpc.PermissionDecisionContext{
+		Outcome: PermissionDecisionOutcomePromptedUser,
+		Source:  PermissionDecisionSourceHumanResponse,
+		Surface: PermissionDecisionSurfaceTui,
+	}
+
+	valueForm := *NewAttributedPermissionResult(&rpc.PermissionDecisionApproveOnce{}, first)
+	replaced := NewAttributedPermissionResult(valueForm, second)
+
+	if replaced.DecisionContext != second {
+		t.Fatal("expected the second context to replace the first")
+	}
+	if _, nested := replaced.PermissionDecision.(AttributedPermissionResult); nested {
+		t.Fatal("value-form attribution must be replaced, not nested")
+	}
+}
diff --git a/go/permissions.go b/go/permissions.go
index 24b9cc7f13..f27f9b6e62 100644
--- a/go/permissions.go
+++ b/go/permissions.go
@@ -6,6 +6,62 @@ import (
 	"github.com/github/copilot-sdk/go/rpc"
 )
 
+// AttributedPermissionResult pairs a permission decision with the context
+// describing how it was reached, so the runtime can attribute auto-approval
+// telemetry to the responding surface.
+//
+// The embedded [rpc.PermissionDecision] carries the actual decision, while
+// DecisionContext is informational only and never changes permission behavior.
+// It satisfies [rpc.PermissionDecision] itself, so a [PermissionHandlerFunc]
+// can return it wherever a plain decision is expected. Prefer constructing it
+// through [NewAttributedPermissionResult] rather than by hand.
+//
+// Experimental: AttributedPermissionResult is part of an experimental API and
+// may change or be removed.
+type AttributedPermissionResult struct {
+	rpc.PermissionDecision
+	// DecisionContext describes how and where the decision was reached. When nil
+	// the SDK omits it from the wire, preserving legacy behavior.
+	DecisionContext *rpc.PermissionDecisionContext
+}
+
+// NewAttributedPermissionResult pairs a permission decision with the context
+// describing how it was reached, so the runtime can attribute auto-approval
+// telemetry to the responding surface.
+//
+// The returned value satisfies [rpc.PermissionDecision], so a
+// [PermissionHandlerFunc] can return it directly. Passing an already-attributed
+// result replaces the previous context rather than nesting it. If result is a
+// [rpc.PermissionDecisionNoResult] (attributed or not), the SDK still
+// suppresses the response.
+//
+// Experimental: NewAttributedPermissionResult is part of an experimental API
+// and may change or be removed.
+func NewAttributedPermissionResult(result rpc.PermissionDecision, decisionContext *rpc.PermissionDecisionContext) *AttributedPermissionResult {
+	decision, _ := splitAttribution(result)
+	return &AttributedPermissionResult{
+		PermissionDecision: decision,
+		DecisionContext:    decisionContext,
+	}
+}
+
+// splitAttribution separates an optionally attributed result into the bare
+// decision and its context, returning a nil context when there is none.
+//
+// Both the pointer and value forms are matched: embedding an interface promotes
+// its methods to the value type too, so an AttributedPermissionResult passed by
+// value also satisfies [rpc.PermissionDecision] and must not slip through
+// unwrapped.
+func splitAttribution(result rpc.PermissionDecision) (rpc.PermissionDecision, *rpc.PermissionDecisionContext) {
+	switch attributed := result.(type) {
+	case *AttributedPermissionResult:
+		return attributed.PermissionDecision, attributed.DecisionContext
+	case AttributedPermissionResult:
+		return attributed.PermissionDecision, attributed.DecisionContext
+	}
+	return result, nil
+}
+
 // PermissionHandler provides pre-built OnPermissionRequest implementations.
 var PermissionHandler = struct {
 	// ApproveAll approves permission requests when managed settings are disabled.
diff --git a/go/rpc/generated_rpc_api_shape_test.go b/go/rpc/generated_rpc_api_shape_test.go
index a6b357d54f..05774f4847 100644
--- a/go/rpc/generated_rpc_api_shape_test.go
+++ b/go/rpc/generated_rpc_api_shape_test.go
@@ -35,9 +35,9 @@ func TestGeneratedRPCAPIShape(t *testing.T) {
 	assertTypeExpr(t, fileSet, findTypeSpec(t, file, "FilterMappingEnumMap").Type, "map[string]ContentFilterMode")
 
 	assertInterfaceType(t, file, "MCPServerConfig")
-	assertStructFieldType(t, file, fileSet, "MCPConfigAddRequest", "Config", "MCPServerConfig")
-	assertStructFieldType(t, file, fileSet, "MCPConfigList", "Servers", "map[string]MCPServerConfig")
-	assertStructFieldType(t, file, fileSet, "MCPConfigUpdateRequest", "Config", "MCPServerConfig")
+	assertStructFieldType(t, file, fileSet, "MCPConfigAddRequest", "Config", "MCPSerializableServerConfig")
+	assertStructFieldType(t, file, fileSet, "MCPConfigList", "Servers", "map[string]MCPSerializableServerConfig")
+	assertStructFieldType(t, file, fileSet, "MCPConfigUpdateRequest", "Config", "MCPSerializableServerConfig")
 	assertStructFieldType(t, file, fileSet, "MCPServerConfigHTTP", "FilterMapping", "FilterMapping")
 	assertStructFieldType(t, file, fileSet, "MCPServerConfigStdio", "FilterMapping", "FilterMapping")
 
diff --git a/go/rpc/permission_request_managed_approval.go b/go/rpc/permission_request_managed_approval.go
index 0206268931..d1bfa37356 100644
--- a/go/rpc/permission_request_managed_approval.go
+++ b/go/rpc/permission_request_managed_approval.go
@@ -20,6 +20,12 @@ func (r PermissionRequestExtensionManagement) RequiresManagedApproval() bool {
 	return managedApprovalRequired(r.ManagedApprovalRequired)
 }
 
+// RequiresManagedApproval reports whether managed policy requires an explicit
+// human decision for this request.
+func (r PermissionRequestExtensionEnvAccess) RequiresManagedApproval() bool {
+	return managedApprovalRequired(r.ManagedApprovalRequired)
+}
+
 // RequiresManagedApproval reports whether managed policy requires an explicit
 // human decision for this request.
 func (r PermissionRequestExtensionPermissionAccess) RequiresManagedApproval() bool {
diff --git a/go/rpc/zrpc.go b/go/rpc/zrpc.go
index 5ecee9f6cb..2b3943988d 100644
--- a/go/rpc/zrpc.go
+++ b/go/rpc/zrpc.go
@@ -28,12 +28,13 @@ type AbortResult struct {
 	Success bool `json:"success"`
 }
 
-// Authenticated account entry returned by `account.getAllUsers`, with auth info and an
-// optional associated token.
+// Authenticated account entry returned by `account.getAllUsers`.
 // Experimental: AccountAllUsers is part of an experimental API and may change or be removed.
 type AccountAllUsers struct {
 	// Authentication information for this user
 	AuthInfo AuthInfo `json:"authInfo"`
+	// Opaque identifier accepted by account and model selection APIs
+	SelectionID *string `json:"selectionId,omitempty"`
 	// Associated token, if available
 	Token *string `json:"token,omitempty"`
 }
@@ -56,9 +57,12 @@ type AccountGetCurrentAuthResult struct {
 // Experimental: AccountGetQuotaRequest is part of an experimental API and may change or be
 // removed.
 type AccountGetQuotaRequest struct {
-	// GitHub token for per-user quota lookup. When provided, resolves this token to determine
-	// the user's quota instead of using the global auth.
+	// GitHub token accepted for compatibility with existing SDK clients. When provided,
+	// resolves this token instead of using the current account.
 	GitHubToken *string `json:"gitHubToken,omitempty"`
+	// Opaque account identifier returned by `account.getAllUsers`. When omitted, the current
+	// account is used.
+	SelectionID *string `json:"selectionId,omitempty"`
 }
 
 // Quota usage snapshots for the resolved user, keyed by quota type.
@@ -69,14 +73,16 @@ type AccountGetQuotaResult struct {
 	QuotaSnapshots map[string]AccountQuotaSnapshot `json:"quotaSnapshots"`
 }
 
-// Credentials to store after successful authentication
+// Credentials to validate and store. Omit login to resolve the authenticated user from the
+// token.
 // Experimental: AccountLoginRequest is part of an experimental API and may change or be
 // removed.
 type AccountLoginRequest struct {
 	// GitHub host URL
 	Host string `json:"host"`
-	// User login/username
-	Login string `json:"login"`
+	// User login/username. When omitted, the runtime validates the token and resolves the login
+	// from GitHub.
+	Login *string `json:"login,omitempty"`
 	// GitHub authentication token
 	Token string `json:"token"`
 }
@@ -96,7 +102,9 @@ type AccountLoginResult struct {
 // removed.
 type AccountLogoutRequest struct {
 	// Authentication information for the user to log out
-	AuthInfo AuthInfo `json:"authInfo"`
+	AuthInfo AuthInfo `json:"authInfo,omitempty"`
+	// Opaque account identifier returned by `account.getAllUsers`
+	SelectionID *string `json:"selectionId,omitempty"`
 }
 
 // Logout result indicating if more users remain
@@ -455,28 +463,6 @@ type AgentsGetDiscoveryPathsRequest struct {
 	ProjectPaths []string `json:"projectPaths,omitzero"`
 }
 
-// Indicates whether the operation succeeded and reports the post-mutation state.
-// Experimental: AllowAllPermissionSetResult is part of an experimental API and may change
-// or be removed.
-type AllowAllPermissionSetResult struct {
-	// Authoritative full allow-all state after the mutation
-	Enabled bool `json:"enabled"`
-	// Authoritative allow-all mode after the mutation
-	Mode *PermissionsAllowAllMode `json:"mode,omitempty"`
-	// Whether the operation succeeded
-	Success bool `json:"success"`
-}
-
-// Current allow-all permission mode.
-// Experimental: AllowAllPermissionState is part of an experimental API and may change or be
-// removed.
-type AllowAllPermissionState struct {
-	// Whether full allow-all permissions are currently active
-	Enabled bool `json:"enabled"`
-	// Current allow-all mode
-	Mode *PermissionsAllowAllMode `json:"mode,omitempty"`
-}
-
 // A user message attachment — a file, directory, code selection, blob, GitHub-anchored
 // pointer, or extension-supplied context payload
 // Experimental: Attachment is part of an experimental API and may change or be removed.
@@ -869,7 +855,26 @@ type AttachmentSelectionDetailsStart struct {
 	Line int64 `json:"line"`
 }
 
-// Initial authentication info for the session.
+// Credential-free authentication identity safe to expose to hosts and user interfaces.
+// Experimental: AuthIdentity is part of an experimental API and may change or be removed.
+type AuthIdentity struct {
+	// Snapshot of the authenticated user's Copilot subscription info, if known
+	CopilotUser *CopilotUserResponse `json:"copilotUser,omitempty"`
+	// Name of the environment variable that supplied the credential, when applicable
+	EnvVar *string `json:"envVar,omitempty"`
+	// Authentication host
+	Host string `json:"host"`
+	// Authenticated login, when available
+	Login *string `json:"login,omitempty"`
+	// Opaque SDK GitHub credential registration backing this identity. Routing metadata only;
+	// never a credential.
+	RegistrationID *string `json:"registrationId,omitempty"`
+	// Authentication type
+	Type AuthInfoType `json:"type"`
+}
+
+// Authentication credentials accepted only at native protocol ingress. Runtime outputs use
+// credential-free `AuthIdentity` metadata.
 // Experimental: AuthInfo is part of an experimental API and may change or be removed.
 type AuthInfo interface {
 	authInfo()
@@ -886,8 +891,8 @@ func (r RawAuthInfoData) Type() AuthInfoType {
 	return r.Discriminator
 }
 
-// Authentication-info variant for API-key authentication to a non-GitHub LLM provider,
-// carrying the secret `apiKey` and host.
+// Authentication-info input variant for API-key authentication to a non-GitHub LLM
+// provider, carrying the secret `apiKey` and host.
 // Experimental: APIKeyAuthInfo is part of an experimental API and may change or be removed.
 type APIKeyAuthInfo struct {
 	// The API key. Treat as a secret.
@@ -923,8 +928,8 @@ func (CopilotAPITokenAuthInfo) Type() AuthInfoType {
 	return AuthInfoTypeCopilotAPIToken
 }
 
-// Authentication-info variant for a token sourced from an environment variable, with host,
-// optional login, token, and env var name.
+// Authentication-info input variant for a token sourced from an environment variable, with
+// host, optional login, token, and env var name.
 // Experimental: EnvAuthInfo is part of an experimental API and may change or be removed.
 type EnvAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
@@ -947,8 +952,8 @@ func (EnvAuthInfo) Type() AuthInfoType {
 	return AuthInfoTypeEnv
 }
 
-// Authentication-info variant for GitHub CLI credentials, carrying host, login, and the `gh
-// auth token` value.
+// Authentication-info input variant for GitHub CLI credentials, carrying host, login, and
+// the `gh auth token` value.
 // Experimental: GhCLIAuthInfo is part of an experimental API and may change or be removed.
 type GhCLIAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
@@ -968,8 +973,8 @@ func (GhCLIAuthInfo) Type() AuthInfoType {
 	return AuthInfoTypeGhCLI
 }
 
-// Authentication-info variant for GitHub-internal HMAC auth, carrying the public GitHub
-// host and HMAC secret.
+// Authentication-info input variant for GitHub-internal HMAC auth, carrying the public
+// GitHub host and HMAC secret.
 // Experimental: HMACAuthInfo is part of an experimental API and may change or be removed.
 type HMACAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
@@ -987,8 +992,8 @@ func (HMACAuthInfo) Type() AuthInfoType {
 	return AuthInfoTypeHMAC
 }
 
-// Authentication-info variant for SDK-configured token authentication, carrying host and
-// the secret token value.
+// Authentication-info input variant for SDK-configured token authentication, carrying host
+// and the secret token value.
 // Experimental: TokenAuthInfo is part of an experimental API and may change or be removed.
 type TokenAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
@@ -997,6 +1002,8 @@ type TokenAuthInfo struct {
 	CopilotUser *CopilotUserResponse `json:"copilotUser,omitempty"`
 	// Authentication host.
 	Host string `json:"host"`
+	// Opaque native GitHub credential registration backing this token identity, when applicable.
+	RegistrationID *string `json:"registrationId,omitempty"`
 	// The token value itself. Treat as a secret.
 	Token string `json:"token"`
 }
@@ -1006,6 +1013,24 @@ func (TokenAuthInfo) Type() AuthInfoType {
 	return AuthInfoTypeToken
 }
 
+// Authentication-info variant backed by an SDK GitHub token callback. It carries routing
+// metadata but never a plaintext token.
+// Experimental: TokenProviderAuthInfo is part of an experimental API and may change or be
+// removed.
+type TokenProviderAuthInfo struct {
+	// Snapshot of the authenticated user's Copilot subscription info, if known.
+	CopilotUser *CopilotUserResponse `json:"copilotUser,omitempty"`
+	// Authentication host.
+	Host string `json:"host"`
+	// Opaque SDK callback registration identifier.
+	RegistrationID string `json:"registrationId"`
+}
+
+func (TokenProviderAuthInfo) authInfo() {}
+func (TokenProviderAuthInfo) Type() AuthInfoType {
+	return AuthInfoTypeTokenProvider
+}
+
 // Authentication-info variant for OAuth user auth, with host and login; the token remains
 // in the runtime secret store.
 // Experimental: UserAuthInfo is part of an experimental API and may change or be removed.
@@ -1025,6 +1050,21 @@ func (UserAuthInfo) Type() AuthInfoType {
 	return AuthInfoTypeUser
 }
 
+// Validation error from an authentication attempt.
+// Experimental: AuthValidationError is part of an experimental API and may change or be
+// removed.
+type AuthValidationError struct {
+	// Optional message returned by GitHub
+	GitHubMessage *string `json:"githubMessage,omitempty"`
+	// Authentication validation error message
+	Message string `json:"message"`
+}
+
+// Validation errors from the most recent authentication attempt.
+// Experimental: AuthValidationErrors is part of an experimental API and may change or be
+// removed.
+type AuthValidationErrors []AuthValidationError
+
 // The running runtime's complete catalog of well-known built-in model IDs, including
 // supported models and additional IDs with built-in metadata.
 // Experimental: BuiltInModelCatalog is part of an experimental API and may change or be
@@ -1038,12 +1078,81 @@ type BuiltInModelCatalog struct {
 // Experimental: BuiltInModelCatalogEntry is part of an experimental API and may change or
 // be removed.
 type BuiltInModelCatalogEntry struct {
-	// Well-known runtime model ID suitable for `ProviderConfig.modelId` or
-	// `ProviderModelConfig.modelId`. This is not necessarily the provider-facing deployment or
-	// model name and does not indicate CAPI entitlement or provider availability.
+	// Well-known runtime model ID suitable for provider or provider-model metadata. This is not
+	// necessarily the provider-facing deployment or model name and does not indicate CAPI
+	// entitlement or provider availability.
 	ID string `json:"id"`
 }
 
+// Rust-owned metadata and input schema for a built-in tool.
+// Experimental: BuiltinToolDescriptor is part of an experimental API and may change or be
+// removed.
+type BuiltinToolDescriptor struct {
+	// Model-facing description of the tool's behavior.
+	Description string `json:"description"`
+	// Optional custom input format used instead of a JSON Schema.
+	Format *BuiltinToolFormat `json:"format"`
+	// Whether the tool provides a specialized intention summary.
+	HasSummariseIntention bool `json:"hasSummariseIntention"`
+	// JSON Schema for the tool input, or null when the tool uses a custom format.
+	InputSchema *BuiltinToolInputSchema `json:"inputSchema"`
+	// Optional supplemental usage instructions for the tool.
+	Instructions *string `json:"instructions"`
+	// Whether the tool executes commands in a terminal.
+	IsTerminal bool `json:"isTerminal"`
+	// Stable name used to invoke the built-in tool.
+	Name string `json:"name"`
+	// Policy describing which tool metadata may be recorded without obfuscation.
+	SafeForTelemetry BuiltinToolSafeForTelemetry `json:"safeForTelemetry"`
+	// Optional human-readable title for the tool.
+	Title *string `json:"title"`
+	// Optional tool category discriminator.
+	Type *string `json:"type"`
+}
+
+// Custom grammar input format accepted by a built-in tool.
+// Experimental: BuiltinToolFormat is part of an experimental API and may change or be
+// removed.
+type BuiltinToolFormat struct {
+	// Grammar definition accepted by the tool.
+	Definition string `json:"definition"`
+	// Grammar syntax used by the format definition.
+	Syntax string `json:"syntax"`
+	// Custom input-format discriminator.
+	Type BuiltinToolFormatType `json:"type"`
+}
+
+// JSON Schema object accepted by a built-in tool.
+// Experimental: BuiltinToolInputSchema is part of an experimental API and may change or be
+// removed.
+type BuiltinToolInputSchema struct {
+	// Root type of the tool input schema.
+	Type BuiltinToolInputSchemaType `json:"type"`
+}
+
+// Telemetry-safety policy for a built-in tool.
+// Experimental: BuiltinToolSafeForTelemetry is part of an experimental API and may change
+// or be removed.
+type BuiltinToolSafeForTelemetry interface {
+	builtinToolSafeForTelemetry()
+}
+
+type BuiltinToolSafeForTelemetryBoolean bool
+
+func (BuiltinToolSafeForTelemetryBoolean) builtinToolSafeForTelemetry() {}
+
+func (BuiltinToolSafeTelemetryFields) builtinToolSafeForTelemetry() {}
+
+// Per-field telemetry-safety policy for a built-in tool.
+// Experimental: BuiltinToolSafeTelemetryFields is part of an experimental API and may
+// change or be removed.
+type BuiltinToolSafeTelemetryFields struct {
+	// Whether tool input names may be included in telemetry without obfuscation.
+	InputsNames *bool `json:"inputsNames,omitempty"`
+	// Whether the tool name may be included in telemetry without obfuscation.
+	Name *bool `json:"name,omitempty"`
+}
+
 // Cancellation result for a user-requested shell command.
 // Experimental: CancelUserRequestedShellCommandResult is part of an experimental API and
 // may change or be removed.
@@ -1220,6 +1329,26 @@ type CanvasProviderOpenResult struct {
 	URL *string `json:"url,omitempty"`
 }
 
+// Internal canvas provider registration parameters.
+// Experimental: CanvasProviderRegisterRequest is part of an experimental API and may change
+// or be removed.
+type CanvasProviderRegisterRequest struct {
+	// Canvas contributions supplied by the provider
+	Canvases []any `json:"canvases"`
+	// Connection identifier for callback routing
+	ConnectionID string `json:"connectionId"`
+	// Provider metadata supplied by the host
+	Info any `json:"info"`
+}
+
+// Internal canvas provider unregistration parameters.
+// Experimental: CanvasProviderUnregisterRequest is part of an experimental API and may
+// change or be removed.
+type CanvasProviderUnregisterRequest struct {
+	// Connection identifier to unregister
+	ConnectionID string `json:"connectionId"`
+}
+
 // Session context supplied by the runtime.
 // Experimental: CanvasSessionContext is part of an experimental API and may change or be
 // removed.
@@ -1240,6 +1369,473 @@ type CapiSessionOptions struct {
 	EnableWebSocketResponses *bool `json:"enableWebSocketResponses,omitempty"`
 }
 
+// Semantic digest of a strictly parsed and schema-validated JSON MCP card. Both URL-backed
+// and embedded cards are canonicalised with RFC 8785 JSON Canonicalization Scheme, encoded
+// as UTF-8, and hashed with SHA-256.
+// Experimental: CardDigest is part of an experimental API and may change or be removed.
+type CardDigest struct {
+	// Digest algorithm and canonical representation
+	Algorithm CardDigestAlgorithm `json:"algorithm"`
+	// SHA-256 digest of the RFC 8785 canonical UTF-8 bytes, encoded as exactly 64 lowercase
+	// hexadecimal characters.
+	Value string `json:"value"`
+}
+
+// SHA-256 digest encoded as exactly 64 lowercase hexadecimal characters.
+// Experimental: CardDigestValue is part of an experimental API and may change or be removed.
+type CardDigestValue string
+
+// Where and when an AI skill catalog reference was observed. Discovery provenance
+// deliberately carries no content digest because search does not establish the exact
+// validated content a later plan will bind.
+// Experimental: CatalogAiSkillCandidateProvenance is part of an experimental API and may
+// change or be removed.
+type CatalogAiSkillCandidateProvenance struct {
+	// Host of the catalog authority that advertised the reference, without path, query, or
+	// credentials. Inert untrusted data.
+	Authority string `json:"authority"`
+	// Media type advertised for the referenced AI skill card
+	MediaType CatalogAiSkillCandidateProvenanceMediaType `json:"mediaType"`
+	// ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a
+	// retrieval or validation timestamp.
+	ObservedAt string `json:"observedAt"`
+}
+
+// One inert catalog result, represented as an MCP server or discovery-only AI skill variant
+// so kind, media type, provenance, and installability cannot contradict each other.
+// Experimental: CatalogCandidate is part of an experimental API and may change or be
+// removed.
+type CatalogCandidate interface {
+	catalogCandidate()
+	Kind() CatalogCandidateKind
+}
+
+type RawCatalogCandidateData struct {
+	Discriminator CatalogCandidateKind
+	Raw           json.RawMessage
+}
+
+func (RawCatalogCandidateData) catalogCandidate() {}
+func (r RawCatalogCandidateData) Kind() CatalogCandidateKind {
+	return r.Discriminator
+}
+
+// An inert AI skill catalog result. AI skills are discovery-only and cannot be represented
+// as installable through this surface.
+// Experimental: CatalogAiSkillCandidate is part of an experimental API and may change or be
+// removed.
+type CatalogAiSkillCandidate struct {
+	// Description taken verbatim from the card. Inert untrusted text.
+	Description *string `json:"description,omitempty"`
+	// Display name taken verbatim from the card. Inert untrusted text.
+	DisplayName string `json:"displayName"`
+	// Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries
+	// no readable information and is rejected when stale, replayed, or presented to a different
+	// runtime instance. Never logged.
+	Handle string `json:"handle"`
+	// ISO 8601 timestamp after which the handle is stale and will be rejected.
+	HandleExpiresAt string `json:"handleExpiresAt"`
+	// AI skills are discovery-only and cannot be installed through this surface
+	Installability CatalogAiSkillCandidateInstallability `json:"installability"`
+	// Media type of the underlying AI skill card
+	MediaType CatalogAiSkillCandidateMediaType `json:"mediaType"`
+	// Where the catalog reference was observed, without the card itself or any content digest.
+	Provenance CatalogAiSkillCandidateProvenance `json:"provenance"`
+	// Publisher taken verbatim from the card. Inert untrusted text.
+	Publisher *string `json:"publisher,omitempty"`
+	// Where the card came from: exactly one of a URL or embedded data, encoded as a tagged
+	// union so neither both nor neither can be represented.
+	Source CatalogCandidateSource `json:"source"`
+}
+
+func (CatalogAiSkillCandidate) catalogCandidate() {}
+func (CatalogAiSkillCandidate) Kind() CatalogCandidateKind {
+	return CatalogCandidateKindAiSkill
+}
+
+// An inert MCP server catalog result. Every free-text field is untrusted external data and
+// must never be treated as an instruction, and the handle is the only way to refer to the
+// candidate in a later operation.
+// Experimental: CatalogMCPServerCandidate is part of an experimental API and may change or
+// be removed.
+type CatalogMCPServerCandidate struct {
+	// Description taken verbatim from the card. Inert untrusted text.
+	Description *string `json:"description,omitempty"`
+	// Display name taken verbatim from the card. Inert untrusted text.
+	DisplayName string `json:"displayName"`
+	// Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries
+	// no readable information and is rejected when stale, replayed, or presented to a different
+	// runtime instance. Never logged.
+	Handle string `json:"handle"`
+	// ISO 8601 timestamp after which the handle is stale and will be rejected.
+	HandleExpiresAt string `json:"handleExpiresAt"`
+	// Whether this MCP server can be planned for installation, and if policy prevents it.
+	Installability CatalogMCPServerInstallability `json:"installability"`
+	// JSON MCP media type of the underlying card.
+	MediaType MCPServerCardMediaType `json:"mediaType"`
+	// Where the catalog reference was observed, without the card itself or any content digest.
+	Provenance CatalogMCPServerCandidateProvenance `json:"provenance"`
+	// Publisher taken verbatim from the card. Inert untrusted text.
+	Publisher *string `json:"publisher,omitempty"`
+	// Where the card came from: exactly one of a URL or embedded data, encoded as a tagged
+	// union so neither both nor neither can be represented.
+	Source CatalogCandidateSource `json:"source"`
+}
+
+func (CatalogMCPServerCandidate) catalogCandidate() {}
+func (CatalogMCPServerCandidate) Kind() CatalogCandidateKind {
+	return CatalogCandidateKindMCPServer
+}
+
+// Where a candidate's card came from. Exactly one of a URL or embedded data: the union has
+// no variant carrying both, and no variant carrying neither, so the rule holds structurally
+// rather than by validation.
+// Experimental: CatalogCandidateSource is part of an experimental API and may change or be
+// removed.
+type CatalogCandidateSource interface {
+	catalogCandidateSource()
+	Kind() CatalogCandidateSourceKind
+}
+
+type RawCatalogCandidateSourceData struct {
+	Discriminator CatalogCandidateSourceKind
+	Raw           json.RawMessage
+}
+
+func (RawCatalogCandidateSourceData) catalogCandidateSource() {}
+func (r RawCatalogCandidateSourceData) Kind() CatalogCandidateSourceKind {
+	return r.Discriminator
+}
+
+// Candidate whose card reference arrived inline. The document and its content-derived
+// properties stay behind the runtime boundary.
+// Experimental: CatalogCandidateSourceEmbedded is part of an experimental API and may
+// change or be removed.
+type CatalogCandidateSourceEmbedded struct {
+}
+
+func (CatalogCandidateSourceEmbedded) catalogCandidateSource() {}
+func (CatalogCandidateSourceEmbedded) Kind() CatalogCandidateSourceKind {
+	return CatalogCandidateSourceKindEmbedded
+}
+
+// Candidate whose card is retrieved from a URL through the runtime's hardened fetch
+// boundary.
+// Experimental: CatalogCandidateSourceURL is part of an experimental API and may change or
+// be removed.
+type CatalogCandidateSourceURL struct {
+	// Card URL as advertised. Inert untrusted data: the runtime retrieves it only through its
+	// own hardened boundary, and it is never logged.
+	URL string `json:"url"`
+}
+
+func (CatalogCandidateSourceURL) catalogCandidateSource() {}
+func (CatalogCandidateSourceURL) Kind() CatalogCandidateSourceKind {
+	return CatalogCandidateSourceKindURL
+}
+
+// Bounded extensible wire-feature identifier. Known values are described by
+// `CatalogCapability`; newer callers may send future identifiers so an older runtime can
+// return a typed negotiation refusal instead of failing schema validation. Capability
+// negotiation establishes contract understanding, while each operation's result separately
+// reports runtime availability.
+// Experimental: CatalogCapabilityID is part of an experimental API and may change or be
+// removed.
+type CatalogCapabilityID string
+
+// The protocol version and capability set a caller requires, supplied on every catalog
+// request so negotiation cannot be skipped by omission.
+// Experimental: CatalogClientContract is part of an experimental API and may change or be
+// removed.
+type CatalogClientContract struct {
+	// SDK protocol version the caller was generated against. A caller below the runtime's
+	// minimum supported version is refused rather than served a partial result.
+	ProtocolVersion int64 `json:"protocolVersion"`
+	// Wire features the caller requires the runtime to understand. Identifiers are bounded but
+	// extensible so a newer caller can negotiate with an older runtime. Requiring an unknown
+	// feature yields a typed refusal listing what is understood, never a partial grant. A grant
+	// does not promise that a deployment has enabled the operation; typed unavailable results
+	// report that separately.
+	RequiredCapabilities []string `json:"requiredCapabilities"`
+}
+
+// Where and when an MCP server catalog reference was observed. Discovery provenance
+// deliberately carries no content digest because search does not establish the exact
+// validated content a later plan will bind.
+// Experimental: CatalogMCPServerCandidateProvenance is part of an experimental API and may
+// change or be removed.
+type CatalogMCPServerCandidateProvenance struct {
+	// Host of the catalog authority that advertised the reference, without path, query, or
+	// credentials. Inert untrusted data.
+	Authority string `json:"authority"`
+	// JSON MCP media type advertised for the referenced card.
+	MediaType MCPServerCardMediaType `json:"mediaType"`
+	// ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a
+	// retrieval or validation timestamp.
+	ObservedAt string `json:"observedAt"`
+}
+
+// The protocol version and capability set the runtime actually honoured for a successful
+// catalog operation.
+// Experimental: CatalogNegotiatedContract is part of an experimental API and may change or
+// be removed.
+type CatalogNegotiatedContract struct {
+	// Wire features the runtime understood for this operation. Always a superset of the
+	// caller's required features, because any shortfall is a refusal instead. Operation
+	// availability remains a separate typed result.
+	GrantedCapabilities []CatalogCapability `json:"grantedCapabilities"`
+	// Protocol version of the runtime that served the request.
+	RuntimeProtocolVersion int64 `json:"runtimeProtocolVersion"`
+}
+
+// A bounded catalog search. Both the query length and the result count are capped by the
+// schema so a caller cannot request an unbounded scan.
+// Experimental: CatalogSearchRequest is part of an experimental API and may change or be
+// removed.
+type CatalogSearchRequest struct {
+	// Protocol version and capabilities the caller requires.
+	Contract CatalogClientContract `json:"contract"`
+	// Restrict results to these candidate kinds. When omitted, every kind the runtime supports
+	// is searched.
+	Kinds []CatalogCandidateKind `json:"kinds,omitzero"`
+	// Maximum number of candidates to return. Defaults to 10 when omitted.
+	Limit *int32 `json:"limit,omitempty"`
+	// Free-text search query. Never written to logs or telemetry.
+	Query string `json:"query"`
+}
+
+// Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal.
+// Never a partial success.
+// Experimental: CatalogSearchResult is part of an experimental API and may change or be
+// removed.
+type CatalogSearchResult interface {
+	catalogSearchResult()
+	Kind() CatalogSearchResultKind
+}
+
+type RawCatalogSearchResultData struct {
+	Discriminator CatalogSearchResultKind
+	Raw           json.RawMessage
+}
+
+func (RawCatalogSearchResultData) catalogSearchResult() {}
+func (r RawCatalogSearchResultData) Kind() CatalogSearchResultKind {
+	return r.Discriminator
+}
+
+// An optional catalog authentication exchange did not establish the caller's identity.
+// Anonymous search remains supported; this refusal is reserved for an operation that cannot
+// continue after the attempted exchange. It is distinct from `policy-rejected` and from a
+// network failure, and the reason identifies the recovery action.
+// Experimental: CatalogAuthenticationRequiredError is part of an experimental API and may
+// change or be removed.
+type CatalogAuthenticationRequiredError struct {
+	// Human-readable explanation, safe to surface. Never contains a credential or token, nor a
+	// query, URL, handle, or secret.
+	Message string `json:"message"`
+	// Why authentication failed. Only an expired credential justifies attempting a silent
+	// refresh; an absent or rejected credential requires sign-in.
+	Reason CatalogAuthenticationRequiredReason `json:"reason"`
+}
+
+func (CatalogAuthenticationRequiredError) catalogSearchResult() {}
+func (CatalogAuthenticationRequiredError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindAuthenticationRequired
+}
+
+// An upstream catalog response broke the wire contract. Most importantly, every result must
+// carry exactly one of a URL or embedded data: a result carrying both, or neither, is
+// refused here rather than being guessed at.
+// Experimental: CatalogContractViolationError is part of an experimental API and may change
+// or be removed.
+type CatalogContractViolationError struct {
+	// Human-readable explanation, safe to surface. Never echoes response content, nor a query,
+	// URL, handle, or secret.
+	Message string `json:"message"`
+	// Which rule the response broke.
+	Reason CatalogContractViolationReason `json:"reason"`
+}
+
+func (CatalogContractViolationError) catalogSearchResult() {}
+func (CatalogContractViolationError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindContractViolation
+}
+
+// The request was rejected before any work was done, because a bounded field fell outside
+// its permitted range or a required field was unusable.
+// Experimental: CatalogInvalidRequestError is part of an experimental API and may change or
+// be removed.
+type CatalogInvalidRequestError struct {
+	// Which request field was rejected.
+	Field CatalogInvalidRequestField `json:"field"`
+	// Human-readable explanation, safe to surface. Never echoes the offending value, nor a
+	// query, URL, handle, or secret.
+	Message string `json:"message"`
+}
+
+func (CatalogInvalidRequestError) catalogSearchResult() {}
+func (CatalogInvalidRequestError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindInvalidRequest
+}
+
+// A card could not be parsed or did not satisfy its declared media type's schema.
+// Experimental: CatalogMalformedCardError is part of an experimental API and may change or
+// be removed.
+type CatalogMalformedCardError struct {
+	// Media type the card was interpreted as, when it declared one this runtime recognises.
+	MediaType *CatalogMediaType `json:"mediaType,omitempty"`
+	// Human-readable explanation, safe to surface. Never echoes card content, nor a query, URL,
+	// handle, or secret.
+	Message string `json:"message"`
+	// How the card failed validation.
+	Reason CatalogMalformedCardReason `json:"reason"`
+}
+
+func (CatalogMalformedCardError) catalogSearchResult() {}
+func (CatalogMalformedCardError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindMalformedCard
+}
+
+// The caller's protocol version or required capabilities cannot be honoured. Returned
+// instead of a partial or ambiguous success.
+// Experimental: CatalogNegotiationRefusedError is part of an experimental API and may
+// change or be removed.
+type CatalogNegotiationRefusedError struct {
+	// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+	// secret.
+	Message string `json:"message"`
+	// Lowest caller protocol version this runtime will serve.
+	MinimumSupportedProtocolVersion int64 `json:"minimumSupportedProtocolVersion"`
+	// Whether the version or the capability set was the problem.
+	Reason CatalogNegotiationRefusedReason `json:"reason"`
+	// Protocol version of the runtime that refused the request.
+	RuntimeProtocolVersion int64 `json:"runtimeProtocolVersion"`
+	// Every wire feature this runtime understands, so the caller can retry within that
+	// contract. This list does not imply that every deployment has enabled every operation.
+	SupportedCapabilities []CatalogCapability `json:"supportedCapabilities"`
+	// The subset of the caller's bounded extensible capability identifiers this runtime cannot
+	// honour.
+	UnsupportedCapabilities []string `json:"unsupportedCapabilities"`
+}
+
+func (CatalogNegotiationRefusedError) catalogSearchResult() {}
+func (CatalogNegotiationRefusedError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindNegotiationRefused
+}
+
+// The runtime could not reach the catalog authority or retrieve a card. Covers being
+// offline as well as transport-level failure.
+// Experimental: CatalogNetworkFailureError is part of an experimental API and may change or
+// be removed.
+type CatalogNetworkFailureError struct {
+	// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+	// secret.
+	Message string `json:"message"`
+	// Categorised failure, low cardinality so it can be aggregated without carrying a URL.
+	Reason CatalogNetworkFailureReason `json:"reason"`
+	// HTTP status code, when the failure was a rejected response.
+	StatusCode *int32 `json:"statusCode,omitempty"`
+}
+
+func (CatalogNetworkFailureError) catalogSearchResult() {}
+func (CatalogNetworkFailureError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindNetworkFailure
+}
+
+// Registry or enterprise policy refused the operation.
+// Experimental: CatalogPolicyRejectedError is part of an experimental API and may change or
+// be removed.
+type CatalogPolicyRejectedError struct {
+	// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+	// secret.
+	Message string `json:"message"`
+	// Which authority produced the decision.
+	Source MCPPlanPolicySource `json:"source"`
+}
+
+func (CatalogPolicyRejectedError) catalogSearchResult() {}
+func (CatalogPolicyRejectedError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindPolicyRejected
+}
+
+// A completed catalog search: inert candidate summaries, each carrying a single-use handle.
+// Experimental: CatalogSearchSucceeded is part of an experimental API and may change or be
+// removed.
+type CatalogSearchSucceeded struct {
+	// Matching candidates, never more than the requested limit. All text is inert untrusted
+	// data.
+	Candidates []CatalogCandidate `json:"candidates"`
+	// Protocol version and capabilities the runtime honoured.
+	Negotiated CatalogNegotiatedContract `json:"negotiated"`
+	// Pseudonymous identifier for this search, issued by the runtime or by the catalog
+	// authority it queried and never by the caller, so it cannot be forged or replayed to
+	// attribute an install to a search that never happened. Always present on a success, so a
+	// result set can be tied to the installs it leads to. It identifies a search rather than a
+	// person: it is derived from no user, account, device, or query data, and must never be
+	// joined with user identity to re-identify anyone.
+	SearchID string `json:"searchId"`
+	// Whether further matches existed beyond the requested limit.
+	Truncated bool `json:"truncated"`
+}
+
+func (CatalogSearchSucceeded) catalogSearchResult() {}
+func (CatalogSearchSucceeded) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindSucceeded
+}
+
+// The operation is not available on this runtime. Distinct from a network failure: nothing
+// was attempted.
+// Experimental: CatalogUnavailableError is part of an experimental API and may change or be
+// removed.
+type CatalogUnavailableError struct {
+	// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+	// secret.
+	Message string `json:"message"`
+	// Why the operation is unavailable.
+	Reason CatalogUnavailableReason `json:"reason"`
+}
+
+func (CatalogUnavailableError) catalogSearchResult() {}
+func (CatalogUnavailableError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindUnavailable
+}
+
+// Retrieval was refused by the runtime's hardened fetch boundary before any request left
+// the process, or before a redirect was followed.
+// Experimental: CatalogUnsafeRetrievalError is part of an experimental API and may change
+// or be removed.
+type CatalogUnsafeRetrievalError struct {
+	// Human-readable explanation, safe to surface. Never contains the refused URL, nor a query,
+	// handle, or secret.
+	Message string `json:"message"`
+	// Which control refused the retrieval, low cardinality so it can be aggregated without
+	// carrying a URL.
+	Reason CatalogUnsafeRetrievalReason `json:"reason"`
+}
+
+func (CatalogUnsafeRetrievalError) catalogSearchResult() {}
+func (CatalogUnsafeRetrievalError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindUnsafeRetrieval
+}
+
+// The request asked for a candidate kind this runtime does not serve.
+// Experimental: CatalogUnsupportedKindError is part of an experimental API and may change
+// or be removed.
+type CatalogUnsupportedKindError struct {
+	// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+	// secret.
+	Message string `json:"message"`
+	// The kinds from the request that are not supported.
+	RequestedKinds []CatalogCandidateKind `json:"requestedKinds"`
+	// Every candidate kind this runtime can serve.
+	SupportedKinds []CatalogCandidateKind `json:"supportedKinds"`
+}
+
+func (CatalogUnsupportedKindError) catalogSearchResult() {}
+func (CatalogUnsupportedKindError) Kind() CatalogSearchResultKind {
+	return CatalogSearchResultKindUnsupportedKind
+}
+
 // Slash commands available in the session, after applying any include/exclude filters.
 // Experimental: CommandList is part of an experimental API and may change or be removed.
 type CommandList struct {
@@ -1247,6 +1843,28 @@ type CommandList struct {
 	Commands []SlashCommandInfo `json:"commands"`
 }
 
+// The pending slash-command invocation effect to finalize, plus whether the host applied or
+// cancelled it.
+// Experimental: CommandsFinalizeInvocationEffectRequest is part of an experimental API and
+// may change or be removed.
+type CommandsFinalizeInvocationEffectRequest struct {
+	// The slash-command result object that produced the pending effect, echoed back unchanged.
+	Effect any `json:"effect"`
+	// Whether the host applied or cancelled the pending invocation effect.
+	Outcome CommandsInvocationEffectOutcome `json:"outcome"`
+}
+
+// Whether finalizing the invocation effect succeeded, and the failure reason when it did
+// not.
+// Experimental: CommandsFinalizeInvocationEffectResult is part of an experimental API and
+// may change or be removed.
+type CommandsFinalizeInvocationEffectResult struct {
+	// Failure reason when the invocation effect could not be finalized.
+	Error *string `json:"error,omitempty"`
+	// Whether the pending invocation effect was finalized successfully.
+	Success bool `json:"success"`
+}
+
 // Pending command request ID and an optional error if the client handler failed.
 // Experimental: CommandsHandlePendingCommandRequest is part of an experimental API and may
 // change or be removed.
@@ -1273,6 +1891,8 @@ type CommandsInvokeRequest struct {
 	Input *string `json:"input,omitempty"`
 	// Command name. Leading slashes are stripped and the name is matched case-insensitively.
 	Name string `json:"name"`
+	// Optional client surface that initiated the invocation
+	Origin *CommandsInvocationOrigin `json:"origin,omitempty"`
 }
 
 // Experimental: CommandsListRequest is part of an experimental API and may change or be
@@ -1352,6 +1972,25 @@ type ConfigureSessionExtensionsParams struct {
 	SessionID string `json:"sessionId"`
 }
 
+// Identity of the integrating host, declared once on the `server.connect` handshake so
+// telemetry from this connection is attributed to a single, consistent surface. All fields
+// are optional; omit them to keep the default attribution.
+// Experimental: ConnectClientInfo is part of an experimental API and may change or be
+// removed.
+// Internal: ConnectClientInfo is an internal SDK API and is not part of the public surface.
+type ConnectClientInfo struct {
+	// Name of the host editor, e.g. `"vscode"`.
+	EditorName *string `json:"editorName,omitempty"`
+	// Version of the host editor, e.g. `"1.124.2"`. Ignored unless it looks like a version
+	// string.
+	EditorVersion *string `json:"editorVersion,omitempty"`
+	// Name of the Copilot extension within the host, e.g. `"copilot-chat"`.
+	ExtensionName *string `json:"extensionName,omitempty"`
+	// Version of the Copilot extension within the host, e.g. `"0.54.0"`. Ignored unless it
+	// looks like a version string.
+	ExtensionVersion *string `json:"extensionVersion,omitempty"`
+}
+
 // Metadata for a connected remote session.
 // Experimental: ConnectedRemoteSessionMetadata is part of an experimental API and may
 // change or be removed.
@@ -1400,11 +2039,15 @@ type ConnectRemoteSessionParams struct {
 	SessionID string `json:"sessionId"`
 }
 
-// Parameters for the `server.connect` handshake: an optional connection token and optional
-// connection-level opt-ins (e.g. GitHub telemetry forwarding).
+// Connection-level opt-ins for the `server.connect` handshake. Transport authentication is
+// consumed by the native protocol boundary before dispatch.
 // Experimental: ConnectRequest is part of an experimental API and may change or be removed.
 // Internal: ConnectRequest is an internal SDK API and is not part of the public surface.
 type ConnectRequest struct {
+	// Identity of the integrating host. Optional; omit it to keep the default attribution.
+	// Internal: ClientInfo is part of the SDK's internal API surface and is not intended for
+	// external use.
+	ClientInfo *ConnectClientInfo `json:"clientInfo,omitempty"`
 	// Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the
 	// runtime forwards every internal telemetry event it emits — across all sessions, plus
 	// sessionless events — to this connection over the `gitHubTelemetry.event` notification.
@@ -1547,16 +2190,23 @@ type CopilotUserResponse struct {
 // Experimental: CopilotUserResponseEndpoints is part of an experimental API and may change
 // or be removed.
 type CopilotUserResponseEndpoints struct {
-	API           *string `json:"api,omitempty"`
-	Exp           *string `json:"exp,omitempty"`
+	// Copilot API endpoint URL.
+	API *string `json:"api,omitempty"`
+	// Experimental-service endpoint URL.
+	Exp *string `json:"exp,omitempty"`
+	// Origin-tracker endpoint URL.
 	OriginTracker *string `json:"origin-tracker,omitempty"`
-	Proxy         *string `json:"proxy,omitempty"`
-	Telemetry     *string `json:"telemetry,omitempty"`
+	// Copilot proxy endpoint URL.
+	Proxy *string `json:"proxy,omitempty"`
+	// Copilot telemetry endpoint URL.
+	Telemetry *string `json:"telemetry,omitempty"`
 }
 
 type CopilotUserResponseOrganizationListItem struct {
+	// GitHub login of the organization.
 	Login *string `json:"login,omitempty"`
-	Name  *string `json:"name,omitempty"`
+	// Display name of the organization.
+	Name *string `json:"name,omitempty"`
 }
 
 // Quota snapshot map from the raw Copilot user-response passthrough, with chat,
@@ -2109,6 +2759,44 @@ type Extension struct {
 	Status ExtensionStatus `json:"status"`
 }
 
+// Opaque integrator-owned process launch profile for one extension entrypoint.
+// Experimental: ExtensionLaunchProfile is part of an experimental API and may change or be
+// removed.
+type ExtensionLaunchProfile struct {
+	// Opaque integrator-defined arguments passed to the executable. The runtime does not append
+	// the extension entrypoint.
+	Args []string `json:"args"`
+	// Opaque integrator-defined environment variables. Runtime-owned COPILOT_SDK_PATH,
+	// SESSION_ID, and COPILOT_EXTENSION_PARENT_PID values take precedence.
+	Env map[string]string `json:"env"`
+	// Executable used to launch the extension entrypoint.
+	Executable string `json:"executable"`
+}
+
+// A discovered extension entrypoint that the registered integrator may classify and resolve
+// to an opaque launch profile.
+// Experimental: ExtensionLaunchProviderResolveRequest is part of an experimental API and
+// may change or be removed.
+type ExtensionLaunchProviderResolveRequest struct {
+	// Source-qualified extension identifier.
+	ID string `json:"id"`
+	// Absolute path to the discovered extension entrypoint.
+	ModulePath string `json:"modulePath"`
+	// Human-readable extension name.
+	Name string `json:"name"`
+	// Discovery source for the extension entrypoint.
+	Source ExtensionSource `json:"source"`
+}
+
+// The launch profile for a supported entrypoint. Omit launch when the provider does not
+// support the entrypoint.
+// Experimental: ExtensionLaunchProviderResolveResult is part of an experimental API and may
+// change or be removed.
+type ExtensionLaunchProviderResolveResult struct {
+	// Opaque launch profile, omitted when this provider does not support the entrypoint.
+	Launch *ExtensionLaunchProfile `json:"launch,omitempty"`
+}
+
 // Extensions discovered for the session, with their current status.
 // Experimental: ExtensionList is part of an experimental API and may change or be removed.
 type ExtensionList struct {
@@ -2414,10 +3102,16 @@ type FactoryAckResult struct {
 // Experimental: FactoryAgentOptions is part of an experimental API and may change or be
 // removed.
 type FactoryAgentOptions struct {
+	// Optional custom agent name for the subagent. This field is accepted but not yet honored.
+	Agent *string `json:"agent,omitempty"`
+	// Optional context tier for the subagent. This field is accepted but not yet honored.
+	ContextTier *ContextTier `json:"contextTier,omitempty"`
 	// Optional label distinguishing otherwise identical memoized agent calls.
 	Label *string `json:"label,omitempty"`
 	// Optional model identifier for the subagent.
 	Model *string `json:"model,omitempty"`
+	// Optional reasoning effort for the subagent. This field is accepted but not yet honored.
+	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
 	// Optional JSON Schema for structured agent output.
 	Schema any `json:"schema,omitempty"`
 }
@@ -2448,19 +3142,34 @@ type FactoryAgentResult struct {
 // Experimental: FactoryAgentSummary is part of an experimental API and may change or be
 // removed.
 type FactoryAgentSummary struct {
-	ActiveMs       int64   `json:"activeMs"`
-	Activity       *string `json:"activity,omitempty"`
-	AgentID        string  `json:"agentId"`
-	AgentType      string  `json:"agentType"`
-	CompletedAt    *int64  `json:"completedAt,omitempty"`
-	Label          string  `json:"label"`
-	PhaseID        *string `json:"phaseId"`
+	// Accumulated active agent time in milliseconds.
+	ActiveMs int64 `json:"activeMs"`
+	// Prompt-safe live activity text.
+	Activity *string `json:"activity,omitempty"`
+	// Stable direct-agent identifier.
+	AgentID string `json:"agentId"`
+	// Registered agent type.
+	AgentType string `json:"agentType"`
+	// Epoch milliseconds when the agent completed.
+	CompletedAt *int64 `json:"completedAt,omitempty"`
+	// Friendly, non-unique name intended for display
+	DisplayName *string `json:"displayName,omitempty"`
+	// Friendly, non-unique name intended for display
+	Label string `json:"label"`
+	// Phase identifier active when the agent was launched, or null.
+	PhaseID *string `json:"phaseId"`
+	// Model requested when the agent was launched.
 	RequestedModel *string `json:"requestedModel,omitempty"`
-	ResolvedModel  *string `json:"resolvedModel,omitempty"`
-	RunID          string  `json:"runId"`
-	StartedAt      *int64  `json:"startedAt,omitempty"`
-	Status         string  `json:"status"`
-	ToolCallID     string  `json:"toolCallId"`
+	// Concrete model resolved for the agent.
+	ResolvedModel *string `json:"resolvedModel,omitempty"`
+	// Owning factory run identifier.
+	RunID string `json:"runId"`
+	// Epoch milliseconds when the agent started.
+	StartedAt *int64 `json:"startedAt,omitempty"`
+	// Current durable or live agent status.
+	Status string `json:"status"`
+	// Tool-call identifier that launched the agent.
+	ToolCallID string `json:"toolCallId"`
 }
 
 // Parameters for cancelling a factory run.
@@ -2475,7 +3184,9 @@ type FactoryCancelRequest struct {
 // Experimental: FactoryCurrentPhase is part of an experimental API and may change or be
 // removed.
 type FactoryCurrentPhase struct {
-	ID      string `json:"id"`
+	// Current phase identifier.
+	ID string `json:"id"`
+	// Zero-based declared phase ordinal, or null for an undeclared phase.
 	Ordinal *int64 `json:"ordinal"`
 }
 
@@ -2483,10 +3194,14 @@ type FactoryCurrentPhase struct {
 // Experimental: FactoryDeclaredLimits is part of an experimental API and may change or be
 // removed.
 type FactoryDeclaredLimits struct {
-	MaxAiCredits           *float64 `json:"maxAiCredits,omitempty"`
-	MaxConcurrentSubagents *int64   `json:"maxConcurrentSubagents,omitempty"`
-	MaxTotalSubagents      *int64   `json:"maxTotalSubagents,omitempty"`
-	TimeoutSeconds         *float64 `json:"timeoutSeconds,omitempty"`
+	// Maximum AI credits consumed by subagents and descendants.
+	MaxAiCredits *float64 `json:"maxAiCredits,omitempty"`
+	// Maximum concurrently active subagents.
+	MaxConcurrentSubagents *int64 `json:"maxConcurrentSubagents,omitempty"`
+	// Maximum total subagents spawned by the run.
+	MaxTotalSubagents *int64 `json:"maxTotalSubagents,omitempty"`
+	// Maximum accumulated active execution time in seconds.
+	TimeoutSeconds *float64 `json:"timeoutSeconds,omitempty"`
 }
 
 // Parameters sent to the owning extension to execute a factory closure.
@@ -2573,16 +3288,31 @@ type FactoryJournalPutRequest struct {
 	RunID string `json:"runId"`
 }
 
-// Empty parameters for listing factory runs.
+// Parameters for paging factory runs.
 // Experimental: FactoryListRunsRequest is part of an experimental API and may change or be
 // removed.
 type FactoryListRunsRequest struct {
+	// Exclusive forward cursor.
+	AfterSeq *int64 `json:"afterSeq,omitempty"`
+	// Exclusive backward cursor.
+	BeforeSeq *int64 `json:"beforeSeq,omitempty"`
+	// Maximum terminal runs to return. Defaults to 200 and is capped at 500.
+	Limit *int32 `json:"limit,omitempty"`
 }
 
-// Factory runs in durable creation order.
+// A page of factory runs in durable creation order.
 // Experimental: FactoryListRunsResult is part of an experimental API and may change or be
 // removed.
 type FactoryListRunsResult struct {
+	// Whether terminal runs newer than this page exist.
+	HasMoreNewer *bool `json:"hasMoreNewer,omitempty"`
+	// Newest terminal-run cursor in this page, or null when the terminal window is empty.
+	NewestSeq *int64 `json:"newestSeq,omitempty"`
+	// Oldest terminal-run cursor in this page, or null when the terminal window is empty.
+	OldestSeq *int64 `json:"oldestSeq,omitempty"`
+	// Number of terminal runs older than this page.
+	OmittedOlder *int64 `json:"omittedOlder,omitempty"`
+	// Factory run summaries in durable creation order.
 	Runs []FactoryRunSummary `json:"runs"`
 }
 
@@ -2613,19 +3343,35 @@ type FactoryLogRequest struct {
 // Experimental: FactoryPhaseObservation is part of an experimental API and may change or be
 // removed.
 type FactoryPhaseObservation struct {
-	AccumulatedActiveMs   int64              `json:"accumulatedActiveMs"`
-	CompletedAt           *int64             `json:"completedAt,omitempty"`
-	CurrentActiveMs       int64              `json:"currentActiveMs"`
-	Detail                *string            `json:"detail,omitempty"`
-	EntryCount            int64              `json:"entryCount"`
-	ID                    string             `json:"id"`
-	LastEnteredRunAttempt int64              `json:"lastEnteredRunAttempt"`
-	LiveAgentCount        int64              `json:"liveAgentCount"`
-	Ordinal               *int64             `json:"ordinal"`
-	StartedAt             *int64             `json:"startedAt,omitempty"`
-	Status                FactoryPhaseStatus `json:"status"`
-	Title                 string             `json:"title"`
-	TotalAgentCount       int64              `json:"totalAgentCount"`
+	// Completed active time accumulated by this phase in milliseconds.
+	AccumulatedActiveMs int64 `json:"accumulatedActiveMs"`
+	// Epoch milliseconds when this phase completed; for a skipped phase, the synthetic skip
+	// timestamp (equal to `startedAt`).
+	CompletedAt *int64 `json:"completedAt,omitempty"`
+	// Current live active time for this phase in milliseconds.
+	CurrentActiveMs int64 `json:"currentActiveMs"`
+	// Optional human-readable phase detail.
+	Detail *string `json:"detail,omitempty"`
+	// Number of times execution entered this phase.
+	EntryCount int64 `json:"entryCount"`
+	// Phase identifier.
+	ID string `json:"id"`
+	// Most recent run attempt that entered this phase, or `0` if the phase has never been
+	// entered.
+	LastEnteredRunAttempt int64 `json:"lastEnteredRunAttempt"`
+	// Direct agents in this phase that are currently live.
+	LiveAgentCount int64 `json:"liveAgentCount"`
+	// Zero-based declared phase ordinal, or null for an undeclared phase.
+	Ordinal *int64 `json:"ordinal"`
+	// Epoch milliseconds when this phase first started; for a skipped phase, the synthetic skip
+	// timestamp (equal to `completedAt`).
+	StartedAt *int64 `json:"startedAt,omitempty"`
+	// Derived lifecycle state of the phase.
+	Status FactoryPhaseStatus `json:"status"`
+	// Human-readable phase title.
+	Title string `json:"title"`
+	// Total direct agents associated with this phase.
+	TotalAgentCount int64 `json:"totalAgentCount"`
 }
 
 // One durable factory progress record.
@@ -2650,11 +3396,16 @@ type FactoryProgressLine struct {
 // Experimental: FactoryProgressPage is part of an experimental API and may change or be
 // removed.
 type FactoryProgressPage struct {
-	HasMoreNewer bool                  `json:"hasMoreNewer"`
-	HasMoreOlder bool                  `json:"hasMoreOlder"`
-	NewestSeq    *int64                `json:"newestSeq"`
-	OldestSeq    *int64                `json:"oldestSeq"`
-	Records      []FactoryProgressLine `json:"records"`
+	// Whether progress records newer than this page exist.
+	HasMoreNewer bool `json:"hasMoreNewer"`
+	// Whether progress records older than this page exist.
+	HasMoreOlder bool `json:"hasMoreOlder"`
+	// Newest sequence number in this page, or null when empty.
+	NewestSeq *int64 `json:"newestSeq"`
+	// Oldest sequence number in this page, or null when empty.
+	OldestSeq *int64 `json:"oldestSeq"`
+	// Progress records in sequence order.
+	Records []FactoryProgressLine `json:"records"`
 	// Run revision reflected by this page.
 	Revision int64 `json:"revision"`
 }
@@ -2683,8 +3434,11 @@ type FactoryResumeResult struct {
 // Experimental: FactoryRunConsumed is part of an experimental API and may change or be
 // removed.
 type FactoryRunConsumed struct {
-	ActiveMs  int64 `json:"activeMs"`
-	NanoAiu   int64 `json:"nanoAiu"`
+	// Accumulated active execution time in milliseconds.
+	ActiveMs int64 `json:"activeMs"`
+	// AI usage consumed by the run in nano-AIU.
+	NanoAiu int64 `json:"nanoAiu"`
+	// Total subagents spawned by the run.
 	Subagents int64 `json:"subagents"`
 }
 
@@ -2692,28 +3446,50 @@ type FactoryRunConsumed struct {
 // Experimental: FactoryRunDetail is part of an experimental API and may change or be
 // removed.
 type FactoryRunDetail struct {
-	ActiveSegmentStartedAt *int64                    `json:"activeSegmentStartedAt"`
-	Agents                 []FactoryAgentSummary     `json:"agents"`
-	Approved               *FactoryDeclaredLimits    `json:"approved"`
-	CompletedAt            *int64                    `json:"completedAt"`
-	Consumed               FactoryRunConsumed        `json:"consumed"`
-	CreatedAt              int64                     `json:"createdAt"`
-	CurrentPhase           *FactoryCurrentPhase      `json:"currentPhase"`
-	DeclaredLimits         FactoryDeclaredLimits     `json:"declaredLimits"`
-	DeclaredPhaseCount     int64                     `json:"declaredPhaseCount"`
-	Description            string                    `json:"description"`
-	FactoryName            string                    `json:"factoryName"`
-	LiveAgentCount         int64                     `json:"liveAgentCount"`
-	ObservedAt             int64                     `json:"observedAt"`
-	Phases                 []FactoryPhaseObservation `json:"phases"`
-	Progress               FactoryProgressPage       `json:"progress"`
-	Revision               int64                     `json:"revision"`
-	RunID                  string                    `json:"runId"`
-	StartedAt              *int64                    `json:"startedAt"`
-	Status                 FactoryRunStatus          `json:"status"`
-	Terminal               *FactoryRunTerminal       `json:"terminal"`
-	TotalSpawnedAgentCount int64                     `json:"totalSpawnedAgentCount"`
-	UpdatedAt              int64                     `json:"updatedAt"`
+	// Epoch milliseconds when the current active segment started, or null while inactive.
+	ActiveSegmentStartedAt *int64 `json:"activeSegmentStartedAt"`
+	// Durable identities and live statuses for direct factory agents.
+	Agents []FactoryAgentSummary `json:"agents"`
+	// Approved effective resource ceilings, or null until approved.
+	Approved *FactoryDeclaredLimits `json:"approved"`
+	// Epoch milliseconds when the run completed, or null while nonterminal.
+	CompletedAt *int64 `json:"completedAt"`
+	// Durable resource consumption.
+	Consumed FactoryRunConsumed `json:"consumed"`
+	// Epoch milliseconds when the run was created.
+	CreatedAt int64 `json:"createdAt"`
+	// Current phase identity, or null before any phase is entered.
+	CurrentPhase *FactoryCurrentPhase `json:"currentPhase"`
+	// Resource ceilings declared by the factory.
+	DeclaredLimits FactoryDeclaredLimits `json:"declaredLimits"`
+	// Number of phases declared by the factory.
+	DeclaredPhaseCount int64 `json:"declaredPhaseCount"`
+	// Human-readable factory description.
+	Description string `json:"description"`
+	// Registered factory name.
+	FactoryName string `json:"factoryName"`
+	// Number of direct factory agents currently live.
+	LiveAgentCount int64 `json:"liveAgentCount"`
+	// Epoch milliseconds when this live-overlay snapshot was observed.
+	ObservedAt int64 `json:"observedAt"`
+	// Lifecycle and timing observations for each factory phase.
+	Phases []FactoryPhaseObservation `json:"phases"`
+	// Bidirectional page of durable factory progress.
+	Progress FactoryProgressPage `json:"progress"`
+	// Monotonic durable run revision.
+	Revision int64 `json:"revision"`
+	// Factory run identifier.
+	RunID string `json:"runId"`
+	// Epoch milliseconds when execution first started, or null before start.
+	StartedAt *int64 `json:"startedAt"`
+	// Current factory run status.
+	Status FactoryRunStatus `json:"status"`
+	// Terminal run outcome, or null while nonterminal.
+	Terminal *FactoryRunTerminal `json:"terminal"`
+	// Total direct factory agents spawned across all attempts.
+	TotalSpawnedAgentCount int64 `json:"totalSpawnedAgentCount"`
+	// Epoch milliseconds when the durable run was last updated.
+	UpdatedAt int64 `json:"updatedAt"`
 }
 
 // Machine-readable factory run failure.
@@ -2734,6 +3510,19 @@ func (r RawFactoryRunFailureData) Type() FactoryRunFailureType {
 	return r.Discriminator
 }
 
+// The run stopped because its usage accounting could not be completed.
+type FactoryRunFailureFactoryAccountingIncomplete struct {
+	// Confirmed usage in nano-AIU, representing the floor of what the run spent.
+	DrainedNanoAiu int64 `json:"drainedNanoAiu"`
+	// Factory run identifier.
+	RunID string `json:"runId"`
+}
+
+func (FactoryRunFailureFactoryAccountingIncomplete) factoryRunFailure() {}
+func (FactoryRunFailureFactoryAccountingIncomplete) Type() FactoryRunFailureType {
+	return FactoryRunFailureTypeFactoryAccountingIncomplete
+}
+
 type FactoryRunFailureFactoryDurableFailure struct {
 	// Stable failure code.
 	Code string `json:"code"`
@@ -2827,35 +3616,58 @@ type FactoryRunResult struct {
 // Experimental: FactoryRunSummary is part of an experimental API and may change or be
 // removed.
 type FactoryRunSummary struct {
-	ActiveSegmentStartedAt *int64                 `json:"activeSegmentStartedAt"`
-	Approved               *FactoryDeclaredLimits `json:"approved"`
-	CompletedAt            *int64                 `json:"completedAt"`
-	Consumed               FactoryRunConsumed     `json:"consumed"`
-	CreatedAt              int64                  `json:"createdAt"`
-	CurrentPhase           *FactoryCurrentPhase   `json:"currentPhase"`
-	DeclaredLimits         FactoryDeclaredLimits  `json:"declaredLimits"`
-	DeclaredPhaseCount     int64                  `json:"declaredPhaseCount"`
-	Description            string                 `json:"description"`
-	FactoryName            string                 `json:"factoryName"`
-	LiveAgentCount         int64                  `json:"liveAgentCount"`
-	ObservedAt             int64                  `json:"observedAt"`
-	Revision               int64                  `json:"revision"`
-	RunID                  string                 `json:"runId"`
-	StartedAt              *int64                 `json:"startedAt"`
-	Status                 FactoryRunStatus       `json:"status"`
-	Terminal               *FactoryRunTerminal    `json:"terminal"`
-	TotalSpawnedAgentCount int64                  `json:"totalSpawnedAgentCount"`
-	UpdatedAt              int64                  `json:"updatedAt"`
+	// Epoch milliseconds when the current active segment started, or null while inactive.
+	ActiveSegmentStartedAt *int64 `json:"activeSegmentStartedAt"`
+	// Approved effective resource ceilings, or null until approved.
+	Approved *FactoryDeclaredLimits `json:"approved"`
+	// Epoch milliseconds when the run completed, or null while nonterminal.
+	CompletedAt *int64 `json:"completedAt"`
+	// Durable resource consumption.
+	Consumed FactoryRunConsumed `json:"consumed"`
+	// Epoch milliseconds when the run was created.
+	CreatedAt int64 `json:"createdAt"`
+	// Current phase identity, or null before any phase is entered.
+	CurrentPhase *FactoryCurrentPhase `json:"currentPhase"`
+	// Resource ceilings declared by the factory.
+	DeclaredLimits FactoryDeclaredLimits `json:"declaredLimits"`
+	// Number of phases declared by the factory.
+	DeclaredPhaseCount int64 `json:"declaredPhaseCount"`
+	// Human-readable factory description.
+	Description string `json:"description"`
+	// Registered factory name.
+	FactoryName string `json:"factoryName"`
+	// Number of direct factory agents currently live.
+	LiveAgentCount int64 `json:"liveAgentCount"`
+	// Epoch milliseconds when this live-overlay snapshot was observed.
+	ObservedAt int64 `json:"observedAt"`
+	// Monotonic durable run revision.
+	Revision int64 `json:"revision"`
+	// Factory run identifier.
+	RunID string `json:"runId"`
+	// Epoch milliseconds when execution first started, or null before start.
+	StartedAt *int64 `json:"startedAt"`
+	// Current factory run status.
+	Status FactoryRunStatus `json:"status"`
+	// Terminal run outcome, or null while nonterminal.
+	Terminal *FactoryRunTerminal `json:"terminal"`
+	// Total direct factory agents spawned across all attempts.
+	TotalSpawnedAgentCount int64 `json:"totalSpawnedAgentCount"`
+	// Epoch milliseconds when the durable run was last updated.
+	UpdatedAt int64 `json:"updatedAt"`
 }
 
 // Prompt-safe terminal factory outcome.
 // Experimental: FactoryRunTerminal is part of an experimental API and may change or be
 // removed.
 type FactoryRunTerminal struct {
-	Error         *string           `json:"error,omitempty"`
-	Failure       FactoryRunFailure `json:"failure,omitempty"`
-	Reason        *string           `json:"reason,omitempty"`
-	ResultPreview *string           `json:"resultPreview,omitempty"`
+	// Human-readable terminal error.
+	Error *string `json:"error,omitempty"`
+	// Machine-readable terminal failure.
+	Failure FactoryRunFailure `json:"failure,omitempty"`
+	// Human-readable terminal reason.
+	Reason *string `json:"reason,omitempty"`
+	// Prompt-safe preview of the completed result.
+	ResultPreview *string `json:"resultPreview,omitempty"`
 }
 
 // Content filtering mode to apply to all tools, or a map of tool name to content filtering
@@ -2934,6 +3746,10 @@ type GitHubTelemetryClientInfo struct {
 	CLIVersion string `json:"cli_version"`
 	// Copilot subscription plan, when known.
 	CopilotPlan *string `json:"copilot_plan,omitempty"`
+	// Number of logical CPU cores on the host.
+	CpuCount *int64 `json:"cpu_count,omitempty"`
+	// Distinct CPU model names for the host, comma-separated.
+	CpuModel *string `json:"cpu_model,omitempty"`
 	// Stable machine identifier for the device.
 	DevDeviceID *string `json:"dev_device_id,omitempty"`
 	// Whether the user is a GitHub/Microsoft staff member.
@@ -2999,9 +3815,64 @@ type GitHubTelemetryNotification struct {
 	SessionID *string `json:"sessionId,omitempty"`
 }
 
-// Pending external tool call request ID, with the tool result or an error describing why it
-// failed.
-// Experimental: HandlePendingToolCallRequest is part of an experimental API and may change
+// Asks the SDK client to acquire a GitHub access token from an opaque callback registration.
+// Experimental: GitHubTokenAcquireRequest is part of an experimental API and may change or
+// be removed.
+type GitHubTokenAcquireRequest struct {
+	// Effective GitHub host for which the callback must return a token.
+	Host string `json:"host"`
+	// Why the runtime is requesting a GitHub credential.
+	Reason GitHubTokenAcquireReason `json:"reason"`
+	// Opaque identifier generated by the SDK for this callback registration.
+	RegistrationID string `json:"registrationId"`
+	// Session receiving the token. Absent only before a cloud session has been assigned its id.
+	SessionID *string `json:"sessionId,omitempty"`
+}
+
+// SDK host response to a GitHub credential request.
+// Experimental: GitHubTokenAcquireResult is part of an experimental API and may change or
+// be removed.
+type GitHubTokenAcquireResult interface {
+	githubTokenAcquireResult()
+	Kind() GitHubTokenAcquireResultKind
+}
+
+type RawGitHubTokenAcquireResultData struct {
+	Discriminator GitHubTokenAcquireResultKind
+	Raw           json.RawMessage
+}
+
+func (RawGitHubTokenAcquireResultData) githubTokenAcquireResult() {}
+func (r RawGitHubTokenAcquireResultData) Kind() GitHubTokenAcquireResultKind {
+	return r.Discriminator
+}
+
+type GitHubTokenAcquireResultCancelled struct {
+}
+
+func (GitHubTokenAcquireResultCancelled) githubTokenAcquireResult() {}
+func (GitHubTokenAcquireResultCancelled) Kind() GitHubTokenAcquireResultKind {
+	return GitHubTokenAcquireResultKindCancelled
+}
+
+type GitHubTokenAcquireResultToken struct {
+	// GitHub access token acquired by the SDK host.
+	AccessToken string `json:"accessToken"`
+	// Remaining token lifetime in seconds when callback execution completes. It must exceed the
+	// one-hour preflight refresh threshold.
+	ExpiresIn int64 `json:"expiresIn"`
+	// OAuth token type. Defaults to bearer when omitted.
+	TokenType *string `json:"tokenType,omitempty"`
+}
+
+func (GitHubTokenAcquireResultToken) githubTokenAcquireResult() {}
+func (GitHubTokenAcquireResultToken) Kind() GitHubTokenAcquireResultKind {
+	return GitHubTokenAcquireResultKindToken
+}
+
+// Pending external tool call request ID, with the tool result or an error describing why it
+// failed.
+// Experimental: HandlePendingToolCallRequest is part of an experimental API and may change
 // or be removed.
 type HandlePendingToolCallRequest struct {
 	// Error message if the tool call failed
@@ -3308,6 +4179,12 @@ type InstalledPlugin struct {
 	Enabled bool `json:"enabled"`
 	// Installation timestamp
 	InstalledAt string `json:"installed_at"`
+	// Absolute path of the marketplace directory a live plugin was resolved from. Present only
+	// on live, never-persisted records — those synthesized at session start for a
+	// directory/local marketplace, whose cache_path points at the real plugin directory on disk
+	// rather than a copy under the installed-plugins cache. Its presence is what marks a record
+	// as live, and no record carrying it is ever written to the persisted installedPlugins key.
+	InstalledFrom *string `json:"installed_from,omitempty"`
 	// Marketplace the plugin came from (empty string for direct repo installs)
 	Marketplace string `json:"marketplace"`
 	// Plugin name
@@ -3334,6 +4211,13 @@ type InstalledPluginInfo struct {
 	DirectSourceID *string `json:"directSourceId,omitempty"`
 	// Whether the plugin is currently enabled for new sessions
 	Enabled bool `json:"enabled"`
+	// Absolute path of the marketplace directory a live plugin was resolved from. Present only
+	// on live, never-persisted records — a plugin belonging to a directory/local marketplace,
+	// which is loaded from its real directory on every pass instead of a copy under the
+	// installed-plugins cache. Its presence is what marks a listed plugin as live: such a
+	// plugin is always present on disk, so `enabled` is its only meaningful state and it is
+	// never "not installed".
+	InstalledFrom *string `json:"installedFrom,omitempty"`
 	// Marketplace the plugin came from. Empty string ("") for direct repo / URL / local
 	// installs.
 	Marketplace string `json:"marketplace"`
@@ -3358,9 +4242,12 @@ type InstalledPluginSource struct {
 // Experimental: InstalledPluginSourceGitHub is part of an experimental API and may change
 // or be removed.
 type InstalledPluginSourceGitHub struct {
+	// Optional repository-relative path to the plugin.
 	Path *string `json:"path,omitempty"`
-	Ref  *string `json:"ref,omitempty"`
-	Repo string  `json:"repo"`
+	// Optional Git ref to resolve.
+	Ref *string `json:"ref,omitempty"`
+	// GitHub repository in `owner/repo` form.
+	Repo string `json:"repo"`
 	// Optional full 40-character hexadecimal commit SHA.
 	Sha *string `json:"sha,omitempty"`
 	// Constant value. Always "github".
@@ -3371,6 +4258,7 @@ type InstalledPluginSourceGitHub struct {
 // Experimental: InstalledPluginSourceLocal is part of an experimental API and may change or
 // be removed.
 type InstalledPluginSourceLocal struct {
+	// Local filesystem path to the plugin.
 	Path string `json:"path"`
 	// Constant value. Always "local".
 	Source InstalledPluginSourceLocalSource `json:"source"`
@@ -3381,13 +4269,16 @@ type InstalledPluginSourceLocal struct {
 // Experimental: InstalledPluginSourceURL is part of an experimental API and may change or
 // be removed.
 type InstalledPluginSourceURL struct {
+	// Optional source-relative path to the plugin.
 	Path *string `json:"path,omitempty"`
-	Ref  *string `json:"ref,omitempty"`
+	// Optional Git ref to resolve.
+	Ref *string `json:"ref,omitempty"`
 	// Optional full 40-character hexadecimal commit SHA.
 	Sha *string `json:"sha,omitempty"`
 	// Constant value. Always "url".
 	Source InstalledPluginSourceURLSource `json:"source"`
-	URL    string                         `json:"url"`
+	// URL of the plugin source.
+	URL string `json:"url"`
 }
 
 // Canonical file or directory where custom instructions can be discovered or created, with
@@ -3556,8 +4447,9 @@ type LlmInferenceHTTPRequestStartRequest struct {
 	// covers auxiliary calls that have no model call id). Otherwise, first-party CAPI requests
 	// fall back to the runtime's agent task id — the same value the runtime emits as the
 	// `X-Agent-Task-Id` header — while custom-provider requests fall back to the model call id.
-	AgentInvocationID *string             `json:"agentInvocationId,omitempty"`
-	Headers           map[string][]string `json:"headers"`
+	AgentInvocationID *string `json:"agentInvocationId,omitempty"`
+	// HTTP request headers, preserving multiple values per name.
+	Headers map[string][]string `json:"headers"`
 	// Coarse classification of the interaction that produced this request. Open string for
 	// forward-compatibility; known values include `conversation-agent`,
 	// `conversation-subagent`, `conversation-sampling`, `conversation-background`,
@@ -3642,6 +4534,7 @@ type LlmInferenceHTTPResponseChunkResult struct {
 // Experimental: LlmInferenceHTTPResponseStartRequest is part of an experimental API and may
 // change or be removed.
 type LlmInferenceHTTPResponseStartRequest struct {
+	// HTTP response headers, preserving multiple values per name.
 	Headers map[string][]string `json:"headers"`
 	// Matches the requestId from the originating httpRequestStart frame.
 	RequestID string `json:"requestId"`
@@ -3737,6 +4630,17 @@ type LspInitializeRequest struct {
 	WorkingDirectory *string `json:"workingDirectory,omitempty"`
 }
 
+// Validated device-managed settings discovered before a session exists.
+// Experimental: ManagedSettingsReadResult is part of an experimental API and may change or
+// be removed.
+type ManagedSettingsReadResult struct {
+	// Discovery or validation error text when managed settings could not be read safely.
+	ErrorMessage *string `json:"errorMessage,omitempty"`
+	// Validated, canonical managed-settings JSON. Omitted when no managed settings were
+	// discovered or when discovered settings failed validation.
+	SettingsJSON any `json:"settingsJson,omitempty"`
+}
+
 // Result of registering a new marketplace.
 // Experimental: MarketplaceAddResult is part of an experimental API and may change or be
 // removed.
@@ -4021,7 +4925,7 @@ type MCPCancelSamplingExecutionResult struct {
 // removed.
 type MCPConfigAddRequest struct {
 	// MCP server configuration (stdio process or remote HTTP/SSE)
-	Config MCPServerConfig `json:"config"`
+	Config MCPSerializableServerConfig `json:"config"`
 	// Unique name for the MCP server
 	Name string `json:"name"`
 }
@@ -4064,7 +4968,7 @@ type MCPConfigEnableResult struct {
 // Experimental: MCPConfigList is part of an experimental API and may change or be removed.
 type MCPConfigList struct {
 	// All MCP servers from user config, keyed by name
-	Servers map[string]MCPServerConfig `json:"servers"`
+	Servers map[string]MCPSerializableServerConfig `json:"servers"`
 }
 
 // Experimental: MCPConfigReloadResult is part of an experimental API and may change or be
@@ -4090,7 +4994,7 @@ type MCPConfigRemoveResult struct {
 // removed.
 type MCPConfigUpdateRequest struct {
 	// MCP server configuration (stdio process or remote HTTP/SSE)
-	Config MCPServerConfig `json:"config"`
+	Config MCPSerializableServerConfig `json:"config"`
 	// Name of the MCP server to update
 	Name string `json:"name"`
 }
@@ -4100,7 +5004,7 @@ type MCPConfigUpdateRequest struct {
 type MCPConfigUpdateResult struct {
 }
 
-// Opaque auth info used to configure GitHub MCP.
+// Credential-free authentication identity used to configure GitHub MCP.
 // Experimental: MCPConfigureGitHubRequest is part of an experimental API and may change or
 // be removed.
 type MCPConfigureGitHubRequest struct {
@@ -4187,6 +5091,15 @@ type MCPExecuteSamplingRequest struct {
 type MCPExecuteSamplingResult struct {
 }
 
+// MCP server whose connection attempt failed.
+// Experimental: MCPFailedServer is part of an experimental API and may change or be removed.
+type MCPFailedServer struct {
+	// The captured connection failure detail.
+	Error *string `json:"error,omitempty"`
+	// The config key of the server that failed to connect.
+	Name string `json:"name"`
+}
+
 // MCP server filtered by policy, with name, reason, and optional redacted reason.
 // Experimental: MCPFilteredServer is part of an experimental API and may change or be
 // removed.
@@ -4280,6 +5193,44 @@ type MCPHostState struct {
 	PendingConnections []string `json:"pendingConnections"`
 }
 
+// A normalised, inert description of what installing an MCP server would involve. Carries
+// no raw card, no install specification, and no secret value.
+// Experimental: MCPInstallPlan is part of an experimental API and may change or be removed.
+type MCPInstallPlan struct {
+	// The configuration changes installing would make, described rather than serialised, so the
+	// mutable configuration payload stays behind the runtime boundary.
+	ConfigurationChanges []MCPPlanConfigurationChange `json:"configurationChanges"`
+	// Normalised identity of the server the plan would install.
+	Identity MCPPlanResourceIdentity `json:"identity"`
+	// Opaque, runtime-instance scoped, TTL-bound, single-use handle for this plan. Rejected
+	// when stale, replayed, or presented to a different runtime instance. Never logged.
+	PlanHandle string `json:"planHandle"`
+	// ISO 8601 timestamp after which the plan handle is stale and will be rejected. Abandoning
+	// a plan needs no call: an unused handle simply expires, so cancellation before commit is
+	// side-effect free.
+	PlanHandleExpiresAt string `json:"planHandleExpiresAt"`
+	// Outcome of evaluating the server against registry and enterprise policy.
+	Policy MCPPlanPolicyResult `json:"policy"`
+	// Origin and semantic digest of the exact validated JSON MCP card content bound to this
+	// plan.
+	Provenance MCPPlanProvenance `json:"provenance"`
+	// Identifier of the choice the runtime would pick by default. Omitted when there is no
+	// eligible transport, or when the runtime expresses no preference.
+	RecommendedTransportChoiceID *string `json:"recommendedTransportChoiceId,omitempty"`
+	// Whether applying this plan would require an MCP reload to take effect. Planning itself
+	// never reloads.
+	ReloadRequired bool `json:"reloadRequired"`
+	// Whether the plan cannot be applied without further input, because a required value has no
+	// default or a secret must be supplied.
+	RequiresInteractiveConfiguration bool `json:"requiresInteractiveConfiguration"`
+	// Configuration scope and key the plan would write to.
+	Target MCPPlanTarget `json:"target"`
+	// Every eligible transport, so a host can present an explicit choice. A completed plan
+	// always has at least one; when none is eligible, planning returns
+	// `CatalogUnavailableTransportError` instead.
+	TransportChoices []MCPPlanTransportChoice `json:"transportChoices"`
+}
+
 // Server name to check running status for.
 // Experimental: MCPIsServerRunningRequest is part of an experimental API and may change or
 // be removed.
@@ -4424,7 +5375,7 @@ type MCPOauthPendingRequestResponseToken struct {
 	AccessToken string `json:"accessToken"`
 	// Token lifetime in seconds, if known.
 	ExpiresIn *int64 `json:"expiresIn,omitempty"`
-	// OAuth token type. Defaults to Bearer when omitted.
+	// OAuth token type. Defaults to bearer when omitted.
 	TokenType *string `json:"tokenType,omitempty"`
 }
 
@@ -4433,6 +5384,83 @@ func (MCPOauthPendingRequestResponseToken) Kind() MCPOauthPendingRequestResponse
 	return MCPOauthPendingRequestResponseKindToken
 }
 
+// Remote MCP server name for a passive OAuth status probe.
+// Experimental: MCPOauthProbeRequest is part of an experimental API and may change or be
+// removed.
+type MCPOauthProbeRequest struct {
+	// Name of the configured remote MCP server to probe.
+	ServerName string `json:"serverName"`
+}
+
+// Passive MCP OAuth probe result. `authenticated` means the server accepted the probe
+// request while an OAuth-origin access token was attached; it does not prove the server
+// required or independently validated that token. The probe does not make a second
+// unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are
+// reserved for API-call failures.
+// Experimental: MCPOauthProbeResult is part of an experimental API and may change or be
+// removed.
+type MCPOauthProbeResult interface {
+	mcpOauthProbeResult()
+	Status() MCPOauthProbeResultStatus
+}
+
+type RawMCPOauthProbeResultData struct {
+	Discriminator MCPOauthProbeResultStatus
+	Raw           json.RawMessage
+}
+
+func (RawMCPOauthProbeResultData) mcpOauthProbeResult() {}
+func (r RawMCPOauthProbeResultData) Status() MCPOauthProbeResultStatus {
+	return r.Discriminator
+}
+
+type MCPOauthProbeResultAuthenticated struct {
+	// HTTP response returned by the server.
+	HTTPResponse MCPOauthHTTPResponse `json:"httpResponse"`
+}
+
+func (MCPOauthProbeResultAuthenticated) mcpOauthProbeResult() {}
+func (MCPOauthProbeResultAuthenticated) Status() MCPOauthProbeResultStatus {
+	return MCPOauthProbeResultStatusAuthenticated
+}
+
+type MCPOauthProbeResultFailed struct {
+	// Human-readable probe failure detail.
+	Error string `json:"error"`
+	// HTTP response returned by the server, when the probe reached the server and captured the
+	// complete response.
+	HTTPResponse *MCPOauthHTTPResponse `json:"httpResponse,omitempty"`
+}
+
+func (MCPOauthProbeResultFailed) mcpOauthProbeResult() {}
+func (MCPOauthProbeResultFailed) Status() MCPOauthProbeResultStatus {
+	return MCPOauthProbeResultStatusFailed
+}
+
+type MCPOauthProbeResultNeedsAuth struct {
+	// HTTP 401 or 403 response returned by the server.
+	HTTPResponse MCPOauthHTTPResponse `json:"httpResponse"`
+	// Why authentication is needed.
+	Reason MCPOauthProbeNeedsAuthReason `json:"reason"`
+	// Parsed WWW-Authenticate challenge parameters, when present and parseable.
+	WwwAuthenticateParams *MCPOauthWwwAuthenticateParams `json:"wwwAuthenticateParams,omitempty"`
+}
+
+func (MCPOauthProbeResultNeedsAuth) mcpOauthProbeResult() {}
+func (MCPOauthProbeResultNeedsAuth) Status() MCPOauthProbeResultStatus {
+	return MCPOauthProbeResultStatusNeedsAuth
+}
+
+type MCPOauthProbeResultNoAuthRequired struct {
+	// HTTP response returned by the server.
+	HTTPResponse MCPOauthHTTPResponse `json:"httpResponse"`
+}
+
+func (MCPOauthProbeResultNoAuthRequired) mcpOauthProbeResult() {}
+func (MCPOauthProbeResultNoAuthRequired) Status() MCPOauthProbeResultStatus {
+	return MCPOauthProbeResultStatusNoAuthRequired
+}
+
 // Pending MCP OAuth request id to respond to.
 // Experimental: MCPOauthRespondRequest is part of an experimental API and may change or be
 // removed.
@@ -4450,6 +5478,439 @@ type MCPOauthRespondResult struct {
 	Success bool `json:"success"`
 }
 
+// One change applying the plan would make, described rather than serialised so the
+// configuration payload stays behind the runtime boundary.
+// Experimental: MCPPlanConfigurationChange is part of an experimental API and may change or
+// be removed.
+type MCPPlanConfigurationChange struct {
+	// Names of the configuration fields the change would set, without their values.
+	ChangedFields []string `json:"changedFields"`
+	// Configuration key the change applies to.
+	ConfigKey string `json:"configKey"`
+	// Whether the change would create a new entry or modify an existing one.
+	Operation MCPPlanConfigurationOperation `json:"operation"`
+	// Scope the change would be written to.
+	Scope MCPPlanScope `json:"scope"`
+	// Secret placeholders the written configuration would reference. The constrained
+	// placeholder type cannot carry a literal secret value.
+	SecretReferences []string `json:"secretReferences"`
+}
+
+// A side-effect-free request for an MCP install plan. Computing a plan never writes
+// configuration, stores a secret, or reloads MCP servers.
+// Experimental: MCPPlanInstallRequest is part of an experimental API and may change or be
+// removed.
+type MCPPlanInstallRequest struct {
+	// Protocol version and capabilities the caller requires.
+	Contract CatalogClientContract `json:"contract"`
+	// Configuration scope the plan targets. Defaults to user scope when omitted.
+	Scope *MCPPlanScope `json:"scope,omitempty"`
+	// What to plan: either a candidate handle from a previous search, or a card supplied
+	// directly.
+	Source MCPPlanInstallSource `json:"source"`
+}
+
+// Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal.
+// Nothing is written in either case.
+// Experimental: MCPPlanInstallResult is part of an experimental API and may change or be
+// removed.
+type MCPPlanInstallResult interface {
+	mcpPlanInstallResult()
+	mcpPlanInstallResultKind() MCPPlanInstallResultKind
+}
+
+type RawMCPPlanInstallResultData struct {
+	Discriminator MCPPlanInstallResultKind
+	Raw           json.RawMessage
+}
+
+func (RawMCPPlanInstallResultData) mcpPlanInstallResult() {}
+func (r RawMCPPlanInstallResultData) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return r.Discriminator
+}
+func (CatalogAuthenticationRequiredError) mcpPlanInstallResult() {}
+func (CatalogAuthenticationRequiredError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindAuthenticationRequired
+}
+func (CatalogContractViolationError) mcpPlanInstallResult() {}
+func (CatalogContractViolationError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindContractViolation
+}
+
+// A presented handle was not accepted. Handles are runtime-instance scoped, TTL-bound, and
+// single-use, so each way of failing is reported distinctly.
+// Experimental: CatalogHandleRejectedError is part of an experimental API and may change or
+// be removed.
+type CatalogHandleRejectedError struct {
+	// Which kind of handle was presented.
+	HandleType CatalogHandleType `json:"handleType"`
+	// Human-readable explanation, safe to surface. Never contains the handle itself, nor a
+	// query, URL, or secret.
+	Message string `json:"message"`
+	// Why the handle was rejected.
+	Reason CatalogHandleRejectionReason `json:"reason"`
+}
+
+func (CatalogHandleRejectedError) mcpPlanInstallResult() {}
+func (CatalogHandleRejectedError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindHandleRejected
+}
+func (CatalogInvalidRequestError) mcpPlanInstallResult() {}
+func (CatalogInvalidRequestError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindInvalidRequest
+}
+func (CatalogMalformedCardError) mcpPlanInstallResult() {}
+func (CatalogMalformedCardError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindMalformedCard
+}
+func (CatalogNegotiationRefusedError) mcpPlanInstallResult() {}
+func (CatalogNegotiationRefusedError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindNegotiationRefused
+}
+func (CatalogNetworkFailureError) mcpPlanInstallResult() {}
+func (CatalogNetworkFailureError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindNetworkFailure
+}
+
+// The candidate is discoverable but cannot be installed. `application/ai-skill` resolves
+// here, because it stays searchable while remaining typed non-installable.
+// Experimental: CatalogNotInstallableError is part of an experimental API and may change or
+// be removed.
+type CatalogNotInstallableError struct {
+	// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+	// secret.
+	Message string `json:"message"`
+	// Why the candidate cannot be installed.
+	Reason CatalogNotInstallableReason `json:"reason"`
+}
+
+func (CatalogNotInstallableError) mcpPlanInstallResult() {}
+func (CatalogNotInstallableError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindNotInstallable
+}
+func (CatalogPolicyRejectedError) mcpPlanInstallResult() {}
+func (CatalogPolicyRejectedError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindPolicyRejected
+}
+func (CatalogUnavailableError) mcpPlanInstallResult() {}
+func (CatalogUnavailableError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindUnavailable
+}
+
+// No transport this runtime can use is available for the requested server.
+// Experimental: CatalogUnavailableTransportError is part of an experimental API and may
+// change or be removed.
+type CatalogUnavailableTransportError struct {
+	// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+	// secret.
+	Message string `json:"message"`
+	// Why no transport could be offered.
+	Reason CatalogUnavailableTransportReason `json:"reason"`
+}
+
+func (CatalogUnavailableTransportError) mcpPlanInstallResult() {}
+func (CatalogUnavailableTransportError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindUnavailableTransport
+}
+func (CatalogUnsafeRetrievalError) mcpPlanInstallResult() {}
+func (CatalogUnsafeRetrievalError) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindUnsafeRetrieval
+}
+
+// A computed MCP install plan. Nothing has been applied: the plan describes what installing
+// would change, and the plan handle is what a later apply operation would consume.
+// Experimental: MCPPlanInstallPlanned is part of an experimental API and may change or be
+// removed.
+type MCPPlanInstallPlanned struct {
+	// Protocol version and capabilities the runtime honoured.
+	Negotiated CatalogNegotiatedContract `json:"negotiated"`
+	// The normalised plan.
+	Plan MCPInstallPlan `json:"plan"`
+}
+
+func (MCPPlanInstallPlanned) mcpPlanInstallResult() {}
+func (MCPPlanInstallPlanned) mcpPlanInstallResultKind() MCPPlanInstallResultKind {
+	return MCPPlanInstallResultKindPlanned
+}
+
+// What an install plan is computed from: a candidate handle from a previous search, or a
+// card supplied directly.
+// Experimental: MCPPlanInstallSource is part of an experimental API and may change or be
+// removed.
+type MCPPlanInstallSource interface {
+	mcpPlanInstallSource()
+	Kind() MCPPlanInstallSourceKind
+}
+
+type RawMCPPlanInstallSourceData struct {
+	Discriminator MCPPlanInstallSourceKind
+	Raw           json.RawMessage
+}
+
+func (RawMCPPlanInstallSourceData) mcpPlanInstallSource() {}
+func (r RawMCPPlanInstallSourceData) Kind() MCPPlanInstallSourceKind {
+	return r.Discriminator
+}
+
+// Plan from a candidate returned by a previous catalog search.
+// Experimental: MCPPlanInstallSourceCandidate is part of an experimental API and may change
+// or be removed.
+type MCPPlanInstallSourceCandidate struct {
+	// Single-use candidate handle. Consumed by this call, so a replay of the same handle is
+	// rejected.
+	CandidateHandle string `json:"candidateHandle"`
+	// The runtime- or authority-minted `searchId` returned with the search that produced this
+	// candidate. A search implementation binds it to private candidate-handle context; a
+	// planning implementation must verify that context before returning a plan. The unavailable
+	// planning implementation in this contract layer validates presence but does not claim the
+	// verification has occurred. It identifies a search rather than a person and must never be
+	// joined with user identity to re-identify anyone.
+	SearchID string `json:"searchId"`
+}
+
+func (MCPPlanInstallSourceCandidate) mcpPlanInstallSource() {}
+func (MCPPlanInstallSourceCandidate) Kind() MCPPlanInstallSourceKind {
+	return MCPPlanInstallSourceKindCandidate
+}
+
+// Plan from a card supplied directly by the caller, without a preceding search.
+// Experimental: MCPPlanInstallSourceCard is part of an experimental API and may change or
+// be removed.
+type MCPPlanInstallSourceCard struct {
+	// The card to plan from: exactly one of a URL or embedded data.
+	Card MCPServerCardReference `json:"card"`
+}
+
+func (MCPPlanInstallSourceCard) mcpPlanInstallSource() {}
+func (MCPPlanInstallSourceCard) Kind() MCPPlanInstallSourceKind {
+	return MCPPlanInstallSourceKindCard
+}
+
+// Outcome of evaluating the planned server against registry and enterprise policy.
+// Evaluation is read-only.
+// Experimental: MCPPlanPolicyResult is part of an experimental API and may change or be
+// removed.
+type MCPPlanPolicyResult struct {
+	// What policy decided for this server.
+	Decision MCPPlanPolicyDecision `json:"decision"`
+	// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+	// secret.
+	Reason *string `json:"reason,omitempty"`
+	// Which authority produced the decision.
+	Source MCPPlanPolicySource `json:"source"`
+}
+
+// Provenance of the exact validated JSON MCP card content bound privately to a completed
+// plan and its opaque handle.
+// Experimental: MCPPlanProvenance is part of an experimental API and may change or be
+// removed.
+type MCPPlanProvenance struct {
+	// Authority associated with the validated card, without path, query, or credentials. Inert
+	// untrusted data.
+	Authority string `json:"authority"`
+	// Semantic digest of the exact validated JSON content bound to the plan handle.
+	CardDigest CardDigest `json:"cardDigest"`
+	// JSON MCP media type the validated card was interpreted as.
+	MediaType MCPServerCardMediaType `json:"mediaType"`
+	// ISO 8601 timestamp at which the runtime completed strict parsing and schema validation of
+	// the card content.
+	ValidatedAt string `json:"validatedAt"`
+}
+
+// One non-secret value a transport choice needs, represented as a scalar or enumerated
+// variant so enum values cannot be missing or attached to another type.
+// Experimental: MCPPlanRequiredValue is part of an experimental API and may change or be
+// removed.
+type MCPPlanRequiredValue interface {
+	mcpPlanRequiredValue()
+	Kind() MCPPlanRequiredValueKind
+}
+
+type RawMCPPlanRequiredValueData struct {
+	Discriminator MCPPlanRequiredValueKind
+	Raw           json.RawMessage
+}
+
+func (RawMCPPlanRequiredValueData) mcpPlanRequiredValue() {}
+func (r RawMCPPlanRequiredValueData) Kind() MCPPlanRequiredValueKind {
+	return r.Discriminator
+}
+
+// One enumerated non-secret value a transport choice needs before it can be applied. The
+// permitted values are structurally required.
+// Experimental: MCPPlanRequiredValueEnum is part of an experimental API and may change or
+// be removed.
+type MCPPlanRequiredValueEnum struct {
+	// Where the value is applied when the server is launched.
+	Category MCPPlanValueCategory `json:"category"`
+	// Default supplied by the card, when the value can be resolved without input. Presence is
+	// the authoritative indication that a default exists. Inert untrusted data.
+	DefaultValue *string `json:"defaultValue,omitempty"`
+	// Human-readable explanation from the card. Inert untrusted text.
+	Description *string `json:"description,omitempty"`
+	// Non-empty permitted value set. Inert untrusted data.
+	EnumValues []string `json:"enumValues"`
+	// Whether the value may be supplied more than once.
+	IsRepeated bool `json:"isRepeated"`
+	// Key the value is supplied under. Inert untrusted data.
+	Key string `json:"key"`
+	// Whether the value must be present for the plan to be applicable.
+	Required bool `json:"required"`
+	// Human-readable label from the card. Inert untrusted text.
+	Title *string `json:"title,omitempty"`
+	// Discriminator: the value must be one of `enumValues`.
+	ValueType MCPPlanEnumValueType `json:"valueType"`
+}
+
+func (MCPPlanRequiredValueEnum) mcpPlanRequiredValue() {}
+func (MCPPlanRequiredValueEnum) Kind() MCPPlanRequiredValueKind {
+	return MCPPlanRequiredValueKindEnum
+}
+
+// One non-secret scalar value a transport choice needs before it can be applied.
+// Experimental: MCPPlanRequiredValueScalar is part of an experimental API and may change or
+// be removed.
+type MCPPlanRequiredValueScalar struct {
+	// Where the value is applied when the server is launched.
+	Category MCPPlanValueCategory `json:"category"`
+	// Default supplied by the card, when the value can be resolved without input. Presence is
+	// the authoritative indication that a default exists. Inert untrusted data.
+	DefaultValue *string `json:"defaultValue,omitempty"`
+	// Human-readable explanation from the card. Inert untrusted text.
+	Description *string `json:"description,omitempty"`
+	// Whether the value may be supplied more than once.
+	IsRepeated bool `json:"isRepeated"`
+	// Key the value is supplied under. Inert untrusted data.
+	Key string `json:"key"`
+	// Whether the value must be present for the plan to be applicable.
+	Required bool `json:"required"`
+	// Human-readable label from the card. Inert untrusted text.
+	Title *string `json:"title,omitempty"`
+	// Scalar type the value must conform to.
+	ValueType MCPPlanScalarValueType `json:"valueType"`
+}
+
+func (MCPPlanRequiredValueScalar) mcpPlanRequiredValue() {}
+func (MCPPlanRequiredValueScalar) Kind() MCPPlanRequiredValueKind {
+	return MCPPlanRequiredValueKindScalar
+}
+
+// Normalised identity of the MCP server a plan targets, independent of how the card spelled
+// it.
+// Experimental: MCPPlanResourceIdentity is part of an experimental API and may change or be
+// removed.
+type MCPPlanResourceIdentity struct {
+	// Canonical, normalised name of the server, for example `io.github.owner/server`.
+	CanonicalName string `json:"canonicalName"`
+	// Registry identifier of the server, when it came from a registry.
+	RegistryID *string `json:"registryId,omitempty"`
+	// Local configuration key the server would be recorded under.
+	ServerName string `json:"serverName"`
+	// Version advertised by the card, when it declares one.
+	Version *string `json:"version,omitempty"`
+}
+
+// A secret a transport choice needs, referenced by placeholder. No secret value ever
+// appears in a plan, and the placeholder resolves against the keychain only when a plan is
+// applied.
+// Experimental: MCPPlanSecretPlaceholder is part of an experimental API and may change or
+// be removed.
+type MCPPlanSecretPlaceholder struct {
+	// Key the secret is supplied under. Inert untrusted data.
+	Key string `json:"key"`
+	// The runtime-assigned `${secret:<id>}` placeholder written into configuration in place of
+	// the value.
+	Placeholder string `json:"placeholder"`
+	// Human-readable label from the card. Inert untrusted text.
+	Title *string `json:"title,omitempty"`
+}
+
+// A runtime-assigned secret placeholder. The identifier is carried once, inside the
+// placeholder, so it cannot contradict a separate secret-id field.
+// Experimental: MCPPlanSecretReference is part of an experimental API and may change or be
+// removed.
+type MCPPlanSecretReference string
+
+// Where a plan would be written.
+// Experimental: MCPPlanTarget is part of an experimental API and may change or be removed.
+type MCPPlanTarget struct {
+	// Configuration key the server would be recorded under within that scope.
+	ConfigKey string `json:"configKey"`
+	// Configuration scope the plan targets.
+	Scope MCPPlanScope `json:"scope"`
+}
+
+// One eligible way to run the server, represented as a tagged package or remote variant so
+// package identity and endpoint states cannot contradict the install method.
+// Experimental: MCPPlanTransportChoice is part of an experimental API and may change or be
+// removed.
+type MCPPlanTransportChoice interface {
+	mcpPlanTransportChoice()
+	Transport() MCPPlanTransportChoiceTransport
+}
+
+type RawMCPPlanTransportChoiceData struct {
+	Discriminator MCPPlanTransportChoiceTransport
+	Raw           json.RawMessage
+}
+
+func (RawMCPPlanTransportChoiceData) mcpPlanTransportChoice() {}
+func (r RawMCPPlanTransportChoiceData) Transport() MCPPlanTransportChoiceTransport {
+	return r.Discriminator
+}
+
+// An eligible local-package transport choice. Package identity is required and a remote
+// endpoint cannot be represented.
+// Experimental: MCPPlanTransportChoicePackage is part of an experimental API and may change
+// or be removed.
+type MCPPlanTransportChoicePackage struct {
+	// Stable identifier for this choice within the plan, used to select it when the plan is
+	// applied.
+	ChoiceID string `json:"choiceId"`
+	// Discriminator: this choice runs a local package
+	InstallMethod MCPPlanPackageInstallMethod `json:"installMethod"`
+	// Package identifier. Inert untrusted data.
+	PackageIdentifier string `json:"packageIdentifier"`
+	// Packaging ecosystem, for example `oci` or `npm`.
+	PackageType string `json:"packageType"`
+	// Typed values this choice requires, excluding secrets.
+	RequiredValues []MCPPlanRequiredValue `json:"requiredValues"`
+	// Secrets this choice requires, referenced by placeholder only.
+	SecretPlaceholders []MCPPlanSecretPlaceholder `json:"secretPlaceholders"`
+}
+
+func (MCPPlanTransportChoicePackage) mcpPlanTransportChoice() {}
+func (MCPPlanTransportChoicePackage) Transport() MCPPlanTransportChoiceTransport {
+	return MCPPlanTransportChoiceTransportStdio
+}
+
+// An eligible remote-endpoint transport choice. The endpoint is required and package
+// identity cannot be represented.
+// Experimental: MCPPlanTransportChoiceRemote is part of an experimental API and may change
+// or be removed.
+type MCPPlanTransportChoiceRemote struct {
+	// Stable identifier for this choice within the plan, used to select it when the plan is
+	// applied.
+	ChoiceID string `json:"choiceId"`
+	// Endpoint URL. Inert untrusted data.
+	Endpoint string `json:"endpoint"`
+	// Discriminator: this choice connects to a remote endpoint
+	InstallMethod MCPPlanRemoteInstallMethod `json:"installMethod"`
+	// Typed values this choice requires, excluding secrets.
+	RequiredValues []MCPPlanRequiredValue `json:"requiredValues"`
+	// Secrets this choice requires, referenced by placeholder only.
+	SecretPlaceholders []MCPPlanSecretPlaceholder `json:"secretPlaceholders"`
+	Discriminator      MCPPlanRemoteTransport     `json:"transport,omitempty"`
+}
+
+func (MCPPlanTransportChoiceRemote) mcpPlanTransportChoice() {}
+func (r MCPPlanTransportChoiceRemote) Transport() MCPPlanTransportChoiceTransport {
+	if r.Discriminator == "" {
+		return MCPPlanTransportChoiceTransportHTTP
+	}
+	return MCPPlanTransportChoiceTransport(r.Discriminator)
+}
+
 // Registration parameters for an external MCP client.
 // Experimental: MCPRegisterExternalClientRequest is part of an experimental API and may
 // change or be removed.
@@ -4473,6 +5934,25 @@ type MCPRegisterExternalClientRequest struct {
 	Transport any `json:"transport"`
 }
 
+// In-process MCP reload configuration.
+// Experimental: MCPReloadConfig is part of an experimental API and may change or be removed.
+type MCPReloadConfig struct {
+	ActiveGitHubToken *string `json:"activeGitHubToken,omitempty"`
+	// Server names the CLI enabled for this session via `--enable-mcp-server`.
+	CLIEnabledServers       []string                   `json:"cliEnabledServers,omitzero"`
+	ConfigFilter            any                        `json:"configFilter,omitempty"`
+	DisabledServers         []string                   `json:"disabledServers,omitzero"`
+	EnabledServers          []string                   `json:"enabledServers,omitzero"`
+	ForceRestart            *bool                      `json:"forceRestart,omitempty"`
+	GitHubMCPToolOptions    any                        `json:"githubMcpToolOptions,omitempty"`
+	GitHubMCPUserOverride   *bool                      `json:"githubMcpUserOverride,omitempty"`
+	IncludeWorkspaceSources *bool                      `json:"includeWorkspaceSources,omitempty"`
+	Mcp3pEnabled            *bool                      `json:"mcp3pEnabled,omitempty"`
+	MCPServers              map[string]MCPServerConfig `json:"mcpServers"`
+	SecretStore             any                        `json:"secretStore,omitempty"`
+	UseCachedToolSnapshots  *bool                      `json:"useCachedToolSnapshots,omitempty"`
+}
+
 // Opaque MCP reload configuration.
 // Experimental: MCPReloadWithConfigRequest is part of an experimental API and may change or
 // be removed.
@@ -4660,11 +6140,34 @@ type MCPResourceTemplate struct {
 type MCPRestartServerRequest struct {
 	// Replacement MCP server configuration (stdio process or remote HTTP/SSE). Omit to restart
 	// the server with its already-registered configuration (config-free restart-by-name).
-	Config MCPServerConfig `json:"config,omitempty"`
+	Config MCPSerializableServerConfig `json:"config,omitempty"`
 	// Name of the MCP server to restart
 	ServerName string `json:"serverName"`
 }
 
+// Telemetry-obfuscation policy for an MCP server's tools.
+// Experimental: MCPSafeForTelemetry is part of an experimental API and may change or be
+// removed.
+type MCPSafeForTelemetry interface {
+	mcpSafeForTelemetry()
+}
+
+type MCPSafeForTelemetryBoolean bool
+
+func (MCPSafeForTelemetryBoolean) mcpSafeForTelemetry() {}
+
+func (MCPSafeForTelemetryFields) mcpSafeForTelemetry() {}
+
+// Per-field MCP telemetry-obfuscation policy.
+// Experimental: MCPSafeForTelemetryFields is part of an experimental API and may change or
+// be removed.
+type MCPSafeForTelemetryFields struct {
+	// Whether MCP tool input names may be included in telemetry without obfuscation.
+	InputsNames bool `json:"inputsNames"`
+	// Whether the MCP tool name may be included in telemetry without obfuscation.
+	Name bool `json:"name"`
+}
+
 // Outcome of an MCP sampling execution: success result, failure error, or cancellation.
 // Experimental: MCPSamplingExecutionResult is part of an experimental API and may change or
 // be removed.
@@ -4681,56 +6184,18 @@ type MCPSamplingExecutionResult struct {
 	Result *MCPExecuteSamplingResult `json:"result,omitempty"`
 }
 
-// MCP server status entry, including config source/plugin source and any connection error.
-// Experimental: MCPServer is part of an experimental API and may change or be removed.
-type MCPServer struct {
-	// Error message if the server failed to connect
-	Error *string `json:"error,omitempty"`
-	// Server name (config key)
-	Name string `json:"name"`
-	// Configuration source: user, workspace, plugin, or builtin
-	Source *MCPServerSource `json:"source,omitempty"`
-	// Plugin name that provided this server, when source is plugin.
-	SourcePlugin *string `json:"sourcePlugin,omitempty"`
-	// Plugin version that provided this server, when source is plugin.
-	SourcePluginVersion *string `json:"sourcePluginVersion,omitempty"`
-	// Connection status: connected, failed, needs-auth, pending, disabled, stopped, or
-	// not_configured
-	Status MCPServerStatus `json:"status"`
-}
-
-// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
-// Experimental: MCPServerAuthConfig is part of an experimental API and may change or be
-// removed.
-type MCPServerAuthConfig interface {
-	mcpServerAuthConfig()
-}
-
-type MCPServerAuthConfigBoolean bool
-
-func (MCPServerAuthConfigBoolean) mcpServerAuthConfig() {}
-
-func (MCPServerAuthConfigRedirectPort) mcpServerAuthConfig() {}
-
-// Authentication settings with optional redirect port configuration.
-// Experimental: MCPServerAuthConfigRedirectPort is part of an experimental API and may
-// change or be removed.
-type MCPServerAuthConfigRedirectPort struct {
-	// Fixed port for the OAuth redirect callback server.
-	RedirectPort *int32 `json:"redirectPort,omitempty"`
-}
-
-// MCP server configuration (stdio process or remote HTTP/SSE)
-// Experimental: MCPServerConfig is part of an experimental API and may change or be removed.
-type MCPServerConfig interface {
-	mcpServerConfig()
+// Serializable MCP server configuration (stdio process or remote HTTP/SSE)
+// Experimental: MCPSerializableServerConfig is part of an experimental API and may change
+// or be removed.
+type MCPSerializableServerConfig interface {
+	mcpSerializableServerConfig()
 }
 
-type RawMCPServerConfigData struct {
+type RawMCPSerializableServerConfigData struct {
 	Raw json.RawMessage
 }
 
-func (RawMCPServerConfigData) mcpServerConfig() {}
+func (RawMCPSerializableServerConfigData) mcpSerializableServerConfig() {}
 
 // Remote MCP server configuration accessed over HTTP or SSE.
 // Experimental: MCPServerConfigHTTP is part of an experimental API and may change or be
@@ -4738,20 +6203,34 @@ func (RawMCPServerConfigData) mcpServerConfig() {}
 type MCPServerConfigHTTP struct {
 	// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
 	Auth MCPServerAuthConfig `json:"auth,omitempty"`
+	// Configuration warnings recorded while loading the server.
+	ConfigWarnings []string `json:"configWarnings,omitzero"`
 	// Controls if tools provided by this server can be loaded on demand via tool search (auto)
 	// or always included in the initial tool list (never)
 	DeferTools *MCPServerConfigDeferTools `json:"deferTools,omitempty"`
+	// Whether secret masking is disabled for calls to this server.
+	DisableSecretMasking *bool `json:"disableSecretMasking,omitempty"`
 	// Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
 	// is unaffected.
 	DisableToolCache *bool `json:"disableToolCache,omitempty"`
+	// Optional human-readable server name.
+	DisplayName *string `json:"displayName,omitempty"`
+	// Event types this server receives as Copilot notifications.
+	Events []string `json:"events,omitzero"`
+	// Tool names excluded after the include filter is applied.
+	ExcludeTools []string `json:"excludeTools,omitzero"`
 	// Content filtering mode to apply to all tools, or a map of tool name to content filtering
 	// mode.
 	FilterMapping FilterMapping `json:"filterMapping,omitempty"`
 	// HTTP headers to include in requests to the remote MCP server.
 	Headers map[string]string `json:"headers,omitzero"`
+	// Dynamic-header refresh cache lifetime in milliseconds.
+	HeadersRefreshTtlMs *int64 `json:"headersRefreshTtlMs,omitempty"`
 	// Whether this server is a built-in fallback used when the user has not configured their
 	// own server.
 	IsDefaultServer *bool `json:"isDefaultServer,omitempty"`
+	// Copilot notification types this server may send to the host.
+	Notifications []string `json:"notifications,omitzero"`
 	// OAuth client ID for a pre-registered remote MCP OAuth client.
 	OauthClientID *string `json:"oauthClientId,omitempty"`
 	// OAuth grant type to use when authenticating to the remote MCP server.
@@ -4760,7 +6239,19 @@ type MCPServerConfigHTTP struct {
 	OauthPublicClient *bool `json:"oauthPublicClient,omitempty"`
 	// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
 	Oidc MCPServerAuthConfig `json:"oidc,omitempty"`
-	// Timeout in milliseconds for tool calls to this server.
+	// Telemetry-obfuscation policy for this server's tools.
+	SafeForTelemetry MCPSafeForTelemetry `json:"safeForTelemetry,omitempty"`
+	// The origin of this server configuration.
+	Source *MCPServerSource `json:"source,omitempty"`
+	// Source file path recorded while loading the config.
+	SourcePath *string `json:"sourcePath,omitempty"`
+	// Plugin that provided this server.
+	SourcePlugin *string `json:"sourcePlugin,omitempty"`
+	// Whether the providing plugin uses the Open Plugin Spec.
+	SourcePluginSpec *bool `json:"sourcePluginSpec,omitempty"`
+	// Version of the plugin that provided this server.
+	SourcePluginVersion *string `json:"sourcePluginVersion,omitempty"`
+	// Timeout in milliseconds for tool discovery and tool calls.
 	Timeout *int64 `json:"timeout,omitempty"`
 	// Tools to include. Defaults to all tools if not specified.
 	Tools []string `json:"tools,omitzero"`
@@ -4770,7 +6261,7 @@ type MCPServerConfigHTTP struct {
 	URL string `json:"url"`
 }
 
-func (MCPServerConfigHTTP) mcpServerConfig() {}
+func (MCPServerConfigHTTP) mcpSerializableServerConfig() {}
 
 // Stdio MCP server configuration launched as a child process.
 // Experimental: MCPServerConfigStdio is part of an experimental API and may change or be
@@ -4782,30 +6273,216 @@ type MCPServerConfigStdio struct {
 	Auth MCPServerAuthConfig `json:"auth,omitempty"`
 	// Executable command used to start the Stdio MCP server process.
 	Command string `json:"command"`
+	// Configuration warnings recorded while loading the server.
+	ConfigWarnings []string `json:"configWarnings,omitzero"`
 	// Working directory for the Stdio MCP server process.
 	Cwd *string `json:"cwd,omitempty"`
 	// Controls if tools provided by this server can be loaded on demand via tool search (auto)
 	// or always included in the initial tool list (never)
 	DeferTools *MCPServerConfigDeferTools `json:"deferTools,omitempty"`
-	// Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
-	// is unaffected.
+	// Whether secret masking is disabled for calls to this server.
+	DisableSecretMasking *bool `json:"disableSecretMasking,omitempty"`
+	// Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
+	// is unaffected.
+	DisableToolCache *bool `json:"disableToolCache,omitempty"`
+	// Optional human-readable server name.
+	DisplayName *string `json:"displayName,omitempty"`
+	// Environment variables to pass to the Stdio MCP server process.
+	Env map[string]string `json:"env,omitzero"`
+	// Event types this server receives as Copilot notifications.
+	Events []string `json:"events,omitzero"`
+	// Tool names excluded after the include filter is applied.
+	ExcludeTools []string `json:"excludeTools,omitzero"`
+	// Content filtering mode to apply to all tools, or a map of tool name to content filtering
+	// mode.
+	FilterMapping FilterMapping `json:"filterMapping,omitempty"`
+	// Whether this server is a built-in fallback used when the user has not configured their
+	// own server.
+	IsDefaultServer *bool `json:"isDefaultServer,omitempty"`
+	// Copilot notification types this server may send to the host.
+	Notifications []string `json:"notifications,omitzero"`
+	// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
+	Oidc MCPServerAuthConfig `json:"oidc,omitempty"`
+	// Telemetry-obfuscation policy for this server's tools.
+	SafeForTelemetry MCPSafeForTelemetry `json:"safeForTelemetry,omitempty"`
+	// The origin of this server configuration.
+	Source *MCPServerSource `json:"source,omitempty"`
+	// Source file path recorded while loading the config.
+	SourcePath *string `json:"sourcePath,omitempty"`
+	// Plugin that provided this server.
+	SourcePlugin *string `json:"sourcePlugin,omitempty"`
+	// Whether the providing plugin uses the Open Plugin Spec.
+	SourcePluginSpec *bool `json:"sourcePluginSpec,omitempty"`
+	// Version of the plugin that provided this server.
+	SourcePluginVersion *string `json:"sourcePluginVersion,omitempty"`
+	// Timeout in milliseconds for tool discovery and tool calls.
+	Timeout *int64 `json:"timeout,omitempty"`
+	// Tools to include. Defaults to all tools if not specified.
+	Tools []string `json:"tools,omitzero"`
+	// Local transport type. Defaults to stdio when omitted.
+	Type *MCPServerConfigStdioType `json:"type,omitempty"`
+}
+
+func (MCPServerConfigStdio) mcpSerializableServerConfig() {}
+
+// MCP server status entry, including config source/plugin source and any connection error.
+// Experimental: MCPServer is part of an experimental API and may change or be removed.
+type MCPServer struct {
+	// Error message if the server failed to connect
+	Error *string `json:"error,omitempty"`
+	// Server name (config key)
+	Name string `json:"name"`
+	// Configuration source: user, workspace, plugin, or builtin
+	Source *MCPServerSource `json:"source,omitempty"`
+	// Plugin name that provided this server, when source is plugin.
+	SourcePlugin *string `json:"sourcePlugin,omitempty"`
+	// Plugin version that provided this server, when source is plugin.
+	SourcePluginVersion *string `json:"sourcePluginVersion,omitempty"`
+	// Connection status: connected, failed, needs-auth, pending, disabled, stopped, or
+	// not_configured
+	Status MCPServerStatus `json:"status"`
+}
+
+// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
+// Experimental: MCPServerAuthConfig is part of an experimental API and may change or be
+// removed.
+type MCPServerAuthConfig interface {
+	mcpServerAuthConfig()
+}
+
+type MCPServerAuthConfigBoolean bool
+
+func (MCPServerAuthConfigBoolean) mcpServerAuthConfig() {}
+
+func (MCPServerAuthConfigRedirectPort) mcpServerAuthConfig() {}
+
+// Authentication settings with optional redirect port configuration.
+// Experimental: MCPServerAuthConfigRedirectPort is part of an experimental API and may
+// change or be removed.
+type MCPServerAuthConfigRedirectPort struct {
+	// Fixed port for the OAuth redirect callback server.
+	RedirectPort *int32 `json:"redirectPort,omitempty"`
+}
+
+// A card supplied directly by the caller. Exactly one of a URL or embedded data, encoded
+// structurally so neither both nor neither can be expressed.
+// Experimental: MCPServerCardReference is part of an experimental API and may change or be
+// removed.
+type MCPServerCardReference interface {
+	mcpServerCardReference()
+	Kind() MCPServerCardReferenceKind
+}
+
+type RawMCPServerCardReferenceData struct {
+	Discriminator MCPServerCardReferenceKind
+	Raw           json.RawMessage
+}
+
+func (RawMCPServerCardReferenceData) mcpServerCardReference() {}
+func (r RawMCPServerCardReferenceData) Kind() MCPServerCardReferenceKind {
+	return r.Discriminator
+}
+
+// An MCP server card supplied inline as an inert document.
+// Experimental: MCPServerCardEmbedded is part of an experimental API and may change or be
+// removed.
+type MCPServerCardEmbedded struct {
+	// The card document verbatim, treated as inert untrusted bytes. The runtime parses and
+	// validates it; the host is not expected to interpret it. Never logged.
+	Data string `json:"data"`
+	// Media type the card is expected to conform to.
+	MediaType MCPServerCardMediaType `json:"mediaType"`
+}
+
+func (MCPServerCardEmbedded) mcpServerCardReference() {}
+func (MCPServerCardEmbedded) Kind() MCPServerCardReferenceKind {
+	return MCPServerCardReferenceKindEmbedded
+}
+
+// An MCP server card to be retrieved from a URL through the runtime's hardened fetch
+// boundary.
+// Experimental: MCPServerCardURL is part of an experimental API and may change or be
+// removed.
+type MCPServerCardURL struct {
+	// Media type the card is expected to conform to.
+	MediaType MCPServerCardMediaType `json:"mediaType"`
+	// Card URL. Retrieved only through the runtime's hardened boundary, with scheme,
+	// credential, address-range, redirect, timeout, and response-size controls applied. Never
+	// logged.
+	URL string `json:"url"`
+}
+
+func (MCPServerCardURL) mcpServerCardReference() {}
+func (MCPServerCardURL) Kind() MCPServerCardReferenceKind {
+	return MCPServerCardReferenceKindURL
+}
+
+// MCP server configuration (stdio, remote HTTP/SSE, or in-process)
+// Experimental: MCPServerConfig is part of an experimental API and may change or be removed.
+type MCPServerConfig interface {
+	mcpServerConfig()
+}
+
+type RawMCPServerConfigData struct {
+	Raw json.RawMessage
+}
+
+func (RawMCPServerConfigData) mcpServerConfig() {}
+func (MCPServerConfigHTTP) mcpServerConfig()    {}
+
+// In-process MCP server configuration used by embedded SDK clients.
+// Experimental: MCPServerConfigMemory is part of an experimental API and may change or be
+// removed.
+type MCPServerConfigMemory struct {
+	// Configuration warnings recorded while loading the server.
+	ConfigWarnings []string `json:"configWarnings,omitzero"`
+	// Controls whether tools can be loaded on demand.
+	DeferTools *MCPServerConfigDeferTools `json:"deferTools,omitempty"`
+	// Whether secret masking is disabled for calls to this server.
+	DisableSecretMasking *bool `json:"disableSecretMasking,omitempty"`
+	// Whether persisted tool snapshots are disabled.
 	DisableToolCache *bool `json:"disableToolCache,omitempty"`
-	// Environment variables to pass to the Stdio MCP server process.
-	Env map[string]string `json:"env,omitzero"`
-	// Content filtering mode to apply to all tools, or a map of tool name to content filtering
-	// mode.
+	// Optional human-readable server name.
+	DisplayName *string `json:"displayName,omitempty"`
+	// Event types this server receives as Copilot notifications.
+	Events []string `json:"events,omitzero"`
+	// Tool names excluded after the include filter is applied.
+	ExcludeTools []string `json:"excludeTools,omitzero"`
+	// Content filtering mode to apply to this server's tools.
 	FilterMapping FilterMapping `json:"filterMapping,omitempty"`
-	// Whether this server is a built-in fallback used when the user has not configured their
-	// own server.
+	// Whether this server is a built-in fallback.
 	IsDefaultServer *bool `json:"isDefaultServer,omitempty"`
-	// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
+	// Copilot notification types this server may send to the host.
+	Notifications []string `json:"notifications,omitzero"`
+	// Set to `true` to use default OIDC settings.
 	Oidc MCPServerAuthConfig `json:"oidc,omitempty"`
-	// Timeout in milliseconds for tool calls to this server.
+	// Telemetry-obfuscation policy for this server's tools.
+	SafeForTelemetry MCPSafeForTelemetry `json:"safeForTelemetry,omitempty"`
+	// In-process MCP server instance. This value cannot cross a JSON-RPC boundary.
+	// Internal: ServerInstance is part of the SDK's internal API surface and is not intended
+	// for external use.
+	ServerInstance any `json:"serverInstance"`
+	// The origin of this server configuration.
+	Source *MCPServerSource `json:"source,omitempty"`
+	// Source file path recorded while loading the config.
+	SourcePath *string `json:"sourcePath,omitempty"`
+	// Plugin that provided this server.
+	SourcePlugin *string `json:"sourcePlugin,omitempty"`
+	// Whether the providing plugin uses the Open Plugin Spec.
+	SourcePluginSpec *bool `json:"sourcePluginSpec,omitempty"`
+	// Version of the plugin that provided this server.
+	SourcePluginVersion *string `json:"sourcePluginVersion,omitempty"`
+	// Timeout in milliseconds for tool discovery and tool calls.
 	Timeout *int64 `json:"timeout,omitempty"`
 	// Tools to include. Defaults to all tools if not specified.
 	Tools []string `json:"tools,omitzero"`
+	// Internal: Type is part of the SDK's internal API surface and is not intended for external
+	// use.
+	Type MCPServerConfigMemoryType `json:"type"`
 }
 
+func (MCPServerConfigMemory) mcpServerConfig() {}
+
 func (MCPServerConfigStdio) mcpServerConfig() {}
 
 // Recorded MCP server connection failure.
@@ -4862,7 +6539,7 @@ type MCPSetEnvValueModeResult struct {
 type MCPStartServerRequest struct {
 	// MCP server configuration (stdio process or remote HTTP/SSE). Omit to start the server
 	// with its already-registered configuration (config-free start-by-name).
-	Config MCPServerConfig `json:"config,omitempty"`
+	Config MCPSerializableServerConfig `json:"config,omitempty"`
 	// Name of the MCP server to start
 	ServerName string `json:"serverName"`
 }
@@ -4873,6 +6550,8 @@ type MCPStartServerRequest struct {
 type MCPStartServersResult struct {
 	// Non-default servers allowed by policy
 	AllowedServers []MCPAllowedServer `json:"allowedServers,omitzero"`
+	// Servers whose connection attempt failed.
+	FailedServers []MCPFailedServer `json:"failedServers,omitzero"`
 	// Servers filtered out before startup
 	FilteredServers []MCPFilteredServer `json:"filteredServers"`
 }
@@ -4885,6 +6564,13 @@ type MCPStopServerRequest struct {
 	ServerName string `json:"serverName"`
 }
 
+// Metadata controlling an MCP task's lifetime.
+// Experimental: MCPTaskMetadata is part of an experimental API and may change or be removed.
+type MCPTaskMetadata struct {
+	// Task time-to-live.
+	Ttl *int64 `json:"ttl,omitempty"`
+}
+
 // MCP tool metadata with tool name, optional description, and normalized MCP Apps discovery
 // metadata.
 // Experimental: MCPTools is part of an experimental API and may change or be removed.
@@ -5097,8 +6783,14 @@ type Model struct {
 	Billing *ModelBilling `json:"billing,omitempty"`
 	// Model capabilities and limits
 	Capabilities ModelCapabilities `json:"capabilities"`
+	// Default reasoning effort level (only present if model supports reasoning effort)
+	DefaultReasoningEffort *string `json:"defaultReasoningEffort,omitempty"`
 	// Model identifier (e.g., "claude-sonnet-4.5")
 	ID string `json:"id"`
+	// Informational notices the service published for this model, such as an upcoming change or
+	// a recommended alternative. Present only when the service published at least one notice.
+	// Hosts should surface these without implying anything is wrong with the model.
+	InfoMessages []ModelMessage `json:"infoMessages,omitzero"`
 	// Model capability category for grouping in the model picker
 	ModelPickerCategory *ModelPickerCategory `json:"modelPickerCategory,omitempty"`
 	// Relative cost tier for token-based billing users
@@ -5107,8 +6799,40 @@ type Model struct {
 	Name string `json:"name"`
 	// Policy state (if applicable)
 	Policy *ModelPolicy `json:"policy,omitempty"`
+	// Context-window tiers this model offers, when the provider advertises them independently
+	// of tiered token pricing. Copilot models carry their tiers in `billing.tokenPrices`; a
+	// provider that has no pricing to publish (an agent host reached over AHP, for example)
+	// declares them here instead, so the model picker can still offer the tier toggle.
+	SupportedContextTiers []string `json:"supportedContextTiers,omitzero"`
 	// Supported reasoning effort levels (only present if model supports reasoning effort)
 	SupportedReasoningEfforts []string `json:"supportedReasoningEfforts,omitzero"`
+	// Warnings the service published for this model, such as a deprecated client version.
+	// Present only when the service published at least one warning. The model remains usable;
+	// hosts should surface these as advisory rather than blocking.
+	WarningMessages []ModelMessage `json:"warningMessages,omitzero"`
+	// Warning text the service requires hosts to surface for this model. Present only when the
+	// service published at least one warning.
+	WarningText *ModelWarningText `json:"warningText,omitempty"`
+}
+
+// Managed, repository, and CLI model overrides to overlay onto the session at startup.
+// Experimental: ModelApplyStartupOverlayRequest is part of an experimental API and may
+// change or be removed.
+type ModelApplyStartupOverlayRequest struct {
+	// Model explicitly selected by the CLI, when provided.
+	CLIModel *string `json:"cliModel,omitempty"`
+	// Whether the overlay is being applied while resuming a deferred session.
+	DeferredResume *bool `json:"deferredResume,omitempty"`
+	// Model required by device-managed policy, when configured.
+	DeviceManagedModel *string `json:"deviceManagedModel,omitempty"`
+	// Context tier selected by repository settings, when configured.
+	RepoContextTier *string `json:"repoContextTier,omitempty"`
+	// Model selected by repository settings, when configured.
+	RepoModel *string `json:"repoModel,omitempty"`
+	// Reasoning effort selected by repository settings, when configured.
+	RepoReasoningEffort *string `json:"repoReasoningEffort,omitempty"`
+	// Model required by server-managed policy, when configured.
+	ServerManagedModel *string `json:"serverManagedModel,omitempty"`
 }
 
 // Billing information
@@ -5155,6 +6879,8 @@ type ModelBillingTokenPrices struct {
 	CachePrice *float64 `json:"cachePrice,omitempty"`
 	// AI Credits cost per billing batch of cached (read) tokens
 	CacheReadPrice *float64 `json:"cacheReadPrice,omitempty"`
+	// AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.
+	CacheWrite1hPrice *float64 `json:"cacheWrite1hPrice,omitempty"`
 	// AI Credits cost per billing batch of cache-write (cache creation) tokens.
 	CacheWritePrice *float64 `json:"cacheWritePrice,omitempty"`
 	// Use maxPromptTokens instead. Prompt token budget for the default tier. The total context
@@ -5181,6 +6907,8 @@ type ModelBillingTokenPricesLongContext struct {
 	CachePrice *float64 `json:"cachePrice,omitempty"`
 	// AI Credits cost per billing batch of cached (read) tokens
 	CacheReadPrice *float64 `json:"cacheReadPrice,omitempty"`
+	// AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.
+	CacheWrite1hPrice *float64 `json:"cacheWrite1hPrice,omitempty"`
 	// AI Credits cost per billing batch of cache-write (cache creation) tokens.
 	CacheWritePrice *float64 `json:"cacheWritePrice,omitempty"`
 	// Use maxPromptTokens instead. Prompt token budget for the long context tier. The total
@@ -5307,6 +7035,41 @@ type ModelListRequest struct {
 	SkipCache *bool `json:"skipCache,omitempty"`
 }
 
+// A service-published message about a model, carrying a stable machine-readable code
+// alongside human-readable text.
+// Experimental: ModelMessage is part of an experimental API and may change or be removed.
+type ModelMessage struct {
+	// Stable machine-readable identifier for the message, such as `client_version_deprecated`.
+	// Hosts can key custom presentation off this; unrecognized codes should fall back to
+	// displaying `message`.
+	Code string `json:"code"`
+	// Human-readable message text intended for display to the user.
+	Message string `json:"message"`
+}
+
+// Experimental: ModelPickerPersistenceRequest is part of an experimental API and may change
+// or be removed.
+type ModelPickerPersistenceRequest struct {
+	// Whether context tier was explicitly selected and should be persisted.
+	ContextTierExplicit *bool `json:"contextTierExplicit,omitempty"`
+	// Whether reasoning effort was explicitly selected and should be persisted.
+	ReasoningEffortExplicit *bool `json:"reasoningEffortExplicit,omitempty"`
+	// Filesystem and environment context used to resolve settings persistence.
+	SettingsContext ModelPickerSettingsContext `json:"settingsContext"`
+}
+
+// Filesystem and environment context used to resolve model-picker settings.
+// Experimental: ModelPickerSettingsContext is part of an experimental API and may change or
+// be removed.
+type ModelPickerSettingsContext struct {
+	// Optional Copilot configuration directory containing persisted settings.
+	ConfigDir *string `json:"configDir,omitempty"`
+	// Environment variables consulted while resolving model-picker settings.
+	Environment any `json:"environment"`
+	// User home directory used when resolving persisted settings.
+	HomeDirectory string `json:"homeDirectory"`
+}
+
 // Policy state (if applicable)
 // Experimental: ModelPolicy is part of an experimental API and may change or be removed.
 type ModelPolicy struct {
@@ -5338,9 +7101,23 @@ type ModelSetReasoningEffortResult struct {
 // Experimental: ModelsListRequest is part of an experimental API and may change or be
 // removed.
 type ModelsListRequest struct {
-	// GitHub token for per-user model listing. When provided, resolves this token to determine
-	// the user's Copilot plan and available models instead of using the global auth.
+	// GitHub token accepted for compatibility with existing SDK clients. When provided,
+	// resolves this token instead of using the current account.
 	GitHubToken *string `json:"gitHubToken,omitempty"`
+	// Opaque account identifier returned by `account.getAllUsers`. When omitted, the current
+	// account is used.
+	SelectionID *string `json:"selectionId,omitempty"`
+}
+
+// Experimental: ModelSwitchConfirmation is part of an experimental API and may change or be
+// removed.
+type ModelSwitchConfirmation struct {
+	// Current conversation token count before switching models.
+	CurrentTokens float64 `json:"currentTokens"`
+	// Target model token limit used by the compaction preflight.
+	TargetLimit float64 `json:"targetLimit"`
+	// Display name of the model that requires compaction confirmation.
+	TargetModelDisplayName string `json:"targetModelDisplayName"`
 }
 
 // Target model identifier and optional reasoning effort, summary, capability overrides, and
@@ -5348,6 +7125,9 @@ type ModelsListRequest struct {
 // Experimental: ModelSwitchToRequest is part of an experimental API and may change or be
 // removed.
 type ModelSwitchToRequest struct {
+	// Explicit response to a model-switch compaction preflight. Omit to request a confirmation
+	// projection when compaction is necessary.
+	CompactionDecision *string `json:"compactionDecision,omitempty"`
 	// Explicit context tier for the selected model. `"default"` / `"long_context"` apply the
 	// requested tier; omit this field to use normal model behavior with no explicit tier.
 	ContextTier *ContextTier `json:"contextTier,omitempty"`
@@ -5359,16 +7139,29 @@ type ModelSwitchToRequest struct {
 	DeferIfModelChangeQueued *bool `json:"deferIfModelChangeQueued,omitempty"`
 	// Override individual model capabilities resolved by the runtime
 	ModelCapabilities *ModelCapabilitiesOverride `json:"modelCapabilities,omitempty"`
+	// Settings scope used when persisting the selected model.
+	ModelChangeScope *string `json:"modelChangeScope,omitempty"`
 	// Model selection id to switch to, as returned by `list`. A bare id (e.g.
 	// `claude-sonnet-4.6`) names a Copilot (CAPI) model; a provider-qualified id
 	// (`provider/id`, e.g. `acme/claude-sonnet`) targets a registry BYOK model.
 	ModelID string `json:"modelId"`
+	// Optional settings context and explicit-override flags used to persist a picker selection.
+	PickerPersistence *ModelPickerPersistenceRequest `json:"pickerPersistence,omitempty"`
 	// Reasoning effort level to use for the model. CAPI values are model-defined and validated
 	// against the selected model; BYOK providers may define additional values. "none" disables
 	// reasoning. When omitted, no effort override is applied.
 	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
 	// Reasoning summary mode to request for supported model clients
 	ReasoningSummary *ReasoningSummary `json:"reasoningSummary,omitempty"`
+	// Optional repository settings scope to persist after the switch commits.
+	RepoScope *string `json:"repoScope,omitempty"`
+	// Require the target to be currently available and enabled before applying the switch.
+	RequireAvailable *bool `json:"requireAvailable,omitempty"`
+	// When true, evaluate context-window compaction policy before applying the switch.
+	RunCompactionPreflight *bool `json:"runCompactionPreflight,omitempty"`
+	// Origin to record on the effective `session.model_change` event. Defaults to `sdk` when
+	// omitted.
+	Source *ModelChangeSource `json:"source,omitempty"`
 	// Output verbosity level to request for supported models
 	Verbosity *Verbosity `json:"verbosity,omitempty"`
 }
@@ -5377,55 +7170,119 @@ type ModelSwitchToRequest struct {
 // Experimental: ModelSwitchToResult is part of an experimental API and may change or be
 // removed.
 type ModelSwitchToResult struct {
+	// Compaction confirmation projection when status is confirmation_required
+	Confirmation *ModelSwitchConfirmation `json:"confirmation,omitempty"`
 	// True when the switch was deferred (enqueued as a cancellable `/model` command) because a
 	// turn was active or another model change was already queued, rather than applied
 	// immediately. When true, the session's live model is unchanged until the queued change
 	// drains.
 	Deferred *bool `json:"deferred,omitempty"`
+	// Deprecation warnings associated with the selected model or options.
+	DeprecationWarnings []string `json:"deprecationWarnings,omitzero"`
+	// User-facing outcome message for the model switch.
+	Message *string `json:"message,omitempty"`
 	// Currently active model identifier after the switch
 	ModelID *string `json:"modelId,omitempty"`
+	// Persistence failure encountered after applying the model switch.
+	PersistenceError *string `json:"persistenceError,omitempty"`
+	// Lifecycle result for the requested switch
+	Status *string `json:"status,omitempty"`
+	// User-facing warning produced while applying the model switch.
+	Warning *string `json:"warning,omitempty"`
+}
+
+// Service-published warning text that hosts should display when presenting a model.
+// Experimental: ModelWarningText is part of an experimental API and may change or be
+// removed.
+type ModelWarningText struct {
+	// Data-retention warning for the model. The text may contain Markdown links and should be
+	// rendered as Markdown when supported.
+	DataRetention *string `json:"dataRetention,omitempty"`
 }
 
 // Agent interaction mode to apply to the session.
 // Experimental: ModeSetRequest is part of an experimental API and may change or be removed.
 type ModeSetRequest struct {
+	// Explicit response to a model-switch compaction preflight.
+	CompactionDecision *string `json:"compactionDecision,omitempty"`
+	// Session whose plan-mode base state should be inherited.
+	InheritPlanBaseFromSessionID *string `json:"inheritPlanBaseFromSessionId,omitempty"`
 	// The session mode the agent is operating in
 	Mode SessionMode `json:"mode"`
+	// Whether the selected plan model should be persisted.
+	PersistPlanSelection *bool `json:"persistPlanSelection,omitempty"`
+	// Settings context used when persisting the selected plan model.
+	PickerSettingsContext *ModelPickerSettingsContext `json:"pickerSettingsContext,omitempty"`
+	// Context tier to use with the dedicated plan model.
+	PlanContextTier *string `json:"planContextTier,omitempty"`
+	// Action to perform when leaving plan mode.
+	PlanExitAction *string `json:"planExitAction,omitempty"`
+	// Dedicated model to use in plan mode, when configured.
+	PlanModel *string `json:"planModel,omitempty"`
+	// Whether a dedicated plan model is configured.
+	PlanModelConfigured *bool `json:"planModelConfigured,omitempty"`
+	// Reasoning effort to use with the dedicated plan model.
+	PlanReasoningEffort *string `json:"planReasoningEffort,omitempty"`
+	// Whether leaving plan mode should restore the session's previous model.
+	RestorePlanModel *bool `json:"restorePlanModel,omitempty"`
+}
+
+// Outcome of a session mode change, including any model switch it triggered and follow-up
+// the host must perform.
+// Experimental: ModeSetResult is part of an experimental API and may change or be removed.
+type ModeSetResult struct {
+	// Whether the host should arm an interactive continuation after the mode change.
+	ArmInteractiveContinuation *bool `json:"armInteractiveContinuation,omitempty"`
+	// Compaction confirmation required before the mode change can complete.
+	Confirmation *ModelSwitchConfirmation `json:"confirmation,omitempty"`
+	// Whether the host must defer implementing the requested mode change.
+	DeferImplementation *bool `json:"deferImplementation,omitempty"`
+	// Deprecation warnings associated with the model selected by the mode change.
+	DeprecationWarnings []string `json:"deprecationWarnings,omitzero"`
+	// User-facing outcome message for the model switch triggered by the mode change.
+	Message *string `json:"message,omitempty"`
+	// Whether applying the mode changed the active model.
+	ModelChanged bool `json:"modelChanged"`
+	// Lifecycle status of the requested mode change.
+	Status string `json:"status"`
+	// User-facing warning produced while applying the mode change.
+	Warning *string `json:"warning,omitempty"`
+}
+
+// Result of moving in-flight MCP loading to the background.
+// Experimental: MoveMCPLoadingToBackgroundResult is part of an experimental API and may
+// change or be removed.
+type MoveMCPLoadingToBackgroundResult struct {
+	// Whether an in-flight MCP load was moved to the background, releasing turns that were
+	// waiting on it. False when no MCP load was in flight or the waiting turns had already been
+	// released.
+	MovedToBackground bool `json:"movedToBackground"`
 }
 
-// A named BYOK provider connection (transport + credentials).
+// External SDK input for a named custom model provider. Ingested by the native protocol
+// boundary before host dispatch.
 // Experimental: NamedProviderConfig is part of an experimental API and may change or be
 // removed.
 type NamedProviderConfig struct {
-	// API key. Optional for local providers like Ollama.
+	// Static API key used to authenticate provider requests.
 	APIKey *string `json:"apiKey,omitempty"`
-	// Azure-specific provider options.
+	// Azure authentication configuration for the provider.
 	Azure *ProviderConfigAzure `json:"azure,omitempty"`
-	// API endpoint URL.
+	// Base URL for provider API requests.
 	BaseURL string `json:"baseUrl"`
-	// Bearer token for authentication. Sets the Authorization header directly. Takes precedence
-	// over apiKey when both are set.
+	// Static bearer token used to authenticate provider requests.
 	BearerToken *string `json:"bearerToken,omitempty"`
-	// When true, the SDK client supplies bearer tokens on demand: the runtime calls the
-	// client-session `providerToken.getToken` callback before each request and applies the
-	// returned token as an `Authorization: Bearer <token>` header. This is the bearer/OAuth
-	// scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens
-	// (including Anthropic's), not a provider-specific API-key header such as Anthropic's
-	// `x-api-key`. The token-acquiring function itself stays on the SDK side and is never
-	// serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`,
-	// the callback takes precedence: the runtime applies the token returned by
-	// `providerToken.getToken` as the `Authorization: Bearer` header for each request and does
-	// not send the static credential.
+	// Whether the host supplies bearer tokens dynamically.
 	HasBearerTokenProvider *bool `json:"hasBearerTokenProvider,omitempty"`
-	// Custom HTTP headers to include in all outbound requests to the provider.
+	// Additional HTTP headers included with provider requests.
 	Headers map[string]string `json:"headers,omitzero"`
-	// Stable identifier referenced by BYOK model definitions. Must not contain '/'.
+	// Unique provider name used to qualify model selection IDs.
 	Name string `json:"name"`
-	// Provider transport. Defaults to "http".
+	// Transport used to communicate with the provider.
 	Transport *ProviderConfigTransport `json:"transport,omitempty"`
-	// Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.
+	// Provider protocol family.
 	Type *ProviderConfigType `json:"type,omitempty"`
-	// Wire API format (openai/azure only). Defaults to "completions".
+	// Wire API used to communicate with the provider.
 	WireAPI *ProviderConfigWireAPI `json:"wireApi,omitempty"`
 }
 
@@ -5491,8 +7348,10 @@ type OpenCanvasInstance struct {
 // Experimental: OptionsUpdateAdditionalContentExclusionPolicy is part of an experimental
 // API and may change or be removed.
 type OptionsUpdateAdditionalContentExclusionPolicy struct {
-	LastUpdatedAt any                                                 `json:"last_updated_at"`
-	Rules         []OptionsUpdateAdditionalContentExclusionPolicyRule `json:"rules"`
+	// Opaque policy update timestamp supplied by the host.
+	LastUpdatedAt any `json:"last_updated_at"`
+	// Content-exclusion rules to apply.
+	Rules []OptionsUpdateAdditionalContentExclusionPolicyRule `json:"rules"`
 	// Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.
 	Scope OptionsUpdateAdditionalContentExclusionPolicyScope `json:"scope"`
 }
@@ -5502,9 +7361,12 @@ type OptionsUpdateAdditionalContentExclusionPolicy struct {
 // Experimental: OptionsUpdateAdditionalContentExclusionPolicyRule is part of an
 // experimental API and may change or be removed.
 type OptionsUpdateAdditionalContentExclusionPolicyRule struct {
-	IfAnyMatch  []string `json:"ifAnyMatch,omitzero"`
+	// Conditions of which at least one must match.
+	IfAnyMatch []string `json:"ifAnyMatch,omitzero"`
+	// Conditions none of which may match.
 	IfNoneMatch []string `json:"ifNoneMatch,omitzero"`
-	Paths       []string `json:"paths"`
+	// Path patterns covered by this rule.
+	Paths []string `json:"paths"`
 	// Source descriptor for a `session.options.update` content-exclusion rule, with source name
 	// and type.
 	Source OptionsUpdateAdditionalContentExclusionPolicyRuleSource `json:"source"`
@@ -5515,7 +7377,9 @@ type OptionsUpdateAdditionalContentExclusionPolicyRule struct {
 // Experimental: OptionsUpdateAdditionalContentExclusionPolicyRuleSource is part of an
 // experimental API and may change or be removed.
 type OptionsUpdateAdditionalContentExclusionPolicyRuleSource struct {
+	// Name of the policy source.
 	Name string `json:"name"`
+	// Type of the policy source.
 	Type string `json:"type"`
 }
 
@@ -5819,6 +7683,24 @@ func (PermissionDecisionApproveForLocationApprovalCustomTool) Kind() PermissionD
 	return PermissionDecisionApproveForLocationApprovalKindCustomTool
 }
 
+// Location-scoped approval details for an extension's access to sensitive environment
+// variables, keyed by extension name and the exact set of variable names.
+// Experimental: PermissionDecisionApproveForLocationApprovalExtensionEnvAccess is part of
+// an experimental API and may change or be removed.
+type PermissionDecisionApproveForLocationApprovalExtensionEnvAccess struct {
+	// Names of the sensitive environment variables this approval covers. Values are never
+	// persisted.
+	EnvironmentVariables []string `json:"environmentVariables"`
+	// Extension name.
+	ExtensionName string `json:"extensionName"`
+}
+
+func (PermissionDecisionApproveForLocationApprovalExtensionEnvAccess) permissionDecisionApproveForLocationApproval() {
+}
+func (PermissionDecisionApproveForLocationApprovalExtensionEnvAccess) Kind() PermissionDecisionApproveForLocationApprovalKind {
+	return PermissionDecisionApproveForLocationApprovalKindExtensionEnvAccess
+}
+
 // Location-scoped approval details for extension-management operations, optionally narrowed
 // by operation.
 // Experimental: PermissionDecisionApproveForLocationApprovalExtensionManagement is part of
@@ -5979,6 +7861,24 @@ func (PermissionDecisionApproveForSessionApprovalCustomTool) Kind() PermissionDe
 	return PermissionDecisionApproveForSessionApprovalKindCustomTool
 }
 
+// Session-scoped approval details for an extension's access to sensitive environment
+// variables, keyed by extension name and the exact set of variable names.
+// Experimental: PermissionDecisionApproveForSessionApprovalExtensionEnvAccess is part of an
+// experimental API and may change or be removed.
+type PermissionDecisionApproveForSessionApprovalExtensionEnvAccess struct {
+	// Names of the sensitive environment variables this approval covers. Values are never
+	// persisted.
+	EnvironmentVariables []string `json:"environmentVariables"`
+	// Extension name.
+	ExtensionName string `json:"extensionName"`
+}
+
+func (PermissionDecisionApproveForSessionApprovalExtensionEnvAccess) permissionDecisionApproveForSessionApproval() {
+}
+func (PermissionDecisionApproveForSessionApprovalExtensionEnvAccess) Kind() PermissionDecisionApproveForSessionApprovalKind {
+	return PermissionDecisionApproveForSessionApprovalKindExtensionEnvAccess
+}
+
 // Session-scoped approval details for extension-management operations, optionally narrowed
 // by operation.
 // Experimental: PermissionDecisionApproveForSessionApprovalExtensionManagement is part of
@@ -6091,10 +7991,29 @@ func (PermissionDecisionApproveForSessionApprovalWrite) Kind() PermissionDecisio
 	return PermissionDecisionApproveForSessionApprovalKindWrite
 }
 
+// Optional informational context describing how and where the permission decision was made.
+// This does not affect permission behavior.
+// Experimental: PermissionDecisionContext is part of an experimental API and may change or
+// be removed.
+type PermissionDecisionContext struct {
+	// Disposition of the permission request as observed by the responding client.
+	Outcome PermissionDecisionOutcome `json:"outcome"`
+	// Whether the responding client could ask a user interactively, was running headlessly, or
+	// had no response path. Omit when the client cannot determine this authoritatively.
+	ResponseCapability *PermissionResponseCapability `json:"responseCapability,omitempty"`
+	// Controlled reason or actor responsible for the response.
+	Source PermissionDecisionSource `json:"source"`
+	// Client surface that submitted the response.
+	Surface PermissionDecisionSurface `json:"surface"`
+}
+
 // Pending permission request ID and the decision to apply (approve/reject and scope).
 // Experimental: PermissionDecisionRequest is part of an experimental API and may change or
 // be removed.
 type PermissionDecisionRequest struct {
+	// Optional informational context describing how and where this response was made. Omit it
+	// to preserve legacy behavior without attributing an origin.
+	DecisionContext *PermissionDecisionContext `json:"decisionContext,omitempty"`
 	// Request ID of the pending permission request
 	RequestID string `json:"requestId"`
 	// The client's response to the pending permission prompt
@@ -6160,7 +8079,9 @@ type PermissionLocationResolveResult struct {
 // be removed.
 type PermissionPathsAddParams struct {
 	// Directory to add to the allow-list. The runtime resolves and validates the path before
-	// adding.
+	// adding, then loads conventional `.github/skills/` and `.github/agents/` definitions under
+	// it when their subsystem gates are enabled. Adding the directory is therefore also a trust
+	// decision for configuration stored there.
 	Path string `json:"path"`
 }
 
@@ -6187,9 +8108,11 @@ type PermissionPathsAllowedCheckResult struct {
 // removed.
 type PermissionPathsConfig struct {
 	// Additional directories to allow tool access to (in addition to the session's working
-	// directory). When `unrestricted` is true, these are still pre-populated on the
-	// UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention
-	// completion).
+	// directory). Conventional `.github/skills/` and `.github/agents/` definitions under them
+	// also join the session catalogs when their subsystem gates are enabled, so supplying a
+	// directory is a trust decision for configuration stored there. When `unrestricted` is
+	// true, these are still pre-populated on the UnrestrictedPathManager so they remain visible
+	// via getDirectories() (e.g. for @-mention completion).
 	AdditionalDirectories []string `json:"additionalDirectories,omitzero"`
 	// Whether to include the system temp directory in the allowed list (defaults to true).
 	// Ignored when `unrestricted` is true.
@@ -6282,8 +8205,10 @@ type PermissionRulesSet struct {
 // Experimental: PermissionsConfigureAdditionalContentExclusionPolicy is part of an
 // experimental API and may change or be removed.
 type PermissionsConfigureAdditionalContentExclusionPolicy struct {
-	LastUpdatedAt any                                                        `json:"last_updated_at"`
-	Rules         []PermissionsConfigureAdditionalContentExclusionPolicyRule `json:"rules"`
+	// Opaque policy update timestamp supplied by the host.
+	LastUpdatedAt any `json:"last_updated_at"`
+	// Content-exclusion rules to apply.
+	Rules []PermissionsConfigureAdditionalContentExclusionPolicyRule `json:"rules"`
 	// Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope`
 	// enumeration.
 	Scope PermissionsConfigureAdditionalContentExclusionPolicyScope `json:"scope"`
@@ -6294,9 +8219,12 @@ type PermissionsConfigureAdditionalContentExclusionPolicy struct {
 // Experimental: PermissionsConfigureAdditionalContentExclusionPolicyRule is part of an
 // experimental API and may change or be removed.
 type PermissionsConfigureAdditionalContentExclusionPolicyRule struct {
-	IfAnyMatch  []string `json:"ifAnyMatch,omitzero"`
+	// Conditions of which at least one must match.
+	IfAnyMatch []string `json:"ifAnyMatch,omitzero"`
+	// Conditions none of which may match.
 	IfNoneMatch []string `json:"ifNoneMatch,omitzero"`
-	Paths       []string `json:"paths"`
+	// Path patterns covered by this rule.
+	Paths []string `json:"paths"`
 	// Source descriptor for a `session.permissions.configure` content-exclusion rule, with
 	// source name and type.
 	Source PermissionsConfigureAdditionalContentExclusionPolicyRuleSource `json:"source"`
@@ -6307,7 +8235,9 @@ type PermissionsConfigureAdditionalContentExclusionPolicyRule struct {
 // Experimental: PermissionsConfigureAdditionalContentExclusionPolicyRuleSource is part of
 // an experimental API and may change or be removed.
 type PermissionsConfigureAdditionalContentExclusionPolicyRuleSource struct {
+	// Name of the policy source.
 	Name string `json:"name"`
+	// Type of the policy source.
 	Type string `json:"type"`
 }
 
@@ -6355,9 +8285,17 @@ type PermissionsFolderTrustAddTrustedResult struct {
 }
 
 // No parameters.
-// Experimental: PermissionsGetAllowAllRequest is part of an experimental API and may change
-// or be removed.
-type PermissionsGetAllowAllRequest struct {
+// Experimental: PermissionsGetModeRequest is part of an experimental API and may change or
+// be removed.
+type PermissionsGetModeRequest struct {
+}
+
+// Current permission mode.
+// Experimental: PermissionsGetModeResult is part of an experimental API and may change or
+// be removed.
+type PermissionsGetModeResult struct {
+	// Current permission mode
+	Mode PermissionMode `json:"mode"`
 }
 
 // Tool approval to persist and apply
@@ -6407,6 +8345,24 @@ func (PermissionsLocationsAddToolApprovalDetailsCustomTool) Kind() PermissionsLo
 	return PermissionsLocationsAddToolApprovalDetailsKindCustomTool
 }
 
+// Location-persisted tool approval details for an extension's access to sensitive
+// environment variables, keyed by extension name and the exact set of variable names.
+// Experimental: PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess is part of an
+// experimental API and may change or be removed.
+type PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess struct {
+	// Names of the sensitive environment variables this approval covers. Values are never
+	// persisted.
+	EnvironmentVariables []string `json:"environmentVariables"`
+	// Extension name.
+	ExtensionName string `json:"extensionName"`
+}
+
+func (PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess) permissionsLocationsAddToolApprovalDetails() {
+}
+func (PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess) Kind() PermissionsLocationsAddToolApprovalDetailsKind {
+	return PermissionsLocationsAddToolApprovalDetailsKindExtensionEnvAccess
+}
+
 // Location-persisted tool approval details for extension-management operations, optionally
 // narrowed by operation.
 // Experimental: PermissionsLocationsAddToolApprovalDetailsExtensionManagement is part of an
@@ -6602,24 +8558,6 @@ type PermissionsResetSessionApprovalsResult struct {
 	Success bool `json:"success"`
 }
 
-// Allow-all mode to apply for the session.
-// Experimental: PermissionsSetAllowAllRequest is part of an experimental API and may change
-// or be removed.
-type PermissionsSetAllowAllRequest struct {
-	// Legacy full allow-all toggle. Prefer `mode`; when `mode` is omitted, `enabled: true` is
-	// treated as `mode: "on"` and any other value is treated as `mode: "off"`.
-	Enabled *bool `json:"enabled,omitempty"`
-	// Allow-all mode to apply. `on` enables full allow-all; `auto` enables advisory LLM
-	// auto-approval; `off` disables both.
-	Mode *PermissionsAllowAllMode `json:"mode,omitempty"`
-	// Optional model id for the `auto` mode auto-approval LLM judging. Only meaningful when
-	// `mode` is `auto`; ignored otherwise. When omitted, the session resolves a default judge
-	// model: `gpt-5.5` for CAPI sessions and the session's active model for BYOK sessions.
-	Model *string `json:"model,omitempty"`
-	// Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
-	Source *PermissionsSetAllowAllSource `json:"source,omitempty"`
-}
-
 // Allow-all toggle for tool permission requests, with an optional telemetry source.
 // Experimental: PermissionsSetApproveAllRequest is part of an experimental API and may
 // change or be removed.
@@ -6638,6 +8576,32 @@ type PermissionsSetApproveAllResult struct {
 	Success bool `json:"success"`
 }
 
+// Permission mode to apply for the session.
+// Experimental: PermissionsSetModeRequest is part of an experimental API and may change or
+// be removed.
+type PermissionsSetModeRequest struct {
+	// Optional judge model id for assisted mode. When omitted, the session resolves the
+	// provider default: `gpt-5.5` for CAPI sessions and the active session model for BYOK
+	// sessions.
+	AssistedApprovalModel *string `json:"assistedApprovalModel,omitempty"`
+	// Permission mode to apply
+	Mode PermissionMode `json:"mode"`
+	// Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK
+	// callers.
+	Source *PermissionModeSource `json:"source,omitempty"`
+}
+
+// Indicates whether the requested permission mode was applied and reports the authoritative
+// post-mutation mode.
+// Experimental: PermissionsSetModeResult is part of an experimental API and may change or
+// be removed.
+type PermissionsSetModeResult struct {
+	// Authoritative permission mode after the mutation
+	Mode PermissionMode `json:"mode"`
+	// Whether the operation succeeded
+	Success bool `json:"success"`
+}
+
 // Toggles whether permission prompts should be bridged into session events for this client.
 // Experimental: PermissionsSetRequiredRequest is part of an experimental API and may change
 // or be removed.
@@ -6721,7 +8685,8 @@ type PlanReadResult struct {
 // Experimental: PlanReadSQLTodosResult is part of an experimental API and may change or be
 // removed.
 type PlanReadSQLTodosResult struct {
-	// Rows from the session SQL todos table, ordered by creation time and id.
+	// Rows from the session SQL todos table, ordered by creation time with insertion order used
+	// to break ties when available and id used for WITHOUT ROWID tables.
 	Rows []PlanSQLTodosRow `json:"rows"`
 }
 
@@ -6733,7 +8698,8 @@ type PlanReadSQLTodosWithDependenciesResult struct {
 	// or the SELECT failed. Read independently from `rows`, so a broken todo_deps table does
 	// not affect the rows result and vice versa.
 	Dependencies []PlanSQLTodoDependency `json:"dependencies"`
-	// Rows from the session SQL todos table, ordered by creation time and id. Empty when no
+	// Rows from the session SQL todos table, ordered by creation time with insertion order used
+	// to break ties when available and id used for WITHOUT ROWID tables. Empty when no
 	// database, no todos table, or the SELECT failed.
 	Rows []PlanSQLTodosRow `json:"rows"`
 }
@@ -6753,6 +8719,11 @@ type PlanSQLTodoDependency struct {
 // because the SQL schema is best-effort and the agent may not have populated every column.
 // Experimental: PlanSQLTodosRow is part of an experimental API and may change or be removed.
 type PlanSQLTodosRow struct {
+	// Todo creation time, as stored by the session SQL schema's `datetime('now')` default:
+	// `YYYY-MM-DD HH:MM:SS` in UTC. Lets clients attribute todos to the work item that created
+	// them (e.g. scoping a goal's progress to the todos it produced) rather than to the whole
+	// session.
+	CreatedAt *string `json:"createdAt,omitempty"`
 	// Todo description.
 	Description *string `json:"description,omitempty"`
 	// Todo identifier.
@@ -6814,6 +8785,20 @@ type PluginListResult struct {
 	Plugins []InstalledPluginInfo `json:"plugins"`
 }
 
+// Trusted built-in plugin directories to use for this runtime process.
+// Experimental: PluginsBuiltinSetRequest is part of an experimental API and may change or
+// be removed.
+type PluginsBuiltinSetRequest struct {
+	// Complete replacement set of trusted built-in plugin directories. Every entry must be an
+	// absolute local filesystem path no longer than 4096 characters.
+	Paths []string `json:"paths"`
+}
+
+// Experimental: PluginsBuiltinSetResult is part of an experimental API and may change or be
+// removed.
+type PluginsBuiltinSetResult struct {
+}
+
 // Plugin names (or specs) to disable.
 // Experimental: PluginsDisableRequest is part of an experimental API and may change or be
 // removed.
@@ -6982,6 +8967,31 @@ type PluginUpdateResult struct {
 	SkillsInstalled int64 `json:"skillsInstalled"`
 }
 
+// Serializable definition of a caller-implemented tool whose execution is handled over the
+// SDK connection.
+// Experimental: ProtocolExternalToolDefinition is part of an experimental API and may
+// change or be removed.
+type ProtocolExternalToolDefinition struct {
+	// Tool-loading deferral policy.
+	Defer *ProtocolExternalToolDefer `json:"defer,omitempty"`
+	// Model-visible explanation of what the tool does.
+	Description string `json:"description"`
+	// Whether the tool executes commands in a terminal.
+	IsTerminal *bool `json:"isTerminal,omitempty"`
+	// Optional caller-defined metadata associated with the tool.
+	Metadata map[string]any `json:"metadata,omitzero"`
+	// Unique model-visible tool name.
+	Name string `json:"name"`
+	// Whether this definition replaces a built-in tool with the same name.
+	OverridesBuiltInTool *bool `json:"overridesBuiltInTool,omitempty"`
+	// JSON Schema describing the tool's input arguments.
+	Parameters map[string]any `json:"parameters,omitzero"`
+	// Whether execution bypasses the normal tool permission prompt.
+	SkipPermission *bool `json:"skipPermission,omitempty"`
+	// Optional human-readable display title.
+	Title *string `json:"title,omitempty"`
+}
+
 // BYOK providers and/or models to add to the session's registry at runtime. Both fields are
 // optional; provide providers, models, or both.
 // Experimental: ProviderAddRequest is part of an experimental API and may change or be
@@ -7036,9 +9046,13 @@ type ProviderConfig struct {
 	MaxOutputTokens *float64 `json:"maxOutputTokens,omitempty"`
 	// Maximum prompt/input tokens for the model.
 	MaxPromptTokens *float64 `json:"maxPromptTokens,omitempty"`
+	// Overrides for model capabilities when they cannot be inferred from modelId.
+	ModelCapabilities *ModelCapabilitiesOverride `json:"modelCapabilities,omitempty"`
 	// Well-known model ID used for capability lookup. When set, agent behavior config and token
 	// limits are inferred from this model.
 	ModelID *string `json:"modelId,omitempty"`
+	// Provider name used for model and telemetry attribution.
+	ProviderName *string `json:"providerName,omitempty"`
 	// Provider transport. Defaults to "http".
 	Transport *ProviderConfigTransport `json:"transport,omitempty"`
 	// Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.
@@ -7107,7 +9121,7 @@ type ProviderModelConfig struct {
 	// Display name for model pickers. Defaults to the provider-qualified selection id
 	// (`provider/id`).
 	Name *string `json:"name,omitempty"`
-	// Name of the NamedProviderConfig that serves this model.
+	// Name of the configured provider that serves this model.
 	Provider string `json:"provider"`
 	// The model name sent to the provider API for inference. Defaults to `id`.
 	WireModel *string `json:"wireModel,omitempty"`
@@ -7136,8 +9150,8 @@ type ProviderSessionToken struct {
 // Experimental: ProviderTokenAcquireRequest is part of an experimental API and may change
 // or be removed.
 type ProviderTokenAcquireRequest struct {
-	// Name of the BYOK provider needing a token. For the legacy whole-session `provider` this
-	// is the implicit provider name; for named providers it is `NamedProviderConfig.name`.
+	// Name of the BYOK provider needing a token. For the legacy whole-session provider this is
+	// the implicit provider name; for named providers it is the configured provider name.
 	ProviderName string `json:"providerName"`
 	// Target session identifier
 	SessionID string `json:"sessionId"`
@@ -7589,6 +9603,7 @@ type QueueDeferSessionIdleRequest struct {
 // Experimental: QueueDuplicateAtRequest is part of an experimental API and may change or be
 // removed.
 type QueueDuplicateAtRequest struct {
+	// Stable opaque ID of the queued item to duplicate.
 	ID string `json:"id"`
 }
 
@@ -7640,6 +9655,7 @@ type QueueHasPendingResult struct {
 // Experimental: QueueInsertAtRequest is part of an experimental API and may change or be
 // removed.
 type QueueInsertAtRequest struct {
+	// Queued message contents and delivery metadata.
 	Message QueueInsertMessage `json:"message"`
 	// Zero-based position in the public visible queue. Values outside the queue clamp to an end.
 	Position int64 `json:"position"`
@@ -7730,6 +9746,10 @@ type QueuePendingItems struct {
 // Experimental: QueuePendingItemsResult is part of an experimental API and may change or be
 // removed.
 type QueuePendingItemsResult struct {
+	// How many leading entries of `steeringMessages` have already been folded into the running
+	// turn (and so have an emitted `user.message`), as opposed to still waiting for one. Absent
+	// for hosts that do not distinguish the two.
+	InFlightSteeringCount *int64 `json:"inFlightSteeringCount,omitempty"`
 	// Pending queued items in submission order. Includes user messages, queued slash commands,
 	// and queued model changes; omits internal system items.
 	Items []QueuePendingItems `json:"items"`
@@ -7742,6 +9762,7 @@ type QueuePendingItemsResult struct {
 // Experimental: QueueRemoveAtRequest is part of an experimental API and may change or be
 // removed.
 type QueueRemoveAtRequest struct {
+	// Stable opaque ID of the queued item to remove.
 	ID string `json:"id"`
 }
 
@@ -7766,6 +9787,7 @@ type QueueRemoveMostRecentResult struct {
 // Experimental: QueueSendNowRequest is part of an experimental API and may change or be
 // removed.
 type QueueSendNowRequest struct {
+	// Stable opaque ID of the queued item to steer into the live turn.
 	ID string `json:"id"`
 }
 
@@ -7786,6 +9808,7 @@ type QueueSendNowResult struct {
 // Experimental: QueueSetDrainPausedRequest is part of an experimental API and may change or
 // be removed.
 type QueueSetDrainPausedRequest struct {
+	// Whether queued-lane draining should be paused.
 	Paused bool `json:"paused"`
 }
 
@@ -7807,9 +9830,12 @@ type QueueSnapshotResult struct {
 // Experimental: QueueUpdateTextRequest is part of an experimental API and may change or be
 // removed.
 type QueueUpdateTextRequest struct {
+	// Optional replacement prompt displayed to the user.
 	DisplayPrompt *string `json:"displayPrompt,omitempty"`
-	ID            string  `json:"id"`
-	Prompt        string  `json:"prompt"`
+	// Stable opaque ID of the queued item to edit.
+	ID string `json:"id"`
+	// Replacement prompt sent to the model.
+	Prompt string `json:"prompt"`
 }
 
 // Result of editing a queued message.
@@ -7852,6 +9878,11 @@ type RegisterEventInterestResult struct {
 	Handle string `json:"handle"`
 }
 
+// Experimental: RegisterExtensionLaunchProviderResult is part of an experimental API and
+// may change or be removed.
+type RegisterExtensionLaunchProviderResult struct {
+}
+
 // Params to attach an extension loader's tools to a session.
 // Experimental: RegisterExtensionToolsParams is part of an experimental API and may change
 // or be removed.
@@ -7959,9 +9990,8 @@ type RemoteControlStatusActive struct {
 	// Whether the MC session may steer this session.
 	IsSteerable bool `json:"isSteerable"`
 	// In-process prompt-manager handle (CLI-only optimization). Marked internal: this field is
-	// excluded from the public SDK surface. When the CLI migrates to a process-separated SDK,
-	// the same bidirectional prompt-routing handshake is expressed via dedicated remote-control
-	// RPCs (register/resolve) rather than a shared in-process object.
+	// excluded from the public SDK surface. Retained as an optional compatibility field; native
+	// remote control does not populate or consume it.
 	// Internal: PromptManager is part of the SDK's internal API surface and is not intended for
 	// external use.
 	PromptManager any `json:"promptManager,omitempty"`
@@ -8130,26 +10160,47 @@ type RuntimeShutdownResult struct {
 type SandboxConfig struct {
 	// Whether to auto-add the current working directory to readwritePaths. Default: true.
 	AddCurrentWorkingDirectory *bool `json:"addCurrentWorkingDirectory,omitempty"`
-	// Whether to auto-grant read access to common developer-tool caches, registries, and
-	// toolchains in their default home locations (cargo, go, npm, Maven, and more), plus
-	// read-write access to (and, on Unix, up-front creation of) the scratch caches builds write
-	// on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so
-	// builds work without exporting CARGO_HOME/GOPATH/etc. Default: true (enabled by default;
-	// set to false to opt out).
-	AllowDevToolCaches *bool `json:"allowDevToolCaches,omitempty"`
+	// Whether to auto-grant read access to the tool directories discovered on PATH and in
+	// toolchain environment variables (GOROOT, CARGO_HOME, JAVA_HOME, VIRTUAL_ENV, and
+	// similar), and to common developer-tool caches, registries, and toolchains in their
+	// default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and
+	// up-front creation of) the scratch caches builds write on every run (go-build, ccache,
+	// sccache, Gradle caches, Cargo lock/tracker files), so builds work without extra
+	// configuration; a relocated CARGO_HOME additionally gets its Cargo lock files granted
+	// read-write. Set to false to disable every grant listed above: user-installed toolchains
+	// (rustup, nvm, pyenv, conda, pipx) then need explicit userPolicy.filesystem entries —
+	// readonlyPaths to read them, plus readwriteFiles for a relocated CARGO_HOME's
+	// .package-cache and .global-cache, which Cargo locks on every build. Only these
+	// developer-tool grants are affected: the working directory (see
+	// addCurrentWorkingDirectory), temporary storage, session log paths, and system locations
+	// follow their own rules and stay granted, so commands still run. Default: true (enabled by
+	// default; set to false to opt out).
+	AllowDevToolAccess *bool `json:"allowDevToolAccess,omitempty"`
+	// Credential-injection capability flags.
+	Auth *SandboxConfigAuth `json:"auth,omitempty"`
 	// Whether sandboxing is enabled for the session.
 	Enabled bool `json:"enabled"`
-	// Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the
-	// OS keyring the sandbox blocks. Default: false (opt-in).
-	GhAuth *bool `json:"ghAuth,omitempty"`
-	// Whether to inject the Copilot GitHub token as an `http.<host>.extraheader` so
-	// authenticated HTTPS git works inside the sandbox without the shell-based credential
-	// helper the sandbox blocks. Default: false (opt-in).
-	GitAuth *bool `json:"gitAuth,omitempty"`
 	// User-managed sandbox policy fragment merged into the auto-discovered base policy.
 	UserPolicy *SandboxConfigUserPolicy `json:"userPolicy,omitempty"`
 }
 
+// Credential-injection capability flags applied while the sandbox is enabled. For the same
+// capability independent of sandboxing, and matched to the credential's GitHub host, see
+// `shell.credentials`; the two are additive.
+// Experimental: SandboxConfigAuth is part of an experimental API and may change or be
+// removed.
+type SandboxConfigAuth struct {
+	// Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the
+	// OS keyring the sandbox blocks. Default: false (opt-in).
+	Gh *bool `json:"gh,omitempty"`
+	// Whether to inject git credentials as an `http.<url>.extraheader` so authenticated HTTPS
+	// git works inside the sandbox without the shell-based credential helper the sandbox
+	// blocks. github.com is served by the Copilot token; every other forge (Azure DevOps,
+	// GitHub Enterprise Server, GitLab, ...) by a credential the host resolves from the user's
+	// own helper before the sandbox is applied. Default: false (opt-in).
+	Git *bool `json:"git,omitempty"`
+}
+
 // User-managed sandbox policy fragment merged into the auto-discovered base policy.
 // Experimental: SandboxConfigUserPolicy is part of an experimental API and may change or be
 // removed.
@@ -8570,6 +10621,8 @@ type ServerSkill struct {
 	// Optional freeform hint describing the skill's expected arguments, from the
 	// `argument-hint` frontmatter field
 	ArgumentHint *string `json:"argumentHint,omitempty"`
+	// Canonical slash command name used to invoke the skill, without the leading '/'
+	CommandName *string `json:"commandName,omitempty"`
 	// Description of what the skill does
 	Description string `json:"description"`
 	// Whether the skill is currently enabled (based on global config)
@@ -8629,6 +10682,47 @@ type SessionAgentListRequest struct {
 type SessionAgentSetPromptResult struct {
 }
 
+// Credential-free authentication identity safe to expose to hosts and user interfaces.
+// Experimental: SessionAuthInfoResult is part of an experimental API and may change or be
+// removed.
+type SessionAuthInfoResult struct {
+	// Snapshot of the authenticated user's Copilot subscription info, if known
+	CopilotUser *CopilotUserResponse `json:"copilotUser,omitempty"`
+	// Name of the environment variable that supplied the credential, when applicable
+	EnvVar *string `json:"envVar,omitempty"`
+	// Authentication host
+	Host string `json:"host"`
+	// Authenticated login, when available
+	Login *string `json:"login,omitempty"`
+	// Opaque SDK GitHub credential registration backing this identity. Routing metadata only;
+	// never a credential.
+	RegistrationID *string `json:"registrationId,omitempty"`
+	// Authentication type
+	Type AuthInfoType `json:"type"`
+}
+
+// Internal GitHub login parameters.
+// Experimental: SessionAuthLoginRequest is part of an experimental API and may change or be
+// removed.
+type SessionAuthLoginRequest struct {
+	// GitHub host URL
+	Host string `json:"host"`
+	// GitHub login
+	Login string `json:"login"`
+	// Whether to persist the token after login
+	Persist *bool `json:"persist,omitempty"`
+	// GitHub authentication token
+	Token string `json:"token"`
+}
+
+// Parameters identifying a GitHub authentication to log out.
+// Experimental: SessionAuthLogoutUserRequest is part of an experimental API and may change
+// or be removed.
+type SessionAuthLogoutUserRequest struct {
+	// Authentication information to log out
+	AuthInfo AuthInfo `json:"authInfo"`
+}
+
 // Authentication status and account metadata for the session.
 // Experimental: SessionAuthStatus is part of an experimental API and may change or be
 // removed.
@@ -8647,6 +10741,16 @@ type SessionAuthStatus struct {
 	StatusMessage *string `json:"statusMessage,omitempty"`
 }
 
+// Parameters for switching the session's active authentication.
+// Experimental: SessionAuthSwitchRequest is part of an experimental API and may change or
+// be removed.
+type SessionAuthSwitchRequest struct {
+	// Authentication information to activate
+	AuthInfo AuthInfo `json:"authInfo"`
+	// Optional token paired with the authentication information
+	Token *string `json:"token,omitempty"`
+}
+
 // Map of sessionId -> bytes freed by removing the session's workspace directory.
 // Experimental: SessionBulkDeleteResult is part of an experimental API and may change or be
 // removed.
@@ -8667,6 +10771,16 @@ type SessionCancelAllBackgroundAgentsResult int64
 type SessionCanvasCloseResult struct {
 }
 
+// Experimental: SessionCanvasProviderRegisterResult is part of an experimental API and may
+// change or be removed.
+type SessionCanvasProviderRegisterResult struct {
+}
+
+// Experimental: SessionCanvasProviderUnregisterResult is part of an experimental API and
+// may change or be removed.
+type SessionCanvasProviderUnregisterResult struct {
+}
+
 // Experimental: SessionCommandsListRequest is part of an experimental API and may change or
 // be removed.
 type SessionCommandsListRequest struct {
@@ -8717,17 +10831,65 @@ type SessionContext struct {
 // Experimental: SessionContextAttribution is part of an experimental API and may change or
 // be removed.
 type SessionContextAttribution struct {
+	// Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors
+	// `SessionContextInfo.bufferTokens`.
+	BufferTokens int64 `json:"bufferTokens"`
+	// The six normalized `/context` header buckets, computed from the same tokenization as
+	// `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer`
+	// describe window capacity rather than occupied context, so the values do not sum to
+	// `totalTokens`.
+	Categories SessionContextAttributionCategories `json:"categories"`
 	// Successful compaction history for the session.
 	Compactions SessionContextAttributionCompactions `json:"compactions"`
+	// Token count at which background compaction starts. Mirrors
+	// `SessionContextInfo.compactionThreshold`.
+	CompactionThreshold int64 `json:"compactionThreshold"`
 	// Flat list of per-source attribution entries. Group by `kind` and render unrecognized
 	// kinds generically. Nesting and rollups are expressed via `parentId`.
 	Entries []SessionContextAttributionEntriesItem `json:"entries"`
+	// Prompt limit plus the model's output reserve: the full context window
+	// `categories.freeSpace` and `categories.buffer` are measured against. Mirrors
+	// `SessionContextInfo.limit`.
+	Limit int64 `json:"limit"`
+	// The concrete model id the entire breakdown was tokenized against (feeds the per-model
+	// token multiplier). Under `Auto` (Free/Student) this is the resolved model, not the
+	// literal `auto` sentinel, so totals are not undercounted. A single-model approximation of
+	// a potentially multi-model Auto session.
+	ModelID string `json:"modelId"`
+	// How `modelId` was chosen. Not a closed set — tolerate unknown values. Known values today:
+	// `autoResolved` (the model Auto resolved to), `selected` (the user's explicitly selected
+	// model), `default` (a fallback before any model is known).
+	ModelSource string `json:"modelSource"`
+	// Maximum prompt tokens the resolved model accepts — the denominator for a `##k/###k`
+	// context-usage display. Mirrors `SessionContextInfo.promptTokenLimit`.
+	PromptTokenLimit int64 `json:"promptTokenLimit"`
 	// Total token count of the current context window the entries are measured against (system
 	// message + conversation messages + tool definitions — the same total reported by
 	// /context). Divide an entry's `tokens` by this to derive its share.
 	TotalTokens int64 `json:"totalTokens"`
 }
 
+// The six normalized `/context` header buckets, computed from the same tokenization as
+// `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer`
+// describe window capacity rather than occupied context, so the values do not sum to
+// `totalTokens`.
+type SessionContextAttributionCategories struct {
+	// Output reserve plus post-blocking-threshold buffer.
+	Buffer int64 `json:"buffer"`
+	// Custom-instructions tokens (0 when none are configured).
+	CustomInstructions int64 `json:"customInstructions"`
+	// Remaining unused window capacity (clamped at 0).
+	FreeSpace int64 `json:"freeSpace"`
+	// MCP tool-definition tokens.
+	MCPTools int64 `json:"mcpTools"`
+	// Conversation (user/assistant/tool) message tokens.
+	Messages int64 `json:"messages"`
+	// System prompt tokens, excluding custom instructions.
+	SystemPrompt int64 `json:"systemPrompt"`
+	// Non-MCP tool-definition tokens.
+	SystemTools int64 `json:"systemTools"`
+}
+
 // Successful compaction history for the session.
 type SessionContextAttributionCompactions struct {
 	// Number of successful compactions in this session.
@@ -9059,8 +11221,10 @@ type SessionFSSqliteQueryResult struct {
 // Experimental: SessionFSSqliteTransactionError is part of an experimental API and may
 // change or be removed.
 type SessionFSSqliteTransactionError struct {
+	// Machine-readable classification of the transaction failure.
 	ErrorClass SessionFSSqliteTransactionErrorClass `json:"errorClass"`
-	Message    string                               `json:"message"`
+	// Human-readable transaction failure message.
+	Message string `json:"message"`
 }
 
 // Statements to execute atomically. Providers apply busy handling for every call.
@@ -9068,7 +11232,8 @@ type SessionFSSqliteTransactionError struct {
 // change or be removed.
 type SessionFSSqliteTransactionRequest struct {
 	// Target session identifier
-	SessionID  string                                `json:"sessionId"`
+	SessionID string `json:"sessionId"`
+	// Ordered SQL statements to execute in one transaction.
 	Statements []SessionFSSqliteTransactionStatement `json:"statements"`
 }
 
@@ -9076,8 +11241,10 @@ type SessionFSSqliteTransactionRequest struct {
 // Experimental: SessionFSSqliteTransactionResult is part of an experimental API and may
 // change or be removed.
 type SessionFSSqliteTransactionResult struct {
-	Error   *SessionFSSqliteTransactionError `json:"error,omitempty"`
-	Results []SessionFSSqliteQueryResult     `json:"results"`
+	// Classified transaction failure, when execution did not succeed.
+	Error *SessionFSSqliteTransactionError `json:"error,omitempty"`
+	// Per-statement query results in input order.
+	Results []SessionFSSqliteQueryResult `json:"results"`
 }
 
 // One statement in an atomic SQLite transaction.
@@ -9134,6 +11301,26 @@ type SessionFSWriteFileRequest struct {
 	SessionID string `json:"sessionId"`
 }
 
+// Authentication accounts available to the internal session host.
+// Experimental: SessionGitHubAuthGetAllAuthAvailableResult is part of an experimental API
+// and may change or be removed.
+type SessionGitHubAuthGetAllAuthAvailableResult []SessionAuthStatus
+
+// Whether the current authentication was logged out.
+// Experimental: SessionGitHubAuthLogoutResult is part of an experimental API and may change
+// or be removed.
+type SessionGitHubAuthLogoutResult bool
+
+// Whether the requested authentication was logged out.
+// Experimental: SessionGitHubAuthLogoutUserResult is part of an experimental API and may
+// change or be removed.
+type SessionGitHubAuthLogoutUserResult bool
+
+// Experimental: SessionGitHubAuthSwitchToAuthResult is part of an experimental API and may
+// change or be removed.
+type SessionGitHubAuthSwitchToAuthResult struct {
+}
+
 // Experimental: SessionHistoryCompactRequest is part of an experimental API and may change
 // or be removed.
 type SessionHistoryCompactRequest struct {
@@ -9164,6 +11351,12 @@ type SessionInstalledPlugin struct {
 	Enabled bool `json:"enabled"`
 	// Installation timestamp (ISO-8601)
 	InstalledAt string `json:"installed_at"`
+	// Absolute path of the marketplace directory a live plugin was resolved from. Present only
+	// on live, never-persisted records — those synthesized at session start for a
+	// directory/local marketplace, whose cache_path points at the real plugin directory on disk
+	// rather than a copy under the installed-plugins cache. Its presence is what marks a record
+	// as live, and no record carrying it is ever written to the persisted installedPlugins key.
+	InstalledFrom *string `json:"installed_from,omitempty"`
 	// Marketplace the plugin came from (empty string for direct repo installs)
 	Marketplace string `json:"marketplace"`
 	// Plugin name
@@ -9195,9 +11388,12 @@ type SessionInstalledPluginSource struct {
 // Experimental: SessionInstalledPluginSourceGitHub is part of an experimental API and may
 // change or be removed.
 type SessionInstalledPluginSourceGitHub struct {
+	// Optional repository-relative path to the plugin.
 	Path *string `json:"path,omitempty"`
-	Ref  *string `json:"ref,omitempty"`
-	Repo string  `json:"repo"`
+	// Optional Git ref to resolve.
+	Ref *string `json:"ref,omitempty"`
+	// GitHub repository in `owner/repo` form.
+	Repo string `json:"repo"`
 	// Optional full 40-character hexadecimal commit SHA.
 	Sha *string `json:"sha,omitempty"`
 	// Constant value. Always "github".
@@ -9208,6 +11404,7 @@ type SessionInstalledPluginSourceGitHub struct {
 // Experimental: SessionInstalledPluginSourceLocal is part of an experimental API and may
 // change or be removed.
 type SessionInstalledPluginSourceLocal struct {
+	// Local filesystem path to the plugin.
 	Path string `json:"path"`
 	// Constant value. Always "local".
 	Source SessionInstalledPluginSourceLocalSource `json:"source"`
@@ -9218,13 +11415,16 @@ type SessionInstalledPluginSourceLocal struct {
 // Experimental: SessionInstalledPluginSourceURL is part of an experimental API and may
 // change or be removed.
 type SessionInstalledPluginSourceURL struct {
+	// Optional source-relative path to the plugin.
 	Path *string `json:"path,omitempty"`
-	Ref  *string `json:"ref,omitempty"`
+	// Optional Git ref to resolve.
+	Ref *string `json:"ref,omitempty"`
 	// Optional full 40-character hexadecimal commit SHA.
 	Sha *string `json:"sha,omitempty"`
 	// Constant value. Always "url".
 	Source SessionInstalledPluginSourceURLSource `json:"source"`
-	URL    string                                `json:"url"`
+	// URL of the plugin source.
+	URL string `json:"url"`
 }
 
 // Baseline data provenance for a prediction.
@@ -9321,7 +11521,8 @@ func (SessionLimitPredictionResultUnavailable) Kind() SessionLimitPredictionResu
 // change or be removed.
 type SessionLimitPredictionTierOption struct {
 	// AI-credit cap for this tier.
-	Cap  float64                    `json:"cap"`
+	Cap float64 `json:"cap"`
+	// Semantic usage tier.
 	Tier SessionLimitPredictionTier `json:"tier"`
 }
 
@@ -9361,6 +11562,14 @@ func (LocalSessionMetadataValue) sessionListEntryIsRemote() bool {
 type RemoteSessionMetadataValue struct {
 	// Most recent working directory context.
 	Context *SessionContext `json:"context,omitempty"`
+	// Host-supplied human description of what the session is doing right now ("running tests",
+	// "waiting for approval"). Optional in the protocol and absent on hosts that do not publish
+	// it, so never rely on it -- it enriches `hostStatus`, it does not replace it.
+	HostActivity *string `json:"hostActivity,omitempty"`
+	// Live status as the owning host reports it in its session listing, so a row for a session
+	// running elsewhere can show that it is running. Absent for hosts that publish no such
+	// status (the cloud task managers), which read as idle.
+	HostStatus *RemoteSessionHostStatus `json:"hostStatus,omitempty"`
 	// Last-modified time as an ISO 8601 timestamp.
 	ModifiedTime string `json:"modifiedTime"`
 	// Optional human-friendly name set via /rename.
@@ -9424,6 +11633,34 @@ type SessionLoadDeferredRepoHooksResult struct {
 type SessionLspInitializeResult struct {
 }
 
+// Enterprise permission policy expressed with the runtime's managed permission-rule syntax.
+// Experimental: SessionManagedPermissions is part of an experimental API and may change or
+// be removed.
+type SessionManagedPermissions struct {
+	// Permission rules that allow matching operations unless another managed source, deny, or
+	// ask rule restricts them.
+	Allow []string `json:"allow,omitzero"`
+	// Permission rules that require explicit human approval.
+	Ask []string `json:"ask,omitzero"`
+	// Permission rules that block matching operations. Deny has highest precedence.
+	Deny []string `json:"deny,omitzero"`
+	// When set to `disable`, prevents bypass/allow-all permission modes. `allow-auto-only`
+	// blocks full allow-all but permits advisory auto-approval. Any other value is accepted
+	// rather than failing the session, but is enforced as `disable`: the key is only present to
+	// restrict something, so a mode this runtime cannot interpret fails closed to the most
+	// restrictive one it knows. Omit the key entirely to impose no restriction.
+	DisableBypassPermissionsMode *string `json:"disableBypassPermissionsMode,omitempty"`
+}
+
+// Managed settings an SDK host may inject at session startup. Only permissions are accepted
+// in this initial contract.
+// Experimental: SessionManagedSettings is part of an experimental API and may change or be
+// removed.
+type SessionManagedSettings struct {
+	// Managed permission policy injected by the SDK host.
+	Permissions *SessionManagedPermissions `json:"permissions,omitempty"`
+}
+
 // Standard MCP CallToolResult
 // Experimental: SessionMCPAppsCallToolResult is part of an experimental API and may change
 // or be removed.
@@ -9552,15 +11789,12 @@ type SessionModelListRequest struct {
 // Experimental: SessionModelPriceCategory is part of an experimental API and may change or
 // be removed.
 type SessionModelPriceCategory struct {
-	ID            string                   `json:"id"`
+	// CAPI model identifier.
+	ID string `json:"id"`
+	// Cost category assigned to the model.
 	PriceCategory ModelPickerPriceCategory `json:"priceCategory"`
 }
 
-// Experimental: SessionModeSetResult is part of an experimental API and may change or be
-// removed.
-type SessionModeSetResult struct {
-}
-
 // Experimental: SessionNameSetResult is part of an experimental API and may change or be
 // removed.
 type SessionNameSetResult struct {
@@ -9576,11 +11810,15 @@ type SessionOpenOptions struct {
 	AdditionalContentExclusionPolicies []SessionOpenOptionsAdditionalContentExclusionPolicy `json:"additionalContentExclusionPolicies,omitzero"`
 	// Additional directories the agent may access beyond the working directory. Each entry is
 	// granted to the session's file-access allow-list and surfaced to the model (system prompt
-	// context and `@`-mention completion). Absolute paths are recommended; a relative path is
-	// resolved against the session's working directory. Nonexistent or unresolvable entries are
-	// skipped with a warning. This is applied on both session creation and resume, and is not
-	// persisted: a resumed session that omits this option does not retain previously supplied
-	// directories (re-supply them, exactly as the CLI re-passes `--add-dir`).
+	// context and `@`-mention completion). Conventional `.github/skills/` and `.github/agents/`
+	// definitions under each directory also join the session's project catalogs when their
+	// existing subsystem gates are enabled: added-root skills require both
+	// `enableConfigDiscovery` and effective `enableSkills`; added-root agents require
+	// `enableConfigDiscovery`. Supplying a directory therefore activates configuration from it
+	// and should be treated as a trust decision. Absolute paths are recommended; a relative
+	// path is resolved against the session's working directory. Nonexistent or unresolvable
+	// entries are skipped with a warning. This is applied during session creation and cold
+	// resume and is not persisted, so a cold resume must re-supply the directories.
 	AdditionalDirectories []string `json:"additionalDirectories,omitzero"`
 	// Runtime context discriminator for agent filtering.
 	AgentContext *string `json:"agentContext,omitempty"`
@@ -9615,11 +11853,14 @@ type SessionOpenOptions struct {
 	DetachedFromSpawningParentSessionID *string `json:"detachedFromSpawningParentSessionId,omitempty"`
 	// Instruction source IDs disabled for this session.
 	DisabledInstructionSources []string `json:"disabledInstructionSources,omitzero"`
+	// MCP server names disabled for this session. Disabled servers are not started or
+	// authenticated on create or cold resume.
+	DisabledMCPServers []string `json:"disabledMcpServers,omitzero"`
 	// Skill IDs disabled for this session.
 	DisabledSkills []string `json:"disabledSkills,omitzero"`
-	// Experimental: enable native model citations (Anthropic models today), normalized onto the
-	// `assistant.message` event. Off by default; may change or be removed while the citations
-	// surface is experimental.
+	// Experimental: enable native model citations for supported Anthropic and OpenAI models,
+	// normalized onto the `assistant.message` event. Off by default; may change or be removed
+	// while the citations surface is experimental.
 	// Experimental: EnableCitations is part of an experimental API and may change or be removed.
 	EnableCitations *bool `json:"enableCitations,omitempty"`
 	// Opt in to capturing file changes for session rewind and session diff. Capture cannot
@@ -9676,6 +11917,10 @@ type SessionOpenOptions struct {
 	// are available, subject to runtime availability and exclusions. Custom agents with the
 	// same name remain available.
 	IncludedBuiltinAgents []string `json:"includedBuiltinAgents,omitzero"`
+	// Built-in skill names to include in this session. When specified, only these
+	// runtime-bundled skills are available. Skills from other sources with the same name remain
+	// available.
+	IncludedBuiltinSkills []string `json:"includedBuiltinSkills,omitzero"`
 	// Installed plugins visible to the session.
 	InstalledPlugins []InstalledPlugin `json:"installedPlugins,omitzero"`
 	// Stable integration identifier for analytics.
@@ -9686,6 +11931,9 @@ type SessionOpenOptions struct {
 	LogInteractiveShells *bool `json:"logInteractiveShells,omitempty"`
 	// Identifier sent to LSP-style integrations.
 	LspClientName *string `json:"lspClientName,omitempty"`
+	// Permissions-only enterprise policy injected by the SDK host at session create or resume.
+	// Composes restrictively with self-fetched and device policy and is not persisted.
+	ManagedSettings *SessionManagedSettings `json:"managedSettings,omitempty"`
 	// Maximum decoded byte size of a single inline model-facing binary tool result persisted in
 	// session events (default 10 MB).
 	MaxInlineBinaryBytes *int64 `json:"maxInlineBinaryBytes,omitempty"`
@@ -9723,6 +11971,11 @@ type SessionOpenOptions struct {
 	RunningInInteractiveMode *bool `json:"runningInInteractiveMode,omitempty"`
 	// Resolved sandbox configuration.
 	SandboxConfig *SandboxConfig `json:"sandboxConfig,omitempty"`
+	// Origin of the sandbox choice. The runtime uses this only for internal telemetry
+	// provenance; managed policy is derived independently.
+	// Internal: SandboxConfigSource is part of the SDK's internal API surface and is not
+	// intended for external use.
+	SandboxConfigSource *SandboxConfigSource `json:"sandboxConfigSource,omitempty"`
 	// Capabilities enabled for this session.
 	SessionCapabilities []SessionCapability `json:"sessionCapabilities,omitzero"`
 	// Optional stable session identifier to use for a new session.
@@ -9755,8 +12008,10 @@ type SessionOpenOptions struct {
 // Experimental: SessionOpenOptionsAdditionalContentExclusionPolicy is part of an
 // experimental API and may change or be removed.
 type SessionOpenOptionsAdditionalContentExclusionPolicy struct {
-	LastUpdatedAt any                                                      `json:"last_updated_at"`
-	Rules         []SessionOpenOptionsAdditionalContentExclusionPolicyRule `json:"rules"`
+	// Opaque policy update timestamp supplied by the host.
+	LastUpdatedAt any `json:"last_updated_at"`
+	// Content-exclusion rules to apply.
+	Rules []SessionOpenOptionsAdditionalContentExclusionPolicyRule `json:"rules"`
 	// Allowed values for the `SessionOpenOptionsAdditionalContentExclusionPolicyScope`
 	// enumeration.
 	Scope SessionOpenOptionsAdditionalContentExclusionPolicyScope `json:"scope"`
@@ -9767,9 +12022,12 @@ type SessionOpenOptionsAdditionalContentExclusionPolicy struct {
 // Experimental: SessionOpenOptionsAdditionalContentExclusionPolicyRule is part of an
 // experimental API and may change or be removed.
 type SessionOpenOptionsAdditionalContentExclusionPolicyRule struct {
-	IfAnyMatch  []string `json:"ifAnyMatch,omitzero"`
+	// Conditions of which at least one must match.
+	IfAnyMatch []string `json:"ifAnyMatch,omitzero"`
+	// Conditions none of which may match.
 	IfNoneMatch []string `json:"ifNoneMatch,omitzero"`
-	Paths       []string `json:"paths"`
+	// Path patterns covered by this rule.
+	Paths []string `json:"paths"`
 	// Source descriptor for a `sessions.open` content-exclusion rule, with source name and type.
 	Source SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource `json:"source"`
 }
@@ -9778,7 +12036,9 @@ type SessionOpenOptionsAdditionalContentExclusionPolicyRule struct {
 // Experimental: SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource is part of an
 // experimental API and may change or be removed.
 type SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource struct {
+	// Name of the policy source.
 	Name string `json:"name"`
+	// Type of the policy source.
 	Type string `json:"type"`
 }
 
@@ -10146,7 +12406,7 @@ type SessionSetCredentialsParams struct {
 	// verbatim credential remains installed. It does NOT otherwise validate the credential.
 	// Several variants carry secret material; treat this method's params as containing secrets
 	// at rest and in transit.
-	Credentials AuthInfo `json:"credentials,omitempty"`
+	Credentials SettableAuthInfo `json:"credentials,omitempty"`
 }
 
 // Indicates whether the credential update succeeded.
@@ -10170,8 +12430,10 @@ type SessionSetCredentialsResult struct {
 // Experimental: SessionSettingsBuiltInToolAvailabilitySnapshot is part of an experimental
 // API and may change or be removed.
 type SessionSettingsBuiltInToolAvailabilitySnapshot struct {
+	// Whether the create-pull-request tool is available.
 	CreatePullRequest *bool `json:"createPullRequest,omitempty"`
-	ReportProgress    *bool `json:"reportProgress,omitempty"`
+	// Whether the report-progress tool is available.
+	ReportProgress *bool `json:"reportProgress,omitempty"`
 }
 
 // Named Rust-owned settings predicate to evaluate for this session.
@@ -10188,6 +12450,7 @@ type SessionSettingsEvaluatePredicateRequest struct {
 // Experimental: SessionSettingsEvaluatePredicateResult is part of an experimental API and
 // may change or be removed.
 type SessionSettingsEvaluatePredicateResult struct {
+	// Whether the named settings predicate evaluated to enabled.
 	Enabled bool `json:"enabled"`
 }
 
@@ -10195,26 +12458,35 @@ type SessionSettingsEvaluatePredicateResult struct {
 // Experimental: SessionSettingsJobSnapshot is part of an experimental API and may change or
 // be removed.
 type SessionSettingsJobSnapshot struct {
+	// Availability of job-specific built-in tools.
 	BuiltInToolAvailability *SessionSettingsBuiltInToolAvailabilitySnapshot `json:"builtInToolAvailability,omitempty"`
-	EventType               *string                                         `json:"eventType,omitempty"`
-	IsTriggerJob            *bool                                           `json:"isTriggerJob,omitempty"`
+	// GitHub Actions event type for the job.
+	EventType *string `json:"eventType,omitempty"`
+	// Whether this is the workflow's trigger job.
+	IsTriggerJob *bool `json:"isTriggerJob,omitempty"`
 }
 
 // Redacted model routing settings for a session.
 // Experimental: SessionSettingsModelSnapshot is part of an experimental API and may change
 // or be removed.
 type SessionSettingsModelSnapshot struct {
-	CallbackURL            *string `json:"callbackUrl,omitempty"`
+	// Agent service callback URL for job and progress updates.
+	CallbackURL *string `json:"callbackUrl,omitempty"`
+	// Default reasoning effort for the selected model.
 	DefaultReasoningEffort *string `json:"defaultReasoningEffort,omitempty"`
-	InstanceID             *string `json:"instanceId,omitempty"`
-	Model                  *string `json:"model,omitempty"`
+	// Agent job identifier for the session.
+	InstanceID *string `json:"instanceId,omitempty"`
+	// Selected model identifier.
+	Model *string `json:"model,omitempty"`
 }
 
 // Online-evaluation settings safe to expose across the SDK boundary.
 // Experimental: SessionSettingsOnlineEvaluationSnapshot is part of an experimental API and
 // may change or be removed.
 type SessionSettingsOnlineEvaluationSnapshot struct {
-	DisableOnlineEvaluation          *bool `json:"disableOnlineEvaluation,omitempty"`
+	// Whether online evaluation is disabled.
+	DisableOnlineEvaluation *bool `json:"disableOnlineEvaluation,omitempty"`
+	// Whether online-evaluation output-file generation is enabled.
 	EnableOnlineEvaluationOutputFile *bool `json:"enableOnlineEvaluationOutputFile,omitempty"`
 }
 
@@ -10222,18 +12494,30 @@ type SessionSettingsOnlineEvaluationSnapshot struct {
 // Experimental: SessionSettingsRepoSnapshot is part of an experimental API and may change
 // or be removed.
 type SessionSettingsRepoSnapshot struct {
-	Branch            *string  `json:"branch,omitempty"`
-	Commit            *string  `json:"commit,omitempty"`
-	Host              *string  `json:"host,omitempty"`
-	HostProtocol      *string  `json:"hostProtocol,omitempty"`
-	ID                *float64 `json:"id,omitempty"`
-	Name              *string  `json:"name,omitempty"`
-	OwnerID           *float64 `json:"ownerId,omitempty"`
-	OwnerName         *string  `json:"ownerName,omitempty"`
-	PrCommitCount     *float64 `json:"prCommitCount,omitempty"`
-	ReadWrite         *bool    `json:"readWrite,omitempty"`
-	SecretScanningURL *string  `json:"secretScanningUrl,omitempty"`
-	ServerURL         *string  `json:"serverUrl,omitempty"`
+	// Checked-out repository branch.
+	Branch *string `json:"branch,omitempty"`
+	// Checked-out commit SHA.
+	Commit *string `json:"commit,omitempty"`
+	// GitHub server host name.
+	Host *string `json:"host,omitempty"`
+	// Protocol used to access the GitHub host.
+	HostProtocol *string `json:"hostProtocol,omitempty"`
+	// GitHub repository database ID.
+	ID *float64 `json:"id,omitempty"`
+	// Repository name.
+	Name *string `json:"name,omitempty"`
+	// GitHub repository owner database ID.
+	OwnerID *float64 `json:"ownerId,omitempty"`
+	// Repository owner login.
+	OwnerName *string `json:"ownerName,omitempty"`
+	// Number of commits in the pull request.
+	PrCommitCount *float64 `json:"prCommitCount,omitempty"`
+	// Whether the repository is writable.
+	ReadWrite *bool `json:"readWrite,omitempty"`
+	// GitHub secret-scanning service URL.
+	SecretScanningURL *string `json:"secretScanningUrl,omitempty"`
+	// GitHub server base URL.
+	ServerURL *string `json:"serverUrl,omitempty"`
 }
 
 // Redacted, serializable view of session runtime settings for SDK boundary consumers.
@@ -10241,30 +12525,49 @@ type SessionSettingsRepoSnapshot struct {
 // Experimental: SessionSettingsSnapshot is part of an experimental API and may change or be
 // removed.
 type SessionSettingsSnapshot struct {
-	ClientName       *string                                 `json:"clientName,omitempty"`
-	Job              SessionSettingsJobSnapshot              `json:"job"`
-	Model            SessionSettingsModelSnapshot            `json:"model"`
+	// Name of the SDK client that created the session.
+	ClientName *string `json:"clientName,omitempty"`
+	// Redacted job settings.
+	Job SessionSettingsJobSnapshot `json:"job"`
+	// Redacted model routing settings.
+	Model SessionSettingsModelSnapshot `json:"model"`
+	// Online-evaluation settings safe for SDK consumers.
 	OnlineEvaluation SessionSettingsOnlineEvaluationSnapshot `json:"onlineEvaluation"`
-	Repo             SessionSettingsRepoSnapshot             `json:"repo"`
-	StartTimeMs      *float64                                `json:"startTimeMs,omitempty"`
-	TimeoutMs        *float64                                `json:"timeoutMs,omitempty"`
-	Validation       SessionSettingsValidationSnapshot       `json:"validation"`
-	Version          *string                                 `json:"version,omitempty"`
+	// Redacted repository and host settings.
+	Repo SessionSettingsRepoSnapshot `json:"repo"`
+	// Session start time as Unix epoch milliseconds.
+	StartTimeMs *float64 `json:"startTimeMs,omitempty"`
+	// Session timeout in milliseconds.
+	TimeoutMs *float64 `json:"timeoutMs,omitempty"`
+	// Redacted validation and memory-tool settings.
+	Validation SessionSettingsValidationSnapshot `json:"validation"`
+	// Agent runtime version selector copied from the session settings, such as `latest` or a
+	// runtime release identifier.
+	Version *string `json:"version,omitempty"`
 }
 
 // Redacted validation and memory-tool settings for a session.
 // Experimental: SessionSettingsValidationSnapshot is part of an experimental API and may
 // change or be removed.
 type SessionSettingsValidationSnapshot struct {
-	AdvisoryEnabled       *bool    `json:"advisoryEnabled,omitempty"`
-	CodeqlEnabled         *bool    `json:"codeqlEnabled,omitempty"`
-	CodeReviewEnabled     *bool    `json:"codeReviewEnabled,omitempty"`
-	CodeReviewModel       *string  `json:"codeReviewModel,omitempty"`
-	DependabotTimeout     *float64 `json:"dependabotTimeout,omitempty"`
-	MemoryStoreEnabled    *bool    `json:"memoryStoreEnabled,omitempty"`
-	MemoryVoteEnabled     *bool    `json:"memoryVoteEnabled,omitempty"`
-	SecretScanningEnabled *bool    `json:"secretScanningEnabled,omitempty"`
-	Timeout               *float64 `json:"timeout,omitempty"`
+	// Whether advisory validation is enabled.
+	AdvisoryEnabled *bool `json:"advisoryEnabled,omitempty"`
+	// Whether CodeQL validation is enabled.
+	CodeqlEnabled *bool `json:"codeqlEnabled,omitempty"`
+	// Whether code-review validation is enabled.
+	CodeReviewEnabled *bool `json:"codeReviewEnabled,omitempty"`
+	// Model used for code-review validation.
+	CodeReviewModel *string `json:"codeReviewModel,omitempty"`
+	// Dependabot validation timeout budget in seconds.
+	DependabotTimeout *float64 `json:"dependabotTimeout,omitempty"`
+	// Whether the memory-store tool is enabled.
+	MemoryStoreEnabled *bool `json:"memoryStoreEnabled,omitempty"`
+	// Whether the memory-vote tool is enabled.
+	MemoryVoteEnabled *bool `json:"memoryVoteEnabled,omitempty"`
+	// Whether secret-scanning validation is enabled.
+	SecretScanningEnabled *bool `json:"secretScanningEnabled,omitempty"`
+	// General validation timeout budget in seconds.
+	Timeout *float64 `json:"timeout,omitempty"`
 }
 
 // UUID prefix to resolve to a unique session ID.
@@ -10721,6 +13024,10 @@ type SessionUpdateOptionsParams struct {
 	// are available, subject to runtime availability and exclusions. Custom agents with the
 	// same name remain available. Set to null to remove the allowlist restriction.
 	IncludedBuiltinAgents []string `json:"includedBuiltinAgents,omitzero"`
+	// Built-in skill names to include in this session. When specified, only these
+	// runtime-bundled skills are available. Skills from other sources with the same name remain
+	// available. Set to null to remove the allowlist restriction.
+	IncludedBuiltinSkills []string `json:"includedBuiltinSkills,omitzero"`
 	// Full set of installed plugins for the session. Replaces the existing list; the runtime
 	// invalidates the skills cache only when the list materially changes.
 	InstalledPlugins []SessionInstalledPlugin `json:"installedPlugins,omitzero"`
@@ -10759,6 +13066,11 @@ type SessionUpdateOptionsParams struct {
 	RunningInInteractiveMode *bool `json:"runningInInteractiveMode,omitempty"`
 	// Resolved sandbox configuration.
 	SandboxConfig *SandboxConfig `json:"sandboxConfig,omitempty"`
+	// Origin of the sandbox choice. The runtime uses this only for internal telemetry
+	// provenance; managed policy is derived independently.
+	// Internal: SandboxConfigSource is part of the SDK's internal API surface and is not
+	// intended for external use.
+	SandboxConfigSource *SandboxConfigSource `json:"sandboxConfigSource,omitempty"`
 	// Replaces the session's capability set with the given list. Use to enable or disable
 	// capabilities mid-session (e.g., remove `memory` for reproducible scripted runs). Omit the
 	// field to leave the existing capability set unchanged.
@@ -10832,6 +13144,68 @@ type SessionWorkingDirectoryContext struct {
 type SessionWorkspacesCreateFileResult struct {
 }
 
+// Authentication credentials accepted by session.gitHubAuth.setCredentials. Session-owned
+// token-provider identities cannot be installed through this method.
+// Experimental: SettableAuthInfo is part of an experimental API and may change or be
+// removed.
+type SettableAuthInfo interface {
+	settableAuthInfo()
+	settableAuthInfoType() SettableAuthInfoType
+}
+
+type RawSettableAuthInfoData struct {
+	Discriminator SettableAuthInfoType
+	Raw           json.RawMessage
+}
+
+func (RawSettableAuthInfoData) settableAuthInfo() {}
+func (r RawSettableAuthInfoData) settableAuthInfoType() SettableAuthInfoType {
+	return r.Discriminator
+}
+func (APIKeyAuthInfo) settableAuthInfo() {}
+func (APIKeyAuthInfo) settableAuthInfoType() SettableAuthInfoType {
+	return SettableAuthInfoTypeAPIKey
+}
+func (CopilotAPITokenAuthInfo) settableAuthInfo() {}
+func (CopilotAPITokenAuthInfo) settableAuthInfoType() SettableAuthInfoType {
+	return SettableAuthInfoTypeCopilotAPIToken
+}
+func (EnvAuthInfo) settableAuthInfo() {}
+func (EnvAuthInfo) settableAuthInfoType() SettableAuthInfoType {
+	return SettableAuthInfoTypeEnv
+}
+func (GhCLIAuthInfo) settableAuthInfo() {}
+func (GhCLIAuthInfo) settableAuthInfoType() SettableAuthInfoType {
+	return SettableAuthInfoTypeGhCLI
+}
+func (HMACAuthInfo) settableAuthInfo() {}
+func (HMACAuthInfo) settableAuthInfoType() SettableAuthInfoType {
+	return SettableAuthInfoTypeHMAC
+}
+
+// Token authentication accepted by session.gitHubAuth.setCredentials.
+// Experimental: SettableTokenAuthInfo is part of an experimental API and may change or be
+// removed.
+type SettableTokenAuthInfo struct {
+	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
+	// GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
+	// verbatim and does not re-fetch when set.
+	CopilotUser *CopilotUserResponse `json:"copilotUser,omitempty"`
+	// Authentication host.
+	Host string `json:"host"`
+	// The token value itself. Treat as a secret.
+	Token string `json:"token"`
+}
+
+func (SettableTokenAuthInfo) settableAuthInfo() {}
+func (SettableTokenAuthInfo) settableAuthInfoType() SettableAuthInfoType {
+	return SettableAuthInfoTypeToken
+}
+func (UserAuthInfo) settableAuthInfo() {}
+func (UserAuthInfo) settableAuthInfoType() SettableAuthInfoType {
+	return SettableAuthInfoTypeUser
+}
+
 // User-requested shell execution cancellation handle.
 // Experimental: ShellCancelUserRequestedRequest is part of an experimental API and may
 // change or be removed.
@@ -10840,6 +13214,55 @@ type ShellCancelUserRequestedRequest struct {
 	RequestID string `json:"requestId"`
 }
 
+// Command-scoped GitHub credential injection for the shell commands an agent runs.
+//
+// Each channel is opt-in and independent, and injection is scoped to the individual command
+// spawn: the credential is resolved from the session's *current* authentication at every
+// spawn
+// and reaches only spawns whose script actually invokes `git` or `gh`. Because nothing is
+// retained between spawns, replacing the session credential
+// (`session.gitHubAuth.setCredentials`)
+// changes what the next spawned command presents — which seeding a credential into the
+// runtime
+// process's own environment cannot do, since a child's environment is fixed at `exec`.
+//
+// The credential is matched to the host it authenticates to, so a github.com credential is
+// never
+// presented to a GitHub Enterprise host and vice versa. Where a channel cannot express that
+// boundary it injects nothing rather than crossing it -- see `gh` below.
+//
+// This is independent of `sandboxConfig`: it is a decision about which identity the agent
+// presents, not about what the agent may touch, and it works on every platform whether or
+// not
+// an OS sandboxing backend is available. `sandboxConfig.auth` remains the sandbox-scoped
+// spelling and is additive with this one.
+// Experimental: ShellCredentials is part of an experimental API and may change or be
+// removed.
+type ShellCredentials struct {
+	// Whether to authenticate the agent's `gh` commands as the session's GitHub credential, by
+	// exporting `GH_TOKEN` to a spawn that runs `gh`. Any inherited `gh` credential is removed
+	// from
+	// spawns that do not, so the credential stays command-scoped.
+	//
+	// Applies to a github.com credential only. `gh` picks its credential variable from the host
+	// a
+	// command targets rather than the one the credential belongs to, and the command can choose
+	// that
+	// target, so `GH_ENTERPRISE_TOKEN` would offer a single-tenant enterprise credential to
+	// every
+	// other enterprise host. A session whose credential is enterprise-scoped therefore runs `gh`
+	// unauthenticated; its `git` commands are unaffected, because `http.<host>.extraheader` is
+	// scoped
+	// to one host by construction. Default: false (opt-in).
+	Gh *bool `json:"gh,omitempty"`
+	// Whether to authenticate the agent's `git` commands as the session's GitHub credential, by
+	// injecting an `http.<host>.extraheader` (plus `insteadOf` rewrites so SSH-spelled remotes
+	// for
+	// that host use the authenticated HTTPS transport). Applied only to a spawn that runs a
+	// remote-contacting `git` subcommand. Default: false (opt-in).
+	Git *bool `json:"git,omitempty"`
+}
+
 // Shell command to run, with optional working directory and timeout in milliseconds.
 // Experimental: ShellExecRequest is part of an experimental API and may change or be
 // removed.
@@ -10901,6 +13324,8 @@ type ShellKillResult struct {
 // Per-session settings for built-in shell tools.
 // Experimental: ShellOptions is part of an experimental API and may change or be removed.
 type ShellOptions struct {
+	// Command-scoped GitHub credential injection for shell commands.
+	Credentials *ShellCredentials `json:"credentials,omitempty"`
 	// Controls automatic non-interactive profile loading where supported. Explicit initScripts
 	// are unaffected.
 	InitProfile *ShellInitProfile `json:"initProfile,omitempty"`
@@ -10943,6 +13368,8 @@ type Skill struct {
 	// Optional freeform hint describing the skill's expected arguments, from the
 	// `argument-hint` frontmatter field
 	ArgumentHint *string `json:"argumentHint,omitempty"`
+	// Canonical slash command name used to invoke the skill, without the leading '/'
+	CommandName *string `json:"commandName,omitempty"`
 	// Description of what the skill does
 	Description string `json:"description"`
 	// Whether the skill is currently enabled
@@ -11004,6 +13431,22 @@ type SkillsConfigSetDisabledSkillsRequest struct {
 type SkillsConfigSetDisabledSkillsResult struct {
 }
 
+// Adds or removes a single skill from the global disabled list, leaving every other entry
+// untouched.
+// Experimental: SkillsConfigSetSkillDisabledRequest is part of an experimental API and may
+// change or be removed.
+type SkillsConfigSetSkillDisabledRequest struct {
+	// True to disable the skill, false to enable it
+	Disabled bool `json:"disabled"`
+	// Name of the skill to add to or remove from the disabled list
+	Name string `json:"name"`
+}
+
+// Experimental: SkillsConfigSetSkillDisabledResult is part of an experimental API and may
+// change or be removed.
+type SkillsConfigSetSkillDisabledResult struct {
+}
+
 // Name of the skill to disable for the session.
 // Experimental: SkillsDisableRequest is part of an experimental API and may change or be
 // removed.
@@ -11153,6 +13596,22 @@ func (r RawSlashCommandInvocationResultData) Kind() SlashCommandInvocationResult
 	return r.Discriminator
 }
 
+// Experimental: SlashCommandAddTimelineEntryResult is part of an experimental API and may
+// change or be removed.
+type SlashCommandAddTimelineEntryResult struct {
+	// Timeline entry the host should append.
+	Entry SlashCommandTimelineEntry `json:"entry"`
+	// Optional text the host should prefill into the input editor.
+	PrefillInput *string `json:"prefillInput,omitempty"`
+	// Whether command execution changed persisted runtime settings.
+	RuntimeSettingsChanged *bool `json:"runtimeSettingsChanged,omitempty"`
+}
+
+func (SlashCommandAddTimelineEntryResult) slashCommandInvocationResult() {}
+func (SlashCommandAddTimelineEntryResult) Kind() SlashCommandInvocationResultKind {
+	return SlashCommandInvocationResultKindAddTimelineEntry
+}
+
 // Slash-command invocation result that submits an agent prompt, with display prompt,
 // optional mode, optional user-facing notice, and settings-change flag.
 // Experimental: SlashCommandAgentPromptResult is part of an experimental API and may change
@@ -11214,6 +13673,60 @@ func (SlashCommandSelectSubcommandResult) Kind() SlashCommandInvocationResultKin
 	return SlashCommandInvocationResultKindSelectSubcommand
 }
 
+// Experimental: SlashCommandSetModelResult is part of an experimental API and may change or
+// be removed.
+type SlashCommandSetModelResult struct {
+	// Model selected by the command.
+	Model string `json:"model"`
+	// Reasoning effort selected for the model.
+	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
+	// Repository settings scope modified by the command.
+	RepoScope *string `json:"repoScope,omitempty"`
+	// User-settings snapshot to restore if the host cancels the model switch.
+	RevertOnCancel any `json:"revertOnCancel,omitempty"`
+	// Whether command execution changed persisted runtime settings.
+	RuntimeSettingsChanged *bool `json:"runtimeSettingsChanged,omitempty"`
+	// Settings scope modified by the command.
+	Scope *string `json:"scope,omitempty"`
+	// User-facing warning produced while selecting the model.
+	Warning *string `json:"warning,omitempty"`
+}
+
+func (SlashCommandSetModelResult) slashCommandInvocationResult() {}
+func (SlashCommandSetModelResult) Kind() SlashCommandInvocationResultKind {
+	return SlashCommandInvocationResultKindSetModel
+}
+
+// Experimental: SlashCommandSetPlanModelResult is part of an experimental API and may
+// change or be removed.
+type SlashCommandSetPlanModelResult struct {
+	// User-facing confirmation message for the plan-model selection.
+	Message string `json:"message"`
+	// Dedicated model selected for plan mode.
+	PlanModel *string `json:"planModel,omitempty"`
+	// Whether command execution changed persisted runtime settings.
+	RuntimeSettingsChanged *bool `json:"runtimeSettingsChanged,omitempty"`
+}
+
+func (SlashCommandSetPlanModelResult) slashCommandInvocationResult() {}
+func (SlashCommandSetPlanModelResult) Kind() SlashCommandInvocationResultKind {
+	return SlashCommandInvocationResultKindSetPlanModel
+}
+
+// Experimental: SlashCommandShowDialogResult is part of an experimental API and may change
+// or be removed.
+type SlashCommandShowDialogResult struct {
+	// Dialog the host should display.
+	Dialog SlashCommandModelPickerDialog `json:"dialog"`
+	// Whether command execution changed persisted runtime settings.
+	RuntimeSettingsChanged *bool `json:"runtimeSettingsChanged,omitempty"`
+}
+
+func (SlashCommandShowDialogResult) slashCommandInvocationResult() {}
+func (SlashCommandShowDialogResult) Kind() SlashCommandInvocationResultKind {
+	return SlashCommandInvocationResultKindShowDialog
+}
+
 // Slash-command invocation result containing text output plus Markdown/ANSI rendering flags.
 // Experimental: SlashCommandTextResult is part of an experimental API and may change or be
 // removed.
@@ -11234,6 +13747,19 @@ func (SlashCommandTextResult) Kind() SlashCommandInvocationResultKind {
 	return SlashCommandInvocationResultKindText
 }
 
+// Experimental: SlashCommandModelPickerDialog is part of an experimental API and may change
+// or be removed.
+type SlashCommandModelPickerDialog struct {
+	// Discriminator for a model-picker dialog.
+	Kind SlashCommandModelPickerDialogKind `json:"kind"`
+	// Model that should be enabled before it can be selected.
+	ModelToEnable *string `json:"modelToEnable,omitempty"`
+	// Settings scope the picker should modify.
+	Scope *string `json:"scope,omitempty"`
+	// Model-selection target represented by the picker.
+	Target *string `json:"target,omitempty"`
+}
+
 // Selectable slash-command subcommand option with name, description, and optional group
 // label.
 // Experimental: SlashCommandSelectSubcommandOption is part of an experimental API and may
@@ -11247,6 +13773,17 @@ type SlashCommandSelectSubcommandOption struct {
 	Name string `json:"name"`
 }
 
+// Experimental: SlashCommandTimelineEntry is part of an experimental API and may change or
+// be removed.
+type SlashCommandTimelineEntry struct {
+	// Text displayed for the timeline entry.
+	Text string `json:"text"`
+	// Timeline entry presentation type.
+	Type string `json:"type"`
+	// Optional URL associated with the timeline entry.
+	URL *string `json:"url,omitempty"`
+}
+
 // Configured per-agent subagent overrides
 // Experimental: SubagentSettings is part of an experimental API and may change or be
 // removed.
@@ -11274,6 +13811,45 @@ type SubagentSettingsEntry struct {
 	Model *string `json:"model,omitempty"`
 }
 
+// Task completion notification with summary from the agent
+// Experimental: TaskCompleteData is part of an experimental API and may change or be
+// removed.
+type TaskCompleteData struct {
+	// Active autopilot objective ID evaluated by the completion reviewer
+	ObjectiveID *int64 `json:"objectiveId,omitempty"`
+	// Semantic completion decision. Absent on legacy events and invalid tool calls
+	Outcome *TaskCompletionOutcome `json:"outcome,omitempty"`
+	// Label-safe runtime rationale for the completion decision (e.g. a cancellation or
+	// pause/resume downgrade), when one applies. Reviewer-authored rationale is intentionally
+	// omitted here because this event has no IFC label channel; the reviewer's findings remain
+	// available through its own labeled sub-agent events
+	Reason *string `json:"reason,omitempty"`
+	// Whether the task was accepted as complete. False when validation failed or completion was
+	// rejected or blocked by the reviewer
+	Success *bool `json:"success,omitempty"`
+	// Summary of the completed task, provided by the agent
+	Summary *string `json:"summary,omitempty"`
+}
+
+// Experimental: TaskCompletionDecision is part of an experimental API and may change or be
+// removed.
+type TaskCompletionDecision struct {
+	// Objective eligibility token captured when the decision was evaluated.
+	CompletionEligibilityToken *int64 `json:"completionEligibilityToken,omitempty"`
+	// Whether completion was accepted after the reviewer-rejection budget was exhausted.
+	CompletionRejectionBudgetExhausted *bool `json:"completionRejectionBudgetExhausted,omitempty"`
+	// Active autopilot objective evaluated by the completion reviewer.
+	ObjectiveID *int64 `json:"objectiveId,omitempty"`
+	// Semantic result of evaluating the task completion request.
+	Outcome TaskCompletionOutcome `json:"outcome"`
+	// Rationale for the completion decision, when one is available.
+	Reason *string `json:"reason,omitempty"`
+	// Whether the rationale was derived from completion-reviewer output.
+	ReviewerDerived *bool `json:"reviewerDerived,omitempty"`
+	// Information-flow metadata captured from the completion reviewer.
+	ReviewerResultMeta any `json:"reviewerResultMeta,omitempty"`
+}
+
 // Tracked task union returned by task APIs, containing either an agent task or a shell task.
 // Experimental: TaskInfo is part of an experimental API and may change or be removed.
 type TaskInfo interface {
@@ -11309,6 +13885,8 @@ type TaskAgentInfo struct {
 	CompletedAt *time.Time `json:"completedAt,omitempty"`
 	// Short description of the task
 	Description string `json:"description"`
+	// Friendly, non-unique name intended for display
+	DisplayName *string `json:"displayName,omitempty"`
 	// Error message when the task failed
 	Error *string `json:"error,omitempty"`
 	// Whether task execution is synchronously awaited or managed in the background
@@ -11567,7 +14145,7 @@ type TasksStartAgentRequest struct {
 	Description *string `json:"description,omitempty"`
 	// Optional model override
 	Model *string `json:"model,omitempty"`
-	// Short name for the agent, used to generate a human-readable ID
+	// Friendly, non-unique name used when displaying the agent
 	Name string `json:"name"`
 	// Task prompt for the agent
 	Prompt string `json:"prompt"`
@@ -11624,6 +14202,112 @@ type ToolList struct {
 	Tools []Tool `json:"tools"`
 }
 
+// Canonical result returned by a session tool.
+// Experimental: ToolResult is part of an experimental API and may change or be removed.
+type ToolResult interface {
+	toolResult()
+}
+
+func (ToolResultExpanded) toolResult() {}
+
+type ToolStringResult string
+
+func (ToolStringResult) toolResult() {}
+
+// Expanded canonical result returned by a session tool.
+// Experimental: ToolResultExpanded is part of an experimental API and may change or be
+// removed.
+type ToolResultExpanded struct {
+	// Base64-encoded binary results returned to the model.
+	BinaryResultsForLlm []ExternalToolTextResultForLlmBinaryResultsForLlm `json:"binaryResultsForLlm,omitzero"`
+	// Sources returned by the tool that the model may cite.
+	CitableSources []any `json:"citableSources,omitzero"`
+	// Structured content blocks returned to the model.
+	Contents []ExternalToolTextResultForLlmContent `json:"contents,omitzero"`
+	// Error message for an unsuccessful execution.
+	Error *string `json:"error,omitempty"`
+	// Metadata propagated with the tool result, including information-flow labels.
+	MCPMeta map[string]any `json:"mcpMeta,omitzero"`
+	// Messages to inject after the tool result.
+	NewMessages []ToolResultNewMessage `json:"newMessages,omitzero"`
+	// Whether post-tool-use failure hooks have already processed this result.
+	PostToolUseFailureHooksProcessed *bool `json:"postToolUseFailureHooksProcessed,omitempty"`
+	// Execution outcome classification.
+	ResultType ToolResultType `json:"resultType"`
+	// Detailed log content available for session display.
+	SessionLog *string `json:"sessionLog,omitempty"`
+	// Skill invocation metadata produced by the tool.
+	SkillInvocation any `json:"skillInvocation,omitempty"`
+	// Whether large-output post-processing should be skipped.
+	SkipLargeOutputProcessing *bool `json:"skipLargeOutputProcessing,omitempty"`
+	// Structured result content in addition to the model-facing text.
+	StructuredContent any `json:"structuredContent,omitempty"`
+	// Completion-review decision produced by the task-completion tool.
+	TaskCompletionDecision *TaskCompletionDecision `json:"taskCompletionDecision,omitempty"`
+	// Text result returned to the model.
+	TextResultForLlm string `json:"textResultForLlm"`
+	// Deferred tool names made available by this result.
+	ToolReferences []string `json:"toolReferences,omitzero"`
+	// Tool-specific telemetry payload.
+	ToolTelemetry any `json:"toolTelemetry,omitempty"`
+	// Optional UI resource produced by the tool.
+	UIResource any `json:"uiResource,omitempty"`
+}
+
+// A message injected by a tool result.
+// Experimental: ToolResultNewMessage is part of an experimental API and may change or be
+// removed.
+type ToolResultNewMessage struct {
+	// Message content to inject after the tool result.
+	Content string `json:"content"`
+	// Source attributed to the injected message.
+	Source string `json:"source"`
+}
+
+// A tool name and arguments to execute through the session's native invocation pipeline.
+// Experimental: ToolsExecuteRequest is part of an experimental API and may change or be
+// removed.
+type ToolsExecuteRequest struct {
+	// Arguments supplied to the tool.
+	Arguments any `json:"arguments"`
+	// Name of the currently offered tool to execute.
+	Name string `json:"name"`
+	// Optional identifier used to correlate this invocation with its tool call.
+	ToolCallID *string `json:"toolCallId,omitempty"`
+}
+
+// Options controlling how Rust-owned built-in tool descriptors are materialized.
+// Experimental: ToolsGetBuiltinDescriptorsRequest is part of an experimental API and may
+// change or be removed.
+type ToolsGetBuiltinDescriptorsRequest struct {
+	// Whether background task completion notifications are enabled.
+	BackgroundTaskNotificationsEnabled *bool `json:"backgroundTaskNotificationsEnabled,omitempty"`
+	// Whether tool descriptors should include authoring metadata.
+	IncludeAuthor *bool `json:"includeAuthor,omitempty"`
+	// Whether line numbers should be omitted from the view tool descriptor.
+	NoViewLineNumbers *bool `json:"noViewLineNumbers,omitempty"`
+	// Whether descriptors should favor fewer user-intervention prompts.
+	ReduceUserIntervention *bool `json:"reduceUserIntervention,omitempty"`
+	// Whether shell commands may only run asynchronously.
+	ShellAsyncOnlyEnabled *bool `json:"shellAsyncOnlyEnabled,omitempty"`
+	// Shell-specific names and description lines for shell tools.
+	ShellConfig *ToolsShellDescriptorConfig `json:"shellConfig,omitempty"`
+	// Whether the configured shell supports PowerShell 7 syntax.
+	ShellSupportsPowerShell7Syntax *bool `json:"shellSupportsPowerShell7Syntax,omitempty"`
+	// Default shell timeout in milliseconds.
+	ShellTimeoutMs *float64 `json:"shellTimeoutMs,omitempty"`
+	// Whether semantic skill lookup is available.
+	SkillEmbeddingEnabled *bool `json:"skillEmbeddingEnabled,omitempty"`
+}
+
+// Rust-owned built-in tool descriptors for the session.
+// Experimental: ToolsGetBuiltinDescriptorsResult is part of an experimental API and may
+// change or be removed.
+type ToolsGetBuiltinDescriptorsResult struct {
+	// Built-in tool descriptors materialized for the session.
+	Tools []BuiltinToolDescriptor `json:"tools"`
+}
+
 // Current lightweight tool metadata snapshot for the session.
 // Experimental: ToolsGetCurrentMetadataResult is part of an experimental API and may change
 // or be removed.
@@ -11649,6 +14333,51 @@ type ToolsListRequest struct {
 	Model *string `json:"model,omitempty"`
 }
 
+// Complete externally implemented tool list for the calling connection. An empty list
+// removes every tool previously supplied by that connection.
+// Experimental: ToolsSetRequest is part of an experimental API and may change or be removed.
+type ToolsSetRequest struct {
+	// Complete replacement list for the calling connection.
+	Tools []ProtocolExternalToolDefinition `json:"tools"`
+}
+
+// Empty result after replacing the calling connection's externally implemented tools.
+// Experimental: ToolsSetResult is part of an experimental API and may change or be removed.
+type ToolsSetResult struct {
+}
+
+// Shell-specific names and description lines used to materialize built-in shell tool
+// descriptors.
+// Experimental: ToolsShellDescriptorConfig is part of an experimental API and may change or
+// be removed.
+type ToolsShellDescriptorConfig struct {
+	// Additional model-facing shell description lines.
+	DescriptionLines []string `json:"descriptionLines"`
+	// Human-readable shell name.
+	DisplayName string `json:"displayName"`
+	// Tool name used to list active shells.
+	ListShellsToolName string `json:"listShellsToolName"`
+	// Tool name used to read shell output.
+	ReadShellToolName string `json:"readShellToolName"`
+	// Tool name used to start shell commands.
+	ShellToolName string `json:"shellToolName"`
+	// Stable shell type identifier.
+	ShellType string `json:"shellType"`
+	// Tool name used to stop shell commands.
+	StopShellToolName string `json:"stopShellToolName"`
+}
+
+// Task-completion tool arguments and final result used to build a label-safe session event
+// payload.
+// Experimental: ToolsTaskCompleteEventDataRequest is part of an experimental API and may
+// change or be removed.
+type ToolsTaskCompleteEventDataRequest struct {
+	// Final expanded result returned by the task_complete tool.
+	FinalResult ToolResultExpanded `json:"finalResult"`
+	// Arguments supplied to the completed task_complete tool call.
+	ToolArgs any `json:"toolArgs"`
+}
+
 // Empty result after applying subagent settings
 // Experimental: ToolsUpdateSubagentSettingsResult is part of an experimental API and may
 // change or be removed.
@@ -11713,8 +14442,14 @@ func (UIElicitationStringValue) uiElicitationFieldValue() {}
 type UIElicitationRequest struct {
 	// Message describing what information is needed from the user
 	Message string `json:"message"`
+	// MCP request metadata.
+	Meta map[string]any `json:"_meta,omitzero"`
+	// Elicitation mode. Omitted and form are equivalent for structured elicitation.
+	Mode *MCPElicitationFormMode `json:"mode,omitempty"`
 	// JSON Schema describing the form fields to present to the user
 	RequestedSchema UIElicitationSchema `json:"requestedSchema"`
+	// MCP task metadata.
+	Task *MCPTaskMetadata `json:"task,omitempty"`
 }
 
 // The elicitation response (accept with form values, decline, or cancel)
@@ -11725,6 +14460,8 @@ type UIElicitationResponse struct {
 	Action UIElicitationResponseAction `json:"action"`
 	// The form values submitted by the user (present when action is 'accept')
 	Content map[string]UIElicitationFieldValue `json:"content,omitzero"`
+	// MCP response metadata.
+	Meta map[string]any `json:"_meta,omitzero"`
 }
 
 // The form values submitted by the user (present when action is 'accept')
@@ -11954,11 +14691,12 @@ type UIEphemeralQueryRequest struct {
 	Question string `json:"question"`
 }
 
-// Transient answer generated from current conversation context.
+// Completed transient query. Ordered chunks and the terminal outcome are also delivered
+// through `ui.ephemeral_query` session events while it runs.
 // Experimental: UIEphemeralQueryResult is part of an experimental API and may change or be
 // removed.
 type UIEphemeralQueryResult struct {
-	// Full assistant response text.
+	// Answer returned by the model
 	Answer string `json:"answer"`
 }
 
@@ -12135,6 +14873,9 @@ type UpdateSubagentSettingsRequest struct {
 // Experimental: UsageGetMetricsResult is part of an experimental API and may change or be
 // removed.
 type UsageGetMetricsResult struct {
+	// Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses
+	// the stable key `main`.
+	AgentMetrics map[string]UsageMetricsAgentMetric `json:"agentMetrics,omitzero"`
 	// Aggregated code change metrics
 	CodeChanges UsageMetricsCodeChanges `json:"codeChanges"`
 	// Currently active model identifier
@@ -12160,6 +14901,26 @@ type UsageGetMetricsResult struct {
 	TotalUserRequests int64 `json:"totalUserRequests"`
 }
 
+// Usage attributed to one agent instance, including its identity, API duration, AI units,
+// and per-model breakdown.
+// Experimental: UsageMetricsAgentMetric is part of an experimental API and may change or be
+// removed.
+type UsageMetricsAgentMetric struct {
+	// Human-readable label for this subagent invocation, copied from the originating
+	// `subagent.started` event. For task-tool subagents this is the invocation's task
+	// description rather than the agent's configured display name, so group by `agentName` for
+	// stable per-agent labels.
+	AgentDisplayName *string `json:"agentDisplayName,omitempty"`
+	// Configured agent name, when this is a subagent
+	AgentName *string `json:"agentName,omitempty"`
+	// Per-model usage for this agent, keyed by model identifier
+	ModelMetrics map[string]UsageMetricsModelMetric `json:"modelMetrics"`
+	// Time spent in model API calls by this agent, in milliseconds
+	TotalAPIDurationMs int64 `json:"totalApiDurationMs"`
+	// Accumulated nano-AI units cost for this agent
+	TotalNanoAiu float64 `json:"totalNanoAiu"`
+}
+
 // Aggregated code change metrics
 // Experimental: UsageMetricsCodeChanges is part of an experimental API and may change or be
 // removed.
@@ -12345,6 +15106,23 @@ func (UserToolSessionApprovalCustomTool) Kind() UserToolSessionApprovalKind {
 	return UserToolSessionApprovalKindCustomTool
 }
 
+// Session-scoped tool-approval rule for an extension's access to sensitive environment
+// variables, keyed by extension name and the exact set of variable names.
+// Experimental: UserToolSessionApprovalExtensionEnvAccess is part of an experimental API
+// and may change or be removed.
+type UserToolSessionApprovalExtensionEnvAccess struct {
+	// Names of the sensitive environment variables this approval covers. Values are never
+	// persisted.
+	EnvironmentVariables []string `json:"environmentVariables"`
+	// Extension name
+	ExtensionName string `json:"extensionName"`
+}
+
+func (UserToolSessionApprovalExtensionEnvAccess) userToolSessionApproval() {}
+func (UserToolSessionApprovalExtensionEnvAccess) Kind() UserToolSessionApprovalKind {
+	return UserToolSessionApprovalKindExtensionEnvAccess
+}
+
 // Session-scoped tool-approval rule for extension-management operations, optionally
 // narrowed by operation.
 // Experimental: UserToolSessionApprovalExtensionManagement is part of an experimental API
@@ -12532,7 +15310,9 @@ type WorkspacesAddSummaryRequest struct {
 // Experimental: WorkspacesAddSummaryResult is part of an experimental API and may change or
 // be removed.
 type WorkspacesAddSummaryResult struct {
-	Summary   any `json:"summary,omitempty"`
+	// Metadata for the persisted summary.
+	Summary any `json:"summary,omitempty"`
+	// Refreshed metadata for the containing workspace.
 	Workspace any `json:"workspace,omitempty"`
 }
 
@@ -12606,24 +15386,40 @@ type WorkspacesGetWorkspaceResult struct {
 }
 
 type WorkspacesGetWorkspaceResultWorkspace struct {
-	Branch                 *string    `json:"branch,omitempty"`
-	ChronicleSyncDismissed *bool      `json:"chronicle_sync_dismissed,omitempty"`
-	ClientName             *string    `json:"client_name,omitempty"`
-	CreatedAt              *time.Time `json:"created_at,omitempty"`
-	Cwd                    *string    `json:"cwd,omitempty"`
-	GitRoot                *string    `json:"git_root,omitempty"`
+	// Current Git branch.
+	Branch *string `json:"branch,omitempty"`
+	// Whether the per-session Chronicle upgrade prompt was dismissed for the workspace.
+	ChronicleSyncDismissed *bool `json:"chronicle_sync_dismissed,omitempty"`
+	// Name of the client that created the workspace.
+	ClientName *string `json:"client_name,omitempty"`
+	// Timestamp when the workspace was created.
+	CreatedAt *time.Time `json:"created_at,omitempty"`
+	// Current working directory associated with the workspace.
+	Cwd *string `json:"cwd,omitempty"`
+	// Git repository root associated with the workspace.
+	GitRoot *string `json:"git_root,omitempty"`
 	// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
-	HostType        *WorkspacesWorkspaceDetailsHostType `json:"host_type,omitempty"`
-	ID              string                              `json:"id"`
-	McLastEventID   *string                             `json:"mc_last_event_id,omitempty"`
-	McSessionID     *string                             `json:"mc_session_id,omitempty"`
-	McTaskID        *string                             `json:"mc_task_id,omitempty"`
-	Name            *string                             `json:"name,omitempty"`
-	RemoteSteerable *bool                               `json:"remote_steerable,omitempty"`
-	Repository      *string                             `json:"repository,omitempty"`
-	SummaryCount    *int64                              `json:"summary_count,omitempty"`
-	UpdatedAt       *time.Time                          `json:"updated_at,omitempty"`
-	UserNamed       *bool                               `json:"user_named,omitempty"`
+	HostType *WorkspacesWorkspaceDetailsHostType `json:"host_type,omitempty"`
+	// Stable workspace identifier.
+	ID string `json:"id"`
+	// Most recent Mission Control event identifier observed for the workspace.
+	McLastEventID *string `json:"mc_last_event_id,omitempty"`
+	// Mission Control session identifier associated with the workspace.
+	McSessionID *string `json:"mc_session_id,omitempty"`
+	// Mission Control task identifier associated with the workspace.
+	McTaskID *string `json:"mc_task_id,omitempty"`
+	// Workspace display name.
+	Name *string `json:"name,omitempty"`
+	// Whether the workspace session can be steered remotely.
+	RemoteSteerable *bool `json:"remote_steerable,omitempty"`
+	// Repository identifier associated with the workspace.
+	Repository *string `json:"repository,omitempty"`
+	// Number of persisted summaries in the workspace.
+	SummaryCount *int64 `json:"summary_count,omitempty"`
+	// Timestamp when the workspace was last updated.
+	UpdatedAt *time.Time `json:"updated_at,omitempty"`
+	// Whether the workspace name was explicitly chosen by the user.
+	UserNamed *bool `json:"user_named,omitempty"`
 }
 
 // Workspace checkpoints in chronological order; empty when the workspace is not enabled.
@@ -12967,53 +15763,411 @@ const (
 	AgentRegistrySpawnValidationErrorReasonYoloNotAllowed AgentRegistrySpawnValidationErrorReason = "yolo-not-allowed"
 )
 
-// Type of GitHub reference
-// Experimental: AttachmentGitHubReferenceType is part of an experimental API and may change
+// Type of GitHub reference
+// Experimental: AttachmentGitHubReferenceType is part of an experimental API and may change
+// or be removed.
+type AttachmentGitHubReferenceType string
+
+const (
+	// GitHub discussion reference.
+	AttachmentGitHubReferenceTypeDiscussion AttachmentGitHubReferenceType = "discussion"
+	// GitHub issue reference.
+	AttachmentGitHubReferenceTypeIssue AttachmentGitHubReferenceType = "issue"
+	// GitHub pull request reference.
+	AttachmentGitHubReferenceTypePr AttachmentGitHubReferenceType = "pr"
+)
+
+// Type discriminator for Attachment.
+type AttachmentType string
+
+const (
+	AttachmentTypeBlob                 AttachmentType = "blob"
+	AttachmentTypeDirectory            AttachmentType = "directory"
+	AttachmentTypeExtensionContext     AttachmentType = "extension_context"
+	AttachmentTypeFile                 AttachmentType = "file"
+	AttachmentTypeGitHubActionsJob     AttachmentType = "github_actions_job"
+	AttachmentTypeGitHubCommit         AttachmentType = "github_commit"
+	AttachmentTypeGitHubFile           AttachmentType = "github_file"
+	AttachmentTypeGitHubFileDiff       AttachmentType = "github_file_diff"
+	AttachmentTypeGitHubReference      AttachmentType = "github_reference"
+	AttachmentTypeGitHubRelease        AttachmentType = "github_release"
+	AttachmentTypeGitHubRepository     AttachmentType = "github_repository"
+	AttachmentTypeGitHubSnippet        AttachmentType = "github_snippet"
+	AttachmentTypeGitHubTreeComparison AttachmentType = "github_tree_comparison"
+	AttachmentTypeGitHubURL            AttachmentType = "github_url"
+	AttachmentTypeSelection            AttachmentType = "selection"
+)
+
+// Type discriminator for AuthInfo.
+// Experimental: AuthInfoType is part of an experimental API and may change or be removed.
+type AuthInfoType string
+
+const (
+	AuthInfoTypeAPIKey          AuthInfoType = "api-key"
+	AuthInfoTypeCopilotAPIToken AuthInfoType = "copilot-api-token"
+	AuthInfoTypeEnv             AuthInfoType = "env"
+	AuthInfoTypeGhCLI           AuthInfoType = "gh-cli"
+	AuthInfoTypeHMAC            AuthInfoType = "hmac"
+	AuthInfoTypeToken           AuthInfoType = "token"
+	AuthInfoTypeTokenProvider   AuthInfoType = "token-provider"
+	AuthInfoTypeUser            AuthInfoType = "user"
+)
+
+// Custom input-format kind.
+// Experimental: BuiltinToolFormatType is part of an experimental API and may change or be
+// removed.
+type BuiltinToolFormatType string
+
+const (
+	// The tool input is parsed with the supplied grammar.
+	BuiltinToolFormatTypeGrammar BuiltinToolFormatType = "grammar"
+)
+
+// Root JSON Schema type for a built-in tool input.
+// Experimental: BuiltinToolInputSchemaType is part of an experimental API and may change or
+// be removed.
+type BuiltinToolInputSchemaType string
+
+const (
+	// The tool accepts a JSON object.
+	BuiltinToolInputSchemaTypeObject BuiltinToolInputSchemaType = "object"
+)
+
+// Canonical digest algorithm for a validated MCP card
+// Experimental: CardDigestAlgorithm is part of an experimental API and may change or be
+// removed.
+type CardDigestAlgorithm string
+
+const (
+	// SHA-256 over RFC 8785 canonical JSON encoded as UTF-8.
+	CardDigestAlgorithmSha256Rfc8785 CardDigestAlgorithm = "sha256-rfc8785"
+)
+
+// AI skills are discovery-only and cannot be installed through this surface
+type CatalogAiSkillCandidateInstallability string
+
+const (
+	CatalogAiSkillCandidateInstallabilityNotInstallableKind CatalogAiSkillCandidateInstallability = "not-installable-kind"
+)
+
+// Media type of the underlying AI skill card
+type CatalogAiSkillCandidateMediaType string
+
+const (
+	CatalogAiSkillCandidateMediaTypeApplicationAiSkill CatalogAiSkillCandidateMediaType = "application/ai-skill"
+)
+
+// Media type advertised for the referenced AI skill card
+type CatalogAiSkillCandidateProvenanceMediaType string
+
+const (
+	CatalogAiSkillCandidateProvenanceMediaTypeApplicationAiSkill CatalogAiSkillCandidateProvenanceMediaType = "application/ai-skill"
+)
+
+// Why the catalog authority did not accept the caller's identity
+// Experimental: CatalogAuthenticationRequiredReason is part of an experimental API and may
+// change or be removed.
+type CatalogAuthenticationRequiredReason string
+
+const (
+	// A credential was presented and its lifetime has elapsed. A silent refresh is worth
+	// attempting before prompting anyone.
+	CatalogAuthenticationRequiredReasonCredentialExpired CatalogAuthenticationRequiredReason = "credential-expired"
+	// A credential was presented and the authority refused it, for example because it was
+	// revoked, malformed, or issued for another audience. Refreshing the same rejected
+	// credential is not useful; the caller must sign in again.
+	CatalogAuthenticationRequiredReasonCredentialRejected CatalogAuthenticationRequiredReason = "credential-rejected"
+	// No credential was presented, so there is nothing to refresh and the caller must sign in.
+	CatalogAuthenticationRequiredReasonNoCredential CatalogAuthenticationRequiredReason = "no-credential"
+)
+
+// Kind discriminator for CatalogCandidate.
+// Experimental: CatalogCandidateKind is part of an experimental API and may change or be
+// removed.
+type CatalogCandidateKind string
+
+const (
+	CatalogCandidateKindAiSkill   CatalogCandidateKind = "ai-skill"
+	CatalogCandidateKindMCPServer CatalogCandidateKind = "mcp-server"
+)
+
+// Kind discriminator for CatalogCandidateSource.
+type CatalogCandidateSourceKind string
+
+const (
+	CatalogCandidateSourceKindEmbedded CatalogCandidateSourceKind = "embedded"
+	CatalogCandidateSourceKindURL      CatalogCandidateSourceKind = "url"
+)
+
+// A wire feature a caller can require of the catalog surface, negotiated per request. A
+// grant means the runtime understands the feature's contract, not that the deployment has
+// enabled the operation; typed unavailable results report availability separately.
+// Experimental: CatalogCapability is part of an experimental API and may change or be
+// removed.
+type CatalogCapability string
+
+const (
+	// Understands `application/ai-skill` candidates as discovery-only and typed non-installable.
+	CatalogCapabilityAiSkillDiscovery CatalogCapability = "ai-skill-discovery"
+	// Understands the legacy `application/mcp-server+json` media type.
+	CatalogCapabilityLegacyMCPServerCard CatalogCapability = "legacy-mcp-server-card"
+	// Understands side-effect-free MCP install-plan requests, results, and plan handles;
+	// `planning-unavailable` separately reports that planning is not enabled.
+	CatalogCapabilityMCPInstallPlanning CatalogCapability = "mcp-install-planning"
+	// Understands the current `application/mcp-server-card+json` media type.
+	CatalogCapabilityMCPServerCard CatalogCapability = "mcp-server-card"
+	// Understands plans that enumerate every eligible transport rather than a single preferred
+	// one.
+	CatalogCapabilityMultipleTransportChoice CatalogCapability = "multiple-transport-choice"
+)
+
+// Which wire-contract rule an upstream response broke
+// Experimental: CatalogContractViolationReason is part of an experimental API and may
+// change or be removed.
+type CatalogContractViolationReason string
+
+const (
+	// A result carried both a URL and embedded data, when exactly one is permitted.
+	CatalogContractViolationReasonBothURLAndData CatalogContractViolationReason = "both-url-and-data"
+	// Two results claimed the same normalised identity.
+	CatalogContractViolationReasonDuplicateIdentity CatalogContractViolationReason = "duplicate-identity"
+	// A result carried neither a URL nor embedded data, when exactly one is required.
+	CatalogContractViolationReasonNeitherURLNorData CatalogContractViolationReason = "neither-url-nor-data"
+	// A result declared no media type, or one this contract does not model.
+	CatalogContractViolationReasonUnknownMediaType CatalogContractViolationReason = "unknown-media-type"
+)
+
+// Why a presented handle was rejected
+// Experimental: CatalogHandleRejectionReason is part of an experimental API and may change
+// or be removed.
+type CatalogHandleRejectionReason string
+
+const (
+	// The handle was issued by a different runtime instance.
+	CatalogHandleRejectionReasonForeign CatalogHandleRejectionReason = "foreign"
+	// The handle is unparseable, unknown, or was issued for a different operation.
+	CatalogHandleRejectionReasonInvalid CatalogHandleRejectionReason = "invalid"
+	// The handle has already been used, and handles are single-use.
+	CatalogHandleRejectionReasonReplayed CatalogHandleRejectionReason = "replayed"
+	// The handle's time to live has elapsed.
+	CatalogHandleRejectionReasonStale CatalogHandleRejectionReason = "stale"
+)
+
+// Which kind of opaque handle was presented
+// Experimental: CatalogHandleType is part of an experimental API and may change or be
+// removed.
+type CatalogHandleType string
+
+const (
+	// A search candidate handle.
+	CatalogHandleTypeCandidate CatalogHandleType = "candidate"
+	// An install plan handle.
+	CatalogHandleTypePlan CatalogHandleType = "plan"
+)
+
+// Which request field was rejected before any work was done
+// Experimental: CatalogInvalidRequestField is part of an experimental API and may change or
+// be removed.
+type CatalogInvalidRequestField string
+
+const (
+	// The supplied card was missing its media type, URL, or data.
+	CatalogInvalidRequestFieldCard CatalogInvalidRequestField = "card"
+	// The negotiation block was missing or malformed.
+	CatalogInvalidRequestFieldContract CatalogInvalidRequestField = "contract"
+	// The requested candidate kinds were empty or contained a duplicate.
+	CatalogInvalidRequestFieldKinds CatalogInvalidRequestField = "kinds"
+	// The requested result count fell outside its permitted range.
+	CatalogInvalidRequestFieldLimit CatalogInvalidRequestField = "limit"
+	// The search query was empty or longer than permitted.
+	CatalogInvalidRequestFieldQuery CatalogInvalidRequestField = "query"
+	// The requested configuration scope is not one this runtime writes.
+	CatalogInvalidRequestFieldScope CatalogInvalidRequestField = "scope"
+	// The plan source was missing or malformed.
+	CatalogInvalidRequestFieldSource CatalogInvalidRequestField = "source"
+)
+
+// How a card failed validation
+// Experimental: CatalogMalformedCardReason is part of an experimental API and may change or
+// be removed.
+type CatalogMalformedCardReason string
+
+const (
+	// The document is not well-formed JSON.
+	CatalogMalformedCardReasonInvalidJSON CatalogMalformedCardReason = "invalid-json"
+	// A field the media type requires is absent.
+	CatalogMalformedCardReasonMissingRequiredField CatalogMalformedCardReason = "missing-required-field"
+	// The document does not satisfy its media type's schema.
+	CatalogMalformedCardReasonSchemaViolation CatalogMalformedCardReason = "schema-violation"
+	// The document exceeded the permitted size.
+	CatalogMalformedCardReasonSizeLimitExceeded CatalogMalformedCardReason = "size-limit-exceeded"
+	// The declared media type is not one this runtime understands.
+	CatalogMalformedCardReasonUnsupportedMediaType CatalogMalformedCardReason = "unsupported-media-type"
+)
+
+// Whether an MCP server candidate can be planned for installation
+// Experimental: CatalogMCPServerInstallability is part of an experimental API and may
+// change or be removed.
+type CatalogMCPServerInstallability string
+
+const (
+	// An install plan can be computed for this MCP server candidate.
+	CatalogMCPServerInstallabilityInstallable CatalogMCPServerInstallability = "installable"
+	// Policy forbids installing this MCP server candidate.
+	CatalogMCPServerInstallabilityNotInstallablePolicy CatalogMCPServerInstallability = "not-installable-policy"
+)
+
+// Media type a catalog card is interpreted as
+// Experimental: CatalogMediaType is part of an experimental API and may change or be
+// removed.
+type CatalogMediaType string
+
+const (
+	// An AI skill card. Representable and searchable, but typed non-installable.
+	CatalogMediaTypeApplicationAiSkill CatalogMediaType = "application/ai-skill"
+	// The current MCP server card media type.
+	CatalogMediaTypeApplicationMCPServerCardJSON CatalogMediaType = "application/mcp-server-card+json"
+	// The legacy MCP server card media type, accepted for compatibility.
+	CatalogMediaTypeApplicationMCPServerJSON CatalogMediaType = "application/mcp-server+json"
+)
+
+// Why capability and protocol-version negotiation refused a caller
+// Experimental: CatalogNegotiationRefusedReason is part of an experimental API and may
+// change or be removed.
+type CatalogNegotiationRefusedReason string
+
+const (
+	// The caller requires at least one capability this runtime cannot honour.
+	CatalogNegotiationRefusedReasonUnsupportedCapability CatalogNegotiationRefusedReason = "unsupported-capability"
+	// The caller's protocol version is below the lowest this runtime serves.
+	CatalogNegotiationRefusedReasonUnsupportedProtocolVersion CatalogNegotiationRefusedReason = "unsupported-protocol-version"
+)
+
+// Categorised network failure, low cardinality so it can be aggregated without carrying a
+// URL
+// Experimental: CatalogNetworkFailureReason is part of an experimental API and may change
+// or be removed.
+type CatalogNetworkFailureReason string
+
+const (
+	// The connection was refused or reset.
+	CatalogNetworkFailureReasonConnectionRefused CatalogNetworkFailureReason = "connection-refused"
+	// The authority's name could not be resolved.
+	CatalogNetworkFailureReasonDns CatalogNetworkFailureReason = "dns"
+	// The authority returned a status the runtime treats as a failure.
+	CatalogNetworkFailureReasonHTTPStatus CatalogNetworkFailureReason = "http-status"
+	// No network is available, so nothing was attempted.
+	CatalogNetworkFailureReasonOffline CatalogNetworkFailureReason = "offline"
+	// A redirect was refused by the runtime's redirect policy.
+	CatalogNetworkFailureReasonRedirectRejected CatalogNetworkFailureReason = "redirect-rejected"
+	// The response exceeded the permitted size.
+	CatalogNetworkFailureReasonResponseTooLarge CatalogNetworkFailureReason = "response-too-large"
+	// The request exceeded its time budget.
+	CatalogNetworkFailureReasonTimeout CatalogNetworkFailureReason = "timeout"
+	// The TLS handshake or certificate validation failed.
+	CatalogNetworkFailureReasonTls CatalogNetworkFailureReason = "tls"
+)
+
+// Why a discoverable candidate cannot be installed
+// Experimental: CatalogNotInstallableReason is part of an experimental API and may change
+// or be removed.
+type CatalogNotInstallableReason string
+
+const (
+	// AI skills are discoverable but have no typed importer in this phase.
+	CatalogNotInstallableReasonAiSkillNotInstallable CatalogNotInstallableReason = "ai-skill-not-installable"
+	// This kind of resource is not installable through this surface.
+	CatalogNotInstallableReasonKindNotInstallable CatalogNotInstallableReason = "kind-not-installable"
+	// Policy forbids installing this candidate.
+	CatalogNotInstallableReasonPolicyForbids CatalogNotInstallableReason = "policy-forbids"
+)
+
+// Kind discriminator for CatalogSearchResult.
+type CatalogSearchResultKind string
+
+const (
+	CatalogSearchResultKindAuthenticationRequired CatalogSearchResultKind = "authentication-required"
+	CatalogSearchResultKindContractViolation      CatalogSearchResultKind = "contract-violation"
+	CatalogSearchResultKindInvalidRequest         CatalogSearchResultKind = "invalid-request"
+	CatalogSearchResultKindMalformedCard          CatalogSearchResultKind = "malformed-card"
+	CatalogSearchResultKindNegotiationRefused     CatalogSearchResultKind = "negotiation-refused"
+	CatalogSearchResultKindNetworkFailure         CatalogSearchResultKind = "network-failure"
+	CatalogSearchResultKindPolicyRejected         CatalogSearchResultKind = "policy-rejected"
+	CatalogSearchResultKindSucceeded              CatalogSearchResultKind = "succeeded"
+	CatalogSearchResultKindUnavailable            CatalogSearchResultKind = "unavailable"
+	CatalogSearchResultKindUnsafeRetrieval        CatalogSearchResultKind = "unsafe-retrieval"
+	CatalogSearchResultKindUnsupportedKind        CatalogSearchResultKind = "unsupported-kind"
+)
+
+// Why a catalog operation is not available on this runtime
+// Experimental: CatalogUnavailableReason is part of an experimental API and may change or
+// be removed.
+type CatalogUnavailableReason string
+
+const (
+	// No catalog authority is configured for this runtime.
+	CatalogUnavailableReasonAuthorityNotConfigured CatalogUnavailableReason = "authority-not-configured"
+	// The surface is disabled by policy on this runtime.
+	CatalogUnavailableReasonDisabledByPolicy CatalogUnavailableReason = "disabled-by-policy"
+	// Install planning is not wired up on this runtime build.
+	CatalogUnavailableReasonPlanningUnavailable CatalogUnavailableReason = "planning-unavailable"
+	// Bounded search is not wired up on this runtime build.
+	CatalogUnavailableReasonSearchUnavailable CatalogUnavailableReason = "search-unavailable"
+)
+
+// Why no usable transport could be offered
+// Experimental: CatalogUnavailableTransportReason is part of an experimental API and may
+// change or be removed.
+type CatalogUnavailableTransportReason string
+
+const (
+	// The card advertises no transport this runtime can use.
+	CatalogUnavailableTransportReasonNoEligibleTransport CatalogUnavailableTransportReason = "no-eligible-transport"
+	// Eligible remotes could not be enumerated, so no explicit choice can be offered.
+	CatalogUnavailableTransportReasonRemoteEnumerationUnavailable CatalogUnavailableTransportReason = "remote-enumeration-unavailable"
+	// Every advertised transport is of a kind this runtime does not implement.
+	CatalogUnavailableTransportReasonTransportNotSupported CatalogUnavailableTransportReason = "transport-not-supported"
+)
+
+// Which hardened-fetch control refused a retrieval
+// Experimental: CatalogUnsafeRetrievalReason is part of an experimental API and may change
 // or be removed.
-type AttachmentGitHubReferenceType string
+type CatalogUnsafeRetrievalReason string
 
 const (
-	// GitHub discussion reference.
-	AttachmentGitHubReferenceTypeDiscussion AttachmentGitHubReferenceType = "discussion"
-	// GitHub issue reference.
-	AttachmentGitHubReferenceTypeIssue AttachmentGitHubReferenceType = "issue"
-	// GitHub pull request reference.
-	AttachmentGitHubReferenceTypePr AttachmentGitHubReferenceType = "pr"
+	// The URL resolved to a loopback, private, link-local, or cloud metadata address.
+	CatalogUnsafeRetrievalReasonBlockedAddress CatalogUnsafeRetrievalReason = "blocked-address"
+	// The URL used a scheme the runtime refuses to fetch.
+	CatalogUnsafeRetrievalReasonBlockedScheme CatalogUnsafeRetrievalReason = "blocked-scheme"
+	// The URL embedded credentials.
+	CatalogUnsafeRetrievalReasonCredentialsInURL CatalogUnsafeRetrievalReason = "credentials-in-url"
+	// The authority is not permitted for card retrieval.
+	CatalogUnsafeRetrievalReasonHostNotPermitted CatalogUnsafeRetrievalReason = "host-not-permitted"
+	// The configured proxy policy refused the request.
+	CatalogUnsafeRetrievalReasonProxyRejected CatalogUnsafeRetrievalReason = "proxy-rejected"
+	// A redirect target resolved to a blocked address.
+	CatalogUnsafeRetrievalReasonRedirectToBlockedAddress CatalogUnsafeRetrievalReason = "redirect-to-blocked-address"
 )
 
-// Type discriminator for Attachment.
-type AttachmentType string
+// Whether a pending slash-command invocation effect was applied or cancelled by the host.
+// Experimental: CommandsInvocationEffectOutcome is part of an experimental API and may
+// change or be removed.
+type CommandsInvocationEffectOutcome string
 
 const (
-	AttachmentTypeBlob                 AttachmentType = "blob"
-	AttachmentTypeDirectory            AttachmentType = "directory"
-	AttachmentTypeExtensionContext     AttachmentType = "extension_context"
-	AttachmentTypeFile                 AttachmentType = "file"
-	AttachmentTypeGitHubActionsJob     AttachmentType = "github_actions_job"
-	AttachmentTypeGitHubCommit         AttachmentType = "github_commit"
-	AttachmentTypeGitHubFile           AttachmentType = "github_file"
-	AttachmentTypeGitHubFileDiff       AttachmentType = "github_file_diff"
-	AttachmentTypeGitHubReference      AttachmentType = "github_reference"
-	AttachmentTypeGitHubRelease        AttachmentType = "github_release"
-	AttachmentTypeGitHubRepository     AttachmentType = "github_repository"
-	AttachmentTypeGitHubSnippet        AttachmentType = "github_snippet"
-	AttachmentTypeGitHubTreeComparison AttachmentType = "github_tree_comparison"
-	AttachmentTypeGitHubURL            AttachmentType = "github_url"
-	AttachmentTypeSelection            AttachmentType = "selection"
+	// The host applied the pending invocation effect.
+	CommandsInvocationEffectOutcomeApplied CommandsInvocationEffectOutcome = "applied"
+	// The host cancelled the pending invocation effect, so any provisional state must be
+	// reverted.
+	CommandsInvocationEffectOutcomeCancelled CommandsInvocationEffectOutcome = "cancelled"
 )
 
-// Type discriminator for AuthInfo.
-// Experimental: AuthInfoType is part of an experimental API and may change or be removed.
-type AuthInfoType string
+// Experimental: CommandsInvocationOrigin is part of an experimental API and may change or
+// be removed.
+type CommandsInvocationOrigin string
 
 const (
-	AuthInfoTypeAPIKey          AuthInfoType = "api-key"
-	AuthInfoTypeCopilotAPIToken AuthInfoType = "copilot-api-token"
-	AuthInfoTypeEnv             AuthInfoType = "env"
-	AuthInfoTypeGhCLI           AuthInfoType = "gh-cli"
-	AuthInfoTypeHMAC            AuthInfoType = "hmac"
-	AuthInfoTypeToken           AuthInfoType = "token"
-	AuthInfoTypeUser            AuthInfoType = "user"
+	CommandsInvocationOriginSettings CommandsInvocationOrigin = "settings"
 )
 
 // Neutral SDK discriminator for the connected remote session kind.
@@ -13311,6 +16465,8 @@ const (
 	FactoryDurableOperationMarkRunStarted FactoryDurableOperation = "markRunStarted"
 	// Reading the authoritative AI-credit total.
 	FactoryDurableOperationReconcileCreditTotal FactoryDurableOperation = "reconcileCreditTotal"
+	// Renewing the durable owner lease that proves this process still owns the run.
+	FactoryDurableOperationRefreshLease FactoryDurableOperation = "refreshLease"
 	// Rolling back an uncommitted subagent admission.
 	FactoryDurableOperationReleaseAgent FactoryDurableOperation = "releaseAgent"
 	// Persisting subagent admission accounting.
@@ -13365,9 +16521,10 @@ const (
 type FactoryRunFailureType string
 
 const (
-	FactoryRunFailureTypeFactoryDurableFailure FactoryRunFailureType = "factory_durable_failure"
-	FactoryRunFailureTypeFactoryLimitReached   FactoryRunFailureType = "factory_limit_reached"
-	FactoryRunFailureTypeFactoryResumeDeclined FactoryRunFailureType = "factory_resume_declined"
+	FactoryRunFailureTypeFactoryAccountingIncomplete FactoryRunFailureType = "factory_accounting_incomplete"
+	FactoryRunFailureTypeFactoryDurableFailure       FactoryRunFailureType = "factory_durable_failure"
+	FactoryRunFailureTypeFactoryLimitReached         FactoryRunFailureType = "factory_limit_reached"
+	FactoryRunFailureTypeFactoryResumeDeclined       FactoryRunFailureType = "factory_resume_declined"
 )
 
 // Current or terminal state of a factory run.
@@ -13390,6 +16547,28 @@ const (
 	FactoryRunStatusRunning FactoryRunStatus = "running"
 )
 
+// Why the runtime is requesting a GitHub credential.
+// Experimental: GitHubTokenAcquireReason is part of an experimental API and may change or
+// be removed.
+type GitHubTokenAcquireReason string
+
+const (
+	// The runtime is acquiring the registration's first credential.
+	GitHubTokenAcquireReasonInitial GitHubTokenAcquireReason = "initial"
+	// The runtime is replacing a credential that is approaching expiry.
+	GitHubTokenAcquireReasonRefresh GitHubTokenAcquireReason = "refresh"
+)
+
+// Kind discriminator for GitHubTokenAcquireResult.
+// Experimental: GitHubTokenAcquireResultKind is part of an experimental API and may change
+// or be removed.
+type GitHubTokenAcquireResultKind string
+
+const (
+	GitHubTokenAcquireResultKindCancelled GitHubTokenAcquireResultKind = "cancelled"
+	GitHubTokenAcquireResultKindToken     GitHubTokenAcquireResultKind = "token"
+)
+
 // What initiated this compaction request, recorded as the `trigger` on the persisted
 // `session.compaction_start` / `session.compaction_complete` events. When absent, the
 // compaction is persisted without trigger attribution (initiator unknown).
@@ -13755,6 +16934,15 @@ const (
 	MCPAppsSetHostContextDetailsThemeLight MCPAppsSetHostContextDetailsTheme = "light"
 )
 
+// Structured MCP elicitation mode.
+// Experimental: MCPElicitationFormMode is part of an experimental API and may change or be
+// removed.
+type MCPElicitationFormMode string
+
+const (
+	MCPElicitationFormModeForm MCPElicitationFormMode = "form"
+)
+
 // Kind discriminator for MCPHeadersHandlePendingHeadersRefreshRequest.
 type MCPHeadersHandlePendingHeadersRefreshRequestKind string
 
@@ -13777,6 +16965,8 @@ const (
 )
 
 // Kind discriminator for MCPOauthPendingRequestResponse.
+// Experimental: MCPOauthPendingRequestResponseKind is part of an experimental API and may
+// change or be removed.
 type MCPOauthPendingRequestResponseKind string
 
 const (
@@ -13784,6 +16974,255 @@ const (
 	MCPOauthPendingRequestResponseKindToken     MCPOauthPendingRequestResponseKind = "token"
 )
 
+// Why a passive MCP OAuth probe determined authentication is needed.
+// Experimental: MCPOauthProbeNeedsAuthReason is part of an experimental API and may change
+// or be removed.
+type MCPOauthProbeNeedsAuthReason string
+
+const (
+	// No token was sent and the server requires authentication.
+	MCPOauthProbeNeedsAuthReasonInitial MCPOauthProbeNeedsAuthReason = "initial"
+	// A cached token was sent and rejected.
+	MCPOauthProbeNeedsAuthReasonRefresh MCPOauthProbeNeedsAuthReason = "refresh"
+	// The server returned a 403 insufficient_scope challenge, indicating additional scopes or
+	// audience are needed.
+	MCPOauthProbeNeedsAuthReasonUpscope MCPOauthProbeNeedsAuthReason = "upscope"
+)
+
+// Status discriminator for MCPOauthProbeResult.
+type MCPOauthProbeResultStatus string
+
+const (
+	MCPOauthProbeResultStatusAuthenticated  MCPOauthProbeResultStatus = "authenticated"
+	MCPOauthProbeResultStatusFailed         MCPOauthProbeResultStatus = "failed"
+	MCPOauthProbeResultStatusNeedsAuth      MCPOauthProbeResultStatus = "needs-auth"
+	MCPOauthProbeResultStatusNoAuthRequired MCPOauthProbeResultStatus = "no-auth-required"
+)
+
+// Whether a planned configuration change would create or modify an entry
+// Experimental: MCPPlanConfigurationOperation is part of an experimental API and may change
+// or be removed.
+type MCPPlanConfigurationOperation string
+
+const (
+	// Creates a configuration entry that does not exist yet.
+	MCPPlanConfigurationOperationAdd MCPPlanConfigurationOperation = "add"
+	// Modifies a configuration entry that already exists.
+	MCPPlanConfigurationOperationUpdate MCPPlanConfigurationOperation = "update"
+)
+
+// Discriminator for an enumerated required value
+// Experimental: MCPPlanEnumValueType is part of an experimental API and may change or be
+// removed.
+type MCPPlanEnumValueType string
+
+const (
+	// One of a fixed, non-empty set of permitted values.
+	MCPPlanEnumValueTypeEnum MCPPlanEnumValueType = "enum"
+)
+
+// Kind discriminator for MCPPlanInstallResult.
+type MCPPlanInstallResultKind string
+
+const (
+	MCPPlanInstallResultKindAuthenticationRequired MCPPlanInstallResultKind = "authentication-required"
+	MCPPlanInstallResultKindContractViolation      MCPPlanInstallResultKind = "contract-violation"
+	MCPPlanInstallResultKindHandleRejected         MCPPlanInstallResultKind = "handle-rejected"
+	MCPPlanInstallResultKindInvalidRequest         MCPPlanInstallResultKind = "invalid-request"
+	MCPPlanInstallResultKindMalformedCard          MCPPlanInstallResultKind = "malformed-card"
+	MCPPlanInstallResultKindNegotiationRefused     MCPPlanInstallResultKind = "negotiation-refused"
+	MCPPlanInstallResultKindNetworkFailure         MCPPlanInstallResultKind = "network-failure"
+	MCPPlanInstallResultKindNotInstallable         MCPPlanInstallResultKind = "not-installable"
+	MCPPlanInstallResultKindPlanned                MCPPlanInstallResultKind = "planned"
+	MCPPlanInstallResultKindPolicyRejected         MCPPlanInstallResultKind = "policy-rejected"
+	MCPPlanInstallResultKindUnavailable            MCPPlanInstallResultKind = "unavailable"
+	MCPPlanInstallResultKindUnavailableTransport   MCPPlanInstallResultKind = "unavailable-transport"
+	MCPPlanInstallResultKindUnsafeRetrieval        MCPPlanInstallResultKind = "unsafe-retrieval"
+)
+
+// Discriminator for a candidate-backed install-plan source
+// Experimental: MCPPlanInstallSourceCandidateKind is part of an experimental API and may
+// change or be removed.
+type MCPPlanInstallSourceCandidateKind string
+
+const (
+	// Plan from a candidate returned by catalog search.
+	MCPPlanInstallSourceCandidateKindCandidate MCPPlanInstallSourceCandidateKind = "candidate"
+)
+
+// Discriminator for a caller-supplied-card install-plan source
+// Experimental: MCPPlanInstallSourceCardKind is part of an experimental API and may change
+// or be removed.
+type MCPPlanInstallSourceCardKind string
+
+const (
+	// Plan directly from a caller-supplied card.
+	MCPPlanInstallSourceCardKindCard MCPPlanInstallSourceCardKind = "card"
+)
+
+// Kind discriminator for MCPPlanInstallSource.
+type MCPPlanInstallSourceKind string
+
+const (
+	MCPPlanInstallSourceKindCandidate MCPPlanInstallSourceKind = "candidate"
+	MCPPlanInstallSourceKindCard      MCPPlanInstallSourceKind = "card"
+)
+
+// Discriminator for a package-backed transport choice
+// Experimental: MCPPlanPackageInstallMethod is part of an experimental API and may change
+// or be removed.
+type MCPPlanPackageInstallMethod string
+
+const (
+	// Install and run a local package.
+	MCPPlanPackageInstallMethodPackage MCPPlanPackageInstallMethod = "package"
+)
+
+// Transport exposed by a locally launched package
+// Experimental: MCPPlanPackageTransport is part of an experimental API and may change or be
+// removed.
+type MCPPlanPackageTransport string
+
+const (
+	// A locally launched process spoken to over standard input and output.
+	MCPPlanPackageTransportStdio MCPPlanPackageTransport = "stdio"
+)
+
+// What policy decided for a planned server
+// Experimental: MCPPlanPolicyDecision is part of an experimental API and may change or be
+// removed.
+type MCPPlanPolicyDecision string
+
+const (
+	// Policy permits the server.
+	MCPPlanPolicyDecisionAllowed MCPPlanPolicyDecision = "allowed"
+	// Policy forbids the server, so the plan cannot be applied.
+	MCPPlanPolicyDecisionBlocked MCPPlanPolicyDecision = "blocked"
+	// Policy permits the server only after an explicit approval.
+	MCPPlanPolicyDecisionRequiresApproval MCPPlanPolicyDecision = "requires-approval"
+)
+
+// Which authority produced a policy decision
+// Experimental: MCPPlanPolicySource is part of an experimental API and may change or be
+// removed.
+type MCPPlanPolicySource string
+
+const (
+	// An enterprise allowlist evaluated the server.
+	MCPPlanPolicySourceEnterpriseAllowlist MCPPlanPolicySource = "enterprise-allowlist"
+	// Local trust settings evaluated the server.
+	MCPPlanPolicySourceLocalTrust MCPPlanPolicySource = "local-trust"
+	// No policy applied, so the server is permitted by default.
+	MCPPlanPolicySourceNone MCPPlanPolicySource = "none"
+	// The registry the card came from evaluated the server.
+	MCPPlanPolicySourceRegistryPolicy MCPPlanPolicySource = "registry-policy"
+)
+
+// Discriminator for a remote-endpoint transport choice
+// Experimental: MCPPlanRemoteInstallMethod is part of an experimental API and may change or
+// be removed.
+type MCPPlanRemoteInstallMethod string
+
+const (
+	// Connect to a remote endpoint.
+	MCPPlanRemoteInstallMethodRemote MCPPlanRemoteInstallMethod = "remote"
+)
+
+// Transport exposed by a remote endpoint
+// Experimental: MCPPlanRemoteTransport is part of an experimental API and may change or be
+// removed.
+type MCPPlanRemoteTransport string
+
+const (
+	// An HTTP endpoint.
+	MCPPlanRemoteTransportHTTP MCPPlanRemoteTransport = "http"
+	// A server-sent events endpoint.
+	MCPPlanRemoteTransportSSE MCPPlanRemoteTransport = "sse"
+	// A streamable HTTP endpoint.
+	MCPPlanRemoteTransportStreamableHTTP MCPPlanRemoteTransport = "streamable-http"
+)
+
+// Discriminator for an enumerated required value
+// Experimental: MCPPlanRequiredValueEnumKind is part of an experimental API and may change
+// or be removed.
+type MCPPlanRequiredValueEnumKind string
+
+const (
+	// The value uses a fixed non-empty enumeration.
+	MCPPlanRequiredValueEnumKindEnum MCPPlanRequiredValueEnumKind = "enum"
+)
+
+// Kind discriminator for MCPPlanRequiredValue.
+type MCPPlanRequiredValueKind string
+
+const (
+	MCPPlanRequiredValueKindEnum   MCPPlanRequiredValueKind = "enum"
+	MCPPlanRequiredValueKindScalar MCPPlanRequiredValueKind = "scalar"
+)
+
+// Discriminator for a scalar required value
+// Experimental: MCPPlanRequiredValueScalarKind is part of an experimental API and may
+// change or be removed.
+type MCPPlanRequiredValueScalarKind string
+
+const (
+	// The value uses one scalar type.
+	MCPPlanRequiredValueScalarKindScalar MCPPlanRequiredValueScalarKind = "scalar"
+)
+
+// Scalar type a required value must conform to
+// Experimental: MCPPlanScalarValueType is part of an experimental API and may change or be
+// removed.
+type MCPPlanScalarValueType string
+
+const (
+	// A boolean.
+	MCPPlanScalarValueTypeBoolean MCPPlanScalarValueType = "boolean"
+	// A number.
+	MCPPlanScalarValueTypeNumber MCPPlanScalarValueType = "number"
+	// A filesystem path.
+	MCPPlanScalarValueTypePath MCPPlanScalarValueType = "path"
+	// Free text.
+	MCPPlanScalarValueTypeString MCPPlanScalarValueType = "string"
+)
+
+// Configuration scope an MCP install plan targets
+// Experimental: MCPPlanScope is part of an experimental API and may change or be removed.
+type MCPPlanScope string
+
+const (
+	// The user's own MCP configuration.
+	MCPPlanScopeUser MCPPlanScope = "user"
+)
+
+// Transport discriminator for MCPPlanTransportChoice.
+type MCPPlanTransportChoiceTransport string
+
+const (
+	MCPPlanTransportChoiceTransportHTTP           MCPPlanTransportChoiceTransport = "http"
+	MCPPlanTransportChoiceTransportSSE            MCPPlanTransportChoiceTransport = "sse"
+	MCPPlanTransportChoiceTransportStdio          MCPPlanTransportChoiceTransport = "stdio"
+	MCPPlanTransportChoiceTransportStreamableHTTP MCPPlanTransportChoiceTransport = "streamable-http"
+)
+
+// Where a required value is applied when the planned server is launched
+// Experimental: MCPPlanValueCategory is part of an experimental API and may change or be
+// removed.
+type MCPPlanValueCategory string
+
+const (
+	// Set as an environment variable on the launched process.
+	MCPPlanValueCategoryEnvironmentVariable MCPPlanValueCategory = "environment-variable"
+	// Sent as a request header to a remote endpoint.
+	MCPPlanValueCategoryHeader MCPPlanValueCategory = "header"
+	// Passed to the packaged server itself.
+	MCPPlanValueCategoryPackageArgument MCPPlanValueCategory = "package-argument"
+	// Passed to the runtime that launches the package.
+	MCPPlanValueCategoryRuntimeArgument MCPPlanValueCategory = "runtime-argument"
+	// Substituted into the remote endpoint URL.
+	MCPPlanValueCategoryURLVariable MCPPlanValueCategory = "url-variable"
+)
+
 // Outcome of the sampling inference. 'success' produced a response; 'failure' encountered
 // an error (including agent-side rejection by content filter or criteria); 'cancelled' the
 // caller cancelled this execution via cancelSamplingExecution.
@@ -13800,6 +17239,46 @@ const (
 	MCPSamplingExecutionActionSuccess MCPSamplingExecutionAction = "success"
 )
 
+// Discriminator for an embedded MCP server card
+// Experimental: MCPServerCardEmbeddedKind is part of an experimental API and may change or
+// be removed.
+type MCPServerCardEmbeddedKind string
+
+const (
+	// Use the embedded card document.
+	MCPServerCardEmbeddedKindEmbedded MCPServerCardEmbeddedKind = "embedded"
+)
+
+// JSON MCP card media type accepted for install planning
+// Experimental: MCPServerCardMediaType is part of an experimental API and may change or be
+// removed.
+type MCPServerCardMediaType string
+
+const (
+	// The current MCP server card media type.
+	MCPServerCardMediaTypeApplicationMCPServerCardJSON MCPServerCardMediaType = "application/mcp-server-card+json"
+	// The legacy MCP server card media type, accepted for compatibility.
+	MCPServerCardMediaTypeApplicationMCPServerJSON MCPServerCardMediaType = "application/mcp-server+json"
+)
+
+// Kind discriminator for MCPServerCardReference.
+type MCPServerCardReferenceKind string
+
+const (
+	MCPServerCardReferenceKindEmbedded MCPServerCardReferenceKind = "embedded"
+	MCPServerCardReferenceKindURL      MCPServerCardReferenceKind = "url"
+)
+
+// Discriminator for a URL-backed MCP server card
+// Experimental: MCPServerCardURLKind is part of an experimental API and may change or be
+// removed.
+type MCPServerCardURLKind string
+
+const (
+	// Retrieve the card from its URL.
+	MCPServerCardURLKindURL MCPServerCardURLKind = "url"
+)
+
 // Controls if tools provided by this server can be loaded on demand via tool search (auto)
 // or always included in the initial tool list (never)
 // Experimental: MCPServerConfigDeferTools is part of an experimental API and may change or
@@ -13837,6 +17316,27 @@ const (
 	MCPServerConfigHTTPTypeSSE MCPServerConfigHTTPType = "sse"
 )
 
+// In-process MCP transport type.
+// Experimental: MCPServerConfigMemoryType is part of an experimental API and may change or
+// be removed.
+type MCPServerConfigMemoryType string
+
+const (
+	MCPServerConfigMemoryTypeMemory MCPServerConfigMemoryType = "memory"
+)
+
+// Local MCP transport type.
+// Experimental: MCPServerConfigStdioType is part of an experimental API and may change or
+// be removed.
+type MCPServerConfigStdioType string
+
+const (
+	// Legacy alias for the local stdio transport.
+	MCPServerConfigStdioTypeLocal MCPServerConfigStdioType = "local"
+	// Server communicates over stdio with a local child process.
+	MCPServerConfigStdioTypeStdio MCPServerConfigStdioType = "stdio"
+)
+
 // Configuration source: user, workspace, plugin, or builtin
 // Experimental: MCPServerSource is part of an experimental API and may change or be removed.
 type MCPServerSource string
@@ -13931,6 +17431,38 @@ const (
 	MetadataSnapshotRemoteMetadataTaskTypeCLI MetadataSnapshotRemoteMetadataTaskType = "cli"
 )
 
+// Origin of an effective session model change.
+// Experimental: ModelChangeSource is part of an experimental API and may change or be
+// removed.
+type ModelChangeSource string
+
+const (
+	// Selecting an agent selected its configured model.
+	ModelChangeSourceAgent ModelChangeSource = "agent"
+	// The runtime selected the model automatically, such as rate-limit recovery or refusal
+	// fallback.
+	ModelChangeSourceAutomatic ModelChangeSource = "automatic"
+	// The user selected the model with the `/config` alias.
+	ModelChangeSourceConfigCommand ModelChangeSource = "config_command"
+	// Organization-managed settings selected the model.
+	ModelChangeSourceManagedSettings ModelChangeSource = "managed_settings"
+	// The user selected a model directly with `/model <id>`.
+	ModelChangeSourceModelCommand ModelChangeSource = "model_command"
+	// The user selected the model in the model picker, including the picker opened by bare
+	// `/model`.
+	ModelChangeSourceModelPicker ModelChangeSource = "model_picker"
+	// Entering, leaving, or reconfiguring plan mode selected the model.
+	ModelChangeSourcePlanMode ModelChangeSource = "plan_mode"
+	// Repository settings selected the model.
+	ModelChangeSourceRepoSettings ModelChangeSource = "repo_settings"
+	// An SDK or RPC caller selected the model.
+	ModelChangeSourceSDK ModelChangeSource = "sdk"
+	// The user selected the model with `/settings`.
+	ModelChangeSourceSettingsCommand ModelChangeSource = "settings_command"
+	// Startup model resolution selected the model.
+	ModelChangeSourceStartup ModelChangeSource = "startup"
+)
+
 // Model capability category for grouping in the model picker
 // Experimental: ModelPickerCategory is part of an experimental API and may change or be
 // removed.
@@ -14064,6 +17596,7 @@ type PermissionDecisionApproveForLocationApprovalKind string
 const (
 	PermissionDecisionApproveForLocationApprovalKindCommands                  PermissionDecisionApproveForLocationApprovalKind = "commands"
 	PermissionDecisionApproveForLocationApprovalKindCustomTool                PermissionDecisionApproveForLocationApprovalKind = "custom-tool"
+	PermissionDecisionApproveForLocationApprovalKindExtensionEnvAccess        PermissionDecisionApproveForLocationApprovalKind = "extension-env-access"
 	PermissionDecisionApproveForLocationApprovalKindExtensionManagement       PermissionDecisionApproveForLocationApprovalKind = "extension-management"
 	PermissionDecisionApproveForLocationApprovalKindExtensionPermissionAccess PermissionDecisionApproveForLocationApprovalKind = "extension-permission-access"
 	PermissionDecisionApproveForLocationApprovalKindFactory                   PermissionDecisionApproveForLocationApprovalKind = "factory"
@@ -14080,6 +17613,7 @@ type PermissionDecisionApproveForSessionApprovalKind string
 const (
 	PermissionDecisionApproveForSessionApprovalKindCommands                  PermissionDecisionApproveForSessionApprovalKind = "commands"
 	PermissionDecisionApproveForSessionApprovalKindCustomTool                PermissionDecisionApproveForSessionApprovalKind = "custom-tool"
+	PermissionDecisionApproveForSessionApprovalKindExtensionEnvAccess        PermissionDecisionApproveForSessionApprovalKind = "extension-env-access"
 	PermissionDecisionApproveForSessionApprovalKindExtensionManagement       PermissionDecisionApproveForSessionApprovalKind = "extension-management"
 	PermissionDecisionApproveForSessionApprovalKindExtensionPermissionAccess PermissionDecisionApproveForSessionApprovalKind = "extension-permission-access"
 	PermissionDecisionApproveForSessionApprovalKindFactory                   PermissionDecisionApproveForSessionApprovalKind = "factory"
@@ -14111,6 +17645,55 @@ const (
 	PermissionDecisionKindUserNotAvailable                               PermissionDecisionKind = "user-not-available"
 )
 
+// Disposition of a permission request as observed by the responding client.
+// Experimental: PermissionDecisionOutcome is part of an experimental API and may change or
+// be removed.
+type PermissionDecisionOutcome string
+
+const (
+	// The request was approved automatically without a new human decision.
+	PermissionDecisionOutcomeAutoApproved PermissionDecisionOutcome = "auto_approved"
+	// The request was denied without an interactive user decision; source records why.
+	PermissionDecisionOutcomeAutopilotDenied PermissionDecisionOutcome = "autopilot_denied"
+	// The response came from an interactive user prompt.
+	PermissionDecisionOutcomePromptedUser PermissionDecisionOutcome = "prompted_user"
+)
+
+// Controlled reason or actor responsible for a permission response.
+// Experimental: PermissionDecisionSource is part of an experimental API and may change or
+// be removed.
+type PermissionDecisionSource string
+
+const (
+	// The response followed the assisted-approval judge recommendation.
+	PermissionDecisionSourceAssistedApproval PermissionDecisionSource = "assisted_approval"
+	// The host applied a standing policy or override rather than a judge recommendation or
+	// human decision.
+	PermissionDecisionSourceHostPolicy PermissionDecisionSource = "host_policy"
+	// A human supplied the response through an interactive prompt.
+	PermissionDecisionSourceHumanResponse PermissionDecisionSource = "human_response"
+	// The host denied the request because no interactive user response was available.
+	PermissionDecisionSourceUnattendedFallback PermissionDecisionSource = "unattended_fallback"
+)
+
+// Client surface that submitted a permission response.
+// Experimental: PermissionDecisionSurface is part of an experimental API and may change or
+// be removed.
+type PermissionDecisionSurface string
+
+const (
+	// An Agent Client Protocol host.
+	PermissionDecisionSurfaceAcp PermissionDecisionSurface = "acp"
+	// The Copilot App client.
+	PermissionDecisionSurfaceCopilotApp PermissionDecisionSurface = "copilot_app"
+	// The non-interactive Copilot CLI prompt mode.
+	PermissionDecisionSurfacePromptMode PermissionDecisionSurface = "prompt_mode"
+	// A generic Copilot SDK client.
+	PermissionDecisionSurfaceSDK PermissionDecisionSurface = "sdk"
+	// The interactive Copilot CLI terminal UI.
+	PermissionDecisionSurfaceTui PermissionDecisionSurface = "tui"
+)
+
 // Whether the location is a git repo or directory
 // Experimental: PermissionLocationType is part of an experimental API and may change or be
 // removed.
@@ -14123,19 +17706,51 @@ const (
 	PermissionLocationTypeRepo PermissionLocationType = "repo"
 )
 
-// Current or requested allow-all mode.
-// Experimental: PermissionsAllowAllMode is part of an experimental API and may change or be
-// removed.
-type PermissionsAllowAllMode string
+// Current or requested permission mode.
+// Experimental: PermissionMode is part of an experimental API and may change or be removed.
+type PermissionMode string
 
 const (
-	// Permission requests follow the normal approval flow with an LLM advisory recommendation
-	// attached; clients may choose to auto-approve requests the judge evaluated as acceptable.
-	PermissionsAllowAllModeAuto PermissionsAllowAllMode = "auto"
-	// Permission requests follow the normal approval flow.
-	PermissionsAllowAllModeOff PermissionsAllowAllMode = "off"
 	// Tool, path, and URL permission requests are automatically approved.
-	PermissionsAllowAllModeOn PermissionsAllowAllMode = "on"
+	PermissionModeAllowAll PermissionMode = "allow-all"
+	// Permission requests include an LLM safety recommendation; clients may automatically
+	// approve requests judged acceptable.
+	PermissionModeAssisted PermissionMode = "assisted"
+	// Permission requests follow the normal approval flow.
+	PermissionModeManual PermissionMode = "manual"
+)
+
+// Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK
+// callers.
+// Experimental: PermissionModeSource is part of an experimental API and may change or be
+// removed.
+type PermissionModeSource string
+
+const (
+	// The mode was set by confirming autopilot behavior.
+	PermissionModeSourceAutopilotConfirmation PermissionModeSource = "autopilot_confirmation"
+	// The mode was set from a CLI command-line flag.
+	PermissionModeSourceCLIFlag PermissionModeSource = "cli_flag"
+	// The mode was set through an RPC caller.
+	PermissionModeSourceRPC PermissionModeSource = "rpc"
+	// The mode was set by a slash command.
+	PermissionModeSourceSlashCommand PermissionModeSource = "slash_command"
+	// The mode was set at startup by the `defaultPermissionMode` user setting.
+	PermissionModeSourceUserSetting PermissionModeSource = "user_setting"
+)
+
+// Response capability available to the client when it settled a permission request.
+// Experimental: PermissionResponseCapability is part of an experimental API and may change
+// or be removed.
+type PermissionResponseCapability string
+
+const (
+	// The client could return an automated response but could not ask a user.
+	PermissionResponseCapabilityHeadless PermissionResponseCapability = "headless"
+	// The client could ask a user for this decision.
+	PermissionResponseCapabilityInteractive PermissionResponseCapability = "interactive"
+	// The client had no response path available.
+	PermissionResponseCapabilityNone PermissionResponseCapability = "none"
 )
 
 // Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope`
@@ -14157,6 +17772,7 @@ type PermissionsLocationsAddToolApprovalDetailsKind string
 const (
 	PermissionsLocationsAddToolApprovalDetailsKindCommands                  PermissionsLocationsAddToolApprovalDetailsKind = "commands"
 	PermissionsLocationsAddToolApprovalDetailsKindCustomTool                PermissionsLocationsAddToolApprovalDetailsKind = "custom-tool"
+	PermissionsLocationsAddToolApprovalDetailsKindExtensionEnvAccess        PermissionsLocationsAddToolApprovalDetailsKind = "extension-env-access"
 	PermissionsLocationsAddToolApprovalDetailsKindExtensionManagement       PermissionsLocationsAddToolApprovalDetailsKind = "extension-management"
 	PermissionsLocationsAddToolApprovalDetailsKindExtensionPermissionAccess PermissionsLocationsAddToolApprovalDetailsKind = "extension-permission-access"
 	PermissionsLocationsAddToolApprovalDetailsKindFactory                   PermissionsLocationsAddToolApprovalDetailsKind = "factory"
@@ -14180,22 +17796,6 @@ const (
 	PermissionsModifyRulesScopeSession PermissionsModifyRulesScope = "session"
 )
 
-// Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
-// Experimental: PermissionsSetAllowAllSource is part of an experimental API and may change
-// or be removed.
-type PermissionsSetAllowAllSource string
-
-const (
-	// Allow-all was enabled by confirming autopilot behavior.
-	PermissionsSetAllowAllSourceAutopilotConfirmation PermissionsSetAllowAllSource = "autopilot_confirmation"
-	// Allow-all was enabled from a CLI command-line flag.
-	PermissionsSetAllowAllSourceCLIFlag PermissionsSetAllowAllSource = "cli_flag"
-	// Allow-all was enabled through an RPC caller.
-	PermissionsSetAllowAllSourceRPC PermissionsSetAllowAllSource = "rpc"
-	// Allow-all was enabled by a slash command.
-	PermissionsSetAllowAllSourceSlashCommand PermissionsSetAllowAllSource = "slash_command"
-)
-
 // Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
 // Experimental: PermissionsSetApproveAllSource is part of an experimental API and may
 // change or be removed.
@@ -14210,6 +17810,20 @@ const (
 	PermissionsSetApproveAllSourceRPC PermissionsSetApproveAllSource = "rpc"
 	// Allow-all was enabled by a slash command.
 	PermissionsSetApproveAllSourceSlashCommand PermissionsSetApproveAllSource = "slash_command"
+	// Allow-all was enabled at startup by the `defaultPermissionMode` user setting.
+	PermissionsSetApproveAllSourceUserSetting PermissionsSetApproveAllSource = "user_setting"
+)
+
+// Controls whether the runtime may defer loading an external tool definition.
+// Experimental: ProtocolExternalToolDefer is part of an experimental API and may change or
+// be removed.
+type ProtocolExternalToolDefer string
+
+const (
+	// The runtime may defer the tool according to its tool-loading policy.
+	ProtocolExternalToolDeferAuto ProtocolExternalToolDefer = "auto"
+	// The runtime must include the tool without deferring it.
+	ProtocolExternalToolDeferNever ProtocolExternalToolDefer = "never"
 )
 
 // Provider transport. Defaults to "http".
@@ -14359,6 +17973,26 @@ const (
 	RemoteControlStatusStateOff        RemoteControlStatusState = "off"
 )
 
+// What a remote host says one of its sessions is doing right now. Deliberately coarse: this
+// is what a host can report for EVERY session in a catalogue listing, without a client
+// subscribing to each one. AHP's `SessionSummary.status` is the source today;
+// `input-needed` covers both a permission prompt and an `ask_user` question, since the
+// summary does not say which.
+// Experimental: RemoteSessionHostStatus is part of an experimental API and may change or be
+// removed.
+type RemoteSessionHostStatus string
+
+const (
+	// The session ended its last turn in an error.
+	RemoteSessionHostStatusError RemoteSessionHostStatus = "error"
+	// No turn is running.
+	RemoteSessionHostStatusIdle RemoteSessionHostStatus = "idle"
+	// The session is blocked on the user: a permission prompt or an `ask_user` question.
+	RemoteSessionHostStatusInputNeeded RemoteSessionHostStatus = "input-needed"
+	// A turn is running.
+	RemoteSessionHostStatusWorking RemoteSessionHostStatus = "working"
+)
+
 // Whether the remote task originated from CCA or CLI `--remote`.
 // Experimental: RemoteSessionMetadataTaskType is part of an experimental API and may change
 // or be removed.
@@ -14386,6 +18020,28 @@ const (
 	RemoteSessionModeOn RemoteSessionMode = "on"
 )
 
+// Origin of the sandbox choice supplied by an internal client.
+// Experimental: SandboxConfigSource is part of an experimental API and may change or be
+// removed.
+type SandboxConfigSource string
+
+const (
+	// The client applied the default because no sandbox preference was configured.
+	SandboxConfigSourceNeverConfigured SandboxConfigSource = "never_configured"
+	// A repository policy selected the sandbox state.
+	SandboxConfigSourceRepositoryPolicy SandboxConfigSource = "repository_policy"
+	// The user disabled the sandbox for the current session.
+	SandboxConfigSourceSessionDisabled SandboxConfigSource = "session_disabled"
+	// A command-line flag selected the sandbox state for this session.
+	SandboxConfigSourceSessionFlag SandboxConfigSource = "session_flag"
+	// The client disabled the sandbox because the host cannot enforce it.
+	SandboxConfigSourceUnsupportedHost SandboxConfigSource = "unsupported_host"
+	// The user's persisted settings disabled the sandbox.
+	SandboxConfigSourceUserDisabled SandboxConfigSource = "user_disabled"
+	// The user's persisted settings enabled the sandbox.
+	SandboxConfigSourceUserEnabled SandboxConfigSource = "user_enabled"
+)
+
 // The UI mode the agent was in when this message was sent. Defaults to the session's
 // current mode.
 // Experimental: SendAgentMode is part of an experimental API and may change or be removed.
@@ -14847,6 +18503,19 @@ const (
 	SessionWorkingDirectoryContextHostTypeGitHub SessionWorkingDirectoryContextHostType = "github"
 )
 
+// Type discriminator for SettableAuthInfo.
+type SettableAuthInfoType string
+
+const (
+	SettableAuthInfoTypeAPIKey          SettableAuthInfoType = "api-key"
+	SettableAuthInfoTypeCopilotAPIToken SettableAuthInfoType = "copilot-api-token"
+	SettableAuthInfoTypeEnv             SettableAuthInfoType = "env"
+	SettableAuthInfoTypeGhCLI           SettableAuthInfoType = "gh-cli"
+	SettableAuthInfoTypeHMAC            SettableAuthInfoType = "hmac"
+	SettableAuthInfoTypeToken           SettableAuthInfoType = "token"
+	SettableAuthInfoTypeUser            SettableAuthInfoType = "user"
+)
+
 // Controls automatic non-interactive profile loading where supported. Explicit initScripts
 // are unaffected.
 // Experimental: ShellInitProfile is part of an experimental API and may change or be
@@ -14948,9 +18617,13 @@ const (
 type SlashCommandInvocationResultKind string
 
 const (
+	SlashCommandInvocationResultKindAddTimelineEntry SlashCommandInvocationResultKind = "add-timeline-entry"
 	SlashCommandInvocationResultKindAgentPrompt      SlashCommandInvocationResultKind = "agent-prompt"
 	SlashCommandInvocationResultKindCompleted        SlashCommandInvocationResultKind = "completed"
 	SlashCommandInvocationResultKindSelectSubcommand SlashCommandInvocationResultKind = "select-subcommand"
+	SlashCommandInvocationResultKindSetModel         SlashCommandInvocationResultKind = "set-model"
+	SlashCommandInvocationResultKindSetPlanModel     SlashCommandInvocationResultKind = "set-plan-model"
+	SlashCommandInvocationResultKindShowDialog       SlashCommandInvocationResultKind = "show-dialog"
 	SlashCommandInvocationResultKindText             SlashCommandInvocationResultKind = "text"
 )
 
@@ -14969,6 +18642,13 @@ const (
 	SlashCommandKindSkill SlashCommandKind = "skill"
 )
 
+// Discriminator for a model-picker dialog.
+type SlashCommandModelPickerDialogKind string
+
+const (
+	SlashCommandModelPickerDialogKindModelPicker SlashCommandModelPickerDialogKind = "model-picker"
+)
+
 // Context tier override for matching subagents
 // Experimental: SubagentSettingsEntryContextTier is part of an experimental API and may
 // change or be removed.
@@ -14983,6 +18663,21 @@ const (
 	SubagentSettingsEntryContextTierLongContext SubagentSettingsEntryContextTier = "long_context"
 )
 
+// Semantic result of evaluating a task completion request
+// Experimental: TaskCompletionOutcome is part of an experimental API and may change or be
+// removed.
+type TaskCompletionOutcome string
+
+const (
+	// Completion cannot proceed without intervention; the active objective is paused when one
+	// is identified.
+	TaskCompletionOutcomeBlocked TaskCompletionOutcome = "blocked"
+	// The completion request was accepted and the objective is complete.
+	TaskCompletionOutcomeCompleted TaskCompletionOutcome = "completed"
+	// The completion request was rejected because more work or validation remains.
+	TaskCompletionOutcomeContinue TaskCompletionOutcome = "continue"
+)
+
 // Whether task execution is synchronously awaited or managed in the background
 // Experimental: TaskExecutionMode is part of an experimental API and may change or be
 // removed.
@@ -15041,6 +18736,23 @@ const (
 	TaskStatusRunning TaskStatus = "running"
 )
 
+// Execution outcome classification.
+// Experimental: ToolResultType is part of an experimental API and may change or be removed.
+type ToolResultType string
+
+const (
+	// Permission policy denied the tool request.
+	ToolResultTypeDenied ToolResultType = "denied"
+	// The tool failed.
+	ToolResultTypeFailure ToolResultType = "failure"
+	// The tool request was rejected before execution.
+	ToolResultTypeRejected ToolResultType = "rejected"
+	// The tool completed successfully.
+	ToolResultTypeSuccess ToolResultType = "success"
+	// The tool exceeded its execution timeout.
+	ToolResultTypeTimeout ToolResultType = "timeout"
+)
+
 // User's choice for auto-mode switching: yes (allow this turn), yes_always (allow + persist
 // as setting), or no (decline).
 // Experimental: UIAutoModeSwitchResponse is part of an experimental API and may change or
@@ -15162,6 +18874,7 @@ type UserToolSessionApprovalKind string
 const (
 	UserToolSessionApprovalKindCommands                  UserToolSessionApprovalKind = "commands"
 	UserToolSessionApprovalKindCustomTool                UserToolSessionApprovalKind = "custom-tool"
+	UserToolSessionApprovalKindExtensionEnvAccess        UserToolSessionApprovalKind = "extension-env-access"
 	UserToolSessionApprovalKindExtensionManagement       UserToolSessionApprovalKind = "extension-management"
 	UserToolSessionApprovalKindExtensionPermissionAccess UserToolSessionApprovalKind = "extension-permission-access"
 	UserToolSessionApprovalKindFactory                   UserToolSessionApprovalKind = "factory"
@@ -15281,12 +18994,12 @@ func (a *ServerAccountAPI) GetCurrentAuth(ctx context.Context) (*AccountGetCurre
 	return &result, nil
 }
 
-// GetQuota gets Copilot quota usage for the authenticated user or supplied GitHub token.
+// GetQuota gets Copilot quota usage for the current or opaquely selected authenticated user.
 //
 // RPC method: account.getQuota.
 //
-// Parameters: Optional GitHub token used to look up quota for a specific user instead of
-// the global auth context.
+// Parameters: Optional opaque account selection or compatibility GitHub token used to look
+// up quota.
 //
 // Returns: Quota usage snapshots for the resolved user, keyed by quota type.
 func (a *ServerAccountAPI) GetQuota(ctx context.Context, params *AccountGetQuotaRequest) (*AccountGetQuotaResult, error) {
@@ -15301,11 +19014,13 @@ func (a *ServerAccountAPI) GetQuota(ctx context.Context, params *AccountGetQuota
 	return &result, nil
 }
 
-// Login stores authentication credentials after successful login (e.g., device code flow).
+// Login validates and stores authentication credentials. When login is omitted, resolves
+// the authenticated user from the token before persistence.
 //
 // RPC method: account.login.
 //
-// Parameters: Credentials to store after successful authentication
+// Parameters: Credentials to validate and store. Omit login to resolve the authenticated
+// user from the token.
 //
 // Returns: Result of a successful login; throws on failure
 func (a *ServerAccountAPI) Login(ctx context.Context, params *AccountLoginRequest) (*AccountLoginResult, error) {
@@ -15410,6 +19125,38 @@ func (a *ServerAgentsAPI) GetDiscoveryPaths(ctx context.Context, params *AgentsG
 	return &result, nil
 }
 
+// Experimental: ServerCatalogAPI contains experimental APIs that may change or be removed.
+type ServerCatalogAPI serverAPI
+
+// Search requests a bounded catalog search. This host-implemented server method is
+// available through SDK/TUI hosts; standalone and C-ABI runtimes whose host does not
+// implement server-method dispatch return JSON-RPC MethodNotFound. A runtime with search
+// available returns inert candidate summaries, each with an opaque single-use handle scoped
+// to this runtime instance; a runtime without it returns the typed search-unavailable
+// result. Public authorities may be searched anonymously, while an authority that requires
+// credentials yields the typed authentication-required result. All returned text, URLs, and
+// package metadata are untrusted external data and can never trigger instructions, tools,
+// or installation. Read-only: nothing is installed, configured, or persisted.
+//
+// RPC method: catalog.search.
+//
+// Parameters: A bounded catalog search. Both the query length and the result count are
+// capped by the schema so a caller cannot request an unbounded scan.
+//
+// Returns: Outcome of a catalog.search call: either bounded inert candidates, or one typed
+// refusal. Never a partial success.
+func (a *ServerCatalogAPI) Search(ctx context.Context, params *CatalogSearchRequest) (CatalogSearchResult, error) {
+	raw, err := a.client.Request(ctx, "catalog.search", params)
+	if err != nil {
+		return nil, err
+	}
+	result, err := unmarshalCatalogSearchResult(raw)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
 // Experimental: ServerCommandsAPI contains experimental APIs that may change or be removed.
 type ServerCommandsAPI serverAPI
 
@@ -15605,6 +19352,29 @@ func (a *ServerLlmInferenceAPI) SetProvider(ctx context.Context) (*LlmInferenceS
 	return &result, nil
 }
 
+// Experimental: ServerManagedSettingsAPI contains experimental APIs that may change or be
+// removed.
+type ServerManagedSettingsAPI serverAPI
+
+// Read discovers device-managed settings from production MDM and managed-file sources,
+// validates them against the runtime-owned managed-settings schema, and returns the
+// canonical JSON without requiring a session.
+//
+// RPC method: managedSettings.read.
+//
+// Returns: Validated device-managed settings discovered before a session exists.
+func (a *ServerManagedSettingsAPI) Read(ctx context.Context) (*ManagedSettingsReadResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.read", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsReadResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Experimental: ServerMCPAPI contains experimental APIs that may change or be removed.
 type ServerMCPAPI serverAPI
 
@@ -15627,6 +19397,36 @@ func (a *ServerMCPAPI) Discover(ctx context.Context, params *MCPDiscoverRequest)
 	return &result, nil
 }
 
+// PlanInstall requests a side-effect-free MCP install plan from a catalog candidate handle
+// or a caller-supplied card. This host-implemented server method is available through
+// SDK/TUI hosts; standalone and C-ABI runtimes whose host does not implement server-method
+// dispatch return JSON-RPC MethodNotFound. A runtime with planning available returns a
+// normalised plan and opaque single-use plan handle; a runtime without it returns the typed
+// planning-unavailable result. A completed plan reports resource identity, provenance,
+// eligible transport choices, the user-scope target, required typed values and secret
+// placeholders, the policy result, the configuration changes installing would make, and
+// whether a reload would be needed. Planning never writes configuration, stores a secret,
+// or reloads MCP servers, so abandoning a plan needs no call and leaves nothing behind.
+//
+// RPC method: mcp.planInstall.
+//
+// Parameters: A side-effect-free request for an MCP install plan. Computing a plan never
+// writes configuration, stores a secret, or reloads MCP servers.
+//
+// Returns: Outcome of an mcp.planInstall call: either a normalised plan, or one typed
+// refusal. Nothing is written in either case.
+func (a *ServerMCPAPI) PlanInstall(ctx context.Context, params *MCPPlanInstallRequest) (MCPPlanInstallResult, error) {
+	raw, err := a.client.Request(ctx, "mcp.planInstall", params)
+	if err != nil {
+		return nil, err
+	}
+	result, err := unmarshalMCPPlanInstallResult(raw)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
 // Experimental: ServerMCPConfigAPI contains experimental APIs that may change or be removed.
 type ServerMCPConfigAPI serverAPI
 
@@ -15779,8 +19579,8 @@ func (a *ServerModelsAPI) GetBuiltInCatalog(ctx context.Context) (*BuiltInModelC
 //
 // RPC method: models.list.
 //
-// Parameters: Optional GitHub token used to list models for a specific user instead of the
-// global auth context.
+// Parameters: Optional opaque account selection or compatibility GitHub token used to list
+// models.
 //
 // Returns: List of Copilot models available to the resolved user, including capabilities
 // and billing metadata.
@@ -15922,6 +19722,33 @@ func (a *ServerPluginsAPI) UpdateAll(ctx context.Context) (*PluginUpdateAllResul
 	return &result, nil
 }
 
+// Experimental: ServerPluginsBuiltinAPI contains experimental APIs that may change or be
+// removed.
+type ServerPluginsBuiltinAPI serverAPI
+
+// Set replaces this server's trusted built-in plugin directories while no sessions are
+// active.
+//
+// RPC method: plugins.builtin.set.
+//
+// Parameters: Trusted built-in plugin directories to use for this runtime process.
+func (a *ServerPluginsBuiltinAPI) Set(ctx context.Context, params *PluginsBuiltinSetRequest) (*PluginsBuiltinSetResult, error) {
+	raw, err := a.client.Request(ctx, "plugins.builtin.set", params)
+	if err != nil {
+		return nil, err
+	}
+	var result PluginsBuiltinSetResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: Builtin returns experimental APIs that may change or be removed.
+func (s *ServerPluginsAPI) Builtin() *ServerPluginsBuiltinAPI {
+	return (*ServerPluginsBuiltinAPI)(s)
+}
+
 // Experimental: ServerPluginsMarketplacesAPI contains experimental APIs that may change or
 // be removed.
 type ServerPluginsMarketplacesAPI serverAPI
@@ -16639,6 +20466,24 @@ func (a *ServerSkillsConfigAPI) SetDisabledSkills(ctx context.Context, params *S
 	return &result, nil
 }
 
+// SetSkillDisabled atomically adds or removes one skill from the disabled list.
+//
+// RPC method: skills.config.setSkillDisabled.
+//
+// Parameters: Adds or removes a single skill from the global disabled list, leaving every
+// other entry untouched.
+func (a *ServerSkillsConfigAPI) SetSkillDisabled(ctx context.Context, params *SkillsConfigSetSkillDisabledRequest) (*SkillsConfigSetSkillDisabledResult, error) {
+	raw, err := a.client.Request(ctx, "skills.config.setSkillDisabled", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SkillsConfigSetSkillDisabledResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Experimental: Config returns experimental APIs that may change or be removed.
 func (s *ServerSkillsAPI) Config() *ServerSkillsConfigAPI {
 	return (*ServerSkillsConfigAPI)(s)
@@ -16747,23 +20592,25 @@ type ServerRPC struct {
 	// Reuse a single struct instead of allocating one for each service on the heap.
 	common serverAPI
 
-	Account       *ServerAccountAPI
-	AgentRegistry *ServerAgentRegistryAPI
-	Agents        *ServerAgentsAPI
-	Commands      *ServerCommandsAPI
-	Extensions    *ServerExtensionsAPI
-	Instructions  *ServerInstructionsAPI
-	LlmInference  *ServerLlmInferenceAPI
-	MCP           *ServerMCPAPI
-	Models        *ServerModelsAPI
-	Plugins       *ServerPluginsAPI
-	Runtime       *ServerRuntimeAPI
-	Secrets       *ServerSecretsAPI
-	SessionFS     *ServerSessionFSAPI
-	Sessions      *ServerSessionsAPI
-	Skills        *ServerSkillsAPI
-	Tools         *ServerToolsAPI
-	User          *ServerUserAPI
+	Account         *ServerAccountAPI
+	AgentRegistry   *ServerAgentRegistryAPI
+	Agents          *ServerAgentsAPI
+	Catalog         *ServerCatalogAPI
+	Commands        *ServerCommandsAPI
+	Extensions      *ServerExtensionsAPI
+	Instructions    *ServerInstructionsAPI
+	LlmInference    *ServerLlmInferenceAPI
+	ManagedSettings *ServerManagedSettingsAPI
+	MCP             *ServerMCPAPI
+	Models          *ServerModelsAPI
+	Plugins         *ServerPluginsAPI
+	Runtime         *ServerRuntimeAPI
+	Secrets         *ServerSecretsAPI
+	SessionFS       *ServerSessionFSAPI
+	Sessions        *ServerSessionsAPI
+	Skills          *ServerSkillsAPI
+	Tools           *ServerToolsAPI
+	User            *ServerUserAPI
 }
 
 // Ping checks server responsiveness and returns protocol information.
@@ -16787,16 +20634,37 @@ func (a *ServerRPC) Ping(ctx context.Context, params *PingRequest) (*PingResult,
 	return &result, nil
 }
 
+// RegisterExtensionLaunchProvider registers the calling SDK client as the per-entrypoint
+// extension launch provider. Call before creating any sessions. When omitted, the runtime
+// temporarily falls back to its built-in Node launcher for backward compatibility.
+//
+// RPC method: registerExtensionLaunchProvider.
+// Experimental: RegisterExtensionLaunchProvider is an experimental API and may change or be
+// removed in future versions.
+func (a *ServerRPC) RegisterExtensionLaunchProvider(ctx context.Context) (*RegisterExtensionLaunchProviderResult, error) {
+	raw, err := a.common.client.Request(ctx, "registerExtensionLaunchProvider", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result RegisterExtensionLaunchProviderResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 func NewServerRPC(client *jsonrpc2.Client) *ServerRPC {
 	r := &ServerRPC{}
 	r.common = serverAPI{client: client}
 	r.Account = (*ServerAccountAPI)(&r.common)
 	r.AgentRegistry = (*ServerAgentRegistryAPI)(&r.common)
 	r.Agents = (*ServerAgentsAPI)(&r.common)
+	r.Catalog = (*ServerCatalogAPI)(&r.common)
 	r.Commands = (*ServerCommandsAPI)(&r.common)
 	r.Extensions = (*ServerExtensionsAPI)(&r.common)
 	r.Instructions = (*ServerInstructionsAPI)(&r.common)
 	r.LlmInference = (*ServerLlmInferenceAPI)(&r.common)
+	r.ManagedSettings = (*ServerManagedSettingsAPI)(&r.common)
 	r.MCP = (*ServerMCPAPI)(&r.common)
 	r.Models = (*ServerModelsAPI)(&r.common)
 	r.Plugins = (*ServerPluginsAPI)(&r.common)
@@ -17028,8 +20896,8 @@ type InternalServerRPC struct {
 //
 // RPC method: connect.
 //
-// Parameters: Parameters for the `server.connect` handshake: an optional connection token
-// and optional connection-level opt-ins (e.g. GitHub telemetry forwarding).
+// Parameters: Connection-level opt-ins for the `server.connect` handshake. Transport
+// authentication is consumed by the native protocol boundary before dispatch.
 //
 // Returns: Handshake result reporting the server's protocol version and package version on
 // success.
@@ -17414,6 +21282,9 @@ func (a *CommandsAPI) Invoke(ctx context.Context, params *CommandsInvokeRequest)
 			req["input"] = *params.Input
 		}
 		req["name"] = params.Name
+		if params.Origin != nil {
+			req["origin"] = *params.Origin
+		}
 	}
 	raw, err := a.client.Request(ctx, "session.commands.invoke", req)
 	if err != nil {
@@ -17967,9 +21838,22 @@ func (a *FactoryAPI) GetRunProgress(ctx context.Context, params *FactoryGetRunPr
 //
 // RPC method: session.factory.listRuns.
 //
-// Returns: Factory runs in durable creation order.
-func (a *FactoryAPI) ListRuns(ctx context.Context) (*FactoryListRunsResult, error) {
+// Parameters: Parameters for paging factory runs.
+//
+// Returns: A page of factory runs in durable creation order.
+func (a *FactoryAPI) ListRuns(ctx context.Context, params *FactoryListRunsRequest) (*FactoryListRunsResult, error) {
 	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		if params.AfterSeq != nil {
+			req["afterSeq"] = *params.AfterSeq
+		}
+		if params.BeforeSeq != nil {
+			req["beforeSeq"] = *params.BeforeSeq
+		}
+		if params.Limit != nil {
+			req["limit"] = *params.Limit
+		}
+	}
 	raw, err := a.client.Request(ctx, "session.factory.listRuns", req)
 	if err != nil {
 		return nil, err
@@ -18679,6 +22563,26 @@ func (a *MCPAPI) ListTools(ctx context.Context, params *MCPListToolsRequest) (*M
 	return &result, nil
 }
 
+// MoveLoadingToBackground releases any turns waiting on an in-flight MCP load without
+// cancelling the load, letting the agent proceed while MCP servers finish connecting in the
+// background. No-op when no MCP load is in flight or waiting turns were already released.
+//
+// RPC method: session.mcp.moveLoadingToBackground.
+//
+// Returns: Result of moving in-flight MCP loading to the background.
+func (a *MCPAPI) MoveLoadingToBackground(ctx context.Context) (*MoveMCPLoadingToBackgroundResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.mcp.moveLoadingToBackground", req)
+	if err != nil {
+		return nil, err
+	}
+	var result MoveMCPLoadingToBackgroundResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Reloads MCP server connections for the session.
 //
 // RPC method: session.mcp.reload.
@@ -19111,6 +23015,35 @@ func (a *MCPOauthAPI) Login(ctx context.Context, params *MCPOauthLoginRequest) (
 	return &result, nil
 }
 
+// Probe passively probes a configured remote MCP server to classify whether OAuth is
+// required or a cached/override token is accepted. Does not start OAuth, emit pending OAuth
+// requests, or mutate MCP connection state.
+//
+// RPC method: session.mcp.oauth.probe.
+//
+// Parameters: Remote MCP server name for a passive OAuth status probe.
+//
+// Returns: Passive MCP OAuth probe result. `authenticated` means the server accepted the
+// probe request while an OAuth-origin access token was attached; it does not prove the
+// server required or independently validated that token. The probe does not make a second
+// unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are
+// reserved for API-call failures.
+func (a *MCPOauthAPI) Probe(ctx context.Context, params *MCPOauthProbeRequest) (MCPOauthProbeResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["serverName"] = params.ServerName
+	}
+	raw, err := a.client.Request(ctx, "session.mcp.oauth.probe", req)
+	if err != nil {
+		return nil, err
+	}
+	result, err := unmarshalMCPOauthProbeResult(raw)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
 // Responds to a pending MCP OAuth authorization request by its request id.
 //
 // RPC method: session.mcp.oauth.respond.
@@ -19490,16 +23423,49 @@ func (a *ModeAPI) Get(ctx context.Context) (*SessionMode, error) {
 // RPC method: session.mode.set.
 //
 // Parameters: Agent interaction mode to apply to the session.
-func (a *ModeAPI) Set(ctx context.Context, params *ModeSetRequest) (*SessionModeSetResult, error) {
+//
+// Returns: Outcome of a session mode change, including any model switch it triggered and
+// follow-up the host must perform.
+func (a *ModeAPI) Set(ctx context.Context, params *ModeSetRequest) (*ModeSetResult, error) {
 	req := map[string]any{"sessionId": a.sessionID}
 	if params != nil {
+		if params.CompactionDecision != nil {
+			req["compactionDecision"] = *params.CompactionDecision
+		}
+		if params.InheritPlanBaseFromSessionID != nil {
+			req["inheritPlanBaseFromSessionId"] = *params.InheritPlanBaseFromSessionID
+		}
 		req["mode"] = params.Mode
+		if params.PersistPlanSelection != nil {
+			req["persistPlanSelection"] = *params.PersistPlanSelection
+		}
+		if params.PickerSettingsContext != nil {
+			req["pickerSettingsContext"] = *params.PickerSettingsContext
+		}
+		if params.PlanContextTier != nil {
+			req["planContextTier"] = *params.PlanContextTier
+		}
+		if params.PlanExitAction != nil {
+			req["planExitAction"] = *params.PlanExitAction
+		}
+		if params.PlanModel != nil {
+			req["planModel"] = *params.PlanModel
+		}
+		if params.PlanModelConfigured != nil {
+			req["planModelConfigured"] = *params.PlanModelConfigured
+		}
+		if params.PlanReasoningEffort != nil {
+			req["planReasoningEffort"] = *params.PlanReasoningEffort
+		}
+		if params.RestorePlanModel != nil {
+			req["restorePlanModel"] = *params.RestorePlanModel
+		}
 	}
 	raw, err := a.client.Request(ctx, "session.mode.set", req)
 	if err != nil {
 		return nil, err
 	}
-	var result SessionModeSetResult
+	var result ModeSetResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
@@ -19597,6 +23563,9 @@ func (a *ModelAPI) SetReasoningEffort(ctx context.Context, params *ModelSetReaso
 func (a *ModelAPI) SwitchTo(ctx context.Context, params *ModelSwitchToRequest) (*ModelSwitchToResult, error) {
 	req := map[string]any{"sessionId": a.sessionID}
 	if params != nil {
+		if params.CompactionDecision != nil {
+			req["compactionDecision"] = *params.CompactionDecision
+		}
 		if params.ContextTier != nil {
 			req["contextTier"] = *params.ContextTier
 		}
@@ -19606,13 +23575,31 @@ func (a *ModelAPI) SwitchTo(ctx context.Context, params *ModelSwitchToRequest) (
 		if params.ModelCapabilities != nil {
 			req["modelCapabilities"] = *params.ModelCapabilities
 		}
+		if params.ModelChangeScope != nil {
+			req["modelChangeScope"] = *params.ModelChangeScope
+		}
 		req["modelId"] = params.ModelID
+		if params.PickerPersistence != nil {
+			req["pickerPersistence"] = *params.PickerPersistence
+		}
 		if params.ReasoningEffort != nil {
 			req["reasoningEffort"] = *params.ReasoningEffort
 		}
 		if params.ReasoningSummary != nil {
 			req["reasoningSummary"] = *params.ReasoningSummary
 		}
+		if params.RepoScope != nil {
+			req["repoScope"] = *params.RepoScope
+		}
+		if params.RequireAvailable != nil {
+			req["requireAvailable"] = *params.RequireAvailable
+		}
+		if params.RunCompactionPreflight != nil {
+			req["runCompactionPreflight"] = *params.RunCompactionPreflight
+		}
+		if params.Source != nil {
+			req["source"] = *params.Source
+		}
 		if params.Verbosity != nil {
 			req["verbosity"] = *params.Verbosity
 		}
@@ -19795,6 +23782,9 @@ func (a *OptionsAPI) Update(ctx context.Context, params *SessionUpdateOptionsPar
 		if params.IncludedBuiltinAgents != nil {
 			req["includedBuiltinAgents"] = params.IncludedBuiltinAgents
 		}
+		if params.IncludedBuiltinSkills != nil {
+			req["includedBuiltinSkills"] = params.IncludedBuiltinSkills
+		}
 		if params.InstalledPlugins != nil {
 			req["installedPlugins"] = params.InstalledPlugins
 		}
@@ -19840,6 +23830,9 @@ func (a *OptionsAPI) Update(ctx context.Context, params *SessionUpdateOptionsPar
 		if params.SandboxConfig != nil {
 			req["sandboxConfig"] = *params.SandboxConfig
 		}
+		if params.SandboxConfigSource != nil {
+			req["sandboxConfigSource"] = *params.SandboxConfigSource
+		}
 		if params.SessionCapabilities != nil {
 			req["sessionCapabilities"] = params.SessionCapabilities
 		}
@@ -19936,18 +23929,18 @@ func (a *PermissionsAPI) Configure(ctx context.Context, params *PermissionsConfi
 	return &result, nil
 }
 
-// GetAllowAll returns the current allow-all permission mode for the session.
+// GetMode returns the current permission mode for the session.
 //
-// RPC method: session.permissions.getAllowAll.
+// RPC method: session.permissions.getMode.
 //
-// Returns: Current allow-all permission mode.
-func (a *PermissionsAPI) GetAllowAll(ctx context.Context) (*AllowAllPermissionState, error) {
+// Returns: Current permission mode.
+func (a *PermissionsAPI) GetMode(ctx context.Context) (*PermissionsGetModeResult, error) {
 	req := map[string]any{"sessionId": a.sessionID}
-	raw, err := a.client.Request(ctx, "session.permissions.getAllowAll", req)
+	raw, err := a.client.Request(ctx, "session.permissions.getMode", req)
 	if err != nil {
 		return nil, err
 	}
-	var result AllowAllPermissionState
+	var result PermissionsGetModeResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
@@ -19966,6 +23959,9 @@ func (a *PermissionsAPI) GetAllowAll(ctx context.Context) (*AllowAllPermissionSt
 func (a *PermissionsAPI) HandlePendingPermissionRequest(ctx context.Context, params *PermissionDecisionRequest) (*PermissionRequestResult, error) {
 	req := map[string]any{"sessionId": a.sessionID}
 	if params != nil {
+		if params.DecisionContext != nil {
+			req["decisionContext"] = *params.DecisionContext
+		}
 		req["requestId"] = params.RequestID
 		req["result"] = params.Result
 	}
@@ -20083,68 +24079,62 @@ func (a *PermissionsAPI) ResetSessionApprovals(ctx context.Context, params *Perm
 	return &result, nil
 }
 
-// SetAllowAll sets the allow-all permission mode for the session. Used by attach-mode
-// clients (e.g. LocalRpcSession's `/allow-all` forwarder) to flip the target session's
-// permission state. The `on` mode swaps in unrestricted path and URL managers and emits
-// `session.permissions_changed` on transition; the `auto` mode keeps normal prompt paths
-// active while attaching LLM safety recommendations. The result returns the authoritative
-// post-mutation state so callers can update their local mirrors without racing the
-// `session.permissions_changed` notification on the same wire.
+// SetApproveAll enables or disables automatic approval of tool permission requests for the
+// session.
 //
-// RPC method: session.permissions.setAllowAll.
+// RPC method: session.permissions.setApproveAll.
 //
-// Parameters: Allow-all mode to apply for the session.
+// Parameters: Allow-all toggle for tool permission requests, with an optional telemetry
+// source.
 //
-// Returns: Indicates whether the operation succeeded and reports the post-mutation state.
-func (a *PermissionsAPI) SetAllowAll(ctx context.Context, params *PermissionsSetAllowAllRequest) (*AllowAllPermissionSetResult, error) {
+// Returns: Indicates whether the operation succeeded.
+func (a *PermissionsAPI) SetApproveAll(ctx context.Context, params *PermissionsSetApproveAllRequest) (*PermissionsSetApproveAllResult, error) {
 	req := map[string]any{"sessionId": a.sessionID}
 	if params != nil {
-		if params.Enabled != nil {
-			req["enabled"] = *params.Enabled
-		}
-		if params.Mode != nil {
-			req["mode"] = *params.Mode
-		}
-		if params.Model != nil {
-			req["model"] = *params.Model
-		}
+		req["enabled"] = params.Enabled
 		if params.Source != nil {
 			req["source"] = *params.Source
 		}
 	}
-	raw, err := a.client.Request(ctx, "session.permissions.setAllowAll", req)
+	raw, err := a.client.Request(ctx, "session.permissions.setApproveAll", req)
 	if err != nil {
 		return nil, err
 	}
-	var result AllowAllPermissionSetResult
+	var result PermissionsSetApproveAllResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// SetApproveAll enables or disables automatic approval of tool permission requests for the
-// session.
+// SetMode sets the permission mode for the session. `manual` follows the normal approval
+// flow, `assisted` attaches LLM safety recommendations, and `allow-all` automatically
+// approves permission requests. The result returns the authoritative post-mutation mode so
+// callers can update local state without racing the `session.permissions_changed`
+// notification.
 //
-// RPC method: session.permissions.setApproveAll.
+// RPC method: session.permissions.setMode.
 //
-// Parameters: Allow-all toggle for tool permission requests, with an optional telemetry
-// source.
+// Parameters: Permission mode to apply for the session.
 //
-// Returns: Indicates whether the operation succeeded.
-func (a *PermissionsAPI) SetApproveAll(ctx context.Context, params *PermissionsSetApproveAllRequest) (*PermissionsSetApproveAllResult, error) {
+// Returns: Indicates whether the requested permission mode was applied and reports the
+// authoritative post-mutation mode.
+func (a *PermissionsAPI) SetMode(ctx context.Context, params *PermissionsSetModeRequest) (*PermissionsSetModeResult, error) {
 	req := map[string]any{"sessionId": a.sessionID}
 	if params != nil {
-		req["enabled"] = params.Enabled
+		if params.AssistedApprovalModel != nil {
+			req["assistedApprovalModel"] = *params.AssistedApprovalModel
+		}
+		req["mode"] = params.Mode
 		if params.Source != nil {
 			req["source"] = *params.Source
 		}
 	}
-	raw, err := a.client.Request(ctx, "session.permissions.setApproveAll", req)
+	raw, err := a.client.Request(ctx, "session.permissions.setMode", req)
 	if err != nil {
 		return nil, err
 	}
-	var result PermissionsSetApproveAllResult
+	var result PermissionsSetModeResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
@@ -20315,7 +24305,8 @@ func (s *PermissionsAPI) Locations() *PermissionsLocationsAPI {
 // removed.
 type PermissionsPathsAPI sessionAPI
 
-// Adds a directory to the session's allow-list.
+// Adds a directory to the session's allow-list and activates conventional skill and agent
+// definitions under it.
 //
 // RPC method: session.permissions.paths.add.
 //
@@ -21580,6 +25571,85 @@ func (a *TelemetryAPI) SetFeatureOverrides(ctx context.Context, params *Telemetr
 // Experimental: ToolsAPI contains experimental APIs that may change or be removed.
 type ToolsAPI sessionAPI
 
+// Executes one tool from the session's currently offered tool set through the native
+// invocation pipeline.
+//
+// RPC method: session.tools.execute.
+//
+// Parameters: A tool name and arguments to execute through the session's native invocation
+// pipeline.
+//
+// Returns: Canonical result returned by a session tool.
+func (a *ToolsAPI) Execute(ctx context.Context, params *ToolsExecuteRequest) (ToolResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["arguments"] = params.Arguments
+		req["name"] = params.Name
+		if params.ToolCallID != nil {
+			req["toolCallId"] = *params.ToolCallID
+		}
+	}
+	raw, err := a.client.Request(ctx, "session.tools.execute", req)
+	if err != nil {
+		return nil, err
+	}
+	result, err := unmarshalToolResult(raw)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// GetBuiltinDescriptors returns the Rust-owned built-in tool descriptors used to construct
+// the session's offered tool set.
+//
+// RPC method: session.tools.getBuiltinDescriptors.
+//
+// Parameters: Options controlling how Rust-owned built-in tool descriptors are materialized.
+//
+// Returns: Rust-owned built-in tool descriptors for the session.
+func (a *ToolsAPI) GetBuiltinDescriptors(ctx context.Context, params *ToolsGetBuiltinDescriptorsRequest) (*ToolsGetBuiltinDescriptorsResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		if params.BackgroundTaskNotificationsEnabled != nil {
+			req["backgroundTaskNotificationsEnabled"] = *params.BackgroundTaskNotificationsEnabled
+		}
+		if params.IncludeAuthor != nil {
+			req["includeAuthor"] = *params.IncludeAuthor
+		}
+		if params.NoViewLineNumbers != nil {
+			req["noViewLineNumbers"] = *params.NoViewLineNumbers
+		}
+		if params.ReduceUserIntervention != nil {
+			req["reduceUserIntervention"] = *params.ReduceUserIntervention
+		}
+		if params.ShellAsyncOnlyEnabled != nil {
+			req["shellAsyncOnlyEnabled"] = *params.ShellAsyncOnlyEnabled
+		}
+		if params.ShellConfig != nil {
+			req["shellConfig"] = *params.ShellConfig
+		}
+		if params.ShellSupportsPowerShell7Syntax != nil {
+			req["shellSupportsPowerShell7Syntax"] = *params.ShellSupportsPowerShell7Syntax
+		}
+		if params.ShellTimeoutMs != nil {
+			req["shellTimeoutMs"] = *params.ShellTimeoutMs
+		}
+		if params.SkillEmbeddingEnabled != nil {
+			req["skillEmbeddingEnabled"] = *params.SkillEmbeddingEnabled
+		}
+	}
+	raw, err := a.client.Request(ctx, "session.tools.getBuiltinDescriptors", req)
+	if err != nil {
+		return nil, err
+	}
+	var result ToolsGetBuiltinDescriptorsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // GetCurrentMetadata returns lightweight metadata for the session's currently initialized
 // tools.
 //
@@ -21618,33 +25688,86 @@ func (a *ToolsAPI) HandlePendingToolCall(ctx context.Context, params *HandlePend
 			req["result"] = params.Result
 		}
 	}
-	raw, err := a.client.Request(ctx, "session.tools.handlePendingToolCall", req)
+	raw, err := a.client.Request(ctx, "session.tools.handlePendingToolCall", req)
+	if err != nil {
+		return nil, err
+	}
+	var result HandlePendingToolCallResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// InitializeAndValidate resolves, builds, and validates the runtime tool list for the
+// session.
+//
+// RPC method: session.tools.initializeAndValidate.
+//
+// Returns: Resolve, build, and validate the runtime tool list for this session. Subagent
+// sessions and consumer flows that need an initialized tool set before `send` invoke this.
+// Default base-class implementation is a no-op for sessions that don't support tool
+// validation.
+func (a *ToolsAPI) InitializeAndValidate(ctx context.Context) (*ToolsInitializeAndValidateResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.tools.initializeAndValidate", req)
+	if err != nil {
+		return nil, err
+	}
+	var result ToolsInitializeAndValidateResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Set atomically replaces the complete externally implemented tool list supplied by the
+// calling connection. Built-in, MCP/plugin, extension-discovered, subagent, and tools
+// supplied by other connections remain unchanged.
+//
+// RPC method: session.tools.set.
+//
+// Parameters: Complete externally implemented tool list for the calling connection. An
+// empty list removes every tool previously supplied by that connection.
+//
+// Returns: Empty result after replacing the calling connection's externally implemented
+// tools.
+func (a *ToolsAPI) Set(ctx context.Context, params *ToolsSetRequest) (*ToolsSetResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["tools"] = params.Tools
+	}
+	raw, err := a.client.Request(ctx, "session.tools.set", req)
 	if err != nil {
 		return nil, err
 	}
-	var result HandlePendingToolCallResult
+	var result ToolsSetResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// InitializeAndValidate resolves, builds, and validates the runtime tool list for the
-// session.
+// TaskCompleteEventData projects a completed task_complete tool call into its label-safe
+// session event payload.
 //
-// RPC method: session.tools.initializeAndValidate.
+// RPC method: session.tools.taskCompleteEventData.
 //
-// Returns: Resolve, build, and validate the runtime tool list for this session. Subagent
-// sessions and consumer flows that need an initialized tool set before `send` invoke this.
-// Default base-class implementation is a no-op for sessions that don't support tool
-// validation.
-func (a *ToolsAPI) InitializeAndValidate(ctx context.Context) (*ToolsInitializeAndValidateResult, error) {
+// Parameters: Task-completion tool arguments and final result used to build a label-safe
+// session event payload.
+//
+// Returns: Task completion notification with summary from the agent
+func (a *ToolsAPI) TaskCompleteEventData(ctx context.Context, params *ToolsTaskCompleteEventDataRequest) (*TaskCompleteData, error) {
 	req := map[string]any{"sessionId": a.sessionID}
-	raw, err := a.client.Request(ctx, "session.tools.initializeAndValidate", req)
+	if params != nil {
+		req["finalResult"] = params.FinalResult
+		req["toolArgs"] = params.ToolArgs
+	}
+	raw, err := a.client.Request(ctx, "session.tools.taskCompleteEventData", req)
 	if err != nil {
 		return nil, err
 	}
-	var result ToolsInitializeAndValidateResult
+	var result TaskCompleteData
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
@@ -21693,7 +25816,16 @@ func (a *UIAPI) Elicitation(ctx context.Context, params *UIElicitationRequest) (
 	req := map[string]any{"sessionId": a.sessionID}
 	if params != nil {
 		req["message"] = params.Message
+		if params.Meta != nil {
+			req["_meta"] = params.Meta
+		}
+		if params.Mode != nil {
+			req["mode"] = *params.Mode
+		}
 		req["requestedSchema"] = params.RequestedSchema
+		if params.Task != nil {
+			req["task"] = *params.Task
+		}
 	}
 	raw, err := a.client.Request(ctx, "session.ui.elicitation", req)
 	if err != nil {
@@ -21713,7 +25845,8 @@ func (a *UIAPI) Elicitation(ctx context.Context, params *UIElicitationRequest) (
 //
 // Parameters: Transient question to answer without adding it to conversation history.
 //
-// Returns: Transient answer generated from current conversation context.
+// Returns: Completed transient query. Ordered chunks and the terminal outcome are also
+// delivered through `ui.ephemeral_query` session events while it runs.
 func (a *UIAPI) EphemeralQuery(ctx context.Context, params *UIEphemeralQueryRequest) (*UIEphemeralQueryResult, error) {
 	req := map[string]any{"sessionId": a.sessionID}
 	if params != nil {
@@ -22747,6 +26880,286 @@ type internalSessionAPI struct {
 	sessionID string
 }
 
+// Experimental: InternalCanvasAPI contains experimental APIs that may change or be removed.
+type InternalCanvasAPI internalSessionAPI
+
+// Experimental: InternalCanvasProviderAPI contains experimental APIs that may change or be
+// removed.
+type InternalCanvasProviderAPI internalSessionAPI
+
+// Registers an internal canvas provider connection and its contributions.
+//
+// RPC method: session.canvas.provider.register.
+//
+// Parameters: Internal canvas provider registration parameters.
+// Internal: Register is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalCanvasProviderAPI) Register(ctx context.Context, params *CanvasProviderRegisterRequest) (*SessionCanvasProviderRegisterResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["canvases"] = params.Canvases
+		req["connectionId"] = params.ConnectionID
+		req["info"] = params.Info
+	}
+	raw, err := a.client.Request(ctx, "session.canvas.provider.register", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionCanvasProviderRegisterResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Unregisters an internal canvas provider connection.
+//
+// RPC method: session.canvas.provider.unregister.
+//
+// Parameters: Internal canvas provider unregistration parameters.
+// Internal: Unregister is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalCanvasProviderAPI) Unregister(ctx context.Context, params *CanvasProviderUnregisterRequest) (*SessionCanvasProviderUnregisterResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["connectionId"] = params.ConnectionID
+	}
+	raw, err := a.client.Request(ctx, "session.canvas.provider.unregister", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionCanvasProviderUnregisterResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: Provider returns experimental APIs that may change or be removed.
+func (s *InternalCanvasAPI) Provider() *InternalCanvasProviderAPI {
+	return (*InternalCanvasProviderAPI)(s)
+}
+
+// Experimental: InternalCommandsAPI contains experimental APIs that may change or be
+// removed.
+type InternalCommandsAPI internalSessionAPI
+
+// FinalizeInvocationEffect finalizes persistence associated with a client-applied
+// slash-command effect.
+//
+// RPC method: session.commands.finalizeInvocationEffect.
+//
+// Parameters: The pending slash-command invocation effect to finalize, plus whether the
+// host applied or cancelled it.
+//
+// Returns: Whether finalizing the invocation effect succeeded, and the failure reason when
+// it did not.
+// Internal: FinalizeInvocationEffect is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalCommandsAPI) FinalizeInvocationEffect(ctx context.Context, params *CommandsFinalizeInvocationEffectRequest) (*CommandsFinalizeInvocationEffectResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["effect"] = params.Effect
+		req["outcome"] = params.Outcome
+	}
+	raw, err := a.client.Request(ctx, "session.commands.finalizeInvocationEffect", req)
+	if err != nil {
+		return nil, err
+	}
+	var result CommandsFinalizeInvocationEffectResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalGitHubAuthAPI contains experimental APIs that may change or be
+// removed.
+type InternalGitHubAuthAPI internalSessionAPI
+
+// GetAllAuthAvailable gets all authentication accounts available to the internal session
+// host.
+//
+// RPC method: session.gitHubAuth.getAllAuthAvailable.
+//
+// Returns: Authentication accounts available to the internal session host.
+// Internal: GetAllAuthAvailable is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalGitHubAuthAPI) GetAllAuthAvailable(ctx context.Context) (*SessionGitHubAuthGetAllAuthAvailableResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.gitHubAuth.getAllAuthAvailable", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionGitHubAuthGetAllAuthAvailableResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetCurrentAuthInfo gets the current authentication information for internal session hosts.
+//
+// RPC method: session.gitHubAuth.getCurrentAuthInfo.
+//
+// Returns: Current authentication information, or null when no authentication is active.
+// Internal: GetCurrentAuthInfo is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalGitHubAuthAPI) GetCurrentAuthInfo(ctx context.Context) (*AuthIdentity, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.gitHubAuth.getCurrentAuthInfo", req)
+	if err != nil {
+		return nil, err
+	}
+	var result AuthIdentity
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// LastAuthErrors gets validation errors from the most recent authentication attempt.
+//
+// RPC method: session.gitHubAuth.lastAuthErrors.
+//
+// Returns: Validation errors from the most recent authentication attempt.
+// Internal: LastAuthErrors is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalGitHubAuthAPI) LastAuthErrors(ctx context.Context) (*AuthValidationErrors, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.gitHubAuth.lastAuthErrors", req)
+	if err != nil {
+		return nil, err
+	}
+	var result AuthValidationErrors
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Login logs in a GitHub user through the internal session host.
+//
+// RPC method: session.gitHubAuth.login.
+//
+// Parameters: Internal GitHub login parameters.
+//
+// Returns: Authentication credentials accepted only at native protocol ingress. Runtime
+// outputs use credential-free `AuthIdentity` metadata.
+// Internal: Login is part of the SDK's internal handshake/plumbing; external callers should
+// not use it.
+func (a *InternalGitHubAuthAPI) Login(ctx context.Context, params *SessionAuthLoginRequest) (AuthInfo, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["host"] = params.Host
+		req["login"] = params.Login
+		if params.Persist != nil {
+			req["persist"] = *params.Persist
+		}
+		req["token"] = params.Token
+	}
+	raw, err := a.client.Request(ctx, "session.gitHubAuth.login", req)
+	if err != nil {
+		return nil, err
+	}
+	result, err := unmarshalAuthInfo(raw)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// Logout logs out the session's current GitHub authentication.
+//
+// RPC method: session.gitHubAuth.logout.
+//
+// Returns: Whether the current authentication was logged out.
+// Internal: Logout is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalGitHubAuthAPI) Logout(ctx context.Context) (*SessionGitHubAuthLogoutResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.gitHubAuth.logout", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionGitHubAuthLogoutResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// LogoutUser logs out a specific GitHub authentication.
+//
+// RPC method: session.gitHubAuth.logoutUser.
+//
+// Parameters: Parameters identifying a GitHub authentication to log out.
+//
+// Returns: Whether the requested authentication was logged out.
+// Internal: LogoutUser is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalGitHubAuthAPI) LogoutUser(ctx context.Context, params *SessionAuthLogoutUserRequest) (*SessionGitHubAuthLogoutUserResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["authInfo"] = params.AuthInfo
+	}
+	raw, err := a.client.Request(ctx, "session.gitHubAuth.logoutUser", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionGitHubAuthLogoutUserResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// RefreshCopilotUser refreshes Copilot account metadata for the current authentication.
+//
+// RPC method: session.gitHubAuth.refreshCopilotUser.
+//
+// Returns: Current authentication information, or null when no authentication is active.
+// Internal: RefreshCopilotUser is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalGitHubAuthAPI) RefreshCopilotUser(ctx context.Context) (*AuthIdentity, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.gitHubAuth.refreshCopilotUser", req)
+	if err != nil {
+		return nil, err
+	}
+	var result AuthIdentity
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// SwitchToAuth switches the session to another available authentication.
+//
+// RPC method: session.gitHubAuth.switchToAuth.
+//
+// Parameters: Parameters for switching the session's active authentication.
+// Internal: SwitchToAuth is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalGitHubAuthAPI) SwitchToAuth(ctx context.Context, params *SessionAuthSwitchRequest) (*SessionGitHubAuthSwitchToAuthResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["authInfo"] = params.AuthInfo
+		if params.Token != nil {
+			req["token"] = *params.Token
+		}
+	}
+	raw, err := a.client.Request(ctx, "session.gitHubAuth.switchToAuth", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionGitHubAuthSwitchToAuthResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Experimental: InternalMCPAPI contains experimental APIs that may change or be removed.
 type InternalMCPAPI internalSessionAPI
 
@@ -22755,7 +27168,7 @@ type InternalMCPAPI internalSessionAPI
 //
 // RPC method: session.mcp.configureGitHub.
 //
-// Parameters: Opaque auth info used to configure GitHub MCP.
+// Parameters: Credential-free authentication identity used to configure GitHub MCP.
 //
 // Returns: Result of configuring GitHub MCP.
 // Internal: ConfigureGitHub is part of the SDK's internal handshake/plumbing; external
@@ -22861,6 +27274,56 @@ func (a *InternalMCPAPI) UnregisterExternalClient(ctx context.Context, params *M
 	return &result, nil
 }
 
+// Experimental: InternalModelAPI contains experimental APIs that may change or be removed.
+type InternalModelAPI internalSessionAPI
+
+// ApplyStartupOverlay resolves and applies organization-managed and repository model
+// overlays.
+//
+// RPC method: session.model.applyStartupOverlay.
+//
+// Parameters: Managed, repository, and CLI model overrides to overlay onto the session at
+// startup.
+//
+// Returns: The model identifier active on the session after the switch.
+// Internal: ApplyStartupOverlay is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalModelAPI) ApplyStartupOverlay(ctx context.Context, params *ModelApplyStartupOverlayRequest) (*ModelSwitchToResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		if params.CLIModel != nil {
+			req["cliModel"] = *params.CLIModel
+		}
+		if params.DeferredResume != nil {
+			req["deferredResume"] = *params.DeferredResume
+		}
+		if params.DeviceManagedModel != nil {
+			req["deviceManagedModel"] = *params.DeviceManagedModel
+		}
+		if params.RepoContextTier != nil {
+			req["repoContextTier"] = *params.RepoContextTier
+		}
+		if params.RepoModel != nil {
+			req["repoModel"] = *params.RepoModel
+		}
+		if params.RepoReasoningEffort != nil {
+			req["repoReasoningEffort"] = *params.RepoReasoningEffort
+		}
+		if params.ServerManagedModel != nil {
+			req["serverManagedModel"] = *params.ServerManagedModel
+		}
+	}
+	raw, err := a.client.Request(ctx, "session.model.applyStartupOverlay", req)
+	if err != nil {
+		return nil, err
+	}
+	var result ModelSwitchToResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Experimental: InternalQueueAPI contains experimental APIs that may change or be removed.
 type InternalQueueAPI internalSessionAPI
 
@@ -23306,10 +27769,14 @@ type InternalSessionRPC struct {
 	// Reuse a single struct instead of allocating one for each service on the heap.
 	common internalSessionAPI
 
-	MCP      *InternalMCPAPI
-	Queue    *InternalQueueAPI
-	Schedule *InternalScheduleAPI
-	Settings *InternalSettingsAPI
+	Canvas     *InternalCanvasAPI
+	Commands   *InternalCommandsAPI
+	GitHubAuth *InternalGitHubAuthAPI
+	MCP        *InternalMCPAPI
+	Model      *InternalModelAPI
+	Queue      *InternalQueueAPI
+	Schedule   *InternalScheduleAPI
+	Settings   *InternalSettingsAPI
 }
 
 // SendSystemNotification queues or sends an internal system notification to the session
@@ -23347,7 +27814,11 @@ func (a *InternalSessionRPC) SendSystemNotification(ctx context.Context, params
 func NewInternalSessionRPC(client *jsonrpc2.Client, sessionID string) *InternalSessionRPC {
 	r := &InternalSessionRPC{}
 	r.common = internalSessionAPI{client: client, sessionID: sessionID}
+	r.Canvas = (*InternalCanvasAPI)(&r.common)
+	r.Commands = (*InternalCommandsAPI)(&r.common)
+	r.GitHubAuth = (*InternalGitHubAuthAPI)(&r.common)
 	r.MCP = (*InternalMCPAPI)(&r.common)
+	r.Model = (*InternalModelAPI)(&r.common)
 	r.Queue = (*InternalQueueAPI)(&r.common)
 	r.Schedule = (*InternalScheduleAPI)(&r.common)
 	r.Settings = (*InternalSettingsAPI)(&r.common)
@@ -23936,6 +28407,23 @@ func RegisterClientSessionAPIHandlers(client *jsonrpc2.Client, getHandlers func(
 	})
 }
 
+// Experimental: ExtensionLaunchProviderHandler contains experimental APIs that may change
+// or be removed.
+type ExtensionLaunchProviderHandler interface {
+	// Resolve asks the registered SDK client to resolve an opaque process launch profile for
+	// one discovered extension entrypoint immediately before launch or reload. The provider
+	// must respond within 15 seconds.
+	//
+	// RPC method: extensionLaunchProvider.resolve.
+	//
+	// Parameters: A discovered extension entrypoint that the registered integrator may classify
+	// and resolve to an opaque launch profile.
+	//
+	// Returns: The launch profile for a supported entrypoint. Omit launch when the provider
+	// does not support the entrypoint.
+	Resolve(request *ExtensionLaunchProviderResolveRequest) (*ExtensionLaunchProviderResolveResult, error)
+}
+
 // Experimental: GitHubTelemetryHandler contains experimental APIs that may change or be
 // removed.
 type GitHubTelemetryHandler interface {
@@ -23952,6 +28440,21 @@ type GitHubTelemetryHandler interface {
 	Event(request *GitHubTelemetryNotification) error
 }
 
+// Experimental: GitHubTokenHandler contains experimental APIs that may change or be removed.
+type GitHubTokenHandler interface {
+	// GetToken asks the SDK client to mint a GitHub access token for a session whose
+	// configuration supplied a GitHub token provider. The runtime acquires the initial token
+	// during bootstrap and refreshes it during expiry preflight when one hour or less remains.
+	//
+	// RPC method: gitHubToken.getToken.
+	//
+	// Parameters: Asks the SDK client to acquire a GitHub access token from an opaque callback
+	// registration.
+	//
+	// Returns: SDK host response to a GitHub credential request.
+	GetToken(request *GitHubTokenAcquireRequest) (GitHubTokenAcquireResult, error)
+}
+
 // Experimental: HooksHandler contains experimental APIs that may change or be removed.
 type HooksHandler interface {
 	// Invoke dispatches one SDK callback hook from the runtime to the connection that
@@ -24002,9 +28505,11 @@ type LlmInferenceHandler interface {
 // Unlike client-session handlers these carry no implicit session id dispatch
 // key; a single set of handlers serves the entire connection.
 type ClientGlobalAPIHandlers struct {
-	GitHubTelemetry GitHubTelemetryHandler
-	Hooks           HooksHandler
-	LlmInference    LlmInferenceHandler
+	ExtensionLaunchProvider ExtensionLaunchProviderHandler
+	GitHubTelemetry         GitHubTelemetryHandler
+	GitHubToken             GitHubTokenHandler
+	Hooks                   HooksHandler
+	LlmInference            LlmInferenceHandler
 }
 
 func clientGlobalHandlerError(err error) *jsonrpc2.Error {
@@ -24021,6 +28526,24 @@ func clientGlobalHandlerError(err error) *jsonrpc2.Error {
 // RegisterClientGlobalAPIHandlers registers handlers for server-to-client client-global API
 // calls.
 func RegisterClientGlobalAPIHandlers(client *jsonrpc2.Client, handlers *ClientGlobalAPIHandlers) {
+	client.SetRequestHandler("extensionLaunchProvider.resolve", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		var request ExtensionLaunchProviderResolveRequest
+		if err := json.Unmarshal(params, &request); err != nil {
+			return nil, &jsonrpc2.Error{Code: -32602, Message: fmt.Sprintf("Invalid params: %v", err)}
+		}
+		if handlers == nil || handlers.ExtensionLaunchProvider == nil {
+			return nil, &jsonrpc2.Error{Code: -32603, Message: "No extensionLaunchProvider client-global handler registered"}
+		}
+		result, err := handlers.ExtensionLaunchProvider.Resolve(&request)
+		if err != nil {
+			return nil, clientGlobalHandlerError(err)
+		}
+		raw, err := json.Marshal(result)
+		if err != nil {
+			return nil, &jsonrpc2.Error{Code: -32603, Message: fmt.Sprintf("Failed to marshal response: %v", err)}
+		}
+		return raw, nil
+	})
 	client.SetRequestHandler("gitHubTelemetry.event", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
 		var request GitHubTelemetryNotification
 		if err := json.Unmarshal(params, &request); err != nil {
@@ -24034,6 +28557,24 @@ func RegisterClientGlobalAPIHandlers(client *jsonrpc2.Client, handlers *ClientGl
 		}
 		return nil, nil
 	})
+	client.SetRequestHandler("gitHubToken.getToken", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		var request GitHubTokenAcquireRequest
+		if err := json.Unmarshal(params, &request); err != nil {
+			return nil, &jsonrpc2.Error{Code: -32602, Message: fmt.Sprintf("Invalid params: %v", err)}
+		}
+		if handlers == nil || handlers.GitHubToken == nil {
+			return nil, &jsonrpc2.Error{Code: -32603, Message: "No gitHubToken client-global handler registered"}
+		}
+		result, err := handlers.GitHubToken.GetToken(&request)
+		if err != nil {
+			return nil, clientGlobalHandlerError(err)
+		}
+		raw, err := json.Marshal(result)
+		if err != nil {
+			return nil, &jsonrpc2.Error{Code: -32603, Message: fmt.Sprintf("Failed to marshal response: %v", err)}
+		}
+		return raw, nil
+	})
 	client.SetRequestHandler("hooks.invoke", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
 		var request HookInvokeRequest
 		if err := json.Unmarshal(params, &request); err != nil {
diff --git a/go/rpc/zrpc_encoding.go b/go/rpc/zrpc_encoding.go
index fdc76729b5..78788660f5 100644
--- a/go/rpc/zrpc_encoding.go
+++ b/go/rpc/zrpc_encoding.go
@@ -57,6 +57,12 @@ func unmarshalAuthInfo(data []byte) (AuthInfo, error) {
 			return nil, err
 		}
 		return &d, nil
+	case AuthInfoTypeTokenProvider:
+		var d TokenProviderAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case AuthInfoTypeUser:
 		var d UserAuthInfo
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -145,6 +151,17 @@ func (r TokenAuthInfo) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func (r TokenProviderAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias TokenProviderAuthInfo
+	return json.Marshal(struct {
+		Type AuthInfoType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
 func (r UserAuthInfo) MarshalJSON() ([]byte, error) {
 	type alias UserAuthInfo
 	return json.Marshal(struct {
@@ -158,8 +175,9 @@ func (r UserAuthInfo) MarshalJSON() ([]byte, error) {
 
 func (r *AccountAllUsers) UnmarshalJSON(data []byte) error {
 	type rawAccountAllUsers struct {
-		AuthInfo json.RawMessage `json:"authInfo"`
-		Token    *string         `json:"token,omitempty"`
+		AuthInfo    json.RawMessage `json:"authInfo"`
+		SelectionID *string         `json:"selectionId,omitempty"`
+		Token       *string         `json:"token,omitempty"`
 	}
 	var raw rawAccountAllUsers
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -172,6 +190,7 @@ func (r *AccountAllUsers) UnmarshalJSON(data []byte) error {
 		}
 		r.AuthInfo = value
 	}
+	r.SelectionID = raw.SelectionID
 	r.Token = raw.Token
 	return nil
 }
@@ -198,7 +217,8 @@ func (r *AccountGetCurrentAuthResult) UnmarshalJSON(data []byte) error {
 
 func (r *AccountLogoutRequest) UnmarshalJSON(data []byte) error {
 	type rawAccountLogoutRequest struct {
-		AuthInfo json.RawMessage `json:"authInfo"`
+		AuthInfo    json.RawMessage `json:"authInfo,omitempty"`
+		SelectionID *string         `json:"selectionId,omitempty"`
 	}
 	var raw rawAccountLogoutRequest
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -211,6 +231,7 @@ func (r *AccountLogoutRequest) UnmarshalJSON(data []byte) error {
 		}
 		r.AuthInfo = value
 	}
+	r.SelectionID = raw.SelectionID
 	return nil
 }
 
@@ -595,86 +616,108 @@ func (r AttachmentSelection) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func unmarshalQueuedCommandResult(data []byte) (QueuedCommandResult, error) {
+func unmarshalBuiltinToolSafeForTelemetry(data []byte) (BuiltinToolSafeForTelemetry, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	{
+		var value bool
+		if err := json.Unmarshal(data, &value); err == nil {
+			return BuiltinToolSafeForTelemetryBoolean(value), nil
+		}
+	}
+	{
+		var value BuiltinToolSafeTelemetryFields
+		if err := json.Unmarshal(data, &value); err == nil {
+			return &value, nil
+		}
+	}
+	return nil, errors.New("data did not match any union variant for BuiltinToolSafeForTelemetry")
+}
+
+func (r *BuiltinToolDescriptor) UnmarshalJSON(data []byte) error {
+	type rawBuiltinToolDescriptor struct {
+		Description           string                  `json:"description"`
+		Format                *BuiltinToolFormat      `json:"format"`
+		HasSummariseIntention bool                    `json:"hasSummariseIntention"`
+		InputSchema           *BuiltinToolInputSchema `json:"inputSchema"`
+		Instructions          *string                 `json:"instructions"`
+		IsTerminal            bool                    `json:"isTerminal"`
+		Name                  string                  `json:"name"`
+		SafeForTelemetry      json.RawMessage         `json:"safeForTelemetry"`
+		Title                 *string                 `json:"title"`
+		Type                  *string                 `json:"type"`
+	}
+	var raw rawBuiltinToolDescriptor
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.Description = raw.Description
+	r.Format = raw.Format
+	r.HasSummariseIntention = raw.HasSummariseIntention
+	r.InputSchema = raw.InputSchema
+	r.Instructions = raw.Instructions
+	r.IsTerminal = raw.IsTerminal
+	r.Name = raw.Name
+	if raw.SafeForTelemetry != nil {
+		value, err := unmarshalBuiltinToolSafeForTelemetry(raw.SafeForTelemetry)
+		if err != nil {
+			return err
+		}
+		r.SafeForTelemetry = value
+	}
+	r.Title = raw.Title
+	r.Type = raw.Type
+	return nil
+}
+
+func unmarshalCatalogCandidate(data []byte) (CatalogCandidate, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
 	type rawUnion struct {
-		Handled *bool `json:"handled"`
+		Kind CatalogCandidateKind `json:"kind"`
 	}
 	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return nil, err
 	}
-	if raw.Handled == nil {
-		return nil, errors.New("data did not match any union variant for QueuedCommandResult")
-	}
 
-	switch *raw.Handled {
-	case false:
-		var d QueuedCommandNotHandled
+	switch raw.Kind {
+	case CatalogCandidateKindAiSkill:
+		var d CatalogAiSkillCandidate
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case true:
-		var d QueuedCommandHandled
+	case CatalogCandidateKindMCPServer:
+		var d CatalogMCPServerCandidate
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
+	default:
+		return &RawCatalogCandidateData{Discriminator: raw.Kind, Raw: data}, nil
 	}
-	return nil, errors.New("data did not match any union variant for QueuedCommandResult")
-}
-
-func (r QueuedCommandHandled) MarshalJSON() ([]byte, error) {
-	type alias QueuedCommandHandled
-	return json.Marshal(struct {
-		Handled bool `json:"handled"`
-		alias
-	}{
-		Handled: r.Handled(),
-		alias:   alias(r),
-	})
 }
 
-func (r QueuedCommandNotHandled) MarshalJSON() ([]byte, error) {
-	type alias QueuedCommandNotHandled
+func (r RawCatalogCandidateData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
 	return json.Marshal(struct {
-		Handled bool `json:"handled"`
-		alias
+		Kind CatalogCandidateKind `json:"kind"`
 	}{
-		Handled: r.Handled(),
-		alias:   alias(r),
+		Kind: r.Discriminator,
 	})
 }
 
-func (r *CommandsRespondToQueuedCommandRequest) UnmarshalJSON(data []byte) error {
-	type rawCommandsRespondToQueuedCommandRequest struct {
-		RequestID string          `json:"requestId"`
-		Result    json.RawMessage `json:"result"`
-	}
-	var raw rawCommandsRespondToQueuedCommandRequest
-	if err := json.Unmarshal(data, &raw); err != nil {
-		return err
-	}
-	r.RequestID = raw.RequestID
-	if raw.Result != nil {
-		value, err := unmarshalQueuedCommandResult(raw.Result)
-		if err != nil {
-			return err
-		}
-		r.Result = value
-	}
-	return nil
-}
-
-func unmarshalDebugCollectLogsDestination(data []byte) (DebugCollectLogsDestination, error) {
+func unmarshalCatalogCandidateSource(data []byte) (CatalogCandidateSource, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
 	type rawUnion struct {
-		Kind DebugCollectLogsDestinationKind `json:"kind"`
+		Kind CatalogCandidateSourceKind `json:"kind"`
 	}
 	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -682,38 +725,38 @@ func unmarshalDebugCollectLogsDestination(data []byte) (DebugCollectLogsDestinat
 	}
 
 	switch raw.Kind {
-	case DebugCollectLogsDestinationKindArchive:
-		var d DebugCollectLogsDestinationArchive
+	case CatalogCandidateSourceKindEmbedded:
+		var d CatalogCandidateSourceEmbedded
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case DebugCollectLogsDestinationKindDirectory:
-		var d DebugCollectLogsDestinationDirectory
+	case CatalogCandidateSourceKindURL:
+		var d CatalogCandidateSourceURL
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	default:
-		return &RawDebugCollectLogsDestinationData{Discriminator: raw.Kind, Raw: data}, nil
+		return &RawCatalogCandidateSourceData{Discriminator: raw.Kind, Raw: data}, nil
 	}
 }
 
-func (r RawDebugCollectLogsDestinationData) MarshalJSON() ([]byte, error) {
+func (r RawCatalogCandidateSourceData) MarshalJSON() ([]byte, error) {
 	if r.Raw != nil {
 		return r.Raw, nil
 	}
 	return json.Marshal(struct {
-		Kind DebugCollectLogsDestinationKind `json:"kind"`
+		Kind CatalogCandidateSourceKind `json:"kind"`
 	}{
 		Kind: r.Discriminator,
 	})
 }
 
-func (r DebugCollectLogsDestinationArchive) MarshalJSON() ([]byte, error) {
-	type alias DebugCollectLogsDestinationArchive
+func (r CatalogCandidateSourceEmbedded) MarshalJSON() ([]byte, error) {
+	type alias CatalogCandidateSourceEmbedded
 	return json.Marshal(struct {
-		Kind DebugCollectLogsDestinationKind `json:"kind"`
+		Kind CatalogCandidateSourceKind `json:"kind"`
 		alias
 	}{
 		Kind:  r.Kind(),
@@ -721,10 +764,10 @@ func (r DebugCollectLogsDestinationArchive) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (r DebugCollectLogsDestinationDirectory) MarshalJSON() ([]byte, error) {
-	type alias DebugCollectLogsDestinationDirectory
+func (r CatalogCandidateSourceURL) MarshalJSON() ([]byte, error) {
+	type alias CatalogCandidateSourceURL
 	return json.Marshal(struct {
-		Kind DebugCollectLogsDestinationKind `json:"kind"`
+		Kind CatalogCandidateSourceKind `json:"kind"`
 		alias
 	}{
 		Kind:  r.Kind(),
@@ -732,668 +775,1345 @@ func (r DebugCollectLogsDestinationDirectory) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (r *DebugCollectLogsRequest) UnmarshalJSON(data []byte) error {
-	type rawDebugCollectLogsRequest struct {
-		AdditionalEntries []DebugCollectLogsEntry  `json:"additionalEntries,omitzero"`
-		Destination       json.RawMessage          `json:"destination"`
-		Include           *DebugCollectLogsInclude `json:"include,omitempty"`
+func (r *CatalogAiSkillCandidate) UnmarshalJSON(data []byte) error {
+	type rawCatalogAiSkillCandidate struct {
+		Description     *string                               `json:"description,omitempty"`
+		DisplayName     string                                `json:"displayName"`
+		Handle          string                                `json:"handle"`
+		HandleExpiresAt string                                `json:"handleExpiresAt"`
+		Installability  CatalogAiSkillCandidateInstallability `json:"installability"`
+		MediaType       CatalogAiSkillCandidateMediaType      `json:"mediaType"`
+		Provenance      CatalogAiSkillCandidateProvenance     `json:"provenance"`
+		Publisher       *string                               `json:"publisher,omitempty"`
+		Source          json.RawMessage                       `json:"source"`
 	}
-	var raw rawDebugCollectLogsRequest
+	var raw rawCatalogAiSkillCandidate
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	r.AdditionalEntries = raw.AdditionalEntries
-	if raw.Destination != nil {
-		value, err := unmarshalDebugCollectLogsDestination(raw.Destination)
+	r.Description = raw.Description
+	r.DisplayName = raw.DisplayName
+	r.Handle = raw.Handle
+	r.HandleExpiresAt = raw.HandleExpiresAt
+	r.Installability = raw.Installability
+	r.MediaType = raw.MediaType
+	r.Provenance = raw.Provenance
+	r.Publisher = raw.Publisher
+	if raw.Source != nil {
+		value, err := unmarshalCatalogCandidateSource(raw.Source)
 		if err != nil {
 			return err
 		}
-		r.Destination = value
+		r.Source = value
 	}
-	r.Include = raw.Include
 	return nil
 }
 
-func (r EventLogTypes) MarshalJSON() ([]byte, error) {
-	if r.String != nil {
-		return json.Marshal(r.String)
-	}
-	if r.StringArray != nil {
-		return json.Marshal(r.StringArray)
-	}
-	return []byte("null"), nil
+func (r CatalogAiSkillCandidate) MarshalJSON() ([]byte, error) {
+	type alias CatalogAiSkillCandidate
+	return json.Marshal(struct {
+		Kind CatalogCandidateKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
 }
 
-func (r *EventLogTypes) UnmarshalJSON(data []byte) error {
-	if string(data) == "null" {
-		*r = EventLogTypes{}
-		return nil
+func (r *CatalogMCPServerCandidate) UnmarshalJSON(data []byte) error {
+	type rawCatalogMCPServerCandidate struct {
+		Description     *string                             `json:"description,omitempty"`
+		DisplayName     string                              `json:"displayName"`
+		Handle          string                              `json:"handle"`
+		HandleExpiresAt string                              `json:"handleExpiresAt"`
+		Installability  CatalogMCPServerInstallability      `json:"installability"`
+		MediaType       MCPServerCardMediaType              `json:"mediaType"`
+		Provenance      CatalogMCPServerCandidateProvenance `json:"provenance"`
+		Publisher       *string                             `json:"publisher,omitempty"`
+		Source          json.RawMessage                     `json:"source"`
 	}
-	{
-		var value EventLogTypesString
-		if err := json.Unmarshal(data, &value); err == nil {
-			*r = EventLogTypes{String: &value}
-			return nil
-		}
+	var raw rawCatalogMCPServerCandidate
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
 	}
-	{
-		var value []string
-		if err := json.Unmarshal(data, &value); err == nil {
-			*r = EventLogTypes{StringArray: value}
-			return nil
+	r.Description = raw.Description
+	r.DisplayName = raw.DisplayName
+	r.Handle = raw.Handle
+	r.HandleExpiresAt = raw.HandleExpiresAt
+	r.Installability = raw.Installability
+	r.MediaType = raw.MediaType
+	r.Provenance = raw.Provenance
+	r.Publisher = raw.Publisher
+	if raw.Source != nil {
+		value, err := unmarshalCatalogCandidateSource(raw.Source)
+		if err != nil {
+			return err
 		}
+		r.Source = value
 	}
-	return errors.New("data did not match any union variant for EventLogTypes")
+	return nil
 }
 
-func unmarshalExternalToolTextResultForLlmContent(data []byte) (ExternalToolTextResultForLlmContent, error) {
+func (r CatalogMCPServerCandidate) MarshalJSON() ([]byte, error) {
+	type alias CatalogMCPServerCandidate
+	return json.Marshal(struct {
+		Kind CatalogCandidateKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func unmarshalCatalogSearchResult(data []byte) (CatalogSearchResult, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
 	type rawUnion struct {
-		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		Kind CatalogSearchResultKind `json:"kind"`
 	}
 	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return nil, err
 	}
 
-	switch raw.Type {
-	case ExternalToolTextResultForLlmContentTypeAudio:
-		var d ExternalToolTextResultForLlmContentAudio
+	switch raw.Kind {
+	case CatalogSearchResultKindAuthenticationRequired:
+		var d CatalogAuthenticationRequiredError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case ExternalToolTextResultForLlmContentTypeImage:
-		var d ExternalToolTextResultForLlmContentImage
+	case CatalogSearchResultKindContractViolation:
+		var d CatalogContractViolationError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case ExternalToolTextResultForLlmContentTypeResource:
-		var d ExternalToolTextResultForLlmContentResource
+	case CatalogSearchResultKindInvalidRequest:
+		var d CatalogInvalidRequestError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case ExternalToolTextResultForLlmContentTypeResourceLink:
-		var d ExternalToolTextResultForLlmContentResourceLink
+	case CatalogSearchResultKindMalformedCard:
+		var d CatalogMalformedCardError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case ExternalToolTextResultForLlmContentTypeShellExit:
-		var d ExternalToolTextResultForLlmContentShellExit
+	case CatalogSearchResultKindNegotiationRefused:
+		var d CatalogNegotiationRefusedError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case ExternalToolTextResultForLlmContentTypeTerminal:
-		var d ExternalToolTextResultForLlmContentTerminal
+	case CatalogSearchResultKindNetworkFailure:
+		var d CatalogNetworkFailureError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case ExternalToolTextResultForLlmContentTypeText:
-		var d ExternalToolTextResultForLlmContentText
+	case CatalogSearchResultKindPolicyRejected:
+		var d CatalogPolicyRejectedError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case CatalogSearchResultKindSucceeded:
+		var d CatalogSearchSucceeded
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case CatalogSearchResultKindUnavailable:
+		var d CatalogUnavailableError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case CatalogSearchResultKindUnsafeRetrieval:
+		var d CatalogUnsafeRetrievalError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case CatalogSearchResultKindUnsupportedKind:
+		var d CatalogUnsupportedKindError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	default:
-		return &RawExternalToolTextResultForLlmContentData{Discriminator: raw.Type, Raw: data}, nil
+		return &RawCatalogSearchResultData{Discriminator: raw.Kind, Raw: data}, nil
 	}
 }
 
-func (r RawExternalToolTextResultForLlmContentData) MarshalJSON() ([]byte, error) {
+func (r RawCatalogSearchResultData) MarshalJSON() ([]byte, error) {
 	if r.Raw != nil {
 		return r.Raw, nil
 	}
 	return json.Marshal(struct {
-		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		Kind CatalogSearchResultKind `json:"kind"`
 	}{
-		Type: r.Discriminator,
+		Kind: r.Discriminator,
 	})
 }
 
-func (r ExternalToolTextResultForLlmContentAudio) MarshalJSON() ([]byte, error) {
-	type alias ExternalToolTextResultForLlmContentAudio
+func (r CatalogAuthenticationRequiredError) MarshalJSON() ([]byte, error) {
+	type alias CatalogAuthenticationRequiredError
 	return json.Marshal(struct {
-		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		Kind CatalogSearchResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r ExternalToolTextResultForLlmContentImage) MarshalJSON() ([]byte, error) {
-	type alias ExternalToolTextResultForLlmContentImage
+func (r CatalogContractViolationError) MarshalJSON() ([]byte, error) {
+	type alias CatalogContractViolationError
 	return json.Marshal(struct {
-		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		Kind CatalogSearchResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func matchesEmbeddedBlobResourceContents(data []byte) bool {
-	var rawGroup0 struct {
-		Blob json.RawMessage `json:"blob"`
-		Text json.RawMessage `json:"text"`
-	}
-	if err := json.Unmarshal(data, &rawGroup0); err != nil {
-		return false
-	}
-	if rawGroup0.Blob == nil {
-		return false
-	}
-	return rawGroup0.Text == nil
+func (r CatalogInvalidRequestError) MarshalJSON() ([]byte, error) {
+	type alias CatalogInvalidRequestError
+	return json.Marshal(struct {
+		Kind CatalogSearchResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
 }
 
-func matchesEmbeddedTextResourceContents(data []byte) bool {
-	var rawGroup0 struct {
-		Blob json.RawMessage `json:"blob"`
-		Text json.RawMessage `json:"text"`
-	}
-	if err := json.Unmarshal(data, &rawGroup0); err != nil {
-		return false
-	}
-	if rawGroup0.Text == nil {
-		return false
-	}
-	return rawGroup0.Blob == nil
+func (r CatalogMalformedCardError) MarshalJSON() ([]byte, error) {
+	type alias CatalogMalformedCardError
+	return json.Marshal(struct {
+		Kind CatalogSearchResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
 }
 
-func unmarshalExternalToolTextResultForLlmContentResourceDetails(data []byte) (ExternalToolTextResultForLlmContentResourceDetails, error) {
-	if string(data) == "null" {
-		return nil, nil
-	}
-	if matchesEmbeddedBlobResourceContents(data) {
-		var d EmbeddedBlobResourceContents
-		if err := json.Unmarshal(data, &d); err != nil {
-			return nil, err
-		}
-		return &d, nil
-	}
-	if matchesEmbeddedTextResourceContents(data) {
-		var d EmbeddedTextResourceContents
-		if err := json.Unmarshal(data, &d); err != nil {
-			return nil, err
-		}
-		return &d, nil
-	}
-	return &RawExternalToolTextResultForLlmContentResourceDetailsData{Raw: data}, nil
+func (r CatalogNegotiationRefusedError) MarshalJSON() ([]byte, error) {
+	type alias CatalogNegotiationRefusedError
+	return json.Marshal(struct {
+		Kind CatalogSearchResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
 }
 
-func (r RawExternalToolTextResultForLlmContentResourceDetailsData) MarshalJSON() ([]byte, error) {
-	if r.Raw != nil {
-		return r.Raw, nil
-	}
-	return []byte("null"), nil
+func (r CatalogNetworkFailureError) MarshalJSON() ([]byte, error) {
+	type alias CatalogNetworkFailureError
+	return json.Marshal(struct {
+		Kind CatalogSearchResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
 }
 
-func (r *ExternalToolTextResultForLlmContentResource) UnmarshalJSON(data []byte) error {
-	type rawExternalToolTextResultForLlmContentResource struct {
-		Resource json.RawMessage `json:"resource"`
+func (r CatalogPolicyRejectedError) MarshalJSON() ([]byte, error) {
+	type alias CatalogPolicyRejectedError
+	return json.Marshal(struct {
+		Kind CatalogSearchResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r *CatalogSearchSucceeded) UnmarshalJSON(data []byte) error {
+	type rawCatalogSearchSucceeded struct {
+		Candidates []json.RawMessage         `json:"candidates"`
+		Negotiated CatalogNegotiatedContract `json:"negotiated"`
+		SearchID   string                    `json:"searchId"`
+		Truncated  bool                      `json:"truncated"`
 	}
-	var raw rawExternalToolTextResultForLlmContentResource
+	var raw rawCatalogSearchSucceeded
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	if raw.Resource != nil {
-		value, err := unmarshalExternalToolTextResultForLlmContentResourceDetails(raw.Resource)
-		if err != nil {
-			return err
+	if raw.Candidates != nil {
+		r.Candidates = make([]CatalogCandidate, 0, len(raw.Candidates))
+		for _, rawItem := range raw.Candidates {
+			value, err := unmarshalCatalogCandidate(rawItem)
+			if err != nil {
+				return err
+			}
+			r.Candidates = append(r.Candidates, value)
 		}
-		r.Resource = value
 	}
+	r.Negotiated = raw.Negotiated
+	r.SearchID = raw.SearchID
+	r.Truncated = raw.Truncated
 	return nil
 }
 
-func (r ExternalToolTextResultForLlmContentResource) MarshalJSON() ([]byte, error) {
-	type alias ExternalToolTextResultForLlmContentResource
+func (r CatalogSearchSucceeded) MarshalJSON() ([]byte, error) {
+	type alias CatalogSearchSucceeded
 	return json.Marshal(struct {
-		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		Kind CatalogSearchResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r ExternalToolTextResultForLlmContentResourceLink) MarshalJSON() ([]byte, error) {
-	type alias ExternalToolTextResultForLlmContentResourceLink
+func (r CatalogUnavailableError) MarshalJSON() ([]byte, error) {
+	type alias CatalogUnavailableError
 	return json.Marshal(struct {
-		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		Kind CatalogSearchResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r ExternalToolTextResultForLlmContentShellExit) MarshalJSON() ([]byte, error) {
-	type alias ExternalToolTextResultForLlmContentShellExit
+func (r CatalogUnsafeRetrievalError) MarshalJSON() ([]byte, error) {
+	type alias CatalogUnsafeRetrievalError
 	return json.Marshal(struct {
-		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		Kind CatalogSearchResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r ExternalToolTextResultForLlmContentTerminal) MarshalJSON() ([]byte, error) {
-	type alias ExternalToolTextResultForLlmContentTerminal
+func (r CatalogUnsupportedKindError) MarshalJSON() ([]byte, error) {
+	type alias CatalogUnsupportedKindError
 	return json.Marshal(struct {
-		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		Kind CatalogSearchResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r ExternalToolTextResultForLlmContentText) MarshalJSON() ([]byte, error) {
-	type alias ExternalToolTextResultForLlmContentText
+func unmarshalQueuedCommandResult(data []byte) (QueuedCommandResult, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	type rawUnion struct {
+		Handled *bool `json:"handled"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+	if raw.Handled == nil {
+		return nil, errors.New("data did not match any union variant for QueuedCommandResult")
+	}
+
+	switch *raw.Handled {
+	case false:
+		var d QueuedCommandNotHandled
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case true:
+		var d QueuedCommandHandled
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	}
+	return nil, errors.New("data did not match any union variant for QueuedCommandResult")
+}
+
+func (r QueuedCommandHandled) MarshalJSON() ([]byte, error) {
+	type alias QueuedCommandHandled
 	return json.Marshal(struct {
-		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		Handled bool `json:"handled"`
 		alias
 	}{
-		Type:  r.Type(),
-		alias: alias(r),
+		Handled: r.Handled(),
+		alias:   alias(r),
 	})
 }
 
-func (r *ExternalToolTextResultForLlm) UnmarshalJSON(data []byte) error {
-	type rawExternalToolTextResultForLlm struct {
-		BinaryResultsForLlm []ExternalToolTextResultForLlmBinaryResultsForLlm `json:"binaryResultsForLlm,omitzero"`
-		Contents            []json.RawMessage                                 `json:"contents,omitzero"`
-		Error               *string                                           `json:"error,omitempty"`
-		ResultType          *string                                           `json:"resultType,omitempty"`
-		SessionLog          *string                                           `json:"sessionLog,omitempty"`
-		TextResultForLlm    string                                            `json:"textResultForLlm"`
-		ToolReferences      []string                                          `json:"toolReferences,omitzero"`
-		ToolTelemetry       map[string]any                                    `json:"toolTelemetry,omitzero"`
+func (r QueuedCommandNotHandled) MarshalJSON() ([]byte, error) {
+	type alias QueuedCommandNotHandled
+	return json.Marshal(struct {
+		Handled bool `json:"handled"`
+		alias
+	}{
+		Handled: r.Handled(),
+		alias:   alias(r),
+	})
+}
+
+func (r *CommandsRespondToQueuedCommandRequest) UnmarshalJSON(data []byte) error {
+	type rawCommandsRespondToQueuedCommandRequest struct {
+		RequestID string          `json:"requestId"`
+		Result    json.RawMessage `json:"result"`
 	}
-	var raw rawExternalToolTextResultForLlm
+	var raw rawCommandsRespondToQueuedCommandRequest
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	r.BinaryResultsForLlm = raw.BinaryResultsForLlm
-	if raw.Contents != nil {
-		r.Contents = make([]ExternalToolTextResultForLlmContent, 0, len(raw.Contents))
-		for _, rawItem := range raw.Contents {
-			value, err := unmarshalExternalToolTextResultForLlmContent(rawItem)
-			if err != nil {
-				return err
-			}
-			r.Contents = append(r.Contents, value)
+	r.RequestID = raw.RequestID
+	if raw.Result != nil {
+		value, err := unmarshalQueuedCommandResult(raw.Result)
+		if err != nil {
+			return err
 		}
+		r.Result = value
 	}
-	r.Error = raw.Error
-	r.ResultType = raw.ResultType
-	r.SessionLog = raw.SessionLog
-	r.TextResultForLlm = raw.TextResultForLlm
-	r.ToolReferences = raw.ToolReferences
-	r.ToolTelemetry = raw.ToolTelemetry
 	return nil
 }
 
-func unmarshalExternalToolResult(data []byte) (ExternalToolResult, error) {
-	if string(data) == "null" {
-		return nil, nil
-	}
-	{
-		var value string
-		if err := json.Unmarshal(data, &value); err == nil {
-			return ExternalToolStringResult(value), nil
-		}
-	}
-	{
-		var value ExternalToolTextResultForLlm
-		if err := json.Unmarshal(data, &value); err == nil {
-			return &value, nil
-		}
-	}
-	return nil, errors.New("data did not match any union variant for ExternalToolResult")
-}
-
-func unmarshalFactoryRunFailure(data []byte) (FactoryRunFailure, error) {
+func unmarshalDebugCollectLogsDestination(data []byte) (DebugCollectLogsDestination, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
 	type rawUnion struct {
-		Type FactoryRunFailureType `json:"type"`
+		Kind DebugCollectLogsDestinationKind `json:"kind"`
 	}
 	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return nil, err
 	}
 
-	switch raw.Type {
-	case FactoryRunFailureTypeFactoryDurableFailure:
-		var d FactoryRunFailureFactoryDurableFailure
-		if err := json.Unmarshal(data, &d); err != nil {
-			return nil, err
-		}
-		return &d, nil
-	case FactoryRunFailureTypeFactoryLimitReached:
-		var d FactoryRunFailureFactoryLimitReached
+	switch raw.Kind {
+	case DebugCollectLogsDestinationKindArchive:
+		var d DebugCollectLogsDestinationArchive
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case FactoryRunFailureTypeFactoryResumeDeclined:
-		var d FactoryRunFailureFactoryResumeDeclined
+	case DebugCollectLogsDestinationKindDirectory:
+		var d DebugCollectLogsDestinationDirectory
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	default:
-		return &RawFactoryRunFailureData{Discriminator: raw.Type, Raw: data}, nil
+		return &RawDebugCollectLogsDestinationData{Discriminator: raw.Kind, Raw: data}, nil
 	}
 }
 
-func (r RawFactoryRunFailureData) MarshalJSON() ([]byte, error) {
+func (r RawDebugCollectLogsDestinationData) MarshalJSON() ([]byte, error) {
 	if r.Raw != nil {
 		return r.Raw, nil
 	}
 	return json.Marshal(struct {
-		Type FactoryRunFailureType `json:"type"`
-	}{
-		Type: r.Discriminator,
-	})
-}
-
-func (r FactoryRunFailureFactoryDurableFailure) MarshalJSON() ([]byte, error) {
-	type alias FactoryRunFailureFactoryDurableFailure
-	return json.Marshal(struct {
-		Type FactoryRunFailureType `json:"type"`
-		alias
+		Kind DebugCollectLogsDestinationKind `json:"kind"`
 	}{
-		Type:  r.Type(),
-		alias: alias(r),
+		Kind: r.Discriminator,
 	})
 }
 
-func (r FactoryRunFailureFactoryLimitReached) MarshalJSON() ([]byte, error) {
-	type alias FactoryRunFailureFactoryLimitReached
+func (r DebugCollectLogsDestinationArchive) MarshalJSON() ([]byte, error) {
+	type alias DebugCollectLogsDestinationArchive
 	return json.Marshal(struct {
-		Type FactoryRunFailureType `json:"type"`
+		Kind DebugCollectLogsDestinationKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r FactoryRunFailureFactoryResumeDeclined) MarshalJSON() ([]byte, error) {
-	type alias FactoryRunFailureFactoryResumeDeclined
+func (r DebugCollectLogsDestinationDirectory) MarshalJSON() ([]byte, error) {
+	type alias DebugCollectLogsDestinationDirectory
 	return json.Marshal(struct {
-		Type FactoryRunFailureType `json:"type"`
+		Kind DebugCollectLogsDestinationKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r *FactoryRunTerminal) UnmarshalJSON(data []byte) error {
-	type rawFactoryRunTerminal struct {
-		Error         *string         `json:"error,omitempty"`
-		Failure       json.RawMessage `json:"failure,omitempty"`
-		Reason        *string         `json:"reason,omitempty"`
-		ResultPreview *string         `json:"resultPreview,omitempty"`
+func (r *DebugCollectLogsRequest) UnmarshalJSON(data []byte) error {
+	type rawDebugCollectLogsRequest struct {
+		AdditionalEntries []DebugCollectLogsEntry  `json:"additionalEntries,omitzero"`
+		Destination       json.RawMessage          `json:"destination"`
+		Include           *DebugCollectLogsInclude `json:"include,omitempty"`
 	}
-	var raw rawFactoryRunTerminal
+	var raw rawDebugCollectLogsRequest
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	r.Error = raw.Error
-	if raw.Failure != nil {
-		value, err := unmarshalFactoryRunFailure(raw.Failure)
+	r.AdditionalEntries = raw.AdditionalEntries
+	if raw.Destination != nil {
+		value, err := unmarshalDebugCollectLogsDestination(raw.Destination)
 		if err != nil {
 			return err
 		}
-		r.Failure = value
+		r.Destination = value
 	}
-	r.Reason = raw.Reason
-	r.ResultPreview = raw.ResultPreview
+	r.Include = raw.Include
 	return nil
 }
 
-func (r *FactoryRunResult) UnmarshalJSON(data []byte) error {
-	type rawFactoryRunResult struct {
-		Error    *string          `json:"error,omitempty"`
-		Failure  json.RawMessage  `json:"failure,omitempty"`
-		Reason   *string          `json:"reason,omitempty"`
-		Result   any              `json:"result,omitempty"`
-		RunID    string           `json:"runId"`
-		Snapshot any              `json:"snapshot,omitempty"`
-		Status   FactoryRunStatus `json:"status"`
-	}
-	var raw rawFactoryRunResult
-	if err := json.Unmarshal(data, &raw); err != nil {
-		return err
+func (r EventLogTypes) MarshalJSON() ([]byte, error) {
+	if r.String != nil {
+		return json.Marshal(r.String)
 	}
-	r.Error = raw.Error
-	if raw.Failure != nil {
-		value, err := unmarshalFactoryRunFailure(raw.Failure)
-		if err != nil {
-			return err
-		}
-		r.Failure = value
+	if r.StringArray != nil {
+		return json.Marshal(r.StringArray)
 	}
-	r.Reason = raw.Reason
-	r.Result = raw.Result
-	r.RunID = raw.RunID
-	r.Snapshot = raw.Snapshot
-	r.Status = raw.Status
-	return nil
+	return []byte("null"), nil
 }
 
-func unmarshalFilterMapping(data []byte) (FilterMapping, error) {
+func (r *EventLogTypes) UnmarshalJSON(data []byte) error {
 	if string(data) == "null" {
-		return nil, nil
+		*r = EventLogTypes{}
+		return nil
 	}
 	{
-		var value FilterMappingEnumMap
+		var value EventLogTypesString
 		if err := json.Unmarshal(data, &value); err == nil {
-			return value, nil
+			*r = EventLogTypes{String: &value}
+			return nil
 		}
 	}
 	{
-		var value ContentFilterMode
+		var value []string
 		if err := json.Unmarshal(data, &value); err == nil {
-			return value, nil
+			*r = EventLogTypes{StringArray: value}
+			return nil
 		}
 	}
-	return nil, errors.New("data did not match any union variant for FilterMapping")
+	return errors.New("data did not match any union variant for EventLogTypes")
 }
 
-func (r *HandlePendingToolCallRequest) UnmarshalJSON(data []byte) error {
-	type rawHandlePendingToolCallRequest struct {
-		Error     *string         `json:"error,omitempty"`
-		RequestID string          `json:"requestId"`
-		Result    json.RawMessage `json:"result,omitempty"`
+func unmarshalExternalToolTextResultForLlmContent(data []byte) (ExternalToolTextResultForLlmContent, error) {
+	if string(data) == "null" {
+		return nil, nil
 	}
-	var raw rawHandlePendingToolCallRequest
+	type rawUnion struct {
+		Type ExternalToolTextResultForLlmContentType `json:"type"`
+	}
+	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
-		return err
+		return nil, err
 	}
-	r.Error = raw.Error
-	r.RequestID = raw.RequestID
-	if raw.Result != nil {
-		value, err := unmarshalExternalToolResult(raw.Result)
-		if err != nil {
-			return err
+
+	switch raw.Type {
+	case ExternalToolTextResultForLlmContentTypeAudio:
+		var d ExternalToolTextResultForLlmContentAudio
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
 		}
-		r.Result = value
+		return &d, nil
+	case ExternalToolTextResultForLlmContentTypeImage:
+		var d ExternalToolTextResultForLlmContentImage
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case ExternalToolTextResultForLlmContentTypeResource:
+		var d ExternalToolTextResultForLlmContentResource
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case ExternalToolTextResultForLlmContentTypeResourceLink:
+		var d ExternalToolTextResultForLlmContentResourceLink
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case ExternalToolTextResultForLlmContentTypeShellExit:
+		var d ExternalToolTextResultForLlmContentShellExit
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case ExternalToolTextResultForLlmContentTypeTerminal:
+		var d ExternalToolTextResultForLlmContentTerminal
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case ExternalToolTextResultForLlmContentTypeText:
+		var d ExternalToolTextResultForLlmContentText
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawExternalToolTextResultForLlmContentData{Discriminator: raw.Type, Raw: data}, nil
 	}
-	return nil
 }
 
-func (r InstalledPluginSource) MarshalJSON() ([]byte, error) {
-	if r.InstalledPluginSourceGitHub != nil {
-		return json.Marshal(r.InstalledPluginSourceGitHub)
-	}
-	if r.InstalledPluginSourceLocal != nil {
-		return json.Marshal(r.InstalledPluginSourceLocal)
-	}
-	if r.InstalledPluginSourceURL != nil {
-		return json.Marshal(r.InstalledPluginSourceURL)
-	}
-	if r.String != nil {
-		return json.Marshal(r.String)
+func (r RawExternalToolTextResultForLlmContentData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
 	}
-	return []byte("null"), nil
+	return json.Marshal(struct {
+		Type ExternalToolTextResultForLlmContentType `json:"type"`
+	}{
+		Type: r.Discriminator,
+	})
 }
 
-func (r *InstalledPluginSource) UnmarshalJSON(data []byte) error {
-	if string(data) == "null" {
-		*r = InstalledPluginSource{}
-		return nil
-	}
-	{
-		var value InstalledPluginSourceGitHub
-		if err := json.Unmarshal(data, &value); err == nil {
-			*r = InstalledPluginSource{InstalledPluginSourceGitHub: &value}
-			return nil
-		}
-	}
-	{
-		var value InstalledPluginSourceLocal
-		if err := json.Unmarshal(data, &value); err == nil {
-			*r = InstalledPluginSource{InstalledPluginSourceLocal: &value}
-			return nil
-		}
-	}
-	{
-		var value InstalledPluginSourceURL
-		if err := json.Unmarshal(data, &value); err == nil {
-			*r = InstalledPluginSource{InstalledPluginSourceURL: &value}
-			return nil
-		}
-	}
-	{
-		var value string
-		if err := json.Unmarshal(data, &value); err == nil {
-			*r = InstalledPluginSource{String: &value}
-			return nil
-		}
-	}
-	return errors.New("data did not match any union variant for InstalledPluginSource")
+func (r ExternalToolTextResultForLlmContentAudio) MarshalJSON() ([]byte, error) {
+	type alias ExternalToolTextResultForLlmContentAudio
+	return json.Marshal(struct {
+		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
 }
 
-func matchesMCPServerConfigHTTP(data []byte) bool {
+func (r ExternalToolTextResultForLlmContentImage) MarshalJSON() ([]byte, error) {
+	type alias ExternalToolTextResultForLlmContentImage
+	return json.Marshal(struct {
+		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func matchesExternalToolTextResultForLlmContentResourceDetailsEmbeddedBlobResourceContents(data []byte) bool {
 	var rawGroup0 struct {
-		Command json.RawMessage `json:"command"`
-		URL     json.RawMessage `json:"url"`
+		Blob json.RawMessage `json:"blob"`
+		Text json.RawMessage `json:"text"`
 	}
 	if err := json.Unmarshal(data, &rawGroup0); err != nil {
 		return false
 	}
-	if rawGroup0.URL == nil {
+	if rawGroup0.Blob == nil {
 		return false
 	}
-	return rawGroup0.Command == nil
+	return rawGroup0.Text == nil
 }
 
-func matchesMCPServerConfigStdio(data []byte) bool {
+func matchesExternalToolTextResultForLlmContentResourceDetailsEmbeddedTextResourceContents(data []byte) bool {
 	var rawGroup0 struct {
-		Command json.RawMessage `json:"command"`
-		URL     json.RawMessage `json:"url"`
+		Blob json.RawMessage `json:"blob"`
+		Text json.RawMessage `json:"text"`
 	}
 	if err := json.Unmarshal(data, &rawGroup0); err != nil {
 		return false
 	}
-	if rawGroup0.Command == nil {
+	if rawGroup0.Text == nil {
 		return false
 	}
-	return rawGroup0.URL == nil
+	return rawGroup0.Blob == nil
 }
 
-func unmarshalMCPServerConfig(data []byte) (MCPServerConfig, error) {
+func unmarshalExternalToolTextResultForLlmContentResourceDetails(data []byte) (ExternalToolTextResultForLlmContentResourceDetails, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
-	if matchesMCPServerConfigHTTP(data) {
-		var d MCPServerConfigHTTP
+	if matchesExternalToolTextResultForLlmContentResourceDetailsEmbeddedBlobResourceContents(data) {
+		var d EmbeddedBlobResourceContents
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	}
-	if matchesMCPServerConfigStdio(data) {
-		var d MCPServerConfigStdio
+	if matchesExternalToolTextResultForLlmContentResourceDetailsEmbeddedTextResourceContents(data) {
+		var d EmbeddedTextResourceContents
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	}
-	return &RawMCPServerConfigData{Raw: data}, nil
+	return &RawExternalToolTextResultForLlmContentResourceDetailsData{Raw: data}, nil
 }
 
-func (r RawMCPServerConfigData) MarshalJSON() ([]byte, error) {
+func (r RawExternalToolTextResultForLlmContentResourceDetailsData) MarshalJSON() ([]byte, error) {
 	if r.Raw != nil {
 		return r.Raw, nil
 	}
 	return []byte("null"), nil
 }
 
-func unmarshalMCPServerAuthConfig(data []byte) (MCPServerAuthConfig, error) {
-	if string(data) == "null" {
-		return nil, nil
-	}
-	{
-		var value bool
-		if err := json.Unmarshal(data, &value); err == nil {
-			return MCPServerAuthConfigBoolean(value), nil
-		}
-	}
-	{
-		var value MCPServerAuthConfigRedirectPort
-		if err := json.Unmarshal(data, &value); err == nil {
-			return &value, nil
-		}
-	}
-	return nil, errors.New("data did not match any union variant for MCPServerAuthConfig")
-}
-
-func (r *MCPServerConfigHTTP) UnmarshalJSON(data []byte) error {
-	type rawMCPServerConfigHTTP struct {
-		Auth              json.RawMessage                    `json:"auth,omitempty"`
-		DeferTools        *MCPServerConfigDeferTools         `json:"deferTools,omitempty"`
-		DisableToolCache  *bool                              `json:"disableToolCache,omitempty"`
-		FilterMapping     json.RawMessage                    `json:"filterMapping,omitempty"`
-		Headers           map[string]string                  `json:"headers,omitzero"`
-		IsDefaultServer   *bool                              `json:"isDefaultServer,omitempty"`
-		OauthClientID     *string                            `json:"oauthClientId,omitempty"`
-		OauthGrantType    *MCPServerConfigHTTPOauthGrantType `json:"oauthGrantType,omitempty"`
-		OauthPublicClient *bool                              `json:"oauthPublicClient,omitempty"`
-		Oidc              json.RawMessage                    `json:"oidc,omitempty"`
-		Timeout           *int64                             `json:"timeout,omitempty"`
-		Tools             []string                           `json:"tools,omitzero"`
-		Type              *MCPServerConfigHTTPType           `json:"type,omitempty"`
-		URL               string                             `json:"url"`
+func (r *ExternalToolTextResultForLlmContentResource) UnmarshalJSON(data []byte) error {
+	type rawExternalToolTextResultForLlmContentResource struct {
+		Resource json.RawMessage `json:"resource"`
 	}
-	var raw rawMCPServerConfigHTTP
+	var raw rawExternalToolTextResultForLlmContentResource
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	if raw.Auth != nil {
-		value, err := unmarshalMCPServerAuthConfig(raw.Auth)
+	if raw.Resource != nil {
+		value, err := unmarshalExternalToolTextResultForLlmContentResourceDetails(raw.Resource)
 		if err != nil {
 			return err
 		}
-		r.Auth = value
+		r.Resource = value
 	}
-	r.DeferTools = raw.DeferTools
-	r.DisableToolCache = raw.DisableToolCache
+	return nil
+}
+
+func (r ExternalToolTextResultForLlmContentResource) MarshalJSON() ([]byte, error) {
+	type alias ExternalToolTextResultForLlmContentResource
+	return json.Marshal(struct {
+		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r ExternalToolTextResultForLlmContentResourceLink) MarshalJSON() ([]byte, error) {
+	type alias ExternalToolTextResultForLlmContentResourceLink
+	return json.Marshal(struct {
+		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r ExternalToolTextResultForLlmContentShellExit) MarshalJSON() ([]byte, error) {
+	type alias ExternalToolTextResultForLlmContentShellExit
+	return json.Marshal(struct {
+		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r ExternalToolTextResultForLlmContentTerminal) MarshalJSON() ([]byte, error) {
+	type alias ExternalToolTextResultForLlmContentTerminal
+	return json.Marshal(struct {
+		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r ExternalToolTextResultForLlmContentText) MarshalJSON() ([]byte, error) {
+	type alias ExternalToolTextResultForLlmContentText
+	return json.Marshal(struct {
+		Type ExternalToolTextResultForLlmContentType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r *ExternalToolTextResultForLlm) UnmarshalJSON(data []byte) error {
+	type rawExternalToolTextResultForLlm struct {
+		BinaryResultsForLlm []ExternalToolTextResultForLlmBinaryResultsForLlm `json:"binaryResultsForLlm,omitzero"`
+		Contents            []json.RawMessage                                 `json:"contents,omitzero"`
+		Error               *string                                           `json:"error,omitempty"`
+		ResultType          *string                                           `json:"resultType,omitempty"`
+		SessionLog          *string                                           `json:"sessionLog,omitempty"`
+		TextResultForLlm    string                                            `json:"textResultForLlm"`
+		ToolReferences      []string                                          `json:"toolReferences,omitzero"`
+		ToolTelemetry       map[string]any                                    `json:"toolTelemetry,omitzero"`
+	}
+	var raw rawExternalToolTextResultForLlm
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.BinaryResultsForLlm = raw.BinaryResultsForLlm
+	if raw.Contents != nil {
+		r.Contents = make([]ExternalToolTextResultForLlmContent, 0, len(raw.Contents))
+		for _, rawItem := range raw.Contents {
+			value, err := unmarshalExternalToolTextResultForLlmContent(rawItem)
+			if err != nil {
+				return err
+			}
+			r.Contents = append(r.Contents, value)
+		}
+	}
+	r.Error = raw.Error
+	r.ResultType = raw.ResultType
+	r.SessionLog = raw.SessionLog
+	r.TextResultForLlm = raw.TextResultForLlm
+	r.ToolReferences = raw.ToolReferences
+	r.ToolTelemetry = raw.ToolTelemetry
+	return nil
+}
+
+func unmarshalExternalToolResult(data []byte) (ExternalToolResult, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	{
+		var value string
+		if err := json.Unmarshal(data, &value); err == nil {
+			return ExternalToolStringResult(value), nil
+		}
+	}
+	{
+		var value ExternalToolTextResultForLlm
+		if err := json.Unmarshal(data, &value); err == nil {
+			return &value, nil
+		}
+	}
+	return nil, errors.New("data did not match any union variant for ExternalToolResult")
+}
+
+func unmarshalFactoryRunFailure(data []byte) (FactoryRunFailure, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	type rawUnion struct {
+		Type FactoryRunFailureType `json:"type"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+
+	switch raw.Type {
+	case FactoryRunFailureTypeFactoryAccountingIncomplete:
+		var d FactoryRunFailureFactoryAccountingIncomplete
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case FactoryRunFailureTypeFactoryDurableFailure:
+		var d FactoryRunFailureFactoryDurableFailure
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case FactoryRunFailureTypeFactoryLimitReached:
+		var d FactoryRunFailureFactoryLimitReached
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case FactoryRunFailureTypeFactoryResumeDeclined:
+		var d FactoryRunFailureFactoryResumeDeclined
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawFactoryRunFailureData{Discriminator: raw.Type, Raw: data}, nil
+	}
+}
+
+func (r RawFactoryRunFailureData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return json.Marshal(struct {
+		Type FactoryRunFailureType `json:"type"`
+	}{
+		Type: r.Discriminator,
+	})
+}
+
+func (r FactoryRunFailureFactoryAccountingIncomplete) MarshalJSON() ([]byte, error) {
+	type alias FactoryRunFailureFactoryAccountingIncomplete
+	return json.Marshal(struct {
+		Type FactoryRunFailureType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r FactoryRunFailureFactoryDurableFailure) MarshalJSON() ([]byte, error) {
+	type alias FactoryRunFailureFactoryDurableFailure
+	return json.Marshal(struct {
+		Type FactoryRunFailureType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r FactoryRunFailureFactoryLimitReached) MarshalJSON() ([]byte, error) {
+	type alias FactoryRunFailureFactoryLimitReached
+	return json.Marshal(struct {
+		Type FactoryRunFailureType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r FactoryRunFailureFactoryResumeDeclined) MarshalJSON() ([]byte, error) {
+	type alias FactoryRunFailureFactoryResumeDeclined
+	return json.Marshal(struct {
+		Type FactoryRunFailureType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r *FactoryRunTerminal) UnmarshalJSON(data []byte) error {
+	type rawFactoryRunTerminal struct {
+		Error         *string         `json:"error,omitempty"`
+		Failure       json.RawMessage `json:"failure,omitempty"`
+		Reason        *string         `json:"reason,omitempty"`
+		ResultPreview *string         `json:"resultPreview,omitempty"`
+	}
+	var raw rawFactoryRunTerminal
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.Error = raw.Error
+	if raw.Failure != nil {
+		value, err := unmarshalFactoryRunFailure(raw.Failure)
+		if err != nil {
+			return err
+		}
+		r.Failure = value
+	}
+	r.Reason = raw.Reason
+	r.ResultPreview = raw.ResultPreview
+	return nil
+}
+
+func (r *FactoryRunResult) UnmarshalJSON(data []byte) error {
+	type rawFactoryRunResult struct {
+		Error    *string          `json:"error,omitempty"`
+		Failure  json.RawMessage  `json:"failure,omitempty"`
+		Reason   *string          `json:"reason,omitempty"`
+		Result   any              `json:"result,omitempty"`
+		RunID    string           `json:"runId"`
+		Snapshot any              `json:"snapshot,omitempty"`
+		Status   FactoryRunStatus `json:"status"`
+	}
+	var raw rawFactoryRunResult
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.Error = raw.Error
+	if raw.Failure != nil {
+		value, err := unmarshalFactoryRunFailure(raw.Failure)
+		if err != nil {
+			return err
+		}
+		r.Failure = value
+	}
+	r.Reason = raw.Reason
+	r.Result = raw.Result
+	r.RunID = raw.RunID
+	r.Snapshot = raw.Snapshot
+	r.Status = raw.Status
+	return nil
+}
+
+func unmarshalFilterMapping(data []byte) (FilterMapping, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	{
+		var value FilterMappingEnumMap
+		if err := json.Unmarshal(data, &value); err == nil {
+			return value, nil
+		}
+	}
+	{
+		var value ContentFilterMode
+		if err := json.Unmarshal(data, &value); err == nil {
+			return value, nil
+		}
+	}
+	return nil, errors.New("data did not match any union variant for FilterMapping")
+}
+
+func unmarshalGitHubTokenAcquireResult(data []byte) (GitHubTokenAcquireResult, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	type rawUnion struct {
+		Kind GitHubTokenAcquireResultKind `json:"kind"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+
+	switch raw.Kind {
+	case GitHubTokenAcquireResultKindCancelled:
+		var d GitHubTokenAcquireResultCancelled
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case GitHubTokenAcquireResultKindToken:
+		var d GitHubTokenAcquireResultToken
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawGitHubTokenAcquireResultData{Discriminator: raw.Kind, Raw: data}, nil
+	}
+}
+
+func (r RawGitHubTokenAcquireResultData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return json.Marshal(struct {
+		Kind GitHubTokenAcquireResultKind `json:"kind"`
+	}{
+		Kind: r.Discriminator,
+	})
+}
+
+func (r GitHubTokenAcquireResultCancelled) MarshalJSON() ([]byte, error) {
+	type alias GitHubTokenAcquireResultCancelled
+	return json.Marshal(struct {
+		Kind GitHubTokenAcquireResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r GitHubTokenAcquireResultToken) MarshalJSON() ([]byte, error) {
+	type alias GitHubTokenAcquireResultToken
+	return json.Marshal(struct {
+		Kind GitHubTokenAcquireResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r *HandlePendingToolCallRequest) UnmarshalJSON(data []byte) error {
+	type rawHandlePendingToolCallRequest struct {
+		Error     *string         `json:"error,omitempty"`
+		RequestID string          `json:"requestId"`
+		Result    json.RawMessage `json:"result,omitempty"`
+	}
+	var raw rawHandlePendingToolCallRequest
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.Error = raw.Error
+	r.RequestID = raw.RequestID
+	if raw.Result != nil {
+		value, err := unmarshalExternalToolResult(raw.Result)
+		if err != nil {
+			return err
+		}
+		r.Result = value
+	}
+	return nil
+}
+
+func (r InstalledPluginSource) MarshalJSON() ([]byte, error) {
+	if r.InstalledPluginSourceGitHub != nil {
+		return json.Marshal(r.InstalledPluginSourceGitHub)
+	}
+	if r.InstalledPluginSourceLocal != nil {
+		return json.Marshal(r.InstalledPluginSourceLocal)
+	}
+	if r.InstalledPluginSourceURL != nil {
+		return json.Marshal(r.InstalledPluginSourceURL)
+	}
+	if r.String != nil {
+		return json.Marshal(r.String)
+	}
+	return []byte("null"), nil
+}
+
+func (r *InstalledPluginSource) UnmarshalJSON(data []byte) error {
+	if string(data) == "null" {
+		*r = InstalledPluginSource{}
+		return nil
+	}
+	{
+		var value InstalledPluginSourceGitHub
+		if err := json.Unmarshal(data, &value); err == nil {
+			*r = InstalledPluginSource{InstalledPluginSourceGitHub: &value}
+			return nil
+		}
+	}
+	{
+		var value InstalledPluginSourceLocal
+		if err := json.Unmarshal(data, &value); err == nil {
+			*r = InstalledPluginSource{InstalledPluginSourceLocal: &value}
+			return nil
+		}
+	}
+	{
+		var value InstalledPluginSourceURL
+		if err := json.Unmarshal(data, &value); err == nil {
+			*r = InstalledPluginSource{InstalledPluginSourceURL: &value}
+			return nil
+		}
+	}
+	{
+		var value string
+		if err := json.Unmarshal(data, &value); err == nil {
+			*r = InstalledPluginSource{String: &value}
+			return nil
+		}
+	}
+	return errors.New("data did not match any union variant for InstalledPluginSource")
+}
+
+func matchesMCPSerializableServerConfigMCPServerConfigHTTP(data []byte) bool {
+	var rawGroup0 struct {
+		Command json.RawMessage `json:"command"`
+		URL     json.RawMessage `json:"url"`
+	}
+	if err := json.Unmarshal(data, &rawGroup0); err != nil {
+		return false
+	}
+	if rawGroup0.URL == nil {
+		return false
+	}
+	return rawGroup0.Command == nil
+}
+
+func matchesMCPSerializableServerConfigMCPServerConfigStdio(data []byte) bool {
+	var rawGroup0 struct {
+		Command json.RawMessage `json:"command"`
+		URL     json.RawMessage `json:"url"`
+	}
+	if err := json.Unmarshal(data, &rawGroup0); err != nil {
+		return false
+	}
+	if rawGroup0.Command == nil {
+		return false
+	}
+	return rawGroup0.URL == nil
+}
+
+func unmarshalMCPSerializableServerConfig(data []byte) (MCPSerializableServerConfig, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	if matchesMCPSerializableServerConfigMCPServerConfigHTTP(data) {
+		var d MCPServerConfigHTTP
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	}
+	if matchesMCPSerializableServerConfigMCPServerConfigStdio(data) {
+		var d MCPServerConfigStdio
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	}
+	return &RawMCPSerializableServerConfigData{Raw: data}, nil
+}
+
+func (r RawMCPSerializableServerConfigData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return []byte("null"), nil
+}
+
+func unmarshalMCPServerAuthConfig(data []byte) (MCPServerAuthConfig, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	{
+		var value bool
+		if err := json.Unmarshal(data, &value); err == nil {
+			return MCPServerAuthConfigBoolean(value), nil
+		}
+	}
+	{
+		var value MCPServerAuthConfigRedirectPort
+		if err := json.Unmarshal(data, &value); err == nil {
+			return &value, nil
+		}
+	}
+	return nil, errors.New("data did not match any union variant for MCPServerAuthConfig")
+}
+
+func unmarshalMCPSafeForTelemetry(data []byte) (MCPSafeForTelemetry, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	{
+		var value bool
+		if err := json.Unmarshal(data, &value); err == nil {
+			return MCPSafeForTelemetryBoolean(value), nil
+		}
+	}
+	{
+		var value MCPSafeForTelemetryFields
+		if err := json.Unmarshal(data, &value); err == nil {
+			return &value, nil
+		}
+	}
+	return nil, errors.New("data did not match any union variant for MCPSafeForTelemetry")
+}
+
+func (r *MCPServerConfigHTTP) UnmarshalJSON(data []byte) error {
+	type rawMCPServerConfigHTTP struct {
+		Auth                 json.RawMessage                    `json:"auth,omitempty"`
+		ConfigWarnings       []string                           `json:"configWarnings,omitzero"`
+		DeferTools           *MCPServerConfigDeferTools         `json:"deferTools,omitempty"`
+		DisableSecretMasking *bool                              `json:"disableSecretMasking,omitempty"`
+		DisableToolCache     *bool                              `json:"disableToolCache,omitempty"`
+		DisplayName          *string                            `json:"displayName,omitempty"`
+		Events               []string                           `json:"events,omitzero"`
+		ExcludeTools         []string                           `json:"excludeTools,omitzero"`
+		FilterMapping        json.RawMessage                    `json:"filterMapping,omitempty"`
+		Headers              map[string]string                  `json:"headers,omitzero"`
+		HeadersRefreshTtlMs  *int64                             `json:"headersRefreshTtlMs,omitempty"`
+		IsDefaultServer      *bool                              `json:"isDefaultServer,omitempty"`
+		Notifications        []string                           `json:"notifications,omitzero"`
+		OauthClientID        *string                            `json:"oauthClientId,omitempty"`
+		OauthGrantType       *MCPServerConfigHTTPOauthGrantType `json:"oauthGrantType,omitempty"`
+		OauthPublicClient    *bool                              `json:"oauthPublicClient,omitempty"`
+		Oidc                 json.RawMessage                    `json:"oidc,omitempty"`
+		SafeForTelemetry     json.RawMessage                    `json:"safeForTelemetry,omitempty"`
+		Source               *MCPServerSource                   `json:"source,omitempty"`
+		SourcePath           *string                            `json:"sourcePath,omitempty"`
+		SourcePlugin         *string                            `json:"sourcePlugin,omitempty"`
+		SourcePluginSpec     *bool                              `json:"sourcePluginSpec,omitempty"`
+		SourcePluginVersion  *string                            `json:"sourcePluginVersion,omitempty"`
+		Timeout              *int64                             `json:"timeout,omitempty"`
+		Tools                []string                           `json:"tools,omitzero"`
+		Type                 *MCPServerConfigHTTPType           `json:"type,omitempty"`
+		URL                  string                             `json:"url"`
+	}
+	var raw rawMCPServerConfigHTTP
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	if raw.Auth != nil {
+		value, err := unmarshalMCPServerAuthConfig(raw.Auth)
+		if err != nil {
+			return err
+		}
+		r.Auth = value
+	}
+	r.ConfigWarnings = raw.ConfigWarnings
+	r.DeferTools = raw.DeferTools
+	r.DisableSecretMasking = raw.DisableSecretMasking
+	r.DisableToolCache = raw.DisableToolCache
+	r.DisplayName = raw.DisplayName
+	r.Events = raw.Events
+	r.ExcludeTools = raw.ExcludeTools
+	if raw.FilterMapping != nil {
+		value, err := unmarshalFilterMapping(raw.FilterMapping)
+		if err != nil {
+			return err
+		}
+		r.FilterMapping = value
+	}
+	r.Headers = raw.Headers
+	r.HeadersRefreshTtlMs = raw.HeadersRefreshTtlMs
+	r.IsDefaultServer = raw.IsDefaultServer
+	r.Notifications = raw.Notifications
+	r.OauthClientID = raw.OauthClientID
+	r.OauthGrantType = raw.OauthGrantType
+	r.OauthPublicClient = raw.OauthPublicClient
+	if raw.Oidc != nil {
+		value, err := unmarshalMCPServerAuthConfig(raw.Oidc)
+		if err != nil {
+			return err
+		}
+		r.Oidc = value
+	}
+	if raw.SafeForTelemetry != nil {
+		value, err := unmarshalMCPSafeForTelemetry(raw.SafeForTelemetry)
+		if err != nil {
+			return err
+		}
+		r.SafeForTelemetry = value
+	}
+	r.Source = raw.Source
+	r.SourcePath = raw.SourcePath
+	r.SourcePlugin = raw.SourcePlugin
+	r.SourcePluginSpec = raw.SourcePluginSpec
+	r.SourcePluginVersion = raw.SourcePluginVersion
+	r.Timeout = raw.Timeout
+	r.Tools = raw.Tools
+	r.Type = raw.Type
+	r.URL = raw.URL
+	return nil
+}
+
+func (r *MCPServerConfigStdio) UnmarshalJSON(data []byte) error {
+	type rawMCPServerConfigStdio struct {
+		Args                 []string                   `json:"args,omitzero"`
+		Auth                 json.RawMessage            `json:"auth,omitempty"`
+		Command              string                     `json:"command"`
+		ConfigWarnings       []string                   `json:"configWarnings,omitzero"`
+		Cwd                  *string                    `json:"cwd,omitempty"`
+		DeferTools           *MCPServerConfigDeferTools `json:"deferTools,omitempty"`
+		DisableSecretMasking *bool                      `json:"disableSecretMasking,omitempty"`
+		DisableToolCache     *bool                      `json:"disableToolCache,omitempty"`
+		DisplayName          *string                    `json:"displayName,omitempty"`
+		Env                  map[string]string          `json:"env,omitzero"`
+		Events               []string                   `json:"events,omitzero"`
+		ExcludeTools         []string                   `json:"excludeTools,omitzero"`
+		FilterMapping        json.RawMessage            `json:"filterMapping,omitempty"`
+		IsDefaultServer      *bool                      `json:"isDefaultServer,omitempty"`
+		Notifications        []string                   `json:"notifications,omitzero"`
+		Oidc                 json.RawMessage            `json:"oidc,omitempty"`
+		SafeForTelemetry     json.RawMessage            `json:"safeForTelemetry,omitempty"`
+		Source               *MCPServerSource           `json:"source,omitempty"`
+		SourcePath           *string                    `json:"sourcePath,omitempty"`
+		SourcePlugin         *string                    `json:"sourcePlugin,omitempty"`
+		SourcePluginSpec     *bool                      `json:"sourcePluginSpec,omitempty"`
+		SourcePluginVersion  *string                    `json:"sourcePluginVersion,omitempty"`
+		Timeout              *int64                     `json:"timeout,omitempty"`
+		Tools                []string                   `json:"tools,omitzero"`
+		Type                 *MCPServerConfigStdioType  `json:"type,omitempty"`
+	}
+	var raw rawMCPServerConfigStdio
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.Args = raw.Args
+	if raw.Auth != nil {
+		value, err := unmarshalMCPServerAuthConfig(raw.Auth)
+		if err != nil {
+			return err
+		}
+		r.Auth = value
+	}
+	r.Command = raw.Command
+	r.ConfigWarnings = raw.ConfigWarnings
+	r.Cwd = raw.Cwd
+	r.DeferTools = raw.DeferTools
+	r.DisableSecretMasking = raw.DisableSecretMasking
+	r.DisableToolCache = raw.DisableToolCache
+	r.DisplayName = raw.DisplayName
+	r.Env = raw.Env
+	r.Events = raw.Events
+	r.ExcludeTools = raw.ExcludeTools
 	if raw.FilterMapping != nil {
 		value, err := unmarshalFilterMapping(raw.FilterMapping)
 		if err != nil {
@@ -1401,11 +2121,8 @@ func (r *MCPServerConfigHTTP) UnmarshalJSON(data []byte) error {
 		}
 		r.FilterMapping = value
 	}
-	r.Headers = raw.Headers
 	r.IsDefaultServer = raw.IsDefaultServer
-	r.OauthClientID = raw.OauthClientID
-	r.OauthGrantType = raw.OauthGrantType
-	r.OauthPublicClient = raw.OauthPublicClient
+	r.Notifications = raw.Notifications
 	if raw.Oidc != nil {
 		value, err := unmarshalMCPServerAuthConfig(raw.Oidc)
 		if err != nil {
@@ -1413,132 +2130,647 @@ func (r *MCPServerConfigHTTP) UnmarshalJSON(data []byte) error {
 		}
 		r.Oidc = value
 	}
-	r.Timeout = raw.Timeout
-	r.Tools = raw.Tools
-	r.Type = raw.Type
-	r.URL = raw.URL
-	return nil
+	if raw.SafeForTelemetry != nil {
+		value, err := unmarshalMCPSafeForTelemetry(raw.SafeForTelemetry)
+		if err != nil {
+			return err
+		}
+		r.SafeForTelemetry = value
+	}
+	r.Source = raw.Source
+	r.SourcePath = raw.SourcePath
+	r.SourcePlugin = raw.SourcePlugin
+	r.SourcePluginSpec = raw.SourcePluginSpec
+	r.SourcePluginVersion = raw.SourcePluginVersion
+	r.Timeout = raw.Timeout
+	r.Tools = raw.Tools
+	r.Type = raw.Type
+	return nil
+}
+
+func (r *MCPConfigAddRequest) UnmarshalJSON(data []byte) error {
+	type rawMCPConfigAddRequest struct {
+		Config json.RawMessage `json:"config"`
+		Name   string          `json:"name"`
+	}
+	var raw rawMCPConfigAddRequest
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	if raw.Config != nil {
+		value, err := unmarshalMCPSerializableServerConfig(raw.Config)
+		if err != nil {
+			return err
+		}
+		r.Config = value
+	}
+	r.Name = raw.Name
+	return nil
+}
+
+func (r *MCPConfigList) UnmarshalJSON(data []byte) error {
+	type rawMCPConfigList struct {
+		Servers map[string]json.RawMessage `json:"servers"`
+	}
+	var raw rawMCPConfigList
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	if raw.Servers != nil {
+		r.Servers = make(map[string]MCPSerializableServerConfig, len(raw.Servers))
+		for key, rawValue := range raw.Servers {
+			value, err := unmarshalMCPSerializableServerConfig(rawValue)
+			if err != nil {
+				return err
+			}
+			r.Servers[key] = value
+		}
+	}
+	return nil
+}
+
+func (r *MCPConfigUpdateRequest) UnmarshalJSON(data []byte) error {
+	type rawMCPConfigUpdateRequest struct {
+		Config json.RawMessage `json:"config"`
+		Name   string          `json:"name"`
+	}
+	var raw rawMCPConfigUpdateRequest
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	if raw.Config != nil {
+		value, err := unmarshalMCPSerializableServerConfig(raw.Config)
+		if err != nil {
+			return err
+		}
+		r.Config = value
+	}
+	r.Name = raw.Name
+	return nil
+}
+
+func unmarshalMCPHeadersHandlePendingHeadersRefreshRequest(data []byte) (MCPHeadersHandlePendingHeadersRefreshRequest, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	type rawUnion struct {
+		Kind MCPHeadersHandlePendingHeadersRefreshRequestKind `json:"kind"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+
+	switch raw.Kind {
+	case MCPHeadersHandlePendingHeadersRefreshRequestKindHeaders:
+		var d MCPHeadersHandlePendingHeadersRefreshRequestHeaders
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPHeadersHandlePendingHeadersRefreshRequestKindNone:
+		var d MCPHeadersHandlePendingHeadersRefreshRequestNone
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawMCPHeadersHandlePendingHeadersRefreshRequestData{Discriminator: raw.Kind, Raw: data}, nil
+	}
+}
+
+func (r RawMCPHeadersHandlePendingHeadersRefreshRequestData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return json.Marshal(struct {
+		Kind MCPHeadersHandlePendingHeadersRefreshRequestKind `json:"kind"`
+	}{
+		Kind: r.Discriminator,
+	})
+}
+
+func (r MCPHeadersHandlePendingHeadersRefreshRequestHeaders) MarshalJSON() ([]byte, error) {
+	type alias MCPHeadersHandlePendingHeadersRefreshRequestHeaders
+	return json.Marshal(struct {
+		Kind MCPHeadersHandlePendingHeadersRefreshRequestKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r MCPHeadersHandlePendingHeadersRefreshRequestNone) MarshalJSON() ([]byte, error) {
+	type alias MCPHeadersHandlePendingHeadersRefreshRequestNone
+	return json.Marshal(struct {
+		Kind MCPHeadersHandlePendingHeadersRefreshRequestKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r *MCPHeadersHandlePendingHeadersRefreshRequestRequest) UnmarshalJSON(data []byte) error {
+	type rawMCPHeadersHandlePendingHeadersRefreshRequestRequest struct {
+		RequestID string          `json:"requestId"`
+		Result    json.RawMessage `json:"result"`
+	}
+	var raw rawMCPHeadersHandlePendingHeadersRefreshRequestRequest
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.RequestID = raw.RequestID
+	if raw.Result != nil {
+		value, err := unmarshalMCPHeadersHandlePendingHeadersRefreshRequest(raw.Result)
+		if err != nil {
+			return err
+		}
+		r.Result = value
+	}
+	return nil
+}
+
+func unmarshalMCPPlanTransportChoice(data []byte) (MCPPlanTransportChoice, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	type rawUnion struct {
+		Transport MCPPlanTransportChoiceTransport `json:"transport"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+
+	switch raw.Transport {
+	case MCPPlanTransportChoiceTransportHTTP:
+		var d MCPPlanTransportChoiceRemote
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanTransportChoiceTransportSSE:
+		var d MCPPlanTransportChoiceRemote
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanTransportChoiceTransportStdio:
+		var d MCPPlanTransportChoicePackage
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanTransportChoiceTransportStreamableHTTP:
+		var d MCPPlanTransportChoiceRemote
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawMCPPlanTransportChoiceData{Discriminator: raw.Transport, Raw: data}, nil
+	}
+}
+
+func (r RawMCPPlanTransportChoiceData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return json.Marshal(struct {
+		Transport MCPPlanTransportChoiceTransport `json:"transport"`
+	}{
+		Transport: r.Discriminator,
+	})
+}
+
+func unmarshalMCPPlanRequiredValue(data []byte) (MCPPlanRequiredValue, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	type rawUnion struct {
+		Kind MCPPlanRequiredValueKind `json:"kind"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+
+	switch raw.Kind {
+	case MCPPlanRequiredValueKindEnum:
+		var d MCPPlanRequiredValueEnum
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanRequiredValueKindScalar:
+		var d MCPPlanRequiredValueScalar
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawMCPPlanRequiredValueData{Discriminator: raw.Kind, Raw: data}, nil
+	}
+}
+
+func (r RawMCPPlanRequiredValueData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return json.Marshal(struct {
+		Kind MCPPlanRequiredValueKind `json:"kind"`
+	}{
+		Kind: r.Discriminator,
+	})
 }
 
-func (r *MCPServerConfigStdio) UnmarshalJSON(data []byte) error {
-	type rawMCPServerConfigStdio struct {
-		Args             []string                   `json:"args,omitzero"`
-		Auth             json.RawMessage            `json:"auth,omitempty"`
-		Command          string                     `json:"command"`
-		Cwd              *string                    `json:"cwd,omitempty"`
-		DeferTools       *MCPServerConfigDeferTools `json:"deferTools,omitempty"`
-		DisableToolCache *bool                      `json:"disableToolCache,omitempty"`
-		Env              map[string]string          `json:"env,omitzero"`
-		FilterMapping    json.RawMessage            `json:"filterMapping,omitempty"`
-		IsDefaultServer  *bool                      `json:"isDefaultServer,omitempty"`
-		Oidc             json.RawMessage            `json:"oidc,omitempty"`
-		Timeout          *int64                     `json:"timeout,omitempty"`
-		Tools            []string                   `json:"tools,omitzero"`
+func (r MCPPlanRequiredValueEnum) MarshalJSON() ([]byte, error) {
+	type alias MCPPlanRequiredValueEnum
+	return json.Marshal(struct {
+		Kind MCPPlanRequiredValueKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r MCPPlanRequiredValueScalar) MarshalJSON() ([]byte, error) {
+	type alias MCPPlanRequiredValueScalar
+	return json.Marshal(struct {
+		Kind MCPPlanRequiredValueKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r *MCPPlanTransportChoicePackage) UnmarshalJSON(data []byte) error {
+	type rawMCPPlanTransportChoicePackage struct {
+		ChoiceID           string                      `json:"choiceId"`
+		InstallMethod      MCPPlanPackageInstallMethod `json:"installMethod"`
+		PackageIdentifier  string                      `json:"packageIdentifier"`
+		PackageType        string                      `json:"packageType"`
+		RequiredValues     []json.RawMessage           `json:"requiredValues"`
+		SecretPlaceholders []MCPPlanSecretPlaceholder  `json:"secretPlaceholders"`
 	}
-	var raw rawMCPServerConfigStdio
+	var raw rawMCPPlanTransportChoicePackage
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	r.Args = raw.Args
-	if raw.Auth != nil {
-		value, err := unmarshalMCPServerAuthConfig(raw.Auth)
-		if err != nil {
-			return err
-		}
-		r.Auth = value
-	}
-	r.Command = raw.Command
-	r.Cwd = raw.Cwd
-	r.DeferTools = raw.DeferTools
-	r.DisableToolCache = raw.DisableToolCache
-	r.Env = raw.Env
-	if raw.FilterMapping != nil {
-		value, err := unmarshalFilterMapping(raw.FilterMapping)
-		if err != nil {
-			return err
-		}
-		r.FilterMapping = value
-	}
-	r.IsDefaultServer = raw.IsDefaultServer
-	if raw.Oidc != nil {
-		value, err := unmarshalMCPServerAuthConfig(raw.Oidc)
-		if err != nil {
-			return err
+	r.ChoiceID = raw.ChoiceID
+	r.InstallMethod = raw.InstallMethod
+	r.PackageIdentifier = raw.PackageIdentifier
+	r.PackageType = raw.PackageType
+	if raw.RequiredValues != nil {
+		r.RequiredValues = make([]MCPPlanRequiredValue, 0, len(raw.RequiredValues))
+		for _, rawItem := range raw.RequiredValues {
+			value, err := unmarshalMCPPlanRequiredValue(rawItem)
+			if err != nil {
+				return err
+			}
+			r.RequiredValues = append(r.RequiredValues, value)
 		}
-		r.Oidc = value
 	}
-	r.Timeout = raw.Timeout
-	r.Tools = raw.Tools
+	r.SecretPlaceholders = raw.SecretPlaceholders
 	return nil
 }
 
-func (r *MCPConfigAddRequest) UnmarshalJSON(data []byte) error {
-	type rawMCPConfigAddRequest struct {
-		Config json.RawMessage `json:"config"`
-		Name   string          `json:"name"`
+func (r MCPPlanTransportChoicePackage) MarshalJSON() ([]byte, error) {
+	type alias MCPPlanTransportChoicePackage
+	return json.Marshal(struct {
+		Transport MCPPlanTransportChoiceTransport `json:"transport"`
+		alias
+	}{
+		Transport: r.Transport(),
+		alias:     alias(r),
+	})
+}
+
+func (r *MCPPlanTransportChoiceRemote) UnmarshalJSON(data []byte) error {
+	type rawMCPPlanTransportChoiceRemote struct {
+		ChoiceID           string                     `json:"choiceId"`
+		Endpoint           string                     `json:"endpoint"`
+		InstallMethod      MCPPlanRemoteInstallMethod `json:"installMethod"`
+		RequiredValues     []json.RawMessage          `json:"requiredValues"`
+		SecretPlaceholders []MCPPlanSecretPlaceholder `json:"secretPlaceholders"`
+		Discriminator      MCPPlanRemoteTransport     `json:"transport,omitempty"`
 	}
-	var raw rawMCPConfigAddRequest
+	var raw rawMCPPlanTransportChoiceRemote
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	if raw.Config != nil {
-		value, err := unmarshalMCPServerConfig(raw.Config)
-		if err != nil {
-			return err
+	r.ChoiceID = raw.ChoiceID
+	r.Endpoint = raw.Endpoint
+	r.InstallMethod = raw.InstallMethod
+	if raw.RequiredValues != nil {
+		r.RequiredValues = make([]MCPPlanRequiredValue, 0, len(raw.RequiredValues))
+		for _, rawItem := range raw.RequiredValues {
+			value, err := unmarshalMCPPlanRequiredValue(rawItem)
+			if err != nil {
+				return err
+			}
+			r.RequiredValues = append(r.RequiredValues, value)
 		}
-		r.Config = value
 	}
-	r.Name = raw.Name
+	r.SecretPlaceholders = raw.SecretPlaceholders
+	r.Discriminator = raw.Discriminator
 	return nil
 }
 
-func (r *MCPConfigList) UnmarshalJSON(data []byte) error {
-	type rawMCPConfigList struct {
-		Servers map[string]json.RawMessage `json:"servers"`
+func (r MCPPlanTransportChoiceRemote) MarshalJSON() ([]byte, error) {
+	type alias MCPPlanTransportChoiceRemote
+	return json.Marshal(struct {
+		Transport MCPPlanTransportChoiceTransport `json:"transport"`
+		alias
+	}{
+		Transport: r.Transport(),
+		alias:     alias(r),
+	})
+}
+
+func (r *MCPInstallPlan) UnmarshalJSON(data []byte) error {
+	type rawMCPInstallPlan struct {
+		ConfigurationChanges             []MCPPlanConfigurationChange `json:"configurationChanges"`
+		Identity                         MCPPlanResourceIdentity      `json:"identity"`
+		PlanHandle                       string                       `json:"planHandle"`
+		PlanHandleExpiresAt              string                       `json:"planHandleExpiresAt"`
+		Policy                           MCPPlanPolicyResult          `json:"policy"`
+		Provenance                       MCPPlanProvenance            `json:"provenance"`
+		RecommendedTransportChoiceID     *string                      `json:"recommendedTransportChoiceId,omitempty"`
+		ReloadRequired                   bool                         `json:"reloadRequired"`
+		RequiresInteractiveConfiguration bool                         `json:"requiresInteractiveConfiguration"`
+		Target                           MCPPlanTarget                `json:"target"`
+		TransportChoices                 []json.RawMessage            `json:"transportChoices"`
 	}
-	var raw rawMCPConfigList
+	var raw rawMCPInstallPlan
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	if raw.Servers != nil {
-		r.Servers = make(map[string]MCPServerConfig, len(raw.Servers))
-		for key, rawValue := range raw.Servers {
-			value, err := unmarshalMCPServerConfig(rawValue)
+	r.ConfigurationChanges = raw.ConfigurationChanges
+	r.Identity = raw.Identity
+	r.PlanHandle = raw.PlanHandle
+	r.PlanHandleExpiresAt = raw.PlanHandleExpiresAt
+	r.Policy = raw.Policy
+	r.Provenance = raw.Provenance
+	r.RecommendedTransportChoiceID = raw.RecommendedTransportChoiceID
+	r.ReloadRequired = raw.ReloadRequired
+	r.RequiresInteractiveConfiguration = raw.RequiresInteractiveConfiguration
+	r.Target = raw.Target
+	if raw.TransportChoices != nil {
+		r.TransportChoices = make([]MCPPlanTransportChoice, 0, len(raw.TransportChoices))
+		for _, rawItem := range raw.TransportChoices {
+			value, err := unmarshalMCPPlanTransportChoice(rawItem)
 			if err != nil {
 				return err
 			}
-			r.Servers[key] = value
+			r.TransportChoices = append(r.TransportChoices, value)
 		}
 	}
 	return nil
 }
 
-func (r *MCPConfigUpdateRequest) UnmarshalJSON(data []byte) error {
-	type rawMCPConfigUpdateRequest struct {
-		Config json.RawMessage `json:"config"`
-		Name   string          `json:"name"`
+func unmarshalMCPOauthPendingRequestResponse(data []byte) (MCPOauthPendingRequestResponse, error) {
+	if string(data) == "null" {
+		return nil, nil
 	}
-	var raw rawMCPConfigUpdateRequest
+	type rawUnion struct {
+		Kind MCPOauthPendingRequestResponseKind `json:"kind"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+
+	switch raw.Kind {
+	case MCPOauthPendingRequestResponseKindCancelled:
+		var d MCPOauthPendingRequestResponseCancelled
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPOauthPendingRequestResponseKindToken:
+		var d MCPOauthPendingRequestResponseToken
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawMCPOauthPendingRequestResponseData{Discriminator: raw.Kind, Raw: data}, nil
+	}
+}
+
+func (r RawMCPOauthPendingRequestResponseData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return json.Marshal(struct {
+		Kind MCPOauthPendingRequestResponseKind `json:"kind"`
+	}{
+		Kind: r.Discriminator,
+	})
+}
+
+func (r MCPOauthPendingRequestResponseCancelled) MarshalJSON() ([]byte, error) {
+	type alias MCPOauthPendingRequestResponseCancelled
+	return json.Marshal(struct {
+		Kind MCPOauthPendingRequestResponseKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r MCPOauthPendingRequestResponseToken) MarshalJSON() ([]byte, error) {
+	type alias MCPOauthPendingRequestResponseToken
+	return json.Marshal(struct {
+		Kind MCPOauthPendingRequestResponseKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r *MCPOauthHandlePendingRequest) UnmarshalJSON(data []byte) error {
+	type rawMCPOauthHandlePendingRequest struct {
+		RequestID string          `json:"requestId"`
+		Result    json.RawMessage `json:"result"`
+	}
+	var raw rawMCPOauthHandlePendingRequest
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	if raw.Config != nil {
-		value, err := unmarshalMCPServerConfig(raw.Config)
+	r.RequestID = raw.RequestID
+	if raw.Result != nil {
+		value, err := unmarshalMCPOauthPendingRequestResponse(raw.Result)
 		if err != nil {
 			return err
 		}
-		r.Config = value
+		r.Result = value
+	}
+	return nil
+}
+
+func unmarshalMCPOauthProbeResult(data []byte) (MCPOauthProbeResult, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	type rawUnion struct {
+		Status MCPOauthProbeResultStatus `json:"status"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+
+	switch raw.Status {
+	case MCPOauthProbeResultStatusAuthenticated:
+		var d MCPOauthProbeResultAuthenticated
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPOauthProbeResultStatusFailed:
+		var d MCPOauthProbeResultFailed
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPOauthProbeResultStatusNeedsAuth:
+		var d MCPOauthProbeResultNeedsAuth
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPOauthProbeResultStatusNoAuthRequired:
+		var d MCPOauthProbeResultNoAuthRequired
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawMCPOauthProbeResultData{Discriminator: raw.Status, Raw: data}, nil
+	}
+}
+
+func (r RawMCPOauthProbeResultData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return json.Marshal(struct {
+		Status MCPOauthProbeResultStatus `json:"status"`
+	}{
+		Status: r.Discriminator,
+	})
+}
+
+func (r MCPOauthProbeResultAuthenticated) MarshalJSON() ([]byte, error) {
+	type alias MCPOauthProbeResultAuthenticated
+	return json.Marshal(struct {
+		Status MCPOauthProbeResultStatus `json:"status"`
+		alias
+	}{
+		Status: r.Status(),
+		alias:  alias(r),
+	})
+}
+
+func (r MCPOauthProbeResultFailed) MarshalJSON() ([]byte, error) {
+	type alias MCPOauthProbeResultFailed
+	return json.Marshal(struct {
+		Status MCPOauthProbeResultStatus `json:"status"`
+		alias
+	}{
+		Status: r.Status(),
+		alias:  alias(r),
+	})
+}
+
+func (r MCPOauthProbeResultNeedsAuth) MarshalJSON() ([]byte, error) {
+	type alias MCPOauthProbeResultNeedsAuth
+	return json.Marshal(struct {
+		Status MCPOauthProbeResultStatus `json:"status"`
+		alias
+	}{
+		Status: r.Status(),
+		alias:  alias(r),
+	})
+}
+
+func (r MCPOauthProbeResultNoAuthRequired) MarshalJSON() ([]byte, error) {
+	type alias MCPOauthProbeResultNoAuthRequired
+	return json.Marshal(struct {
+		Status MCPOauthProbeResultStatus `json:"status"`
+		alias
+	}{
+		Status: r.Status(),
+		alias:  alias(r),
+	})
+}
+
+func unmarshalMCPPlanInstallSource(data []byte) (MCPPlanInstallSource, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	type rawUnion struct {
+		Kind MCPPlanInstallSourceKind `json:"kind"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+
+	switch raw.Kind {
+	case MCPPlanInstallSourceKindCandidate:
+		var d MCPPlanInstallSourceCandidate
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallSourceKindCard:
+		var d MCPPlanInstallSourceCard
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawMCPPlanInstallSourceData{Discriminator: raw.Kind, Raw: data}, nil
 	}
-	r.Name = raw.Name
-	return nil
 }
 
-func unmarshalMCPHeadersHandlePendingHeadersRefreshRequest(data []byte) (MCPHeadersHandlePendingHeadersRefreshRequest, error) {
+func (r RawMCPPlanInstallSourceData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return json.Marshal(struct {
+		Kind MCPPlanInstallSourceKind `json:"kind"`
+	}{
+		Kind: r.Discriminator,
+	})
+}
+
+func (r MCPPlanInstallSourceCandidate) MarshalJSON() ([]byte, error) {
+	type alias MCPPlanInstallSourceCandidate
+	return json.Marshal(struct {
+		Kind MCPPlanInstallSourceKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func unmarshalMCPServerCardReference(data []byte) (MCPServerCardReference, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
 	type rawUnion struct {
-		Kind MCPHeadersHandlePendingHeadersRefreshRequestKind `json:"kind"`
+		Kind MCPServerCardReferenceKind `json:"kind"`
 	}
 	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -1546,38 +2778,38 @@ func unmarshalMCPHeadersHandlePendingHeadersRefreshRequest(data []byte) (MCPHead
 	}
 
 	switch raw.Kind {
-	case MCPHeadersHandlePendingHeadersRefreshRequestKindHeaders:
-		var d MCPHeadersHandlePendingHeadersRefreshRequestHeaders
+	case MCPServerCardReferenceKindEmbedded:
+		var d MCPServerCardEmbedded
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case MCPHeadersHandlePendingHeadersRefreshRequestKindNone:
-		var d MCPHeadersHandlePendingHeadersRefreshRequestNone
+	case MCPServerCardReferenceKindURL:
+		var d MCPServerCardURL
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	default:
-		return &RawMCPHeadersHandlePendingHeadersRefreshRequestData{Discriminator: raw.Kind, Raw: data}, nil
+		return &RawMCPServerCardReferenceData{Discriminator: raw.Kind, Raw: data}, nil
 	}
 }
 
-func (r RawMCPHeadersHandlePendingHeadersRefreshRequestData) MarshalJSON() ([]byte, error) {
+func (r RawMCPServerCardReferenceData) MarshalJSON() ([]byte, error) {
 	if r.Raw != nil {
 		return r.Raw, nil
 	}
 	return json.Marshal(struct {
-		Kind MCPHeadersHandlePendingHeadersRefreshRequestKind `json:"kind"`
+		Kind MCPServerCardReferenceKind `json:"kind"`
 	}{
 		Kind: r.Discriminator,
 	})
 }
 
-func (r MCPHeadersHandlePendingHeadersRefreshRequestHeaders) MarshalJSON() ([]byte, error) {
-	type alias MCPHeadersHandlePendingHeadersRefreshRequestHeaders
+func (r MCPServerCardEmbedded) MarshalJSON() ([]byte, error) {
+	type alias MCPServerCardEmbedded
 	return json.Marshal(struct {
-		Kind MCPHeadersHandlePendingHeadersRefreshRequestKind `json:"kind"`
+		Kind MCPServerCardReferenceKind `json:"kind"`
 		alias
 	}{
 		Kind:  r.Kind(),
@@ -1585,10 +2817,10 @@ func (r MCPHeadersHandlePendingHeadersRefreshRequestHeaders) MarshalJSON() ([]by
 	})
 }
 
-func (r MCPHeadersHandlePendingHeadersRefreshRequestNone) MarshalJSON() ([]byte, error) {
-	type alias MCPHeadersHandlePendingHeadersRefreshRequestNone
+func (r MCPServerCardURL) MarshalJSON() ([]byte, error) {
+	type alias MCPServerCardURL
 	return json.Marshal(struct {
-		Kind MCPHeadersHandlePendingHeadersRefreshRequestKind `json:"kind"`
+		Kind MCPServerCardReferenceKind `json:"kind"`
 		alias
 	}{
 		Kind:  r.Kind(),
@@ -1596,32 +2828,63 @@ func (r MCPHeadersHandlePendingHeadersRefreshRequestNone) MarshalJSON() ([]byte,
 	})
 }
 
-func (r *MCPHeadersHandlePendingHeadersRefreshRequestRequest) UnmarshalJSON(data []byte) error {
-	type rawMCPHeadersHandlePendingHeadersRefreshRequestRequest struct {
-		RequestID string          `json:"requestId"`
-		Result    json.RawMessage `json:"result"`
+func (r *MCPPlanInstallSourceCard) UnmarshalJSON(data []byte) error {
+	type rawMCPPlanInstallSourceCard struct {
+		Card json.RawMessage `json:"card"`
 	}
-	var raw rawMCPHeadersHandlePendingHeadersRefreshRequestRequest
+	var raw rawMCPPlanInstallSourceCard
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	r.RequestID = raw.RequestID
-	if raw.Result != nil {
-		value, err := unmarshalMCPHeadersHandlePendingHeadersRefreshRequest(raw.Result)
+	if raw.Card != nil {
+		value, err := unmarshalMCPServerCardReference(raw.Card)
 		if err != nil {
 			return err
 		}
-		r.Result = value
+		r.Card = value
 	}
 	return nil
 }
 
-func unmarshalMCPOauthPendingRequestResponse(data []byte) (MCPOauthPendingRequestResponse, error) {
+func (r MCPPlanInstallSourceCard) MarshalJSON() ([]byte, error) {
+	type alias MCPPlanInstallSourceCard
+	return json.Marshal(struct {
+		Kind MCPPlanInstallSourceKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r *MCPPlanInstallRequest) UnmarshalJSON(data []byte) error {
+	type rawMCPPlanInstallRequest struct {
+		Contract CatalogClientContract `json:"contract"`
+		Scope    *MCPPlanScope         `json:"scope,omitempty"`
+		Source   json.RawMessage       `json:"source"`
+	}
+	var raw rawMCPPlanInstallRequest
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.Contract = raw.Contract
+	r.Scope = raw.Scope
+	if raw.Source != nil {
+		value, err := unmarshalMCPPlanInstallSource(raw.Source)
+		if err != nil {
+			return err
+		}
+		r.Source = value
+	}
+	return nil
+}
+
+func unmarshalMCPPlanInstallResult(data []byte) (MCPPlanInstallResult, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
 	type rawUnion struct {
-		Kind MCPOauthPendingRequestResponseKind `json:"kind"`
+		Kind MCPPlanInstallResultKind `json:"kind"`
 	}
 	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -1629,73 +2892,366 @@ func unmarshalMCPOauthPendingRequestResponse(data []byte) (MCPOauthPendingReques
 	}
 
 	switch raw.Kind {
-	case MCPOauthPendingRequestResponseKindCancelled:
-		var d MCPOauthPendingRequestResponseCancelled
+	case MCPPlanInstallResultKindAuthenticationRequired:
+		var d CatalogAuthenticationRequiredError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case MCPOauthPendingRequestResponseKindToken:
-		var d MCPOauthPendingRequestResponseToken
+	case MCPPlanInstallResultKindContractViolation:
+		var d CatalogContractViolationError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindHandleRejected:
+		var d CatalogHandleRejectedError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindInvalidRequest:
+		var d CatalogInvalidRequestError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindMalformedCard:
+		var d CatalogMalformedCardError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindNegotiationRefused:
+		var d CatalogNegotiationRefusedError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindNetworkFailure:
+		var d CatalogNetworkFailureError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindNotInstallable:
+		var d CatalogNotInstallableError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindPlanned:
+		var d MCPPlanInstallPlanned
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindPolicyRejected:
+		var d CatalogPolicyRejectedError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindUnavailable:
+		var d CatalogUnavailableError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindUnavailableTransport:
+		var d CatalogUnavailableTransportError
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case MCPPlanInstallResultKindUnsafeRetrieval:
+		var d CatalogUnsafeRetrievalError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	default:
-		return &RawMCPOauthPendingRequestResponseData{Discriminator: raw.Kind, Raw: data}, nil
+		return &RawMCPPlanInstallResultData{Discriminator: raw.Kind, Raw: data}, nil
 	}
 }
 
-func (r RawMCPOauthPendingRequestResponseData) MarshalJSON() ([]byte, error) {
+func (r RawMCPPlanInstallResultData) MarshalJSON() ([]byte, error) {
 	if r.Raw != nil {
 		return r.Raw, nil
 	}
 	return json.Marshal(struct {
-		Kind MCPOauthPendingRequestResponseKind `json:"kind"`
+		Kind MCPPlanInstallResultKind `json:"kind"`
 	}{
 		Kind: r.Discriminator,
 	})
 }
 
-func (r MCPOauthPendingRequestResponseCancelled) MarshalJSON() ([]byte, error) {
-	type alias MCPOauthPendingRequestResponseCancelled
+func (r CatalogHandleRejectedError) MarshalJSON() ([]byte, error) {
+	type alias CatalogHandleRejectedError
 	return json.Marshal(struct {
-		Kind MCPOauthPendingRequestResponseKind `json:"kind"`
+		Kind MCPPlanInstallResultKind `json:"kind"`
 		alias
 	}{
-		Kind:  r.Kind(),
+		Kind:  r.mcpPlanInstallResultKind(),
 		alias: alias(r),
 	})
 }
 
-func (r MCPOauthPendingRequestResponseToken) MarshalJSON() ([]byte, error) {
-	type alias MCPOauthPendingRequestResponseToken
+func (r CatalogNotInstallableError) MarshalJSON() ([]byte, error) {
+	type alias CatalogNotInstallableError
 	return json.Marshal(struct {
-		Kind MCPOauthPendingRequestResponseKind `json:"kind"`
+		Kind MCPPlanInstallResultKind `json:"kind"`
 		alias
 	}{
-		Kind:  r.Kind(),
+		Kind:  r.mcpPlanInstallResultKind(),
 		alias: alias(r),
 	})
 }
 
-func (r *MCPOauthHandlePendingRequest) UnmarshalJSON(data []byte) error {
-	type rawMCPOauthHandlePendingRequest struct {
-		RequestID string          `json:"requestId"`
-		Result    json.RawMessage `json:"result"`
+func (r CatalogUnavailableTransportError) MarshalJSON() ([]byte, error) {
+	type alias CatalogUnavailableTransportError
+	return json.Marshal(struct {
+		Kind MCPPlanInstallResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.mcpPlanInstallResultKind(),
+		alias: alias(r),
+	})
+}
+
+func (r MCPPlanInstallPlanned) MarshalJSON() ([]byte, error) {
+	type alias MCPPlanInstallPlanned
+	return json.Marshal(struct {
+		Kind MCPPlanInstallResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.mcpPlanInstallResultKind(),
+		alias: alias(r),
+	})
+}
+
+func matchesMCPServerConfigHTTP(data []byte) bool {
+	var rawGroup0 struct {
+		Command        json.RawMessage `json:"command"`
+		ServerInstance json.RawMessage `json:"serverInstance"`
+		Type           json.RawMessage `json:"type"`
+		URL            json.RawMessage `json:"url"`
 	}
-	var raw rawMCPOauthHandlePendingRequest
+	if err := json.Unmarshal(data, &rawGroup0); err != nil {
+		return false
+	}
+	if rawGroup0.URL == nil {
+		return false
+	}
+	if rawGroup0.Command != nil {
+		return false
+	}
+	if rawGroup0.ServerInstance != nil {
+		return false
+	}
+	return rawGroup0.Type == nil
+}
+
+func matchesMCPServerConfigMemory(data []byte) bool {
+	var rawGroup0 struct {
+		Command        json.RawMessage `json:"command"`
+		ServerInstance json.RawMessage `json:"serverInstance"`
+		Type           json.RawMessage `json:"type"`
+		URL            json.RawMessage `json:"url"`
+	}
+	if err := json.Unmarshal(data, &rawGroup0); err != nil {
+		return false
+	}
+	if rawGroup0.ServerInstance == nil {
+		return false
+	}
+	if rawGroup0.Type == nil {
+		return false
+	}
+	var rawGroup0String string
+	if err := json.Unmarshal(rawGroup0.Type, &rawGroup0String); err != nil {
+		return false
+	}
+	switch rawGroup0String {
+	case "memory":
+	default:
+		return false
+	}
+	if rawGroup0.Command != nil {
+		return false
+	}
+	return rawGroup0.URL == nil
+}
+
+func matchesMCPServerConfigStdio(data []byte) bool {
+	var rawGroup0 struct {
+		Command        json.RawMessage `json:"command"`
+		ServerInstance json.RawMessage `json:"serverInstance"`
+		Type           json.RawMessage `json:"type"`
+		URL            json.RawMessage `json:"url"`
+	}
+	if err := json.Unmarshal(data, &rawGroup0); err != nil {
+		return false
+	}
+	if rawGroup0.Command == nil {
+		return false
+	}
+	if rawGroup0.ServerInstance != nil {
+		return false
+	}
+	if rawGroup0.Type != nil {
+		return false
+	}
+	return rawGroup0.URL == nil
+}
+
+func unmarshalMCPServerConfig(data []byte) (MCPServerConfig, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	if matchesMCPServerConfigHTTP(data) {
+		var d MCPServerConfigHTTP
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	}
+	if matchesMCPServerConfigMemory(data) {
+		var d MCPServerConfigMemory
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	}
+	if matchesMCPServerConfigStdio(data) {
+		var d MCPServerConfigStdio
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	}
+	return &RawMCPServerConfigData{Raw: data}, nil
+}
+
+func (r RawMCPServerConfigData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return []byte("null"), nil
+}
+
+func (r *MCPServerConfigMemory) UnmarshalJSON(data []byte) error {
+	type rawMCPServerConfigMemory struct {
+		ConfigWarnings       []string                   `json:"configWarnings,omitzero"`
+		DeferTools           *MCPServerConfigDeferTools `json:"deferTools,omitempty"`
+		DisableSecretMasking *bool                      `json:"disableSecretMasking,omitempty"`
+		DisableToolCache     *bool                      `json:"disableToolCache,omitempty"`
+		DisplayName          *string                    `json:"displayName,omitempty"`
+		Events               []string                   `json:"events,omitzero"`
+		ExcludeTools         []string                   `json:"excludeTools,omitzero"`
+		FilterMapping        json.RawMessage            `json:"filterMapping,omitempty"`
+		IsDefaultServer      *bool                      `json:"isDefaultServer,omitempty"`
+		Notifications        []string                   `json:"notifications,omitzero"`
+		Oidc                 json.RawMessage            `json:"oidc,omitempty"`
+		SafeForTelemetry     json.RawMessage            `json:"safeForTelemetry,omitempty"`
+		ServerInstance       any                        `json:"serverInstance"`
+		Source               *MCPServerSource           `json:"source,omitempty"`
+		SourcePath           *string                    `json:"sourcePath,omitempty"`
+		SourcePlugin         *string                    `json:"sourcePlugin,omitempty"`
+		SourcePluginSpec     *bool                      `json:"sourcePluginSpec,omitempty"`
+		SourcePluginVersion  *string                    `json:"sourcePluginVersion,omitempty"`
+		Timeout              *int64                     `json:"timeout,omitempty"`
+		Tools                []string                   `json:"tools,omitzero"`
+		Type                 MCPServerConfigMemoryType  `json:"type"`
+	}
+	var raw rawMCPServerConfigMemory
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.ConfigWarnings = raw.ConfigWarnings
+	r.DeferTools = raw.DeferTools
+	r.DisableSecretMasking = raw.DisableSecretMasking
+	r.DisableToolCache = raw.DisableToolCache
+	r.DisplayName = raw.DisplayName
+	r.Events = raw.Events
+	r.ExcludeTools = raw.ExcludeTools
+	if raw.FilterMapping != nil {
+		value, err := unmarshalFilterMapping(raw.FilterMapping)
+		if err != nil {
+			return err
+		}
+		r.FilterMapping = value
+	}
+	r.IsDefaultServer = raw.IsDefaultServer
+	r.Notifications = raw.Notifications
+	if raw.Oidc != nil {
+		value, err := unmarshalMCPServerAuthConfig(raw.Oidc)
+		if err != nil {
+			return err
+		}
+		r.Oidc = value
+	}
+	if raw.SafeForTelemetry != nil {
+		value, err := unmarshalMCPSafeForTelemetry(raw.SafeForTelemetry)
+		if err != nil {
+			return err
+		}
+		r.SafeForTelemetry = value
+	}
+	r.ServerInstance = raw.ServerInstance
+	r.Source = raw.Source
+	r.SourcePath = raw.SourcePath
+	r.SourcePlugin = raw.SourcePlugin
+	r.SourcePluginSpec = raw.SourcePluginSpec
+	r.SourcePluginVersion = raw.SourcePluginVersion
+	r.Timeout = raw.Timeout
+	r.Tools = raw.Tools
+	r.Type = raw.Type
+	return nil
+}
+
+func (r *MCPReloadConfig) UnmarshalJSON(data []byte) error {
+	type rawMCPReloadConfig struct {
+		ActiveGitHubToken       *string                    `json:"activeGitHubToken,omitempty"`
+		CLIEnabledServers       []string                   `json:"cliEnabledServers,omitzero"`
+		ConfigFilter            any                        `json:"configFilter,omitempty"`
+		DisabledServers         []string                   `json:"disabledServers,omitzero"`
+		EnabledServers          []string                   `json:"enabledServers,omitzero"`
+		ForceRestart            *bool                      `json:"forceRestart,omitempty"`
+		GitHubMCPToolOptions    any                        `json:"githubMcpToolOptions,omitempty"`
+		GitHubMCPUserOverride   *bool                      `json:"githubMcpUserOverride,omitempty"`
+		IncludeWorkspaceSources *bool                      `json:"includeWorkspaceSources,omitempty"`
+		Mcp3pEnabled            *bool                      `json:"mcp3pEnabled,omitempty"`
+		MCPServers              map[string]json.RawMessage `json:"mcpServers"`
+		SecretStore             any                        `json:"secretStore,omitempty"`
+		UseCachedToolSnapshots  *bool                      `json:"useCachedToolSnapshots,omitempty"`
+	}
+	var raw rawMCPReloadConfig
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
-	r.RequestID = raw.RequestID
-	if raw.Result != nil {
-		value, err := unmarshalMCPOauthPendingRequestResponse(raw.Result)
-		if err != nil {
-			return err
+	r.ActiveGitHubToken = raw.ActiveGitHubToken
+	r.CLIEnabledServers = raw.CLIEnabledServers
+	r.ConfigFilter = raw.ConfigFilter
+	r.DisabledServers = raw.DisabledServers
+	r.EnabledServers = raw.EnabledServers
+	r.ForceRestart = raw.ForceRestart
+	r.GitHubMCPToolOptions = raw.GitHubMCPToolOptions
+	r.GitHubMCPUserOverride = raw.GitHubMCPUserOverride
+	r.IncludeWorkspaceSources = raw.IncludeWorkspaceSources
+	r.Mcp3pEnabled = raw.Mcp3pEnabled
+	if raw.MCPServers != nil {
+		r.MCPServers = make(map[string]MCPServerConfig, len(raw.MCPServers))
+		for key, rawValue := range raw.MCPServers {
+			value, err := unmarshalMCPServerConfig(rawValue)
+			if err != nil {
+				return err
+			}
+			r.MCPServers[key] = value
 		}
-		r.Result = value
 	}
+	r.SecretStore = raw.SecretStore
+	r.UseCachedToolSnapshots = raw.UseCachedToolSnapshots
 	return nil
 }
 
@@ -1709,7 +3265,7 @@ func (r *MCPRestartServerRequest) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	if raw.Config != nil {
-		value, err := unmarshalMCPServerConfig(raw.Config)
+		value, err := unmarshalMCPSerializableServerConfig(raw.Config)
 		if err != nil {
 			return err
 		}
@@ -1729,7 +3285,7 @@ func (r *MCPStartServerRequest) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	if raw.Config != nil {
-		value, err := unmarshalMCPServerConfig(raw.Config)
+		value, err := unmarshalMCPSerializableServerConfig(raw.Config)
 		if err != nil {
 			return err
 		}
@@ -1894,6 +3450,12 @@ func unmarshalUserToolSessionApproval(data []byte) (UserToolSessionApproval, err
 			return nil, err
 		}
 		return &d, nil
+	case UserToolSessionApprovalKindExtensionEnvAccess:
+		var d UserToolSessionApprovalExtensionEnvAccess
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case UserToolSessionApprovalKindExtensionManagement:
 		var d UserToolSessionApprovalExtensionManagement
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -1974,6 +3536,17 @@ func (r UserToolSessionApprovalCustomTool) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func (r UserToolSessionApprovalExtensionEnvAccess) MarshalJSON() ([]byte, error) {
+	type alias UserToolSessionApprovalExtensionEnvAccess
+	return json.Marshal(struct {
+		Kind UserToolSessionApprovalKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
 func (r UserToolSessionApprovalExtensionManagement) MarshalJSON() ([]byte, error) {
 	type alias UserToolSessionApprovalExtensionManagement
 	return json.Marshal(struct {
@@ -2136,6 +3709,12 @@ func unmarshalPermissionDecisionApproveForLocationApproval(data []byte) (Permiss
 			return nil, err
 		}
 		return &d, nil
+	case PermissionDecisionApproveForLocationApprovalKindExtensionEnvAccess:
+		var d PermissionDecisionApproveForLocationApprovalExtensionEnvAccess
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case PermissionDecisionApproveForLocationApprovalKindExtensionManagement:
 		var d PermissionDecisionApproveForLocationApprovalExtensionManagement
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -2222,6 +3801,17 @@ func (r PermissionDecisionApproveForLocationApprovalCustomTool) MarshalJSON() ([
 	})
 }
 
+func (r PermissionDecisionApproveForLocationApprovalExtensionEnvAccess) MarshalJSON() ([]byte, error) {
+	type alias PermissionDecisionApproveForLocationApprovalExtensionEnvAccess
+	return json.Marshal(struct {
+		Kind PermissionDecisionApproveForLocationApprovalKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
 func (r PermissionDecisionApproveForLocationApprovalExtensionManagement) MarshalJSON() ([]byte, error) {
 	type alias PermissionDecisionApproveForLocationApprovalExtensionManagement
 	return json.Marshal(struct {
@@ -2366,6 +3956,12 @@ func unmarshalPermissionDecisionApproveForSessionApproval(data []byte) (Permissi
 			return nil, err
 		}
 		return &d, nil
+	case PermissionDecisionApproveForSessionApprovalKindExtensionEnvAccess:
+		var d PermissionDecisionApproveForSessionApprovalExtensionEnvAccess
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case PermissionDecisionApproveForSessionApprovalKindExtensionManagement:
 		var d PermissionDecisionApproveForSessionApprovalExtensionManagement
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -2452,6 +4048,17 @@ func (r PermissionDecisionApproveForSessionApprovalCustomTool) MarshalJSON() ([]
 	})
 }
 
+func (r PermissionDecisionApproveForSessionApprovalExtensionEnvAccess) MarshalJSON() ([]byte, error) {
+	type alias PermissionDecisionApproveForSessionApprovalExtensionEnvAccess
+	return json.Marshal(struct {
+		Kind PermissionDecisionApproveForSessionApprovalKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
 func (r PermissionDecisionApproveForSessionApprovalExtensionManagement) MarshalJSON() ([]byte, error) {
 	type alias PermissionDecisionApproveForSessionApprovalExtensionManagement
 	return json.Marshal(struct {
@@ -2683,13 +4290,15 @@ func (r PermissionDecisionUserNotAvailable) MarshalJSON() ([]byte, error) {
 
 func (r *PermissionDecisionRequest) UnmarshalJSON(data []byte) error {
 	type rawPermissionDecisionRequest struct {
-		RequestID string          `json:"requestId"`
-		Result    json.RawMessage `json:"result"`
+		DecisionContext *PermissionDecisionContext `json:"decisionContext,omitempty"`
+		RequestID       string                     `json:"requestId"`
+		Result          json.RawMessage            `json:"result"`
 	}
 	var raw rawPermissionDecisionRequest
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return err
 	}
+	r.DecisionContext = raw.DecisionContext
 	r.RequestID = raw.RequestID
 	if raw.Result != nil {
 		value, err := unmarshalPermissionDecision(raw.Result)
@@ -2726,6 +4335,12 @@ func unmarshalPermissionsLocationsAddToolApprovalDetails(data []byte) (Permissio
 			return nil, err
 		}
 		return &d, nil
+	case PermissionsLocationsAddToolApprovalDetailsKindExtensionEnvAccess:
+		var d PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case PermissionsLocationsAddToolApprovalDetailsKindExtensionManagement:
 		var d PermissionsLocationsAddToolApprovalDetailsExtensionManagement
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -2812,6 +4427,17 @@ func (r PermissionsLocationsAddToolApprovalDetailsCustomTool) MarshalJSON() ([]b
 	})
 }
 
+func (r PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess) MarshalJSON() ([]byte, error) {
+	type alias PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess
+	return json.Marshal(struct {
+		Kind PermissionsLocationsAddToolApprovalDetailsKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
 func (r PermissionsLocationsAddToolApprovalDetailsExtensionManagement) MarshalJSON() ([]byte, error) {
 	type alias PermissionsLocationsAddToolApprovalDetailsExtensionManagement
 	return json.Marshal(struct {
@@ -3501,6 +5127,44 @@ func (r *SendRequest) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+func (r *SessionAuthLogoutUserRequest) UnmarshalJSON(data []byte) error {
+	type rawSessionAuthLogoutUserRequest struct {
+		AuthInfo json.RawMessage `json:"authInfo"`
+	}
+	var raw rawSessionAuthLogoutUserRequest
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	if raw.AuthInfo != nil {
+		value, err := unmarshalAuthInfo(raw.AuthInfo)
+		if err != nil {
+			return err
+		}
+		r.AuthInfo = value
+	}
+	return nil
+}
+
+func (r *SessionAuthSwitchRequest) UnmarshalJSON(data []byte) error {
+	type rawSessionAuthSwitchRequest struct {
+		AuthInfo json.RawMessage `json:"authInfo"`
+		Token    *string         `json:"token,omitempty"`
+	}
+	var raw rawSessionAuthSwitchRequest
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	if raw.AuthInfo != nil {
+		value, err := unmarshalAuthInfo(raw.AuthInfo)
+		if err != nil {
+			return err
+		}
+		r.AuthInfo = value
+	}
+	r.Token = raw.Token
+	return nil
+}
+
 func (r SessionInstalledPluginSource) MarshalJSON() ([]byte, error) {
 	if r.SessionInstalledPluginSourceGitHub != nil {
 		return json.Marshal(r.SessionInstalledPluginSourceGitHub)
@@ -3711,6 +5375,7 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 		DetachedFromSpawningParentEngagementID *string                                              `json:"detachedFromSpawningParentEngagementId,omitempty"`
 		DetachedFromSpawningParentSessionID    *string                                              `json:"detachedFromSpawningParentSessionId,omitempty"`
 		DisabledInstructionSources             []string                                             `json:"disabledInstructionSources,omitzero"`
+		DisabledMCPServers                     []string                                             `json:"disabledMcpServers,omitzero"`
 		DisabledSkills                         []string                                             `json:"disabledSkills,omitzero"`
 		EnableCitations                        *bool                                                `json:"enableCitations,omitempty"`
 		EnableFileChangeTracking               *bool                                                `json:"enableFileChangeTracking,omitempty"`
@@ -3726,11 +5391,13 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 		ExpAssignments                         any                                                  `json:"expAssignments,omitempty"`
 		FeatureFlags                           map[string]bool                                      `json:"featureFlags,omitzero"`
 		IncludedBuiltinAgents                  []string                                             `json:"includedBuiltinAgents,omitzero"`
+		IncludedBuiltinSkills                  []string                                             `json:"includedBuiltinSkills,omitzero"`
 		InstalledPlugins                       []InstalledPlugin                                    `json:"installedPlugins,omitzero"`
 		IntegrationID                          *string                                              `json:"integrationId,omitempty"`
 		IsExperimentalMode                     *bool                                                `json:"isExperimentalMode,omitempty"`
 		LogInteractiveShells                   *bool                                                `json:"logInteractiveShells,omitempty"`
 		LspClientName                          *string                                              `json:"lspClientName,omitempty"`
+		ManagedSettings                        *SessionManagedSettings                              `json:"managedSettings,omitempty"`
 		MaxInlineBinaryBytes                   *int64                                               `json:"maxInlineBinaryBytes,omitempty"`
 		Memory                                 *MemoryConfiguration                                 `json:"memory,omitempty"`
 		Model                                  *string                                              `json:"model,omitempty"`
@@ -3746,6 +5413,7 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 		RemoteSteerable                        *bool                                                `json:"remoteSteerable,omitempty"`
 		RunningInInteractiveMode               *bool                                                `json:"runningInInteractiveMode,omitempty"`
 		SandboxConfig                          *SandboxConfig                                       `json:"sandboxConfig,omitempty"`
+		SandboxConfigSource                    *SandboxConfigSource                                 `json:"sandboxConfigSource,omitempty"`
 		SessionCapabilities                    []SessionCapability                                  `json:"sessionCapabilities,omitzero"`
 		SessionID                              *string                                              `json:"sessionId,omitempty"`
 		SessionLimits                          *SessionLimitsConfig                                 `json:"sessionLimits,omitempty"`
@@ -3787,6 +5455,7 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 	r.DetachedFromSpawningParentEngagementID = raw.DetachedFromSpawningParentEngagementID
 	r.DetachedFromSpawningParentSessionID = raw.DetachedFromSpawningParentSessionID
 	r.DisabledInstructionSources = raw.DisabledInstructionSources
+	r.DisabledMCPServers = raw.DisabledMCPServers
 	r.DisabledSkills = raw.DisabledSkills
 	r.EnableCitations = raw.EnableCitations
 	r.EnableFileChangeTracking = raw.EnableFileChangeTracking
@@ -3802,11 +5471,13 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 	r.ExpAssignments = raw.ExpAssignments
 	r.FeatureFlags = raw.FeatureFlags
 	r.IncludedBuiltinAgents = raw.IncludedBuiltinAgents
+	r.IncludedBuiltinSkills = raw.IncludedBuiltinSkills
 	r.InstalledPlugins = raw.InstalledPlugins
 	r.IntegrationID = raw.IntegrationID
 	r.IsExperimentalMode = raw.IsExperimentalMode
 	r.LogInteractiveShells = raw.LogInteractiveShells
 	r.LspClientName = raw.LspClientName
+	r.ManagedSettings = raw.ManagedSettings
 	r.MaxInlineBinaryBytes = raw.MaxInlineBinaryBytes
 	r.Memory = raw.Memory
 	r.Model = raw.Model
@@ -3822,6 +5493,7 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 	r.RemoteSteerable = raw.RemoteSteerable
 	r.RunningInInteractiveMode = raw.RunningInInteractiveMode
 	r.SandboxConfig = raw.SandboxConfig
+	r.SandboxConfigSource = raw.SandboxConfigSource
 	r.SessionCapabilities = raw.SessionCapabilities
 	r.SessionID = raw.SessionID
 	r.SessionLimits = raw.SessionLimits
@@ -3985,6 +5657,88 @@ func (r SessionsOpenResumeLast) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func unmarshalSettableAuthInfo(data []byte) (SettableAuthInfo, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	type rawUnion struct {
+		Type SettableAuthInfoType `json:"type"`
+	}
+	var raw rawUnion
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return nil, err
+	}
+
+	switch raw.Type {
+	case SettableAuthInfoTypeAPIKey:
+		var d APIKeyAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case SettableAuthInfoTypeCopilotAPIToken:
+		var d CopilotAPITokenAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case SettableAuthInfoTypeEnv:
+		var d EnvAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case SettableAuthInfoTypeGhCLI:
+		var d GhCLIAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case SettableAuthInfoTypeHMAC:
+		var d HMACAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case SettableAuthInfoTypeToken:
+		var d SettableTokenAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case SettableAuthInfoTypeUser:
+		var d UserAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	default:
+		return &RawSettableAuthInfoData{Discriminator: raw.Type, Raw: data}, nil
+	}
+}
+
+func (r RawSettableAuthInfoData) MarshalJSON() ([]byte, error) {
+	if r.Raw != nil {
+		return r.Raw, nil
+	}
+	return json.Marshal(struct {
+		Type SettableAuthInfoType `json:"type"`
+	}{
+		Type: r.Discriminator,
+	})
+}
+
+func (r SettableTokenAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias SettableTokenAuthInfo
+	return json.Marshal(struct {
+		Type SettableAuthInfoType `json:"type"`
+		alias
+	}{
+		Type:  r.settableAuthInfoType(),
+		alias: alias(r),
+	})
+}
+
 func (r *SessionSetCredentialsParams) UnmarshalJSON(data []byte) error {
 	type rawSessionSetCredentialsParams struct {
 		Credentials json.RawMessage `json:"credentials,omitempty"`
@@ -3994,7 +5748,7 @@ func (r *SessionSetCredentialsParams) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	if raw.Credentials != nil {
-		value, err := unmarshalAuthInfo(raw.Credentials)
+		value, err := unmarshalSettableAuthInfo(raw.Credentials)
 		if err != nil {
 			return err
 		}
@@ -4016,6 +5770,12 @@ func unmarshalSlashCommandInvocationResult(data []byte) (SlashCommandInvocationR
 	}
 
 	switch raw.Kind {
+	case SlashCommandInvocationResultKindAddTimelineEntry:
+		var d SlashCommandAddTimelineEntryResult
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case SlashCommandInvocationResultKindAgentPrompt:
 		var d SlashCommandAgentPromptResult
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -4034,6 +5794,24 @@ func unmarshalSlashCommandInvocationResult(data []byte) (SlashCommandInvocationR
 			return nil, err
 		}
 		return &d, nil
+	case SlashCommandInvocationResultKindSetModel:
+		var d SlashCommandSetModelResult
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case SlashCommandInvocationResultKindSetPlanModel:
+		var d SlashCommandSetPlanModelResult
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case SlashCommandInvocationResultKindShowDialog:
+		var d SlashCommandShowDialogResult
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case SlashCommandInvocationResultKindText:
 		var d SlashCommandTextResult
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -4056,6 +5834,17 @@ func (r RawSlashCommandInvocationResultData) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func (r SlashCommandAddTimelineEntryResult) MarshalJSON() ([]byte, error) {
+	type alias SlashCommandAddTimelineEntryResult
+	return json.Marshal(struct {
+		Kind SlashCommandInvocationResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
 func (r SlashCommandAgentPromptResult) MarshalJSON() ([]byte, error) {
 	type alias SlashCommandAgentPromptResult
 	return json.Marshal(struct {
@@ -4089,6 +5878,39 @@ func (r SlashCommandSelectSubcommandResult) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func (r SlashCommandSetModelResult) MarshalJSON() ([]byte, error) {
+	type alias SlashCommandSetModelResult
+	return json.Marshal(struct {
+		Kind SlashCommandInvocationResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r SlashCommandSetPlanModelResult) MarshalJSON() ([]byte, error) {
+	type alias SlashCommandSetPlanModelResult
+	return json.Marshal(struct {
+		Kind SlashCommandInvocationResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
+func (r SlashCommandShowDialogResult) MarshalJSON() ([]byte, error) {
+	type alias SlashCommandShowDialogResult
+	return json.Marshal(struct {
+		Kind SlashCommandInvocationResultKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
 func (r SlashCommandTextResult) MarshalJSON() ([]byte, error) {
 	type alias SlashCommandTextResult
 	return json.Marshal(struct {
@@ -4301,6 +6123,78 @@ func (r *TasksPromoteCurrentToBackgroundResult) UnmarshalJSON(data []byte) error
 	return nil
 }
 
+func (r *ToolResultExpanded) UnmarshalJSON(data []byte) error {
+	type rawToolResultExpanded struct {
+		BinaryResultsForLlm              []ExternalToolTextResultForLlmBinaryResultsForLlm `json:"binaryResultsForLlm,omitzero"`
+		CitableSources                   []any                                             `json:"citableSources,omitzero"`
+		Contents                         []json.RawMessage                                 `json:"contents,omitzero"`
+		Error                            *string                                           `json:"error,omitempty"`
+		MCPMeta                          map[string]any                                    `json:"mcpMeta,omitzero"`
+		NewMessages                      []ToolResultNewMessage                            `json:"newMessages,omitzero"`
+		PostToolUseFailureHooksProcessed *bool                                             `json:"postToolUseFailureHooksProcessed,omitempty"`
+		ResultType                       ToolResultType                                    `json:"resultType"`
+		SessionLog                       *string                                           `json:"sessionLog,omitempty"`
+		SkillInvocation                  any                                               `json:"skillInvocation,omitempty"`
+		SkipLargeOutputProcessing        *bool                                             `json:"skipLargeOutputProcessing,omitempty"`
+		StructuredContent                any                                               `json:"structuredContent,omitempty"`
+		TaskCompletionDecision           *TaskCompletionDecision                           `json:"taskCompletionDecision,omitempty"`
+		TextResultForLlm                 string                                            `json:"textResultForLlm"`
+		ToolReferences                   []string                                          `json:"toolReferences,omitzero"`
+		ToolTelemetry                    any                                               `json:"toolTelemetry,omitempty"`
+		UIResource                       any                                               `json:"uiResource,omitempty"`
+	}
+	var raw rawToolResultExpanded
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.BinaryResultsForLlm = raw.BinaryResultsForLlm
+	r.CitableSources = raw.CitableSources
+	if raw.Contents != nil {
+		r.Contents = make([]ExternalToolTextResultForLlmContent, 0, len(raw.Contents))
+		for _, rawItem := range raw.Contents {
+			value, err := unmarshalExternalToolTextResultForLlmContent(rawItem)
+			if err != nil {
+				return err
+			}
+			r.Contents = append(r.Contents, value)
+		}
+	}
+	r.Error = raw.Error
+	r.MCPMeta = raw.MCPMeta
+	r.NewMessages = raw.NewMessages
+	r.PostToolUseFailureHooksProcessed = raw.PostToolUseFailureHooksProcessed
+	r.ResultType = raw.ResultType
+	r.SessionLog = raw.SessionLog
+	r.SkillInvocation = raw.SkillInvocation
+	r.SkipLargeOutputProcessing = raw.SkipLargeOutputProcessing
+	r.StructuredContent = raw.StructuredContent
+	r.TaskCompletionDecision = raw.TaskCompletionDecision
+	r.TextResultForLlm = raw.TextResultForLlm
+	r.ToolReferences = raw.ToolReferences
+	r.ToolTelemetry = raw.ToolTelemetry
+	r.UIResource = raw.UIResource
+	return nil
+}
+
+func unmarshalToolResult(data []byte) (ToolResult, error) {
+	if string(data) == "null" {
+		return nil, nil
+	}
+	{
+		var value string
+		if err := json.Unmarshal(data, &value); err == nil {
+			return ToolStringResult(value), nil
+		}
+	}
+	{
+		var value ToolResultExpanded
+		if err := json.Unmarshal(data, &value); err == nil {
+			return &value, nil
+		}
+	}
+	return nil, errors.New("data did not match any union variant for ToolResult")
+}
+
 func unmarshalUIElicitationFieldValue(data []byte) (UIElicitationFieldValue, error) {
 	if string(data) == "null" {
 		return nil, nil
@@ -4332,7 +6226,7 @@ func unmarshalUIElicitationFieldValue(data []byte) (UIElicitationFieldValue, err
 	return nil, errors.New("data did not match any union variant for UIElicitationFieldValue")
 }
 
-func matchesUIElicitationArrayAnyOfField(data []byte) bool {
+func matchesUIElicitationSchemaPropertyUIElicitationArrayAnyOfField(data []byte) bool {
 	var rawGroup0 struct {
 		Items json.RawMessage `json:"items"`
 	}
@@ -4359,7 +6253,7 @@ func matchesUIElicitationArrayAnyOfField(data []byte) bool {
 	return rawGroup0Items.Type == nil
 }
 
-func matchesUIElicitationArrayEnumField(data []byte) bool {
+func matchesUIElicitationSchemaPropertyUIElicitationArrayEnumField(data []byte) bool {
 	var rawGroup0 struct {
 		Items json.RawMessage `json:"items"`
 	}
@@ -4409,7 +6303,7 @@ func matchesUIElicitationSchemaPropertyString(data []byte) bool {
 	return rawGroup0.OneOf == nil
 }
 
-func matchesUIElicitationStringEnumField(data []byte) bool {
+func matchesUIElicitationSchemaPropertyUIElicitationStringEnumField(data []byte) bool {
 	var rawGroup0 struct {
 		Enum  json.RawMessage `json:"enum"`
 		OneOf json.RawMessage `json:"oneOf"`
@@ -4423,7 +6317,7 @@ func matchesUIElicitationStringEnumField(data []byte) bool {
 	return rawGroup0.OneOf == nil
 }
 
-func matchesUIElicitationStringOneOfField(data []byte) bool {
+func matchesUIElicitationSchemaPropertyUIElicitationStringOneOfField(data []byte) bool {
 	var rawGroup0 struct {
 		Enum  json.RawMessage `json:"enum"`
 		OneOf json.RawMessage `json:"oneOf"`
@@ -4451,14 +6345,14 @@ func unmarshalUIElicitationSchemaProperty(data []byte) (UIElicitationSchemaPrope
 
 	switch raw.Type {
 	case UIElicitationSchemaPropertyTypeArray:
-		if matchesUIElicitationArrayAnyOfField(data) {
+		if matchesUIElicitationSchemaPropertyUIElicitationArrayAnyOfField(data) {
 			var d UIElicitationArrayAnyOfField
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
 			}
 			return &d, nil
 		}
-		if matchesUIElicitationArrayEnumField(data) {
+		if matchesUIElicitationSchemaPropertyUIElicitationArrayEnumField(data) {
 			var d UIElicitationArrayEnumField
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
@@ -4492,14 +6386,14 @@ func unmarshalUIElicitationSchemaProperty(data []byte) (UIElicitationSchemaPrope
 			}
 			return &d, nil
 		}
-		if matchesUIElicitationStringEnumField(data) {
+		if matchesUIElicitationSchemaPropertyUIElicitationStringEnumField(data) {
 			var d UIElicitationStringEnumField
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
 			}
 			return &d, nil
 		}
-		if matchesUIElicitationStringOneOfField(data) {
+		if matchesUIElicitationSchemaPropertyUIElicitationStringOneOfField(data) {
 			var d UIElicitationStringOneOfField
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
@@ -4629,6 +6523,7 @@ func (r *UIElicitationResponse) UnmarshalJSON(data []byte) error {
 	type rawUIElicitationResponse struct {
 		Action  UIElicitationResponseAction `json:"action"`
 		Content map[string]json.RawMessage  `json:"content,omitzero"`
+		Meta    map[string]any              `json:"_meta,omitzero"`
 	}
 	var raw rawUIElicitationResponse
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -4645,5 +6540,6 @@ func (r *UIElicitationResponse) UnmarshalJSON(data []byte) error {
 			r.Content[key] = value
 		}
 	}
+	r.Meta = raw.Meta
 	return nil
 }
diff --git a/go/rpc/zsession_encoding.go b/go/rpc/zsession_encoding.go
index 05e466012c..5c5d3bca27 100644
--- a/go/rpc/zsession_encoding.go
+++ b/go/rpc/zsession_encoding.go
@@ -41,6 +41,12 @@ func (e *SessionEvent) UnmarshalJSON(data []byte) error {
 			return err
 		}
 		e.Data = &d
+	case SessionEventTypeAgentInterrupted:
+		var d AgentInterruptedData
+		if err := json.Unmarshal(raw.Data, &d); err != nil {
+			return err
+		}
+		e.Data = &d
 	case SessionEventTypeAssistantIdle:
 		var d AssistantIdleData
 		if err := json.Unmarshal(raw.Data, &d); err != nil {
@@ -203,6 +209,18 @@ func (e *SessionEvent) UnmarshalJSON(data []byte) error {
 			return err
 		}
 		e.Data = &d
+	case SessionEventTypeFactoryRunSettled:
+		var d FactoryRunSettledData
+		if err := json.Unmarshal(raw.Data, &d); err != nil {
+			return err
+		}
+		e.Data = &d
+	case SessionEventTypeFactoryRunStarted:
+		var d FactoryRunStartedData
+		if err := json.Unmarshal(raw.Data, &d); err != nil {
+			return err
+		}
+		e.Data = &d
 	case SessionEventTypeFactoryRunUpdated:
 		var d FactoryRunUpdatedData
 		if err := json.Unmarshal(raw.Data, &d); err != nil {
@@ -281,6 +299,12 @@ func (e *SessionEvent) UnmarshalJSON(data []byte) error {
 			return err
 		}
 		e.Data = &d
+	case SessionEventTypeModelCallFinished:
+		var d ModelCallFinishedData
+		if err := json.Unmarshal(raw.Data, &d); err != nil {
+			return err
+		}
+		e.Data = &d
 	case SessionEventTypeModelCallStart:
 		var d ModelCallStartData
 		if err := json.Unmarshal(raw.Data, &d); err != nil {
@@ -305,6 +329,12 @@ func (e *SessionEvent) UnmarshalJSON(data []byte) error {
 			return err
 		}
 		e.Data = &d
+	case SessionEventTypePromptCacheBreak:
+		var d PromptCacheBreakData
+		if err := json.Unmarshal(raw.Data, &d); err != nil {
+			return err
+		}
+		e.Data = &d
 	case SessionEventTypeSamplingCompleted:
 		var d SamplingCompletedData
 		if err := json.Unmarshal(raw.Data, &d); err != nil {
@@ -317,6 +347,12 @@ func (e *SessionEvent) UnmarshalJSON(data []byte) error {
 			return err
 		}
 		e.Data = &d
+	case SessionEventTypeSandboxDecision:
+		var d SandboxDecisionData
+		if err := json.Unmarshal(raw.Data, &d); err != nil {
+			return err
+		}
+		e.Data = &d
 	case SessionEventTypeSessionAutoModeResolved:
 		var d SessionAutoModeResolvedData
 		if err := json.Unmarshal(raw.Data, &d); err != nil {
@@ -707,6 +743,12 @@ func (e *SessionEvent) UnmarshalJSON(data []byte) error {
 			return err
 		}
 		e.Data = &d
+	case SessionEventTypeUIEphemeralQuery:
+		var d UIEphemeralQueryData
+		if err := json.Unmarshal(raw.Data, &d); err != nil {
+			return err
+		}
+		e.Data = &d
 	case SessionEventTypeUserInputCompleted:
 		var d UserInputCompletedData
 		if err := json.Unmarshal(raw.Data, &d); err != nil {
@@ -773,6 +815,7 @@ func (r *UserMessageData) UnmarshalJSON(data []byte) error {
 		Source                           *string               `json:"source,omitempty"`
 		SupportedNativeDocumentMIMETypes []string              `json:"supportedNativeDocumentMimeTypes,omitzero"`
 		TransformedContent               *string               `json:"transformedContent,omitempty"`
+		TurnID                           *string               `json:"turnId,omitempty"`
 	}
 	var raw rawUserMessageData
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -798,6 +841,7 @@ func (r *UserMessageData) UnmarshalJSON(data []byte) error {
 	r.Source = raw.Source
 	r.SupportedNativeDocumentMIMETypes = raw.SupportedNativeDocumentMIMETypes
 	r.TransformedContent = raw.TransformedContent
+	r.TurnID = raw.TurnID
 	return nil
 }
 
@@ -905,7 +949,7 @@ func (r *CitationReference) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-func matchesBinaryAssetReference(data []byte) bool {
+func matchesPersistedBinaryResultBinaryAssetReference(data []byte) bool {
 	var rawGroup0 struct {
 		AssetID       json.RawMessage `json:"assetId"`
 		ByteLength    json.RawMessage `json:"byteLength"`
@@ -927,7 +971,7 @@ func matchesBinaryAssetReference(data []byte) bool {
 	return rawGroup0.OmittedReason == nil
 }
 
-func matchesOmittedBinaryResult(data []byte) bool {
+func matchesPersistedBinaryResultOmittedBinaryResult(data []byte) bool {
 	var rawGroup0 struct {
 		AssetID       json.RawMessage `json:"assetId"`
 		ByteLength    json.RawMessage `json:"byteLength"`
@@ -949,7 +993,7 @@ func matchesOmittedBinaryResult(data []byte) bool {
 	return rawGroup0.Data == nil
 }
 
-func matchesPersistedBinaryImage(data []byte) bool {
+func matchesPersistedBinaryResultPersistedBinaryImage(data []byte) bool {
 	var rawGroup0 struct {
 		AssetID       json.RawMessage `json:"assetId"`
 		ByteLength    json.RawMessage `json:"byteLength"`
@@ -985,21 +1029,21 @@ func unmarshalPersistedBinaryResult(data []byte) (PersistedBinaryResult, error)
 
 	switch raw.Type {
 	case PersistedBinaryResultTypeImage:
-		if matchesBinaryAssetReference(data) {
+		if matchesPersistedBinaryResultBinaryAssetReference(data) {
 			var d BinaryAssetReference
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
 			}
 			return &d, nil
 		}
-		if matchesOmittedBinaryResult(data) {
+		if matchesPersistedBinaryResultOmittedBinaryResult(data) {
 			var d OmittedBinaryResult
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
 			}
 			return &d, nil
 		}
-		if matchesPersistedBinaryImage(data) {
+		if matchesPersistedBinaryResultPersistedBinaryImage(data) {
 			var d PersistedBinaryImage
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
@@ -1008,21 +1052,21 @@ func unmarshalPersistedBinaryResult(data []byte) (PersistedBinaryResult, error)
 		}
 		return &RawPersistedBinaryResult{Discriminator: raw.Type, Raw: data}, nil
 	case PersistedBinaryResultTypeResource:
-		if matchesBinaryAssetReference(data) {
+		if matchesPersistedBinaryResultBinaryAssetReference(data) {
 			var d BinaryAssetReference
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
 			}
 			return &d, nil
 		}
-		if matchesOmittedBinaryResult(data) {
+		if matchesPersistedBinaryResultOmittedBinaryResult(data) {
 			var d OmittedBinaryResult
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
 			}
 			return &d, nil
 		}
-		if matchesPersistedBinaryImage(data) {
+		if matchesPersistedBinaryResultPersistedBinaryImage(data) {
 			var d PersistedBinaryImage
 			if err := json.Unmarshal(data, &d); err != nil {
 				return nil, err
@@ -1537,6 +1581,12 @@ func unmarshalPermissionRequest(data []byte) (PermissionRequest, error) {
 			return nil, err
 		}
 		return &d, nil
+	case PermissionRequestKindExtensionEnvAccess:
+		var d PermissionRequestExtensionEnvAccess
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case PermissionRequestKindExtensionManagement:
 		var d PermissionRequestExtensionManagement
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -1624,6 +1674,17 @@ func (r PermissionRequestCustomTool) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func (r PermissionRequestExtensionEnvAccess) MarshalJSON() ([]byte, error) {
+	type alias PermissionRequestExtensionEnvAccess
+	return json.Marshal(struct {
+		Kind PermissionRequestKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
 func (r PermissionRequestExtensionManagement) MarshalJSON() ([]byte, error) {
 	type alias PermissionRequestExtensionManagement
 	return json.Marshal(struct {
@@ -1759,6 +1820,12 @@ func unmarshalPermissionPromptRequest(data []byte) (PermissionPromptRequest, err
 			return nil, err
 		}
 		return &d, nil
+	case PermissionPromptRequestKindExtensionEnvAccess:
+		var d PermissionPromptRequestExtensionEnvAccess
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case PermissionPromptRequestKindExtensionManagement:
 		var d PermissionPromptRequestExtensionManagement
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -1857,6 +1924,17 @@ func (r PermissionPromptRequestCustomTool) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func (r PermissionPromptRequestExtensionEnvAccess) MarshalJSON() ([]byte, error) {
+	type alias PermissionPromptRequestExtensionEnvAccess
+	return json.Marshal(struct {
+		Kind PermissionPromptRequestKind `json:"kind"`
+		alias
+	}{
+		Kind:  r.Kind(),
+		alias: alias(r),
+	})
+}
+
 func (r PermissionPromptRequestExtensionManagement) MarshalJSON() ([]byte, error) {
 	type alias PermissionPromptRequestExtensionManagement
 	return json.Marshal(struct {
@@ -2095,8 +2173,9 @@ func (r PermissionApproved) MarshalJSON() ([]byte, error) {
 
 func (r *PermissionApprovedForLocation) UnmarshalJSON(data []byte) error {
 	type rawPermissionApprovedForLocation struct {
-		Approval    json.RawMessage `json:"approval"`
-		LocationKey string          `json:"locationKey"`
+		Approval               json.RawMessage `json:"approval"`
+		LocationKey            string          `json:"locationKey"`
+		ManagedApprovalHandled *bool           `json:"managedApprovalHandled,omitempty"`
 	}
 	var raw rawPermissionApprovedForLocation
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -2110,6 +2189,7 @@ func (r *PermissionApprovedForLocation) UnmarshalJSON(data []byte) error {
 		r.Approval = value
 	}
 	r.LocationKey = raw.LocationKey
+	r.ManagedApprovalHandled = raw.ManagedApprovalHandled
 	return nil
 }
 
@@ -2126,7 +2206,8 @@ func (r PermissionApprovedForLocation) MarshalJSON() ([]byte, error) {
 
 func (r *PermissionApprovedForSession) UnmarshalJSON(data []byte) error {
 	type rawPermissionApprovedForSession struct {
-		Approval json.RawMessage `json:"approval"`
+		Approval               json.RawMessage `json:"approval"`
+		ManagedApprovalHandled *bool           `json:"managedApprovalHandled,omitempty"`
 	}
 	var raw rawPermissionApprovedForSession
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -2139,6 +2220,7 @@ func (r *PermissionApprovedForSession) UnmarshalJSON(data []byte) error {
 		}
 		r.Approval = value
 	}
+	r.ManagedApprovalHandled = raw.ManagedApprovalHandled
 	return nil
 }
 
diff --git a/go/rpc/zsession_events.go b/go/rpc/zsession_events.go
index 26e7b5f726..2abfd75a66 100644
--- a/go/rpc/zsession_events.go
+++ b/go/rpc/zsession_events.go
@@ -54,6 +54,7 @@ type SessionEventType string
 
 const (
 	SessionEventTypeAbort                       SessionEventType = "abort"
+	SessionEventTypeAgentInterrupted            SessionEventType = "agent.interrupted"
 	SessionEventTypeAssistantIdle               SessionEventType = "assistant.idle"
 	SessionEventTypeAssistantIntent             SessionEventType = "assistant.intent"
 	SessionEventTypeAssistantMessage            SessionEventType = "assistant.message"
@@ -81,6 +82,12 @@ const (
 	SessionEventTypeExitPlanModeRequested       SessionEventType = "exit_plan_mode.requested"
 	SessionEventTypeExternalToolCompleted       SessionEventType = "external_tool.completed"
 	SessionEventTypeExternalToolRequested       SessionEventType = "external_tool.requested"
+	// Experimental: SessionEventTypeFactoryRunSettled identifies an experimental event that may
+	// change or be removed.
+	SessionEventTypeFactoryRunSettled SessionEventType = "factory.run_settled"
+	// Experimental: SessionEventTypeFactoryRunStarted identifies an experimental event that may
+	// change or be removed.
+	SessionEventTypeFactoryRunStarted SessionEventType = "factory.run_started"
 	// Experimental: SessionEventTypeFactoryRunUpdated identifies an experimental event that may
 	// change or be removed.
 	SessionEventTypeFactoryRunUpdated          SessionEventType = "factory.run_updated"
@@ -96,12 +103,15 @@ const (
 	SessionEventTypeMCPResourcesListChanged    SessionEventType = "mcp.resources.list_changed"
 	SessionEventTypeMCPToolsListChanged        SessionEventType = "mcp.tools.list_changed"
 	SessionEventTypeModelCallFailure           SessionEventType = "model.call_failure"
+	SessionEventTypeModelCallFinished          SessionEventType = "model.call_finished"
 	SessionEventTypeModelCallStart             SessionEventType = "model.call_start"
 	SessionEventTypePendingMessagesModified    SessionEventType = "pending_messages.modified"
 	SessionEventTypePermissionCompleted        SessionEventType = "permission.completed"
 	SessionEventTypePermissionRequested        SessionEventType = "permission.requested"
+	SessionEventTypePromptCacheBreak           SessionEventType = "prompt_cache_break"
 	SessionEventTypeSamplingCompleted          SessionEventType = "sampling.completed"
 	SessionEventTypeSamplingRequested          SessionEventType = "sampling.requested"
+	SessionEventTypeSandboxDecision            SessionEventType = "sandbox.decision"
 	// Experimental: SessionEventTypeSessionAutoModeResolved identifies an experimental event
 	// that may change or be removed.
 	SessionEventTypeSessionAutoModeResolved          SessionEventType = "session.auto_mode_resolved"
@@ -152,46 +162,121 @@ const (
 	SessionEventTypeSessionMCPServerStatusChanged  SessionEventType = "session.mcp_server_status_changed"
 	SessionEventTypeSessionModeChanged             SessionEventType = "session.mode_changed"
 	SessionEventTypeSessionModelChange             SessionEventType = "session.model_change"
-	SessionEventTypeSessionPermissionsChanged      SessionEventType = "session.permissions_changed"
-	SessionEventTypeSessionPlanChanged             SessionEventType = "session.plan_changed"
-	SessionEventTypeSessionRemoteSteerableChanged  SessionEventType = "session.remote_steerable_changed"
-	SessionEventTypeSessionResume                  SessionEventType = "session.resume"
-	SessionEventTypeSessionScheduleCancelled       SessionEventType = "session.schedule_cancelled"
-	SessionEventTypeSessionScheduleCreated         SessionEventType = "session.schedule_created"
-	SessionEventTypeSessionScheduleRearmed         SessionEventType = "session.schedule_rearmed"
-	SessionEventTypeSessionSessionLimitsChanged    SessionEventType = "session.session_limits_changed"
-	SessionEventTypeSessionShutdown                SessionEventType = "session.shutdown"
-	SessionEventTypeSessionSkillsLoaded            SessionEventType = "session.skills_loaded"
-	SessionEventTypeSessionSnapshotRewind          SessionEventType = "session.snapshot_rewind"
-	SessionEventTypeSessionStart                   SessionEventType = "session.start"
-	SessionEventTypeSessionTaskComplete            SessionEventType = "session.task_complete"
-	SessionEventTypeSessionTitleChanged            SessionEventType = "session.title_changed"
-	SessionEventTypeSessionTodosChanged            SessionEventType = "session.todos_changed"
-	SessionEventTypeSessionToolsUpdated            SessionEventType = "session.tools_updated"
-	SessionEventTypeSessionTruncation              SessionEventType = "session.truncation"
-	SessionEventTypeSessionUsageCheckpoint         SessionEventType = "session.usage_checkpoint"
-	SessionEventTypeSessionUsageInfo               SessionEventType = "session.usage_info"
-	SessionEventTypeSessionWarning                 SessionEventType = "session.warning"
-	SessionEventTypeSessionWorkspaceFileChanged    SessionEventType = "session.workspace_file_changed"
-	SessionEventTypeSkillInvoked                   SessionEventType = "skill.invoked"
-	SessionEventTypeSubagentCompleted              SessionEventType = "subagent.completed"
-	SessionEventTypeSubagentDeselected             SessionEventType = "subagent.deselected"
-	SessionEventTypeSubagentFailed                 SessionEventType = "subagent.failed"
-	SessionEventTypeSubagentSelected               SessionEventType = "subagent.selected"
-	SessionEventTypeSubagentStarted                SessionEventType = "subagent.started"
-	SessionEventTypeSystemMessage                  SessionEventType = "system.message"
-	SessionEventTypeSystemNotification             SessionEventType = "system.notification"
-	SessionEventTypeToolExecutionComplete          SessionEventType = "tool.execution_complete"
-	SessionEventTypeToolExecutionPartialResult     SessionEventType = "tool.execution_partial_result"
-	SessionEventTypeToolExecutionProgress          SessionEventType = "tool.execution_progress"
-	SessionEventTypeToolExecutionStart             SessionEventType = "tool.execution_start"
-	SessionEventTypeToolSearchActivated            SessionEventType = "tool_search.activated"
-	SessionEventTypeToolUserRequested              SessionEventType = "tool.user_requested"
-	SessionEventTypeUserInputCompleted             SessionEventType = "user_input.completed"
-	SessionEventTypeUserInputRequested             SessionEventType = "user_input.requested"
-	SessionEventTypeUserMessage                    SessionEventType = "user.message"
+	// Experimental: SessionEventTypeSessionPermissionsChanged identifies an experimental event
+	// that may change or be removed.
+	SessionEventTypeSessionPermissionsChanged     SessionEventType = "session.permissions_changed"
+	SessionEventTypeSessionPlanChanged            SessionEventType = "session.plan_changed"
+	SessionEventTypeSessionRemoteSteerableChanged SessionEventType = "session.remote_steerable_changed"
+	SessionEventTypeSessionResume                 SessionEventType = "session.resume"
+	SessionEventTypeSessionScheduleCancelled      SessionEventType = "session.schedule_cancelled"
+	SessionEventTypeSessionScheduleCreated        SessionEventType = "session.schedule_created"
+	SessionEventTypeSessionScheduleRearmed        SessionEventType = "session.schedule_rearmed"
+	SessionEventTypeSessionSessionLimitsChanged   SessionEventType = "session.session_limits_changed"
+	SessionEventTypeSessionShutdown               SessionEventType = "session.shutdown"
+	SessionEventTypeSessionSkillsLoaded           SessionEventType = "session.skills_loaded"
+	SessionEventTypeSessionSnapshotRewind         SessionEventType = "session.snapshot_rewind"
+	SessionEventTypeSessionStart                  SessionEventType = "session.start"
+	SessionEventTypeSessionTaskComplete           SessionEventType = "session.task_complete"
+	SessionEventTypeSessionTitleChanged           SessionEventType = "session.title_changed"
+	SessionEventTypeSessionTodosChanged           SessionEventType = "session.todos_changed"
+	SessionEventTypeSessionToolsUpdated           SessionEventType = "session.tools_updated"
+	SessionEventTypeSessionTruncation             SessionEventType = "session.truncation"
+	SessionEventTypeSessionUsageCheckpoint        SessionEventType = "session.usage_checkpoint"
+	SessionEventTypeSessionUsageInfo              SessionEventType = "session.usage_info"
+	SessionEventTypeSessionWarning                SessionEventType = "session.warning"
+	SessionEventTypeSessionWorkspaceFileChanged   SessionEventType = "session.workspace_file_changed"
+	SessionEventTypeSkillInvoked                  SessionEventType = "skill.invoked"
+	SessionEventTypeSubagentCompleted             SessionEventType = "subagent.completed"
+	SessionEventTypeSubagentDeselected            SessionEventType = "subagent.deselected"
+	SessionEventTypeSubagentFailed                SessionEventType = "subagent.failed"
+	SessionEventTypeSubagentSelected              SessionEventType = "subagent.selected"
+	SessionEventTypeSubagentStarted               SessionEventType = "subagent.started"
+	SessionEventTypeSystemMessage                 SessionEventType = "system.message"
+	SessionEventTypeSystemNotification            SessionEventType = "system.notification"
+	SessionEventTypeToolExecutionComplete         SessionEventType = "tool.execution_complete"
+	SessionEventTypeToolExecutionPartialResult    SessionEventType = "tool.execution_partial_result"
+	SessionEventTypeToolExecutionProgress         SessionEventType = "tool.execution_progress"
+	SessionEventTypeToolExecutionStart            SessionEventType = "tool.execution_start"
+	SessionEventTypeToolSearchActivated           SessionEventType = "tool_search.activated"
+	SessionEventTypeToolUserRequested             SessionEventType = "tool.user_requested"
+	// Experimental: SessionEventTypeUIEphemeralQuery identifies an experimental event that may
+	// change or be removed.
+	SessionEventTypeUIEphemeralQuery   SessionEventType = "ui.ephemeral_query"
+	SessionEventTypeUserInputCompleted SessionEventType = "user_input.completed"
+	SessionEventTypeUserInputRequested SessionEventType = "user_input.requested"
+	SessionEventTypeUserMessage        SessionEventType = "user.message"
 )
 
+// A detected loss of a previously cached prompt prefix
+type PromptCacheBreakData struct {
+	// Request state whose cached prefix fell short
+	// Internal: AfterRequest is part of the SDK's internal API surface and is not intended for external use.
+	AfterRequest any `json:"afterRequest,omitempty"`
+	// Name of the sub-agent whose conversation broke, stamped by the parent bridge
+	// Internal: AgentName is part of the SDK's internal API surface and is not intended for external use.
+	AgentName *string `json:"agentName,omitempty"`
+	// Request state that established the prior cache frontier
+	// Internal: BeforeRequest is part of the SDK's internal API surface and is not intended for external use.
+	BeforeRequest any `json:"beforeRequest,omitempty"`
+	// Names of the cache-configuration fields that changed
+	// Internal: CacheConfigChangedFields is part of the SDK's internal API surface and is not intended for external use.
+	CacheConfigChangedFields []string `json:"cacheConfigChangedFields,omitzero"`
+	// All reasons that contributed to the cache break, ordered by precedence
+	ContributingReasons []string `json:"contributingReasons"`
+	// Prior cached prompt frontier in tokens
+	FrontierTokens int64 `json:"frontierTokens"`
+	// Model that held the prior cache frontier, when the call changed models
+	// Internal: ModelFrom is part of the SDK's internal API surface and is not intended for external use.
+	ModelFrom *string `json:"modelFrom,omitempty"`
+	// Model this call targeted, when the call changed models
+	// Internal: ModelTo is part of the SDK's internal API surface and is not intended for external use.
+	ModelTo *string `json:"modelTo,omitempty"`
+	// The highest-precedence reason for the cache break
+	PrimaryReason string `json:"primaryReason"`
+	// Fraction of the prior cache frontier that survived
+	RetentionRatio float64 `json:"retentionRatio"`
+	// Index of the first conversation message whose content changed
+	// Internal: RewriteMessageIndex is part of the SDK's internal API surface and is not intended for external use.
+	RewriteMessageIndex *int64 `json:"rewriteMessageIndex,omitempty"`
+	// Shape of the history rewrite, for example whether the history grew or shrank
+	// Internal: RewriteShape is part of the SDK's internal API surface and is not intended for external use.
+	RewriteShape *string `json:"rewriteShape,omitempty"`
+	// Subsystems that announced a history rewrite before this call, for example compaction or truncation
+	// Internal: RewriteSource is part of the SDK's internal API surface and is not intended for external use.
+	RewriteSource []string `json:"rewriteSource,omitzero"`
+	// Cached prefix tokens lost since the prior call
+	ShortfallTokens int64 `json:"shortfallTokens"`
+	// Number of cached prefix tokens that survived
+	SurvivedTokens int64 `json:"survivedTokens"`
+	// Names of the system-prompt segments whose content changed
+	// Internal: SystemSegmentsChanged is part of the SDK's internal API surface and is not intended for external use.
+	SystemSegmentsChanged []string `json:"systemSegmentsChanged,omitzero"`
+	// Telemetry-safe names of tools added since the prior call
+	// Internal: ToolsAdded is part of the SDK's internal API surface and is not intended for external use.
+	ToolsAdded []string `json:"toolsAdded,omitzero"`
+	// Raw names of tools added since the prior call, restricted because a tool name can be user-authored
+	// Internal: ToolsAddedRaw is part of the SDK's internal API surface and is not intended for external use.
+	ToolsAddedRaw []string `json:"toolsAddedRaw,omitzero"`
+	// Telemetry-safe names of tools whose definition changed since the prior call
+	// Internal: ToolsRedefined is part of the SDK's internal API surface and is not intended for external use.
+	ToolsRedefined []string `json:"toolsRedefined,omitzero"`
+	// Raw names of tools redefined since the prior call, restricted because a tool name can be user-authored
+	// Internal: ToolsRedefinedRaw is part of the SDK's internal API surface and is not intended for external use.
+	ToolsRedefinedRaw []string `json:"toolsRedefinedRaw,omitzero"`
+	// Telemetry-safe names of tools removed since the prior call
+	// Internal: ToolsRemoved is part of the SDK's internal API surface and is not intended for external use.
+	ToolsRemoved []string `json:"toolsRemoved,omitzero"`
+	// Raw names of tools removed since the prior call, restricted because a tool name can be user-authored
+	// Internal: ToolsRemovedRaw is part of the SDK's internal API surface and is not intended for external use.
+	ToolsRemovedRaw []string `json:"toolsRemovedRaw,omitzero"`
+	// Whether the tool list kept its members but changed their order
+	// Internal: ToolsReordered is part of the SDK's internal API surface and is not intended for external use.
+	ToolsReordered *bool `json:"toolsReordered,omitempty"`
+}
+
+func (*PromptCacheBreakData) sessionEventData()      {}
+func (*PromptCacheBreakData) Type() SessionEventType { return SessionEventTypePromptCacheBreak }
+
 // Agent intent description for current activity or plan
 type AssistantIntentData struct {
 	// Short description of what the agent is currently doing or planning to do
@@ -218,7 +303,8 @@ type AssistantReasoningData struct {
 	Content string `json:"content"`
 	// Unique identifier for this reasoning block
 	ReasoningID string `json:"reasoningId"`
-	Rte         *bool  `json:"rte,omitempty"`
+	// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+	Rte *bool `json:"rte,omitempty"`
 }
 
 func (*AssistantReasoningData) sessionEventData()      {}
@@ -254,6 +340,8 @@ type AssistantMessageData struct {
 	ParentToolCallID *string `json:"parentToolCallId,omitempty"`
 	// Generation phase for phased-output models (e.g., thinking vs. response phases)
 	Phase *string `json:"phase,omitempty"`
+	// Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping. `reasoningText` and `reasoningOpaque` are a lossy derived view of these blocks, retained for display.
+	ReasoningBlocks *AssistantMessageReasoningBlocks `json:"reasoningBlocks,omitempty"`
 	// Opaque/encrypted extended thinking data from Anthropic models. Session-bound and stripped on resume.
 	ReasoningOpaque *string `json:"reasoningOpaque,omitempty"`
 	// Readable reasoning text from the model's extended thinking
@@ -262,7 +350,8 @@ type AssistantMessageData struct {
 	ReasoningWireField *string `json:"reasoningWireField,omitempty"`
 	// GitHub request tracing ID (x-github-request-id header) for correlating with server-side logs
 	RequestID *string `json:"requestId,omitempty"`
-	Rte       *bool   `json:"rte,omitempty"`
+	// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+	Rte *bool `json:"rte,omitempty"`
 	// Neutral provider-tagged server-side tool-use payload (tool search, advisor) for verbatim round-tripping
 	ServerTools *AssistantMessageServerTools `json:"serverTools,omitempty"`
 	// Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
@@ -561,6 +650,9 @@ type SessionUsageCheckpointData struct {
 	// Internal per-model prompt-cache state used to restore expiration tracking on resume
 	// Internal: ModelCacheState is part of the SDK's internal API surface and is not intended for external use.
 	ModelCacheState []UsageCheckpointModelCacheState `json:"modelCacheState,omitzero"`
+	// Internal per-conversation prompt-cache-break detector baselines restored on resume
+	// Internal: PromptCacheBreakState is part of the SDK's internal API surface and is not intended for external use.
+	PromptCacheBreakState []any `json:"promptCacheBreakState,omitzero"`
 	// Session-wide accumulated nano-AI units cost at checkpoint time
 	TotalNanoAiu float64 `json:"totalNanoAiu"`
 	// Total number of premium API requests used at checkpoint time
@@ -649,24 +741,28 @@ func (*PendingMessagesModifiedData) Type() SessionEventType {
 	return SessionEventTypePendingMessagesModified
 }
 
-// Enterprise managed-settings resolution: the effective managed settings the session applied and where they came from, so SDK clients can show users what is enterprise-managed and by which authority. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted; for a session-independent pull, use the SDK `getManagedSettings()` API, which returns the identical payload. Managed settings have a single authoritative source, so the highest-authority present layer (server > device) wins wholesale; `bypassPermissionsDisabled` is deny-wins across layers. Marked experimental while the managed-settings surface stabilizes.
+// Enterprise managed-settings resolution: the effective managed settings the session applied and which channels contributed, so SDK clients can show users what is enterprise-managed. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted. Device values take precedence over server values per ordinary key, while permissions compose restrictively across device, server, and SDK-client layers. The account-scoped `getManagedSettings()` API does not include session-local client injection. Marked experimental while the managed-settings surface stabilizes.
 // Experimental: SessionManagedSettingsResolvedData is part of an experimental API and may change or be removed.
 type SessionManagedSettingsResolvedData struct {
 	// Whether enterprise policy disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers, and forced on when `failClosed` is true.
 	BypassPermissionsDisabled bool `json:"bypassPermissionsDisabled"`
-	// Whether the device (MDM/plist/registry/file) managed-settings layer was present
+	// Whether a session-local permissions layer injected by the SDK host was present
+	ClientManaged *bool `json:"clientManaged,omitempty"`
+	// Whether an actual device MDM/plist/registry/file managed-settings layer was present
 	DeviceManaged bool `json:"deviceManaged"`
 	// Whether managed policy could not be determined (e.g. a failed server fetch) and the session fell back to the fail-closed restriction. When true, restrictions such as disabling bypass-permissions are enforced even though `settings` may be absent.
 	FailClosed bool `json:"failClosed"`
 	// The setting keys under enterprise management in the effective managed settings (e.g. `model`, `enabledPlugins`, `permissions`). Empty when no managed settings are in force.
 	ManagedKeys []string `json:"managedKeys"`
-	// Whether server and device each supplied a permission allowlist, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.
+	// Whether at least two managed sources supplied permission allowlists, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.
 	PermissionsAllowIntersected *bool `json:"permissionsAllowIntersected,omitempty"`
+	// Whether the effective sandbox policy forces the sandbox on *only* because managed policy could not be determined, rather than because the policy requires it. Lets clients tell a user whose `--no-sandbox` was overridden that the sandbox stayed on as a fail-closed fallback, instead of attributing it to an administrator who set no such policy.
+	SandboxEnabledByUndeterminedPolicy *bool `json:"sandboxEnabledByUndeterminedPolicy,omitempty"`
 	// Whether the server (account/org) managed-settings layer was present
 	ServerManaged bool `json:"serverManaged"`
 	// The effective (resolved) managed settings values, so clients can render exactly what is enforced. Absent when no managed policy is in force.
 	Settings any `json:"settings,omitempty"`
-	// Which channel supplied the effective managed settings (the winning layer), or `none` when no policy is in force
+	// Channel summary: `server`, `device`, or `client` when exactly one channel contributed; `mixed` when multiple channels contributed; otherwise `none`. Consult the per-channel booleans for exact provenance.
 	Source ManagedSettingsResolvedSource `json:"source"`
 }
 
@@ -679,8 +775,9 @@ func (*SessionManagedSettingsResolvedData) Type() SessionEventType {
 // Experimental: FactoryRunUpdatedData is part of an experimental API and may change or be removed.
 type FactoryRunUpdatedData struct {
 	// Monotonic revision now available for the run.
-	Revision int64  `json:"revision"`
-	RunID    string `json:"runId"`
+	Revision int64 `json:"revision"`
+	// Factory run identifier.
+	RunID string `json:"runId"`
 }
 
 func (*FactoryRunUpdatedData) sessionEventData()      {}
@@ -697,6 +794,40 @@ type HookProgressData struct {
 func (*HookProgressData) sessionEventData()      {}
 func (*HookProgressData) Type() SessionEventType { return SessionEventTypeHookProgress }
 
+// Ephemeral signal that a factory run attempt began executing.
+// Experimental: FactoryRunStartedData is part of an experimental API and may change or be removed.
+type FactoryRunStartedData struct {
+	// Attempt number this start committed; a resumed run increments it.
+	Attempt int64 `json:"attempt"`
+	// Name of the factory this run executes. Low cardinality by construction.
+	FactoryName string `json:"factoryName"`
+	// Identifier of the factory run that started.
+	RunID string `json:"runId"`
+}
+
+func (*FactoryRunStartedData) sessionEventData()      {}
+func (*FactoryRunStartedData) Type() SessionEventType { return SessionEventTypeFactoryRunStarted }
+
+// Ephemeral signal that a factory run reached a terminal status.
+// Experimental: FactoryRunSettledData is part of an experimental API and may change or be removed.
+type FactoryRunSettledData struct {
+	// AI credits this run consumed, in nano-AIU.
+	ConsumedNanoAiu int64 `json:"consumedNanoAiu"`
+	// Subagents this run consumed against its limits.
+	ConsumedSubagents int64 `json:"consumedSubagents"`
+	// Active milliseconds accumulated across every attempt of this run.
+	ElapsedMs int64 `json:"elapsedMs"`
+	// Typed failure class recorded on the run, when it failed with one (e.g. `factory_limit_reached`).
+	FailureType *string `json:"failureType,omitempty"`
+	// Identifier of the factory run that settled.
+	RunID string `json:"runId"`
+	// Terminal status the run committed.
+	Status FactoryRunSettledStatus `json:"status"`
+}
+
+func (*FactoryRunSettledData) sessionEventData()      {}
+func (*FactoryRunSettledData) Type() SessionEventType { return SessionEventTypeFactoryRunSettled }
+
 // Error details for timeline display including message and optional diagnostic information
 type SessionErrorData struct {
 	// Only set on `errorType: "rate_limit"`. When `true`, the runtime will follow this error with an `auto_mode_switch.requested` event (or silently switch if `continueOnAutoMode` is enabled). UI clients can use this flag to suppress duplicate rendering of the rate-limit error when they show their own auto-mode-switch prompt.
@@ -737,6 +868,8 @@ func (*ExternalToolCompletedData) Type() SessionEventType {
 type ExternalToolRequestedData struct {
 	// Arguments to pass to the external tool
 	Arguments any `json:"arguments,omitempty"`
+	// Stable provider identity captured with an extension-owned tool definition; hosts use it to route the request to the same provider that was offered to the model
+	ProviderID *string `json:"providerId,omitempty"`
 	// Unique identifier for this request; used to respond via session.respondToExternalTool()
 	RequestID string `json:"requestId"`
 	// Session ID that this external tool request belongs to
@@ -778,6 +911,8 @@ type ModelCallFailureData struct {
 	FailureKind *ModelCallFailureKind `json:"failureKind,omitempty"`
 	// What initiated this API call (e.g., "sub-agent", "mcp-sampling"); absent for user-initiated calls
 	Initiator *string `json:"initiator,omitempty"`
+	// Authoritative interaction classification for the failed call, matching `assistant.usage.interactionType` (for example `conversation-agent`, `conversation-subagent`, or `conversation-sampling`). Absent when the producer cannot classify the interaction.
+	InteractionType *string `json:"interactionType,omitempty"`
 	// Whether the session selected Auto mode for the failed call
 	IsAuto *bool `json:"isAuto,omitempty"`
 	// Whether the failed call used a bring-your-own-key provider
@@ -797,7 +932,8 @@ type ModelCallFailureData struct {
 	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
 	// Content-free structural summary of the failing request. Contains only counts and shape flags (no prompt content), so it is safe for unrestricted telemetry. Populated only for client-error (4xx) failures.
 	RequestFingerprint *ModelCallFailureRequestFingerprint `json:"requestFingerprint,omitempty"`
-	Rte                *bool                               `json:"rte,omitempty"`
+	// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+	Rte *bool `json:"rte,omitempty"`
 	// Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
 	ServiceRequestID *string `json:"serviceRequestId,omitempty"`
 	// Where the failed model call originated
@@ -811,6 +947,25 @@ type ModelCallFailureData struct {
 func (*ModelCallFailureData) sessionEventData()      {}
 func (*ModelCallFailureData) Type() SessionEventType { return SessionEventTypeModelCallFailure }
 
+// Final lifecycle outcome for one logical model dispatch. A logical dispatch may include internal reconnect or fallback work, so event count is not provider HTTP-request count.
+type ModelCallFinishedData struct {
+	// Whether an accepted successful response requested the exact name and command semantics of a built-in file edit tool, including an external tool explicitly replacing that built-in name. Absent when the logical dispatch did not produce an accepted response.
+	ContainsBuiltInFileEditRequest *bool `json:"containsBuiltInFileEditRequest,omitempty"`
+	// Monotonic elapsed time spent in the logical model dispatch, including any internal transport reconnect or fallback and excluding orchestrator retry backoff, tool execution, confirmations, and post-response processing
+	DispatchDurationMs float64 `json:"dispatchDurationMs"`
+	// Version of the built-in file-edit semantic classifier used for this event
+	EditClassifierVersion int64 `json:"editClassifierVersion"`
+	// Identifier of the user interaction that owns the model dispatch, matching assistant.turn_start.interactionId when available
+	InteractionID *string `json:"interactionId,omitempty"`
+	// Final outcome after post-response acceptance processing
+	Outcome ModelCallFinishedOutcome `json:"outcome"`
+	// Agent-loop iteration within the interaction that initiated the model dispatch
+	TurnID string `json:"turnId"`
+}
+
+func (*ModelCallFinishedData) sessionEventData()      {}
+func (*ModelCallFinishedData) Type() SessionEventType { return SessionEventTypeModelCallFinished }
+
 // Hook invocation completion details including output, success status, and error information
 type HookEndData struct {
 	// Error details when the hook failed
@@ -858,6 +1013,8 @@ func (*SessionInfoData) Type() SessionEventType { return SessionEventTypeSession
 
 // LLM API call usage metrics including tokens, costs, quotas, and billing information
 type AssistantUsageData struct {
+	// Number of accepted speculative prediction tokens
+	AcceptedPredictionTokens *int64 `json:"acceptedPredictionTokens,omitempty"`
 	// Completion ID from the model provider (e.g., chatcmpl-abc123)
 	APICallID *string `json:"apiCallId,omitempty"`
 	// API endpoint used for this model call, matching CAPI supported_endpoints vocabulary
@@ -865,10 +1022,16 @@ type AssistantUsageData struct {
 	// Number of tools available to the model for this call
 	// Internal: AvailableToolCount is part of the SDK's internal API surface and is not intended for external use.
 	AvailableToolCount *int64 `json:"availableToolCount,omitempty"`
+	// Whether the provider reported prompt-cache usage details for this call
+	// Internal: CacheDetailsReported is part of the SDK's internal API surface and is not intended for external use.
+	CacheDetailsReported *bool `json:"cacheDetailsReported,omitempty"`
 	// Updated prompt-cache expiration for this model call. Present only when the call establishes or refreshes known cache state.
 	CacheExpiresAt *time.Time `json:"cacheExpiresAt,omitempty"`
 	// Number of tokens read from prompt cache
 	CacheReadTokens *int64 `json:"cacheReadTokens,omitempty"`
+	// Effective prompt-cache lifetime in seconds for this call
+	// Internal: CacheTtlSeconds is part of the SDK's internal API surface and is not intended for external use.
+	CacheTtlSeconds *int64 `json:"cacheTtlSeconds,omitempty"`
 	// Number of tokens written to prompt cache
 	CacheWriteTokens *int64 `json:"cacheWriteTokens,omitempty"`
 	// Whether the model response was blocked or truncated by content filtering (finish_reason === 'content_filter'). For Anthropic models this corresponds to a 'refusal' stop reason.
@@ -882,6 +1045,9 @@ type AssistantUsageData struct {
 	Duration *int64 `json:"duration,omitempty"`
 	// Finish reason reported by the model for this API call (e.g. "stop", "length", "tool_calls", "content_filter"). Normalized to OpenAI vocabulary; for Anthropic models a "refusal" stop reason maps to "content_filter".
 	FinishReason *string `json:"finishReason,omitempty"`
+	// How the prompt-cache frontier was determined for this call
+	// Internal: FrontierSource is part of the SDK's internal API surface and is not intended for external use.
+	FrontierSource *string `json:"frontierSource,omitempty"`
 	// What initiated this API call (e.g., "sub-agent", "mcp-sampling"); absent for user-initiated calls
 	Initiator *string `json:"initiator,omitempty"`
 	// Number of input tokens consumed
@@ -890,6 +1056,14 @@ type AssistantUsageData struct {
 	InteractionType *string `json:"interactionType,omitempty"`
 	// Average inter-token latency in milliseconds. Only available for streaming requests
 	InterTokenLatencyMs *float64 `json:"interTokenLatencyMs,omitempty"`
+	// Whether Auto mode was selected for this model call
+	IsAuto *bool `json:"isAuto,omitempty"`
+	// Whether this model call used a bring-your-own-key provider
+	IsByok *bool `json:"isByok,omitempty"`
+	// Requested maximum output tokens used for this model call
+	MaxOutputTokens *int64 `json:"maxOutputTokens,omitempty"`
+	// Effective maximum prompt-token limit used for this model call
+	MaxPromptTokens *int64 `json:"maxPromptTokens,omitempty"`
 	// Model identifier used for this API call
 	Model string `json:"model"`
 	// Number of tool calls returned by the model
@@ -897,6 +1071,8 @@ type AssistantUsageData struct {
 	NumToolCalls *int64 `json:"numToolCalls,omitempty"`
 	// Number of output tokens produced
 	OutputTokens *int64 `json:"outputTokens,omitempty"`
+	// Time to first observable model output in milliseconds. Includes text, reasoning, and tool-call output; only available for streaming requests that produce observable output.
+	OutputTtftMs *float64 `json:"outputTtftMs,omitempty"`
 	// Parent tool call ID when this usage originates from a sub-agent
 	// Deprecated: ParentToolCallID is deprecated.
 	ParentToolCallID *string `json:"parentToolCallId,omitempty"`
@@ -907,9 +1083,14 @@ type AssistantUsageData struct {
 	QuotaSnapshots map[string]AssistantUsageQuotaSnapshot `json:"quotaSnapshots,omitzero"`
 	// Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max")
 	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
+	// Reasoning summary mode used for this model call, if applicable
+	ReasoningSummary *ReasoningSummary `json:"reasoningSummary,omitempty"`
 	// Number of output tokens used for reasoning (e.g., chain-of-thought)
 	ReasoningTokens *int64 `json:"reasoningTokens,omitempty"`
-	Rte             *bool  `json:"rte,omitempty"`
+	// Number of rejected speculative prediction tokens
+	RejectedPredictionTokens *int64 `json:"rejectedPredictionTokens,omitempty"`
+	// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+	Rte *bool `json:"rte,omitempty"`
 	// Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
 	ServiceRequestID *string `json:"serviceRequestId,omitempty"`
 	// Time to first token in milliseconds. Only available for streaming requests
@@ -920,6 +1101,8 @@ type AssistantUsageData struct {
 	// Number of tokens used by tool definitions for this call
 	// Internal: ToolTokenCount is part of the SDK's internal API surface and is not intended for external use.
 	ToolTokenCount *int64 `json:"toolTokenCount,omitempty"`
+	// Transport used for this model call (http or websocket)
+	Transport *AssistantUsageTransport `json:"transport,omitempty"`
 }
 
 func (*AssistantUsageData) sessionEventData()      {}
@@ -1002,6 +1185,39 @@ type AssistantTurnRetryData struct {
 func (*AssistantTurnRetryData) sessionEventData()      {}
 func (*AssistantTurnRetryData) Type() SessionEventType { return SessionEventTypeAssistantTurnRetry }
 
+// Metadata for work the user interrupted while the agent was running
+type AgentInterruptedData struct {
+	// What the agent was doing when the user interrupted it
+	Activity AgentInterruptedActivity `json:"activity"`
+	// For an interrupted model call: the provider endpoint the request targeted
+	APIEndpoint *string `json:"apiEndpoint,omitempty"`
+	// For an interrupted model call: whether the user interrupted before any token arrived or while the response was streaming
+	CancelPhase *AgentInterruptedCancelPhase `json:"cancelPhase,omitempty"`
+	// How long the interrupted work had been running, in milliseconds
+	ElapsedMs float64 `json:"elapsedMs"`
+	// For an interrupted background-agent batch: how many background sub-agents the stop swept. Counts accepted cancellations, so an agent cancelled as a cascade of its interrupted parent is covered by that parent rather than counted again.
+	InterruptedAgentCount *int64 `json:"interruptedAgentCount,omitempty"`
+	// For an interrupted model call: the model the request targeted
+	Model *string `json:"model,omitempty"`
+	// For a mid-stream interrupt: the observed time to first observable output, in milliseconds. Deliberately distinct from the `ttftMs` reported on a successful model call, which measures time to first stream event.
+	OutputTtftMs *float64 `json:"outputTtftMs,omitempty"`
+	// For an interrupted model call: the reasoning effort the request asked for
+	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
+	// Subset of `toolNames` whose tool metadata marks the tool name as safe to record unhashed in telemetry.
+	SafeToolNames []string `json:"safeToolNames,omitzero"`
+	// Tool call identifiers that were still running
+	ToolCallIDs []string `json:"toolCallIds,omitzero"`
+	// Names of the tools that were still running. More than one when the model requested a parallel fan-out.
+	ToolNames []string `json:"toolNames,omitzero"`
+	// For an interrupted model call: the transport the request used
+	Transport *ModelCallFailureTransport `json:"transport,omitempty"`
+	// Zero-based agentic-loop iteration the interrupt landed in
+	Turn int64 `json:"turn"`
+}
+
+func (*AgentInterruptedData) sessionEventData()      {}
+func (*AgentInterruptedData) Type() SessionEventType { return SessionEventTypeAgentInterrupted }
+
 // Model API dispatch metadata for internal telemetry
 type ModelCallStartData struct {
 	// Model identifier used for this API call, when known
@@ -1036,6 +1252,8 @@ type SessionModelChangeData struct {
 	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
 	// Reasoning summary mode after the model change, if applicable
 	ReasoningSummary *ReasoningSummary `json:"reasoningSummary,omitempty"`
+	// Origin of the effective model change, when known.
+	Source *ModelChangeSource `json:"source,omitempty"`
 	// Output verbosity level after the model change, if applicable
 	Verbosity *Verbosity `json:"verbosity,omitempty"`
 }
@@ -1096,6 +1314,24 @@ func (*SessionCustomNotificationData) Type() SessionEventType {
 	return SessionEventTypeSessionCustomNotification
 }
 
+// Ordered output and terminal state for a transient query that does not modify conversation history.
+// Experimental: UIEphemeralQueryData is part of an experimental API and may change or be removed.
+type UIEphemeralQueryData struct {
+	// Full response text, present for the `completed` phase.
+	Answer *string `json:"answer,omitempty"`
+	// Ordered text delta, present for the `chunk` phase.
+	Chunk *string `json:"chunk,omitempty"`
+	// Model or transport failure message, present for the `failed` phase.
+	Error *string `json:"error,omitempty"`
+	// Current query lifecycle phase.
+	Phase UIEphemeralQueryPhase `json:"phase"`
+	// Runtime-minted query identifier.
+	RequestID string `json:"requestId"`
+}
+
+func (*UIEphemeralQueryData) sessionEventData()      {}
+func (*UIEphemeralQueryData) Type() SessionEventType { return SessionEventTypeUIEphemeralQuery }
+
 // Payload emitted whenever the main agent's processing loop goes idle, including while related background work (running agents or in-flight attached shell commands) is still pending and the session-level idle event is therefore deferred
 type AssistantIdleData struct {
 	// True when the preceding agentic loop was cancelled via abort signal
@@ -1140,11 +1376,20 @@ func (*MCPToolsListChangedData) Type() SessionEventType { return SessionEventTyp
 type SessionIdleData struct {
 	// True when the preceding agentic loop was cancelled via abort signal
 	Aborted *bool `json:"aborted,omitempty"`
+	// The session mode the agent was operating in when it went idle, when the mode is known. Lets turn-scoped consumers distinguish an autopilot continuation boundary (where the agent keeps working after this idle) from a genuine turn completion.
+	Mode *SessionMode `json:"mode,omitempty"`
 }
 
 func (*SessionIdleData) sessionEventData()      {}
 func (*SessionIdleData) Type() SessionEventType { return SessionEventTypeSessionIdle }
 
+// Payload of `sandbox.decision`, a bounded governance record of what the process sandbox was configured to do and whether it took effect. Discriminated by `kind`.
+type SandboxDecisionData struct {
+}
+
+func (*SandboxDecisionData) sessionEventData()      {}
+func (*SandboxDecisionData) Type() SessionEventType { return SessionEventTypeSandboxDecision }
+
 // Payload of `session.canvas.closed` with the closed canvas instance ID, provider ID, and canvas ID.
 // Experimental: SessionCanvasClosedData is part of an experimental API and may change or be removed.
 type SessionCanvasClosedData struct {
@@ -1302,6 +1547,8 @@ type UserMessageData struct {
 	SupportedNativeDocumentMIMETypes []string `json:"supportedNativeDocumentMimeTypes,omitzero"`
 	// Transformed version of the message sent to the model, with XML wrapping, timestamps, and other augmentations for prompt caching
 	TransformedContent *string `json:"transformedContent,omitempty"`
+	// The agent-loop turn ID that consumed this message; absent when no agent-loop turn consumed it
+	TurnID *string `json:"turnId,omitempty"`
 }
 
 func (*UserMessageData) sessionEventData()      {}
@@ -1337,18 +1584,18 @@ type PermissionRequestedData struct {
 func (*PermissionRequestedData) sessionEventData()      {}
 func (*PermissionRequestedData) Type() SessionEventType { return SessionEventTypePermissionRequested }
 
-// Permissions change details carrying the aggregate allow-all transition.
+// Permission-mode transition details.
+// Experimental: SessionPermissionsChangedData is part of an experimental API and may change or be removed.
 type SessionPermissionsChangedData struct {
-	// Allow-all mode after the change
-	// Experimental: AllowAllPermissionMode is part of an experimental API and may change or be removed.
-	AllowAllPermissionMode *PermissionAllowAllMode `json:"allowAllPermissionMode,omitempty"`
-	// Aggregate allow-all flag after the change
-	AllowAllPermissions bool `json:"allowAllPermissions"`
-	// Allow-all mode before the change
-	// Experimental: PreviousAllowAllPermissionMode is part of an experimental API and may change or be removed.
-	PreviousAllowAllPermissionMode *PermissionAllowAllMode `json:"previousAllowAllPermissionMode,omitempty"`
-	// Aggregate allow-all flag before the change
-	PreviousAllowAllPermissions bool `json:"previousAllowAllPermissions"`
+	// Explicit LLM judge model override used by assisted mode; omitted when the provider default applies
+	// Experimental: AssistedApprovalModel is part of an experimental API and may change or be removed.
+	AssistedApprovalModel *string `json:"assistedApprovalModel,omitempty"`
+	// Permission mode after the change
+	// Experimental: Mode is part of an experimental API and may change or be removed.
+	Mode PermissionMode `json:"mode"`
+	// Permission mode before the change
+	// Experimental: PreviousMode is part of an experimental API and may change or be removed.
+	PreviousMode PermissionMode `json:"previousMode"`
 }
 
 func (*SessionPermissionsChangedData) sessionEventData() {}
@@ -1371,6 +1618,8 @@ func (*ToolSearchActivatedData) Type() SessionEventType { return SessionEventTyp
 type ExitPlanModeRequestedData struct {
 	// Available actions the user can take
 	Actions []ExitPlanModeAction `json:"actions"`
+	// Model the session had selected when the plan was authored, when one is known
+	Model *string `json:"model,omitempty"`
 	// Full content of the plan file
 	PlanContent string `json:"planContent"`
 	// Recommended action to preselect for the user
@@ -1711,6 +1960,8 @@ func (*SessionSnapshotRewindData) Type() SessionEventType {
 
 // Session termination metrics including usage statistics, code changes, and shutdown reason
 type SessionShutdownData struct {
+	// Per-agent usage breakdown, keyed by agent instance identifier. The main conversation uses the stable key `main`.
+	AgentMetrics map[string]ShutdownAgentMetric `json:"agentMetrics,omitzero"`
 	// Aggregate code change metrics for the session
 	CodeChanges ShutdownCodeChanges `json:"codeChanges"`
 	// Non-system message token count at shutdown
@@ -1880,8 +2131,20 @@ type SubagentCompletedData struct {
 	AgentDisplayName string `json:"agentDisplayName"`
 	// Internal name of the sub-agent
 	AgentName string `json:"agentName"`
+	// Whether the sub-agent was torn down by cancellation - its own abort, or an ancestor being killed - instead of finishing its work. Cancellation is not a failure, so the run still reports completion; this distinguishes a torn-down sub-agent from one that ran to the end.
+	Cancelled *bool `json:"cancelled,omitempty"`
+	// Whether the first model actually dispatched matched the user's configured preference
+	ConfiguredModelMatchesActual *bool `json:"configuredModelMatchesActual,omitempty"`
+	// Concrete model the user configured for this sub-agent via `/subagents`, when present
+	ConfiguredModelPreference *string `json:"configuredModelPreference,omitempty"`
 	// Wall-clock duration of the sub-agent execution in milliseconds
 	DurationMs *int64 `json:"durationMs,omitempty"`
+	// Whether the explicit task-call model matched the user's configured preference
+	ExplicitModelMatchesPreference *bool `json:"explicitModelMatchesPreference,omitempty"`
+	// Explicit model supplied by the parent agent on the task call, when present
+	ExplicitModelOverride *string `json:"explicitModelOverride,omitempty"`
+	// First model for which the sub-agent started an inference request, when one was dispatched
+	FirstDispatchedModel *string `json:"firstDispatchedModel,omitempty"`
 	// Model used by the sub-agent
 	Model *string `json:"model,omitempty"`
 	// Tool call ID of the parent tool invocation that spawned this sub-agent
@@ -1901,10 +2164,20 @@ type SubagentFailedData struct {
 	AgentDisplayName string `json:"agentDisplayName"`
 	// Internal name of the sub-agent
 	AgentName string `json:"agentName"`
+	// Whether the first model actually dispatched matched the user's configured preference
+	ConfiguredModelMatchesActual *bool `json:"configuredModelMatchesActual,omitempty"`
+	// Concrete model the user configured for this sub-agent via `/subagents`, when present
+	ConfiguredModelPreference *string `json:"configuredModelPreference,omitempty"`
 	// Wall-clock duration of the sub-agent execution in milliseconds
 	DurationMs *int64 `json:"durationMs,omitempty"`
 	// Error message describing why the sub-agent failed
 	Error string `json:"error"`
+	// Whether the explicit task-call model matched the user's configured preference
+	ExplicitModelMatchesPreference *bool `json:"explicitModelMatchesPreference,omitempty"`
+	// Explicit model supplied by the parent agent on the task call, when present
+	ExplicitModelOverride *string `json:"explicitModelOverride,omitempty"`
+	// First model for which the sub-agent started an inference request, when one was dispatched
+	FirstDispatchedModel *string `json:"firstDispatchedModel,omitempty"`
 	// Model selected for the sub-agent, when known
 	Model *string `json:"model,omitempty"`
 	// Tool call ID of the parent tool invocation that spawned this sub-agent
@@ -1926,6 +2199,8 @@ type SubagentStartedData struct {
 	AgentDisplayName string `json:"agentDisplayName"`
 	// Internal name of the sub-agent
 	AgentName string `json:"agentName"`
+	// Root id of the factory run that spawned this sub-agent, when it was spawned by one.
+	FactoryRunID *string `json:"factoryRunId,omitempty"`
 	// Model the sub-agent will run with, when known at start.
 	Model *string `json:"model,omitempty"`
 	// Tool call ID of the parent tool invocation that spawned this sub-agent
@@ -1965,16 +2240,6 @@ func (*SystemMessageData) Type() SessionEventType { return SessionEventTypeSyste
 
 // Task completion notification with summary from the agent
 type SessionTaskCompleteData struct {
-	// Active autopilot objective ID evaluated by the completion reviewer
-	ObjectiveID *int64 `json:"objectiveId,omitempty"`
-	// Semantic completion decision. Absent on legacy events and invalid tool calls
-	Outcome *TaskCompletionOutcome `json:"outcome,omitempty"`
-	// Label-safe runtime rationale for the completion decision (e.g. a cancellation or pause/resume downgrade), when one applies. Reviewer-authored rationale is intentionally omitted here because this event has no IFC label channel; the reviewer's findings remain available through its own labeled sub-agent events
-	Reason *string `json:"reason,omitempty"`
-	// Whether the task was accepted as complete. False when validation failed or completion was rejected or blocked by the reviewer
-	Success *bool `json:"success,omitempty"`
-	// Summary of the completed task, provided by the agent
-	Summary *string `json:"summary,omitempty"`
 }
 
 func (*SessionTaskCompleteData) sessionEventData()      {}
@@ -1998,7 +2263,8 @@ type ToolExecutionCompleteData struct {
 	ParentToolCallID *string `json:"parentToolCallId,omitempty"`
 	// Tool execution result on success
 	Result *ToolExecutionCompleteResult `json:"result,omitempty"`
-	Rte    *bool                        `json:"rte,omitempty"`
+	// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+	Rte *bool `json:"rte,omitempty"`
 	// Whether this tool execution ran inside a sandbox container
 	Sandboxed *bool `json:"sandboxed,omitempty"`
 	// Whether the tool execution completed successfully
@@ -2046,7 +2312,8 @@ type ToolExecutionStartData struct {
 	// Tool call ID of the parent tool invocation when this event originates from a sub-agent
 	// Deprecated: ParentToolCallID is deprecated.
 	ParentToolCallID *string `json:"parentToolCallId,omitempty"`
-	Rte              *bool   `json:"rte,omitempty"`
+	// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+	Rte *bool `json:"rte,omitempty"`
 	// Shell-tool path hints derived from the command at start time for shell tools (bash/powershell/local_shell). Produced by the same shell-aware extractor as PermissionRequestShell.possiblePaths, so it is present even when the command is auto-approved and no permission request fires. Absent for non-shell tools.
 	ShellToolInfo *ToolExecutionStartShellToolInfo `json:"shellToolInfo,omitempty"`
 	// Unique identifier for this tool call
@@ -2207,14 +2474,28 @@ func (*SessionWorkspaceFileChangedData) Type() SessionEventType {
 	return SessionEventTypeSessionWorkspaceFileChanged
 }
 
+// Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping
+// Experimental: AssistantMessageReasoningBlocks is part of an experimental API and may change or be removed.
+type AssistantMessageReasoningBlocks struct {
+	// Provider-native reasoning content blocks (e.g. Anthropic `thinking` / `redacted_thinking`) preserved verbatim, in order. A single response can carry several, each signed over the content preceding it, so dropping or reordering any of them invalidates the rest.
+	Blocks []any `json:"blocks,omitzero"`
+	// Model provider that produced these reasoning blocks.
+	Provider string `json:"provider"`
+}
+
 // Neutral provider-tagged server-side tool-use payload (tool search, advisor) for verbatim round-tripping
 // Experimental: AssistantMessageServerTools is part of an experimental API and may change or be removed.
 type AssistantMessageServerTools struct {
-	AdvisorModel           *string           `json:"advisorModel,omitempty"`
+	// Advisor model identifier associated with the server-tool payload.
+	AdvisorModel *string `json:"advisorModel,omitempty"`
+	// Provider function-call namespaces keyed by function-call identifier.
 	FunctionCallNamespaces map[string]string `json:"functionCallNamespaces,omitzero"`
-	Items                  []any             `json:"items,omitzero"`
-	Provider               string            `json:"provider"`
-	RawContentBlocks       []any             `json:"rawContentBlocks,omitzero"`
+	// Provider-native server-tool call and output items preserved verbatim for replay.
+	Items []any `json:"items,omitzero"`
+	// Model provider that produced this server-tool payload.
+	Provider string `json:"provider"`
+	// Raw provider content blocks retained for verbatim round-tripping.
+	RawContentBlocks []any `json:"rawContentBlocks,omitzero"`
 }
 
 // A tool invocation request from the assistant
@@ -2684,17 +2965,17 @@ type ModelCallFailureRequestFingerprint struct {
 	ToolResultMessageCount int64 `json:"toolResultMessageCount"`
 }
 
-// Auto-approval judge information attached to a permission request. Present (non-null) only when the session's allow-all mode is "auto"; its absence means auto mode was off and the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request.
-// Experimental: PermissionAutoApproval is part of an experimental API and may change or be removed.
-type PermissionAutoApproval struct {
+// Assisted-approval judge information attached to a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request.
+// Experimental: PermissionAssistedApproval is part of an experimental API and may change or be removed.
+type PermissionAssistedApproval struct {
 	// Classified cause of an `error` recommendation. Absent for every other recommendation.
-	FailureReason *AutoApprovalJudgeFailureReason `json:"failureReason,omitempty"`
+	FailureReason *AssistedApprovalJudgeFailureReason `json:"failureReason,omitempty"`
 	// Model id that produced the recommendation, when the judge was consulted and reported one. Absent for `excluded` (the judge was not consulted) and for failures that occurred before a model was selected.
 	Model *string `json:"model,omitempty"`
 	// Human-readable reason for the judge's recommendation, when available.
 	Reason *string `json:"reason,omitempty"`
-	// The auto-approval safety judge's outcome for this request.
-	Recommendation AutoApprovalRecommendation `json:"recommendation"`
+	// The assisted-approval safety judge's outcome for this request.
+	Recommendation AssistedApprovalRecommendation `json:"recommendation"`
 }
 
 // Derived user-facing permission prompt details for UI consumers
@@ -2715,9 +2996,9 @@ func (r RawPermissionPromptRequest) Kind() PermissionPromptRequestKind {
 
 // Shell command permission prompt
 type PermissionPromptRequestCommands struct {
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Whether the UI can offer session-wide approval for this command pattern
 	CanOfferSessionApproval bool `json:"canOfferSessionApproval"`
 	// Command identifiers covered by this approval prompt
@@ -2743,9 +3024,9 @@ func (PermissionPromptRequestCommands) Kind() PermissionPromptRequestKind {
 type PermissionPromptRequestCustomTool struct {
 	// Arguments to pass to the custom tool
 	Args any `json:"args,omitempty"`
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Tool call ID that triggered this permission request
 	ToolCallID *string `json:"toolCallId,omitempty"`
 	// Description of what the custom tool does
@@ -2759,11 +3040,29 @@ func (PermissionPromptRequestCustomTool) Kind() PermissionPromptRequestKind {
 	return PermissionPromptRequestKindCustomTool
 }
 
+// Extension sensitive environment variable access prompt
+type PermissionPromptRequestExtensionEnvAccess struct {
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
+	// Names of the sensitive environment variables the extension is requesting. Values never appear here.
+	EnvironmentVariables []string `json:"environmentVariables"`
+	// Name of the extension requesting environment variable access
+	ExtensionName string `json:"extensionName"`
+	// Tool call ID that triggered this permission request
+	ToolCallID *string `json:"toolCallId,omitempty"`
+}
+
+func (PermissionPromptRequestExtensionEnvAccess) permissionPromptRequest() {}
+func (PermissionPromptRequestExtensionEnvAccess) Kind() PermissionPromptRequestKind {
+	return PermissionPromptRequestKindExtensionEnvAccess
+}
+
 // Extension management permission prompt
 type PermissionPromptRequestExtensionManagement struct {
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Name of the extension being managed
 	ExtensionName *string `json:"extensionName,omitempty"`
 	// The extension management operation (scaffold, reload)
@@ -2779,9 +3078,9 @@ func (PermissionPromptRequestExtensionManagement) Kind() PermissionPromptRequest
 
 // Extension permission access prompt
 type PermissionPromptRequestExtensionPermissionAccess struct {
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Capabilities the extension is requesting
 	Capabilities []string `json:"capabilities"`
 	// Name of the extension requesting permission access
@@ -2799,15 +3098,19 @@ func (PermissionPromptRequestExtensionPermissionAccess) Kind() PermissionPromptR
 type PermissionPromptRequestFactory struct {
 	// Canonical key used for scoped factory approvals
 	ApprovalKey string `json:"approvalKey"`
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Whether this factory is eligible for persistent approval
-	CanPersistApproval             bool     `json:"canPersistApproval"`
-	DeclaredMaxAiCredits           *float64 `json:"declaredMaxAiCredits,omitempty"`
-	DeclaredMaxConcurrentSubagents *int64   `json:"declaredMaxConcurrentSubagents,omitempty"`
-	DeclaredMaxTotalSubagents      *int64   `json:"declaredMaxTotalSubagents,omitempty"`
-	DeclaredTimeoutSeconds         *float64 `json:"declaredTimeoutSeconds,omitempty"`
+	CanPersistApproval bool `json:"canPersistApproval"`
+	// Factory-declared AI-credit limit before any run/resume caller override is applied.
+	DeclaredMaxAiCredits *float64 `json:"declaredMaxAiCredits,omitempty"`
+	// Factory-declared concurrent-subagent limit before any run/resume caller override is applied.
+	DeclaredMaxConcurrentSubagents *int64 `json:"declaredMaxConcurrentSubagents,omitempty"`
+	// Factory-declared total-subagent limit before any run/resume caller override is applied.
+	DeclaredMaxTotalSubagents *int64 `json:"declaredMaxTotalSubagents,omitempty"`
+	// Factory-declared active-time limit in seconds before any run/resume caller override is applied.
+	DeclaredTimeoutSeconds *float64 `json:"declaredTimeoutSeconds,omitempty"`
 	// Factory description
 	Description string `json:"description"`
 	// Whether managed policy requires a human response and forbids host auto-approval
@@ -2837,9 +3140,9 @@ func (PermissionPromptRequestFactory) Kind() PermissionPromptRequestKind {
 
 // Hook confirmation permission prompt
 type PermissionPromptRequestHook struct {
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Optional message from the hook explaining why confirmation is needed
 	HookMessage *string `json:"hookMessage,omitempty"`
 	// Arguments of the tool call being gated
@@ -2859,9 +3162,14 @@ func (PermissionPromptRequestHook) Kind() PermissionPromptRequestKind {
 type PermissionPromptRequestMCP struct {
 	// Arguments to pass to the MCP tool
 	Args any `json:"args,omitempty"`
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
+	// Whether the host may offer a server-wide "approve all tools from this server" blanket. Absent is treated as true; the runtime sends false when managed policy disables bypass-permissions mode, which forbids the server-wide escalation while still allowing per-tool approval.
+	CanOfferServerWideApproval *bool `json:"canOfferServerWideApproval,omitempty"`
+	// Advisory runtime permission recommendation. The host remains responsible for deciding the request and may reject it.
+	// Experimental: PermissionRecommendation is part of an experimental API and may change or be removed.
+	PermissionRecommendation *PermissionRecommendation `json:"permissionRecommendation,omitempty"`
 	// Name of the MCP server providing the tool
 	ServerName string `json:"serverName"`
 	// Tool call ID that triggered this permission request
@@ -2881,9 +3189,9 @@ func (PermissionPromptRequestMCP) Kind() PermissionPromptRequestKind {
 type PermissionPromptRequestMemory struct {
 	// Whether this is a store or vote memory operation
 	Action *PermissionRequestMemoryAction `json:"action,omitempty"`
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Source references for the stored fact (store only)
 	Citations *string `json:"citations,omitempty"`
 	// Vote direction (vote only)
@@ -2907,9 +3215,9 @@ func (PermissionPromptRequestMemory) Kind() PermissionPromptRequestKind {
 type PermissionPromptRequestPath struct {
 	// Underlying permission kind that needs path approval
 	AccessKind PermissionPromptRequestPathAccessKind `json:"accessKind"`
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// File paths that require explicit approval
 	Paths []string `json:"paths"`
 	// Tool call ID that triggered this permission request
@@ -2923,9 +3231,9 @@ func (PermissionPromptRequestPath) Kind() PermissionPromptRequestKind {
 
 // File read permission prompt
 type PermissionPromptRequestRead struct {
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Human-readable description of why the file is being read
 	Intention string `json:"intention"`
 	// Whether managed policy requires a human response and forbids host auto-approval
@@ -2943,9 +3251,9 @@ func (PermissionPromptRequestRead) Kind() PermissionPromptRequestKind {
 
 // URL access permission prompt
 type PermissionPromptRequestURL struct {
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Human-readable description of why the URL is being accessed
 	Intention string `json:"intention"`
 	// Whether managed policy requires a human response and forbids host auto-approval
@@ -2969,9 +3277,9 @@ func (PermissionPromptRequestURL) Kind() PermissionPromptRequestKind {
 
 // File write permission prompt
 type PermissionPromptRequestWrite struct {
-	// Auto-approval judge information for this request; present only when auto mode is enabled.
-	// Experimental: AutoApproval is part of an experimental API and may change or be removed.
-	AutoApproval *PermissionAutoApproval `json:"autoApproval,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Whether the UI can offer session-wide approval for file write operations
 	CanOfferSessionApproval bool `json:"canOfferSessionApproval"`
 	// Unified diff showing the proposed changes
@@ -3016,6 +3324,8 @@ type PermissionRequestCustomTool struct {
 	Args any `json:"args,omitempty"`
 	// When true, managed policy requires an explicit user decision and automatic approval must be bypassed.
 	ManagedApprovalRequired *bool `json:"managedApprovalRequired,omitempty"`
+	// Whether the tool declared that permission may be skipped unless a deny rule matches
+	SkipPermission *bool `json:"skipPermission,omitempty"`
 	// Tool call ID that triggered this permission request
 	ToolCallID *string `json:"toolCallId,omitempty"`
 	// Description of what the custom tool does
@@ -3029,6 +3339,23 @@ func (PermissionRequestCustomTool) Kind() PermissionRequestKind {
 	return PermissionRequestKindCustomTool
 }
 
+// Extension sensitive environment variable access request
+type PermissionRequestExtensionEnvAccess struct {
+	// Names of the sensitive environment variables the extension is requesting. Values never appear here.
+	EnvironmentVariables []string `json:"environmentVariables"`
+	// Name of the extension requesting environment variable access
+	ExtensionName string `json:"extensionName"`
+	// When true, managed policy requires an explicit user decision and automatic approval must be bypassed.
+	ManagedApprovalRequired *bool `json:"managedApprovalRequired,omitempty"`
+	// Tool call ID that triggered this permission request
+	ToolCallID *string `json:"toolCallId,omitempty"`
+}
+
+func (PermissionRequestExtensionEnvAccess) permissionRequest() {}
+func (PermissionRequestExtensionEnvAccess) Kind() PermissionRequestKind {
+	return PermissionRequestKindExtensionEnvAccess
+}
+
 // Extension management permission request
 type PermissionRequestExtensionManagement struct {
 	// Name of the extension being managed
@@ -3068,11 +3395,15 @@ type PermissionRequestFactory struct {
 	// Canonical key used for scoped factory approvals
 	ApprovalKey string `json:"approvalKey"`
 	// Whether this factory is eligible for persistent approval
-	CanPersistApproval             bool     `json:"canPersistApproval"`
-	DeclaredMaxAiCredits           *float64 `json:"declaredMaxAiCredits,omitempty"`
-	DeclaredMaxConcurrentSubagents *int64   `json:"declaredMaxConcurrentSubagents,omitempty"`
-	DeclaredMaxTotalSubagents      *int64   `json:"declaredMaxTotalSubagents,omitempty"`
-	DeclaredTimeoutSeconds         *float64 `json:"declaredTimeoutSeconds,omitempty"`
+	CanPersistApproval bool `json:"canPersistApproval"`
+	// Factory-declared AI-credit limit before any run/resume caller override is applied.
+	DeclaredMaxAiCredits *float64 `json:"declaredMaxAiCredits,omitempty"`
+	// Factory-declared concurrent-subagent limit before any run/resume caller override is applied.
+	DeclaredMaxConcurrentSubagents *int64 `json:"declaredMaxConcurrentSubagents,omitempty"`
+	// Factory-declared total-subagent limit before any run/resume caller override is applied.
+	DeclaredMaxTotalSubagents *int64 `json:"declaredMaxTotalSubagents,omitempty"`
+	// Factory-declared active-time limit in seconds before any run/resume caller override is applied.
+	DeclaredTimeoutSeconds *float64 `json:"declaredTimeoutSeconds,omitempty"`
 	// Factory description
 	Description string `json:"description"`
 	// When true, managed policy requires an explicit user decision and automatic approval must be bypassed.
@@ -3125,6 +3456,9 @@ type PermissionRequestMCP struct {
 	Args any `json:"args,omitempty"`
 	// When true, managed policy requires an explicit user decision and automatic approval must be bypassed.
 	ManagedApprovalRequired *bool `json:"managedApprovalRequired,omitempty"`
+	// Advisory runtime permission recommendation. The SDK host remains responsible for deciding the request and may reject it.
+	// Experimental: PermissionRecommendation is part of an experimental API and may change or be removed.
+	PermissionRecommendation *PermissionRecommendation `json:"permissionRecommendation,omitempty"`
 	// Whether this MCP tool is read-only (no side effects)
 	ReadOnly bool `json:"readOnly"`
 	// Name of the MCP server providing the tool
@@ -3146,6 +3480,9 @@ func (PermissionRequestMCP) Kind() PermissionRequestKind {
 type PermissionRequestMemory struct {
 	// Whether this is a store or vote memory operation
 	Action *PermissionRequestMemoryAction `json:"action,omitempty"`
+	// Assisted-approval judge information for this request; present only in assisted mode.
+	// Experimental: AssistedApproval is part of an experimental API and may change or be removed.
+	AssistedApproval *PermissionAssistedApproval `json:"assistedApproval,omitempty"`
 	// Source references for the stored fact (store only)
 	Citations *string `json:"citations,omitempty"`
 	// Vote direction (vote only)
@@ -3156,6 +3493,10 @@ type PermissionRequestMemory struct {
 	ManagedApprovalRequired *bool `json:"managedApprovalRequired,omitempty"`
 	// Reason for the vote (vote only)
 	Reason *string `json:"reason,omitempty"`
+	// Repository name with owner associated with the stored memory (store only)
+	RepoNwo *string `json:"repoNwo,omitempty"`
+	// Scope of the stored memory (store only)
+	Scope *PermissionRequestMemoryScope `json:"scope,omitempty"`
 	// Topic or subject of the memory (store only)
 	Subject *string `json:"subject,omitempty"`
 	// Tool call ID that triggered this permission request
@@ -3313,6 +3654,8 @@ func (r RawPermissionResult) Kind() PermissionResultKind {
 
 // Permission response variant indicating the request was approved without persisting an approval rule.
 type PermissionApproved struct {
+	// Whether a managed approval policy already handled this request
+	ManagedApprovalHandled *bool `json:"managedApprovalHandled,omitempty"`
 }
 
 func (PermissionApproved) permissionResult() {}
@@ -3326,6 +3669,8 @@ type PermissionApprovedForLocation struct {
 	Approval UserToolSessionApproval `json:"approval"`
 	// The location key (git root or cwd) to persist the approval to
 	LocationKey string `json:"locationKey"`
+	// Whether a managed approval policy already handled this request
+	ManagedApprovalHandled *bool `json:"managedApprovalHandled,omitempty"`
 }
 
 func (PermissionApprovedForLocation) permissionResult() {}
@@ -3337,6 +3682,8 @@ func (PermissionApprovedForLocation) Kind() PermissionResultKind {
 type PermissionApprovedForSession struct {
 	// The approval to add as a session-scoped rule
 	Approval UserToolSessionApproval `json:"approval"`
+	// Whether a managed approval policy already handled this request
+	ManagedApprovalHandled *bool `json:"managedApprovalHandled,omitempty"`
 }
 
 func (PermissionApprovedForSession) permissionResult() {}
@@ -3508,6 +3855,20 @@ type SessionLimitsExhaustedResponse struct {
 	MaxAiCredits *float64 `json:"maxAiCredits,omitempty"`
 }
 
+// Usage attributed to one agent instance at session shutdown.
+type ShutdownAgentMetric struct {
+	// Human-readable label for this subagent invocation, copied from the originating `subagent.started` event. For task-tool subagents this is the invocation's task description rather than the agent's configured display name, so group by `agentName` for stable per-agent labels.
+	AgentDisplayName *string `json:"agentDisplayName,omitempty"`
+	// Configured agent name, when this is a subagent
+	AgentName *string `json:"agentName,omitempty"`
+	// Per-model usage for this agent, keyed by model identifier
+	ModelMetrics map[string]ShutdownModelMetric `json:"modelMetrics"`
+	// Time spent in model API calls by this agent, in milliseconds
+	TotalAPIDurationMs int64 `json:"totalApiDurationMs"`
+	// Accumulated nano-AI units cost for this agent
+	TotalNanoAiu float64 `json:"totalNanoAiu"`
+}
+
 // Aggregate code change metrics for the session
 type ShutdownCodeChanges struct {
 	// List of file paths that were modified during the session
@@ -3571,6 +3932,8 @@ type ShutdownTokenDetail struct {
 type SkillsLoadedSkill struct {
 	// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
 	ArgumentHint *string `json:"argumentHint,omitempty"`
+	// Canonical slash command name used to invoke the skill, without the leading '/'
+	CommandName *string `json:"commandName,omitempty"`
 	// Description of what the skill does
 	Description string `json:"description"`
 	// Whether the skill is currently enabled
@@ -3611,12 +3974,14 @@ func (r RawSystemNotification) Type() SystemNotificationType {
 
 // System notification metadata for a background agent that completed or failed, including agent ID, type, status, description, and prompt.
 type SystemNotificationAgentCompleted struct {
-	// Unique identifier of the background agent
+	// Unique task identifier
 	AgentID string `json:"agentId"`
 	// Type of the agent (e.g., explore, task, general-purpose)
 	AgentType string `json:"agentType"`
 	// Human-readable description of the agent task
 	Description *string `json:"description,omitempty"`
+	// Friendly, non-unique name intended for display
+	DisplayName *string `json:"displayName,omitempty"`
 	// The full prompt given to the background agent
 	Prompt *string `json:"prompt,omitempty"`
 	// Whether the agent completed successfully or failed
@@ -3630,12 +3995,14 @@ func (SystemNotificationAgentCompleted) Type() SystemNotificationType {
 
 // System notification metadata for a background agent that became idle, including agent ID, type, and description.
 type SystemNotificationAgentIdle struct {
-	// Unique identifier of the background agent
+	// Unique task identifier
 	AgentID string `json:"agentId"`
 	// Type of the agent (e.g., explore, task, general-purpose)
 	AgentType string `json:"agentType"`
 	// Human-readable description of the agent task
 	Description *string `json:"description,omitempty"`
+	// Friendly, non-unique name intended for display
+	DisplayName *string `json:"displayName,omitempty"`
 }
 
 func (SystemNotificationAgentIdle) systemNotification() {}
@@ -3962,18 +4329,24 @@ type ToolExecutionCompleteUIResourceMeta struct {
 // MCP Apps UI resource metadata for a completed tool result, including CSP, permissions, domain, and border preference.
 type ToolExecutionCompleteUIResourceMetaUI struct {
 	// CSP domain allowlists for an MCP Apps UI resource, including connect, resource, frame, and base URI domains.
-	Csp    *ToolExecutionCompleteUIResourceMetaUICsp `json:"csp,omitempty"`
-	Domain *string                                   `json:"domain,omitempty"`
+	Csp *ToolExecutionCompleteUIResourceMetaUICsp `json:"csp,omitempty"`
+	// Optional dedicated origin for the rendered MCP Apps UI resource.
+	Domain *string `json:"domain,omitempty"`
 	// Browser permission metadata for an MCP Apps UI resource, including camera, microphone, geolocation, and clipboard-write.
-	Permissions   *ToolExecutionCompleteUIResourceMetaUIPermissions `json:"permissions,omitempty"`
-	PrefersBorder *bool                                             `json:"prefersBorder,omitempty"`
+	Permissions *ToolExecutionCompleteUIResourceMetaUIPermissions `json:"permissions,omitempty"`
+	// Whether the host should render a border around the MCP Apps UI resource.
+	PrefersBorder *bool `json:"prefersBorder,omitempty"`
 }
 
 // CSP domain allowlists for an MCP Apps UI resource, including connect, resource, frame, and base URI domains.
 type ToolExecutionCompleteUIResourceMetaUICsp struct {
-	BaseURIDomains  []string `json:"baseUriDomains,omitzero"`
-	ConnectDomains  []string `json:"connectDomains,omitzero"`
-	FrameDomains    []string `json:"frameDomains,omitzero"`
+	// Domains the UI resource may use as document base URIs.
+	BaseURIDomains []string `json:"baseUriDomains,omitzero"`
+	// Domains the UI resource may connect to.
+	ConnectDomains []string `json:"connectDomains,omitzero"`
+	// Domains the UI resource may embed as nested frames.
+	FrameDomains []string `json:"frameDomains,omitzero"`
+	// Domains from which the UI resource may load scripts, styles, images, and other resources.
 	ResourceDomains []string `json:"resourceDomains,omitzero"`
 }
 
@@ -4074,6 +4447,30 @@ type WorkingDirectoryContext struct {
 	RepositoryHost *string `json:"repositoryHost,omitempty"`
 }
 
+// What the agent was doing when the user interrupted it.
+type AgentInterruptedActivity string
+
+const (
+	// Background sub-agents were running while the main loop was idle.
+	AgentInterruptedActivityBackgroundAgent AgentInterruptedActivity = "background_agent"
+	// A request to the model was open.
+	AgentInterruptedActivityModelCall AgentInterruptedActivity = "model_call"
+	// The turn was sleeping between retry attempts.
+	AgentInterruptedActivityRetryBackoff AgentInterruptedActivity = "retry_backoff"
+	// One or more tools were executing.
+	AgentInterruptedActivityToolCall AgentInterruptedActivity = "tool_call"
+)
+
+// Where the interruption landed relative to the first streamed token.
+type AgentInterruptedCancelPhase string
+
+const (
+	// The response was already streaming when the request was cancelled.
+	AgentInterruptedCancelPhaseMidStream AgentInterruptedCancelPhase = "mid_stream"
+	// No output had been produced when the request was cancelled.
+	AgentInterruptedCancelPhasePreFirstToken AgentInterruptedCancelPhase = "pre_first_token"
+)
+
 // Tool call type: "function" for standard tool calls, "custom" for grammar-based tool calls. Defaults to "function" when absent.
 type AssistantMessageToolRequestType string
 
@@ -4098,36 +4495,46 @@ const (
 	AssistantUsageAPIEndpointWsResponses AssistantUsageAPIEndpoint = "ws:/responses"
 )
 
-// Why the auto-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs.
-// Experimental: AutoApprovalJudgeFailureReason is part of an experimental API and may change or be removed.
-type AutoApprovalJudgeFailureReason string
+// Transport used for a successful model call
+type AssistantUsageTransport string
+
+const (
+	// HTTP transport, including SSE streams.
+	AssistantUsageTransportHTTP AssistantUsageTransport = "http"
+	// WebSocket transport.
+	AssistantUsageTransportWebsocket AssistantUsageTransport = "websocket"
+)
+
+// Why the assisted-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs.
+// Experimental: AssistedApprovalJudgeFailureReason is part of an experimental API and may change or be removed.
+type AssistedApprovalJudgeFailureReason string
 
 const (
 	// The judge model call was cancelled before it returned.
-	AutoApprovalJudgeFailureReasonAbort AutoApprovalJudgeFailureReason = "abort"
+	AssistedApprovalJudgeFailureReasonAbort AssistedApprovalJudgeFailureReason = "abort"
 	// The judge model call completed but returned no content.
-	AutoApprovalJudgeFailureReasonEmptyResponse AutoApprovalJudgeFailureReason = "empty_response"
+	AssistedApprovalJudgeFailureReasonEmptyResponse AssistedApprovalJudgeFailureReason = "empty_response"
 	// The judge model call failed (for example a transport, authentication, or rate-limit error).
-	AutoApprovalJudgeFailureReasonModelError AutoApprovalJudgeFailureReason = "model_error"
+	AssistedApprovalJudgeFailureReasonModelError AssistedApprovalJudgeFailureReason = "model_error"
 	// The judge model replied, but the reply carried no ALLOW/DENY verdict.
-	AutoApprovalJudgeFailureReasonParseError AutoApprovalJudgeFailureReason = "parse_error"
+	AssistedApprovalJudgeFailureReasonParseError AssistedApprovalJudgeFailureReason = "parse_error"
 	// The judge model call exceeded its deadline.
-	AutoApprovalJudgeFailureReasonTimeout AutoApprovalJudgeFailureReason = "timeout"
+	AssistedApprovalJudgeFailureReasonTimeout AssistedApprovalJudgeFailureReason = "timeout"
 )
 
-// Outcome of the auto-approval safety judge for a permission request. Present only when auto mode is enabled; its absence means the judge did not evaluate the request (auto mode was off).
-// Experimental: AutoApprovalRecommendation is part of an experimental API and may change or be removed.
-type AutoApprovalRecommendation string
+// Outcome of the assisted-approval safety judge for a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request.
+// Experimental: AssistedApprovalRecommendation is part of an experimental API and may change or be removed.
+type AssistedApprovalRecommendation string
 
 const (
 	// The judge evaluated the request and recommends automatically approving it.
-	AutoApprovalRecommendationApprove AutoApprovalRecommendation = "approve"
+	AssistedApprovalRecommendationApprove AssistedApprovalRecommendation = "approve"
 	// The judge was consulted but did not return a usable recommendation, so the request requires explicit approval.
-	AutoApprovalRecommendationError AutoApprovalRecommendation = "error"
-	// Auto mode is enabled, but this request category is never auto-approvable (for example, sandbox-bypass requests), so the judge was not consulted.
-	AutoApprovalRecommendationExcluded AutoApprovalRecommendation = "excluded"
-	// The judge evaluated the request and does not recommend auto-approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision.
-	AutoApprovalRecommendationRequireApproval AutoApprovalRecommendation = "requireApproval"
+	AssistedApprovalRecommendationError AssistedApprovalRecommendation = "error"
+	// Assisted mode is enabled, but this request category is never automatically approvable (for example, sandbox-bypass requests), so the judge was not consulted.
+	AssistedApprovalRecommendationExcluded AssistedApprovalRecommendation = "excluded"
+	// The judge evaluated the request and does not recommend automatically approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision.
+	AssistedApprovalRecommendationRequireApproval AssistedApprovalRecommendation = "requireApproval"
 )
 
 // Coarse request-difficulty bucket for UX explainability
@@ -4320,6 +4727,20 @@ const (
 	FactoryPermissionOperationRun FactoryPermissionOperation = "run"
 )
 
+// Terminal status a factory run committed. A settled run is never `pending` or `running`, so those two members of the run-status domain are deliberately absent.
+type FactoryRunSettledStatus string
+
+const (
+	// The run was cancelled by its caller or by session disposal.
+	FactoryRunSettledStatusCancelled FactoryRunSettledStatus = "cancelled"
+	// The factory body resolved and its result was committed.
+	FactoryRunSettledStatusCompleted FactoryRunSettledStatus = "completed"
+	// The run failed, with `failureType` carrying the class when it has one.
+	FactoryRunSettledStatusError FactoryRunSettledStatus = "error"
+	// The run was stopped by a limit, an approval refusal or another policy decision.
+	FactoryRunSettledStatusHalted FactoryRunSettledStatus = "halted"
+)
+
 // Origin type of the session being handed off
 type HandoffSourceType string
 
@@ -4342,27 +4763,33 @@ const (
 type ManagedSettingsEnforcedEscalation string
 
 const (
-	// Full allow-all ("/allow-all on") permissions — auto-approving tools, paths, and URLs.
+	// Full allow-all permissions — automatically approving tools, paths, and URLs.
 	ManagedSettingsEnforcedEscalationAllowAll ManagedSettingsEnforcedEscalation = "allow_all"
-	// Auto-approval of all tool permission requests.
+	// Automatic approval of all tool permission requests.
 	ManagedSettingsEnforcedEscalationApproveAll ManagedSettingsEnforcedEscalation = "approve_all"
-	// Advisory auto-approval ("/allow-all auto") mode — keeps normal prompt paths and adds LLM-advised approval, distinct from full allow-all.
-	ManagedSettingsEnforcedEscalationAutoApproval ManagedSettingsEnforcedEscalation = "auto_approval"
+	// Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all.
+	ManagedSettingsEnforcedEscalationAssistedApproval ManagedSettingsEnforcedEscalation = "assisted_approval"
+	// A server-wide MCP "Always Allow" (or `--allow-tool <server>`) blanket that would auto-approve every tool from an MCP server. Capped to per-tool approval; each tool still prompts.
+	ManagedSettingsEnforcedEscalationServerWideMCPApproval ManagedSettingsEnforcedEscalation = "server_wide_mcp_approval"
 	// Unrestricted filesystem access outside the session's allowed directories.
 	ManagedSettingsEnforcedEscalationUnrestrictedPaths ManagedSettingsEnforcedEscalation = "unrestricted_paths"
 	// Unrestricted URL fetch access.
 	ManagedSettingsEnforcedEscalationUnrestrictedURLs ManagedSettingsEnforcedEscalation = "unrestricted_urls"
 )
 
-// Which channel supplied the effective enterprise managed settings (highest-authority present layer wins wholesale)
+// Summary of which managed-settings channels contributed to the effective session policy. Use the per-channel booleans for exact provenance.
 type ManagedSettingsResolvedSource string
 
 const (
-	// Device-level MDM policy discovered from plist/registry/file (lower authority).
+	// Only session-local SDK-host injection contributed.
+	ManagedSettingsResolvedSourceClient ManagedSettingsResolvedSource = "client"
+	// Only the device MDM/plist/registry/file channel contributed.
 	ManagedSettingsResolvedSourceDevice ManagedSettingsResolvedSource = "device"
-	// No managed policy is in force (no layer contributed).
+	// More than one channel contributed. Ordinary keys resolve device over server per key, while permissions compose restrictively across all present layers.
+	ManagedSettingsResolvedSourceMixed ManagedSettingsResolvedSource = "mixed"
+	// No managed policy is in force (no channel contributed).
 	ManagedSettingsResolvedSourceNone ManagedSettingsResolvedSource = "none"
-	// Account/org policy self-fetched from the GitHub managed-settings endpoint (higher authority).
+	// Only the server/account channel contributed.
 	ManagedSettingsResolvedSourceServer ManagedSettingsResolvedSource = "server"
 )
 
@@ -4477,6 +4904,20 @@ const (
 	ModelCallFailureTransportWebsocket ModelCallFailureTransport = "websocket"
 )
 
+// Final outcome of one logical model dispatch after response acceptance processing
+type ModelCallFinishedOutcome string
+
+const (
+	// The dispatch was cancelled before an accepted response was produced.
+	ModelCallFinishedOutcomeCancelled ModelCallFinishedOutcome = "cancelled"
+	// The dispatch ended with a provider or transport error.
+	ModelCallFinishedOutcomeError ModelCallFinishedOutcome = "error"
+	// The provider response was rejected during post-response acceptance processing.
+	ModelCallFinishedOutcomeRejected ModelCallFinishedOutcome = "rejected"
+	// The provider response was accepted for continued agent processing.
+	ModelCallFinishedOutcomeSuccess ModelCallFinishedOutcome = "success"
+)
+
 // Binary result type discriminator. Use "image" for images and "resource" for other binary data.
 type OmittedBinaryType string
 
@@ -4487,25 +4928,13 @@ const (
 	OmittedBinaryTypeResource OmittedBinaryType = "resource"
 )
 
-// Allow-all mode for the session.
-// Experimental: PermissionAllowAllMode is part of an experimental API and may change or be removed.
-type PermissionAllowAllMode string
-
-const (
-	// Permission requests follow the normal approval flow with an LLM advisory recommendation attached; clients may choose to auto-approve requests the judge evaluated as acceptable.
-	PermissionAllowAllModeAuto PermissionAllowAllMode = "auto"
-	// Permission requests follow the normal approval flow.
-	PermissionAllowAllModeOff PermissionAllowAllMode = "off"
-	// Tool, path, and URL permission requests are automatically approved.
-	PermissionAllowAllModeOn PermissionAllowAllMode = "on"
-)
-
 // Kind discriminator for PermissionPromptRequest.
 type PermissionPromptRequestKind string
 
 const (
 	PermissionPromptRequestKindCommands                  PermissionPromptRequestKind = "commands"
 	PermissionPromptRequestKindCustomTool                PermissionPromptRequestKind = "custom-tool"
+	PermissionPromptRequestKindExtensionEnvAccess        PermissionPromptRequestKind = "extension-env-access"
 	PermissionPromptRequestKindExtensionManagement       PermissionPromptRequestKind = "extension-management"
 	PermissionPromptRequestKindExtensionPermissionAccess PermissionPromptRequestKind = "extension-permission-access"
 	PermissionPromptRequestKindFactory                   PermissionPromptRequestKind = "factory"
@@ -4530,11 +4959,21 @@ const (
 	PermissionPromptRequestPathAccessKindWrite PermissionPromptRequestPathAccessKind = "write"
 )
 
+// Advisory recommendation the runtime attaches to a permission request whose origin it can vouch for by construction. Unlike the auto-approval judge this does not depend on auto mode and does not evaluate what the tool call does; its absence simply means the runtime has no opinion and the request follows the host's normal approval flow.
+// Experimental: PermissionRecommendation is part of an experimental API and may change or be removed.
+type PermissionRecommendation string
+
+const (
+	// The runtime vouches for the request's origin and recommends approving it without prompting. The host still owns the decision and may deny it; deny rules, managed policy, and the auto-approval safety judge all outrank this recommendation.
+	PermissionRecommendationApprove PermissionRecommendation = "approve"
+)
+
 // Kind discriminator for PermissionRequest.
 type PermissionRequestKind string
 
 const (
 	PermissionRequestKindCustomTool                PermissionRequestKind = "custom-tool"
+	PermissionRequestKindExtensionEnvAccess        PermissionRequestKind = "extension-env-access"
 	PermissionRequestKindExtensionManagement       PermissionRequestKind = "extension-management"
 	PermissionRequestKindExtensionPermissionAccess PermissionRequestKind = "extension-permission-access"
 	PermissionRequestKindFactory                   PermissionRequestKind = "factory"
@@ -4567,6 +5006,16 @@ const (
 	PermissionRequestMemoryDirectionUpvote PermissionRequestMemoryDirection = "upvote"
 )
 
+// Scope of a stored memory.
+type PermissionRequestMemoryScope string
+
+const (
+	// Store the memory for the current repository.
+	PermissionRequestMemoryScopeRepository PermissionRequestMemoryScope = "repository"
+	// Store the memory for the current user.
+	PermissionRequestMemoryScopeUser PermissionRequestMemoryScope = "user"
+)
+
 // Kind discriminator for PermissionResult.
 type PermissionResultKind string
 
@@ -4697,18 +5146,6 @@ const (
 	SystemNotificationTypeUnclassified           SystemNotificationType = "unclassified"
 )
 
-// Semantic result of evaluating a task completion request
-type TaskCompletionOutcome string
-
-const (
-	// Completion cannot proceed without intervention; the active objective is paused when one is identified.
-	TaskCompletionOutcomeBlocked TaskCompletionOutcome = "blocked"
-	// The completion request was accepted and the objective is complete.
-	TaskCompletionOutcomeCompleted TaskCompletionOutcome = "completed"
-	// The completion request was rejected because more work or validation remains.
-	TaskCompletionOutcomeContinue TaskCompletionOutcome = "continue"
-)
-
 // Theme variant this icon is intended for
 type ToolExecutionCompleteContentResourceLinkIconTheme string
 
@@ -4752,6 +5189,23 @@ const (
 	ToolExecutionStartToolDescriptionMetaUIVisibilityModel ToolExecutionStartToolDescriptionMetaUIVisibility = "model"
 )
 
+// Lifecycle phase for a Rust-owned ephemeral query stream.
+// Experimental: UIEphemeralQueryPhase is part of an experimental API and may change or be removed.
+type UIEphemeralQueryPhase string
+
+const (
+	// The ephemeral query stream was cancelled before completing.
+	UIEphemeralQueryPhaseAborted UIEphemeralQueryPhase = "aborted"
+	// A partial result chunk was produced by the stream.
+	UIEphemeralQueryPhaseChunk UIEphemeralQueryPhase = "chunk"
+	// The ephemeral query stream finished successfully.
+	UIEphemeralQueryPhaseCompleted UIEphemeralQueryPhase = "completed"
+	// The ephemeral query stream ended with an error.
+	UIEphemeralQueryPhaseFailed UIEphemeralQueryPhase = "failed"
+	// The ephemeral query stream has begun.
+	UIEphemeralQueryPhaseStarted UIEphemeralQueryPhase = "started"
+)
+
 // The agent mode that was active when this message was sent
 type UserMessageAgentMode string
 
diff --git a/go/session.go b/go/session.go
index 99939de4a8..5d45d19ef2 100644
--- a/go/session.go
+++ b/go/session.go
@@ -56,42 +56,45 @@ type sessionHandler struct {
 //	})
 type Session struct {
 	// SessionID is the unique identifier for this session.
-	SessionID             string
-	workspacePath         string
-	client                *jsonrpc2.Client
-	clientSessionAPIs     *rpc.ClientSessionAPIHandlers
-	handlers              []sessionHandler
-	nextHandlerID         uint64
-	handlerMutex          sync.RWMutex
-	toolHandlers          map[string]ToolHandler
-	toolHandlersM         sync.RWMutex
-	permissionHandler     PermissionHandlerFunc
-	permissionMux         sync.RWMutex
-	managedSettings       bool
-	mcpAuthHandler        MCPAuthHandler
-	mcpAuthMu             sync.RWMutex
-	userInputHandler      UserInputHandler
-	userInputMux          sync.RWMutex
-	exitPlanModeHandler   ExitPlanModeRequestHandler
-	exitPlanModeMu        sync.RWMutex
-	autoModeSwitchHandler AutoModeSwitchRequestHandler
-	autoModeSwitchMu      sync.RWMutex
-	hooks                 *SessionHooks
-	hooksMux              sync.RWMutex
-	transformCallbacks    map[string]SectionTransformFn
-	transformMu           sync.Mutex
-	commandHandlers       map[string]CommandHandler
-	commandHandlersMu     sync.RWMutex
-	elicitationHandler    ElicitationHandler
-	elicitationMu         sync.RWMutex
-	canvasHandler         CanvasHandler
-	canvasMu              sync.RWMutex
-	bearerTokenProviders  map[string]BearerTokenProvider
-	bearerTokenMu         sync.RWMutex
-	openCanvases          []rpc.OpenCanvasInstance
-	openCanvasesMu        sync.RWMutex
-	capabilities          SessionCapabilities
-	capabilitiesMu        sync.RWMutex
+	SessionID                   string
+	workspacePath               string
+	client                      *jsonrpc2.Client
+	clientSessionAPIs           *rpc.ClientSessionAPIHandlers
+	handlers                    []sessionHandler
+	nextHandlerID               uint64
+	handlerMutex                sync.RWMutex
+	toolHandlers                map[string]ToolHandler
+	toolHandlersM               sync.RWMutex
+	permissionHandler           PermissionHandlerFunc
+	permissionMux               sync.RWMutex
+	managedSettings             bool
+	mcpAuthHandler              MCPAuthHandler
+	mcpAuthMu                   sync.RWMutex
+	userInputHandler            UserInputHandler
+	userInputMux                sync.RWMutex
+	exitPlanModeHandler         ExitPlanModeRequestHandler
+	exitPlanModeMu              sync.RWMutex
+	autoModeSwitchHandler       AutoModeSwitchRequestHandler
+	autoModeSwitchMu            sync.RWMutex
+	hooks                       *SessionHooks
+	hooksMux                    sync.RWMutex
+	transformCallbacks          map[string]SectionTransformFn
+	transformMu                 sync.Mutex
+	commandHandlers             map[string]CommandHandler
+	commandHandlersMu           sync.RWMutex
+	elicitationHandler          ElicitationHandler
+	elicitationMu               sync.RWMutex
+	canvasHandler               CanvasHandler
+	canvasMu                    sync.RWMutex
+	bearerTokenProviders        map[string]BearerTokenProvider
+	bearerTokenMu               sync.RWMutex
+	releaseGitHubTokenProvider  func()
+	gitHubTokenProviderMu       sync.Mutex
+	gitHubTokenProviderReleased bool
+	openCanvases                []rpc.OpenCanvasInstance
+	openCanvasesMu              sync.RWMutex
+	capabilities                SessionCapabilities
+	capabilitiesMu              sync.RWMutex
 
 	// eventCh serializes user event handler dispatch. dispatchEvent enqueues;
 	// a single goroutine (processEvents) dequeues and invokes handlers in FIFO order.
@@ -495,6 +498,9 @@ func (s *Session) SendAndWait(ctx context.Context, options MessageOptions) (*Ses
 			lastAssistantMessage = &eventCopy
 			mu.Unlock()
 		case *SessionIdleData:
+			if d.Mode != nil && *d.Mode == SessionModeAutopilot {
+				break
+			}
 			select {
 			case idleCh <- struct{}{}:
 			default:
@@ -1646,6 +1652,10 @@ func (s *Session) executePermissionAndRespond(requestID string, permissionReques
 		})
 		return
 	}
+	// Unwrap any attribution so decisionContext travels as a sibling of result,
+	// not nested inside it. The suppression and send logic below operates on the
+	// underlying decision.
+	decision, decisionContext := splitAttribution(decision)
 	if _, ok := decision.(*rpc.PermissionDecisionNoResult); ok {
 		return
 	}
@@ -1654,8 +1664,9 @@ func (s *Session) executePermissionAndRespond(requestID string, permissionReques
 	}
 
 	s.RPC.Permissions.HandlePendingPermissionRequest(context.Background(), &rpc.PermissionDecisionRequest{
-		RequestID: requestID,
-		Result:    decision,
+		RequestID:       requestID,
+		Result:          decision,
+		DecisionContext: decisionContext,
 	})
 }
 
@@ -1717,11 +1728,9 @@ func (s *Session) GetEvents(ctx context.Context) ([]SessionEvent, error) {
 //	}
 func (s *Session) Disconnect() error {
 	_, err := s.client.Request(context.Background(), "session.destroy", sessionDestroyRequest{SessionID: s.SessionID})
-	if err != nil {
-		return fmt.Errorf("failed to disconnect session: %w", err)
-	}
 
 	s.closeOnce.Do(func() { close(s.eventCh) })
+	s.releaseGitHubTokenProviderRegistration()
 
 	// Clear handlers
 	s.handlerMutex.Lock()
@@ -1744,9 +1753,38 @@ func (s *Session) Disconnect() error {
 	s.elicitationHandler = nil
 	s.elicitationMu.Unlock()
 
+	if err != nil {
+		return fmt.Errorf("failed to disconnect session: %w", err)
+	}
 	return nil
 }
 
+func (s *Session) releaseGitHubTokenProviderRegistration() {
+	s.gitHubTokenProviderMu.Lock()
+	if s.gitHubTokenProviderReleased {
+		s.gitHubTokenProviderMu.Unlock()
+		return
+	}
+	s.gitHubTokenProviderReleased = true
+	release := s.releaseGitHubTokenProvider
+	s.releaseGitHubTokenProvider = nil
+	s.gitHubTokenProviderMu.Unlock()
+	if release != nil {
+		release()
+	}
+}
+
+func (s *Session) setGitHubTokenProviderRegistrationRelease(release func()) {
+	s.gitHubTokenProviderMu.Lock()
+	if !s.gitHubTokenProviderReleased {
+		s.releaseGitHubTokenProvider = release
+		s.gitHubTokenProviderMu.Unlock()
+		return
+	}
+	s.gitHubTokenProviderMu.Unlock()
+	release()
+}
+
 // Abort aborts the currently processing message in this session.
 //
 // Use this to cancel a long-running request. The session remains valid
diff --git a/go/session_event_serialization_test.go b/go/session_event_serialization_test.go
index bd47fdfbe2..ee9258b225 100644
--- a/go/session_event_serialization_test.go
+++ b/go/session_event_serialization_test.go
@@ -189,3 +189,69 @@ func TestRawSessionEventDataWithNilRawMarshalsAsNull(t *testing.T) {
 		t.Fatalf("expected missing raw data to marshal as null, got %v", serialized["data"])
 	}
 }
+
+func TestManagedSettingsResolvedProvenanceRoundTrips(t *testing.T) {
+	sources := []ManagedSettingsResolvedSource{
+		ManagedSettingsResolvedSourceServer,
+		ManagedSettingsResolvedSourceDevice,
+		ManagedSettingsResolvedSourceClient,
+		ManagedSettingsResolvedSourceMixed,
+		ManagedSettingsResolvedSourceNone,
+	}
+	expectedSources := []string{"server", "device", "client", "mixed", "none"}
+	for i, source := range sources {
+		if string(source) != expectedSources[i] {
+			t.Fatalf("expected source %q, got %q", expectedSources[i], source)
+		}
+	}
+
+	clientManaged := true
+	resolved := SessionManagedSettingsResolvedData{
+		BypassPermissionsDisabled: true,
+		ClientManaged:             &clientManaged,
+		DeviceManaged:             false,
+		FailClosed:                false,
+		ManagedKeys:               []string{"permissions"},
+		ServerManaged:             false,
+		Source:                    ManagedSettingsResolvedSourceClient,
+	}
+	data, err := json.Marshal(resolved)
+	if err != nil {
+		t.Fatalf("failed to marshal managed settings resolution: %v", err)
+	}
+
+	var serialized map[string]any
+	if err := json.Unmarshal(data, &serialized); err != nil {
+		t.Fatalf("failed to inspect managed settings resolution: %v", err)
+	}
+	if serialized["source"] != "client" || serialized["clientManaged"] != true {
+		t.Fatalf("expected client provenance, got %v", serialized)
+	}
+
+	var roundTripped SessionManagedSettingsResolvedData
+	if err := json.Unmarshal(data, &roundTripped); err != nil {
+		t.Fatalf("failed to round-trip managed settings resolution: %v", err)
+	}
+	if roundTripped.Source != ManagedSettingsResolvedSourceClient ||
+		roundTripped.ClientManaged == nil ||
+		!*roundTripped.ClientManaged {
+		t.Fatalf("expected client provenance to round-trip, got %#v", roundTripped)
+	}
+
+	resolved.Source = ManagedSettingsResolvedSourceMixed
+	resolved.ClientManaged = nil
+	data, err = json.Marshal(resolved)
+	if err != nil {
+		t.Fatalf("failed to marshal mixed managed settings resolution: %v", err)
+	}
+	serialized = nil
+	if err := json.Unmarshal(data, &serialized); err != nil {
+		t.Fatalf("failed to inspect mixed managed settings resolution: %v", err)
+	}
+	if serialized["source"] != "mixed" {
+		t.Fatalf("expected mixed provenance, got %v", serialized["source"])
+	}
+	if _, ok := serialized["clientManaged"]; ok {
+		t.Fatalf("expected absent clientManaged to be omitted, got %v", serialized)
+	}
+}
diff --git a/go/session_test.go b/go/session_test.go
index 9c5f4df8c9..74e212c418 100644
--- a/go/session_test.go
+++ b/go/session_test.go
@@ -366,6 +366,138 @@ func readTestJSONRPCFrame(r io.Reader) ([]byte, error) {
 	return data, err
 }
 
+func TestSession_SendAndWaitSkipsAutopilotContinuationIdle(t *testing.T) {
+	stdinR, stdinW := io.Pipe()
+	stdoutR, stdoutW := io.Pipe()
+	defer stdinR.Close()
+	defer stdinW.Close()
+	defer stdoutR.Close()
+	defer stdoutW.Close()
+
+	client := jsonrpc2.NewClient(stdinW, stdoutR)
+	client.Start()
+	defer client.Stop()
+
+	requestReceived := make(chan struct{})
+	errCh := make(chan error, 1)
+	go func() {
+		frame, err := readTestJSONRPCFrame(stdinR)
+		if err != nil {
+			errCh <- err
+			return
+		}
+
+		var request struct {
+			ID     json.RawMessage `json:"id"`
+			Method string          `json:"method"`
+		}
+		if err := json.Unmarshal(frame, &request); err != nil {
+			errCh <- err
+			return
+		}
+		if request.Method != "session.send" {
+			errCh <- fmt.Errorf("expected session.send, got %s", request.Method)
+			return
+		}
+
+		response := map[string]any{
+			"jsonrpc": "2.0",
+			"id":      json.RawMessage(request.ID),
+			"result":  map[string]any{"messageId": "message-1"},
+		}
+		data, err := json.Marshal(response)
+		if err != nil {
+			errCh <- err
+			return
+		}
+		if _, err := fmt.Fprintf(stdoutW, "Content-Length: %d\r\n\r\n%s", len(data), data); err != nil {
+			errCh <- err
+			return
+		}
+		close(requestReceived)
+	}()
+
+	session := &Session{
+		SessionID: "session-1",
+		client:    client,
+		RPC:       rpc.NewSessionRPC(client, "session-1"),
+		handlers:  make([]sessionHandler, 0),
+		eventCh:   make(chan SessionEvent, 8),
+	}
+	go session.processEvents()
+	defer close(session.eventCh)
+
+	resultCh := make(chan *SessionEvent, 1)
+	go func() {
+		result, err := session.SendAndWait(t.Context(), MessageOptions{Prompt: "keep going"})
+		if err != nil {
+			errCh <- err
+			return
+		}
+		resultCh <- result
+	}()
+
+	select {
+	case <-requestReceived:
+	case err := <-errCh:
+		t.Fatal(err)
+	case <-time.After(2 * time.Second):
+		t.Fatal("timed out waiting for session.send request")
+	}
+
+	continuationIdleProcessed := make(chan struct{})
+	unsubscribe := session.On(func(event SessionEvent) {
+		if idle, ok := event.Data.(*SessionIdleData); ok &&
+			idle.Mode != nil && *idle.Mode == SessionModeAutopilot {
+			close(continuationIdleProcessed)
+		}
+	})
+	defer unsubscribe()
+
+	autopilot := SessionModeAutopilot
+	session.dispatchEvent(SessionEvent{Data: &AssistantMessageData{
+		Content:   "intermediate",
+		MessageID: "assistant-1",
+	}})
+	session.dispatchEvent(SessionEvent{Data: &SessionIdleData{Mode: &autopilot}})
+
+	select {
+	case <-continuationIdleProcessed:
+	case err := <-errCh:
+		t.Fatal(err)
+	case <-time.After(2 * time.Second):
+		t.Fatal("timed out waiting for autopilot continuation idle")
+	}
+
+	select {
+	case <-resultCh:
+		t.Fatal("SendAndWait returned at an autopilot continuation idle")
+	default:
+	}
+
+	interactive := SessionModeInteractive
+	session.dispatchEvent(SessionEvent{Data: &AssistantMessageData{
+		Content:   "final",
+		MessageID: "assistant-2",
+	}})
+	session.dispatchEvent(SessionEvent{Data: &SessionIdleData{Mode: &interactive}})
+
+	select {
+	case result := <-resultCh:
+		message, ok := result.Data.(*AssistantMessageData)
+		if !ok {
+			t.Fatalf("expected assistant message, got %T", result.Data)
+		}
+		if message.Content != "final" {
+			t.Fatalf("expected final assistant message, got %q", message.Content)
+		}
+	case err := <-errCh:
+		t.Fatal(err)
+	case <-time.After(2 * time.Second):
+		t.Fatal("timed out waiting for terminal idle")
+	}
+}
+
 func TestSession_On(t *testing.T) {
 	t.Run("multiple handlers all receive events", func(t *testing.T) {
 		session, cleanup := newTestSession()
diff --git a/go/types.go b/go/types.go
index 19689c7074..1d98e06158 100644
--- a/go/types.go
+++ b/go/types.go
@@ -129,6 +129,11 @@ type ClientOptions struct {
 	// location.
 	// Ignored when connecting to an existing runtime via [URIConnection].
 	BaseDirectory string
+	// BuiltinPluginDirectories contains absolute paths to trusted plugin
+	// directories bundled by the host. When non-empty, Start replaces the
+	// runtime's complete trusted built-in plugin directory set before sessions
+	// can be created.
+	BuiltinPluginDirectories []string
 	// LogLevel for the runtime. When empty (the default), the runtime
 	// uses its own default level; the SDK does not pass --log-level.
 	// Recognized values: "none", "error", "warning", "info", "debug", "all".
@@ -379,6 +384,58 @@ type PermissionInvocation struct {
 	ManagedSettingsEnabled bool
 }
 
+// PermissionDecisionContext describes how and where a permission decision was
+// reached. Attach it to a decision with [NewAttributedPermissionResult] so the runtime
+// can attribute auto-approval telemetry to the responding surface. It is
+// informational only and never changes permission behavior.
+//
+// Experimental: PermissionDecisionContext is part of an experimental API and
+// may change or be removed.
+type PermissionDecisionContext = rpc.PermissionDecisionContext
+
+// PermissionResponseCapability describes whether the responding client could
+// ask a user for a permission decision.
+type PermissionResponseCapability = rpc.PermissionResponseCapability
+
+const (
+	PermissionResponseCapabilityHeadless    = rpc.PermissionResponseCapabilityHeadless
+	PermissionResponseCapabilityInteractive = rpc.PermissionResponseCapabilityInteractive
+	PermissionResponseCapabilityNone        = rpc.PermissionResponseCapabilityNone
+)
+
+// PermissionDecisionOutcome describes the disposition of a permission request
+// as observed by the responding client.
+type PermissionDecisionOutcome = rpc.PermissionDecisionOutcome
+
+const (
+	PermissionDecisionOutcomeAutoApproved    = rpc.PermissionDecisionOutcomeAutoApproved
+	PermissionDecisionOutcomeAutopilotDenied = rpc.PermissionDecisionOutcomeAutopilotDenied
+	PermissionDecisionOutcomePromptedUser    = rpc.PermissionDecisionOutcomePromptedUser
+)
+
+// PermissionDecisionSource identifies the controlled reason or actor
+// responsible for a permission response.
+type PermissionDecisionSource = rpc.PermissionDecisionSource
+
+const (
+	PermissionDecisionSourceAssistedApproval   = rpc.PermissionDecisionSourceAssistedApproval
+	PermissionDecisionSourceHostPolicy         = rpc.PermissionDecisionSourceHostPolicy
+	PermissionDecisionSourceHumanResponse      = rpc.PermissionDecisionSourceHumanResponse
+	PermissionDecisionSourceUnattendedFallback = rpc.PermissionDecisionSourceUnattendedFallback
+)
+
+// PermissionDecisionSurface identifies the client surface that submitted a
+// permission response.
+type PermissionDecisionSurface = rpc.PermissionDecisionSurface
+
+const (
+	PermissionDecisionSurfaceAcp        = rpc.PermissionDecisionSurfaceAcp
+	PermissionDecisionSurfaceCopilotApp = rpc.PermissionDecisionSurfaceCopilotApp
+	PermissionDecisionSurfacePromptMode = rpc.PermissionDecisionSurfacePromptMode
+	PermissionDecisionSurfaceSDK        = rpc.PermissionDecisionSurfaceSDK
+	PermissionDecisionSurfaceTui        = rpc.PermissionDecisionSurfaceTui
+)
+
 // MCPAuthWwwAuthenticateParams contains parsed parameters from an MCP server's WWW-Authenticate response.
 type MCPAuthWwwAuthenticateParams struct {
 	ResourceMetadataURL *string `json:"resourceMetadataUrl,omitempty"`
@@ -1252,6 +1309,10 @@ type SessionConfig struct {
 	// and discovered skill directories). When false, no skills are loaded regardless
 	// of SkillDirectories or EnableConfigDiscovery settings.
 	EnableSkills *bool
+	// IncludedBuiltinSkills is the allowlist of runtime-bundled skill names.
+	// In ModeEmpty, nil excludes all built-in skills; a non-nil list opts the
+	// named built-ins back in. Skills from other sources remain eligible.
+	IncludedBuiltinSkills []string
 	// Tools exposes caller-implemented tools to the CLI. A Tool with a nil Handler
 	// is declaration-only; the consumer must resolve its calls via pending tool RPCs.
 	Tools []Tool
@@ -1276,6 +1337,9 @@ type SessionConfig struct {
 	// When provided, the SDK can satisfy MCP server OAuth requests with host-provided
 	// token data or cancellation.
 	OnMCPAuthRequest MCPAuthHandler
+	// GitHubTokenProvider acquires session-scoped GitHub tokens on demand. It
+	// cannot be combined with GitHubToken.
+	GitHubTokenProvider GitHubTokenProvider
 	// OnUserInputRequest is a handler for user input requests from the agent (enables ask_user tool)
 	OnUserInputRequest UserInputHandler
 	// Hooks configures hook handlers for session lifecycle events
@@ -1326,6 +1390,9 @@ type SessionConfig struct {
 	// Experimental: EnableCitations is part of an experimental model capability
 	// surface and may change or be removed in future SDK or CLI releases.
 	EnableCitations *bool
+	// EnableFileChangeTracking opts in to capturing file changes from the first
+	// turn for session rewind and cumulative session diff.
+	EnableFileChangeTracking *bool
 	// SessionLimits applies limits to this session's current accounting window.
 	//
 	// Experimental: SessionLimits is part of an experimental runtime accounting
@@ -1376,6 +1443,10 @@ type SessionConfig struct {
 	InstructionDirectories []string
 	// DisabledSkills is a list of skill names to disable
 	DisabledSkills []string
+	// DisabledMCPServers is a list of exact MCP server names to disable for this session.
+	// Disabled servers are not started or authenticated on create or cold resume.
+	// A resident resume cannot stop servers that are already running.
+	DisabledMCPServers []string
 	// InfiniteSessions configures infinite sessions for persistent workspaces and automatic compaction.
 	// When enabled (default), sessions automatically manage context limits and persist state.
 	InfiniteSessions *InfiniteSessionConfig
@@ -1494,6 +1565,56 @@ type SessionConfig struct {
 	// be set; if omitted, the runtime is expected to reject session creation
 	// (fail-closed). Unset behaves exactly as before.
 	EnableManagedSettings *bool
+	// ManagedSettings supplies host-injected enterprise managed settings for
+	// the session. Unlike EnableManagedSettings (which asks the runtime to
+	// self-fetch account/org and device policy), this provides the managed
+	// policy directly. The runtime validates it with the same
+	// managed-permission parser it uses for fetched policy and composes it
+	// restrictively with any self-fetched (server) and device-managed (MDM)
+	// layers. It is startup-only and not persisted: re-supply it on resume,
+	// where it replaces the prior injected layer (omitting it clears the
+	// layer). It may be combined with EnableManagedSettings. Requires a runtime
+	// whose RPC schema includes managedSettings.
+	ManagedSettings *ManagedSettings
+}
+
+// ManagedSettings is host-injected enterprise managed settings for a session.
+// The first supported contract is permissions-only; unknown sibling keys are
+// rejected by the runtime. Serialized on the wire as managedSettings.
+type ManagedSettings struct {
+	// Permissions is the managed permission policy for the session.
+	Permissions *ManagedSettingsPermissions `json:"permissions,omitempty"`
+}
+
+// DisableBypassPermissionsMode is the managed bypass-permissions policy.
+//
+// The runtime may introduce additional fail-closed modes. Values are serialized
+// as strings so callers can use newer modes without waiting for an SDK release.
+type DisableBypassPermissionsMode string
+
+const (
+	// DisableBypassPermissionsModeDisable turns off bypass-permissions mode.
+	DisableBypassPermissionsModeDisable DisableBypassPermissionsMode = "disable"
+	// DisableBypassPermissionsModeAllowAutoOnly permits only automatic bypass.
+	DisableBypassPermissionsModeAllowAutoOnly DisableBypassPermissionsMode = "allow-auto-only"
+)
+
+// ManagedSettingsPermissions is the permissions-only managed policy injected
+// via ManagedSettings. Rule strings use the same vocabulary the runtime
+// accepts for fetched managed policy (e.g. "Read(**)", "Shell(git push *)");
+// malformed rules are rejected by the runtime at session creation.
+type ManagedSettingsPermissions struct {
+	// DisableBypassPermissionsMode restricts bypass-permissions mode for the
+	// session. See the DisableBypassPermissionsMode constants for known values.
+	// Newer values are forwarded unchanged so runtime policies remain fail-closed.
+	DisableBypassPermissionsMode DisableBypassPermissionsMode `json:"disableBypassPermissionsMode,omitempty"`
+	// Deny lists operations that must always be denied. Unioned across layers.
+	Deny []string `json:"deny,omitzero"`
+	// Ask lists operations that must prompt for approval. Unioned across layers.
+	Ask []string `json:"ask,omitzero"`
+	// Allow lists operations permitted without prompting. Every declared allow
+	// list across managed layers must admit an operation for it to be allowed.
+	Allow []string `json:"allow,omitzero"`
 }
 
 // ToolDefer controls whether a tool may be deferred (loaded lazily via tool
@@ -1513,6 +1634,11 @@ type Tool struct {
 	Parameters           map[string]any `json:"parameters,omitzero"`
 	OverridesBuiltInTool bool           `json:"overridesBuiltInTool,omitempty"`
 	SkipPermission       bool           `json:"skipPermission,omitempty"`
+	// IsTerminal reports that a successful call to this tool ends the agent
+	// turn: the runtime halts instead of feeding the result back to the model
+	// for another round. A failed call leaves the loop running so the model can
+	// read the error and retry.
+	IsTerminal bool `json:"isTerminal,omitempty"`
 	// Defer controls whether the tool may be deferred (loaded lazily via tool
 	// search) rather than always pre-loaded. When empty, the runtime decides.
 	Defer ToolDefer `json:"defer,omitempty"`
@@ -1690,6 +1816,9 @@ type ResumeSessionConfig struct {
 	// ClientName identifies the application using the SDK.
 	// Included in the User-Agent header for API requests.
 	ClientName string
+	// GitHubTokenProvider acquires session-scoped GitHub tokens on demand. It
+	// cannot be combined with GitHubToken.
+	GitHubTokenProvider GitHubTokenProvider
 	// Model to use for this session. Can change the model when resuming.
 	Model string
 	// Tools exposes caller-implemented tools to the CLI. A Tool with a nil Handler
@@ -1708,6 +1837,10 @@ type ResumeSessionConfig struct {
 	// be selected or invoked unless a custom agent with the same name is
 	// configured.
 	ExcludedBuiltInAgents []string
+	// IncludedBuiltinSkills is the allowlist of runtime-bundled skill names.
+	// In ModeEmpty, nil excludes all built-in skills; a non-nil list opts the
+	// named built-ins back in. Skills from other sources remain eligible.
+	IncludedBuiltinSkills []string
 	// Provider configures a custom model provider
 	Provider *ProviderConfig
 	// Capi configures provider-scoped CAPI (Copilot API) session options.
@@ -1736,6 +1869,10 @@ type ResumeSessionConfig struct {
 	// Experimental: EnableCitations is part of an experimental model capability
 	// surface and may change or be removed in future SDK or CLI releases.
 	EnableCitations *bool
+	// EnableFileChangeTracking opts in to capturing file changes for session
+	// rewind and cumulative session diff when the resumed session has a valid
+	// baseline. Earlier untracked changes cannot be reconstructed.
+	EnableFileChangeTracking *bool
 	// SessionLimits applies limits to this session's current accounting window.
 	//
 	// Experimental: SessionLimits is part of an experimental runtime accounting
@@ -1855,6 +1992,10 @@ type ResumeSessionConfig struct {
 	InstructionDirectories []string
 	// DisabledSkills is a list of skill names to disable
 	DisabledSkills []string
+	// DisabledMCPServers is a list of exact MCP server names to disable for this session.
+	// Disabled servers are not started or authenticated on create or cold resume.
+	// A resident resume cannot stop servers that are already running.
+	DisabledMCPServers []string
 	// InfiniteSessions configures infinite sessions for persistent workspaces and automatic compaction.
 	InfiniteSessions *InfiniteSessionConfig
 	// LargeOutput configures handling of large tool outputs. When a tool produces
@@ -1948,6 +2089,11 @@ type ResumeSessionConfig struct {
 	// SessionConfig.EnableManagedSettings. Re-supply on resume so the runtime
 	// re-applies the managed-settings self-fetch after a CLI process restart.
 	EnableManagedSettings *bool
+	// ManagedSettings re-injects host-provided managed settings on resume. See
+	// SessionConfig.ManagedSettings. It must be re-supplied on resume: it
+	// replaces the prior injected layer, and omitting it clears that layer so
+	// warm and cold resume behave identically.
+	ManagedSettings *ManagedSettings
 }
 
 // ProviderTokenArgs carries the context passed to a [BearerTokenProvider] callback
@@ -2353,6 +2499,7 @@ type createSessionRequest struct {
 	Models                             []ProviderModelConfig                  `json:"models,omitempty"`
 	EnableSessionTelemetry             *bool                                  `json:"enableSessionTelemetry,omitempty"`
 	EnableCitations                    *bool                                  `json:"enableCitations,omitempty"`
+	EnableFileChangeTracking           *bool                                  `json:"enableFileChangeTracking,omitempty"`
 	SessionLimits                      *rpc.SessionLimitsConfig               `json:"sessionLimits,omitempty"`
 	IsExperimentalMode                 *bool                                  `json:"isExperimentalMode,omitempty"`
 	SkipCustomInstructions             *bool                                  `json:"skipCustomInstructions,omitempty"`
@@ -2390,6 +2537,7 @@ type createSessionRequest struct {
 	PluginDirectories                  []string                               `json:"pluginDirectories,omitempty"`
 	InstructionDirectories             []string                               `json:"instructionDirectories,omitempty"`
 	DisabledSkills                     []string                               `json:"disabledSkills,omitempty"`
+	DisabledMCPServers                 *[]string                              `json:"disabledMcpServers,omitempty"`
 	InfiniteSessions                   *InfiniteSessionConfig                 `json:"infiniteSessions,omitempty"`
 	LargeOutput                        *LargeToolOutputConfig                 `json:"largeOutput,omitempty"`
 	ToolSearch                         *ToolSearchConfig                      `json:"toolSearch,omitempty"`
@@ -2399,6 +2547,7 @@ type createSessionRequest struct {
 	RequestMCPApps                     *bool                                  `json:"requestMcpApps,omitempty"`
 	GitHubMCPToolConfig                *GitHubMCPToolConfig                   `json:"githubMcpToolConfig,omitempty"`
 	GitHubToken                        string                                 `json:"gitHubToken,omitempty"`
+	GitHubTokenProviderRegistrationID  string                                 `json:"gitHubTokenProviderRegistrationId,omitempty"`
 	RemoteSession                      rpc.RemoteSessionMode                  `json:"remoteSession,omitempty"`
 	Cloud                              *CloudSessionOptions                   `json:"cloud,omitempty"`
 	Canvases                           []CanvasDeclaration                    `json:"canvases,omitempty"`
@@ -2409,6 +2558,7 @@ type createSessionRequest struct {
 	CanvasProvider                     *CanvasProviderIdentity                `json:"canvasProvider,omitempty"`
 	ExpAssignments                     *CopilotExpAssignmentResponse          `json:"expAssignments,omitempty"`
 	EnableManagedSettings              *bool                                  `json:"enableManagedSettings,omitempty"`
+	ManagedSettings                    *ManagedSettings                       `json:"managedSettings,omitempty"`
 	Traceparent                        string                                 `json:"traceparent,omitempty"`
 	Tracestate                         string                                 `json:"tracestate,omitempty"`
 }
@@ -2416,7 +2566,7 @@ type createSessionRequest struct {
 // wireCommand is the wire representation of a command (name + description only, no handler).
 type wireCommand struct {
 	Name        string `json:"name"`
-	Description string `json:"description,omitempty"`
+	Description string `json:"description"`
 }
 
 // createSessionResponse is the response from session.create
@@ -2446,6 +2596,7 @@ type resumeSessionRequest struct {
 	Models                             []ProviderModelConfig                  `json:"models,omitempty"`
 	EnableSessionTelemetry             *bool                                  `json:"enableSessionTelemetry,omitempty"`
 	EnableCitations                    *bool                                  `json:"enableCitations,omitempty"`
+	EnableFileChangeTracking           *bool                                  `json:"enableFileChangeTracking,omitempty"`
 	SessionLimits                      *rpc.SessionLimitsConfig               `json:"sessionLimits,omitempty"`
 	IsExperimentalMode                 *bool                                  `json:"isExperimentalMode,omitempty"`
 	SkipCustomInstructions             *bool                                  `json:"skipCustomInstructions,omitempty"`
@@ -2485,6 +2636,7 @@ type resumeSessionRequest struct {
 	PluginDirectories                  []string                               `json:"pluginDirectories,omitempty"`
 	InstructionDirectories             []string                               `json:"instructionDirectories,omitempty"`
 	DisabledSkills                     []string                               `json:"disabledSkills,omitempty"`
+	DisabledMCPServers                 *[]string                              `json:"disabledMcpServers,omitempty"`
 	InfiniteSessions                   *InfiniteSessionConfig                 `json:"infiniteSessions,omitempty"`
 	LargeOutput                        *LargeToolOutputConfig                 `json:"largeOutput,omitempty"`
 	ToolSearch                         *ToolSearchConfig                      `json:"toolSearch,omitempty"`
@@ -2494,6 +2646,7 @@ type resumeSessionRequest struct {
 	RequestMCPApps                     *bool                                  `json:"requestMcpApps,omitempty"`
 	GitHubMCPToolConfig                *GitHubMCPToolConfig                   `json:"githubMcpToolConfig,omitempty"`
 	GitHubToken                        string                                 `json:"gitHubToken,omitempty"`
+	GitHubTokenProviderRegistrationID  string                                 `json:"gitHubTokenProviderRegistrationId,omitempty"`
 	RemoteSession                      rpc.RemoteSessionMode                  `json:"remoteSession,omitempty"`
 	Canvases                           []CanvasDeclaration                    `json:"canvases,omitempty"`
 	OpenCanvases                       []rpc.OpenCanvasInstance               `json:"openCanvases,omitempty"`
@@ -2504,6 +2657,7 @@ type resumeSessionRequest struct {
 	CanvasProvider                     *CanvasProviderIdentity                `json:"canvasProvider,omitempty"`
 	ExpAssignments                     *CopilotExpAssignmentResponse          `json:"expAssignments,omitempty"`
 	EnableManagedSettings              *bool                                  `json:"enableManagedSettings,omitempty"`
+	ManagedSettings                    *ManagedSettings                       `json:"managedSettings,omitempty"`
 	Traceparent                        string                                 `json:"traceparent,omitempty"`
 	Tracestate                         string                                 `json:"tracestate,omitempty"`
 }
diff --git a/go/zsession_events.go b/go/zsession_events.go
index fbc1002774..11a1bd666f 100644
--- a/go/zsession_events.go
+++ b/go/zsession_events.go
@@ -9,10 +9,14 @@ import "github.com/github/copilot-sdk/go/rpc"
 type (
 	AbortData                                                      = rpc.AbortData
 	AbortReason                                                    = rpc.AbortReason
+	AgentInterruptedActivity                                       = rpc.AgentInterruptedActivity
+	AgentInterruptedCancelPhase                                    = rpc.AgentInterruptedCancelPhase
+	AgentInterruptedData                                           = rpc.AgentInterruptedData
 	AssistantIdleData                                              = rpc.AssistantIdleData
 	AssistantIntentData                                            = rpc.AssistantIntentData
 	AssistantMessageData                                           = rpc.AssistantMessageData
 	AssistantMessageDeltaData                                      = rpc.AssistantMessageDeltaData
+	AssistantMessageReasoningBlocks                                = rpc.AssistantMessageReasoningBlocks
 	AssistantMessageServerTools                                    = rpc.AssistantMessageServerTools
 	AssistantMessageStartData                                      = rpc.AssistantMessageStartData
 	AssistantMessageToolRequest                                    = rpc.AssistantMessageToolRequest
@@ -29,6 +33,9 @@ type (
 	AssistantUsageCopilotUsage                                     = rpc.AssistantUsageCopilotUsage
 	AssistantUsageCopilotUsageTokenDetail                          = rpc.AssistantUsageCopilotUsageTokenDetail
 	AssistantUsageData                                             = rpc.AssistantUsageData
+	AssistantUsageTransport                                        = rpc.AssistantUsageTransport
+	AssistedApprovalJudgeFailureReason                             = rpc.AssistedApprovalJudgeFailureReason
+	AssistedApprovalRecommendation                                 = rpc.AssistedApprovalRecommendation
 	Attachment                                                     = rpc.Attachment
 	AttachmentBlob                                                 = rpc.AttachmentBlob
 	AttachmentDirectory                                            = rpc.AttachmentDirectory
@@ -53,8 +60,6 @@ type (
 	AttachmentSelectionDetailsEnd                                  = rpc.AttachmentSelectionDetailsEnd
 	AttachmentSelectionDetailsStart                                = rpc.AttachmentSelectionDetailsStart
 	AttachmentType                                                 = rpc.AttachmentType
-	AutoApprovalJudgeFailureReason                                 = rpc.AutoApprovalJudgeFailureReason
-	AutoApprovalRecommendation                                     = rpc.AutoApprovalRecommendation
 	AutoModeResolvedReasoningBucket                                = rpc.AutoModeResolvedReasoningBucket
 	AutoModeSwitchCompletedData                                    = rpc.AutoModeSwitchCompletedData
 	AutoModeSwitchRequestedData                                    = rpc.AutoModeSwitchRequestedData
@@ -107,6 +112,9 @@ type (
 	ExternalToolRequestedData                                      = rpc.ExternalToolRequestedData
 	FactoryPermissionOperation                                     = rpc.FactoryPermissionOperation
 	FactoryPermissionPhase                                         = rpc.FactoryPermissionPhase
+	FactoryRunSettledData                                          = rpc.FactoryRunSettledData
+	FactoryRunSettledStatus                                        = rpc.FactoryRunSettledStatus
+	FactoryRunStartedData                                          = rpc.FactoryRunStartedData
 	FactoryRunUpdatedData                                          = rpc.FactoryRunUpdatedData
 	GitHubRepoRef                                                  = rpc.GitHubRepoRef
 	HandoffRepository                                              = rpc.HandoffRepository
@@ -148,16 +156,18 @@ type (
 	ModelCallFailureRequestFingerprint                             = rpc.ModelCallFailureRequestFingerprint
 	ModelCallFailureSource                                         = rpc.ModelCallFailureSource
 	ModelCallFailureTransport                                      = rpc.ModelCallFailureTransport
+	ModelCallFinishedData                                          = rpc.ModelCallFinishedData
+	ModelCallFinishedOutcome                                       = rpc.ModelCallFinishedOutcome
 	ModelCallStartData                                             = rpc.ModelCallStartData
+	ModelChangeSource                                              = rpc.ModelChangeSource
 	OmittedBinaryOmittedReason                                     = rpc.OmittedBinaryOmittedReason
 	OmittedBinaryResult                                            = rpc.OmittedBinaryResult
 	OmittedBinaryType                                              = rpc.OmittedBinaryType
 	PendingMessagesModifiedData                                    = rpc.PendingMessagesModifiedData
-	PermissionAllowAllMode                                         = rpc.PermissionAllowAllMode
 	PermissionApproved                                             = rpc.PermissionApproved
 	PermissionApprovedForLocation                                  = rpc.PermissionApprovedForLocation
 	PermissionApprovedForSession                                   = rpc.PermissionApprovedForSession
-	PermissionAutoApproval                                         = rpc.PermissionAutoApproval
+	PermissionAssistedApproval                                     = rpc.PermissionAssistedApproval
 	PermissionCancelled                                            = rpc.PermissionCancelled
 	PermissionCompletedData                                        = rpc.PermissionCompletedData
 	PermissionDeniedByContentExclusionPolicy                       = rpc.PermissionDeniedByContentExclusionPolicy
@@ -165,9 +175,11 @@ type (
 	PermissionDeniedByRules                                        = rpc.PermissionDeniedByRules
 	PermissionDeniedInteractivelyByUser                            = rpc.PermissionDeniedInteractivelyByUser
 	PermissionDeniedNoApprovalRuleAndCouldNotRequestFromUser       = rpc.PermissionDeniedNoApprovalRuleAndCouldNotRequestFromUser
+	PermissionMode                                                 = rpc.PermissionMode
 	PermissionPromptRequest                                        = rpc.PermissionPromptRequest
 	PermissionPromptRequestCommands                                = rpc.PermissionPromptRequestCommands
 	PermissionPromptRequestCustomTool                              = rpc.PermissionPromptRequestCustomTool
+	PermissionPromptRequestExtensionEnvAccess                      = rpc.PermissionPromptRequestExtensionEnvAccess
 	PermissionPromptRequestExtensionManagement                     = rpc.PermissionPromptRequestExtensionManagement
 	PermissionPromptRequestExtensionPermissionAccess               = rpc.PermissionPromptRequestExtensionPermissionAccess
 	PermissionPromptRequestFactory                                 = rpc.PermissionPromptRequestFactory
@@ -180,10 +192,12 @@ type (
 	PermissionPromptRequestRead                                    = rpc.PermissionPromptRequestRead
 	PermissionPromptRequestURL                                     = rpc.PermissionPromptRequestURL
 	PermissionPromptRequestWrite                                   = rpc.PermissionPromptRequestWrite
+	PermissionRecommendation                                       = rpc.PermissionRecommendation
 	PermissionRequest                                              = rpc.PermissionRequest
 	PermissionRequestCommand                                       = rpc.PermissionRequestCommand
 	PermissionRequestCustomTool                                    = rpc.PermissionRequestCustomTool
 	PermissionRequestedData                                        = rpc.PermissionRequestedData
+	PermissionRequestExtensionEnvAccess                            = rpc.PermissionRequestExtensionEnvAccess
 	PermissionRequestExtensionManagement                           = rpc.PermissionRequestExtensionManagement
 	PermissionRequestExtensionPermissionAccess                     = rpc.PermissionRequestExtensionPermissionAccess
 	PermissionRequestFactory                                       = rpc.PermissionRequestFactory
@@ -193,6 +207,7 @@ type (
 	PermissionRequestMemory                                        = rpc.PermissionRequestMemory
 	PermissionRequestMemoryAction                                  = rpc.PermissionRequestMemoryAction
 	PermissionRequestMemoryDirection                               = rpc.PermissionRequestMemoryDirection
+	PermissionRequestMemoryScope                                   = rpc.PermissionRequestMemoryScope
 	PermissionRequestRead                                          = rpc.PermissionRequestRead
 	PermissionRequestShell                                         = rpc.PermissionRequestShell
 	PermissionRequestShellCommand                                  = rpc.PermissionRequestShellCommand
@@ -209,6 +224,7 @@ type (
 	PersistedBinaryResultType                                      = rpc.PersistedBinaryResultType
 	PlanChangedOperation                                           = rpc.PlanChangedOperation
 	PossibleURL                                                    = rpc.PossibleURL
+	PromptCacheBreakData                                           = rpc.PromptCacheBreakData
 	RawCitationLocation                                            = rpc.RawCitationLocation
 	RawPermissionPromptRequest                                     = rpc.RawPermissionPromptRequest
 	RawPermissionRequest                                           = rpc.RawPermissionRequest
@@ -220,6 +236,7 @@ type (
 	ReasoningSummary                                               = rpc.ReasoningSummary
 	SamplingCompletedData                                          = rpc.SamplingCompletedData
 	SamplingRequestedData                                          = rpc.SamplingRequestedData
+	SandboxDecisionData                                            = rpc.SandboxDecisionData
 	ScheduleOrigin                                                 = rpc.ScheduleOrigin
 	SessionAutoModeResolvedData                                    = rpc.SessionAutoModeResolvedData
 	SessionAutopilotObjectiveChangedData                           = rpc.SessionAutopilotObjectiveChangedData
@@ -279,6 +296,7 @@ type (
 	SessionUsageInfoData                                           = rpc.SessionUsageInfoData
 	SessionWarningData                                             = rpc.SessionWarningData
 	SessionWorkspaceFileChangedData                                = rpc.SessionWorkspaceFileChangedData
+	ShutdownAgentMetric                                            = rpc.ShutdownAgentMetric
 	ShutdownCodeChanges                                            = rpc.ShutdownCodeChanges
 	ShutdownModelMetric                                            = rpc.ShutdownModelMetric
 	ShutdownModelMetricRequests                                    = rpc.ShutdownModelMetricRequests
@@ -311,6 +329,7 @@ type (
 	SystemNotificationShellDetachedCompleted                       = rpc.SystemNotificationShellDetachedCompleted
 	SystemNotificationType                                         = rpc.SystemNotificationType
 	SystemNotificationUnclassified                                 = rpc.SystemNotificationUnclassified
+	TaskCompleteData                                               = rpc.TaskCompleteData
 	TaskCompletionOutcome                                          = rpc.TaskCompletionOutcome
 	ToolExecutionCompleteContent                                   = rpc.ToolExecutionCompleteContent
 	ToolExecutionCompleteContentAudio                              = rpc.ToolExecutionCompleteContentAudio
@@ -350,6 +369,8 @@ type (
 	ToolExecutionStartToolDescriptionMetaUIVisibility              = rpc.ToolExecutionStartToolDescriptionMetaUIVisibility
 	ToolSearchActivatedData                                        = rpc.ToolSearchActivatedData
 	ToolUserRequestedData                                          = rpc.ToolUserRequestedData
+	UIEphemeralQueryData                                           = rpc.UIEphemeralQueryData
+	UIEphemeralQueryPhase                                          = rpc.UIEphemeralQueryPhase
 	UserInputCompletedData                                         = rpc.UserInputCompletedData
 	UserInputRequestedData                                         = rpc.UserInputRequestedData
 	UserMessageAgentMode                                           = rpc.UserMessageAgentMode
@@ -358,6 +379,7 @@ type (
 	UserToolSessionApproval                                        = rpc.UserToolSessionApproval
 	UserToolSessionApprovalCommands                                = rpc.UserToolSessionApprovalCommands
 	UserToolSessionApprovalCustomTool                              = rpc.UserToolSessionApprovalCustomTool
+	UserToolSessionApprovalExtensionEnvAccess                      = rpc.UserToolSessionApprovalExtensionEnvAccess
 	UserToolSessionApprovalExtensionManagement                     = rpc.UserToolSessionApprovalExtensionManagement
 	UserToolSessionApprovalExtensionPermissionAccess               = rpc.UserToolSessionApprovalExtensionPermissionAccess
 	UserToolSessionApprovalFactory                                 = rpc.UserToolSessionApprovalFactory
@@ -378,12 +400,29 @@ const (
 	AbortReasonRemoteCommand                                           = rpc.AbortReasonRemoteCommand
 	AbortReasonUserAbort                                               = rpc.AbortReasonUserAbort
 	AbortReasonUserInitiated                                           = rpc.AbortReasonUserInitiated
+	AgentInterruptedActivityBackgroundAgent                            = rpc.AgentInterruptedActivityBackgroundAgent
+	AgentInterruptedActivityModelCall                                  = rpc.AgentInterruptedActivityModelCall
+	AgentInterruptedActivityRetryBackoff                               = rpc.AgentInterruptedActivityRetryBackoff
+	AgentInterruptedActivityToolCall                                   = rpc.AgentInterruptedActivityToolCall
+	AgentInterruptedCancelPhaseMidStream                               = rpc.AgentInterruptedCancelPhaseMidStream
+	AgentInterruptedCancelPhasePreFirstToken                           = rpc.AgentInterruptedCancelPhasePreFirstToken
 	AssistantMessageToolRequestTypeCustom                              = rpc.AssistantMessageToolRequestTypeCustom
 	AssistantMessageToolRequestTypeFunction                            = rpc.AssistantMessageToolRequestTypeFunction
 	AssistantUsageAPIEndpointChatCompletions                           = rpc.AssistantUsageAPIEndpointChatCompletions
 	AssistantUsageAPIEndpointResponses                                 = rpc.AssistantUsageAPIEndpointResponses
 	AssistantUsageAPIEndpointV1Messages                                = rpc.AssistantUsageAPIEndpointV1Messages
 	AssistantUsageAPIEndpointWsResponses                               = rpc.AssistantUsageAPIEndpointWsResponses
+	AssistantUsageTransportHTTP                                        = rpc.AssistantUsageTransportHTTP
+	AssistantUsageTransportWebsocket                                   = rpc.AssistantUsageTransportWebsocket
+	AssistedApprovalJudgeFailureReasonAbort                            = rpc.AssistedApprovalJudgeFailureReasonAbort
+	AssistedApprovalJudgeFailureReasonEmptyResponse                    = rpc.AssistedApprovalJudgeFailureReasonEmptyResponse
+	AssistedApprovalJudgeFailureReasonModelError                       = rpc.AssistedApprovalJudgeFailureReasonModelError
+	AssistedApprovalJudgeFailureReasonParseError                       = rpc.AssistedApprovalJudgeFailureReasonParseError
+	AssistedApprovalJudgeFailureReasonTimeout                          = rpc.AssistedApprovalJudgeFailureReasonTimeout
+	AssistedApprovalRecommendationApprove                              = rpc.AssistedApprovalRecommendationApprove
+	AssistedApprovalRecommendationError                                = rpc.AssistedApprovalRecommendationError
+	AssistedApprovalRecommendationExcluded                             = rpc.AssistedApprovalRecommendationExcluded
+	AssistedApprovalRecommendationRequireApproval                      = rpc.AssistedApprovalRecommendationRequireApproval
 	AttachmentGitHubReferenceTypeDiscussion                            = rpc.AttachmentGitHubReferenceTypeDiscussion
 	AttachmentGitHubReferenceTypeIssue                                 = rpc.AttachmentGitHubReferenceTypeIssue
 	AttachmentGitHubReferenceTypePr                                    = rpc.AttachmentGitHubReferenceTypePr
@@ -402,15 +441,6 @@ const (
 	AttachmentTypeGitHubTreeComparison                                 = rpc.AttachmentTypeGitHubTreeComparison
 	AttachmentTypeGitHubURL                                            = rpc.AttachmentTypeGitHubURL
 	AttachmentTypeSelection                                            = rpc.AttachmentTypeSelection
-	AutoApprovalJudgeFailureReasonAbort                                = rpc.AutoApprovalJudgeFailureReasonAbort
-	AutoApprovalJudgeFailureReasonEmptyResponse                        = rpc.AutoApprovalJudgeFailureReasonEmptyResponse
-	AutoApprovalJudgeFailureReasonModelError                           = rpc.AutoApprovalJudgeFailureReasonModelError
-	AutoApprovalJudgeFailureReasonParseError                           = rpc.AutoApprovalJudgeFailureReasonParseError
-	AutoApprovalJudgeFailureReasonTimeout                              = rpc.AutoApprovalJudgeFailureReasonTimeout
-	AutoApprovalRecommendationApprove                                  = rpc.AutoApprovalRecommendationApprove
-	AutoApprovalRecommendationError                                    = rpc.AutoApprovalRecommendationError
-	AutoApprovalRecommendationExcluded                                 = rpc.AutoApprovalRecommendationExcluded
-	AutoApprovalRecommendationRequireApproval                          = rpc.AutoApprovalRecommendationRequireApproval
 	AutoModeResolvedReasoningBucketHigh                                = rpc.AutoModeResolvedReasoningBucketHigh
 	AutoModeResolvedReasoningBucketLow                                 = rpc.AutoModeResolvedReasoningBucketLow
 	AutoModeResolvedReasoningBucketMedium                              = rpc.AutoModeResolvedReasoningBucketMedium
@@ -461,15 +491,22 @@ const (
 	ExtensionsLoadedExtensionStatusStarting                            = rpc.ExtensionsLoadedExtensionStatusStarting
 	FactoryPermissionOperationAuthor                                   = rpc.FactoryPermissionOperationAuthor
 	FactoryPermissionOperationRun                                      = rpc.FactoryPermissionOperationRun
+	FactoryRunSettledStatusCancelled                                   = rpc.FactoryRunSettledStatusCancelled
+	FactoryRunSettledStatusCompleted                                   = rpc.FactoryRunSettledStatusCompleted
+	FactoryRunSettledStatusError                                       = rpc.FactoryRunSettledStatusError
+	FactoryRunSettledStatusHalted                                      = rpc.FactoryRunSettledStatusHalted
 	HandoffSourceTypeLocal                                             = rpc.HandoffSourceTypeLocal
 	HandoffSourceTypeRemote                                            = rpc.HandoffSourceTypeRemote
 	ManagedSettingsEnforcedActionBypassPermissionsBlocked              = rpc.ManagedSettingsEnforcedActionBypassPermissionsBlocked
 	ManagedSettingsEnforcedEscalationAllowAll                          = rpc.ManagedSettingsEnforcedEscalationAllowAll
 	ManagedSettingsEnforcedEscalationApproveAll                        = rpc.ManagedSettingsEnforcedEscalationApproveAll
-	ManagedSettingsEnforcedEscalationAutoApproval                      = rpc.ManagedSettingsEnforcedEscalationAutoApproval
+	ManagedSettingsEnforcedEscalationAssistedApproval                  = rpc.ManagedSettingsEnforcedEscalationAssistedApproval
+	ManagedSettingsEnforcedEscalationServerWideMCPApproval             = rpc.ManagedSettingsEnforcedEscalationServerWideMCPApproval
 	ManagedSettingsEnforcedEscalationUnrestrictedPaths                 = rpc.ManagedSettingsEnforcedEscalationUnrestrictedPaths
 	ManagedSettingsEnforcedEscalationUnrestrictedURLs                  = rpc.ManagedSettingsEnforcedEscalationUnrestrictedURLs
+	ManagedSettingsResolvedSourceClient                                = rpc.ManagedSettingsResolvedSourceClient
 	ManagedSettingsResolvedSourceDevice                                = rpc.ManagedSettingsResolvedSourceDevice
+	ManagedSettingsResolvedSourceMixed                                 = rpc.ManagedSettingsResolvedSourceMixed
 	ManagedSettingsResolvedSourceNone                                  = rpc.ManagedSettingsResolvedSourceNone
 	ManagedSettingsResolvedSourceServer                                = rpc.ManagedSettingsResolvedSourceServer
 	MCPHeadersRefreshCompletedOutcomeHeaders                           = rpc.MCPHeadersRefreshCompletedOutcomeHeaders
@@ -509,15 +546,31 @@ const (
 	ModelCallFailureSourceTopLevel                                     = rpc.ModelCallFailureSourceTopLevel
 	ModelCallFailureTransportHTTP                                      = rpc.ModelCallFailureTransportHTTP
 	ModelCallFailureTransportWebsocket                                 = rpc.ModelCallFailureTransportWebsocket
+	ModelCallFinishedOutcomeCancelled                                  = rpc.ModelCallFinishedOutcomeCancelled
+	ModelCallFinishedOutcomeError                                      = rpc.ModelCallFinishedOutcomeError
+	ModelCallFinishedOutcomeRejected                                   = rpc.ModelCallFinishedOutcomeRejected
+	ModelCallFinishedOutcomeSuccess                                    = rpc.ModelCallFinishedOutcomeSuccess
+	ModelChangeSourceAgent                                             = rpc.ModelChangeSourceAgent
+	ModelChangeSourceAutomatic                                         = rpc.ModelChangeSourceAutomatic
+	ModelChangeSourceConfigCommand                                     = rpc.ModelChangeSourceConfigCommand
+	ModelChangeSourceManagedSettings                                   = rpc.ModelChangeSourceManagedSettings
+	ModelChangeSourceModelCommand                                      = rpc.ModelChangeSourceModelCommand
+	ModelChangeSourceModelPicker                                       = rpc.ModelChangeSourceModelPicker
+	ModelChangeSourcePlanMode                                          = rpc.ModelChangeSourcePlanMode
+	ModelChangeSourceRepoSettings                                      = rpc.ModelChangeSourceRepoSettings
+	ModelChangeSourceSDK                                               = rpc.ModelChangeSourceSDK
+	ModelChangeSourceSettingsCommand                                   = rpc.ModelChangeSourceSettingsCommand
+	ModelChangeSourceStartup                                           = rpc.ModelChangeSourceStartup
 	OmittedBinaryOmittedReasonAssetUnavailable                         = rpc.OmittedBinaryOmittedReasonAssetUnavailable
 	OmittedBinaryOmittedReasonTooLarge                                 = rpc.OmittedBinaryOmittedReasonTooLarge
 	OmittedBinaryTypeImage                                             = rpc.OmittedBinaryTypeImage
 	OmittedBinaryTypeResource                                          = rpc.OmittedBinaryTypeResource
-	PermissionAllowAllModeAuto                                         = rpc.PermissionAllowAllModeAuto
-	PermissionAllowAllModeOff                                          = rpc.PermissionAllowAllModeOff
-	PermissionAllowAllModeOn                                           = rpc.PermissionAllowAllModeOn
+	PermissionModeAllowAll                                             = rpc.PermissionModeAllowAll
+	PermissionModeAssisted                                             = rpc.PermissionModeAssisted
+	PermissionModeManual                                               = rpc.PermissionModeManual
 	PermissionPromptRequestKindCommands                                = rpc.PermissionPromptRequestKindCommands
 	PermissionPromptRequestKindCustomTool                              = rpc.PermissionPromptRequestKindCustomTool
+	PermissionPromptRequestKindExtensionEnvAccess                      = rpc.PermissionPromptRequestKindExtensionEnvAccess
 	PermissionPromptRequestKindExtensionManagement                     = rpc.PermissionPromptRequestKindExtensionManagement
 	PermissionPromptRequestKindExtensionPermissionAccess               = rpc.PermissionPromptRequestKindExtensionPermissionAccess
 	PermissionPromptRequestKindFactory                                 = rpc.PermissionPromptRequestKindFactory
@@ -531,7 +584,9 @@ const (
 	PermissionPromptRequestPathAccessKindRead                          = rpc.PermissionPromptRequestPathAccessKindRead
 	PermissionPromptRequestPathAccessKindShell                         = rpc.PermissionPromptRequestPathAccessKindShell
 	PermissionPromptRequestPathAccessKindWrite                         = rpc.PermissionPromptRequestPathAccessKindWrite
+	PermissionRecommendationApprove                                    = rpc.PermissionRecommendationApprove
 	PermissionRequestKindCustomTool                                    = rpc.PermissionRequestKindCustomTool
+	PermissionRequestKindExtensionEnvAccess                            = rpc.PermissionRequestKindExtensionEnvAccess
 	PermissionRequestKindExtensionManagement                           = rpc.PermissionRequestKindExtensionManagement
 	PermissionRequestKindExtensionPermissionAccess                     = rpc.PermissionRequestKindExtensionPermissionAccess
 	PermissionRequestKindFactory                                       = rpc.PermissionRequestKindFactory
@@ -546,6 +601,8 @@ const (
 	PermissionRequestMemoryActionVote                                  = rpc.PermissionRequestMemoryActionVote
 	PermissionRequestMemoryDirectionDownvote                           = rpc.PermissionRequestMemoryDirectionDownvote
 	PermissionRequestMemoryDirectionUpvote                             = rpc.PermissionRequestMemoryDirectionUpvote
+	PermissionRequestMemoryScopeRepository                             = rpc.PermissionRequestMemoryScopeRepository
+	PermissionRequestMemoryScopeUser                                   = rpc.PermissionRequestMemoryScopeUser
 	PermissionResultKindApproved                                       = rpc.PermissionResultKindApproved
 	PermissionResultKindApprovedForLocation                            = rpc.PermissionResultKindApprovedForLocation
 	PermissionResultKindApprovedForSession                             = rpc.PermissionResultKindApprovedForSession
@@ -568,6 +625,7 @@ const (
 	ScheduleOriginModel                                                = rpc.ScheduleOriginModel
 	ScheduleOriginUser                                                 = rpc.ScheduleOriginUser
 	SessionEventTypeAbort                                              = rpc.SessionEventTypeAbort
+	SessionEventTypeAgentInterrupted                                   = rpc.SessionEventTypeAgentInterrupted
 	SessionEventTypeAssistantIdle                                      = rpc.SessionEventTypeAssistantIdle
 	SessionEventTypeAssistantIntent                                    = rpc.SessionEventTypeAssistantIntent
 	SessionEventTypeAssistantMessage                                   = rpc.SessionEventTypeAssistantMessage
@@ -595,6 +653,8 @@ const (
 	SessionEventTypeExitPlanModeRequested                              = rpc.SessionEventTypeExitPlanModeRequested
 	SessionEventTypeExternalToolCompleted                              = rpc.SessionEventTypeExternalToolCompleted
 	SessionEventTypeExternalToolRequested                              = rpc.SessionEventTypeExternalToolRequested
+	SessionEventTypeFactoryRunSettled                                  = rpc.SessionEventTypeFactoryRunSettled
+	SessionEventTypeFactoryRunStarted                                  = rpc.SessionEventTypeFactoryRunStarted
 	SessionEventTypeFactoryRunUpdated                                  = rpc.SessionEventTypeFactoryRunUpdated
 	SessionEventTypeHookEnd                                            = rpc.SessionEventTypeHookEnd
 	SessionEventTypeHookProgress                                       = rpc.SessionEventTypeHookProgress
@@ -608,12 +668,15 @@ const (
 	SessionEventTypeMCPResourcesListChanged                            = rpc.SessionEventTypeMCPResourcesListChanged
 	SessionEventTypeMCPToolsListChanged                                = rpc.SessionEventTypeMCPToolsListChanged
 	SessionEventTypeModelCallFailure                                   = rpc.SessionEventTypeModelCallFailure
+	SessionEventTypeModelCallFinished                                  = rpc.SessionEventTypeModelCallFinished
 	SessionEventTypeModelCallStart                                     = rpc.SessionEventTypeModelCallStart
 	SessionEventTypePendingMessagesModified                            = rpc.SessionEventTypePendingMessagesModified
 	SessionEventTypePermissionCompleted                                = rpc.SessionEventTypePermissionCompleted
 	SessionEventTypePermissionRequested                                = rpc.SessionEventTypePermissionRequested
+	SessionEventTypePromptCacheBreak                                   = rpc.SessionEventTypePromptCacheBreak
 	SessionEventTypeSamplingCompleted                                  = rpc.SessionEventTypeSamplingCompleted
 	SessionEventTypeSamplingRequested                                  = rpc.SessionEventTypeSamplingRequested
+	SessionEventTypeSandboxDecision                                    = rpc.SessionEventTypeSandboxDecision
 	SessionEventTypeSessionAutoModeResolved                            = rpc.SessionEventTypeSessionAutoModeResolved
 	SessionEventTypeSessionAutopilotObjectiveChanged                   = rpc.SessionEventTypeSessionAutopilotObjectiveChanged
 	SessionEventTypeSessionBackgroundTasksChanged                      = rpc.SessionEventTypeSessionBackgroundTasksChanged
@@ -679,6 +742,7 @@ const (
 	SessionEventTypeToolExecutionStart                                 = rpc.SessionEventTypeToolExecutionStart
 	SessionEventTypeToolSearchActivated                                = rpc.SessionEventTypeToolSearchActivated
 	SessionEventTypeToolUserRequested                                  = rpc.SessionEventTypeToolUserRequested
+	SessionEventTypeUIEphemeralQuery                                   = rpc.SessionEventTypeUIEphemeralQuery
 	SessionEventTypeUserInputCompleted                                 = rpc.SessionEventTypeUserInputCompleted
 	SessionEventTypeUserInputRequested                                 = rpc.SessionEventTypeUserInputRequested
 	SessionEventTypeUserMessage                                        = rpc.SessionEventTypeUserMessage
@@ -733,6 +797,11 @@ const (
 	ToolExecutionCompleteToolDescriptionMetaUIVisibilityModel          = rpc.ToolExecutionCompleteToolDescriptionMetaUIVisibilityModel
 	ToolExecutionStartToolDescriptionMetaUIVisibilityApp               = rpc.ToolExecutionStartToolDescriptionMetaUIVisibilityApp
 	ToolExecutionStartToolDescriptionMetaUIVisibilityModel             = rpc.ToolExecutionStartToolDescriptionMetaUIVisibilityModel
+	UIEphemeralQueryPhaseAborted                                       = rpc.UIEphemeralQueryPhaseAborted
+	UIEphemeralQueryPhaseChunk                                         = rpc.UIEphemeralQueryPhaseChunk
+	UIEphemeralQueryPhaseCompleted                                     = rpc.UIEphemeralQueryPhaseCompleted
+	UIEphemeralQueryPhaseFailed                                        = rpc.UIEphemeralQueryPhaseFailed
+	UIEphemeralQueryPhaseStarted                                       = rpc.UIEphemeralQueryPhaseStarted
 	UserMessageAgentModeAutopilot                                      = rpc.UserMessageAgentModeAutopilot
 	UserMessageAgentModeInteractive                                    = rpc.UserMessageAgentModeInteractive
 	UserMessageAgentModePlan                                           = rpc.UserMessageAgentModePlan
@@ -742,6 +811,7 @@ const (
 	UserMessageDeliverySteering                                        = rpc.UserMessageDeliverySteering
 	UserToolSessionApprovalKindCommands                                = rpc.UserToolSessionApprovalKindCommands
 	UserToolSessionApprovalKindCustomTool                              = rpc.UserToolSessionApprovalKindCustomTool
+	UserToolSessionApprovalKindExtensionEnvAccess                      = rpc.UserToolSessionApprovalKindExtensionEnvAccess
 	UserToolSessionApprovalKindExtensionManagement                     = rpc.UserToolSessionApprovalKindExtensionManagement
 	UserToolSessionApprovalKindExtensionPermissionAccess               = rpc.UserToolSessionApprovalKindExtensionPermissionAccess
 	UserToolSessionApprovalKindFactory                                 = rpc.UserToolSessionApprovalKindFactory
diff --git a/java/.mvn/wrapper/maven-wrapper.properties b/java/.mvn/wrapper/maven-wrapper.properties
index 8dea6c227c..216df05897 100644
--- a/java/.mvn/wrapper/maven-wrapper.properties
+++ b/java/.mvn/wrapper/maven-wrapper.properties
@@ -1,3 +1,3 @@
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
diff --git a/java/README.md b/java/README.md
index c3428eee08..e699c67369 100644
--- a/java/README.md
+++ b/java/README.md
@@ -32,14 +32,14 @@ Replace `${copilot.sdk.version}` with the latest release from Maven Central.
 <dependency>
     <groupId>com.github</groupId>
     <artifactId>copilot-sdk-java</artifactId>
-    <version>1.0.9-preview.3</version>
+    <version>1.0.13-preview.1</version>
 </dependency>
 ```
 
 ### Gradle
 
 ```groovy
-implementation 'com.github:copilot-sdk-java:1.0.9-preview.3'
+implementation 'com.github:copilot-sdk-java:1.0.13-preview.1'
 ```
 
 #### Snapshot Builds
@@ -58,7 +58,7 @@ Snapshot builds of the next development version are published to Maven Central S
 <dependency>
     <groupId>com.github</groupId>
     <artifactId>copilot-sdk-java</artifactId>
-    <version>1.0.10-preview.3-SNAPSHOT</version>
+    <version>1.0.14-preview.1-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -67,7 +67,54 @@ Snapshot builds of the next development version are published to Maven Central S
 Replace `${copilot.sdk.version}` with the latest release from Maven Central.
 
 ```groovy
-implementation 'com.github:copilot-sdk-java:1.0.10-preview.3-SNAPSHOT'
+implementation 'com.github:copilot-sdk-java:1.0.14-preview.1-SNAPSHOT'
+```
+
+## In-process mode (experimental)
+
+The SDK supports running the Copilot runtime **in-process** as a native library instead of spawning a separate CLI process. This eliminates process management overhead and simplifies deployment. In-process mode is currently experimental and supported on **linux-x64** (glibc), **linux-arm64** (glibc), **win32-x64**, and **darwin-arm64**.
+
+Because in-process mode is experimental, see the [Using experimental APIs](#using-experimental-apis) section for how to opt in.
+
+### Additional dependency
+
+Add both the SDK and the platform-specific native runtime to your project:
+
+```xml
+<dependencies>
+    <!-- Pure-Java SDK (~1.5 MB) -->
+    <dependency>
+        <groupId>com.github</groupId>
+        <artifactId>copilot-sdk-java</artifactId>
+        <version>${copilot.version}</version>
+    </dependency>
+    <!-- Add the native runtime for the target platform -->
+    <dependency>
+        <groupId>com.github</groupId>
+        <artifactId>copilot-sdk-java-runtime</artifactId>
+        <version>${copilot.version}</version>
+        <classifier>linux-x64</classifier>
+    </dependency>
+    <!-- Use linux-arm64, win32-x64, or darwin-arm64 on those target platforms -->
+    <!-- JNA (required for in-process mode) -->
+    <dependency>
+        <groupId>net.java.dev.jna</groupId>
+        <artifactId>jna</artifactId>
+        <version>5.19.1</version>
+    </dependency>
+</dependencies>
+```
+
+### Usage
+
+Configure the client to use the in-process connection:
+
+```java
+CopilotClientOptions options = new CopilotClientOptions()
+    .setConnection(RuntimeConnection.forInProcess());
+
+CopilotClient client = new CopilotClient(options);
+client.start().get();
 ```
 
 ## Quick Start
@@ -129,6 +176,25 @@ directly.
 
 `CopilotClientOptions.setCwd(...)` sets the runtime process working directory, which otherwise inherits the current process working directory. `SessionConfig.setWorkingDirectory(...)` sets the session working directory, which otherwise defaults to the runtime process working directory.
 
+For rotating per-session GitHub credentials, use
+`SessionConfig.setGitHubTokenProvider(...)` (or the equivalent
+`ResumeSessionConfig` setter) instead of `setGitHubToken(...)`:
+
+```java
+var config = new SessionConfig().setGitHubTokenProvider(args ->
+    acquireForHost(args.host()).thenApply(token ->
+        GitHubTokenProviderResult.token(token, 8 * 60 * 60)));
+```
+
+The remaining lifetime is required and must be positive when the callback
+completes; production GitHub tokens typically last eight hours. A static token
+and a provider are mutually exclusive.
+
+Initial acquisition runs during session creation or resume. Cancellation,
+provider errors, and invalid token responses reject that operation instead of
+falling back to ambient authentication. Idle sessions refresh only before their
+next credential-consuming operation; there is no background refresh timer.
+
 ## Permission Handling
 
 `PermissionHandler.APPROVE_ALL` approves requests when managed settings are disabled. When `enableManagedSettings` is true, it completes exceptionally. Custom handlers can inspect `request.getManagedApprovalRequired()` for human-facing confirmation logic.
@@ -156,12 +222,12 @@ PermissionHandler handler = (request, invocation) -> {
 
 You can run the SDK without setting up a full Java project, by using [JBang](https://www.jbang.dev/).
 
-See the full source of [`jbang-example.java`](jbang-example.java) for a complete example with more features like session idle handling and usage info events.
+See the full source of [`jbang-example.java`](sdk/jbang-example.java) for a complete example with more features like session idle handling and usage info events.
 
 Or run it directly from the repository:
 
 ```bash
-jbang https://github.com/github/copilot-sdk/blob/main/java/jbang-example.java
+jbang https://github.com/github/copilot-sdk/blob/main/java/sdk/jbang-example.java
 ```
 
 ## Annotation-based tools and `ToolInvocation` context
@@ -441,6 +507,65 @@ mvn verify -Dskip.test.harness=true
 mvn jacoco:prepare-agent@wire-up-coverage-instrumentation antrun:run@print-test-jdk-banner surefire:test failsafe:integration-test failsafe:verify jacoco:report@build-coverage-report-from-tests -Denforcer.skip=true
 ```
 
+#### Development Setup for native embedding
+
+Run native-runtime Maven commands from the `java` directory. Native packaging requires Node.js and npm in addition to JDK 25 and Maven because `copilot-native/scripts/fetch-native.mjs` retrieves the pinned npm runtime package.
+
+On a native Linux glibc host, Maven activates `native-linux-x64` or `native-linux-arm64` for the matching architecture when `copilot.native.libc=glibc` is set. On Windows x64 and Apple Silicon macOS, Maven activates `native-win32-x64` or `native-darwin-arm64` automatically. The matching profile validates the host, runs the native script tests, fetches the pinned `@github/copilot-<classifier>` package during `generate-resources`, packages the classifier JAR during `package`, and verifies its native contents. Ensure npm can authenticate to the package registry before running the build.
+
+Before opting in, validate that Node.js reports glibc for the build host:
+
+```bash
+node copilot-native/scripts/validate-native-host.mjs linux-x64
+mvn -pl copilot-native clean verify -Dcopilot.native.libc=glibc
+```
+
+The `inprocess` test profile performs the same validation and native packaging automatically, so the full in-process test command remains:
+
+```bash
+mvn -Pinprocess clean verify
+```
+
+On Windows PowerShell, initialize Java and run the same profile:
+
+```powershell
+mvn -Pinprocess clean verify
+```
+
+The same command validates in-process mode on Apple Silicon macOS:
+
+```bash
+node copilot-native/scripts/validate-native-host.mjs darwin-arm64
+mvn -Pinprocess clean verify
+```
+
+The same command validates in-process mode on Linux ARM64:
+
+```bash
+node copilot-native/scripts/validate-native-host.mjs linux-arm64
+mvn -Pinprocess clean verify -Dcopilot.native.libc=glibc
+```
+
+On Intel macOS, Linux musl, and other unsupported hosts, do not set `copilot.native.libc=glibc`. A normal build produces only the OS-neutral primary, sources, and Javadoc JARs; it does not run native script tests, download or stage native files, or produce a platform classifier JAR.
+
+To build only the OS-neutral artifacts on any host, or override the glibc opt-in, disable native download and packaging:
+
+```bash
+mvn -pl copilot-native clean package -DskipTests -Dcopilot.native.libc=glibc -Dcopilot.native.skip.download=true
+```
+
+The verified Linux x64 checks are:
+
+```bash
+node --test copilot-native/scripts/fetch-native.test.mjs copilot-native/scripts/validate-native-host.test.mjs
+mvn -pl copilot-native help:active-profiles -Dcopilot.native.libc=glibc -Dcopilot.native.skip.download=false
+mvn -pl copilot-native test -Dcopilot.native.libc=glibc
+mvn clean verify -Dcopilot.native.libc=glibc
+mvn clean package -pl copilot-native -DskipTests -Dcopilot.native.libc=glibc -Dcopilot.native.skip.download=true
+```
+
+On Linux, the classifier JAR contains `runtime.node`, `platform.properties`, and `copilot` under `native/linux-x64` or `native/linux-arm64`. On Windows x64, it contains those resources under `native/win32-x64`, with the CLI named `copilot.exe`. On Apple Silicon macOS, it contains them under `native/darwin-arm64`. The placeholder JAR remains OS-neutral and contains no native binaries. Unsupported hosts retain the placeholder-only behavior.
+
 ## License
 
-MIT — see [LICENSE](LICENSE) for details.
+MIT — see [LICENSE](sdk/LICENSE) for details.
diff --git a/java/copilot-native/pom.xml b/java/copilot-native/pom.xml
new file mode 100644
index 0000000000..48f11e4404
--- /dev/null
+++ b/java/copilot-native/pom.xml
@@ -0,0 +1,853 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.github</groupId>
+        <artifactId>copilot-sdk-java-parent</artifactId>
+        <version>1.0.14-preview.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>com.github</groupId>
+    <artifactId>copilot-sdk-java-runtime</artifactId>
+    <packaging>jar</packaging>
+
+    <name>GitHub Copilot SDK :: Java :: Native Runtime</name>
+    <description>Native runtime artifacts for the GitHub Copilot Java SDK, with host-matched platform classifier JARs</description>
+    <url>https://github.com/github/copilot-sdk</url>
+
+    <scm>
+        <connection>scm:git:https://github.com/github/copilot-sdk.git</connection>
+        <developerConnection>scm:git:https://github.com/github/copilot-sdk.git</developerConnection>
+        <url>https://github.com/github/copilot-sdk</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <!--
+            Root of the monorepo. This module lives at java/copilot-native/, so
+            two levels up reaches the monorepo root. Used to locate
+            nodejs/package-lock.json, which pins both the runtime version and
+            its SHA-512 integrity hash.
+        -->
+        <copilot.sdk.root>${project.basedir}/../..</copilot.sdk.root>
+        <copilot.native.staging>${project.build.directory}/native-staging</copilot.native.staging>
+        <!--
+            The native runtime is downloaded from npm; this module is published
+            to Maven Central alongside the sdk module.
+        -->
+        <maven.deploy.skip>false</maven.deploy.skip>
+    </properties>
+
+    <build>
+        <resources>
+            <!--
+                Placeholder resource for the primary JAR. Filtered so that
+                ${project.version} is substituted. Deliberately contains no
+                native binaries: the primary JAR exists only to satisfy Maven
+                Central validation, which requires a main artifact.
+            -->
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <!--
+                On a supported build host, download and verify the matching native
+                runtime binary. The helper script reads the pinned version and
+                SHA-512 integrity hash for @github/copilot-<classifier> from
+                nodejs/package-lock.json, runs `npm pack`, verifies the tarball
+                against that hash, and extracts runtime.node into the staging
+                directory. Requires Node.js and npm — already required for the
+                Java E2E tests.
+            -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>validate-native-host</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>node</executable>
+                            <arguments>
+                                <argument>${project.basedir}/scripts/validate-native-host.mjs</argument>
+                                <argument>${copilot.native.classifier}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>fetch-native</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>node</executable>
+                            <arguments>
+                                <argument>${project.basedir}/scripts/fetch-native.mjs</argument>
+                                <argument>${copilot.sdk.root}</argument>
+                                <argument>${copilot.native.staging}</argument>
+                                <argument>${copilot.native.classifier}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-fetch-native</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${skipTests}</skip>
+                            <executable>node</executable>
+                            <arguments>
+                                <argument>--test</argument>
+                                <argument>${project.basedir}/scripts/fetch-native.test.mjs</argument>
+                                <argument>${project.basedir}/scripts/validate-native-host.test.mjs</argument>
+                                <argument>${project.basedir}/scripts/validate-native-artifact.test.mjs</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <!--
+                        Additional classifier JAR containing
+                        native/<classifier>/runtime.node,
+                        native/<classifier>/copilot or copilot.exe, and
+                        native/<classifier>/platform.properties.
+                    -->
+                    <execution>
+                        <id>jar-native</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>${copilot.native.classifier}</classifier>
+                            <classesDirectory>${copilot.native.staging}/${copilot.native.classifier}</classesDirectory>
+                            <excludes>
+                                <exclude>.version</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <!--
+                        Empty javadoc JAR required by Maven Central. This module
+                        has no Java sources so maven-javadoc-plugin produces nothing.
+                    -->
+                    <execution>
+                        <id>empty-javadoc-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>javadoc</classifier>
+                            <classesDirectory>${project.basedir}/src/main/javadoc</classesDirectory>
+                        </configuration>
+                    </execution>
+                    <!--
+                        Empty sources JAR required by Maven Central.
+                    -->
+                    <execution>
+                        <id>empty-sources-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>sources</classifier>
+                            <classesDirectory>${project.basedir}/src/main/java</classesDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--
+                Structural guards: assert that the classifier JAR carries the
+                complete native artifact set and that the placeholder JAR does
+                not carry the native binary.
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>verify-native-jars</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <condition property="native.binary.present">
+                                    <resourceexists>
+                                        <zipentry zipfile="${project.build.directory}/${project.build.finalName}-${copilot.native.classifier}.jar" name="native/${copilot.native.classifier}/runtime.node" />
+                                    </resourceexists>
+                                </condition>
+                                <fail unless="native.binary.present" message="Classifier JAR is missing native/${copilot.native.classifier}/runtime.node" />
+                                <condition property="native.properties.present">
+                                    <resourceexists>
+                                        <zipentry zipfile="${project.build.directory}/${project.build.finalName}-${copilot.native.classifier}.jar" name="native/${copilot.native.classifier}/platform.properties" />
+                                    </resourceexists>
+                                </condition>
+                                <fail unless="native.properties.present" message="Classifier JAR is missing native/${copilot.native.classifier}/platform.properties" />
+                                <condition property="native.cli.present">
+                                    <resourceexists>
+                                        <zipentry zipfile="${project.build.directory}/${project.build.finalName}-${copilot.native.classifier}.jar" name="native/${copilot.native.classifier}/${copilot.native.cli.filename}" />
+                                    </resourceexists>
+                                </condition>
+                                <fail unless="native.cli.present" message="Classifier JAR is missing native/${copilot.native.classifier}/${copilot.native.cli.filename}" />
+                                <condition property="placeholder.jar.polluted">
+                                    <resourceexists>
+                                        <zipentry zipfile="${project.build.directory}/${project.build.finalName}.jar" name="native/${copilot.native.classifier}/runtime.node" />
+                                    </resourceexists>
+                                </condition>
+                                <fail if="placeholder.jar.polluted" message="Placeholder primary JAR must not contain native binaries" />
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <!--
+            The explicit in-process test profile defaults to Linux x64. A later
+            host profile overrides these properties on Linux ARM64, Windows x64,
+            or Apple Silicon macOS. Unsupported hosts fail validation before
+            downloading or packaging native files.
+        -->
+        <profile>
+            <id>inprocess</id>
+            <properties>
+                <copilot.native.classifier>linux-x64</copilot.native.classifier>
+                <copilot.native.cli.filename>copilot</copilot.native.cli.filename>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-native-host</id>
+                                <phase>validate</phase>
+                            </execution>
+                            <execution>
+                                <id>fetch-native</id>
+                                <phase>generate-resources</phase>
+                            </execution>
+                            <execution>
+                                <id>test-fetch-native</id>
+                                <phase>test</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jar-native</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>verify-native-jars</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!--
+            Bind native packaging only when the build host matches an implemented
+            classifier. Add sibling profiles as additional platforms are supported.
+        -->
+        <profile>
+            <id>native-linux-x64</id>
+            <activation>
+                <os>
+                    <name>Linux</name>
+                    <arch>amd64</arch>
+                </os>
+                <property>
+                    <name>copilot.native.libc</name>
+                    <value>glibc</value>
+                </property>
+            </activation>
+            <properties>
+                <copilot.native.classifier>linux-x64</copilot.native.classifier>
+                <copilot.native.cli.filename>copilot</copilot.native.cli.filename>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-native-host</id>
+                                <phase>validate</phase>
+                            </execution>
+                            <execution>
+                                <id>fetch-native</id>
+                                <phase>generate-resources</phase>
+                            </execution>
+                            <execution>
+                                <id>test-fetch-native</id>
+                                <phase>test</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jar-native</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>verify-native-jars</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>native-linux-arm64</id>
+            <activation>
+                <os>
+                    <name>Linux</name>
+                    <arch>aarch64</arch>
+                </os>
+                <property>
+                    <name>copilot.native.libc</name>
+                    <value>glibc</value>
+                </property>
+            </activation>
+            <properties>
+                <copilot.native.classifier>linux-arm64</copilot.native.classifier>
+                <copilot.native.cli.filename>copilot</copilot.native.cli.filename>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-native-host</id>
+                                <phase>validate</phase>
+                            </execution>
+                            <execution>
+                                <id>fetch-native</id>
+                                <phase>generate-resources</phase>
+                            </execution>
+                            <execution>
+                                <id>test-fetch-native</id>
+                                <phase>test</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jar-native</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>verify-native-jars</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>native-win32-x64</id>
+            <activation>
+                <os>
+                    <family>Windows</family>
+                    <arch>amd64</arch>
+                </os>
+            </activation>
+            <properties>
+                <copilot.native.classifier>win32-x64</copilot.native.classifier>
+                <copilot.native.cli.filename>copilot.exe</copilot.native.cli.filename>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-native-host</id>
+                                <phase>validate</phase>
+                            </execution>
+                            <execution>
+                                <id>fetch-native</id>
+                                <phase>generate-resources</phase>
+                            </execution>
+                            <execution>
+                                <id>test-fetch-native</id>
+                                <phase>test</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jar-native</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>verify-native-jars</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>native-darwin-arm64</id>
+            <activation>
+                <os>
+                    <family>mac</family>
+                    <arch>aarch64</arch>
+                </os>
+            </activation>
+            <properties>
+                <copilot.native.classifier>darwin-arm64</copilot.native.classifier>
+                <copilot.native.cli.filename>copilot</copilot.native.cli.filename>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-native-host</id>
+                                <phase>validate</phase>
+                            </execution>
+                            <execution>
+                                <id>fetch-native</id>
+                                <phase>generate-resources</phase>
+                            </execution>
+                            <execution>
+                                <id>test-fetch-native</id>
+                                <phase>test</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jar-native</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>verify-native-jars</id>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!--
+            The Linux ARM64 classifier is assembled on an ARM64 Ubuntu runner
+            and passed to the sole Ubuntu x64 publisher.
+        -->
+        <profile>
+            <id>attach-external-linux-arm64-classifier</id>
+            <activation>
+                <property>
+                    <name>copilot.native.external.linux.arm64.classifier.path</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-external-linux-arm64-classifier</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>node</executable>
+                                    <arguments>
+                                        <argument>${project.basedir}/scripts/validate-native-artifact.mjs</argument>
+                                        <argument>classifier</argument>
+                                        <argument>linux-arm64</argument>
+                                        <argument>${copilot.native.external.linux.arm64.classifier.path}</argument>
+                                        <argument>${project.build.finalName}-linux-arm64.jar</argument>
+                                        <argument>${copilot.sdk.root}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-external-linux-arm64-classifier</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${copilot.native.external.linux.arm64.classifier.path}</file>
+                                            <type>jar</type>
+                                            <classifier>linux-arm64</classifier>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!--
+            The Windows classifier is assembled on windows-latest and passed to
+            the sole Ubuntu publisher. Validate it before attaching so deploy
+            and release signing see one complete, host-matched artifact set.
+        -->
+        <profile>
+            <id>attach-external-win32-classifier</id>
+            <activation>
+                <property>
+                    <name>copilot.native.external.win32.classifier.path</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-external-win32-classifier</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>node</executable>
+                                    <arguments>
+                                        <argument>${project.basedir}/scripts/validate-native-artifact.mjs</argument>
+                                        <argument>classifier</argument>
+                                        <argument>win32-x64</argument>
+                                        <argument>${copilot.native.external.win32.classifier.path}</argument>
+                                        <argument>${project.build.finalName}-win32-x64.jar</argument>
+                                        <argument>${copilot.sdk.root}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-external-win32-classifier</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${copilot.native.external.win32.classifier.path}</file>
+                                            <type>jar</type>
+                                            <classifier>win32-x64</classifier>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!--
+            The Darwin classifier is assembled on an Apple Silicon macOS runner
+            and passed to the sole Ubuntu publisher with the Windows classifier.
+        -->
+        <profile>
+            <id>attach-external-darwin-classifier</id>
+            <activation>
+                <property>
+                    <name>copilot.native.external.darwin.classifier.path</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-external-darwin-classifier</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>node</executable>
+                                    <arguments>
+                                        <argument>${project.basedir}/scripts/validate-native-artifact.mjs</argument>
+                                        <argument>classifier</argument>
+                                        <argument>darwin-arm64</argument>
+                                        <argument>${copilot.native.external.darwin.classifier.path}</argument>
+                                        <argument>${project.build.finalName}-darwin-arm64.jar</argument>
+                                        <argument>${copilot.sdk.root}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-external-darwin-classifier</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${copilot.native.external.darwin.classifier.path}</file>
+                                            <type>jar</type>
+                                            <classifier>darwin-arm64</classifier>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!--
+            This test-only hook makes Windows-host local deployment validation
+            deterministic. Publication workflows never set this property: they
+            build the Linux classifier on Ubuntu instead.
+        -->
+        <profile>
+            <id>attach-test-linux-classifier</id>
+            <activation>
+                <property>
+                    <name>copilot.native.test.linux.classifier.path</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-test-linux-classifier</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>node</executable>
+                                    <arguments>
+                                        <argument>${project.basedir}/scripts/validate-native-artifact.mjs</argument>
+                                        <argument>classifier</argument>
+                                        <argument>linux-x64</argument>
+                                        <argument>${copilot.native.test.linux.classifier.path}</argument>
+                                        <argument>${project.build.finalName}-linux-x64.jar</argument>
+                                        <argument>${copilot.sdk.root}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-test-linux-classifier</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${copilot.native.test.linux.classifier.path}</file>
+                                            <type>jar</type>
+                                            <classifier>linux-x64</classifier>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!--
+            Keep the end-to-end local deployment check entirely local while
+            exercising the same deploy lifecycle used by releases.
+        -->
+        <profile>
+            <id>local-publication-validation</id>
+            <activation>
+                <property>
+                    <name>copilot.native.test.local.publication</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <configuration>
+                            <skipPublishing>true</skipPublishing>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!--
+            Skip the npm download when building offline or when only the
+            placeholder JAR is needed: mvn -Dcopilot.native.skip.download=true
+        -->
+        <profile>
+            <id>skip-native-download</id>
+            <activation>
+                <property>
+                    <name>copilot.native.skip.download</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-native-host</id>
+                                <phase>none</phase>
+                            </execution>
+                            <execution>
+                                <id>fetch-native</id>
+                                <phase>none</phase>
+                            </execution>
+                            <execution>
+                                <id>test-fetch-native</id>
+                                <phase>none</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jar-native</id>
+                                <phase>none</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>verify-native-jars</id>
+                                <phase>none</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/java/copilot-native/scripts/create-native-classifier-test-fixture.mjs b/java/copilot-native/scripts/create-native-classifier-test-fixture.mjs
new file mode 100644
index 0000000000..095d8c1e9e
--- /dev/null
+++ b/java/copilot-native/scripts/create-native-classifier-test-fixture.mjs
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import fs from "node:fs";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+
+import { readPinnedNativeVersion } from "./validate-native-artifact.mjs";
+
+export function createNativeClassifierTestFixture({
+  classifier,
+  outputPath,
+  repoRoot,
+}) {
+  const cliFilename = classifier.startsWith("win32")
+    ? "copilot.exe"
+    : "copilot";
+  const nativeVersion = readPinnedNativeVersion(repoRoot, classifier);
+  const prefix = `native/${classifier}`;
+  writeStoredZip(outputPath, [
+    [`${prefix}/runtime.node`, "test runtime"],
+    [`${prefix}/${cliFilename}`, "test cli"],
+    [
+      `${prefix}/platform.properties`,
+      `classifier=${classifier}\nversion=${nativeVersion}\n`,
+    ],
+  ]);
+}
+
+export function writeStoredZip(outputPath, entries) {
+  const localRecords = [];
+  const centralRecords = [];
+  let offset = 0;
+
+  for (const [filename, contents] of entries) {
+    const filenameBuffer = Buffer.from(filename);
+    const contentsBuffer = Buffer.isBuffer(contents)
+      ? contents
+      : Buffer.from(contents);
+    const crc = crc32(contentsBuffer);
+    const localHeader = Buffer.alloc(30);
+    localHeader.writeUInt32LE(0x04034b50, 0);
+    localHeader.writeUInt16LE(20, 4);
+    localHeader.writeUInt32LE(crc, 14);
+    localHeader.writeUInt32LE(contentsBuffer.length, 18);
+    localHeader.writeUInt32LE(contentsBuffer.length, 22);
+    localHeader.writeUInt16LE(filenameBuffer.length, 26);
+    const localRecord = Buffer.concat([
+      localHeader,
+      filenameBuffer,
+      contentsBuffer,
+    ]);
+    localRecords.push(localRecord);
+
+    const centralHeader = Buffer.alloc(46);
+    centralHeader.writeUInt32LE(0x02014b50, 0);
+    centralHeader.writeUInt16LE(20, 4);
+    centralHeader.writeUInt16LE(20, 6);
+    centralHeader.writeUInt32LE(crc, 16);
+    centralHeader.writeUInt32LE(contentsBuffer.length, 20);
+    centralHeader.writeUInt32LE(contentsBuffer.length, 24);
+    centralHeader.writeUInt16LE(filenameBuffer.length, 28);
+    centralHeader.writeUInt32LE(offset, 42);
+    centralRecords.push(Buffer.concat([centralHeader, filenameBuffer]));
+    offset += localRecord.length;
+  }
+
+  const centralDirectory = Buffer.concat(centralRecords);
+  const endOfCentralDirectory = Buffer.alloc(22);
+  endOfCentralDirectory.writeUInt32LE(0x06054b50, 0);
+  endOfCentralDirectory.writeUInt16LE(entries.length, 8);
+  endOfCentralDirectory.writeUInt16LE(entries.length, 10);
+  endOfCentralDirectory.writeUInt32LE(centralDirectory.length, 12);
+  endOfCentralDirectory.writeUInt32LE(offset, 16);
+
+  fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+  fs.writeFileSync(
+    outputPath,
+    Buffer.concat([...localRecords, centralDirectory, endOfCentralDirectory]),
+  );
+}
+
+function crc32(buffer) {
+  let crc = 0xffffffff;
+  for (const byte of buffer) {
+    crc ^= byte;
+    for (let bit = 0; bit < 8; bit += 1) {
+      crc = (crc >>> 1) ^ (crc & 1 ? 0xedb88320 : 0);
+    }
+  }
+  return (crc ^ 0xffffffff) >>> 0;
+}
+
+function main() {
+  const [classifier, outputPath, repoRoot] = process.argv.slice(2);
+  if (!classifier || !outputPath || !repoRoot) {
+    console.error(
+      "Usage: node create-native-classifier-test-fixture.mjs <classifier> <outputJar> <repoRoot>",
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  try {
+    createNativeClassifierTestFixture({ classifier, outputPath, repoRoot });
+    console.log(`Created ${classifier} test fixture: ${outputPath}`);
+  } catch (error) {
+    console.error(error.message);
+    process.exitCode = 1;
+  }
+}
+
+if (
+  process.argv[1] &&
+  import.meta.url === pathToFileURL(process.argv[1]).href
+) {
+  main();
+}
diff --git a/java/copilot-native/scripts/fetch-native.mjs b/java/copilot-native/scripts/fetch-native.mjs
new file mode 100644
index 0000000000..7b68f04065
--- /dev/null
+++ b/java/copilot-native/scripts/fetch-native.mjs
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Downloads the `runtime.node` native binary for a single platform classifier
+ * and stages it for packaging into a classifier JAR.
+ *
+ * Steps:
+ *   1. Read the pinned version and the SHA-512 `integrity` value for
+ *      `@github/copilot-<classifier>` from `nodejs/package-lock.json`.
+ *   2. `npm pack` that exact version into the staging directory.
+ *   3. Verify the downloaded tarball against the `integrity` value.
+ *   4. Extract `package/prebuilds/<classifier>/runtime.node` to
+ *      `<staging>/<classifier>/native/<classifier>/runtime.node`.
+ *   5. Extract `package/copilot` (or `package/copilot.exe` on Windows) to
+ *      `<staging>/<classifier>/native/<classifier>/copilot`.
+ *   6. Write `<staging>/<classifier>/native/<classifier>/platform.properties`.
+ *
+ * Usage: node fetch-native.mjs <repoRoot> <stagingDir> <classifier>
+ */
+
+import { createHash } from 'node:crypto';
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const [repoRoot, stagingDir, classifier] = process.argv.slice(2);
+
+if (!repoRoot || !stagingDir || !classifier) {
+  console.error('Usage: node fetch-native.mjs <repoRoot> <stagingDir> <classifier>');
+  process.exit(1);
+}
+
+const lockPath = path.join(repoRoot, 'nodejs', 'package-lock.json');
+const packageName = `@github/copilot-${classifier}`;
+const lock = JSON.parse(fs.readFileSync(lockPath, 'utf8'));
+const entry = lock.packages?.[`node_modules/${packageName}`];
+
+if (!entry?.version || !entry?.integrity) {
+  console.error(`Could not find version/integrity for ${packageName} in ${lockPath}`);
+  process.exit(1);
+}
+
+const { version, integrity } = entry;
+if (!integrity.startsWith('sha512-')) {
+  console.error(`Unsupported integrity algorithm for ${packageName}: ${integrity}`);
+  process.exit(1);
+}
+
+const outDir = path.join(stagingDir, classifier);
+const resourceDir = path.join(outDir, 'native', classifier);
+const runtimePath = path.join(resourceDir, 'runtime.node');
+const isWindows = classifier.startsWith('win32');
+const cliTarballMember = isWindows ? 'package/copilot.exe' : 'package/copilot';
+const cliFilename = isWindows ? 'copilot.exe' : 'copilot';
+const cliPath = path.join(resourceDir, cliFilename);
+const platformPropertiesPath = path.join(resourceDir, 'platform.properties');
+const expectedPlatformProperties = `classifier=${classifier}\nversion=${version}\n`;
+const stampPath = path.join(outDir, '.version');
+
+// Idempotence: skip the download only when every required staged artifact
+// matches the package identity recorded in the stamp.
+if (
+  fs.existsSync(runtimePath) &&
+  fs.existsSync(cliPath) &&
+  fs.existsSync(platformPropertiesPath) &&
+  fs.existsSync(stampPath)
+) {
+  const stampLines = fs.readFileSync(stampPath, 'utf8').trim().split('\n');
+  const stampVersion = stampLines[0] || '';
+  const stampIntegrity = stampLines[1] || '';
+  const stampRuntimeDigest = stampLines[2] || '';
+  const stampCliDigest = stampLines[3] || '';
+  const currentRuntimeDigest = digestFile(runtimePath);
+  const currentCliDigest = digestFile(cliPath);
+  const currentPlatformProperties = fs.readFileSync(platformPropertiesPath, 'utf8');
+  if (
+    stampVersion === version &&
+    stampIntegrity === integrity &&
+    stampRuntimeDigest === currentRuntimeDigest &&
+    stampCliDigest === currentCliDigest &&
+    currentPlatformProperties === expectedPlatformProperties
+  ) {
+    console.log(`${packageName}@${version} already staged at ${runtimePath}`);
+    process.exit(0);
+  }
+}
+
+fs.rmSync(outDir, { recursive: true, force: true });
+fs.mkdirSync(resourceDir, { recursive: true });
+
+console.log(`Downloading ${packageName}@${version} ...`);
+const packOutput = execFileSync('npm', ['pack', `${packageName}@${version}`, '--pack-destination', outDir], {
+  encoding: 'utf8',
+  shell: process.platform === 'win32',
+});
+const tarballName = packOutput.trim().split('\n').pop().trim();
+const tarballPath = path.join(outDir, tarballName);
+
+const actual = `sha512-${createHash('sha512').update(fs.readFileSync(tarballPath)).digest('base64')}`;
+if (actual !== integrity) {
+  console.error(`Integrity verification failed for ${tarballPath}`);
+  console.error(`  expected: ${integrity}`);
+  console.error(`  actual:   ${actual}`);
+  process.exit(1);
+}
+console.log(`Integrity verified (${integrity.slice(0, 20)}...).`);
+
+const memberPath = `package/prebuilds/${classifier}/runtime.node`;
+execFileSync('tar', ['-xzf', tarballPath, '-C', outDir, memberPath], { stdio: 'inherit' });
+fs.renameSync(path.join(outDir, memberPath), runtimePath);
+
+// Extract the copilot CLI executable (necessary-and-sufficient runtime artifact invariant:
+// host_start needs both runtime.node and the copilot CLI from the same package version).
+execFileSync('tar', ['-xzf', tarballPath, '-C', outDir, cliTarballMember], { stdio: 'inherit' });
+fs.renameSync(path.join(outDir, cliTarballMember), cliPath);
+if (!isWindows) {
+  fs.chmodSync(cliPath, 0o755);
+}
+
+fs.rmSync(path.join(outDir, 'package'), { recursive: true, force: true });
+fs.rmSync(tarballPath, { force: true });
+
+fs.writeFileSync(platformPropertiesPath, expectedPlatformProperties);
+const runtimeDigest = digestFile(runtimePath);
+const cliDigest = digestFile(cliPath);
+fs.writeFileSync(stampPath, `${version}\n${integrity}\n${runtimeDigest}\n${cliDigest}\n`);
+
+console.log(`Staged ${runtimePath}`);
+
+function digestFile(filePath) {
+  return `sha512-${createHash('sha512').update(fs.readFileSync(filePath)).digest('base64')}`;
+}
diff --git a/java/copilot-native/scripts/fetch-native.test.mjs b/java/copilot-native/scripts/fetch-native.test.mjs
new file mode 100644
index 0000000000..a2e7ad2a0f
--- /dev/null
+++ b/java/copilot-native/scripts/fetch-native.test.mjs
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'node:assert/strict';
+import { createHash } from 'node:crypto';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+import test from 'node:test';
+
+const version = '1.0.79';
+const integrity = 'sha512-test-integrity';
+const runtimeContent = 'runtime content';
+const cliContent = 'cli content';
+const scriptPath = fileURLToPath(new URL('./fetch-native.mjs', import.meta.url));
+
+for (const classifier of ['linux-x64', 'linux-arm64', 'win32-x64', 'darwin-arm64']) {
+  test(`${classifier}: missing CLI does not use incremental fast path`, (t) => {
+    const fixture = createFixture(t, classifier);
+    fs.rmSync(fixture.cliPath);
+
+    const result = runScript(fixture);
+
+    assertRestagingAttempted(fixture, result);
+  });
+
+  test(`${classifier}: stale CLI does not use incremental fast path`, (t) => {
+    const fixture = createFixture(t, classifier);
+    fs.writeFileSync(fixture.cliPath, 'stale CLI content');
+
+    const result = runScript(fixture);
+
+    assertRestagingAttempted(fixture, result);
+  });
+
+  test(`${classifier}: missing platform metadata does not use incremental fast path`, (t) => {
+    const fixture = createFixture(t, classifier);
+    fs.rmSync(fixture.platformPropertiesPath);
+
+    const result = runScript(fixture);
+
+    assertRestagingAttempted(fixture, result);
+  });
+
+  test(`${classifier}: complete matching artifacts use incremental fast path`, (t) => {
+    const fixture = createFixture(t, classifier);
+
+    const result = runScript(fixture);
+
+    assert.equal(result.status, 0, result.stderr);
+    assert.match(result.stdout, /already staged/);
+    assert.equal(fs.existsSync(fixture.npmMarkerPath), false);
+  });
+}
+
+function createFixture(t, classifier) {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'fetch-native-test-'));
+  t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+
+  const repoRoot = path.join(root, 'repo');
+  const stagingDir = path.join(root, 'staging');
+  const resourceDir = path.join(stagingDir, classifier, 'native', classifier);
+  const fakeBinDir = path.join(root, 'bin');
+  const npmMarkerPath = path.join(root, 'npm-invoked');
+  fs.mkdirSync(path.join(repoRoot, 'nodejs'), { recursive: true });
+  fs.mkdirSync(resourceDir, { recursive: true });
+  fs.mkdirSync(fakeBinDir);
+
+  fs.writeFileSync(
+    path.join(repoRoot, 'nodejs', 'package-lock.json'),
+    JSON.stringify({
+      packages: {
+        [`node_modules/@github/copilot-${classifier}`]: { version, integrity },
+      },
+    }),
+  );
+
+  const runtimePath = path.join(resourceDir, 'runtime.node');
+  const cliPath = path.join(resourceDir, classifier.startsWith('win32') ? 'copilot.exe' : 'copilot');
+  const platformPropertiesPath = path.join(resourceDir, 'platform.properties');
+  fs.writeFileSync(runtimePath, runtimeContent);
+  fs.writeFileSync(cliPath, cliContent);
+  fs.writeFileSync(platformPropertiesPath, `classifier=${classifier}\nversion=${version}\n`);
+  fs.writeFileSync(
+    path.join(stagingDir, classifier, '.version'),
+    `${version}\n${integrity}\n${digest(runtimeContent)}\n${digest(cliContent)}\n`,
+  );
+
+  const fakeNpmPath = path.join(fakeBinDir, process.platform === 'win32' ? 'npm.cmd' : 'npm');
+  if (process.platform === 'win32') {
+    fs.writeFileSync(fakeNpmPath, '@echo off\r\n> "%FETCH_NATIVE_NPM_MARKER%" echo invoked\r\nexit /b 42\r\n');
+  } else {
+    fs.writeFileSync(fakeNpmPath, '#!/bin/sh\nprintf invoked > "$FETCH_NATIVE_NPM_MARKER"\nexit 42\n');
+    fs.chmodSync(fakeNpmPath, 0o755);
+  }
+
+  return {
+    classifier,
+    repoRoot,
+    stagingDir,
+    fakeBinDir,
+    npmMarkerPath,
+    runtimePath,
+    cliPath,
+    platformPropertiesPath,
+  };
+}
+
+function runScript(fixture) {
+  return spawnSync(process.execPath, [scriptPath, fixture.repoRoot, fixture.stagingDir, fixture.classifier], {
+    encoding: 'utf8',
+    env: {
+      ...process.env,
+      PATH: `${fixture.fakeBinDir}${path.delimiter}${process.env.PATH}`,
+      FETCH_NATIVE_NPM_MARKER: fixture.npmMarkerPath,
+    },
+  });
+}
+
+function assertRestagingAttempted(fixture, result) {
+  assert.notEqual(result.status, 0, 'The fake npm command should make restaging fail');
+  assert.equal(fs.readFileSync(fixture.npmMarkerPath, 'utf8').trim(), 'invoked');
+}
+
+function digest(content) {
+  return `sha512-${createHash('sha512').update(content).digest('base64')}`;
+}
diff --git a/java/copilot-native/scripts/validate-local-publication.mjs b/java/copilot-native/scripts/validate-local-publication.mjs
new file mode 100644
index 0000000000..a2586f6c14
--- /dev/null
+++ b/java/copilot-native/scripts/validate-local-publication.mjs
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import fs from "node:fs";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+
+import {
+  validateNativeClassifierJar,
+  validatePlaceholderJar,
+} from "./validate-native-artifact.mjs";
+
+export function validateLocalPublication({
+  artifactId,
+  repositoryPath,
+  repoRoot,
+  requireSignatures,
+  version,
+}) {
+  const artifactDirectory = path.join(
+    repositoryPath,
+    "com",
+    "github",
+    artifactId,
+    version,
+  );
+  const requiredArtifacts = [
+    `${artifactId}-${version}.jar`,
+    `${artifactId}-${version}.pom`,
+    `${artifactId}-${version}-sources.jar`,
+    `${artifactId}-${version}-javadoc.jar`,
+    `${artifactId}-${version}-linux-x64.jar`,
+    `${artifactId}-${version}-linux-arm64.jar`,
+    `${artifactId}-${version}-win32-x64.jar`,
+    `${artifactId}-${version}-darwin-arm64.jar`,
+  ];
+  const files = new Set(fs.readdirSync(artifactDirectory));
+
+  for (const artifact of requiredArtifacts) {
+    if (!files.has(artifact)) {
+      throw new Error(`Local publication is missing ${artifact}`);
+    }
+    if (requireSignatures && !files.has(`${artifact}.asc`)) {
+      throw new Error(
+        `Local release publication is missing signature ${artifact}.asc`,
+      );
+    }
+  }
+
+  const publishedJars = [...files]
+    .filter((file) => file.endsWith(".jar"))
+    .sort();
+  const expectedJars = requiredArtifacts
+    .filter((file) => file.endsWith(".jar"))
+    .sort();
+  if (publishedJars.join("\n") !== expectedJars.join("\n")) {
+    throw new Error(
+      `Local publication contains unexpected JARs:\n${publishedJars.join("\n")}`,
+    );
+  }
+
+  validatePlaceholderJar(
+    path.join(artifactDirectory, `${artifactId}-${version}.jar`),
+  );
+  for (const classifier of [
+    "linux-x64",
+    "linux-arm64",
+    "win32-x64",
+    "darwin-arm64",
+  ]) {
+    const filename = `${artifactId}-${version}-${classifier}.jar`;
+    validateNativeClassifierJar({
+      classifier,
+      jarPath: path.join(artifactDirectory, filename),
+      expectedFilename: filename,
+      repoRoot,
+    });
+  }
+
+  return artifactDirectory;
+}
+
+function main() {
+  const [repositoryPath, artifactId, version, repoRoot, signatures] =
+    process.argv.slice(2);
+  if (!repositoryPath || !artifactId || !version || !repoRoot) {
+    console.error(
+      "Usage: node validate-local-publication.mjs <repositoryPath> <artifactId> <version> <repoRoot> [--signatures]",
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  try {
+    const artifactDirectory = validateLocalPublication({
+      artifactId,
+      repositoryPath,
+      repoRoot,
+      requireSignatures: signatures === "--signatures",
+      version,
+    });
+    console.log(`Validated local Maven publication: ${artifactDirectory}`);
+  } catch (error) {
+    console.error(error.message);
+    process.exitCode = 1;
+  }
+}
+
+if (
+  process.argv[1] &&
+  import.meta.url === pathToFileURL(process.argv[1]).href
+) {
+  main();
+}
diff --git a/java/copilot-native/scripts/validate-native-artifact.mjs b/java/copilot-native/scripts/validate-native-artifact.mjs
new file mode 100644
index 0000000000..dda86a917a
--- /dev/null
+++ b/java/copilot-native/scripts/validate-native-artifact.mjs
@@ -0,0 +1,341 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createHash } from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+import zlib from "node:zlib";
+
+const END_OF_CENTRAL_DIRECTORY = 0x06054b50;
+const CENTRAL_DIRECTORY_FILE_HEADER = 0x02014b50;
+const LOCAL_FILE_HEADER = 0x04034b50;
+const PLATFORM_CLASSIFIER =
+  /^(?:linux(?:musl)?-(?:x64|arm64)|darwin-(?:x64|arm64)|win32-(?:x64|arm64))$/;
+
+export function validateNativeClassifierJar({
+  classifier,
+  jarPath,
+  expectedFilename,
+  repoRoot,
+}) {
+  if (path.basename(jarPath) !== expectedFilename) {
+    throw new Error(
+      `External ${classifier} classifier must be named ${expectedFilename}; received ${path.basename(jarPath)}`,
+    );
+  }
+
+  const archive = readJar(jarPath);
+  const cliFilename = classifier.startsWith("win32")
+    ? "copilot.exe"
+    : "copilot";
+  const resourcePrefix = `native/${classifier}/`;
+  const requiredEntries = [
+    `${resourcePrefix}runtime.node`,
+    `${resourcePrefix}${cliFilename}`,
+    `${resourcePrefix}platform.properties`,
+  ];
+
+  for (const entryName of requiredEntries) {
+    const entry = archive.entries.get(entryName);
+    if (!entry || entry.uncompressedSize === 0) {
+      throw new Error(
+        `External ${classifier} classifier is missing nonempty ${entryName}`,
+      );
+    }
+  }
+
+  for (const entryName of archive.entries.keys()) {
+    const nativeClassifier = /^native\/([^/]+)\//.exec(entryName)?.[1];
+    if (nativeClassifier && nativeClassifier !== classifier) {
+      throw new Error(
+        `External ${classifier} classifier must not contain ${entryName}`,
+      );
+    }
+  }
+
+  const properties = parseProperties(
+    readEntry(archive, `${resourcePrefix}platform.properties`),
+  );
+  const expectedVersion = readPinnedNativeVersion(repoRoot, classifier);
+  if (properties.classifier !== classifier) {
+    throw new Error(
+      `External classifier metadata must contain classifier=${classifier}; received ${properties.classifier ?? "none"}`,
+    );
+  }
+  if (properties.version !== expectedVersion) {
+    throw new Error(
+      `External ${classifier} classifier metadata must contain version=${expectedVersion}; received ${properties.version ?? "none"}`,
+    );
+  }
+
+  return {
+    classifier,
+    nativeVersion: expectedVersion,
+    sha256: undefined,
+  };
+}
+
+export function validatePlaceholderJar(jarPath) {
+  const archive = readJar(jarPath);
+  for (const entryName of archive.entries.keys()) {
+    const nativeClassifier = /^native\/([^/]+)\//.exec(entryName)?.[1];
+    if (nativeClassifier && PLATFORM_CLASSIFIER.test(nativeClassifier)) {
+      throw new Error(
+        `Placeholder primary JAR must not contain platform-native resources; found ${entryName}`,
+      );
+    }
+  }
+}
+
+export function validateSha256Manifest({
+  expectedFilename,
+  jarPath,
+  manifestPath,
+}) {
+  let manifest;
+  try {
+    manifest = fs.readFileSync(manifestPath, "utf8").trim();
+  } catch (error) {
+    throw new Error(
+      `Could not read SHA-256 manifest ${manifestPath}: ${error.message}`,
+    );
+  }
+  const match = /^([a-fA-F0-9]{64}) {2}(.+)$/.exec(manifest);
+  if (!match || match[2] !== expectedFilename) {
+    throw new Error(
+      `SHA-256 manifest must contain one checksum for ${expectedFilename}: ${manifestPath}`,
+    );
+  }
+  const actual = createHash("sha256")
+    .update(fs.readFileSync(jarPath))
+    .digest("hex");
+  if (actual !== match[1].toLowerCase()) {
+    throw new Error(
+      `SHA-256 mismatch for ${expectedFilename}; expected ${match[1].toLowerCase()}, received ${actual}`,
+    );
+  }
+}
+
+export function readPinnedNativeVersion(repoRoot, classifier) {
+  const packageName = `@github/copilot-${classifier}`;
+  const lockPath = path.join(repoRoot, "nodejs", "package-lock.json");
+  let lock;
+  try {
+    lock = JSON.parse(fs.readFileSync(lockPath, "utf8"));
+  } catch (error) {
+    throw new Error(
+      `Could not read pinned ${packageName} version from ${lockPath}: ${error.message}`,
+    );
+  }
+
+  const version = lock.packages?.[`node_modules/${packageName}`]?.version;
+  if (!version) {
+    throw new Error(
+      `Could not find pinned ${packageName} version in ${lockPath}`,
+    );
+  }
+  return version;
+}
+
+function readJar(jarPath) {
+  let stat;
+  try {
+    stat = fs.statSync(jarPath);
+  } catch (error) {
+    throw new Error(`External classifier JAR does not exist: ${jarPath}`);
+  }
+  if (!stat.isFile() || path.extname(jarPath).toLowerCase() !== ".jar") {
+    throw new Error(
+      `External classifier must be a regular .jar file: ${jarPath}`,
+    );
+  }
+
+  const data = fs.readFileSync(jarPath);
+  const eocdOffset = findEndOfCentralDirectory(data);
+  const entryCount = data.readUInt16LE(eocdOffset + 10);
+  const centralDirectorySize = data.readUInt32LE(eocdOffset + 12);
+  const centralDirectoryOffset = data.readUInt32LE(eocdOffset + 16);
+  if (entryCount === 0xffff || centralDirectoryOffset === 0xffffffff) {
+    throw new Error(`ZIP64 classifier JARs are not supported: ${jarPath}`);
+  }
+  if (centralDirectoryOffset + centralDirectorySize > data.length) {
+    throw new Error(
+      `Classifier JAR has an invalid central directory: ${jarPath}`,
+    );
+  }
+
+  const entries = new Map();
+  let offset = centralDirectoryOffset;
+  for (let index = 0; index < entryCount; index += 1) {
+    if (readUInt32(data, offset, jarPath) !== CENTRAL_DIRECTORY_FILE_HEADER) {
+      throw new Error(
+        `Classifier JAR has an invalid central directory entry: ${jarPath}`,
+      );
+    }
+    const compressionMethod = data.readUInt16LE(offset + 10);
+    const compressedSize = data.readUInt32LE(offset + 20);
+    const uncompressedSize = data.readUInt32LE(offset + 24);
+    const filenameLength = data.readUInt16LE(offset + 28);
+    const extraLength = data.readUInt16LE(offset + 30);
+    const commentLength = data.readUInt16LE(offset + 32);
+    const localHeaderOffset = data.readUInt32LE(offset + 42);
+    const filenameOffset = offset + 46;
+    const nextOffset =
+      filenameOffset + filenameLength + extraLength + commentLength;
+    if (nextOffset > data.length) {
+      throw new Error(
+        `Classifier JAR has a truncated central directory entry: ${jarPath}`,
+      );
+    }
+
+    const filename = data.toString(
+      "utf8",
+      filenameOffset,
+      filenameOffset + filenameLength,
+    );
+    if (entries.has(filename)) {
+      throw new Error(
+        `Classifier JAR contains duplicate entry ${filename}: ${jarPath}`,
+      );
+    }
+    entries.set(filename, {
+      compressionMethod,
+      compressedSize,
+      uncompressedSize,
+      localHeaderOffset,
+    });
+    offset = nextOffset;
+  }
+
+  return { data, entries, jarPath };
+}
+
+function findEndOfCentralDirectory(data) {
+  const minimumSize = 22;
+  const minimumOffset = Math.max(0, data.length - minimumSize - 0xffff);
+  for (
+    let offset = data.length - minimumSize;
+    offset >= minimumOffset;
+    offset -= 1
+  ) {
+    if (
+      data.readUInt32LE(offset) === END_OF_CENTRAL_DIRECTORY &&
+      offset + minimumSize + data.readUInt16LE(offset + 20) === data.length
+    ) {
+      return offset;
+    }
+  }
+  throw new Error("Classifier JAR is not a valid ZIP archive");
+}
+
+function readEntry(archive, entryName) {
+  const entry = archive.entries.get(entryName);
+  if (!entry) {
+    throw new Error(`Classifier JAR is missing ${entryName}`);
+  }
+  if (entry.uncompressedSize > 1024 * 1024) {
+    throw new Error(
+      `Classifier JAR metadata entry is unexpectedly large: ${entryName}`,
+    );
+  }
+
+  const { data, jarPath } = archive;
+  const localOffset = entry.localHeaderOffset;
+  if (readUInt32(data, localOffset, jarPath) !== LOCAL_FILE_HEADER) {
+    throw new Error(
+      `Classifier JAR has an invalid local entry for ${entryName}`,
+    );
+  }
+  const filenameLength = data.readUInt16LE(localOffset + 26);
+  const extraLength = data.readUInt16LE(localOffset + 28);
+  const contentsOffset = localOffset + 30 + filenameLength + extraLength;
+  const contentsEnd = contentsOffset + entry.compressedSize;
+  if (contentsEnd > data.length) {
+    throw new Error(
+      `Classifier JAR has a truncated local entry for ${entryName}`,
+    );
+  }
+
+  const compressed = data.subarray(contentsOffset, contentsEnd);
+  let contents;
+  if (entry.compressionMethod === 0) {
+    contents = compressed;
+  } else if (entry.compressionMethod === 8) {
+    contents = zlib.inflateRawSync(compressed);
+  } else {
+    throw new Error(
+      `Classifier JAR uses unsupported compression for ${entryName}: ${entry.compressionMethod}`,
+    );
+  }
+  if (contents.length !== entry.uncompressedSize) {
+    throw new Error(`Classifier JAR has an invalid size for ${entryName}`);
+  }
+  return contents.toString("utf8");
+}
+
+function parseProperties(contents) {
+  const properties = {};
+  for (const line of contents.split(/\r?\n/)) {
+    const separator = line.indexOf("=");
+    if (separator > 0) {
+      properties[line.slice(0, separator).trim()] = line
+        .slice(separator + 1)
+        .trim();
+    }
+  }
+  return properties;
+}
+
+function readUInt32(data, offset, jarPath) {
+  if (offset + 4 > data.length) {
+    throw new Error(`Classifier JAR is truncated: ${jarPath}`);
+  }
+  return data.readUInt32LE(offset);
+}
+
+function main() {
+  const [mode, ...arguments_] = process.argv.slice(2);
+  try {
+    if (mode === "classifier" && arguments_.length === 4) {
+      const [classifier, jarPath, expectedFilename, repoRoot] = arguments_;
+      const result = validateNativeClassifierJar({
+        classifier,
+        jarPath,
+        expectedFilename,
+        repoRoot,
+      });
+      console.log(
+        `Validated ${result.classifier} classifier JAR (${result.nativeVersion}): ${jarPath}`,
+      );
+      return;
+    }
+    if (mode === "placeholder" && arguments_.length === 1) {
+      validatePlaceholderJar(arguments_[0]);
+      console.log(`Validated native-free placeholder JAR: ${arguments_[0]}`);
+      return;
+    }
+    if (mode === "checksum" && arguments_.length === 3) {
+      const [jarPath, manifestPath, expectedFilename] = arguments_;
+      validateSha256Manifest({ expectedFilename, jarPath, manifestPath });
+      console.log(
+        `Validated SHA-256 manifest for ${expectedFilename}: ${manifestPath}`,
+      );
+      return;
+    }
+    throw new Error(
+      "Usage: node validate-native-artifact.mjs classifier <classifier> <jar> <expectedFilename> <repoRoot> | placeholder <jar> | checksum <jar> <manifest> <expectedFilename>",
+    );
+  } catch (error) {
+    console.error(error.message);
+    process.exitCode = 1;
+  }
+}
+
+if (
+  process.argv[1] &&
+  import.meta.url === pathToFileURL(process.argv[1]).href
+) {
+  main();
+}
diff --git a/java/copilot-native/scripts/validate-native-artifact.test.mjs b/java/copilot-native/scripts/validate-native-artifact.test.mjs
new file mode 100644
index 0000000000..f84b4add61
--- /dev/null
+++ b/java/copilot-native/scripts/validate-native-artifact.test.mjs
@@ -0,0 +1,511 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from "node:assert/strict";
+import { createHash } from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import test from "node:test";
+import { fileURLToPath } from "node:url";
+
+import {
+  createNativeClassifierTestFixture,
+  writeStoredZip,
+} from "./create-native-classifier-test-fixture.mjs";
+import {
+  validateNativeClassifierJar,
+  validatePlaceholderJar,
+  validateSha256Manifest,
+} from "./validate-native-artifact.mjs";
+import { validateLocalPublication } from "./validate-local-publication.mjs";
+
+const classifier = "win32-x64";
+const artifactName = "copilot-sdk-java-runtime-1.2.3-win32-x64.jar";
+const moduleRoot = fileURLToPath(new URL("../", import.meta.url));
+
+test("accepts a matching, complete Windows classifier", (t) => {
+  const fixture = createFixture(t);
+  createNativeClassifierTestFixture({
+    classifier,
+    outputPath: fixture.jarPath,
+    repoRoot: fixture.repoRoot,
+  });
+
+  assert.deepEqual(
+    validateNativeClassifierJar({
+      classifier,
+      jarPath: fixture.jarPath,
+      expectedFilename: artifactName,
+      repoRoot: fixture.repoRoot,
+    }),
+    { classifier, nativeVersion: "9.8.7", sha256: undefined },
+  );
+});
+
+test("accepts a matching, complete Darwin classifier", (t) => {
+  const fixture = createFixture(t);
+  const darwinClassifier = "darwin-arm64";
+  const darwinArtifactName =
+    "copilot-sdk-java-runtime-1.2.3-darwin-arm64.jar";
+  const darwinJarPath = path.join(fixture.root, darwinArtifactName);
+  createNativeClassifierTestFixture({
+    classifier: darwinClassifier,
+    outputPath: darwinJarPath,
+    repoRoot: fixture.repoRoot,
+  });
+
+  assert.deepEqual(
+    validateNativeClassifierJar({
+      classifier: darwinClassifier,
+      jarPath: darwinJarPath,
+      expectedFilename: darwinArtifactName,
+      repoRoot: fixture.repoRoot,
+    }),
+    {
+      classifier: darwinClassifier,
+      nativeVersion: "9.8.8",
+      sha256: undefined,
+    },
+  );
+});
+
+test("accepts a matching, complete Linux ARM64 classifier", (t) => {
+  const fixture = createFixture(t);
+  const linuxArm64Classifier = "linux-arm64";
+  const linuxArm64ArtifactName =
+    "copilot-sdk-java-runtime-1.2.3-linux-arm64.jar";
+  const linuxArm64JarPath = path.join(fixture.root, linuxArm64ArtifactName);
+  createNativeClassifierTestFixture({
+    classifier: linuxArm64Classifier,
+    outputPath: linuxArm64JarPath,
+    repoRoot: fixture.repoRoot,
+  });
+
+  assert.deepEqual(
+    validateNativeClassifierJar({
+      classifier: linuxArm64Classifier,
+      jarPath: linuxArm64JarPath,
+      expectedFilename: linuxArm64ArtifactName,
+      repoRoot: fixture.repoRoot,
+    }),
+    {
+      classifier: linuxArm64Classifier,
+      nativeVersion: "9.8.9",
+      sha256: undefined,
+    },
+  );
+});
+
+test("rejects a wrong external filename before attachment", (t) => {
+  const fixture = createFixture(t);
+  const wrongName = path.join(fixture.root, "arbitrary.jar");
+  createNativeClassifierTestFixture({
+    classifier,
+    outputPath: wrongName,
+    repoRoot: fixture.repoRoot,
+  });
+
+  assert.throws(
+    () =>
+      validateNativeClassifierJar({
+        classifier,
+        jarPath: wrongName,
+        expectedFilename: artifactName,
+        repoRoot: fixture.repoRoot,
+      }),
+    /must be named/,
+  );
+});
+
+test("rejects a missing classifier JAR with the expected filename", (t) => {
+  const fixture = createFixture(t);
+
+  assert.throws(
+    () =>
+      validateNativeClassifierJar({
+        classifier,
+        jarPath: fixture.jarPath,
+        expectedFilename: artifactName,
+        repoRoot: fixture.repoRoot,
+      }),
+    /does not exist/,
+  );
+});
+
+test("rejects missing native resources", (t) => {
+  const fixture = createFixture(t);
+  writeStoredZip(fixture.jarPath, [
+    ["native/win32-x64/runtime.node", "runtime"],
+    [
+      "native/win32-x64/platform.properties",
+      "classifier=win32-x64\nversion=9.8.7\n",
+    ],
+  ]);
+
+  assert.throws(
+    () =>
+      validateNativeClassifierJar({
+        classifier,
+        jarPath: fixture.jarPath,
+        expectedFilename: artifactName,
+        repoRoot: fixture.repoRoot,
+      }),
+    /copilot\.exe/,
+  );
+});
+
+test("rejects incorrect pinned package metadata", (t) => {
+  const fixture = createFixture(t);
+  writeStoredZip(fixture.jarPath, [
+    ["native/win32-x64/runtime.node", "runtime"],
+    ["native/win32-x64/copilot.exe", "cli"],
+    [
+      "native/win32-x64/platform.properties",
+      "classifier=win32-x64\nversion=0.0.1\n",
+    ],
+  ]);
+
+  assert.throws(
+    () =>
+      validateNativeClassifierJar({
+        classifier,
+        jarPath: fixture.jarPath,
+        expectedFilename: artifactName,
+        repoRoot: fixture.repoRoot,
+      }),
+    /version=9\.8\.7/,
+  );
+});
+
+test("rejects Linux resources in a Windows classifier", (t) => {
+  const fixture = createFixture(t);
+  createNativeClassifierTestFixture({
+    classifier,
+    outputPath: fixture.jarPath,
+    repoRoot: fixture.repoRoot,
+  });
+  writeStoredZip(fixture.jarPath, [
+    ["native/win32-x64/runtime.node", "runtime"],
+    ["native/win32-x64/copilot.exe", "cli"],
+    [
+      "native/win32-x64/platform.properties",
+      "classifier=win32-x64\nversion=9.8.7\n",
+    ],
+    ["native/linux-x64/runtime.node", "wrong platform"],
+  ]);
+
+  assert.throws(
+    () =>
+      validateNativeClassifierJar({
+        classifier,
+        jarPath: fixture.jarPath,
+        expectedFilename: artifactName,
+        repoRoot: fixture.repoRoot,
+      }),
+    /must not contain/,
+  );
+});
+
+test("rejects Windows resources in a Linux classifier", (t) => {
+  const fixture = createFixture(t);
+  const linuxClassifier = "linux-x64";
+  const linuxArtifactName =
+    "copilot-sdk-java-runtime-1.2.3-linux-x64.jar";
+  const linuxJarPath = path.join(fixture.root, linuxArtifactName);
+  writeStoredZip(linuxJarPath, [
+    ["native/linux-x64/runtime.node", "runtime"],
+    ["native/linux-x64/copilot", "cli"],
+    [
+      "native/linux-x64/platform.properties",
+      "classifier=linux-x64\nversion=9.8.6\n",
+    ],
+    ["native/win32-x64/runtime.node", "wrong platform"],
+  ]);
+
+  assert.throws(
+    () =>
+      validateNativeClassifierJar({
+        classifier: linuxClassifier,
+        jarPath: linuxJarPath,
+        expectedFilename: linuxArtifactName,
+        repoRoot: fixture.repoRoot,
+      }),
+    /must not contain/,
+  );
+});
+
+test("rejects native resources in the placeholder JAR", (t) => {
+  const fixture = createFixture(t);
+  writeStoredZip(fixture.jarPath, [
+    ["native/win32-x64/runtime.node", "runtime"],
+  ]);
+
+  assert.throws(
+    () => validatePlaceholderJar(fixture.jarPath),
+    /must not contain/,
+  );
+});
+
+test("rejects Darwin native resources in the placeholder JAR", (t) => {
+  const fixture = createFixture(t);
+  writeStoredZip(fixture.jarPath, [
+    ["native/darwin-arm64/runtime.node", "runtime"],
+  ]);
+
+  assert.throws(
+    () => validatePlaceholderJar(fixture.jarPath),
+    /must not contain/,
+  );
+});
+
+test("accepts a native-free placeholder JAR", (t) => {
+  const fixture = createFixture(t);
+  writeStoredZip(fixture.jarPath, [
+    ["META-INF/MANIFEST.MF", "Manifest-Version: 1.0\n"],
+  ]);
+
+  assert.doesNotThrow(() => validatePlaceholderJar(fixture.jarPath));
+});
+
+test("rejects an invalid SHA-256 manifest", (t) => {
+  const fixture = createFixture(t);
+  createNativeClassifierTestFixture({
+    classifier,
+    outputPath: fixture.jarPath,
+    repoRoot: fixture.repoRoot,
+  });
+  const manifestPath = path.join(fixture.root, "classifier.sha256");
+  fs.writeFileSync(manifestPath, `${"0".repeat(64)}  ${artifactName}\n`);
+
+  assert.throws(
+    () =>
+      validateSha256Manifest({
+        expectedFilename: artifactName,
+        jarPath: fixture.jarPath,
+        manifestPath,
+      }),
+    /SHA-256 mismatch/,
+  );
+});
+
+test("accepts a matching SHA-256 manifest", (t) => {
+  const fixture = createFixture(t);
+  createNativeClassifierTestFixture({
+    classifier,
+    outputPath: fixture.jarPath,
+    repoRoot: fixture.repoRoot,
+  });
+  const manifestPath = path.join(fixture.root, "classifier.sha256");
+  const digest = createHash("sha256")
+    .update(fs.readFileSync(fixture.jarPath))
+    .digest("hex");
+  fs.writeFileSync(manifestPath, `${digest}  ${artifactName}\n`);
+
+  assert.doesNotThrow(() =>
+    validateSha256Manifest({
+      expectedFilename: artifactName,
+      jarPath: fixture.jarPath,
+      manifestPath,
+    }),
+  );
+});
+
+test("validates one complete signed local publication", (t) => {
+  const fixture = createFixture(t);
+  const artifactId = "copilot-sdk-java-runtime";
+  const version = "1.2.3";
+  const publicationDirectory = path.join(
+    fixture.root,
+    "repository",
+    "com",
+    "github",
+    artifactId,
+    version,
+  );
+  fs.mkdirSync(publicationDirectory, { recursive: true });
+  const primaryJar = `${artifactId}-${version}.jar`;
+  const linuxJar = `${artifactId}-${version}-linux-x64.jar`;
+  const linuxArm64Jar = `${artifactId}-${version}-linux-arm64.jar`;
+  const windowsJar = `${artifactId}-${version}-win32-x64.jar`;
+  const darwinJar = `${artifactId}-${version}-darwin-arm64.jar`;
+  writeStoredZip(path.join(publicationDirectory, primaryJar), [
+    ["META-INF/MANIFEST.MF", "Manifest-Version: 1.0\n"],
+  ]);
+  writeStoredZip(
+    path.join(publicationDirectory, `${artifactId}-${version}-sources.jar`),
+    [],
+  );
+  writeStoredZip(
+    path.join(publicationDirectory, `${artifactId}-${version}-javadoc.jar`),
+    [],
+  );
+  createNativeClassifierTestFixture({
+    classifier: "linux-x64",
+    outputPath: path.join(publicationDirectory, linuxJar),
+    repoRoot: fixture.repoRoot,
+  });
+  createNativeClassifierTestFixture({
+    classifier: "linux-arm64",
+    outputPath: path.join(publicationDirectory, linuxArm64Jar),
+    repoRoot: fixture.repoRoot,
+  });
+  createNativeClassifierTestFixture({
+    classifier,
+    outputPath: path.join(publicationDirectory, windowsJar),
+    repoRoot: fixture.repoRoot,
+  });
+  createNativeClassifierTestFixture({
+    classifier: "darwin-arm64",
+    outputPath: path.join(publicationDirectory, darwinJar),
+    repoRoot: fixture.repoRoot,
+  });
+  fs.writeFileSync(
+    path.join(publicationDirectory, `${artifactId}-${version}.pom`),
+    "<project />",
+  );
+  for (const artifact of [
+    primaryJar,
+    `${artifactId}-${version}.pom`,
+    `${artifactId}-${version}-sources.jar`,
+    `${artifactId}-${version}-javadoc.jar`,
+    linuxJar,
+    linuxArm64Jar,
+    windowsJar,
+    darwinJar,
+  ]) {
+    fs.writeFileSync(
+      path.join(publicationDirectory, `${artifact}.asc`),
+      "signature",
+    );
+  }
+
+  assert.equal(
+    validateLocalPublication({
+      artifactId,
+      repositoryPath: path.join(fixture.root, "repository"),
+      repoRoot: fixture.repoRoot,
+      requireSignatures: true,
+      version,
+    }),
+    publicationDirectory,
+  );
+});
+
+test("local publication validation rejects cross-classifier contamination", (t) => {
+  const fixture = createFixture(t);
+  const artifactId = "copilot-sdk-java-runtime";
+  const version = "1.2.3";
+  const publicationDirectory = path.join(
+    fixture.root,
+    "repository",
+    "com",
+    "github",
+    artifactId,
+    version,
+  );
+  fs.mkdirSync(publicationDirectory, { recursive: true });
+
+  writeStoredZip(
+    path.join(publicationDirectory, `${artifactId}-${version}.jar`),
+    [["META-INF/MANIFEST.MF", "Manifest-Version: 1.0\n"]],
+  );
+  writeStoredZip(
+    path.join(publicationDirectory, `${artifactId}-${version}-sources.jar`),
+    [],
+  );
+  writeStoredZip(
+    path.join(publicationDirectory, `${artifactId}-${version}-javadoc.jar`),
+    [],
+  );
+  writeStoredZip(
+    path.join(publicationDirectory, `${artifactId}-${version}-linux-x64.jar`),
+    [
+      ["native/linux-x64/runtime.node", "runtime"],
+      ["native/linux-x64/copilot", "cli"],
+      [
+        "native/linux-x64/platform.properties",
+        "classifier=linux-x64\nversion=9.8.6\n",
+      ],
+      ["native/win32-x64/runtime.node", "wrong platform"],
+    ],
+  );
+  createNativeClassifierTestFixture({
+    classifier: "linux-arm64",
+    outputPath: path.join(
+      publicationDirectory,
+      `${artifactId}-${version}-linux-arm64.jar`,
+    ),
+    repoRoot: fixture.repoRoot,
+  });
+  createNativeClassifierTestFixture({
+    classifier: "win32-x64",
+    outputPath: path.join(
+      publicationDirectory,
+      `${artifactId}-${version}-win32-x64.jar`,
+    ),
+    repoRoot: fixture.repoRoot,
+  });
+  createNativeClassifierTestFixture({
+    classifier: "darwin-arm64",
+    outputPath: path.join(
+      publicationDirectory,
+      `${artifactId}-${version}-darwin-arm64.jar`,
+    ),
+    repoRoot: fixture.repoRoot,
+  });
+  fs.writeFileSync(
+    path.join(publicationDirectory, `${artifactId}-${version}.pom`),
+    "<project />",
+  );
+
+  assert.throws(
+    () =>
+      validateLocalPublication({
+        artifactId,
+        repositoryPath: path.join(fixture.root, "repository"),
+        repoRoot: fixture.repoRoot,
+        requireSignatures: false,
+        version,
+      }),
+    /must not contain/,
+  );
+});
+
+function createFixture(t) {
+  const fixtureParent = path.join(
+    moduleRoot,
+    "target",
+    "validate-native-artifact-test-",
+  );
+  fs.mkdirSync(fixtureParent, { recursive: true });
+  const root = fs.mkdtempSync(path.join(fixtureParent, `${process.pid}-`));
+  t.after(() =>
+    fs.rmSync(root, {
+      recursive: true,
+      force: true,
+      maxRetries: 3,
+      retryDelay: 100,
+    }),
+  );
+
+  const repoRoot = path.join(root, "repo");
+  fs.mkdirSync(path.join(repoRoot, "nodejs"), { recursive: true });
+  fs.writeFileSync(
+    path.join(repoRoot, "nodejs", "package-lock.json"),
+    JSON.stringify({
+      packages: {
+        "node_modules/@github/copilot-win32-x64": { version: "9.8.7" },
+        "node_modules/@github/copilot-linux-x64": { version: "9.8.6" },
+        "node_modules/@github/copilot-linux-arm64": { version: "9.8.9" },
+        "node_modules/@github/copilot-darwin-arm64": { version: "9.8.8" },
+      },
+    }),
+  );
+
+  return {
+    root,
+    repoRoot,
+    jarPath: path.join(root, artifactName),
+  };
+}
diff --git a/java/copilot-native/scripts/validate-native-host.mjs b/java/copilot-native/scripts/validate-native-host.mjs
new file mode 100644
index 0000000000..a07dddee34
--- /dev/null
+++ b/java/copilot-native/scripts/validate-native-host.mjs
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { pathToFileURL } from "node:url";
+
+export function validateNativeHost(classifier, host) {
+  if (classifier === "linux-x64" || classifier === "linux-arm64") {
+    const expectedArch = classifier === "linux-x64" ? "x64" : "arm64";
+    const displayArch = expectedArch === "x64" ? "x64" : "ARM64";
+    if (host.platform !== "linux" || host.arch !== expectedArch) {
+      throw new Error(
+        `Native ${classifier} packaging requires Linux ${displayArch}; detected ${host.platform}-${host.arch}`,
+      );
+    }
+    if (!host.glibcVersionRuntime) {
+      throw new Error(
+        `Native ${classifier} packaging requires glibc; musl and unknown libc hosts are unsupported`,
+      );
+    }
+    return `Validated native build host: ${classifier} (glibc ${host.glibcVersionRuntime})`;
+  }
+
+  if (classifier === "win32-x64") {
+    if (host.platform !== "win32" || host.arch !== "x64") {
+      throw new Error(
+        `Native ${classifier} packaging requires Windows x64; detected ${host.platform}-${host.arch}`,
+      );
+    }
+    return `Validated native build host: ${classifier}`;
+  }
+
+  if (classifier === "darwin-arm64") {
+    if (host.platform !== "darwin" || host.arch !== "arm64") {
+      throw new Error(
+        `Native ${classifier} packaging requires macOS ARM64; detected ${host.platform}-${host.arch}`,
+      );
+    }
+    return `Validated native build host: ${classifier}`;
+  }
+
+  throw new Error(`Unsupported native build classifier: ${classifier}`);
+}
+
+export function detectNativeHost() {
+  const report = process.report?.getReport();
+  return {
+    platform: process.platform,
+    arch: process.arch,
+    glibcVersionRuntime: report?.header?.glibcVersionRuntime,
+  };
+}
+
+function main() {
+  const [classifier] = process.argv.slice(2);
+  if (!classifier) {
+    console.error("Usage: node validate-native-host.mjs <classifier>");
+    process.exitCode = 1;
+    return;
+  }
+
+  try {
+    console.log(validateNativeHost(classifier, detectNativeHost()));
+  } catch (error) {
+    console.error(error.message);
+    process.exitCode = 1;
+  }
+}
+
+if (
+  process.argv[1] &&
+  import.meta.url === pathToFileURL(process.argv[1]).href
+) {
+  main();
+}
diff --git a/java/copilot-native/scripts/validate-native-host.test.mjs b/java/copilot-native/scripts/validate-native-host.test.mjs
new file mode 100644
index 0000000000..1a71eff44f
--- /dev/null
+++ b/java/copilot-native/scripts/validate-native-host.test.mjs
@@ -0,0 +1,172 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { validateNativeHost } from "./validate-native-host.mjs";
+
+test("accepts Linux x64 with glibc", () => {
+  assert.equal(
+    validateNativeHost("linux-x64", {
+      platform: "linux",
+      arch: "x64",
+      glibcVersionRuntime: "2.39",
+    }),
+    "Validated native build host: linux-x64 (glibc 2.39)",
+  );
+});
+
+test("accepts Linux ARM64 with glibc", () => {
+  assert.equal(
+    validateNativeHost("linux-arm64", {
+      platform: "linux",
+      arch: "arm64",
+      glibcVersionRuntime: "2.39",
+    }),
+    "Validated native build host: linux-arm64 (glibc 2.39)",
+  );
+});
+
+test("accepts Windows x64 without a libc requirement", () => {
+  assert.equal(
+    validateNativeHost("win32-x64", {
+      platform: "win32",
+      arch: "x64",
+      glibcVersionRuntime: undefined,
+    }),
+    "Validated native build host: win32-x64",
+  );
+});
+
+test("accepts macOS ARM64 without a libc requirement", () => {
+  assert.equal(
+    validateNativeHost("darwin-arm64", {
+      platform: "darwin",
+      arch: "arm64",
+      glibcVersionRuntime: undefined,
+    }),
+    "Validated native build host: darwin-arm64",
+  );
+});
+
+test("rejects Linux x64 with musl or unknown libc", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("linux-x64", {
+        platform: "linux",
+        arch: "x64",
+        glibcVersionRuntime: undefined,
+      }),
+    /requires glibc/,
+  );
+});
+
+test("rejects Linux ARM64 with musl or unknown libc", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("linux-arm64", {
+        platform: "linux",
+        arch: "arm64",
+        glibcVersionRuntime: undefined,
+      }),
+    /requires glibc/,
+  );
+});
+
+test("rejects a non-Linux host", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("linux-x64", {
+        platform: "darwin",
+        arch: "x64",
+        glibcVersionRuntime: undefined,
+      }),
+    /requires Linux x64/,
+  );
+});
+
+test("rejects a non-x64 host", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("linux-x64", {
+        platform: "linux",
+        arch: "arm64",
+        glibcVersionRuntime: "2.39",
+      }),
+    /requires Linux x64/,
+  );
+});
+
+test("rejects Linux x64 for the Linux ARM64 classifier", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("linux-arm64", {
+        platform: "linux",
+        arch: "x64",
+        glibcVersionRuntime: "2.39",
+      }),
+    /requires Linux ARM64/,
+  );
+});
+
+test("rejects a non-Windows host for the Windows classifier", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("win32-x64", {
+        platform: "linux",
+        arch: "x64",
+        glibcVersionRuntime: "2.39",
+      }),
+    /requires Windows x64/,
+  );
+});
+
+test("rejects Windows ARM64 for the Windows x64 classifier", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("win32-x64", {
+        platform: "win32",
+        arch: "arm64",
+        glibcVersionRuntime: undefined,
+      }),
+    /requires Windows x64/,
+  );
+});
+
+test("rejects a non-macOS host for the macOS classifier", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("darwin-arm64", {
+        platform: "linux",
+        arch: "arm64",
+        glibcVersionRuntime: "2.39",
+      }),
+    /requires macOS ARM64/,
+  );
+});
+
+test("rejects macOS x64 for the macOS ARM64 classifier", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("darwin-arm64", {
+        platform: "darwin",
+        arch: "x64",
+        glibcVersionRuntime: undefined,
+      }),
+    /requires macOS ARM64/,
+  );
+});
+
+test("rejects an unimplemented classifier", () => {
+  assert.throws(
+    () =>
+      validateNativeHost("linuxmusl-x64", {
+        platform: "linux",
+        arch: "x64",
+        glibcVersionRuntime: undefined,
+      }),
+    /Unsupported native build classifier/,
+  );
+});
diff --git a/java/copilot-native/src/main/java/.gitkeep b/java/copilot-native/src/main/java/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/java/copilot-native/src/main/javadoc/.gitkeep b/java/copilot-native/src/main/javadoc/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/java/copilot-native/src/main/resources/native/lib/copilot-runtime.properties b/java/copilot-native/src/main/resources/native/lib/copilot-runtime.properties
new file mode 100644
index 0000000000..0f32308984
--- /dev/null
+++ b/java/copilot-native/src/main/resources/native/lib/copilot-runtime.properties
@@ -0,0 +1,12 @@
+# Placeholder marker for the primary (classifier-less) artifact of
+# com.github:copilot-sdk-java-runtime.
+#
+# The real native binaries ship in per-platform classifier JARs
+# (e.g. copilot-sdk-java-runtime-<version>-linux-x64.jar) under
+# native/<classifier>/runtime.node. This primary JAR exists only to satisfy
+# Maven Central's requirement for a main artifact and intentionally contains
+# no native binaries.
+#
+# This file is processed by Maven resource filtering.
+placeholder=true
+version=${project.version}
diff --git a/java/docs/adr/adr-007-native-bundling-strategy.md b/java/docs/adr/adr-007-native-bundling-strategy.md
index 1322e199ef..78276f3481 100644
--- a/java/docs/adr/adr-007-native-bundling-strategy.md
+++ b/java/docs/adr/adr-007-native-bundling-strategy.md
@@ -1,85 +1,109 @@
-# ADR-007: Native runtime bundling strategy — per-platform classifier JARs
+# ADR-007: Native runtime bundling strategy: per-platform classifier JARs
 
-## Context and Problem Statement
+## Context and problem statement
 
-The Copilot SDK for Java currently has no embedded runtime. It depends on an externally provided runtime process (see epic [#1917](https://github.com/github/copilot-sdk/issues/1917)). The ongoing Rust port of the `copilot-agent-runtime` repository is reaching the point where the runtime can be consumed as a native shared library without requiring a Node.js process, making it practical to embed the runtime directly in the SDK JAR.
+The Copilot SDK for Java supports an experimental in-process connection that loads the Copilot agent runtime as a native shared library. The existing stdio, TCP, and URI connections remain the default behavior unless the user explicitly selects the in-process connection.
 
 ### The runtime artifact
 
 The artifact to be embedded is `runtime.node`, a Rust [`cdylib`](#references) produced by the `src/runtime` crate in `github/copilot-agent-runtime` using the [napi-rs](#references) build toolchain. Despite the `.node` file extension (a naming convention of napi-rs), this is an ordinary platform-specific shared library (`.so` on Linux, `.dylib` on macOS, `.dll` on Windows). It exposes two front doors built over the same internal engine:
 
-- **[napi](#references) front door** — loaded by a Node.js process as a native addon (current CLI path).
-- **[C ABI](#references) front door** — a fixed set of approximately 12 `extern "C"` lifecycle and transport entry points (`copilot_runtime_server_create`, `copilot_runtime_connection_open`, etc.) that any language can call in-process via [FFI](#references) ([JNA](#references) for Java, Python/cffi, C#/`DllImport`, Go/purego) **without a Node.js process**. All API methods travel as JSON-RPC data through this fixed transport; the export list never changes as the method set grows.
+* **[napi](#references) front door**: loaded by a Node.js process as a native addon for the current CLI path.
+* **[C ABI](#references) front door**: a fixed set of 5 `extern "C"` lifecycle and transport entry points that any language can call in-process via [FFI](#references) ([JNA](#references) for Java, Python/cffi, C#/`DllImport`, Go/purego). All API methods travel as JSON-RPC data through this fixed transport; the export list does not change as the method set grows.
+
+  | Entry point                        | C signature                                                                                                                                                                                                                                                                | Purpose                                                                                                                                                                                                                                 |
+  | ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+  | `copilot_runtime_host_start`       | `(const uint8_t* argv_json, size_t argv_json_len, const uint8_t* env_json, size_t env_json_len) → uint32_t`                                                                                                                                                                | Start the runtime host; `argv_json` is a JSON array (e.g., `["copilot","--embedded-host"]`), `env_json` is an optional JSON object of environment overrides. Returns a server handle (0 = failure).                                     |
+  | `copilot_runtime_host_shutdown`    | `(uint32_t server_id) → bool`                                                                                                                                                                                                                                              | Shut down the runtime host identified by `server_id`.                                                                                                                                                                                   |
+  | `copilot_runtime_connection_open`  | `(uint32_t server_id, void(*on_outbound)(void* user_data, const uint8_t* data, size_t len), void* user_data, const uint8_t* ext_source, size_t ext_source_len, const uint8_t* ext_name, size_t ext_name_len, const uint8_t* conn_token, size_t conn_token_len) → uint32_t` | Open a bidirectional connection on the server; registers the `on_outbound` callback for runtime→SDK data delivery. `ext_source`, `ext_name`, and `conn_token` are nullable metadata buffers. Returns a connection handle (0 = failure). |
+  | `copilot_runtime_connection_write` | `(uint32_t connection_id, const uint8_t* data, size_t len) → bool`                                                                                                                                                                                                         | Write a JSON-RPC frame from the SDK into the runtime. The native side copies the buffer synchronously before returning.                                                                                                                 |
+  | `copilot_runtime_connection_close` | `(uint32_t connection_id) → bool`                                                                                                                                                                                                                                          | Close a connection.                                                                                                                                                                                                                     |
+
+  The outbound callback signature: `void on_outbound(void* user_data, const uint8_t* data, size_t len)` — invoked by native code (potentially on native threads) to deliver JSON-RPC responses and notifications back to the SDK.
 
 The `cli-native.node` addon — a separate, smaller artifact that provides ICU4X text segmentation, Win32 API wrappers, and terminal UI helpers — is a CLI-only artifact used by the Ink/React terminal interface. It is **not needed** by the Java SDK.
 
 ### Note on the active Rust migration
 
-As of 2026-07, the `runtime.node` binary is being built up iteratively as TypeScript runtime code is ported into it. It is **not** being reduced; it is growing with each port PR. The `embedded_host.rs` module in the runtime currently spawns a short-lived child process to service method bodies not yet ported to Rust. This internal Node.js dependency shrinks with each port PR and is expected to disappear entirely when the migration completes. The C ABI surface and loading mechanism described in this ADR are stable regardless of migration progress.
+As of 2026-08, the `runtime.node` binary is being built up iteratively as TypeScript runtime code is ported into it. It is **not** being reduced; it is growing with each port PR. The `embedded_host.rs` module currently starts a child `copilot --embedded-host` process to service method bodies not yet ported to Rust.
+
+The classifier JAR therefore contains a version-matched pair during the migration:
+
+* `runtime.node`: loaded into the Java process through JNA
+* `copilot` or `copilot.exe`: started internally by `copilot_runtime_host_start`
+* `platform.properties`: classifier and runtime version metadata
+
+The Java SDK does not independently spawn this child for JSON-RPC transport. The native runtime owns the transitional embedded-host process. The bundled CLI requirement disappears after the Rust migration is complete, while the C ABI and Java loading mechanism remain stable.
 
 ### Platform dimensions
 
 The runtime must be built for each unique combination of OS, CPU architecture, and (on Linux) C runtime variant. The build system in `github/copilot-agent-runtime` produces eight Rust target triples:
 
-| Platform label | Rust triple | Constraint |
-|---------------|-------------|------------|
-| `linux-x64` | `x86_64-unknown-linux-gnu` | [glibc](#references) ≥ 2.28 (Debian 10+, Ubuntu 20.04+, RHEL 8+) |
-| `linux-arm64` | `aarch64-unknown-linux-gnu` | glibc ≥ 2.28 |
-| `linuxmusl-x64` | `x86_64-unknown-linux-musl` | dynamically links [musl libc](#references) (Alpine Linux) |
-| `linuxmusl-arm64` | `aarch64-unknown-linux-musl` | dynamically links musl libc |
-| `darwin-x64` | `x86_64-apple-darwin` | macOS, Intel |
-| `darwin-arm64` | `aarch64-apple-darwin` | macOS, Apple Silicon |
-| `win32-x64` | `x86_64-pc-windows-msvc` | [MSVC CRT](#references) statically linked (`+crt-static`) |
-| `win32-arm64` | `aarch64-pc-windows-msvc` | MSVC CRT statically linked (`+crt-static`) |
+| Platform label    | Rust triple                  | Constraint                                                       |
+| ----------------- | ---------------------------- | ---------------------------------------------------------------- |
+| `linux-x64`       | `x86_64-unknown-linux-gnu`   | [glibc](#references) ≥ 2.28 (Debian 10+, Ubuntu 20.04+, RHEL 8+) |
+| `linux-arm64`     | `aarch64-unknown-linux-gnu`  | glibc ≥ 2.28                                                     |
+| `linuxmusl-x64`   | `x86_64-unknown-linux-musl`  | dynamically links [musl libc](#references) (Alpine Linux)        |
+| `linuxmusl-arm64` | `aarch64-unknown-linux-musl` | dynamically links musl libc                                      |
+| `darwin-x64`      | `x86_64-apple-darwin`        | macOS, Intel                                                     |
+| `darwin-arm64`    | `aarch64-apple-darwin`       | macOS, Apple Silicon                                             |
+| `win32-x64`       | `x86_64-pc-windows-msvc`     | [MSVC CRT](#references) statically linked (`+crt-static`)        |
+| `win32-arm64`     | `aarch64-pc-windows-msvc`    | MSVC CRT statically linked (`+crt-static`)                       |
 
 The GNU/Linux glibc minimum of 2.28 is enforced at build time via a Microsoft/vscode-linux-build-agent sysroot and verified post-build by `script/linux/verify-glibc-requirements.sh`. The musl binaries are **not** fully statically linked; they dynamically link musl libc (`-C target-feature=-crt-static` is explicitly set at build time).
 
 The **common case** (Windows × 2 + macOS × 2 + GNU/Linux × 2) requires **6 binaries**. Supporting Alpine Linux adds 2 more musl binaries for a total of **8**.
 
-### Platform selection is 100% deterministic
+### Platform selection
 
-The correct binary can be selected at runtime without any heuristics, using only standard Java and OS APIs:
+The loader selects a classifier at runtime using standard Java and OS APIs:
 
-1. **OS**: `System.getProperty("os.name")` — distinguishes Windows, macOS, and Linux unambiguously.
-2. **Architecture**: `System.getProperty("os.arch")` — `"amd64"` and `"x86_64"` both map to `x64`; `"aarch64"` and `"arm64"` both map to `arm64`.
-3. **Linux libc variant**: Read the first 2 KB of `/proc/self/exe` and parse the [ELF](#references) PT_INTERP segment (the dynamic linker path). If the interpreter path contains `/ld-musl-` → musl; if it contains `/ld-linux-` → glibc. This requires no subprocess, no PATH lookup, and works inside containers. This is the same approach used by the `detect-libc` npm package (its primary, most reliable detection method).
+1. **OS**: `System.getProperty("os.name")` distinguishes Windows, macOS, and Linux.
+1. **Architecture**: `System.getProperty("os.arch")` maps `"amd64"`, `"x86_64"`, and `"x64"` to `x64`, and maps `"aarch64"` and `"arm64"` to `arm64`.
+1. **Linux libc variant**: The loader reads the first 2 KB of `/proc/self/exe` and parses the [ELF](#references) PT_INTERP segment. An interpreter containing `/ld-musl-` selects musl, while `/ld-linux-` selects glibc.
+
+If the Linux executable cannot be read or its interpreter is not recognized, the implementation falls back to the GNU/Linux classifier for the detected architecture. Unsupported operating systems and architectures fail with `IllegalStateException`.
 
 ### Size baseline
 
 Measured from `github/copilot-agent-runtime` release `cli-1.0.69-2` (2026-07-06):
 
-| Platform | `runtime.node` (uncompressed) | Compressed (~40% deflate) |
-|----------|------------------------------|--------------------------|
-| `linux-x64` | 64.7 MB | ~25.9 MB |
-| `linux-arm64` | 55.5 MB | ~22.2 MB |
-| `linuxmusl-x64` | 64.4 MB | ~25.8 MB |
-| `linuxmusl-arm64` | 55.3 MB | ~22.1 MB |
-| `darwin-x64` | 57.3 MB | ~22.9 MB |
-| `darwin-arm64` | 48.1 MB | ~19.2 MB |
-| `win32-x64` | 55.9 MB | ~22.4 MB |
-| `win32-arm64` | 48.4 MB | ~19.4 MB |
+| Platform          | `runtime.node` (uncompressed) | Compressed (~40% deflate) |
+| ----------------- | ----------------------------- | ------------------------- |
+| `linux-x64`       | 64.7 MB                       | ~25.9 MB                  |
+| `linux-arm64`     | 55.5 MB                       | ~22.2 MB                  |
+| `linuxmusl-x64`   | 64.4 MB                       | ~25.8 MB                  |
+| `linuxmusl-arm64` | 55.3 MB                       | ~22.1 MB                  |
+| `darwin-x64`      | 57.3 MB                       | ~22.9 MB                  |
+| `darwin-arm64`    | 48.1 MB                       | ~19.2 MB                  |
+| `win32-x64`       | 55.9 MB                       | ~22.4 MB                  |
+| `win32-arm64`     | 48.4 MB                       | ~19.4 MB                  |
+
+The published Java SDK JAR (`copilot-sdk-java-1.0.6-preview.1.jar`) is currently **1.53 MB**. A future runtime-only monolithic JAR containing all 6 common-case native binaries would be approximately **132 MB** compressed; all 8 including musl would be approximately **180 MB** compressed.
 
-The published Java SDK JAR (`copilot-sdk-java-1.0.6-preview.1.jar`) is currently **1.53 MB**. A monolithic JAR containing all 6 common-case native binaries would be approximately **132 MB** compressed; all 8 including musl would be approximately **180 MB** compressed.
+These runtime-only estimates do not describe the current migration artifact. The current development `linux-x64` classifier JAR also contains the version-matched CLI executable and is approximately **152 MB compressed**. Its staged contents are approximately **133 MB** for `runtime.node` and **170 MB** for `copilot` before JAR compression.
 
 All native dependencies within the runtime (`rustls`/`aws-lc-rs` for TLS, `rusqlite` with `bundled` feature for SQLite, `zlib-rs` for compression) are statically compiled into the binary. There are no dependencies on system OpenSSL, libgit2, or libz.
 
-## Considered Options
+## Considered options
 
-### Option 1: Monolithic JAR — all platform binaries in one artifact
+### Option 1: Monolithic JAR with all platform binaries
 
-All 6 (or 8) `runtime.node` binaries are bundled inside the single `copilot-sdk-java` artifact. At runtime the SDK extracts and loads the one matching the current platform; the remaining 5–7 are carried silently.
+All 6 (or 8) platform artifact sets are bundled inside a single monolithic artifact. At runtime the SDK extracts and loads the one matching the current platform; the remaining 5–7 are carried silently.
 
 **Advantages:**
+
 - Single `<dependency>` in `pom.xml`; zero extra configuration for users.
 - Familiar pattern: [ONNX Runtime](#references) (`onnxruntime-1.21.0.jar`, **130 MB**, all platforms) demonstrates this is an accepted norm in the Java ML ecosystem.
 
 **Drawbacks:**
+
 - Every user downloads every platform regardless of their target. A developer on Apple Silicon downloads 105+ MB of Linux and Windows binaries they will never use.
 - Build tooling (thin Docker layers, incremental CI caches, artifact registries) penalises large JARs. A single 132–180 MB JAR invalidates the entire cache whenever any platform's binary changes.
 - Maven's dependency resolution has no mechanism to supply platform-appropriate variants automatically; platform selection must happen entirely at runtime inside the JAR.
 - Conflicts with the principle that Maven artifacts should be reproducible and minimal.
 
-### Option 2: Per-platform classifier JARs ([DJL](#references) style)
+### Option 2: Per-platform classifier JARs
 
 A small, pure-Java coordination artifact (`copilot-sdk-java`, ~1.5 MB) is published alongside separate per-platform native artifacts differentiated by Maven classifier:
 
@@ -94,7 +118,7 @@ com.github:copilot-sdk-java-runtime:VERSION:win32-x64
 com.github:copilot-sdk-java-runtime:VERSION:win32-arm64
 ```
 
-Each classifier JAR contains only the `runtime.node` binary for that platform (~19–26 MB compressed) plus a small `.properties` metadata file. The coordination artifact selects and loads the matching native at startup.
+Each classifier JAR contains `runtime.node`, `platform.properties`, and, during the active Rust migration, the version-matched `copilot` or `copilot.exe` embedded-host executable. The coordination artifact selects and loads the matching native when the user selects the in-process connection.
 
 This is the same pattern used by DJL's PyTorch native artifacts (`pytorch-native-cpu-2.5.1-linux-x86_64.jar`, `pytorch-native-cpu-2.5.1-osx-aarch64.jar`, etc.), Netty's `netty-tcnative-boringssl-static` per-platform JARs, and others.
 
@@ -105,39 +129,43 @@ Build tools can be configured to resolve the correct classifier automatically:
 - **Uber-jar builds**: include all classifiers; the coordination artifact picks the right one at runtime.
 
 **Advantages:**
-- Default download is the tiny coordination artifact (~1.5 MB) plus one platform JAR (~20–26 MB compressed) — approximately **22–28 MB total** vs. 132–180 MB for a monolithic JAR.
+
+* The long-term runtime-only download is the coordination artifact plus one platform JAR instead of every platform binary.
 - Each platform JAR changes independently; CI caches and Docker layers for unchanged platforms are preserved across releases.
 - Users building for a single known platform (most production deployments) pay exactly the cost of that platform.
 - Follows well-established Maven ecosystem conventions; standard tooling ([os-maven-plugin](#references), Gradle variant resolution) handles classifier selection.
 - Aligns with DJL's proven distribution strategy for large native ML runtimes.
 
 **Drawbacks:**
+
 - Requires publishing 6–8 additional Maven artifacts per release.
 - Users building portable über-JARs must explicitly include all classifiers they wish to support.
 - Slightly more complex `pom.xml` / `build.gradle` for users who need cross-platform packaging.
 
-### Option 3: Download-on-demand (DJL thin placeholder style)
+### Option 3: Download on demand
 
 The SDK ships a minimal placeholder that detects the current platform at runtime and downloads the correct `runtime.node` binary from a distribution endpoint (GitHub Releases or a CDN) on first use, caching it locally (e.g., `~/.copilot/runtime-cache/`).
 
 **Advantages:**
+
 - Zero native binary content in any published Maven artifact; total download at `mvn install` is negligible.
 - Identical user experience to the current "externally provided runtime" model during the download, which most CLI users already accept.
 
 **Drawbacks:**
+
 - Requires internet access on first run. Offline environments (air-gapped enterprise, CI without outbound HTTP) break silently or require manual pre-seeding.
 - Introduces a network dependency into an otherwise pure library artifact, which violates Maven Central's expectations for reproducible builds.
 - Adds an operational concern: distribution endpoint availability, CDN costs, URL stability across versions.
 - Makes JVM startup non-deterministic in latency (first run downloads 20–26 MB).
 - Cannot be pre-warmed by dependency management tooling; no `mvn dependency:resolve` analogue works for a runtime download.
 
-## Decision Outcome
+## Decision outcome
 
-**Chosen: Option 2 — per-platform classifier JARs and Option 1 - monolithic jar. Use `maven-assembly-plugin` to allow the creation of the monolithic jar.**
+**Chosen: Option 2, per-platform classifier JARs, with Option 1 available through a consumer-built monolithic JAR.** Consumers can use `maven-assembly-plugin` to merge the platform classifiers they need.
 
 ### Rationale
 
-1. **User download cost matches actual need.** Most users run on one OS and architecture. Option 2 makes their download approximately 22–28 MB (coordination JAR + one platform JAR), versus 132–180 MB for Option 1 and an unbounded deferred network cost for Option 3.
+1. **User download cost matches actual need.** Most users run on one OS and architecture. Option 2 avoids downloading every platform artifact. During the active migration, each classifier also carries the embedded-host executable and is larger than the runtime-only target.
 
 2. **Proven ecosystem pattern.** DJL, Netty, and others have established the per-classifier pattern as the correct Maven idiom for large native binaries. Build tooling already knows how to handle it; users and framework integrations (Spring Boot, Quarkus, Micronaut) are familiar with it.
 
@@ -145,15 +173,48 @@ The SDK ships a minimal placeholder that detects the current platform at runtime
 
 4. **No operational dependencies.** Unlike Option 3, no external download service is required at runtime. The artifact is self-contained once resolved by Maven/Gradle.
 
-5. **Size per platform is acceptable.** At ~20–26 MB compressed per platform, each classifier JAR is well within the range of routinely used native JARs in the Java ecosystem (DJL PyTorch osx-aarch64: 37 MB; ONNX Runtime per platform: ~20–30 MB before bundling).
+5. **The distribution model remains valid as artifact size changes.** The current transitional classifier is large because it contains both the runtime and CLI. The classifier model still prevents users from downloading artifacts for unrelated platforms, and its size decreases when the embedded-host executable is no longer required.
 
 6. **Option 3 remains composable.** A download-on-demand fallback can be layered on top of Option 2 for users who prefer it without changing the primary distribution model. The coordination artifact can attempt classpath lookup first, then fall back to a cached download if no matching classifier JAR is present.
 
-7. See section [How can we do Option 2 and Option 1](#how-can-we-do-option-2-and-option-1) for more details.
+7. See [How to support classifier and monolithic JARs](#how-to-support-classifier-and-monolithic-jars) for more details.
+
+### Transport selection and failure behavior
+
+Adding a classifier JAR does not change the client's connection automatically. Users opt in with:
+
+```java
+CopilotClientOptions options = new CopilotClientOptions()
+    .setConnection(RuntimeConnection.forInProcess());
+```
+
+The `COPILOT_SDK_DEFAULT_CONNECTION=inprocess` environment variable also selects the in-process connection when no explicit or legacy subprocess options override it.
+
+The selected connection is strict:
+
+* If the user selects in-process and native resolution or startup fails, `CopilotClient.start()` fails.
+* The SDK does not silently retry with stdio or TCP.
+* If the user does not select in-process, classifier JARs are ignored and the existing stdio, TCP, or URI behavior remains unchanged.
+
+### Runtime resolution order
+
+When the in-process connection is selected, the Java loader resolves `runtime.node` in this order:
+
+1. `COPILOT_CLI_PATH`: accept either a flat sibling `runtime.node` or the npm `prebuilds/<classifier>/runtime.node` layout.
+1. Classpath resource: extract `native/<classifier>/runtime.node` and the bundled CLI from the classifier or monolithic JAR into a cache keyed by SDK version, native package version, and classifier.
+1. PATH compatibility fallback: find `copilot` on `PATH` and accept a flat sibling `runtime.node`.
+
+If none succeeds, startup fails. The PATH fallback does not claim to support every npm or Homebrew installation layout.
+
+### Current platform scope
+
+The platform detector recognizes the 8 classifiers listed in this ADR. The Maven build binds native packaging only for a host matching an implemented classifier. Linux x64 and ARM64 glibc hosts can opt in with `copilot.native.libc=glibc`, while Windows x64 and Apple Silicon macOS hosts package `win32-x64` or `darwin-arm64` automatically. The `inprocess` test profile selects the matching implemented classifier automatically on all four hosts. Every path validates the host before downloading or packaging native files. Linux musl and other unsupported hosts build only the OS-neutral placeholder, sources, and Javadoc artifacts unless they explicitly request in-process tests, which fail during host validation. Additional classifier artifacts remain follow-up work.
+
+Maven Central release and snapshot workflows build each classifier on its matching native host from the same immutable source. The Linux ARM64, Windows, and macOS jobs each upload only their verified classifier and checksum manifest. The Ubuntu x64 job verifies and attaches all three, builds `linux-x64` with the glibc opt-in, and performs the only Maven deployment. Release signing therefore covers the neutral artifacts and all four classifiers in one deployment.
 
 ## Binding technology: JNA over Panama FFM
 
-A secondary decision within the scope of this ADR is *how* the coordination artifact calls the C ABI entry points once the correct `runtime.node` binary has been loaded. Two candidates were considered: [JNA](#references) and the [Foreign Function & Memory API](#references) (FFM, the product of [Project Panama](#references), final since Java 22 via [JEP 454](#references)).
+A secondary decision within the scope of this ADR is _how_ the coordination artifact calls the C ABI entry points once the correct `runtime.node` binary has been loaded. Two candidates were considered: [JNA](#references) and the [Foreign Function & Memory API](#references) (FFM, the product of [Project Panama](#references), final since Java 22 via [JEP 454](#references)).
 
 **Chosen: JNA.** FFM was considered and deliberately deferred, for the following reasons:
 
@@ -161,7 +222,7 @@ A secondary decision within the scope of this ADR is *how* the coordination arti
 
 2. **Consumer-side configuration burden.** FFM downcalls and upcalls are restricted operations under the JDK's integrity-by-default direction ([JEP 472](#references)). An FFM-based SDK would require every consumer to grant native access explicitly — `--enable-native-access=<module>` (or `ALL-UNNAMED` for classpath applications) on the launcher, or an `Enable-Native-Access` manifest attribute. JNA requires no consumer-side configuration today. For an SDK, this flag becomes every downstream application's problem and a predictable source of support issues. (JNA is on the same enforcement trajectory eventually, as it uses JNI internally; this consideration buys time, not immunity.)
 
-3. **No realizable performance benefit.** FFM's principal advantage over JNA is the elimination of per-call reflective marshalling overhead. The C ABI surface here is a fixed set of ~12 entry points carrying JSON-RPC strings; JSON serialization/deserialization cost dominates the call path, and call frequency is bounded by agent-interaction rates rather than tight loops. The latency difference between JNA and FFM is expected to be unmeasurable in end-to-end SDK usage. This calculus would change only if the transport moved to a high-frequency or shared-memory framing model.
+3. **No realizable performance benefit.** FFM's principal advantage over JNA is the elimination of per-call reflective marshalling overhead. The C ABI surface here is a fixed set of 5 entry points carrying JSON-RPC bytes; JSON serialization and deserialization cost dominates the call path, and call frequency is bounded by agent-interaction rates rather than tight loops. The latency difference between JNA and FFM is expected to be unmeasurable in end-to-end SDK usage. This calculus would change only if the transport moved to a high-frequency or shared-memory framing model.
 
 4. **Upcall lifetime complexity.** The transport is bidirectional: the runtime delivers JSON-RPC responses and server-initiated requests back into Java from native threads. JNA's `Callback` mechanism handles foreign-thread attachment with well-established semantics. FFM upcall stubs require explicit `Arena` lifetime management, where a stub whose arena is closed while the Rust side still holds the function pointer results in a JVM crash. This shifts lifetime reasoning that JNA encapsulates onto the binding layer.
 
@@ -171,110 +232,74 @@ A secondary decision within the scope of this ADR is *how* the coordination arti
 
 ### Preserving the FFM migration path
 
-FFM is regarded as the likely eventual binding technology: the JEP 472 endgame applies enforcement pressure to JNA as well, and a ~12-function stable C ABI makes a future migration inexpensive. To keep that path open at low cost:
+FFM is regarded as the likely eventual binding technology: the JEP 472 endgame applies enforcement pressure to JNA as well, and a 5-function stable C ABI makes a future migration inexpensive. To keep that path open at low cost:
 
 - The binding layer is abstracted behind a small internal interface (native load + downcall + upcall registration), so that an FFM implementation can be introduced later — for example, as a multi-release JAR selecting FFM on Java 22+ — without changes to the transport or API layers.
 - The decision should be revisited when (a) the SDK's minimum Java baseline moves past 17, or (b) JDK releases begin enforcing `--illegal-native-access=deny` by default, whichever comes first.
 
-## How can we do Option 2 and Option 1
+## How to support classifier and monolithic JARs
 
-## How it works: classpath resource convention + platform detection
+### Classpath resource convention and platform detection
 
-### 1. Each classifier JAR uses a well-known resource path
+#### Each classifier JAR uses a well-known resource path
 
-Each per-platform JAR (`copilot-sdk-java-runtime:VERSION:darwin-arm64`, etc.) places its binary under a deterministic path inside the JAR:
+Each per-platform JAR places its artifacts under a deterministic path:
 
 ```
 native/darwin-arm64/runtime.node
 native/darwin-arm64/platform.properties
+native/darwin-arm64/copilot
 ```
 
-When `maven-assembly-plugin` creates the uber-jar, it unpacks all dependencies and merges them. The resulting uber-jar contains:
+Windows classifiers use `copilot.exe`. The CLI entrypoint remains in the classifier while the runtime requires the transitional embedded host.
+
+When `maven-assembly-plugin` creates the uber-JAR, it unpacks all dependencies and merges them. The resulting uber-JAR contains the selected platforms:
 
 ```
 com/github/copilot/sdk/...          (Java classes)
 native/linux-x64/runtime.node
+native/linux-x64/copilot
 native/linux-arm64/runtime.node
+native/linux-arm64/copilot
 native/linuxmusl-x64/runtime.node
+native/linuxmusl-x64/copilot
 native/linuxmusl-arm64/runtime.node
+native/linuxmusl-arm64/copilot
 native/darwin-x64/runtime.node
+native/darwin-x64/copilot
 native/darwin-arm64/runtime.node
+native/darwin-arm64/copilot
 native/win32-x64/runtime.node
+native/win32-x64/copilot.exe
 native/win32-arm64/runtime.node
+native/win32-arm64/copilot.exe
 ```
 
-### 2. The coordination artifact selects at runtime via `getResourceAsStream`
+#### The coordination artifact selects at runtime through the classloader
 
-```java
-public class NativeRuntimeLoader {
-
-    public Path loadRuntime() {
-        String classifier = detectPlatformClassifier();
-        String resourcePath = "native/" + classifier + "/runtime.node";
-
-        try (InputStream in = getClass().getClassLoader()
-                .getResourceAsStream(resourcePath)) {
-            if (in == null) {
-                throw new UnsupportedOperationException(
-                    "No native runtime for platform: " + classifier);
-            }
-            Path cached = getCachePath(classifier);
-            if (!Files.exists(cached)) {
-                Files.createDirectories(cached.getParent());
-                Files.copy(in, cached);
-                // Make executable on Unix
-                cached.toFile().setExecutable(true);
-            }
-            return cached;
-        }
-    }
-
-    private String detectPlatformClassifier() {
-        String os = normalizeOs(System.getProperty("os.name"));
-        String arch = normalizeArch(System.getProperty("os.arch"));
-        String libc = "linux".equals(os) ? detectLinuxLibc() : "";
-
-        // Produces: "linux-x64", "linuxmusl-arm64", "darwin-arm64", "win32-x64", etc.
-        return (libc.isEmpty() ? os : os + libc) + "-" + arch;
-    }
-
-    private String detectLinuxLibc() {
-        // Read ELF PT_INTERP from /proc/self/exe
-        // If interpreter contains "/ld-musl-" → "musl"
-        // Otherwise → "" (glibc is the default/unmarked case for "linux-")
-        // ...
-    }
-
-    private Path getCachePath(String classifier) {
-        String version = getClass().getPackage().getImplementationVersion();
-        return Path.of(System.getProperty("user.home"),
-            ".copilot", "runtime-cache", version, classifier, "runtime.node");
-    }
-}
-```
+`NativeRuntimeLoader` detects the current classifier and requests `native/<classifier>/runtime.node`, `native/<classifier>/platform.properties`, and `native/<classifier>/copilot` from the classloader. It uses the native package version from `platform.properties` as part of the cache identity, writes each executable artifact to a unique sibling temporary file, forces the file contents to storage, and atomically publishes the completed file into `~/.copilot/runtime-cache/<sdk-version>/<native-version>/<classifier>/`.
+
+On non-Windows platforms, the loader makes the temporary CLI executable and verifies its executable status before atomic publication. A nonempty but non-executable cached CLI is repaired instead of being accepted as valid.
 
-### 3. JNA loads from the extracted path
+#### JNA loads from the extracted path
 
 Once extracted to a known filesystem path, JNA loads it directly:
 
 ```java
-NativeLibrary lib = NativeLibrary.getInstance(extractedPath.toString());
-// Or via a mapped interface:
-CopilotRuntime runtime = Native.load(extractedPath.toString(), CopilotRuntime.class);
+CopilotRuntimeLibrary runtime =
+    Native.load(extractedPath.toString(), CopilotRuntimeLibrary.class);
 ```
 
-### Key insight: the same code works in both modes
+#### The same code works in both modes
 
-The beauty is that `getResourceAsStream("native/darwin-arm64/runtime.node")` works identically whether:
+Classloader resource lookup works identically whether:
 
-- The native lives in a **separate classifier JAR** on the classpath (normal dev dependency), OR  
-- It's been **merged into an uber-jar** by `maven-assembly-plugin`
+* The native artifacts live in a separate classifier JAR on the classpath.
+* The artifacts have been merged into an uber-JAR by `maven-assembly-plugin`.
 
-The classloader doesn't care which JAR file the resource came from — it searches the entire classpath. This means **zero code changes** between the two consumption models.
+The classloader searches the entire classpath, so the Java loading code does not change between the two consumption models.
 
----
-
-## Assembly plugin configuration (consumer-side)
+### Consumer-side assembly plugin configuration
 
 A consumer building a portable uber-jar would configure:
 
@@ -298,7 +323,7 @@ With all classifier JARs declared as dependencies:
         <artifactId>copilot-sdk-java</artifactId>
         <version>${copilot.version}</version>
     </dependency>
-    <!-- Include platforms you need -->
+    <!-- Include the platforms you need -->
     <dependency>
         <groupId>com.github</groupId>
         <artifactId>copilot-sdk-java-runtime</artifactId>
@@ -311,66 +336,64 @@ With all classifier JARs declared as dependencies:
         <version>${copilot.version}</version>
         <classifier>darwin-arm64</classifier>
     </dependency>
-    <!-- ... etc for each target platform -->
+    <!-- Repeat for each target platform -->
 </dependencies>
 ```
 
----
-
-## Why this works cleanly
+### Why this works cleanly
 
-| Concern | How it's handled |
-|---------|-----------------|
-| No resource path collisions | Each platform has its own subdirectory (`native/<classifier>/`) |
-| Extraction only happens once | Cached to `~/.copilot/runtime-cache/<version>/<classifier>/` |
-| Works without uber-jar too | Same `getResourceAsStream` call — classloader finds it in the separate JAR |
-| Subset selection | Consumer declares only the classifiers they need; missing platforms get a clear error at runtime |
-| JNA loading | `NativeLibrary.getInstance(path)` loads from an absolute filesystem path after extraction — no JNA platform-detection magic needed |
-
-The pattern is identical to how DJL's `LibUtils.loadLibrary()` works — detect platform, construct resource path, extract if needed, load via absolute path.
+| Concern                      | How it's handled                                                                                                                   |
+| ---------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
+| No resource path collisions  | Each platform has its own subdirectory (`native/<classifier>/`)                                                                    |
+| Extraction only happens once | Cached to `~/.copilot/runtime-cache/<sdk-version>/<native-version>/<classifier>/`                                                   |
+| Works without uber-JAR too   | The classloader finds the same resource in a separate classifier JAR                                                               |
+| Subset selection             | Consumer declares only the classifiers they need; missing platforms get a clear error at runtime                                   |
+| JNA loading                  | `Native.load(path, interface)` loads from an absolute filesystem path after extraction                                             |
 
+The pattern follows DJL's `LibUtils.loadLibrary()` approach: detect the platform, construct the resource path, extract when needed, and load from an absolute path.
 
 ## Consequences
 
-- A new Maven module (`copilot-sdk-java-runtime` or similar) is introduced to hold the per-platform native JARs. The existing `copilot-sdk-java` coordination artifact depends on it.
-- The coordination artifact gains a platform detection and native loading component that:
+* The `copilot-sdk-java-runtime` Maven module holds the per-platform classifier JARs. Users add the classifier for each platform they intend to run.
+* Users selecting in-process mode also add JNA. The coordination artifact does not force native dependencies on users who keep the default subprocess connection.
+* The coordination artifact includes platform detection and native loading code that:
   1. Detects OS, architecture, and Linux libc variant deterministically as described above.
   2. Locates the matching `runtime.node` binary on the classpath (via `getResourceAsStream` from the classifier JAR).
-  3. Extracts the binary to a temporary or cached location (e.g., `~/.copilot/runtime-cache/`) if not already present.
+  3. Extracts `runtime.node` and the transitional CLI entrypoint into `~/.copilot/runtime-cache/` if valid cached files are not already present.
   4. Loads it via [JNA](#references) using the C ABI entry points, per the [binding technology decision](#binding-technology-jna-over-panama-ffm) above. The JNA-specific code is confined behind an internal binding interface to preserve a future FFM migration path.
-- The release pipeline for `github/copilot-agent-runtime` must produce the per-platform `runtime.node` binaries as inputs to the Java SDK publish workflow. The per-platform `pkg-tarballs-<platform>` artifacts from the `publish-cli.yml` workflow are the authoritative source.
-- Each release of `copilot-sdk-java` publishes 6 (or 8) classifier JARs to Maven Central alongside the coordination JAR.
-- The version of the bundled `runtime.node` is recorded in the coordination JAR's manifest and queryable at runtime, enabling diagnostics and mismatch detection.
-- `cli-native.node` is not bundled. It provides only terminal UI features (ICU4X text segmentation, Win32 APIs, OS desktop notifications) that are irrelevant to the Java SDK's programmatic API surface.
+* A validated supported-host profile fetches the pinned matching `@github/copilot-<classifier>` npm package, verifies its SHA-512 integrity from `nodejs/package-lock.json`, and packages the version-matched runtime and CLI files.
+* The current release work publishes the `linux-x64`, `linux-arm64`, `win32-x64`, and `darwin-arm64` classifiers. The planned classifier set expands to the other detected platforms.
+* Adding an implemented platform requires validated host activation, a profile that supplies the classifier and platform CLI filename, and lifecycle bindings for the shared host validation, fetch, script test, package, and verification executions.
+* `cli-native.node` is not bundled. It provides terminal UI features that are irrelevant to the Java SDK's programmatic API surface.
 
 ## Related work items
 
-- https://github.com/github/copilot-sdk/issues/1917 — Epic: Embed Rust-based Copilot CLI Runtime and cease requiring Node.js
-- https://devdiv.visualstudio.com/DevDiv/_workitems/edit/3028097
-- https://github.com/github/copilot-sdk/pull/1901 dotnet: in-process FFI runtime hosting (InProcess transport)
-- https://github.com/github/copilot-sdk/pull/1915 Add in-process FFI transport for Rust and TypeScript SDKs
+* https://github.com/github/copilot-sdk/issues/1917: Epic to embed the Rust-based Copilot CLI runtime
+* https://devdiv.visualstudio.com/DevDiv/_workitems/edit/3028097
+* https://github.com/github/copilot-sdk/pull/1901: .NET in-process FFI runtime hosting
+* https://github.com/github/copilot-sdk/pull/1915: In-process FFI transport for Rust and TypeScript SDKs
 
 ### References
 
-| Term | Definition | Link |
-|------|------------|------|
-| **FFI** (Foreign Function Interface) | A mechanism by which code written in one language can call functions defined in another. In this ADR, Java calls into the Rust runtime shared library via JNA's FFI layer. | https://en.wikipedia.org/wiki/Foreign_function_interface |
-| **JNA** (Java Native Access) | A Java library that provides easy access to native shared libraries without requiring the JNI boilerplate. Used here to call the `extern "C"` C ABI entry points exported by `runtime.node`. | https://github.com/java-native-access/jna |
-| **napi-rs** | A Rust framework for building native Node.js addons using the Node-API (napi) stable ABI. Produces the `.node` file and generates TypeScript type declarations automatically. | https://napi.rs/ |
-| **cdylib** | A Rust `crate-type` that produces a C-compatible dynamic shared library (`.so` / `.dylib` / `.dll`). Distinct from `dylib` (Rust-to-Rust only) and `staticlib`. | https://doc.rust-lang.org/reference/linkage.html |
-| **napi (Node-API)** | A stable C ABI provided by Node.js for building native addons that remain binary-compatible across Node.js versions. `napi-rs` generates Rust code against this interface. | https://nodejs.org/api/n-api.html |
-| **C ABI** (Application Binary Interface) | The low-level contract between a compiled binary and its callers: calling conventions, data type layouts, symbol naming. An `extern "C"` ABI uses C's conventions, making a library callable from any language that speaks C FFI. | https://en.wikipedia.org/wiki/Application_binary_interface |
-| **ELF PT_INTERP** | A segment in an [ELF](https://man7.org/linux/man-pages/man5/elf.5.html) binary (the Linux/Unix executable format) that records the path of the dynamic linker/interpreter. On glibc systems this path is `/lib64/ld-linux-x86-64.so.2`; on musl systems it is `/lib/ld-musl-x86_64.so.1`. Inspecting it is the most reliable way to detect glibc vs. musl at runtime without executing a subprocess. | https://man7.org/linux/man-pages/man5/elf.5.html |
-| **glibc** (GNU C Library) | The standard C runtime library on most mainstream Linux distributions (Debian, Ubuntu, RHEL, Fedora, SLES). Binaries linked against glibc require the same version or newer to be present at runtime. The `runtime.node` glibc build requires glibc ≥ 2.28. | https://www.gnu.org/software/libc/ |
-| **musl libc** | An alternative C standard library optimised for static linking and used as the default libc on Alpine Linux. Not binary-compatible with glibc; a separate `runtime.node` build is required. | https://musl.libc.org/ |
-| **MSVC CRT** (Microsoft Visual C++ Runtime) | The C runtime library shipped with Visual Studio. When compiled with `+crt-static` (as `runtime.node` is on Windows), it is statically linked into the binary and the end-user does not need to install the Visual C++ Redistributable. | https://learn.microsoft.com/en-us/cpp/c-runtime-library/c-run-time-library-reference |
-| **Project Panama** | The OpenJDK project that produced the Foreign Function & Memory API as the modern, supported replacement for JNI-based native interop. | https://openjdk.org/projects/panama/ |
-| **FFM** (Foreign Function & Memory API) | The `java.lang.foreign` API for calling native functions and managing native memory from Java, finalized in Java 22. Considered and deferred as the binding technology for this SDK; see [Binding technology](#binding-technology-jna-over-panama-ffm). | https://docs.oracle.com/en/java/javase/22/core/foreign-function-and-memory-api.html |
-| **JEP 454** | The JDK Enhancement Proposal that finalized the FFM API in Java 22. | https://openjdk.org/jeps/454 |
-| **JEP 472** | "Prepare to Restrict the Use of JNI" — part of the JDK's integrity-by-default direction under which native access (via JNI or FFM) requires explicit consumer opt-in (`--enable-native-access`). Drives both the FFM configuration-burden concern and the expectation that JNA itself will eventually require the same opt-in. | https://openjdk.org/jeps/472 |
-| **DJL** (Deep Java Library) | Amazon's open-source Java framework for ML inference, used here as a reference for the per-platform classifier JAR distribution pattern. Its PyTorch native artifacts (`pytorch-native-cpu-*-<platform>.jar`) are the direct model for the proposed `copilot-sdk-java-runtime:VERSION:<classifier>` artifacts. | https://djl.ai/ |
-| **os-maven-plugin** | A Maven extension that detects the current OS and architecture and exposes them as properties (e.g., `${os.detected.classifier}`) so that `<classifier>` values can be resolved at build time rather than hardcoded. | https://github.com/trustin/os-maven-plugin |
-| **ONNX Runtime** | Microsoft's cross-platform ML inference runtime, used in this ADR as the size comparable for a monolithic all-platform JAR (~130 MB, Option 1). | https://onnxruntime.ai/ |
+| Term                                        | Definition                                                                                                                                                                                                                                                                                                                                                                                           | Link                                                                                 |
+| ------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
+| **FFI** (Foreign Function Interface)        | A mechanism by which code written in one language can call functions defined in another. In this ADR, Java calls into the Rust runtime shared library via JNA's FFI layer.                                                                                                                                                                                                                           | https://en.wikipedia.org/wiki/Foreign_function_interface                             |
+| **JNA** (Java Native Access)                | A Java library that provides easy access to native shared libraries without requiring the JNI boilerplate. Used here to call the `extern "C"` C ABI entry points exported by `runtime.node`.                                                                                                                                                                                                         | https://github.com/java-native-access/jna                                            |
+| **napi-rs**                                 | A Rust framework for building native Node.js addons using the Node-API (napi) stable ABI. Produces the `.node` file and generates TypeScript type declarations automatically.                                                                                                                                                                                                                        | https://napi.rs/                                                                     |
+| **cdylib**                                  | A Rust `crate-type` that produces a C-compatible dynamic shared library (`.so` / `.dylib` / `.dll`). Distinct from `dylib` (Rust-to-Rust only) and `staticlib`.                                                                                                                                                                                                                                      | https://doc.rust-lang.org/reference/linkage.html                                     |
+| **napi (Node-API)**                         | A stable C ABI provided by Node.js for building native addons that remain binary-compatible across Node.js versions. `napi-rs` generates Rust code against this interface.                                                                                                                                                                                                                           | https://nodejs.org/api/n-api.html                                                    |
+| **C ABI** (Application Binary Interface)    | The low-level contract between a compiled binary and its callers: calling conventions, data type layouts, symbol naming. An `extern "C"` ABI uses C's conventions, making a library callable from any language that speaks C FFI.                                                                                                                                                                    | https://en.wikipedia.org/wiki/Application_binary_interface                           |
+| **ELF PT_INTERP**                           | A segment in an [ELF](https://man7.org/linux/man-pages/man5/elf.5.html) binary (the Linux/Unix executable format) that records the path of the dynamic linker/interpreter. On glibc systems this path is `/lib64/ld-linux-x86-64.so.2`; on musl systems it is `/lib/ld-musl-x86_64.so.1`. Inspecting it is the most reliable way to detect glibc vs. musl at runtime without executing a subprocess. | https://man7.org/linux/man-pages/man5/elf.5.html                                     |
+| **glibc** (GNU C Library)                   | The standard C runtime library on most mainstream Linux distributions (Debian, Ubuntu, RHEL, Fedora, SLES). Binaries linked against glibc require the same version or newer to be present at runtime. The `runtime.node` glibc build requires glibc ≥ 2.28.                                                                                                                                          | https://www.gnu.org/software/libc/                                                   |
+| **musl libc**                               | An alternative C standard library optimised for static linking and used as the default libc on Alpine Linux. Not binary-compatible with glibc; a separate `runtime.node` build is required.                                                                                                                                                                                                          | https://musl.libc.org/                                                               |
+| **MSVC CRT** (Microsoft Visual C++ Runtime) | The C runtime library shipped with Visual Studio. When compiled with `+crt-static` (as `runtime.node` is on Windows), it is statically linked into the binary and the end-user does not need to install the Visual C++ Redistributable.                                                                                                                                                              | https://learn.microsoft.com/en-us/cpp/c-runtime-library/c-run-time-library-reference |
+| **Project Panama**                          | The OpenJDK project that produced the Foreign Function & Memory API as the modern, supported replacement for JNI-based native interop.                                                                                                                                                                                                                                                               | https://openjdk.org/projects/panama/                                                 |
+| **FFM** (Foreign Function & Memory API)     | The `java.lang.foreign` API for calling native functions and managing native memory from Java, finalized in Java 22. Considered and deferred as the binding technology for this SDK; see [Binding technology](#binding-technology-jna-over-panama-ffm).                                                                                                                                              | https://docs.oracle.com/en/java/javase/22/core/foreign-function-and-memory-api.html  |
+| **JEP 454**                                 | The JDK Enhancement Proposal that finalized the FFM API in Java 22.                                                                                                                                                                                                                                                                                                                                  | https://openjdk.org/jeps/454                                                         |
+| **JEP 472**                                 | "Prepare to Restrict the Use of JNI" — part of the JDK's integrity-by-default direction under which native access (via JNI or FFM) requires explicit consumer opt-in (`--enable-native-access`). Drives both the FFM configuration-burden concern and the expectation that JNA itself will eventually require the same opt-in.                                                                       | https://openjdk.org/jeps/472                                                         |
+| **DJL** (Deep Java Library)                 | Amazon's open-source Java framework for ML inference, used here as a reference for the per-platform classifier JAR distribution pattern. Its PyTorch native artifacts (`pytorch-native-cpu-*-<platform>.jar`) are the direct model for the proposed `copilot-sdk-java-runtime:VERSION:<classifier>` artifacts.                                                                                       | https://djl.ai/                                                                      |
+| **os-maven-plugin**                         | A Maven extension that detects the current OS and architecture and exposes them as properties (e.g., `${os.detected.classifier}`) so that `<classifier>` values can be resolved at build time rather than hardcoded.                                                                                                                                                                                 | https://github.com/trustin/os-maven-plugin                                           |
+| **ONNX Runtime**                            | Microsoft's cross-platform ML inference runtime, used in this ADR as the size comparable for a monolithic all-platform JAR (~130 MB, Option 1).                                                                                                                                                                                                                                                      | https://onnxruntime.ai/                                                              |
 
 Additional source references:
 
@@ -381,4 +404,3 @@ Additional source references:
 - `github/copilot-agent-runtime` build target definitions: `script/build-runtime.ts`
 - `github/copilot-agent-runtime` glibc sysroot and verification: `script/linux/install-sysroot.cjs`, `script/linux/verify-glibc-requirements.sh`
 - ONNX Runtime Java on Maven Central (size comparable): https://repo1.maven.org/maven2/com/microsoft/onnxruntime/onnxruntime/1.21.0/
-
diff --git a/java/mvnw.cmd b/java/mvnw.cmd
index 92450f9327..5761d94892 100644
--- a/java/mvnw.cmd
+++ b/java/mvnw.cmd
@@ -1,189 +1,189 @@
-<# : batch portion
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.3.4
-@REM
-@REM Optional ENV vars
-@REM   MVNW_REPOURL - repo url base for downloading maven distribution
-@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
-@REM ----------------------------------------------------------------------------
-
-@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
-@SET __MVNW_CMD__=
-@SET __MVNW_ERROR__=
-@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
-@SET PSModulePath=
-@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
-  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
-)
-@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
-@SET __MVNW_PSMODULEP_SAVE=
-@SET __MVNW_ARG0_NAME__=
-@SET MVNW_USERNAME=
-@SET MVNW_PASSWORD=
-@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
-@echo Cannot start maven from wrapper >&2 && exit /b 1
-@GOTO :EOF
-: end batch / begin powershell #>
-
-$ErrorActionPreference = "Stop"
-if ($env:MVNW_VERBOSE -eq "true") {
-  $VerbosePreference = "Continue"
-}
-
-# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
-$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
-if (!$distributionUrl) {
-  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
-}
-
-switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
-  "maven-mvnd-*" {
-    $USE_MVND = $true
-    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
-    $MVN_CMD = "mvnd.cmd"
-    break
-  }
-  default {
-    $USE_MVND = $false
-    $MVN_CMD = $script -replace '^mvnw','mvn'
-    break
-  }
-}
-
-# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-if ($env:MVNW_REPOURL) {
-  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
-  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
-}
-$distributionUrlName = $distributionUrl -replace '^.*/',''
-$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
-
-$MAVEN_M2_PATH = "$HOME/.m2"
-if ($env:MAVEN_USER_HOME) {
-  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
-}
-
-if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
-    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
-}
-
-$MAVEN_WRAPPER_DISTS = $null
-if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
-  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
-} else {
-  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
-}
-
-$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
-$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
-$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
-
-if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
-  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
-  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
-  exit $?
-}
-
-if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
-  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
-}
-
-# prepare tmp dir
-$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
-$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
-$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
-trap {
-  if ($TMP_DOWNLOAD_DIR.Exists) {
-    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-  }
-}
-
-New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
-
-# Download and Install Apache Maven
-Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-Write-Verbose "Downloading from: $distributionUrl"
-Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
-$webclient = New-Object System.Net.WebClient
-if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
-  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
-}
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
-
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
-$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
-if ($distributionSha256Sum) {
-  if ($USE_MVND) {
-    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
-  }
-  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
-  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
-    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
-  }
-}
-
-# unzip and move
-Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
-
-# Find the actual extracted directory name (handles snapshots where filename != directory name)
-$actualDistributionDir = ""
-
-# First try the expected directory name (for regular distributions)
-$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
-$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
-if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
-  $actualDistributionDir = $distributionUrlNameMain
-}
-
-# If not found, search for any directory with the Maven executable (for snapshots)
-if (!$actualDistributionDir) {
-  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
-    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
-    if (Test-Path -Path $testPath -PathType Leaf) {
-      $actualDistributionDir = $_.Name
-    }
-  }
-}
-
-if (!$actualDistributionDir) {
-  Write-Error "Could not find Maven distribution directory in extracted archive"
-}
-
-Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
-Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
-try {
-  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
-} catch {
-  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
-    Write-Error "fail to move MAVEN_HOME"
-  }
-} finally {
-  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-}
-
-Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
+@REM
+@REM Optional ENV vars
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+
+$MAVEN_M2_PATH = "$HOME/.m2"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
+}
+
+if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
+    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
+}
+
+$MAVEN_WRAPPER_DISTS = $null
+if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
+  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
+} else {
+  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
+}
+
+$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+$actualDistributionDir = ""
+
+# First try the expected directory name (for regular distributions)
+$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
+$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
+if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
+  $actualDistributionDir = $distributionUrlNameMain
+}
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if (!$actualDistributionDir) {
+  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
+    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
+    if (Test-Path -Path $testPath -PathType Leaf) {
+      $actualDistributionDir = $_.Name
+    }
+  }
+}
+
+if (!$actualDistributionDir) {
+  Write-Error "Could not find Maven distribution directory in extracted archive"
+}
+
+Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/java/pom.xml b/java/pom.xml
index efb54bbef3..b7618b897a 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -6,12 +6,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.github</groupId>
-    <artifactId>copilot-sdk-java</artifactId>
-    <version>1.0.10-preview.3-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <artifactId>copilot-sdk-java-parent</artifactId>
+    <version>1.0.14-preview.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>GitHub Copilot SDK :: Java</name>
-    <description>Official SDK for programmatic control of GitHub Copilot CLI</description>
+    <name>GitHub Copilot SDK :: Java :: Parent</name>
+    <description>Parent POM for the GitHub Copilot Java SDK multi-module reactor</description>
     <url>https://github.com/github/copilot-sdk</url>
 
     <licenses>
@@ -36,50 +36,25 @@
         <tag>HEAD</tag>
     </scm>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>central</id>
-            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
+    <modules>
+        <module>sdk</module>
+        <module>copilot-native</module>
+        <!--
+            copilot-native-all (the monolithic uber-JAR) is added in a later task.
+            Uncomment when the module directory and POM are created.
+        -->
+        <!-- <module>copilot-native-all</module> -->
+    </modules>
 
     <properties>
         <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!--
-            Root of the monorepo. Since the Java SDK now lives inside the
-            monorepo (java/ directory), we point directly at the repo root
-            instead of cloning a separate copy into target/.
+            Root of the monorepo. The parent POM lives at java/, so one level up
+            reaches the monorepo root. Submodules must override this property to
+            adjust for their directory depth (e.g. sdk/ overrides with ../../).
         -->
         <copilot.sdk.root>${project.basedir}/..</copilot.sdk.root>
-        <copilot.tests.dir>${copilot.sdk.root}/test</copilot.tests.dir>
-        <!--
-            Path to the Copilot CLI entry point used by the SDK tests. Defaults
-            to the CLI installed under the monorepo's nodejs/ directory.
-            Surefire injects this into the test JVM as the COPILOT_CLI_PATH
-            environment variable, so `mvn verify` is self-contained and the
-            developer never has to set it manually. Override on the command
-            line to point at a different CLI build, e.g.:
-              mvn verify -Dcopilot.cli.path=/some/other/copilot/npm-loader.js
-        -->
-        <copilot.cli.path>${copilot.sdk.root}/nodejs/node_modules/@github/copilot/npm-loader.js</copilot.cli.path>
-        <!-- Set to true (via -Pskip-test-harness) to skip npm install of test harness -->
-        <skip.test.harness>false</skip.test.harness>
-        <!--
-            Whether to skip the install-nodejs-cli-dependencies execution
-            (npm ci of the @github/copilot CLI). Defaults to ${skip.test.harness}
-            so it tracks the rest of the test-harness setup, but is also
-            forced to true when Maven tests are skipped (-DskipTests or
-            -Dmaven.test.skip) via the skip-cli-install-when-tests-skipped
-            and skip-cli-install-when-maven-test-skip profiles below, so that
-            non-test builds (e.g. package/deploy with tests skipped) do not
-            require npm or network access.
-        -->
-        <skip.cli.install>${skip.test.harness}</skip.cli.install>
-        <!-- Override with -Dnpm.loglevel=verbose when troubleshooting npm. -->
-        <npm.loglevel>notice</npm.loglevel>
-        <!-- Extra JVM args for Surefire; overridden by the jdk21+ profile -->
-        <surefire.jvm.args />
         <!--
             The pinned version of the @github/copilot npm package used by CI
             workflows (java-smoke-test.yml, update-copilot-dependency.yml) to
@@ -88,54 +63,29 @@
             DO NOT EDIT MANUALLY. Updated by the update-copilot-dependency
             workflow.
         -->
-        <readonly-copilot-sdk-ref-impl-version-from-lastmerge-file-updated-by-reference-impl-sync>^1.0.78</readonly-copilot-sdk-ref-impl-version-from-lastmerge-file-updated-by-reference-impl-sync>
-
+        <readonly-copilot-sdk-ref-impl-version-from-lastmerge-file-updated-by-reference-impl-sync>^1.0.81-11</readonly-copilot-sdk-ref-impl-version-from-lastmerge-file-updated-by-reference-impl-sync>
+        <!-- The parent POM is not published to Maven Central. -->
+        <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
-    <dependencies>
-        <!-- JSON-RPC -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.22.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.22</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.22.1</version>
-        </dependency>
-
-        <!-- SpotBugs annotations for suppressing warnings -->
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <version>4.10.3</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>5.14.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>5.23.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.5.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.15.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.5.1</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
@@ -146,521 +96,111 @@
                         <doclint>none</doclint>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.4.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.5.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>3.5.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.6.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>3.2.8</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>3.3.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>3.6.0</version>
+                </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
                     <version>4.10.3.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.diffplug.spotless</groupId>
+                    <artifactId>spotless-maven-plugin</artifactId>
+                    <version>2.46.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.15</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>3.6.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>3.6.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.sonatype.central</groupId>
+                    <artifactId>central-publishing-maven-plugin</artifactId>
+                    <version>0.11.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>flatten-maven-plugin</artifactId>
+                    <version>1.8.0</version>
                     <configuration>
-                        <excludeFilterFile>config/spotbugs/spotbugs-exclude.xml</excludeFilterFile>
+                        <flattenMode>ossrh</flattenMode>
                     </configuration>
+                    <executions>
+                        <execution>
+                            <id>flatten</id>
+                            <phase>process-resources</phase>
+                            <goals>
+                                <goal>flatten</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>flatten-clean</id>
+                            <phase>clean</phase>
+                            <goals>
+                                <goal>clean</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.5.0</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.15.0</version>
-                <configuration>
-                    <compilerArgs>
-                        <arg>-Acopilot.experimental.allowed=true</arg>
-                    </compilerArgs>
-                    <proc>none</proc>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.5.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <id>print-test-jdk-banner</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <echo level="warning" message="⚠⚠⚠ Using Java ${java.version} (${java.vendor}) to run tests." />
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Install harness dependencies -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.6.3</version>
-                <executions>
-                    <execution>
-                        <id>install-harness-dependencies</id>
-                        <phase>generate-test-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.test.harness}</skip>
-                            <executable>npm</executable>
-                            <workingDirectory>${copilot.sdk.root}/test/harness</workingDirectory>
-                            <arguments>
-                                <argument>ci</argument>
-                                <argument>--loglevel</argument>
-                                <argument>${npm.loglevel}</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <!--
-                        Install the @github/copilot CLI declared by the
-                        monorepo's nodejs/package.json. This is the CLI version
-                        the SDK tests must run against. Uses npm ci with the
-                        ignore-scripts flag, matching build-test.yml.
-                    -->
-                    <execution>
-                        <id>install-nodejs-cli-dependencies</id>
-                        <phase>generate-test-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.cli.install}</skip>
-                            <executable>npm</executable>
-                            <workingDirectory>${copilot.sdk.root}/nodejs</workingDirectory>
-                            <arguments>
-                                <argument>ci</argument>
-                                <argument>--ignore-scripts</argument>
-                                <argument>--loglevel</argument>
-                                <argument>${npm.loglevel}</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!--
-                Failsafe runs integration tests against the actually packaged
-                JAR (after the package phase). Used to validate multi-release
-                JAR behaviour end-to-end without reflecting on private fields
-                or hand-rolling a synthetic JAR. See
-                src/test/java/com/github/copilot/InternalExecutorProviderIT.java.
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.6</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <systemPropertyVariables>
-                        <project.build.directory>${project.build.directory}</project.build.directory>
-                        <project.build.finalName>${project.build.finalName}</project.build.finalName>
-                        <project.build.testOutputDirectory>${project.build.testOutputDirectory}</project.build.testOutputDirectory>
-                    </systemPropertyVariables>
-                    <!--
-                        Keep the integration-test JVM aligned with Surefire so
-                        tests like SlashCommandsIT resolve the pinned CLI from
-                        the monorepo nodejs install at
-                        ${copilot.sdk.root}/nodejs.
-                    -->
-                    <environmentVariables>
-                        <COPILOT_CLI_PATH>${copilot.cli.path}</COPILOT_CLI_PATH>
-                    </environmentVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.6</version>
-                <configuration>
-                    <runOrder>alphabetical</runOrder>
-                    <!-- Inject JaCoCo agent + any JDK-version-specific flags -->
-                    <argLine>${testExecutionAgentArgs} ${surefire.jvm.args}</argLine>
-                    <!--
-                        Automatically retry tests that fail on the first attempt.
-                        This handles intermittent failures in E2E tests (e.g.,
-                        CompactionTest) where snapshot matching can be sensitive
-                        to non-deterministic compaction behaviour.
-                        Revisit this once this issue is successfully resolved.
-                        https://github.com/github/copilot-sdk/issues/1227
-                    -->
-                    <rerunFailingTestsCount>2</rerunFailingTestsCount>
-                    <systemPropertyVariables>
-                        <copilot.tests.dir>${copilot.tests.dir}</copilot.tests.dir>
-                        <copilot.sdk.dir>${copilot.sdk.root}</copilot.sdk.dir>
-                    </systemPropertyVariables>
-                    <!--
-                        Set COPILOT_CLI_PATH for the forked test JVM so the SDK
-                        tests transparently use the pinned CLI under
-                        ${copilot.sdk.root}/nodejs/. See the copilot.cli.path
-                        property above for the override mechanism and override
-                        support.
-                    -->
-                    <environmentVariables>
-                        <COPILOT_CLI_PATH>${copilot.cli.path}</COPILOT_CLI_PATH>
-                    </environmentVariables>
-                </configuration>
-                <executions>
-                    <!--
-                        Run multi-client session resume tests in isolation BEFORE the
-                        main suite. These tests pass reliably alone but can time out
-                        when run after other E2E tests due to harness state leakage.
-                    -->
-                    <execution>
-                        <id>isolated-resume-tests</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <groups>isolated-resume</groups>
-                            <!-- Use a separate report directory so these results
-                                 don't overwrite the default-test XML reports for
-                                 the same test classes (CopilotSessionTest,
-                                 StreamingFidelityTest). -->
-                            <reportsDirectory>${project.build.directory}/surefire-reports-isolated</reportsDirectory>
-                        </configuration>
-                    </execution>
-                    <!-- Exclude the isolated resume tests from the main run -->
-                    <execution>
-                        <id>default-test</id>
-                        <configuration>
-                            <excludedGroups>isolated-resume</excludedGroups>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Add src/generated/java as an additional source root -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.6.1</version>
-                <executions>
-                    <execution>
-                        <id>add-generated-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.basedir}/src/generated/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.diffplug.spotless</groupId>
-                <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.46.1</version>
-                <configuration>
-                    <java>
-                        <excludes>
-                            <exclude>src/generated/java/**/*.java</exclude>
-                        </excludes>
-                        <eclipse>
-                            <version>4.33</version>
-                        </eclipse>
-                        <removeUnusedImports />
-                        <trimTrailingWhitespace />
-                        <endWithNewline />
-                        <indent>
-                            <spaces>true</spaces>
-                            <spacesPerTab>4</spacesPerTab>
-                        </indent>
-                    </java>
-                </configuration>
-            </plugin>
-            <!-- Coverage tracking for CopilotClient/CopilotSession interactions with CLI -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.15</version>
-                <executions>
-                    <!-- Instrument bytecode before E2ETestContext runs tests with CapiProxy -->
-                    <execution>
-                        <id>wire-up-coverage-instrumentation</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Store exec file alongside other build artifacts -->
-                            <destFile>${project.build.directory}/jacoco-test-results/sdk-tests.exec</destFile>
-                            <!-- Pass agent args via this property to surefire -->
-                            <propertyName>testExecutionAgentArgs</propertyName>
-                            <!-- Focus on SDK package, exclude test harness utilities -->
-                            <includes>
-                                <include>com/github/copilot/**</include>
-                            </includes>
-                            <excludes>
-                                <exclude>com/github/copilot/E2ETestContext*</exclude>
-                                <exclude>com/github/copilot/CapiProxy*</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                    <!-- Generate HTML/XML reports after tests complete -->
-                    <execution>
-                        <id>build-coverage-report-from-tests</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <phase>verify</phase>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco-test-results/sdk-tests.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-coverage</outputDirectory>
-                            <excludes>
-                                <!-- Exclude multi-release classes to avoid duplicate class analysis. -->
-                                <exclude>META-INF/versions/**/*.class</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.6.0</version>
-                <configuration>
-                    <configLocation>config/checkstyle/checkstyle.xml</configLocation>
-                    <consoleOutput>true</consoleOutput>
-                    <failsOnError>true</failsOnError>
-                    <includeTestSourceDirectory>false</includeTestSourceDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>validate</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.puppycrawl.tools</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>10.26.1</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.sonatype.central</groupId>
-                <artifactId>central-publishing-maven-plugin</artifactId>
-                <version>0.11.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <publishingServerId>central</publishingServerId>
-                    <autoPublish>true</autoPublish>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.6.3</version>
-                <executions>
-                    <execution>
-                        <id>enforce-jdk25</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[25,)</version>
-                                    <message>JDK 25+ is required to build the Multi-Release JAR with the virtual-thread overlay.</message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>verify-multi-release-overlay</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireFilesExist>
-                                    <files>
-                                        <file>${project.build.outputDirectory}/META-INF/versions/25/com/github/copilot/InternalExecutorProvider.class</file>
-                                    </files>
-                                    <message>Multi-Release JAR overlay missing: META-INF/versions/25/com/github/copilot/InternalExecutorProvider.class was not compiled. Ensure the build runs on JDK 25+.</message>
-                                </requireFilesExist>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>flatten-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
 
     <profiles>
-        <!-- Enable dynamic agent loading on JDK 21+ so Mockito/ByteBuddy
-             can attach at runtime (JEP 451). The flag does not exist on
-             earlier JDKs, so it must be conditional. -->
-        <profile>
-            <id>jdk21+</id>
-            <activation>
-                <jdk>[21,)</jdk>
-            </activation>
-            <properties>
-                <surefire.jvm.args>-XX:+EnableDynamicAgentLoading</surefire.jvm.args>
-            </properties>
-        </profile>
-        <profile>
-            <id>java25-multi-release</id>
-            <activation>
-                <jdk>[25,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>compile-java25</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>compile</goal>
-                                </goals>
-                                <configuration>
-                                    <release>25</release>
-                                    <useIncrementalCompilation>false</useIncrementalCompilation>
-                                    <compileSourceRoots>
-                                        <compileSourceRoot>${project.basedir}/src/main/java25</compileSourceRoot>
-                                    </compileSourceRoots>
-                                    <multiReleaseOutput>true</multiReleaseOutput>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <configuration>
-                            <archive>
-                                <manifestEntries>
-                                    <Multi-Release>true</Multi-Release>
-                                </manifestEntries>
-                            </archive>
-                        </configuration>
-                    </plugin>
-                    <!--
-                        Structural guard: when this profile is active (JDK 25+
-                        builds), assert that the packaged JAR contains the
-                        JDK 25 multi-release overlay class. Catches accidental
-                        profile-disable / classifier / shading regressions
-                        before the failsafe IT runs.
-                    -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>verify-java25-overlay</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <condition property="java25.overlay.present">
-                                            <resourceexists>
-                                                <zipentry zipfile="${project.build.directory}/${project.build.finalName}.jar" name="META-INF/versions/25/com/github/copilot/InternalExecutorProvider.class" />
-                                            </resourceexists>
-                                        </condition>
-                                        <fail unless="java25.overlay.present">
-JDK 25 multi-release overlay class is missing from the packaged JAR.
-Expected entry: META-INF/versions/25/com/github/copilot/InternalExecutorProvider.class
-JAR: ${project.build.directory}/${project.build.finalName}.jar
-
-This usually means the 'java25-multi-release' Maven profile did not activate
-(e.g. the build is running on a JDK older than 25) or maven-compiler-plugin
-did not produce the multi-release output. Re-build on JDK 25+ and verify the
-'compile-java25' execution ran during the 'compile' phase.
-                                        </fail>
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <!-- Skip npm install of the copilot-sdk test harness -->
-        <profile>
-            <id>skip-test-harness</id>
-            <properties>
-                <skip.test.harness>true</skip.test.harness>
-            </properties>
-        </profile>
-        <!--
-            Skip the install-nodejs-cli-dependencies (npm ci) execution when
-            tests are skipped via -DskipTests, so non-test builds do not
-            require npm or network access. Activates automatically; no manual
-            -P needed.
-        -->
-        <profile>
-            <id>skip-cli-install-when-tests-skipped</id>
-            <activation>
-                <property>
-                    <name>skipTests</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <properties>
-                <skip.cli.install>true</skip.cli.install>
-            </properties>
-        </profile>
-        <!--
-            Same as above, but for -Dmaven.test.skip=true.
-        -->
-        <profile>
-            <id>skip-cli-install-when-maven-test-skip</id>
-            <activation>
-                <property>
-                    <name>maven.test.skip</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <properties>
-                <skip.cli.install>true</skip.cli.install>
-            </properties>
-        </profile>
-        <!-- Debug profile for FINE logging during tests -->
-        <profile>
-            <id>debug</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <java.util.logging.config.file>${project.basedir}/src/test/resources/logging-debug.properties</java.util.logging.config.file>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -668,7 +208,6 @@ did not produce the multi-release output. Re-build on JDK 25+ and verify the
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.4.0</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -693,7 +232,6 @@ did not produce the multi-release output. Re-build on JDK 25+ and verify the
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.8</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -707,103 +245,5 @@ did not produce the multi-release output. Re-build on JDK 25+ and verify the
                 </plugins>
             </build>
         </profile>
-        <!-- Update the @github/copilot npm schema package to a new version.
-             Usage: mvn generate-sources -Pupdate-schemas-from-npm-artifact -Dcopilot.schema.version=1.0.25 -->
-        <profile>
-            <id>update-schemas-from-npm-artifact</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.6.3</version>
-                        <executions>
-                            <execution>
-                                <id>update-copilot-schema-version</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>npm</executable>
-                                    <workingDirectory>${project.basedir}/scripts/codegen</workingDirectory>
-                                    <arguments>
-                                        <argument>install</argument>
-                                        <argument>@github/copilot@${copilot.schema.version}</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-enforcer-plugin</artifactId>
-                        <version>3.6.3</version>
-                        <executions>
-                            <execution>
-                                <id>require-schema-version</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>enforce</goal>
-                                </goals>
-                                <configuration>
-                                    <rules>
-                                        <requireProperty>
-                                            <property>copilot.schema.version</property>
-                                            <message>You must specify -Dcopilot.schema.version=VERSION (e.g. 1.0.25)</message>
-                                        </requireProperty>
-                                    </rules>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <!-- Run the TypeScript code generator to regenerate Java sources from the current schema.
-             Usage: mvn generate-sources -Pcodegen -->
-        <profile>
-            <id>codegen</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.6.3</version>
-                        <executions>
-                            <execution>
-                                <id>codegen-npm-install</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>npm</executable>
-                                    <workingDirectory>${project.basedir}/scripts/codegen</workingDirectory>
-                                    <arguments>
-                                        <argument>ci</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>codegen-generate</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>npm</executable>
-                                    <workingDirectory>${project.basedir}/scripts/codegen</workingDirectory>
-                                    <arguments>
-                                        <argument>run</argument>
-                                        <argument>generate</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/java/scripts/codegen/java.ts b/java/scripts/codegen/java.ts
index 9f7eb40039..785049afa1 100644
--- a/java/scripts/codegen/java.ts
+++ b/java/scripts/codegen/java.ts
@@ -4,7 +4,7 @@
 
 /**
  * Java code generator for session-events and RPC types.
- * Generates Java source files under src/generated/java/ from JSON Schema files.
+ * Generates Java source files under sdk/src/generated/java/ from JSON Schema files.
  */
 
 import fs from "fs/promises";
@@ -66,6 +66,24 @@ function normalizeBrandCasingNode(node: unknown): void {
     if (node === null || typeof node !== "object") return;
     const obj = node as Record<string, unknown>;
 
+    if (obj.title === "ProviderModelConfig" && obj.properties && typeof obj.properties === "object") {
+        const tokenFields = new Set([
+            "maxPromptTokens",
+            "maxContextWindowTokens",
+            "maxOutputTokens",
+        ]);
+        for (const [key, value] of Object.entries(obj.properties as Record<string, unknown>)) {
+            if (
+                tokenFields.has(key) &&
+                value !== null &&
+                typeof value === "object" &&
+                (value as Record<string, unknown>).type === "number"
+            ) {
+                (value as Record<string, unknown>).type = "integer";
+            }
+        }
+    }
+
     for (const defsKey of ["definitions", "$defs"] as const) {
         const defs = obj[defsKey];
         if (defs && typeof defs === "object" && !Array.isArray(defs)) {
@@ -149,7 +167,9 @@ function toCamelCase(name: string): string {
 }
 
 function toEnumConstant(value: string): string {
-    return value.toUpperCase().replace(/[-. /:]/g, "_").replace(/^_+/, "").replace(/_+/g, "_");
+    const constant = value.toUpperCase().replace(/[^A-Z0-9]/g, "_").replace(/^_+/, "").replace(/_+/g, "_");
+    if (constant.length === 0) return "_";
+    return /^[0-9]/.test(constant) ? `_${constant}` : constant;
 }
 
 // ── Schema path resolution ───────────────────────────────────────────────────
@@ -232,6 +252,7 @@ interface JavaTypeResult {
 // Set before each schema generation pass; used by schemaTypeToJava and helpers.
 let currentDefinitions: Record<string, JSONSchema7> = {};
 const pendingStandaloneTypes = new Map<string, JSONSchema7>();
+const generatedSessionEventTypeNames = new Set<string>();
 
 // Cross-schema definitions: keyed by schema filename (e.g. "session-events.schema.json"),
 // value is the definitions map from that schema. Populated by generateRpcTypes so that
@@ -573,21 +594,15 @@ function schemaTypeToJava(
         if (crossSchemaMatch) {
             const [, schemaFile, typeName] = crossSchemaMatch;
             const externalDefs = crossSchemaDefinitions.get(schemaFile);
-            if (externalDefs) {
-                const resolved = externalDefs[typeName];
-                if (resolved) {
-                    // Save and swap currentDefinitions so recursive calls resolve against
-                    // the external schema's definitions.
-                    const savedDefs = currentDefinitions;
-                    currentDefinitions = externalDefs;
-                    const result = schemaTypeToJava(resolved, required, context, propName, nestedTypes);
-                    currentDefinitions = savedDefs;
-                    return result;
-                }
+            if (
+                schemaFile === "session-events.schema.json"
+                && externalDefs?.[typeName]
+                && generatedSessionEventTypeNames.has(typeName)
+            ) {
+                imports.add(`com.github.copilot.generated.${typeName}`);
+                return { javaType: typeName, imports };
             }
-            // Fallback: extract just the type name and warn
-            console.warn(`[codegen] Unresolved cross-schema $ref: ${schema.$ref}`);
-            return { javaType: typeName, imports };
+            return { javaType: "Object", imports };
         }
 
         const name = schema.$ref.replace(/^#\/definitions\//, "");
@@ -779,7 +794,7 @@ async function generateSessionEvents(schemaPath: string): Promise<void> {
 
     const variants = extractEventVariants(schema);
     const packageName = "com.github.copilot.generated";
-    const packageDir = `src/generated/java/com/github/copilot/generated`;
+    const packageDir = `sdk/src/generated/java/com/github/copilot/generated`;
 
     // Generate base SessionEvent class
     await generateSessionEventBaseClass(variants, packageName, packageDir);
@@ -792,6 +807,13 @@ async function generateSessionEvents(schemaPath: string): Promise<void> {
     // Generate standalone types discovered via $ref resolution
     await generatePendingStandaloneTypes(packageName, packageDir, GENERATED_FROM_SESSION_EVENTS);
 
+    generatedSessionEventTypeNames.clear();
+    for (const entry of await fs.readdir(path.join(REPO_ROOT, packageDir), { withFileTypes: true })) {
+        if (entry.isFile() && entry.name.endsWith(".java")) {
+            generatedSessionEventTypeNames.add(path.basename(entry.name, ".java"));
+        }
+    }
+
     console.log(`✅ Generated ${variants.length + 1} session event files`);
 }
 
@@ -1384,7 +1406,7 @@ async function generateRpcTypes(schemaPath: string): Promise<void> {
     }
 
     const packageName = "com.github.copilot.generated.rpc";
-    const packageDir = `src/generated/java/com/github/copilot/generated/rpc`;
+    const packageDir = `sdk/src/generated/java/com/github/copilot/generated/rpc`;
 
     // Collect all RPC methods from all sections
     const sections: [string, Record<string, unknown>][] = [];
@@ -2224,7 +2246,7 @@ async function generateRpcWrappers(schemaPath: string): Promise<void> {
     currentDefinitions = (schema.definitions ?? {}) as Record<string, JSONSchema7>;
 
     const packageName = "com.github.copilot.generated.rpc";
-    const packageDir = `src/generated/java/com/github/copilot/generated/rpc`;
+    const packageDir = `sdk/src/generated/java/com/github/copilot/generated/rpc`;
 
     // RpcCaller interface and shared ObjectMapper holder
     await generateRpcCallerInterface(packageName, packageDir);
@@ -2347,7 +2369,7 @@ async function main(): Promise<void> {
     console.log("============================");
 
     // Clean the generated output directory to remove orphaned files from previous runs
-    const generatedOutputDir = path.join(REPO_ROOT, "src/generated/java/com/github/copilot/generated");
+    const generatedOutputDir = path.join(REPO_ROOT, "sdk/src/generated/java/com/github/copilot/generated");
     console.log(`🧹 Cleaning output directory: ${generatedOutputDir}`);
     await fs.rm(generatedOutputDir, { recursive: true, force: true });
     await fs.mkdir(generatedOutputDir, { recursive: true });
@@ -2362,8 +2384,8 @@ async function main(): Promise<void> {
     await generateRpcWrappers(apiSchemaPath);
 
     // Generate package-info.java for each generated package
-    const generatedPkgDir = `src/generated/java/com/github/copilot/generated`;
-    const rpcPkgDir = `src/generated/java/com/github/copilot/generated/rpc`;
+    const generatedPkgDir = `sdk/src/generated/java/com/github/copilot/generated`;
+    const rpcPkgDir = `sdk/src/generated/java/com/github/copilot/generated/rpc`;
     await generateGeneratedPackageInfo(generatedPkgDir);
     await generateRpcPackageInfo(rpcPkgDir);
 
diff --git a/java/scripts/codegen/package-lock.json b/java/scripts/codegen/package-lock.json
index c4a159b6e4..d0b602e846 100644
--- a/java/scripts/codegen/package-lock.json
+++ b/java/scripts/codegen/package-lock.json
@@ -6,9 +6,9 @@
     "": {
       "name": "copilot-sdk-java-codegen",
       "dependencies": {
-        "@github/copilot": "^1.0.78",
+        "@github/copilot": "^1.0.81-11",
         "json-schema": "^0.4.0",
-        "tsx": "^4.23.1"
+        "tsx": "^4.23.12"
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
@@ -428,9 +428,9 @@
       }
     },
     "node_modules/@github/copilot": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.78.tgz",
-      "integrity": "sha512-jn+8HLZC3R7d6K1/1g9L1iWNKzBVS3JdVcx40r3aWyS5r+MLV1OPNp0fo5OfRMCDIm3NmEaaoqypi9sQkCXuiQ==",
+      "version": "1.0.81-11",
+      "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.81-11.tgz",
+      "integrity": "sha512-F7hZ6G6fhWH4uq862mbs2JE3nL0KIVBOc94/EFOdEjux3oHUQst9a06gKibEJS6VRULaYTXzatA1EAgNC9dzFA==",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "detect-libc": "^2.1.2"
@@ -439,20 +439,20 @@
         "copilot": "npm-loader.js"
       },
       "optionalDependencies": {
-        "@github/copilot-darwin-arm64": "1.0.78",
-        "@github/copilot-darwin-x64": "1.0.78",
-        "@github/copilot-linux-arm64": "1.0.78",
-        "@github/copilot-linux-x64": "1.0.78",
-        "@github/copilot-linuxmusl-arm64": "1.0.78",
-        "@github/copilot-linuxmusl-x64": "1.0.78",
-        "@github/copilot-win32-arm64": "1.0.78",
-        "@github/copilot-win32-x64": "1.0.78"
+        "@github/copilot-darwin-arm64": "1.0.81-11",
+        "@github/copilot-darwin-x64": "1.0.81-11",
+        "@github/copilot-linux-arm64": "1.0.81-11",
+        "@github/copilot-linux-x64": "1.0.81-11",
+        "@github/copilot-linuxmusl-arm64": "1.0.81-11",
+        "@github/copilot-linuxmusl-x64": "1.0.81-11",
+        "@github/copilot-win32-arm64": "1.0.81-11",
+        "@github/copilot-win32-x64": "1.0.81-11"
       }
     },
     "node_modules/@github/copilot-darwin-arm64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.78.tgz",
-      "integrity": "sha512-P11+VyWg8ad0WlywGtO2d7AxqTLJv4hkUicFg6Ycth5lfk00aCu/74YOOZSPO6C2bBBJhAza7oAdmauM6KEojw==",
+      "version": "1.0.81-11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.81-11.tgz",
+      "integrity": "sha512-3eLs71CLnJH9RNnESnv4esipZPeGXMlBxQeKXwZY+crwcW2RAR8YuovQyfoZ/5by1PLPbYrOjXNfQL6kXSisrA==",
       "cpu": [
         "arm64"
       ],
@@ -466,9 +466,9 @@
       }
     },
     "node_modules/@github/copilot-darwin-x64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.78.tgz",
-      "integrity": "sha512-stimP3WDFs2GU8nJzTJbtRpZViV4bsf80yg7QrFq+G4RISQ3Nihg/3/H0U6UQF1+txMJ/Ohmb5RFYxSw1Hj2sw==",
+      "version": "1.0.81-11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.81-11.tgz",
+      "integrity": "sha512-GdFLiUC8UL9k6K+woG8AyL3zBafd0Br1TIPDV5iiZsyBtTe4g67FjL7DGCYDt6AN9G43jWdK0M0InoNDVq1K1A==",
       "cpu": [
         "x64"
       ],
@@ -482,9 +482,9 @@
       }
     },
     "node_modules/@github/copilot-linux-arm64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.78.tgz",
-      "integrity": "sha512-K31PRKGTm252V1Lof7ypjg283R2QSm3BgoCvZfX2taos4wqC3SaTozSQKwW3dgrAx7A3G3SGEoilVCNqfigdZA==",
+      "version": "1.0.81-11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.81-11.tgz",
+      "integrity": "sha512-C4hcAow5CdaVJITbdtGqFgxWpW7TqwyCPNn8OtcbvdWeiKcfOBDrgkvbsezG98/5Ovs3HWxZRT4oZqCEmGF9Ww==",
       "cpu": [
         "arm64"
       ],
@@ -498,9 +498,9 @@
       }
     },
     "node_modules/@github/copilot-linux-x64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.78.tgz",
-      "integrity": "sha512-QK3oMtAn9dIv+1u1kx0xNpZNtZxdI+uZVIyLl7myp+Oh2Uj8BLagVv6a7uP0cDphO3TgfIdlvpepCe5MIcx0fw==",
+      "version": "1.0.81-11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.81-11.tgz",
+      "integrity": "sha512-izu0PwWx+wL4zxacO6cd6r0zMMMQ3pTz+2euWcAd7HCJ/CIR6+YYfjU3TI3TPBZ9zDLZGoxHKYYPfJ1ZbSTzEg==",
       "cpu": [
         "x64"
       ],
@@ -514,9 +514,9 @@
       }
     },
     "node_modules/@github/copilot-linuxmusl-arm64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.78.tgz",
-      "integrity": "sha512-F/0cTMsz6ug4yiXn3RKaCAMsLR261U5Njb6G9Y/HeAI7ES/tKEo2t5SHuvgXaIH4mYiZsRvfDKdX7c0WgBX/Jg==",
+      "version": "1.0.81-11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.81-11.tgz",
+      "integrity": "sha512-uWGUjaxOSMu6dKFWcTvXGUUp76vC3OV7nlSupecRkQ7gA3OxdrrB8rXE5/leC606Hk6oe9Wl7wKCH9EwuZ6afg==",
       "cpu": [
         "arm64"
       ],
@@ -530,9 +530,9 @@
       }
     },
     "node_modules/@github/copilot-linuxmusl-x64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.78.tgz",
-      "integrity": "sha512-YMaJaeBGbArGAFYel+yFaFW/0rFgh0Oqki2f2mUtlonTX/xHr8EB4+mTnMJkHYMFy4gOTC3OtSEEe1NaW/cBXQ==",
+      "version": "1.0.81-11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.81-11.tgz",
+      "integrity": "sha512-BpWKd/iu1tTyuPR2zuPFs1pVOlley4yt/TXkn6/gVwt52VI0rUxEO+n77RVjDcyMxWaUApbad2VNRPIH77guCA==",
       "cpu": [
         "x64"
       ],
@@ -546,9 +546,9 @@
       }
     },
     "node_modules/@github/copilot-win32-arm64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.78.tgz",
-      "integrity": "sha512-ktDkFXaaecEKD3hpM6ydM9lKOdoCfsQsXCmzLzE7DCmSpbbMCdfPfWfZ7MOclmKmpZ5/MNfr4U2l8CUqGerzYA==",
+      "version": "1.0.81-11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.81-11.tgz",
+      "integrity": "sha512-GOK3cACgD96m065uJxbgcXL7MQ1qm+wq1qtvGBpprY0r9wTYJG/rVCtayjYB6B57rnaBwPll3+PQ2J1qgfO57A==",
       "cpu": [
         "arm64"
       ],
@@ -562,9 +562,9 @@
       }
     },
     "node_modules/@github/copilot-win32-x64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.78.tgz",
-      "integrity": "sha512-Gd8l2T4eqYEWlOEPd0SZznQ+YYgYrwOkE0QXodMkhCBbPdgu/uTzb7mnISWwnVAgqs7pONdF1GOpHkTo+ay8CQ==",
+      "version": "1.0.81-11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.81-11.tgz",
+      "integrity": "sha512-u4K6UU2iGQJqQwsdHNilJBwiaC48PfMsWVFnTSlJD5lCYp9zCk1odrvrcmB3ARYinE/IcXLUosiHaM/ChR/pdA==",
       "cpu": [
         "x64"
       ],
@@ -648,9 +648,9 @@
       "license": "(AFL-2.1 OR BSD-3-Clause)"
     },
     "node_modules/tsx": {
-      "version": "4.23.1",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.23.1.tgz",
-      "integrity": "sha512-GQHnkIfxyx1wYCOS/wonik5MVRZU9hi1TEZmzGZSCJB1y9YgoZ8H6itNE/u4suE+yLmOzuE4E5S4TZ/ZX2wcWQ==",
+      "version": "4.23.12",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.23.12.tgz",
+      "integrity": "sha512-FDf4L4sYzKtzWYhU/Xm0AQFdTjdIxNo9ElTf2mxXM6k8YMHXzYUe4yODVaXP4V9uMFbVg8c0qyBccK2OOxb45Q==",
       "license": "MIT",
       "dependencies": {
         "esbuild": "~0.28.0"
diff --git a/java/scripts/codegen/package.json b/java/scripts/codegen/package.json
index 7547468e84..d5669c39f0 100644
--- a/java/scripts/codegen/package.json
+++ b/java/scripts/codegen/package.json
@@ -7,8 +7,8 @@
     "generate:java": "tsx java.ts"
   },
   "dependencies": {
-    "@github/copilot": "^1.0.78",
+    "@github/copilot": "^1.0.81-11",
     "json-schema": "^0.4.0",
-    "tsx": "^4.23.1"
+    "tsx": "^4.23.12"
   }
 }
diff --git a/java/scripts/test-update-documentation-versions.sh b/java/scripts/test-update-documentation-versions.sh
index 213bda6c43..606e2f7f80 100755
--- a/java/scripts/test-update-documentation-versions.sh
+++ b/java/scripts/test-update-documentation-versions.sh
@@ -28,6 +28,10 @@ run_case() {
         "    <version>${old_dev_version}</version>" \
         '</dependency>' \
         "implementation 'com.github:copilot-sdk-java:${old_dev_version}'" \
+        '<dependency>' \
+        '    <artifactId>jna</artifactId>' \
+        '    <version>5.19.1</version>' \
+        '</dependency>' \
         > "${case_dir}/README.md"
     printf '%s\n' \
         "///usr/bin/env jbang \"\$0\" \"\$@\" ; exit \$?" \
@@ -40,6 +44,7 @@ run_case() {
     grep -Fqx "implementation 'com.github:copilot-sdk-java:${version}'" "${case_dir}/README.md"
     grep -Fqx "    <version>${dev_version}</version>" "${case_dir}/README.md"
     grep -Fqx "implementation 'com.github:copilot-sdk-java:${dev_version}'" "${case_dir}/README.md"
+    grep -Fqx '    <version>5.19.1</version>' "${case_dir}/README.md"
     grep -Fqx "//DEPS com.github:copilot-sdk-java:${version}" "${case_dir}/jbang-example.java"
 
     if grep -Fq "$old_version" "${case_dir}/README.md" "${case_dir}/jbang-example.java" ||
diff --git a/java/scripts/update-documentation-versions.sh b/java/scripts/update-documentation-versions.sh
index d2d23c4ff2..5280f55d55 100755
--- a/java/scripts/update-documentation-versions.sh
+++ b/java/scripts/update-documentation-versions.sh
@@ -39,9 +39,10 @@ close $input or die "Cannot close $path: $!\n";
 
 # Match accepted release versions plus numeric suffixes left by the former broken updater.
 my $version = qr/[0-9]+\.[0-9]+\.[0-9]+(?:-(?:preview|(?:beta-)?java(?:-preview)?)\.[0-9]+)?(?:-[0-9]+)*/;
-my $snapshot_xml = ($content =~ s{<version>$version-SNAPSHOT</version>}{<version>$ENV{DEV_VERSION}</version>}g);
+my $sdk_dependency_version = qr{(<artifactId>copilot-sdk-java</artifactId>(?:(?!</dependency>).)*?<version>)}s;
+my $snapshot_xml = ($content =~ s{$sdk_dependency_version$version-SNAPSHOT</version>}{$1$ENV{DEV_VERSION}</version>}g);
 my $snapshot_gradle = ($content =~ s{(copilot-sdk-java:)$version-SNAPSHOT(?![-A-Za-z0-9.])}{$1 . $ENV{DEV_VERSION}}ge);
-my $release_xml = ($content =~ s{<version>$version</version>}{<version>$ENV{VERSION}</version>}g);
+my $release_xml = ($content =~ s{$sdk_dependency_version$version</version>}{$1$ENV{VERSION}</version>}g);
 my $release_gradle = ($content =~ s{(copilot-sdk-java:)$version(?![-A-Za-z0-9.])}{$1 . $ENV{VERSION}}ge);
 
 die "Expected one release and one snapshot example for both Maven and Gradle in $path\n"
diff --git a/java/config/checkstyle/checkstyle.xml b/java/sdk/config/checkstyle/checkstyle.xml
similarity index 100%
rename from java/config/checkstyle/checkstyle.xml
rename to java/sdk/config/checkstyle/checkstyle.xml
diff --git a/java/config/spotbugs/spotbugs-exclude.xml b/java/sdk/config/spotbugs/spotbugs-exclude.xml
similarity index 100%
rename from java/config/spotbugs/spotbugs-exclude.xml
rename to java/sdk/config/spotbugs/spotbugs-exclude.xml
diff --git a/java/jbang-example.java b/java/sdk/jbang-example.java
similarity index 96%
rename from java/jbang-example.java
rename to java/sdk/jbang-example.java
index 9abc39eddd..cf091d3c12 100644
--- a/java/jbang-example.java
+++ b/java/sdk/jbang-example.java
@@ -1,5 +1,5 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
-//DEPS com.github:copilot-sdk-java:1.0.9-preview.3
+//DEPS com.github:copilot-sdk-java:1.0.13-preview.1
 import com.github.copilot.CopilotClient;
 import com.github.copilot.generated.AssistantMessageEvent;
 import com.github.copilot.generated.SessionUsageInfoEvent;
diff --git a/java/sdk/pom.xml b/java/sdk/pom.xml
new file mode 100644
index 0000000000..6bad3d2f6e
--- /dev/null
+++ b/java/sdk/pom.xml
@@ -0,0 +1,869 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) Microsoft Corporation. All rights reserved.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.github</groupId>
+        <artifactId>copilot-sdk-java-parent</artifactId>
+        <version>1.0.14-preview.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>com.github</groupId>
+    <artifactId>copilot-sdk-java</artifactId>
+    <packaging>jar</packaging>
+
+    <name>GitHub Copilot SDK :: Java</name>
+    <description>Official SDK for programmatic control of GitHub Copilot CLI</description>
+    <url>https://github.com/github/copilot-sdk</url>
+
+    <scm>
+        <connection>scm:git:https://github.com/github/copilot-sdk.git</connection>
+        <developerConnection>scm:git:https://github.com/github/copilot-sdk.git</developerConnection>
+        <url>https://github.com/github/copilot-sdk</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>central</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <properties>
+        <!--
+            Root of the monorepo. The sdk module lives at java/sdk/, so two
+            levels up reaches the monorepo root.
+        -->
+        <copilot.sdk.root>${project.basedir}/../..</copilot.sdk.root>
+        <copilot.tests.dir>${copilot.sdk.root}/test</copilot.tests.dir>
+        <!--
+            Path to the Copilot CLI entry point used by the SDK tests. Defaults
+            to the CLI installed under the monorepo's nodejs/ directory.
+            Surefire injects this into the test JVM as the COPILOT_CLI_PATH
+            environment variable, so `mvn verify` is self-contained and the
+            developer never has to set it manually. Override on the command
+            line to point at a different CLI build, e.g.:
+              mvn verify -Dcopilot.cli.path=/some/other/copilot/npm-loader.js
+        -->
+        <copilot.cli.path>${copilot.sdk.root}/nodejs/node_modules/@github/copilot/npm-loader.js</copilot.cli.path>
+        <!-- Set to true (via -Pskip-test-harness) to skip npm install of test harness -->
+        <skip.test.harness>false</skip.test.harness>
+        <!--
+            Whether to skip the install-nodejs-cli-dependencies execution
+            (npm ci of the @github/copilot CLI). Defaults to ${skip.test.harness}
+            so it tracks the rest of the test-harness setup, but is also
+            forced to true when Maven tests are skipped (-DskipTests or
+            -Dmaven.test.skip) via the skip-cli-install-when-tests-skipped
+            and skip-cli-install-when-maven-test-skip profiles below, so that
+            non-test builds (e.g. package/deploy with tests skipped) do not
+            require npm or network access.
+        -->
+        <skip.cli.install>${skip.test.harness}</skip.cli.install>
+        <!-- Override with -Dnpm.loglevel=verbose when troubleshooting npm. -->
+        <npm.loglevel>notice</npm.loglevel>
+        <!-- Extra JVM args for Surefire; overridden by the jdk21+ profile -->
+        <surefire.jvm.args />
+        <!-- Override parent: the sdk module IS published to Maven Central. -->
+        <maven.deploy.skip>false</maven.deploy.skip>
+        <!-- JNA version — pin deliberately; a JNA upgrade must rerun the callback spike. -->
+        <jna.version>5.19.1</jna.version>
+    </properties>
+
+    <dependencies>
+        <!-- JSON-RPC -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.22.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.22</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.22.1</version>
+        </dependency>
+
+        <!-- SpotBugs annotations for suppressing warnings -->
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <version>4.10.3</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--
+            JNA — required only when using InProcess transport. Optional so that
+            subprocess-only consumers do not receive JNA transitively.
+            Pin the version; a JNA upgrade must rerun the callback spike.
+        -->
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>${jna.version}</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.14.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.23.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-maven-plugin</artifactId>
+                    <configuration>
+                        <excludeFilterFile>config/spotbugs/spotbugs-exclude.xml</excludeFilterFile>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-Acopilot.experimental.allowed=true</arg>
+                    </compilerArgs>
+                    <proc>none</proc>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>print-test-jdk-banner</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <echo level="warning" message="⚠⚠⚠ Using Java ${java.version} (${java.vendor}) to run tests." />
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Install harness dependencies -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install-harness-dependencies</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${skip.test.harness}</skip>
+                            <executable>npm</executable>
+                            <workingDirectory>${copilot.sdk.root}/test/harness</workingDirectory>
+                            <arguments>
+                                <argument>ci</argument>
+                                <argument>--loglevel</argument>
+                                <argument>${npm.loglevel}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <!--
+                        Install the @github/copilot CLI declared by the
+                        monorepo's nodejs/package.json. This is the CLI version
+                        the SDK tests must run against. Uses npm ci with the
+                        ignore-scripts flag, matching build-test.yml.
+                    -->
+                    <execution>
+                        <id>install-nodejs-cli-dependencies</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${skip.cli.install}</skip>
+                            <executable>npm</executable>
+                            <workingDirectory>${copilot.sdk.root}/nodejs</workingDirectory>
+                            <arguments>
+                                <argument>ci</argument>
+                                <argument>--ignore-scripts</argument>
+                                <argument>--loglevel</argument>
+                                <argument>${npm.loglevel}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--
+                Failsafe runs integration tests against the actually packaged
+                JAR (after the package phase). Used to validate multi-release
+                JAR behaviour end-to-end without reflecting on private fields
+                or hand-rolling a synthetic JAR. See
+                src/test/java/com/github/copilot/InternalExecutorProviderIT.java.
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
+                    <systemPropertyVariables>
+                        <project.build.directory>${project.build.directory}</project.build.directory>
+                        <project.build.finalName>${project.build.finalName}</project.build.finalName>
+                        <project.build.testOutputDirectory>${project.build.testOutputDirectory}</project.build.testOutputDirectory>
+                    </systemPropertyVariables>
+                    <!--
+                        Keep the integration-test JVM aligned with Surefire so
+                        tests like SlashCommandsIT resolve the pinned CLI from
+                        the monorepo nodejs install at
+                        ${copilot.sdk.root}/nodejs.
+                    -->
+                    <environmentVariables>
+                        <COPILOT_CLI_PATH>${copilot.cli.path}</COPILOT_CLI_PATH>
+                    </environmentVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <runOrder>alphabetical</runOrder>
+                    <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
+                    <!-- Inject JaCoCo agent + any JDK-version-specific flags -->
+                    <argLine>${testExecutionAgentArgs} ${surefire.jvm.args} --add-opens com.github.copilot.java/com.github.copilot.e2e=ALL-UNNAMED</argLine>
+                    <!--
+                        Automatically retry tests that fail on the first attempt.
+                        This handles intermittent failures in E2E tests (e.g.,
+                        CompactionTest) where snapshot matching can be sensitive
+                        to non-deterministic compaction behaviour.
+                        Revisit this once this issue is successfully resolved.
+                        https://github.com/github/copilot-sdk/issues/1227
+                    -->
+                    <rerunFailingTestsCount>2</rerunFailingTestsCount>
+                    <systemPropertyVariables>
+                        <copilot.tests.dir>${copilot.tests.dir}</copilot.tests.dir>
+                        <copilot.sdk.dir>${copilot.sdk.root}</copilot.sdk.dir>
+                    </systemPropertyVariables>
+                    <!--
+                        Set COPILOT_CLI_PATH for the forked test JVM so the SDK
+                        tests transparently use the pinned CLI under
+                        ${copilot.sdk.root}/nodejs/. See the copilot.cli.path
+                        property above for the override mechanism and override
+                        support.
+                    -->
+                    <environmentVariables>
+                        <COPILOT_CLI_PATH>${copilot.cli.path}</COPILOT_CLI_PATH>
+                    </environmentVariables>
+                </configuration>
+                <executions>
+                    <!--
+                        Run multi-client session resume tests in isolation BEFORE the
+                        main suite. These tests pass reliably alone but can time out
+                        when run after other E2E tests due to harness state leakage.
+                    -->
+                    <execution>
+                        <id>isolated-resume-tests</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <groups>isolated-resume</groups>
+                            <!-- Use a separate report directory so these results
+                                 don't overwrite the default-test XML reports for
+                                 the same test classes (CopilotSessionTest,
+                                 StreamingFidelityTest). -->
+                            <reportsDirectory>${project.build.directory}/surefire-reports-isolated</reportsDirectory>
+                        </configuration>
+                    </execution>
+                    <!-- Exclude the isolated resume tests from the main run -->
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <excludedGroups>isolated-resume</excludedGroups>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Add src/generated/java as an additional source root -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-generated-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.basedir}/src/generated/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <configuration>
+                    <java>
+                        <excludes>
+                            <exclude>src/generated/java/**/*.java</exclude>
+                        </excludes>
+                        <eclipse>
+                            <version>4.33</version>
+                        </eclipse>
+                        <removeUnusedImports />
+                        <trimTrailingWhitespace />
+                        <endWithNewline />
+                        <indent>
+                            <spaces>true</spaces>
+                            <spacesPerTab>4</spacesPerTab>
+                        </indent>
+                    </java>
+                </configuration>
+            </plugin>
+            <!-- Coverage tracking for CopilotClient/CopilotSession interactions with CLI -->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <!-- Instrument bytecode before E2ETestContext runs tests with CapiProxy -->
+                    <execution>
+                        <id>wire-up-coverage-instrumentation</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Store exec file alongside other build artifacts -->
+                            <destFile>${project.build.directory}/jacoco-test-results/sdk-tests.exec</destFile>
+                            <!-- Pass agent args via this property to surefire -->
+                            <propertyName>testExecutionAgentArgs</propertyName>
+                            <!-- Focus on SDK package, exclude test harness utilities -->
+                            <includes>
+                                <include>com/github/copilot/**</include>
+                            </includes>
+                            <excludes>
+                                <exclude>com/github/copilot/E2ETestContext*</exclude>
+                                <exclude>com/github/copilot/CapiProxy*</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <!-- Generate HTML/XML reports after tests complete -->
+                    <execution>
+                        <id>build-coverage-report-from-tests</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <phase>verify</phase>
+                        <configuration>
+                            <dataFile>${project.build.directory}/jacoco-test-results/sdk-tests.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-coverage</outputDirectory>
+                            <excludes>
+                                <!-- Exclude multi-release classes to avoid duplicate class analysis. -->
+                                <exclude>META-INF/versions/**/*.class</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>config/checkstyle/checkstyle.xml</configLocation>
+                    <consoleOutput>true</consoleOutput>
+                    <failsOnError>true</failsOnError>
+                    <includeTestSourceDirectory>false</includeTestSourceDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>10.26.1</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
+            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-jdk25</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>[25,)</version>
+                                    <message>JDK 25+ is required to build the Multi-Release JAR with the virtual-thread overlay.</message>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>verify-multi-release-overlay</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireFilesExist>
+                                    <files>
+                                        <file>${project.build.outputDirectory}/META-INF/versions/25/com/github/copilot/InternalExecutorProvider.class</file>
+                                    </files>
+                                    <message>Multi-Release JAR overlay missing: META-INF/versions/25/com/github/copilot/InternalExecutorProvider.class was not compiled. Ensure the build runs on JDK 25+.</message>
+                                </requireFilesExist>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <!-- Enable dynamic agent loading on JDK 21+ so Mockito/ByteBuddy
+             can attach at runtime (JEP 451). The flag does not exist on
+             earlier JDKs, so it must be conditional. -->
+        <profile>
+            <id>jdk21+</id>
+            <activation>
+                <jdk>[21,)</jdk>
+            </activation>
+            <properties>
+                <surefire.jvm.args>-XX:+EnableDynamicAgentLoading</surefire.jvm.args>
+            </properties>
+        </profile>
+        <profile>
+            <id>java25-multi-release</id>
+            <activation>
+                <jdk>[25,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>compile-java25</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>compile</goal>
+                                </goals>
+                                <configuration>
+                                    <release>25</release>
+                                    <useIncrementalCompilation>false</useIncrementalCompilation>
+                                    <compileSourceRoots>
+                                        <compileSourceRoot>${project.basedir}/src/main/java25</compileSourceRoot>
+                                    </compileSourceRoots>
+                                    <multiReleaseOutput>true</multiReleaseOutput>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            <archive>
+                                <manifestEntries>
+                                    <Multi-Release>true</Multi-Release>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                    <!--
+                        Structural guard: when this profile is active (JDK 25+
+                        builds), assert that the packaged JAR contains the
+                        JDK 25 multi-release overlay class. Catches accidental
+                        profile-disable / classifier / shading regressions
+                        before the failsafe IT runs.
+                    -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>verify-java25-overlay</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <condition property="java25.overlay.present">
+                                            <resourceexists>
+                                                <zipentry zipfile="${project.build.directory}/${project.build.finalName}.jar" name="META-INF/versions/25/com/github/copilot/InternalExecutorProvider.class" />
+                                            </resourceexists>
+                                        </condition>
+                                        <fail unless="java25.overlay.present">
+JDK 25 multi-release overlay class is missing from the packaged JAR.
+Expected entry: META-INF/versions/25/com/github/copilot/InternalExecutorProvider.class
+JAR: ${project.build.directory}/${project.build.finalName}.jar
+
+This usually means the 'java25-multi-release' Maven profile did not activate
+(e.g. the build is running on a JDK older than 25) or maven-compiler-plugin
+did not produce the multi-release output. Re-build on JDK 25+ and verify the
+'compile-java25' execution ran during the 'compile' phase.
+                                        </fail>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!-- Skip npm install of the copilot-sdk test harness -->
+        <profile>
+            <id>skip-test-harness</id>
+            <properties>
+                <skip.test.harness>true</skip.test.harness>
+            </properties>
+        </profile>
+        <!--
+            Runs the E2E suite over the in-process (FFI) transport instead of
+            the default child-process transport. COPILOT_SDK_DEFAULT_CONNECTION
+            makes CopilotClient host the runtime in-process (see
+            CopilotClient.resolveDefaultConnection). forkCount=1 and
+            parallel=none are required because InProcessEnvGuard and the FFI
+            host mutate process-global state (the native process environment
+            block and JNA callback registration).
+        -->
+        <profile>
+            <id>inprocess</id>
+            <properties>
+                <COPILOT_SDK_DEFAULT_CONNECTION>inprocess</COPILOT_SDK_DEFAULT_CONNECTION>
+                <copilot.native.classifier>linux-x64</copilot.native.classifier>
+                <!-- Force classpath resolution of runtime.node and the embedded CLI. -->
+                <copilot.inprocess.cli.path />
+            </properties>
+            <dependencies>
+                <!--
+                    Classpath resource native/<classifier>/runtime.node, resolved by
+                    NativeRuntimeLoader when no runtime.node is found next to
+                    COPILOT_CLI_PATH. Test-scoped: production consumers add the
+                    classifier they need themselves.
+                -->
+                <dependency>
+                    <groupId>com.github</groupId>
+                    <artifactId>copilot-sdk-java-runtime</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>${copilot.native.classifier}</classifier>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>false</skipTests>
+                            <forkCount>1</forkCount>
+                            <parallel>none</parallel>
+                            <!--
+                                TODO(cli-1.0.81-2): CLI 1.0.81-5 still stops
+                                completing model-driven turns when hosted in-process
+                                against CAPI. The shared runtime then poisons every
+                                later model-driven test. These classes still run over
+                                stdio; pure-RPC in-process coverage remains enabled.
+                            -->
+                            <excludes>
+                                <exclude>**/AskUserTest.java</exclude>
+                                <exclude>**/CompactionTest.java</exclude>
+                                <exclude>**/CopilotSessionTest.java</exclude>
+                                <exclude>**/ErrorHandlingTest.java</exclude>
+                                <exclude>**/EventFidelityTest.java</exclude>
+                                <exclude>**/ExecutorWiringTest.java</exclude>
+                                <exclude>**/HooksTest.java</exclude>
+                                <exclude>**/McpAndAgentsTest.java</exclude>
+                                <exclude>**/McpOAuthResumeE2ETest.java</exclude>
+                                <exclude>**/PermissionsTest.java</exclude>
+                                <exclude>**/PreMcpToolCallHookTest.java</exclude>
+                                <exclude>**/RpcServerE2ETest.java</exclude>
+                                <exclude>**/RpcSessionStateExtrasE2ETest.java</exclude>
+                                <exclude>**/SessionConfigE2ETest.java</exclude>
+                                <exclude>**/SessionEventsE2ETest.java</exclude>
+                                <exclude>**/SessionTodosChangedTest.java</exclude>
+                                <exclude>**/SkillsTest.java</exclude>
+                                <exclude>**/StreamingFidelityTest.java</exclude>
+                                <exclude>**/SubagentHooksE2ETest.java</exclude>
+                                <exclude>**/ToolResultsTest.java</exclude>
+                                <exclude>**/ToolsTest.java</exclude>
+                            </excludes>
+                            <environmentVariables>
+                                <COPILOT_CLI_PATH>${copilot.inprocess.cli.path}</COPILOT_CLI_PATH>
+                                <COPILOT_SDK_DEFAULT_CONNECTION>inprocess</COPILOT_SDK_DEFAULT_CONNECTION>
+                            </environmentVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <forkCount>1</forkCount>
+                            <parallel>none</parallel>
+                            <!--
+                                TODO(cli-1.0.81-2): same in-process CAPI turn hang as
+                                the Surefire exclusions above.
+                            -->
+                            <excludes>
+                                <exclude>**/ErgonomicToolDefinitionIT.java</exclude>
+                                <exclude>**/GitHubTelemetryForwardingIT.java</exclude>
+                                <exclude>**/LowLevelToolDefinitionIT.java</exclude>
+                                <exclude>**/RewindIT.java</exclude>
+                                <exclude>**/SystemMessageSectionsIT.java</exclude>
+                            </excludes>
+                            <environmentVariables>
+                                <COPILOT_CLI_PATH>${copilot.inprocess.cli.path}</COPILOT_CLI_PATH>
+                                <COPILOT_SDK_DEFAULT_CONNECTION>inprocess</COPILOT_SDK_DEFAULT_CONNECTION>
+                            </environmentVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>native-linux-arm64</id>
+            <activation>
+                <os>
+                    <name>Linux</name>
+                    <arch>aarch64</arch>
+                </os>
+            </activation>
+            <properties>
+                <copilot.native.classifier>linux-arm64</copilot.native.classifier>
+            </properties>
+        </profile>
+        <profile>
+            <id>native-win32-x64</id>
+            <activation>
+                <os>
+                    <family>Windows</family>
+                    <arch>amd64</arch>
+                </os>
+            </activation>
+            <properties>
+                <copilot.native.classifier>win32-x64</copilot.native.classifier>
+            </properties>
+        </profile>
+        <profile>
+            <id>native-darwin-arm64</id>
+            <activation>
+                <os>
+                    <family>mac</family>
+                    <arch>aarch64</arch>
+                </os>
+            </activation>
+            <properties>
+                <copilot.native.classifier>darwin-arm64</copilot.native.classifier>
+            </properties>
+        </profile>
+        <!--
+            Skip the install-nodejs-cli-dependencies (npm ci) execution when
+            tests are skipped via -DskipTests, so non-test builds do not
+            require npm or network access. Activates automatically; no manual
+            -P needed.
+        -->
+        <profile>
+            <id>skip-cli-install-when-tests-skipped</id>
+            <activation>
+                <property>
+                    <name>skipTests</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <skip.cli.install>true</skip.cli.install>
+            </properties>
+        </profile>
+        <!--
+            Same as above, but for -Dmaven.test.skip=true.
+        -->
+        <profile>
+            <id>skip-cli-install-when-maven-test-skip</id>
+            <activation>
+                <property>
+                    <name>maven.test.skip</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <skip.cli.install>true</skip.cli.install>
+            </properties>
+        </profile>
+        <!-- Debug profile for FINE logging during tests -->
+        <profile>
+            <id>debug</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <java.util.logging.config.file>${project.basedir}/src/test/resources/logging-debug.properties</java.util.logging.config.file>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!-- Update the @github/copilot npm schema package to a new version.
+             Usage: mvn generate-sources -Pupdate-schemas-from-npm-artifact -Dcopilot.schema.version=1.0.25 -->
+        <profile>
+            <id>update-schemas-from-npm-artifact</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>update-copilot-schema-version</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>npm</executable>
+                                    <workingDirectory>${project.parent.basedir}/scripts/codegen</workingDirectory>
+                                    <arguments>
+                                        <argument>install</argument>
+                                        <argument>@github/copilot@${copilot.schema.version}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>require-schema-version</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <requireProperty>
+                                            <property>copilot.schema.version</property>
+                                            <message>You must specify -Dcopilot.schema.version=VERSION (e.g. 1.0.25)</message>
+                                        </requireProperty>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!-- Run the TypeScript code generator to regenerate Java sources from the current schema.
+             Usage: mvn generate-sources -Pcodegen -->
+        <profile>
+            <id>codegen</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>codegen-npm-install</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>npm</executable>
+                                    <workingDirectory>${project.parent.basedir}/scripts/codegen</workingDirectory>
+                                    <arguments>
+                                        <argument>ci</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>codegen-generate</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>npm</executable>
+                                    <workingDirectory>${project.parent.basedir}/scripts/codegen</workingDirectory>
+                                    <arguments>
+                                        <argument>run</argument>
+                                        <argument>generate</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/java/src/generated/java/com/github/copilot/generated/AbortEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AbortEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AbortEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AbortEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AbortReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/AbortReason.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AbortReason.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AbortReason.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AgentInterruptedActivity.java b/java/sdk/src/generated/java/com/github/copilot/generated/AgentInterruptedActivity.java
new file mode 100644
index 0000000000..0cca731a6e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AgentInterruptedActivity.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * What the agent was doing when the user interrupted it.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum AgentInterruptedActivity {
+    /** The {@code model_call} variant. */
+    MODEL_CALL("model_call"),
+    /** The {@code retry_backoff} variant. */
+    RETRY_BACKOFF("retry_backoff"),
+    /** The {@code tool_call} variant. */
+    TOOL_CALL("tool_call"),
+    /** The {@code background_agent} variant. */
+    BACKGROUND_AGENT("background_agent");
+
+    private final String value;
+    AgentInterruptedActivity(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static AgentInterruptedActivity fromValue(String value) {
+        for (AgentInterruptedActivity v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown AgentInterruptedActivity value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AgentInterruptedCancelPhase.java b/java/sdk/src/generated/java/com/github/copilot/generated/AgentInterruptedCancelPhase.java
new file mode 100644
index 0000000000..41a8bd11b8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AgentInterruptedCancelPhase.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Where the interruption landed relative to the first streamed token.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum AgentInterruptedCancelPhase {
+    /** The {@code pre_first_token} variant. */
+    PRE_FIRST_TOKEN("pre_first_token"),
+    /** The {@code mid_stream} variant. */
+    MID_STREAM("mid_stream");
+
+    private final String value;
+    AgentInterruptedCancelPhase(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static AgentInterruptedCancelPhase fromValue(String value) {
+        for (AgentInterruptedCancelPhase v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown AgentInterruptedCancelPhase value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AgentInterruptedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AgentInterruptedEvent.java
new file mode 100644
index 0000000000..ef6772fca2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AgentInterruptedEvent.java
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Session event "agent.interrupted". Metadata for work the user interrupted while the agent was running
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class AgentInterruptedEvent extends SessionEvent {
+
+    @Override
+    public String getType() { return "agent.interrupted"; }
+
+    @JsonProperty("data")
+    private AgentInterruptedEventData data;
+
+    public AgentInterruptedEventData getData() { return data; }
+    public void setData(AgentInterruptedEventData data) { this.data = data; }
+
+    /** Data payload for {@link AgentInterruptedEvent}. */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record AgentInterruptedEventData(
+        /** What the agent was doing when the user interrupted it */
+        @JsonProperty("activity") AgentInterruptedActivity activity,
+        /** How long the interrupted work had been running, in milliseconds */
+        @JsonProperty("elapsedMs") Double elapsedMs,
+        /** Zero-based agentic-loop iteration the interrupt landed in */
+        @JsonProperty("turn") Long turn,
+        /** For an interrupted model call: the model the request targeted */
+        @JsonProperty("model") String model,
+        /** For an interrupted model call: the provider endpoint the request targeted */
+        @JsonProperty("apiEndpoint") String apiEndpoint,
+        /** For an interrupted model call: the transport the request used */
+        @JsonProperty("transport") ModelCallFailureTransport transport,
+        /** For an interrupted model call: the reasoning effort the request asked for */
+        @JsonProperty("reasoningEffort") String reasoningEffort,
+        /** For an interrupted model call: whether the user interrupted before any token arrived or while the response was streaming */
+        @JsonProperty("cancelPhase") AgentInterruptedCancelPhase cancelPhase,
+        /** For a mid-stream interrupt: the observed time to first observable output, in milliseconds. Deliberately distinct from the `ttftMs` reported on a successful model call, which measures time to first stream event. */
+        @JsonProperty("outputTtftMs") Double outputTtftMs,
+        /** Names of the tools that were still running. More than one when the model requested a parallel fan-out. */
+        @JsonProperty("toolNames") List<String> toolNames,
+        /** Tool call identifiers that were still running */
+        @JsonProperty("toolCallIds") List<String> toolCallIds,
+        /** Subset of `toolNames` whose tool metadata marks the tool name as safe to record unhashed in telemetry. */
+        @JsonProperty("safeToolNames") List<String> safeToolNames,
+        /** For an interrupted background-agent batch: how many background sub-agents the stop swept. Counts accepted cancellations, so an agent cancelled as a cascade of its interrupted parent is covered by that parent rather than counted again. */
+        @JsonProperty("interruptedAgentCount") Long interruptedAgentCount
+    ) {
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantIdleEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantIdleEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantIdleEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantIdleEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantIntentEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantIntentEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantIntentEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantIntentEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantMessageDeltaEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageDeltaEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantMessageDeltaEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageDeltaEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java
similarity index 91%
rename from java/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java
index fee236ed2c..41147f3c55 100644
--- a/java/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java
@@ -67,11 +67,14 @@ public record AssistantMessageEventData(
         @JsonProperty("clientRequestId") String clientRequestId,
         /** Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation */
         @JsonProperty("serviceRequestId") String serviceRequestId,
+        /** Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable. */
         @JsonProperty("rte") Boolean rte,
         /** Provider's completion / response identifier; shared across all chunks of a single API call. Used to group multi-chunk assistant utterances. */
         @JsonProperty("apiCallId") String apiCallId,
         /** Neutral provider-tagged server-side tool-use payload (tool search, advisor) for verbatim round-tripping */
         @JsonProperty("serverTools") AssistantMessageServerTools serverTools,
+        /** Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping. `reasoningText` and `reasoningOpaque` are a lossy derived view of these blocks, retained for display. */
+        @JsonProperty("reasoningBlocks") AssistantMessageReasoningBlocks reasoningBlocks,
         /** Identifier for the agent loop turn that produced this message, matching the corresponding assistant.turn_start event */
         @JsonProperty("turnId") String turnId,
         /** Tool call ID of the parent tool invocation when this event originates from a sub-agent */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageReasoningBlocks.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageReasoningBlocks.java
new file mode 100644
index 0000000000..d2ad87f7c4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageReasoningBlocks.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AssistantMessageReasoningBlocks(
+    /** Model provider that produced these reasoning blocks. */
+    @JsonProperty("provider") String provider,
+    /** Provider-native reasoning content blocks (e.g. Anthropic `thinking` / `redacted_thinking`) preserved verbatim, in order. A single response can carry several, each signed over the content preceding it, so dropping or reordering any of them invalidates the rest. */
+    @JsonProperty("blocks") List<Object> blocks
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantMessageServerTools.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageServerTools.java
similarity index 76%
rename from java/src/generated/java/com/github/copilot/generated/AssistantMessageServerTools.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageServerTools.java
index 72d6850376..6d67f6ecbe 100644
--- a/java/src/generated/java/com/github/copilot/generated/AssistantMessageServerTools.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageServerTools.java
@@ -23,10 +23,15 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record AssistantMessageServerTools(
+    /** Model provider that produced this server-tool payload. */
     @JsonProperty("provider") String provider,
+    /** Provider-native server-tool call and output items preserved verbatim for replay. */
     @JsonProperty("items") List<Object> items,
+    /** Provider function-call namespaces keyed by function-call identifier. */
     @JsonProperty("functionCallNamespaces") Map<String, String> functionCallNamespaces,
+    /** Raw provider content blocks retained for verbatim round-tripping. */
     @JsonProperty("rawContentBlocks") List<Object> rawContentBlocks,
+    /** Advisor model identifier associated with the server-tool payload. */
     @JsonProperty("advisorModel") String advisorModel
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantMessageStartEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageStartEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantMessageStartEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageStartEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantMessageToolRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageToolRequest.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantMessageToolRequest.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageToolRequest.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantMessageToolRequestType.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageToolRequestType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantMessageToolRequestType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageToolRequestType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantReasoningDeltaEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantReasoningDeltaEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantReasoningDeltaEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantReasoningDeltaEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantReasoningEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantReasoningEvent.java
similarity index 88%
rename from java/src/generated/java/com/github/copilot/generated/AssistantReasoningEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantReasoningEvent.java
index 52996aeeed..627dea8ef5 100644
--- a/java/src/generated/java/com/github/copilot/generated/AssistantReasoningEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantReasoningEvent.java
@@ -38,6 +38,7 @@ public record AssistantReasoningEventData(
         @JsonProperty("reasoningId") String reasoningId,
         /** The complete extended thinking text from the model */
         @JsonProperty("content") String content,
+        /** Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable. */
         @JsonProperty("rte") Boolean rte
     ) {
     }
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantServerToolProgressEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantServerToolProgressEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantServerToolProgressEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantServerToolProgressEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantStreamingDeltaEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantStreamingDeltaEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantStreamingDeltaEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantStreamingDeltaEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantToolCallDeltaEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantToolCallDeltaEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantToolCallDeltaEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantToolCallDeltaEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantTurnEndEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantTurnEndEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantTurnEndEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantTurnEndEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantTurnRetryEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantTurnRetryEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantTurnRetryEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantTurnRetryEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantTurnStartEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantTurnStartEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantTurnStartEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantTurnStartEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantUsageApiEndpoint.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageApiEndpoint.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantUsageApiEndpoint.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageApiEndpoint.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantUsageCopilotUsage.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageCopilotUsage.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantUsageCopilotUsage.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageCopilotUsage.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantUsageCopilotUsageTokenDetail.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageCopilotUsageTokenDetail.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantUsageCopilotUsageTokenDetail.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageCopilotUsageTokenDetail.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java
similarity index 75%
rename from java/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java
index 85bd81d3c9..ff4cfddec8 100644
--- a/java/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java
@@ -56,18 +56,35 @@ public record AssistantUsageEventData(
         @JsonProperty("duration") Long duration,
         /** Time to first token in milliseconds. Only available for streaming requests */
         @JsonProperty("timeToFirstTokenMs") Double timeToFirstTokenMs,
+        /** Time to first observable model output in milliseconds. Includes text, reasoning, and tool-call output; only available for streaming requests that produce observable output. */
+        @JsonProperty("outputTtftMs") Double outputTtftMs,
         /** Average inter-token latency in milliseconds. Only available for streaming requests */
         @JsonProperty("interTokenLatencyMs") Double interTokenLatencyMs,
         /** What initiated this API call (e.g., "sub-agent", "mcp-sampling"); absent for user-initiated calls */
         @JsonProperty("initiator") String initiator,
         /** Coarse classification of the interaction that produced this call, mirroring the session's per-request agent context (e.g. `conversation-agent`, `conversation-subagent`, `conversation-sampling`, `conversation-background`, `conversation-compaction`, `conversation-user`). Non-billing; lets consumers attribute a model call to a call class (e.g. sub-agent/sidekick) independently of the billing initiator. Absent when the runtime did not classify the request. */
         @JsonProperty("interactionType") String interactionType,
+        /** Whether this model call used a bring-your-own-key provider */
+        @JsonProperty("isByok") Boolean isByok,
+        /** Whether Auto mode was selected for this model call */
+        @JsonProperty("isAuto") Boolean isAuto,
+        /** Effective maximum prompt-token limit used for this model call */
+        @JsonProperty("maxPromptTokens") Long maxPromptTokens,
+        /** Requested maximum output tokens used for this model call */
+        @JsonProperty("maxOutputTokens") Long maxOutputTokens,
+        /** Number of accepted speculative prediction tokens */
+        @JsonProperty("acceptedPredictionTokens") Long acceptedPredictionTokens,
+        /** Number of rejected speculative prediction tokens */
+        @JsonProperty("rejectedPredictionTokens") Long rejectedPredictionTokens,
+        /** Transport used for this model call (http or websocket) */
+        @JsonProperty("transport") AssistantUsageTransport transport,
         /** Completion ID from the model provider (e.g., chatcmpl-abc123) */
         @JsonProperty("apiCallId") String apiCallId,
         /** GitHub request tracing ID (x-github-request-id header) for server-side log correlation */
         @JsonProperty("providerCallId") String providerCallId,
         /** Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation */
         @JsonProperty("serviceRequestId") String serviceRequestId,
+        /** Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable. */
         @JsonProperty("rte") Boolean rte,
         /** API endpoint used for this model call, matching CAPI supported_endpoints vocabulary */
         @JsonProperty("apiEndpoint") AssistantUsageApiEndpoint apiEndpoint,
@@ -79,10 +96,18 @@ public record AssistantUsageEventData(
         @JsonProperty("copilotUsage") AssistantUsageCopilotUsage copilotUsage,
         /** Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max") */
         @JsonProperty("reasoningEffort") String reasoningEffort,
+        /** Reasoning summary mode used for this model call, if applicable */
+        @JsonProperty("reasoningSummary") ReasoningSummary reasoningSummary,
         /** Number of tools available to the model for this call */
         @JsonProperty("availableToolCount") Long availableToolCount,
         /** Number of tokens used by tool definitions for this call */
         @JsonProperty("toolTokenCount") Long toolTokenCount,
+        /** How the prompt-cache frontier was determined for this call */
+        @JsonProperty("frontierSource") String frontierSource,
+        /** Effective prompt-cache lifetime in seconds for this call */
+        @JsonProperty("cacheTtlSeconds") Long cacheTtlSeconds,
+        /** Whether the provider reported prompt-cache usage details for this call */
+        @JsonProperty("cacheDetailsReported") Boolean cacheDetailsReported,
         /** Number of tool calls returned by the model */
         @JsonProperty("numToolCalls") Long numToolCalls,
         /** Tool-call counts keyed by tool name */
diff --git a/java/src/generated/java/com/github/copilot/generated/AssistantUsageQuotaSnapshot.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageQuotaSnapshot.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AssistantUsageQuotaSnapshot.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageQuotaSnapshot.java
diff --git a/java/src/generated/java/com/github/copilot/generated/PermissionAllowAllMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageTransport.java
similarity index 60%
rename from java/src/generated/java/com/github/copilot/generated/PermissionAllowAllMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageTransport.java
index d05b936e6a..9d69b50f0d 100644
--- a/java/src/generated/java/com/github/copilot/generated/PermissionAllowAllMode.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageTransport.java
@@ -10,28 +10,26 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Allow-all mode for the session.
+ * Transport used for a successful model call
  *
  * @since 1.0.0
  */
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
-public enum PermissionAllowAllMode {
-    /** The {@code off} variant. */
-    OFF("off"),
-    /** The {@code on} variant. */
-    ON("on"),
-    /** The {@code auto} variant. */
-    AUTO("auto");
+public enum AssistantUsageTransport {
+    /** The {@code http} variant. */
+    HTTP("http"),
+    /** The {@code websocket} variant. */
+    WEBSOCKET("websocket");
 
     private final String value;
-    PermissionAllowAllMode(String value) { this.value = value; }
+    AssistantUsageTransport(String value) { this.value = value; }
     @com.fasterxml.jackson.annotation.JsonValue
     public String getValue() { return value; }
     @com.fasterxml.jackson.annotation.JsonCreator
-    public static PermissionAllowAllMode fromValue(String value) {
-        for (PermissionAllowAllMode v : values()) {
+    public static AssistantUsageTransport fromValue(String value) {
+        for (AssistantUsageTransport v : values()) {
             if (v.value.equals(value)) return v;
         }
-        throw new IllegalArgumentException("Unknown PermissionAllowAllMode value: " + value);
+        throw new IllegalArgumentException("Unknown AssistantUsageTransport value: " + value);
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/AutoModeResolvedReasoningBucket.java b/java/sdk/src/generated/java/com/github/copilot/generated/AutoModeResolvedReasoningBucket.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AutoModeResolvedReasoningBucket.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AutoModeResolvedReasoningBucket.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AutoModeSwitchCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AutoModeSwitchCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AutoModeSwitchCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AutoModeSwitchCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AutoModeSwitchRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AutoModeSwitchRequestedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AutoModeSwitchRequestedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AutoModeSwitchRequestedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AutoModeSwitchResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/AutoModeSwitchResponse.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AutoModeSwitchResponse.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AutoModeSwitchResponse.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AutopilotObjectiveChangedOperation.java b/java/sdk/src/generated/java/com/github/copilot/generated/AutopilotObjectiveChangedOperation.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AutopilotObjectiveChangedOperation.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AutopilotObjectiveChangedOperation.java
diff --git a/java/src/generated/java/com/github/copilot/generated/AutopilotObjectiveChangedStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/AutopilotObjectiveChangedStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/AutopilotObjectiveChangedStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/AutopilotObjectiveChangedStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/BinaryAssetType.java b/java/sdk/src/generated/java/com/github/copilot/generated/BinaryAssetType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/BinaryAssetType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/BinaryAssetType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CanvasRegistryChangedCanvas.java b/java/sdk/src/generated/java/com/github/copilot/generated/CanvasRegistryChangedCanvas.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CanvasRegistryChangedCanvas.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CanvasRegistryChangedCanvas.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CanvasRegistryChangedCanvasAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/CanvasRegistryChangedCanvasAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CanvasRegistryChangedCanvasAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CanvasRegistryChangedCanvasAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CapabilitiesChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/CapabilitiesChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CapabilitiesChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CapabilitiesChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CapabilitiesChangedUI.java b/java/sdk/src/generated/java/com/github/copilot/generated/CapabilitiesChangedUI.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CapabilitiesChangedUI.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CapabilitiesChangedUI.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CitableSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/CitableSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CitableSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CitableSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CitationProvider.java b/java/sdk/src/generated/java/com/github/copilot/generated/CitationProvider.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CitationProvider.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CitationProvider.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CitationReference.java b/java/sdk/src/generated/java/com/github/copilot/generated/CitationReference.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CitationReference.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CitationReference.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CitationSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/CitationSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CitationSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CitationSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CitationSpan.java b/java/sdk/src/generated/java/com/github/copilot/generated/CitationSpan.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CitationSpan.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CitationSpan.java
diff --git a/java/src/generated/java/com/github/copilot/generated/Citations.java b/java/sdk/src/generated/java/com/github/copilot/generated/Citations.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/Citations.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/Citations.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CommandCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/CommandCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CommandCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CommandCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CommandExecuteEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/CommandExecuteEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CommandExecuteEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CommandExecuteEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CommandQueuedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/CommandQueuedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CommandQueuedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CommandQueuedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CommandsChangedCommand.java b/java/sdk/src/generated/java/com/github/copilot/generated/CommandsChangedCommand.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CommandsChangedCommand.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CommandsChangedCommand.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CommandsChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/CommandsChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CommandsChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CommandsChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsed.java b/java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsed.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsed.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsed.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsedCopilotUsage.java b/java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsedCopilotUsage.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsedCopilotUsage.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsedCopilotUsage.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail.java b/java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CompactionTrigger.java b/java/sdk/src/generated/java/com/github/copilot/generated/CompactionTrigger.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CompactionTrigger.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CompactionTrigger.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ContextTier.java b/java/sdk/src/generated/java/com/github/copilot/generated/ContextTier.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ContextTier.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ContextTier.java
diff --git a/java/src/generated/java/com/github/copilot/generated/CustomAgentsUpdatedAgent.java b/java/sdk/src/generated/java/com/github/copilot/generated/CustomAgentsUpdatedAgent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/CustomAgentsUpdatedAgent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/CustomAgentsUpdatedAgent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ElicitationCompletedAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/ElicitationCompletedAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ElicitationCompletedAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ElicitationCompletedAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ElicitationCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ElicitationCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ElicitationCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ElicitationCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ElicitationRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ElicitationRequestedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ElicitationRequestedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ElicitationRequestedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ElicitationRequestedMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/ElicitationRequestedMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ElicitationRequestedMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ElicitationRequestedMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ElicitationRequestedSchema.java b/java/sdk/src/generated/java/com/github/copilot/generated/ElicitationRequestedSchema.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ElicitationRequestedSchema.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ElicitationRequestedSchema.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ExitPlanModeAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/ExitPlanModeAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ExitPlanModeAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ExitPlanModeAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ExitPlanModeCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ExitPlanModeCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ExitPlanModeCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ExitPlanModeCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ExitPlanModeRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ExitPlanModeRequestedEvent.java
similarity index 93%
rename from java/src/generated/java/com/github/copilot/generated/ExitPlanModeRequestedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ExitPlanModeRequestedEvent.java
index 4242b4b656..7f20d35bf2 100644
--- a/java/src/generated/java/com/github/copilot/generated/ExitPlanModeRequestedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ExitPlanModeRequestedEvent.java
@@ -44,7 +44,9 @@ public record ExitPlanModeRequestedEventData(
         /** Available actions the user can take */
         @JsonProperty("actions") List<ExitPlanModeAction> actions,
         /** Recommended action to preselect for the user */
-        @JsonProperty("recommendedAction") ExitPlanModeAction recommendedAction
+        @JsonProperty("recommendedAction") ExitPlanModeAction recommendedAction,
+        /** Model the session had selected when the plan was authored, when one is known */
+        @JsonProperty("model") String model
     ) {
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtension.java b/java/sdk/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtension.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtension.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtension.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtensionSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtensionSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtensionSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtensionSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtensionStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtensionStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtensionStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ExtensionsLoadedExtensionStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ExternalToolCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ExternalToolCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ExternalToolCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ExternalToolCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ExternalToolRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ExternalToolRequestedEvent.java
similarity index 91%
rename from java/src/generated/java/com/github/copilot/generated/ExternalToolRequestedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ExternalToolRequestedEvent.java
index 903f01f1e8..e2d5bda5a9 100644
--- a/java/src/generated/java/com/github/copilot/generated/ExternalToolRequestedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ExternalToolRequestedEvent.java
@@ -42,6 +42,8 @@ public record ExternalToolRequestedEventData(
         @JsonProperty("toolCallId") String toolCallId,
         /** Name of the external tool to invoke */
         @JsonProperty("toolName") String toolName,
+        /** Stable provider identity captured with an extension-owned tool definition; hosts use it to route the request to the same provider that was offered to the model */
+        @JsonProperty("providerId") String providerId,
         /** Arguments to pass to the external tool */
         @JsonProperty("arguments") Object arguments,
         /** Active session working directory, when known. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunSettledEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunSettledEvent.java
new file mode 100644
index 0000000000..58ffa9cb3c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunSettledEvent.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Session event "factory.run_settled". Ephemeral signal that a factory run reached a terminal status.
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class FactoryRunSettledEvent extends SessionEvent {
+
+    @Override
+    public String getType() { return "factory.run_settled"; }
+
+    @JsonProperty("data")
+    private FactoryRunSettledEventData data;
+
+    public FactoryRunSettledEventData getData() { return data; }
+    public void setData(FactoryRunSettledEventData data) { this.data = data; }
+
+    /** Data payload for {@link FactoryRunSettledEvent}. */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record FactoryRunSettledEventData(
+        /** Identifier of the factory run that settled. */
+        @JsonProperty("runId") String runId,
+        /** Terminal status the run committed. */
+        @JsonProperty("status") FactoryRunSettledStatus status,
+        /** Subagents this run consumed against its limits. */
+        @JsonProperty("consumedSubagents") Long consumedSubagents,
+        /** AI credits this run consumed, in nano-AIU. */
+        @JsonProperty("consumedNanoAiu") Long consumedNanoAiu,
+        /** Active milliseconds accumulated across every attempt of this run. */
+        @JsonProperty("elapsedMs") Long elapsedMs,
+        /** Typed failure class recorded on the run, when it failed with one (e.g. `factory_limit_reached`). */
+        @JsonProperty("failureType") String failureType
+    ) {
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunSettledStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunSettledStatus.java
new file mode 100644
index 0000000000..bbeffbbf48
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunSettledStatus.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Terminal status a factory run committed. A settled run is never `pending` or `running`, so those two members of the run-status domain are deliberately absent.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum FactoryRunSettledStatus {
+    /** The {@code completed} variant. */
+    COMPLETED("completed"),
+    /** The {@code halted} variant. */
+    HALTED("halted"),
+    /** The {@code cancelled} variant. */
+    CANCELLED("cancelled"),
+    /** The {@code error} variant. */
+    ERROR("error");
+
+    private final String value;
+    FactoryRunSettledStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static FactoryRunSettledStatus fromValue(String value) {
+        for (FactoryRunSettledStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown FactoryRunSettledStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunStartedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunStartedEvent.java
new file mode 100644
index 0000000000..691c7185d4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunStartedEvent.java
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Session event "factory.run_started". Ephemeral signal that a factory run attempt began executing.
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class FactoryRunStartedEvent extends SessionEvent {
+
+    @Override
+    public String getType() { return "factory.run_started"; }
+
+    @JsonProperty("data")
+    private FactoryRunStartedEventData data;
+
+    public FactoryRunStartedEventData getData() { return data; }
+    public void setData(FactoryRunStartedEventData data) { this.data = data; }
+
+    /** Data payload for {@link FactoryRunStartedEvent}. */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record FactoryRunStartedEventData(
+        /** Identifier of the factory run that started. */
+        @JsonProperty("runId") String runId,
+        /** Name of the factory this run executes. Low cardinality by construction. */
+        @JsonProperty("factoryName") String factoryName,
+        /** Attempt number this start committed; a resumed run increments it. */
+        @JsonProperty("attempt") Long attempt
+    ) {
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/FactoryRunUpdatedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunUpdatedEvent.java
similarity index 97%
rename from java/src/generated/java/com/github/copilot/generated/FactoryRunUpdatedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunUpdatedEvent.java
index e9abb1053a..33b542058b 100644
--- a/java/src/generated/java/com/github/copilot/generated/FactoryRunUpdatedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/FactoryRunUpdatedEvent.java
@@ -34,6 +34,7 @@ public final class FactoryRunUpdatedEvent extends SessionEvent {
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record FactoryRunUpdatedEventData(
+        /** Factory run identifier. */
         @JsonProperty("runId") String runId,
         /** Monotonic revision now available for the run. */
         @JsonProperty("revision") Long revision
diff --git a/java/src/generated/java/com/github/copilot/generated/GitHubMcpToolConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/GitHubMcpToolConfig.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/GitHubMcpToolConfig.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/GitHubMcpToolConfig.java
diff --git a/java/src/generated/java/com/github/copilot/generated/HandoffRepository.java b/java/sdk/src/generated/java/com/github/copilot/generated/HandoffRepository.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/HandoffRepository.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/HandoffRepository.java
diff --git a/java/src/generated/java/com/github/copilot/generated/HandoffSourceType.java b/java/sdk/src/generated/java/com/github/copilot/generated/HandoffSourceType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/HandoffSourceType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/HandoffSourceType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/HeaderEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/HeaderEntry.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/HeaderEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/HeaderEntry.java
diff --git a/java/src/generated/java/com/github/copilot/generated/HookEndError.java b/java/sdk/src/generated/java/com/github/copilot/generated/HookEndError.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/HookEndError.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/HookEndError.java
diff --git a/java/src/generated/java/com/github/copilot/generated/HookEndEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/HookEndEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/HookEndEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/HookEndEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/HookProgressEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/HookProgressEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/HookProgressEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/HookProgressEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/HookStartEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/HookStartEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/HookStartEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/HookStartEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java
similarity index 85%
rename from java/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java
index cdeea72b4f..619fb326e1 100644
--- a/java/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java
@@ -20,12 +20,14 @@ public enum ManagedSettingsEnforcedEscalation {
     ALLOW_ALL("allow_all"),
     /** The {@code approve_all} variant. */
     APPROVE_ALL("approve_all"),
-    /** The {@code auto_approval} variant. */
-    AUTO_APPROVAL("auto_approval"),
+    /** The {@code assisted_approval} variant. */
+    ASSISTED_APPROVAL("assisted_approval"),
     /** The {@code unrestricted_paths} variant. */
     UNRESTRICTED_PATHS("unrestricted_paths"),
     /** The {@code unrestricted_urls} variant. */
-    UNRESTRICTED_URLS("unrestricted_urls");
+    UNRESTRICTED_URLS("unrestricted_urls"),
+    /** The {@code server_wide_mcp_approval} variant. */
+    SERVER_WIDE_MCP_APPROVAL("server_wide_mcp_approval");
 
     private final String value;
     ManagedSettingsEnforcedEscalation(String value) { this.value = value; }
diff --git a/java/src/generated/java/com/github/copilot/generated/ManagedSettingsResolvedSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsResolvedSource.java
similarity index 83%
rename from java/src/generated/java/com/github/copilot/generated/ManagedSettingsResolvedSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsResolvedSource.java
index 1ffa100635..32386f898a 100644
--- a/java/src/generated/java/com/github/copilot/generated/ManagedSettingsResolvedSource.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsResolvedSource.java
@@ -10,7 +10,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Which channel supplied the effective enterprise managed settings (highest-authority present layer wins wholesale)
+ * Summary of which managed-settings channels contributed to the effective session policy. Use the per-channel booleans for exact provenance.
  *
  * @since 1.0.0
  */
@@ -20,6 +20,10 @@ public enum ManagedSettingsResolvedSource {
     SERVER("server"),
     /** The {@code device} variant. */
     DEVICE("device"),
+    /** The {@code client} variant. */
+    CLIENT("client"),
+    /** The {@code mixed} variant. */
+    MIXED("mixed"),
     /** The {@code none} variant. */
     NONE("none");
 
diff --git a/java/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteError.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteError.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteError.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteError.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteToolMeta.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteToolMeta.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteToolMeta.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteToolMeta.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteToolMetaUI.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteToolMetaUI.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteToolMetaUI.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpAppToolCallCompleteToolMetaUI.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpHeadersRefreshCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpHeadersRefreshCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpHeadersRefreshCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpHeadersRefreshCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpHeadersRefreshCompletedOutcome.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpHeadersRefreshCompletedOutcome.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpHeadersRefreshCompletedOutcome.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpHeadersRefreshCompletedOutcome.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpHeadersRefreshRequiredEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpHeadersRefreshRequiredEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpHeadersRefreshRequiredEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpHeadersRefreshRequiredEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpHeadersRefreshRequiredReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpHeadersRefreshRequiredReason.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpHeadersRefreshRequiredReason.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpHeadersRefreshRequiredReason.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpOauthCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpOauthCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpOauthCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpOauthCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpOauthCompletionOutcome.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpOauthCompletionOutcome.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpOauthCompletionOutcome.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpOauthCompletionOutcome.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpOauthHttpResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpOauthHttpResponse.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpOauthHttpResponse.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpOauthHttpResponse.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpOauthRequestReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpOauthRequestReason.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpOauthRequestReason.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpOauthRequestReason.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpOauthRequiredEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpOauthRequiredEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpOauthRequiredEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpOauthRequiredEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpOauthRequiredStaticClientConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpOauthRequiredStaticClientConfig.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpOauthRequiredStaticClientConfig.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpOauthRequiredStaticClientConfig.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpOauthWWWAuthenticateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpOauthWWWAuthenticateParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpOauthWWWAuthenticateParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpOauthWWWAuthenticateParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpPromptsListChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpPromptsListChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpPromptsListChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpPromptsListChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpResourcesListChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpResourcesListChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpResourcesListChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpResourcesListChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpServerSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpServerSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpServerSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpServerSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpServerStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpServerStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpServerStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpServerStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpServerTransport.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpServerTransport.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpServerTransport.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpServerTransport.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpServersLoadedServer.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpServersLoadedServer.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpServersLoadedServer.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpServersLoadedServer.java
diff --git a/java/src/generated/java/com/github/copilot/generated/McpToolsListChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpToolsListChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/McpToolsListChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/McpToolsListChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureBadRequestKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureBadRequestKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ModelCallFailureBadRequestKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureBadRequestKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
similarity index 91%
rename from java/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
index f6c399b4c3..fb1ddcecd4 100644
--- a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
@@ -45,6 +45,7 @@ public record ModelCallFailureEventData(
         @JsonProperty("providerCallId") String providerCallId,
         /** Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation */
         @JsonProperty("serviceRequestId") String serviceRequestId,
+        /** Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable. */
         @JsonProperty("rte") Boolean rte,
         /** HTTP status code from the failed request */
         @JsonProperty("statusCode") Long statusCode,
@@ -66,6 +67,8 @@ public record ModelCallFailureEventData(
         @JsonProperty("isAuto") Boolean isAuto,
         /** Reasoning effort level used for the failed model call, if applicable */
         @JsonProperty("reasoningEffort") String reasoningEffort,
+        /** Authoritative interaction classification for the failed call, matching `assistant.usage.interactionType` (for example `conversation-agent`, `conversation-subagent`, or `conversation-sampling`). Absent when the producer cannot classify the interaction. */
+        @JsonProperty("interactionType") String interactionType,
         /** Where the failed model call originated */
         @JsonProperty("source") ModelCallFailureSource source,
         /** Raw provider/runtime error message for restricted telemetry */
diff --git a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ModelCallFailureKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ModelCallFailureSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureTransport.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureTransport.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ModelCallFailureTransport.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureTransport.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFinishedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFinishedEvent.java
new file mode 100644
index 0000000000..a1b424e807
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFinishedEvent.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Session event "model.call_finished". Final lifecycle outcome for one logical model dispatch. A logical dispatch may include internal reconnect or fallback work, so event count is not provider HTTP-request count.
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class ModelCallFinishedEvent extends SessionEvent {
+
+    @Override
+    public String getType() { return "model.call_finished"; }
+
+    @JsonProperty("data")
+    private ModelCallFinishedEventData data;
+
+    public ModelCallFinishedEventData getData() { return data; }
+    public void setData(ModelCallFinishedEventData data) { this.data = data; }
+
+    /** Data payload for {@link ModelCallFinishedEvent}. */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record ModelCallFinishedEventData(
+        /** Agent-loop iteration within the interaction that initiated the model dispatch */
+        @JsonProperty("turnId") String turnId,
+        /** Identifier of the user interaction that owns the model dispatch, matching assistant.turn_start.interactionId when available */
+        @JsonProperty("interactionId") String interactionId,
+        /** Monotonic elapsed time spent in the logical model dispatch, including any internal transport reconnect or fallback and excluding orchestrator retry backoff, tool execution, confirmations, and post-response processing */
+        @JsonProperty("dispatchDurationMs") Double dispatchDurationMs,
+        /** Final outcome after post-response acceptance processing */
+        @JsonProperty("outcome") ModelCallFinishedOutcome outcome,
+        /** Whether an accepted successful response requested the exact name and command semantics of a built-in file edit tool, including an external tool explicitly replacing that built-in name. Absent when the logical dispatch did not produce an accepted response. */
+        @JsonProperty("containsBuiltInFileEditRequest") Boolean containsBuiltInFileEditRequest,
+        /** Version of the built-in file-edit semantic classifier used for this event */
+        @JsonProperty("editClassifierVersion") Long editClassifierVersion
+    ) {
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFinishedOutcome.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFinishedOutcome.java
new file mode 100644
index 0000000000..8b86ed0281
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFinishedOutcome.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Final outcome of one logical model dispatch after response acceptance processing
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ModelCallFinishedOutcome {
+    /** The {@code success} variant. */
+    SUCCESS("success"),
+    /** The {@code error} variant. */
+    ERROR("error"),
+    /** The {@code cancelled} variant. */
+    CANCELLED("cancelled"),
+    /** The {@code rejected} variant. */
+    REJECTED("rejected");
+
+    private final String value;
+    ModelCallFinishedOutcome(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ModelCallFinishedOutcome fromValue(String value) {
+        for (ModelCallFinishedOutcome v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ModelCallFinishedOutcome value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/ModelCallStartEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallStartEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ModelCallStartEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ModelCallStartEvent.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelChangeSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelChangeSource.java
new file mode 100644
index 0000000000..0d54709de8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelChangeSource.java
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Origin of an effective session model change.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ModelChangeSource {
+    /** The {@code model_command} variant. */
+    MODEL_COMMAND("model_command"),
+    /** The {@code settings_command} variant. */
+    SETTINGS_COMMAND("settings_command"),
+    /** The {@code config_command} variant. */
+    CONFIG_COMMAND("config_command"),
+    /** The {@code model_picker} variant. */
+    MODEL_PICKER("model_picker"),
+    /** The {@code managed_settings} variant. */
+    MANAGED_SETTINGS("managed_settings"),
+    /** The {@code repo_settings} variant. */
+    REPO_SETTINGS("repo_settings"),
+    /** The {@code startup} variant. */
+    STARTUP("startup"),
+    /** The {@code agent} variant. */
+    AGENT("agent"),
+    /** The {@code plan_mode} variant. */
+    PLAN_MODE("plan_mode"),
+    /** The {@code automatic} variant. */
+    AUTOMATIC("automatic"),
+    /** The {@code sdk} variant. */
+    SDK("sdk");
+
+    private final String value;
+    ModelChangeSource(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ModelChangeSource fromValue(String value) {
+        for (ModelChangeSource v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ModelChangeSource value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/PendingMessagesModifiedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PendingMessagesModifiedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/PendingMessagesModifiedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/PendingMessagesModifiedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/PermissionCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/PermissionCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/PermissionCompletedEvent.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMode.java
new file mode 100644
index 0000000000..421ad76139
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMode.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Permission mode for the session.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum PermissionMode {
+    /** The {@code manual} variant. */
+    MANUAL("manual"),
+    /** The {@code assisted} variant. */
+    ASSISTED("assisted"),
+    /** The {@code allow-all} variant. */
+    ALLOW_ALL("allow-all");
+
+    private final String value;
+    PermissionMode(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static PermissionMode fromValue(String value) {
+        for (PermissionMode v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown PermissionMode value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/PermissionRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionRequestedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/PermissionRequestedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/PermissionRequestedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/PlanChangedOperation.java b/java/sdk/src/generated/java/com/github/copilot/generated/PlanChangedOperation.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/PlanChangedOperation.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/PlanChangedOperation.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PromptCacheBreakEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PromptCacheBreakEvent.java
new file mode 100644
index 0000000000..7ad39dec97
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PromptCacheBreakEvent.java
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Session event "prompt_cache_break". A detected loss of a previously cached prompt prefix
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class PromptCacheBreakEvent extends SessionEvent {
+
+    @Override
+    public String getType() { return "prompt_cache_break"; }
+
+    @JsonProperty("data")
+    private PromptCacheBreakEventData data;
+
+    public PromptCacheBreakEventData getData() { return data; }
+    public void setData(PromptCacheBreakEventData data) { this.data = data; }
+
+    /** Data payload for {@link PromptCacheBreakEvent}. */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record PromptCacheBreakEventData(
+        /** The highest-precedence reason for the cache break */
+        @JsonProperty("primaryReason") String primaryReason,
+        /** All reasons that contributed to the cache break, ordered by precedence */
+        @JsonProperty("contributingReasons") List<String> contributingReasons,
+        /** Request state that established the prior cache frontier */
+        @JsonProperty("beforeRequest") Object beforeRequest,
+        /** Request state whose cached prefix fell short */
+        @JsonProperty("afterRequest") Object afterRequest,
+        /** Number of cached prefix tokens that survived */
+        @JsonProperty("survivedTokens") Long survivedTokens,
+        /** Prior cached prompt frontier in tokens */
+        @JsonProperty("frontierTokens") Long frontierTokens,
+        /** Cached prefix tokens lost since the prior call */
+        @JsonProperty("shortfallTokens") Long shortfallTokens,
+        /** Fraction of the prior cache frontier that survived */
+        @JsonProperty("retentionRatio") Double retentionRatio,
+        /** Model that held the prior cache frontier, when the call changed models */
+        @JsonProperty("modelFrom") String modelFrom,
+        /** Model this call targeted, when the call changed models */
+        @JsonProperty("modelTo") String modelTo,
+        /** Telemetry-safe names of tools added since the prior call */
+        @JsonProperty("toolsAdded") List<String> toolsAdded,
+        /** Telemetry-safe names of tools removed since the prior call */
+        @JsonProperty("toolsRemoved") List<String> toolsRemoved,
+        /** Telemetry-safe names of tools whose definition changed since the prior call */
+        @JsonProperty("toolsRedefined") List<String> toolsRedefined,
+        /** Raw names of tools added since the prior call, restricted because a tool name can be user-authored */
+        @JsonProperty("toolsAddedRaw") List<String> toolsAddedRaw,
+        /** Raw names of tools removed since the prior call, restricted because a tool name can be user-authored */
+        @JsonProperty("toolsRemovedRaw") List<String> toolsRemovedRaw,
+        /** Raw names of tools redefined since the prior call, restricted because a tool name can be user-authored */
+        @JsonProperty("toolsRedefinedRaw") List<String> toolsRedefinedRaw,
+        /** Whether the tool list kept its members but changed their order */
+        @JsonProperty("toolsReordered") Boolean toolsReordered,
+        /** Names of the system-prompt segments whose content changed */
+        @JsonProperty("systemSegmentsChanged") List<String> systemSegmentsChanged,
+        /** Names of the cache-configuration fields that changed */
+        @JsonProperty("cacheConfigChangedFields") List<String> cacheConfigChangedFields,
+        /** Index of the first conversation message whose content changed */
+        @JsonProperty("rewriteMessageIndex") Long rewriteMessageIndex,
+        /** Shape of the history rewrite, for example whether the history grew or shrank */
+        @JsonProperty("rewriteShape") String rewriteShape,
+        /** Subsystems that announced a history rewrite before this call, for example compaction or truncation */
+        @JsonProperty("rewriteSource") List<String> rewriteSource,
+        /** Name of the sub-agent whose conversation broke, stamped by the parent bridge */
+        @JsonProperty("agentName") String agentName
+    ) {
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/ReasoningSummary.java b/java/sdk/src/generated/java/com/github/copilot/generated/ReasoningSummary.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ReasoningSummary.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ReasoningSummary.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SamplingCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SamplingCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SamplingCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SamplingCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SamplingRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SamplingRequestedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SamplingRequestedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SamplingRequestedEvent.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SandboxDecisionEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SandboxDecisionEvent.java
new file mode 100644
index 0000000000..f87be0fe9d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SandboxDecisionEvent.java
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Session event "sandbox.decision". Payload of `sandbox.decision`, a bounded governance record of what the process sandbox was configured to do and whether it took effect. Discriminated by `kind`.
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class SandboxDecisionEvent extends SessionEvent {
+
+    @Override
+    public String getType() { return "sandbox.decision"; }
+
+    @JsonProperty("data")
+    private SandboxDecisionEventData data;
+
+    public SandboxDecisionEventData getData() { return data; }
+    public void setData(SandboxDecisionEventData data) { this.data = data; }
+
+    /** Data payload for {@link SandboxDecisionEvent}. */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record SandboxDecisionEventData() {
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/ScheduleOrigin.java b/java/sdk/src/generated/java/com/github/copilot/generated/ScheduleOrigin.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ScheduleOrigin.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ScheduleOrigin.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionAutoModeResolvedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoModeResolvedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionAutoModeResolvedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoModeResolvedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionAutopilotObjectiveChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutopilotObjectiveChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionAutopilotObjectiveChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionAutopilotObjectiveChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionBackgroundTasksChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionBackgroundTasksChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionBackgroundTasksChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionBackgroundTasksChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionBinaryAssetEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionBinaryAssetEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionBinaryAssetEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionBinaryAssetEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCanvasClosedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasClosedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCanvasClosedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasClosedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCanvasOpenedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasOpenedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCanvasOpenedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasOpenedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCanvasRecordedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRecordedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCanvasRecordedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRecordedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCanvasRegistryChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRegistryChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCanvasRegistryChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRegistryChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCanvasRemovedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRemovedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCanvasRemovedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRemovedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCanvasUnavailableEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasUnavailableEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCanvasUnavailableEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasUnavailableEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCompactionCompleteEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCompactionCompleteEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCompactionCompleteEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCompactionCompleteEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCompactionStartEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCompactionStartEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCompactionStartEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCompactionStartEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionContextChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionContextChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionContextChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionContextChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionContextClearedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionContextClearedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionContextClearedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionContextClearedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCustomAgentsUpdatedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCustomAgentsUpdatedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCustomAgentsUpdatedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCustomAgentsUpdatedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionCustomNotificationEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCustomNotificationEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionCustomNotificationEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionCustomNotificationEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionErrorEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionErrorEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionErrorEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionErrorEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionEvent.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/SessionEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionEvent.java
index 582ecd3d4f..0acc3df712 100644
--- a/java/src/generated/java/com/github/copilot/generated/SessionEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionEvent.java
@@ -59,6 +59,7 @@
     @JsonSubTypes.Type(value = PendingMessagesModifiedEvent.class, name = "pending_messages.modified"),
     @JsonSubTypes.Type(value = AssistantTurnStartEvent.class, name = "assistant.turn_start"),
     @JsonSubTypes.Type(value = AssistantTurnRetryEvent.class, name = "assistant.turn_retry"),
+    @JsonSubTypes.Type(value = AgentInterruptedEvent.class, name = "agent.interrupted"),
     @JsonSubTypes.Type(value = AssistantIntentEvent.class, name = "assistant.intent"),
     @JsonSubTypes.Type(value = AssistantServerToolProgressEvent.class, name = "assistant.server_tool_progress"),
     @JsonSubTypes.Type(value = AssistantReasoningEvent.class, name = "assistant.reasoning"),
@@ -71,7 +72,9 @@
     @JsonSubTypes.Type(value = AssistantTurnEndEvent.class, name = "assistant.turn_end"),
     @JsonSubTypes.Type(value = AssistantIdleEvent.class, name = "assistant.idle"),
     @JsonSubTypes.Type(value = AssistantUsageEvent.class, name = "assistant.usage"),
+    @JsonSubTypes.Type(value = PromptCacheBreakEvent.class, name = "prompt_cache_break"),
     @JsonSubTypes.Type(value = ModelCallFailureEvent.class, name = "model.call_failure"),
+    @JsonSubTypes.Type(value = ModelCallFinishedEvent.class, name = "model.call_finished"),
     @JsonSubTypes.Type(value = ModelCallStartEvent.class, name = "model.call_start"),
     @JsonSubTypes.Type(value = AbortEvent.class, name = "abort"),
     @JsonSubTypes.Type(value = ToolUserRequestedEvent.class, name = "tool.user_requested"),
@@ -81,6 +84,7 @@
     @JsonSubTypes.Type(value = ToolExecutionCompleteEvent.class, name = "tool.execution_complete"),
     @JsonSubTypes.Type(value = ToolSearchActivatedEvent.class, name = "tool_search.activated"),
     @JsonSubTypes.Type(value = SkillInvokedEvent.class, name = "skill.invoked"),
+    @JsonSubTypes.Type(value = SandboxDecisionEvent.class, name = "sandbox.decision"),
     @JsonSubTypes.Type(value = SubagentStartedEvent.class, name = "subagent.started"),
     @JsonSubTypes.Type(value = SubagentCompletedEvent.class, name = "subagent.completed"),
     @JsonSubTypes.Type(value = SubagentFailedEvent.class, name = "subagent.failed"),
@@ -105,6 +109,7 @@
     @JsonSubTypes.Type(value = McpHeadersRefreshRequiredEvent.class, name = "mcp.headers_refresh_required"),
     @JsonSubTypes.Type(value = McpHeadersRefreshCompletedEvent.class, name = "mcp.headers_refresh_completed"),
     @JsonSubTypes.Type(value = SessionCustomNotificationEvent.class, name = "session.custom_notification"),
+    @JsonSubTypes.Type(value = UiEphemeralQueryEvent.class, name = "ui.ephemeral_query"),
     @JsonSubTypes.Type(value = ExternalToolRequestedEvent.class, name = "external_tool.requested"),
     @JsonSubTypes.Type(value = ExternalToolCompletedEvent.class, name = "external_tool.completed"),
     @JsonSubTypes.Type(value = CommandQueuedEvent.class, name = "command.queued"),
@@ -124,6 +129,8 @@
     @JsonSubTypes.Type(value = SessionToolsUpdatedEvent.class, name = "session.tools_updated"),
     @JsonSubTypes.Type(value = SessionBackgroundTasksChangedEvent.class, name = "session.background_tasks_changed"),
     @JsonSubTypes.Type(value = FactoryRunUpdatedEvent.class, name = "factory.run_updated"),
+    @JsonSubTypes.Type(value = FactoryRunStartedEvent.class, name = "factory.run_started"),
+    @JsonSubTypes.Type(value = FactoryRunSettledEvent.class, name = "factory.run_settled"),
     @JsonSubTypes.Type(value = SessionSkillsLoadedEvent.class, name = "session.skills_loaded"),
     @JsonSubTypes.Type(value = SessionCustomAgentsUpdatedEvent.class, name = "session.custom_agents_updated"),
     @JsonSubTypes.Type(value = SessionMcpServersLoadedEvent.class, name = "session.mcp_servers_loaded"),
@@ -177,6 +184,7 @@ public abstract sealed class SessionEvent permits
         PendingMessagesModifiedEvent,
         AssistantTurnStartEvent,
         AssistantTurnRetryEvent,
+        AgentInterruptedEvent,
         AssistantIntentEvent,
         AssistantServerToolProgressEvent,
         AssistantReasoningEvent,
@@ -189,7 +197,9 @@ public abstract sealed class SessionEvent permits
         AssistantTurnEndEvent,
         AssistantIdleEvent,
         AssistantUsageEvent,
+        PromptCacheBreakEvent,
         ModelCallFailureEvent,
+        ModelCallFinishedEvent,
         ModelCallStartEvent,
         AbortEvent,
         ToolUserRequestedEvent,
@@ -199,6 +209,7 @@ public abstract sealed class SessionEvent permits
         ToolExecutionCompleteEvent,
         ToolSearchActivatedEvent,
         SkillInvokedEvent,
+        SandboxDecisionEvent,
         SubagentStartedEvent,
         SubagentCompletedEvent,
         SubagentFailedEvent,
@@ -223,6 +234,7 @@ public abstract sealed class SessionEvent permits
         McpHeadersRefreshRequiredEvent,
         McpHeadersRefreshCompletedEvent,
         SessionCustomNotificationEvent,
+        UiEphemeralQueryEvent,
         ExternalToolRequestedEvent,
         ExternalToolCompletedEvent,
         CommandQueuedEvent,
@@ -242,6 +254,8 @@ public abstract sealed class SessionEvent permits
         SessionToolsUpdatedEvent,
         SessionBackgroundTasksChangedEvent,
         FactoryRunUpdatedEvent,
+        FactoryRunStartedEvent,
+        FactoryRunSettledEvent,
         SessionSkillsLoadedEvent,
         SessionCustomAgentsUpdatedEvent,
         SessionMcpServersLoadedEvent,
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionExtensionsAttachmentsPushedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionExtensionsAttachmentsPushedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionExtensionsAttachmentsPushedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionExtensionsAttachmentsPushedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionExtensionsLoadedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionExtensionsLoadedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionExtensionsLoadedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionExtensionsLoadedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionHandoffEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionHandoffEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionHandoffEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionHandoffEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionIdleEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionIdleEvent.java
similarity index 81%
rename from java/src/generated/java/com/github/copilot/generated/SessionIdleEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionIdleEvent.java
index e51a26e5ae..ae509c4b42 100644
--- a/java/src/generated/java/com/github/copilot/generated/SessionIdleEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionIdleEvent.java
@@ -35,7 +35,9 @@ public final class SessionIdleEvent extends SessionEvent {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionIdleEventData(
         /** True when the preceding agentic loop was cancelled via abort signal */
-        @JsonProperty("aborted") Boolean aborted
+        @JsonProperty("aborted") Boolean aborted,
+        /** The session mode the agent was operating in when it went idle, when the mode is known. Lets turn-scoped consumers distinguish an autopilot continuation boundary (where the agent keeps working after this idle) from a genuine turn completion. */
+        @JsonProperty("mode") SessionMode mode
     ) {
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionInfoEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionInfoEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionInfoEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionInfoEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionLimitsConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsConfig.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionLimitsConfig.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsConfig.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedRequestedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedRequestedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedRequestedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedResponse.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedResponse.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedResponse.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedResponseAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedResponseAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedResponseAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionLimitsExhaustedResponseAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionManagedSettingsEnforcedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsEnforcedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionManagedSettingsEnforcedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsEnforcedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java
similarity index 62%
rename from java/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java
index 7c7a4df738..ac3763248a 100644
--- a/java/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java
@@ -14,7 +14,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Session event "session.managed_settings_resolved". Enterprise managed-settings resolution: the effective managed settings the session applied and where they came from, so SDK clients can show users what is enterprise-managed and by which authority. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted; for a session-independent pull, use the SDK `getManagedSettings()` API, which returns the identical payload. Managed settings have a single authoritative source, so the highest-authority present layer (server > device) wins wholesale; `bypassPermissionsDisabled` is deny-wins across layers. Marked experimental while the managed-settings surface stabilizes.
+ * Session event "session.managed_settings_resolved". Enterprise managed-settings resolution: the effective managed settings the session applied and which channels contributed, so SDK clients can show users what is enterprise-managed. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted. Device values take precedence over server values per ordinary key, while permissions compose restrictively across device, server, and SDK-client layers. The account-scoped `getManagedSettings()` API does not include session-local client injection. Marked experimental while the managed-settings surface stabilizes.
  * @since 1.0.0
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -35,17 +35,21 @@ public final class SessionManagedSettingsResolvedEvent extends SessionEvent {
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionManagedSettingsResolvedEventData(
-        /** Which channel supplied the effective managed settings (the winning layer), or `none` when no policy is in force */
+        /** Channel summary: `server`, `device`, or `client` when exactly one channel contributed; `mixed` when multiple channels contributed; otherwise `none`. Consult the per-channel booleans for exact provenance. */
         @JsonProperty("source") ManagedSettingsResolvedSource source,
         /** Whether the server (account/org) managed-settings layer was present */
         @JsonProperty("serverManaged") Boolean serverManaged,
-        /** Whether the device (MDM/plist/registry/file) managed-settings layer was present */
+        /** Whether an actual device MDM/plist/registry/file managed-settings layer was present */
         @JsonProperty("deviceManaged") Boolean deviceManaged,
+        /** Whether a session-local permissions layer injected by the SDK host was present */
+        @JsonProperty("clientManaged") Boolean clientManaged,
         /** Whether managed policy could not be determined (e.g. a failed server fetch) and the session fell back to the fail-closed restriction. When true, restrictions such as disabling bypass-permissions are enforced even though `settings` may be absent. */
         @JsonProperty("failClosed") Boolean failClosed,
+        /** Whether the effective sandbox policy forces the sandbox on *only* because managed policy could not be determined, rather than because the policy requires it. Lets clients tell a user whose `--no-sandbox` was overridden that the sandbox stayed on as a fail-closed fallback, instead of attributing it to an administrator who set no such policy. */
+        @JsonProperty("sandboxEnabledByUndeterminedPolicy") Boolean sandboxEnabledByUndeterminedPolicy,
         /** Whether enterprise policy disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers, and forced on when `failClosed` is true. */
         @JsonProperty("bypassPermissionsDisabled") Boolean bypassPermissionsDisabled,
-        /** Whether server and device each supplied a permission allowlist, so enforcement intersects them and the flattened settings payload omits `permissions.allow`. */
+        /** Whether at least two managed sources supplied permission allowlists, so enforcement intersects them and the flattened settings payload omits `permissions.allow`. */
         @JsonProperty("permissionsAllowIntersected") Boolean permissionsAllowIntersected,
         /** The setting keys under enterprise management in the effective managed settings (e.g. `model`, `enabledPlugins`, `permissions`). Empty when no managed settings are in force. */
         @JsonProperty("managedKeys") List<String> managedKeys,
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionMcpServerStatusChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionMcpServerStatusChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionMcpServerStatusChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionMcpServerStatusChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionMcpServersLoadedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionMcpServersLoadedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionMcpServersLoadedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionMcpServersLoadedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionModeChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionModeChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionModeChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionModeChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java
similarity index 94%
rename from java/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java
index e53c1594ae..868d78fe0d 100644
--- a/java/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java
@@ -53,7 +53,9 @@ public record SessionModelChangeEventData(
         /** Context tier after the model change; null explicitly clears a previously selected tier */
         @JsonProperty("contextTier") ContextTier contextTier,
         /** Reason the change happened, when not user-initiated. `"rate_limit_auto_switch"` for changes triggered by the auto-mode-switch rate-limit recovery path, or `"refusal_fallback"` when the active model declined a request (content refusal) and the runtime switched to the configured refusal-fallback model. UI clients can use this to render contextual copy. */
-        @JsonProperty("cause") String cause
+        @JsonProperty("cause") String cause,
+        /** Origin of the effective model change, when known. */
+        @JsonProperty("source") ModelChangeSource source
     ) {
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java
similarity index 66%
rename from java/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java
index c1f82f5af7..ef332617ac 100644
--- a/java/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java
@@ -13,7 +13,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Session event "session.permissions_changed". Permissions change details carrying the aggregate allow-all transition.
+ * Session event "session.permissions_changed". Permission-mode transition details.
  * @since 1.0.0
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -34,14 +34,12 @@ public final class SessionPermissionsChangedEvent extends SessionEvent {
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionPermissionsChangedEventData(
-        /** Aggregate allow-all flag before the change */
-        @JsonProperty("previousAllowAllPermissions") Boolean previousAllowAllPermissions,
-        /** Aggregate allow-all flag after the change */
-        @JsonProperty("allowAllPermissions") Boolean allowAllPermissions,
-        /** Allow-all mode before the change */
-        @JsonProperty("previousAllowAllPermissionMode") PermissionAllowAllMode previousAllowAllPermissionMode,
-        /** Allow-all mode after the change */
-        @JsonProperty("allowAllPermissionMode") PermissionAllowAllMode allowAllPermissionMode
+        /** Permission mode before the change */
+        @JsonProperty("previousMode") PermissionMode previousMode,
+        /** Permission mode after the change */
+        @JsonProperty("mode") PermissionMode mode,
+        /** Explicit LLM judge model override used by assisted mode; omitted when the provider default applies */
+        @JsonProperty("assistedApprovalModel") String assistedApprovalModel
     ) {
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionPlanChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionPlanChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionPlanChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionPlanChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionRemoteSteerableChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionRemoteSteerableChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionRemoteSteerableChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionRemoteSteerableChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionResumeEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionResumeEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionResumeEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionResumeEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionScheduleCancelledEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionScheduleCancelledEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionScheduleCancelledEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionScheduleCancelledEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionScheduleCreatedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionScheduleCreatedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionScheduleCreatedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionScheduleCreatedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionScheduleRearmedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionScheduleRearmedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionScheduleRearmedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionScheduleRearmedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionSessionLimitsChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionSessionLimitsChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionSessionLimitsChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionSessionLimitsChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.java
similarity index 94%
rename from java/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.java
index 84c3023066..cf8600e388 100644
--- a/java/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.java
@@ -55,6 +55,8 @@ public record SessionShutdownEventData(
         @JsonProperty("codeChanges") ShutdownCodeChanges codeChanges,
         /** Per-model usage breakdown, keyed by model identifier */
         @JsonProperty("modelMetrics") Map<String, ShutdownModelMetric> modelMetrics,
+        /** Per-agent usage breakdown, keyed by agent instance identifier. The main conversation uses the stable key `main`. */
+        @JsonProperty("agentMetrics") Map<String, ShutdownAgentMetric> agentMetrics,
         /** Model that was selected at the time of shutdown */
         @JsonProperty("currentModel") String currentModel,
         /** Total tokens in context window at shutdown */
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionSkillsLoadedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionSkillsLoadedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionSkillsLoadedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionSkillsLoadedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionSnapshotRewindEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionSnapshotRewindEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionSnapshotRewindEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionSnapshotRewindEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionStartEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionStartEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionStartEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionStartEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionTaskCompleteEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionTaskCompleteEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionTaskCompleteEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionTaskCompleteEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionTitleChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionTitleChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionTitleChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionTitleChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionTodosChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionTodosChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionTodosChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionTodosChangedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionToolsUpdatedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionToolsUpdatedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionToolsUpdatedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionToolsUpdatedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionTruncationEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionTruncationEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionTruncationEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionTruncationEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java
similarity index 90%
rename from java/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java
index 1a400c0130..bdbc1add95 100644
--- a/java/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java
@@ -40,7 +40,9 @@ public record SessionUsageCheckpointEventData(
         /** Total number of premium API requests used at checkpoint time */
         @JsonProperty("totalPremiumRequests") Double totalPremiumRequests,
         /** Internal per-model prompt-cache state used to restore expiration tracking on resume */
-        @JsonProperty("modelCacheState") List<UsageCheckpointModelCacheState> modelCacheState
+        @JsonProperty("modelCacheState") List<UsageCheckpointModelCacheState> modelCacheState,
+        /** Internal per-conversation prompt-cache-break detector baselines restored on resume */
+        @JsonProperty("promptCacheBreakState") List<Object> promptCacheBreakState
     ) {
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionUsageInfoEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionUsageInfoEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionUsageInfoEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionUsageInfoEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionWarningEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionWarningEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionWarningEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionWarningEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SessionWorkspaceFileChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionWorkspaceFileChangedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SessionWorkspaceFileChangedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SessionWorkspaceFileChangedEvent.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownAgentMetric.java b/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownAgentMetric.java
new file mode 100644
index 0000000000..a6ed890ba7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownAgentMetric.java
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Usage attributed to one agent instance at session shutdown.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ShutdownAgentMetric(
+    /** Configured agent name, when this is a subagent */
+    @JsonProperty("agentName") String agentName,
+    /** Human-readable label for this subagent invocation, copied from the originating `subagent.started` event. For task-tool subagents this is the invocation's task description rather than the agent's configured display name, so group by `agentName` for stable per-agent labels. */
+    @JsonProperty("agentDisplayName") String agentDisplayName,
+    /** Time spent in model API calls by this agent, in milliseconds */
+    @JsonProperty("totalApiDurationMs") Long totalApiDurationMs,
+    /** Accumulated nano-AI units cost for this agent */
+    @JsonProperty("totalNanoAiu") Double totalNanoAiu,
+    /** Per-model usage for this agent, keyed by model identifier */
+    @JsonProperty("modelMetrics") Map<String, ShutdownModelMetric> modelMetrics
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/ShutdownCodeChanges.java b/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownCodeChanges.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ShutdownCodeChanges.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ShutdownCodeChanges.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ShutdownModelMetric.java b/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownModelMetric.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ShutdownModelMetric.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ShutdownModelMetric.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ShutdownModelMetricRequests.java b/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownModelMetricRequests.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ShutdownModelMetricRequests.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ShutdownModelMetricRequests.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ShutdownModelMetricTokenDetail.java b/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownModelMetricTokenDetail.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ShutdownModelMetricTokenDetail.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ShutdownModelMetricTokenDetail.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ShutdownModelMetricUsage.java b/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownModelMetricUsage.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ShutdownModelMetricUsage.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ShutdownModelMetricUsage.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ShutdownTokenDetail.java b/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownTokenDetail.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ShutdownTokenDetail.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ShutdownTokenDetail.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ShutdownType.java b/java/sdk/src/generated/java/com/github/copilot/generated/ShutdownType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ShutdownType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ShutdownType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SkillInvokedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SkillInvokedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SkillInvokedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SkillInvokedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SkillInvokedTrigger.java b/java/sdk/src/generated/java/com/github/copilot/generated/SkillInvokedTrigger.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SkillInvokedTrigger.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SkillInvokedTrigger.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SkillSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/SkillSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SkillSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SkillSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java b/java/sdk/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java
index d3196c6bbf..932d9affe5 100644
--- a/java/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java
@@ -23,6 +23,8 @@
 public record SkillsLoadedSkill(
     /** Unique identifier for the skill */
     @JsonProperty("name") String name,
+    /** Canonical slash command name used to invoke the skill, without the leading '/' */
+    @JsonProperty("commandName") String commandName,
     /** Description of what the skill does */
     @JsonProperty("description") String description,
     /** Source location type (e.g., project, personal-copilot, plugin, builtin) */
diff --git a/java/src/generated/java/com/github/copilot/generated/SubagentCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SubagentCompletedEvent.java
similarity index 63%
rename from java/src/generated/java/com/github/copilot/generated/SubagentCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SubagentCompletedEvent.java
index f32613579d..62f6803652 100644
--- a/java/src/generated/java/com/github/copilot/generated/SubagentCompletedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SubagentCompletedEvent.java
@@ -42,12 +42,24 @@ public record SubagentCompletedEventData(
         @JsonProperty("agentDisplayName") String agentDisplayName,
         /** Model used by the sub-agent */
         @JsonProperty("model") String model,
+        /** First model for which the sub-agent started an inference request, when one was dispatched */
+        @JsonProperty("firstDispatchedModel") String firstDispatchedModel,
+        /** Concrete model the user configured for this sub-agent via `/subagents`, when present */
+        @JsonProperty("configuredModelPreference") String configuredModelPreference,
+        /** Explicit model supplied by the parent agent on the task call, when present */
+        @JsonProperty("explicitModelOverride") String explicitModelOverride,
+        /** Whether the explicit task-call model matched the user's configured preference */
+        @JsonProperty("explicitModelMatchesPreference") Boolean explicitModelMatchesPreference,
+        /** Whether the first model actually dispatched matched the user's configured preference */
+        @JsonProperty("configuredModelMatchesActual") Boolean configuredModelMatchesActual,
         /** Total number of tool calls made by the sub-agent */
         @JsonProperty("totalToolCalls") Long totalToolCalls,
         /** Total tokens (input + output) consumed by the sub-agent */
         @JsonProperty("totalTokens") Long totalTokens,
         /** Wall-clock duration of the sub-agent execution in milliseconds */
-        @JsonProperty("durationMs") Long durationMs
+        @JsonProperty("durationMs") Long durationMs,
+        /** Whether the sub-agent was torn down by cancellation - its own abort, or an ancestor being killed - instead of finishing its work. Cancellation is not a failure, so the run still reports completion; this distinguishes a torn-down sub-agent from one that ran to the end. */
+        @JsonProperty("cancelled") Boolean cancelled
     ) {
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/SubagentDeselectedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SubagentDeselectedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SubagentDeselectedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SubagentDeselectedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SubagentFailedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SubagentFailedEvent.java
similarity index 72%
rename from java/src/generated/java/com/github/copilot/generated/SubagentFailedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SubagentFailedEvent.java
index 6a48544ce9..1d1413c64d 100644
--- a/java/src/generated/java/com/github/copilot/generated/SubagentFailedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SubagentFailedEvent.java
@@ -44,6 +44,16 @@ public record SubagentFailedEventData(
         @JsonProperty("error") String error,
         /** Model selected for the sub-agent, when known */
         @JsonProperty("model") String model,
+        /** First model for which the sub-agent started an inference request, when one was dispatched */
+        @JsonProperty("firstDispatchedModel") String firstDispatchedModel,
+        /** Concrete model the user configured for this sub-agent via `/subagents`, when present */
+        @JsonProperty("configuredModelPreference") String configuredModelPreference,
+        /** Explicit model supplied by the parent agent on the task call, when present */
+        @JsonProperty("explicitModelOverride") String explicitModelOverride,
+        /** Whether the explicit task-call model matched the user's configured preference */
+        @JsonProperty("explicitModelMatchesPreference") Boolean explicitModelMatchesPreference,
+        /** Whether the first model actually dispatched matched the user's configured preference */
+        @JsonProperty("configuredModelMatchesActual") Boolean configuredModelMatchesActual,
         /** Total number of tool calls made before the sub-agent failed */
         @JsonProperty("totalToolCalls") Long totalToolCalls,
         /** Total tokens (input + output) consumed before the sub-agent failed */
diff --git a/java/src/generated/java/com/github/copilot/generated/SubagentSelectedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SubagentSelectedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SubagentSelectedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SubagentSelectedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SubagentStartedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SubagentStartedEvent.java
similarity index 90%
rename from java/src/generated/java/com/github/copilot/generated/SubagentStartedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SubagentStartedEvent.java
index fb94f97cfa..291dc5e040 100644
--- a/java/src/generated/java/com/github/copilot/generated/SubagentStartedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SubagentStartedEvent.java
@@ -43,7 +43,9 @@ public record SubagentStartedEventData(
         /** Description of what the sub-agent does */
         @JsonProperty("agentDescription") String agentDescription,
         /** Model the sub-agent will run with, when known at start. */
-        @JsonProperty("model") String model
+        @JsonProperty("model") String model,
+        /** Root id of the factory run that spawned this sub-agent, when it was spawned by one. */
+        @JsonProperty("factoryRunId") String factoryRunId
     ) {
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/SystemMessageEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SystemMessageEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SystemMessageEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SystemMessageEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SystemMessageMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/SystemMessageMetadata.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SystemMessageMetadata.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SystemMessageMetadata.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SystemMessageRole.java b/java/sdk/src/generated/java/com/github/copilot/generated/SystemMessageRole.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SystemMessageRole.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SystemMessageRole.java
diff --git a/java/src/generated/java/com/github/copilot/generated/SystemNotificationEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SystemNotificationEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/SystemNotificationEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/SystemNotificationEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/TaskCompletionOutcome.java b/java/sdk/src/generated/java/com/github/copilot/generated/TaskCompletionOutcome.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/TaskCompletionOutcome.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/TaskCompletionOutcome.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteError.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteError.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteError.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteError.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteEvent.java
similarity index 94%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteEvent.java
index a265b5305e..574d3aa6b9 100644
--- a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteEvent.java
@@ -45,6 +45,7 @@ public record ToolExecutionCompleteEventData(
         @JsonProperty("mcpMeta") Object mcpMeta,
         /** CAPI interaction ID for correlating this tool execution with upstream telemetry */
         @JsonProperty("interactionId") String interactionId,
+        /** Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable. */
         @JsonProperty("rte") Boolean rte,
         /** Whether this tool call was explicitly requested by the user rather than the assistant */
         @JsonProperty("isUserRequested") Boolean isUserRequested,
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescription.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescription.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescription.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescription.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMeta.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMeta.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMeta.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMeta.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMetaUI.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMetaUI.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMetaUI.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMetaUI.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMetaUIVisibility.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMetaUIVisibility.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMetaUIVisibility.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteToolDescriptionMetaUIVisibility.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResource.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMeta.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMeta.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMeta.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMeta.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUI.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUI.java
similarity index 90%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUI.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUI.java
index 6679b85aec..500eb17554 100644
--- a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUI.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUI.java
@@ -25,7 +25,9 @@ public record ToolExecutionCompleteUIResourceMetaUI(
     @JsonProperty("csp") ToolExecutionCompleteUIResourceMetaUICsp csp,
     /** Browser permission metadata for an MCP Apps UI resource, including camera, microphone, geolocation, and clipboard-write. */
     @JsonProperty("permissions") ToolExecutionCompleteUIResourceMetaUIPermissions permissions,
+    /** Optional dedicated origin for the rendered MCP Apps UI resource. */
     @JsonProperty("domain") String domain,
+    /** Whether the host should render a border around the MCP Apps UI resource. */
     @JsonProperty("prefersBorder") Boolean prefersBorder
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUICsp.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUICsp.java
similarity index 81%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUICsp.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUICsp.java
index 41e799cf03..4b9cfb133b 100644
--- a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUICsp.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUICsp.java
@@ -22,9 +22,13 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record ToolExecutionCompleteUIResourceMetaUICsp(
+    /** Domains the UI resource may connect to. */
     @JsonProperty("connectDomains") List<String> connectDomains,
+    /** Domains from which the UI resource may load scripts, styles, images, and other resources. */
     @JsonProperty("resourceDomains") List<String> resourceDomains,
+    /** Domains the UI resource may embed as nested frames. */
     @JsonProperty("frameDomains") List<String> frameDomains,
+    /** Domains the UI resource may use as document base URIs. */
     @JsonProperty("baseUriDomains") List<String> baseUriDomains
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissions.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissions.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissions.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissions.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsCamera.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsCamera.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsCamera.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsCamera.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionPartialResultEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionPartialResultEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionPartialResultEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionPartialResultEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionProgressEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionProgressEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionProgressEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionProgressEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionStartEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartEvent.java
similarity index 93%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionStartEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartEvent.java
index 782e93931f..1aa69c6c20 100644
--- a/java/src/generated/java/com/github/copilot/generated/ToolExecutionStartEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartEvent.java
@@ -44,6 +44,7 @@ public record ToolExecutionStartEventData(
         @JsonProperty("shellToolInfo") ToolExecutionStartShellToolInfo shellToolInfo,
         /** Model identifier that generated this tool call */
         @JsonProperty("model") String model,
+        /** Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable. */
         @JsonProperty("rte") Boolean rte,
         /** Name of the MCP server hosting this tool, when the tool is an MCP tool */
         @JsonProperty("mcpServerName") String mcpServerName,
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionStartShellToolInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartShellToolInfo.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionStartShellToolInfo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartShellToolInfo.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescription.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescription.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescription.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescription.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMeta.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMeta.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMeta.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMeta.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMetaUI.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMetaUI.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMetaUI.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMetaUI.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMetaUIVisibility.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMetaUIVisibility.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMetaUIVisibility.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolExecutionStartToolDescriptionMetaUIVisibility.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolSearchActivatedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolSearchActivatedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolSearchActivatedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolSearchActivatedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/ToolUserRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ToolUserRequestedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/ToolUserRequestedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/ToolUserRequestedEvent.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UIEphemeralQueryPhase.java b/java/sdk/src/generated/java/com/github/copilot/generated/UIEphemeralQueryPhase.java
new file mode 100644
index 0000000000..7798c159eb
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UIEphemeralQueryPhase.java
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Lifecycle phase for a Rust-owned ephemeral query stream.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum UIEphemeralQueryPhase {
+    /** The {@code started} variant. */
+    STARTED("started"),
+    /** The {@code chunk} variant. */
+    CHUNK("chunk"),
+    /** The {@code completed} variant. */
+    COMPLETED("completed"),
+    /** The {@code failed} variant. */
+    FAILED("failed"),
+    /** The {@code aborted} variant. */
+    ABORTED("aborted");
+
+    private final String value;
+    UIEphemeralQueryPhase(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static UIEphemeralQueryPhase fromValue(String value) {
+        for (UIEphemeralQueryPhase v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown UIEphemeralQueryPhase value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UiEphemeralQueryEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/UiEphemeralQueryEvent.java
new file mode 100644
index 0000000000..b2f390e823
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UiEphemeralQueryEvent.java
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Session event "ui.ephemeral_query". Ordered output and terminal state for a transient query that does not modify conversation history.
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class UiEphemeralQueryEvent extends SessionEvent {
+
+    @Override
+    public String getType() { return "ui.ephemeral_query"; }
+
+    @JsonProperty("data")
+    private UiEphemeralQueryEventData data;
+
+    public UiEphemeralQueryEventData getData() { return data; }
+    public void setData(UiEphemeralQueryEventData data) { this.data = data; }
+
+    /** Data payload for {@link UiEphemeralQueryEvent}. */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record UiEphemeralQueryEventData(
+        /** Runtime-minted query identifier. */
+        @JsonProperty("requestId") String requestId,
+        /** Current query lifecycle phase. */
+        @JsonProperty("phase") UIEphemeralQueryPhase phase,
+        /** Ordered text delta, present for the `chunk` phase. */
+        @JsonProperty("chunk") String chunk,
+        /** Full response text, present for the `completed` phase. */
+        @JsonProperty("answer") String answer,
+        /** Model or transport failure message, present for the `failed` phase. */
+        @JsonProperty("error") String error
+    ) {
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/UnknownSessionEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/UnknownSessionEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/UnknownSessionEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/UnknownSessionEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/UsageCheckpointModelCacheState.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageCheckpointModelCacheState.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/UsageCheckpointModelCacheState.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/UsageCheckpointModelCacheState.java
diff --git a/java/src/generated/java/com/github/copilot/generated/UserInputCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/UserInputCompletedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/UserInputCompletedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/UserInputCompletedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/UserInputRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/UserInputRequestedEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/UserInputRequestedEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/UserInputRequestedEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/UserMessageAgentMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/UserMessageAgentMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/UserMessageAgentMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/UserMessageAgentMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/UserMessageDelivery.java b/java/sdk/src/generated/java/com/github/copilot/generated/UserMessageDelivery.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/UserMessageDelivery.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/UserMessageDelivery.java
diff --git a/java/src/generated/java/com/github/copilot/generated/UserMessageEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/UserMessageEvent.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/UserMessageEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/UserMessageEvent.java
index bc579968b3..7d839087da 100644
--- a/java/src/generated/java/com/github/copilot/generated/UserMessageEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UserMessageEvent.java
@@ -55,6 +55,8 @@ public record UserMessageEventData(
         @JsonProperty("isAutopilotContinuation") Boolean isAutopilotContinuation,
         /** CAPI interaction ID for correlating this user message with its turn */
         @JsonProperty("interactionId") String interactionId,
+        /** The agent-loop turn ID that consumed this message; absent when no agent-loop turn consumed it */
+        @JsonProperty("turnId") String turnId,
         /** Parent agent task ID for background telemetry correlated to this user turn */
         @JsonProperty("parentAgentTaskId") String parentAgentTaskId
     ) {
diff --git a/java/src/generated/java/com/github/copilot/generated/Verbosity.java b/java/sdk/src/generated/java/com/github/copilot/generated/Verbosity.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/Verbosity.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/Verbosity.java
diff --git a/java/src/generated/java/com/github/copilot/generated/WorkingDirectoryContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/WorkingDirectoryContext.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/WorkingDirectoryContext.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/WorkingDirectoryContext.java
diff --git a/java/src/generated/java/com/github/copilot/generated/WorkingDirectoryContextHostType.java b/java/sdk/src/generated/java/com/github/copilot/generated/WorkingDirectoryContextHostType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/WorkingDirectoryContextHostType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/WorkingDirectoryContextHostType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/WorkspaceFileChangedOperation.java b/java/sdk/src/generated/java/com/github/copilot/generated/WorkspaceFileChangedOperation.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/WorkspaceFileChangedOperation.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/WorkspaceFileChangedOperation.java
diff --git a/java/src/generated/java/com/github/copilot/generated/package-info.java b/java/sdk/src/generated/java/com/github/copilot/generated/package-info.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/package-info.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/package-info.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AbortReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AbortReason.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AbortReason.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AbortReason.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountAllUsers.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountAllUsers.java
similarity index 89%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AccountAllUsers.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountAllUsers.java
index eecdad01ee..3f93dd7c60 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/AccountAllUsers.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountAllUsers.java
@@ -13,7 +13,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Authenticated account entry returned by `account.getAllUsers`, with auth info and an optional associated token.
+ * Authenticated account entry returned by `account.getAllUsers`.
  *
  * @since 1.0.0
  */
@@ -23,6 +23,8 @@
 public record AccountAllUsers(
     /** Authentication information for this user */
     @JsonProperty("authInfo") Object authInfo,
+    /** Opaque identifier accepted by account and model selection APIs */
+    @JsonProperty("selectionId") String selectionId,
     /** Associated token, if available */
     @JsonProperty("token") String token
 ) {
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountGetCurrentAuthResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetCurrentAuthResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AccountGetCurrentAuthResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetCurrentAuthResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaParams.java
similarity index 77%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaParams.java
index cea523551f..9863b5d9c9 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaParams.java
@@ -24,7 +24,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record AccountGetQuotaParams(
-    /** GitHub token for per-user quota lookup. When provided, resolves this token to determine the user's quota instead of using the global auth. */
+    /** Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used. */
+    @JsonProperty("selectionId") String selectionId,
+    /** GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account. */
     @JsonProperty("gitHubToken") String gitHubToken
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetQuotaResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLoginParams.java
similarity index 84%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLoginParams.java
index bd8e697341..ca724fc675 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLoginParams.java
@@ -14,7 +14,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Credentials to store after successful authentication
+ * Credentials to validate and store. Omit login to resolve the authenticated user from the token.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
@@ -26,7 +26,7 @@
 public record AccountLoginParams(
     /** GitHub host URL */
     @JsonProperty("host") String host,
-    /** User login/username */
+    /** User login/username. When omitted, the runtime validates the token and resolves the login from GitHub. */
     @JsonProperty("login") String login,
     /** GitHub authentication token */
     @JsonProperty("token") String token
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLoginResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLoginResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutParams.java
similarity index 89%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutParams.java
index b5e93e1859..b57aef87c4 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutParams.java
@@ -24,6 +24,8 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record AccountLogoutParams(
+    /** Opaque account identifier returned by `account.getAllUsers` */
+    @JsonProperty("selectionId") String selectionId,
     /** Authentication information for the user to log out */
     @JsonProperty("authInfo") Object authInfo
 ) {
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountQuotaSnapshot.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountQuotaSnapshot.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AccountQuotaSnapshot.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountQuotaSnapshot.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AdaptiveThinkingSupport.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AdaptiveThinkingSupport.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AdaptiveThinkingSupport.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AdaptiveThinkingSupport.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentDiscoveryPath.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentDiscoveryPath.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentDiscoveryPath.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentDiscoveryPath.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentDiscoveryPathScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentDiscoveryPathScope.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentDiscoveryPathScope.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentDiscoveryPathScope.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentInfo.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentInfo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentInfo.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentInfoSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentInfoSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentInfoSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentInfoSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntry.java
similarity index 97%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntry.java
index 3e44993b96..c9e2ed2320 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntry.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntry.java
@@ -31,8 +31,6 @@ public record AgentRegistryLiveTargetEntry(
     @JsonProperty("host") String host,
     /** TCP port the entry's JSON-RPC server is listening on */
     @JsonProperty("port") Long port,
-    /** Connection token (null when the target is unauthenticated) */
-    @JsonProperty("token") String token,
     /** Session ID of the foreground session for this entry */
     @JsonProperty("sessionId") String sessionId,
     /** Friendly session name (when set) */
@@ -56,6 +54,8 @@ public record AgentRegistryLiveTargetEntry(
     /** Copilot CLI version that wrote the entry */
     @JsonProperty("copilotVersion") String copilotVersion,
     /** Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness) */
-    @JsonProperty("lastSeenMs") Long lastSeenMs
+    @JsonProperty("lastSeenMs") Long lastSeenMs,
+    /** Connection token (null when the target is unauthenticated) */
+    @JsonProperty("token") String token
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryAttentionKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryAttentionKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryAttentionKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryAttentionKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryLastTerminalEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryLastTerminalEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryLastTerminalEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryLastTerminalEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLiveTargetEntryStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLogCapture.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLogCapture.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLogCapture.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLogCapture.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLogCaptureOpenErrorReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLogCaptureOpenErrorReason.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLogCaptureOpenErrorReason.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistryLogCaptureOpenErrorReason.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnError.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnError.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnError.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnPermissionMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnPermissionMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnPermissionMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnPermissionMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnRegistryTimeout.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnRegistryTimeout.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnRegistryTimeout.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnRegistryTimeout.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnSpawned.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnSpawned.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnSpawned.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnSpawned.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationError.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationError.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationError.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationErrorField.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationErrorField.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationErrorField.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationErrorField.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationErrorReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationErrorReason.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationErrorReason.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentRegistrySpawnValidationErrorReason.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ApiKeyAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ApiKeyAuthInfo.java
new file mode 100644
index 0000000000..fecbfff415
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ApiKeyAuthInfo.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication-info input variant for API-key authentication to a non-GitHub LLM provider, carrying the secret `apiKey` and host.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class ApiKeyAuthInfo extends AuthInfo {
+
+    @JsonProperty("type")
+    private final String type = "api-key";
+
+    @Override
+    public String getType() { return type; }
+
+    /** The API key. Treat as a secret. */
+    @JsonProperty("apiKey")
+    private String apiKey;
+
+    /** Authentication host. */
+    @JsonProperty("host")
+    private String host;
+
+    /** Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set. */
+    @JsonProperty("copilotUser")
+    private CopilotUserResponse copilotUser;
+
+    public String getApiKey() { return apiKey; }
+    public void setApiKey(String apiKey) { this.apiKey = apiKey; }
+
+    public String getHost() { return host; }
+    public void setHost(String host) { this.host = host; }
+
+    public CopilotUserResponse getCopilotUser() { return copilotUser; }
+    public void setCopilotUser(CopilotUserResponse copilotUser) { this.copilotUser = copilotUser; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfo.java
new file mode 100644
index 0000000000..5d82a47f85
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfo.java
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.
+ *
+ * @since 1.0.0
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", visible = true)
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = HMACAuthInfo.class, name = "hmac"),
+    @JsonSubTypes.Type(value = EnvAuthInfo.class, name = "env"),
+    @JsonSubTypes.Type(value = TokenAuthInfo.class, name = "token"),
+    @JsonSubTypes.Type(value = TokenProviderAuthInfo.class, name = "token-provider"),
+    @JsonSubTypes.Type(value = CopilotApiTokenAuthInfo.class, name = "copilot-api-token"),
+    @JsonSubTypes.Type(value = UserAuthInfo.class, name = "user"),
+    @JsonSubTypes.Type(value = GhCliAuthInfo.class, name = "gh-cli"),
+    @JsonSubTypes.Type(value = ApiKeyAuthInfo.class, name = "api-key")
+})
+@JsonIgnoreProperties(ignoreUnknown = true)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public abstract class AuthInfo {
+
+    /**
+     * Returns the discriminator value for this variant.
+     *
+     * @return the type discriminator
+     */
+    public abstract String getType();
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java
similarity index 94%
rename from java/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java
index 1fb4b43ba4..5f81c8cf84 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java
@@ -28,6 +28,8 @@ public enum AuthInfoType {
     API_KEY("api-key"),
     /** The {@code token} variant. */
     TOKEN("token"),
+    /** The {@code token-provider} variant. */
+    TOKEN_PROVIDER("token-provider"),
     /** The {@code copilot-api-token} variant. */
     COPILOT_API_TOKEN("copilot-api-token");
 
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthValidationError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthValidationError.java
new file mode 100644
index 0000000000..99f78006fd
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthValidationError.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Validation error from an authentication attempt.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AuthValidationError(
+    /** Authentication validation error message */
+    @JsonProperty("message") String message,
+    /** Optional message returned by GitHub */
+    @JsonProperty("githubMessage") String gitHubMessage
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/BuiltInModelCatalogEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltInModelCatalogEntry.java
similarity index 78%
rename from java/src/generated/java/com/github/copilot/generated/rpc/BuiltInModelCatalogEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltInModelCatalogEntry.java
index 679278356e..a3f751b418 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/BuiltInModelCatalogEntry.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltInModelCatalogEntry.java
@@ -21,7 +21,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record BuiltInModelCatalogEntry(
-    /** Well-known runtime model ID suitable for `ProviderConfig.modelId` or `ProviderModelConfig.modelId`. This is not necessarily the provider-facing deployment or model name and does not indicate CAPI entitlement or provider availability. */
+    /** Well-known runtime model ID suitable for provider or provider-model metadata. This is not necessarily the provider-facing deployment or model name and does not indicate CAPI entitlement or provider availability. */
     @JsonProperty("id") String id
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolDescriptor.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolDescriptor.java
new file mode 100644
index 0000000000..057498fb98
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolDescriptor.java
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Rust-owned metadata and input schema for a built-in tool.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BuiltinToolDescriptor(
+    /** Stable name used to invoke the built-in tool. */
+    @JsonProperty("name") String name,
+    /** Optional human-readable title for the tool. */
+    @JsonProperty("title") String title,
+    /** Model-facing description of the tool's behavior. */
+    @JsonProperty("description") String description,
+    /** JSON Schema for the tool input, or null when the tool uses a custom format. */
+    @JsonProperty("inputSchema") BuiltinToolInputSchema inputSchema,
+    /** Optional supplemental usage instructions for the tool. */
+    @JsonProperty("instructions") String instructions,
+    /** Optional tool category discriminator. */
+    @JsonProperty("type") String type,
+    /** Optional custom input format used instead of a JSON Schema. */
+    @JsonProperty("format") BuiltinToolFormat format,
+    /** Policy describing which tool metadata may be recorded without obfuscation. */
+    @JsonProperty("safeForTelemetry") Object safeForTelemetry,
+    /** Whether the tool executes commands in a terminal. */
+    @JsonProperty("isTerminal") Boolean isTerminal,
+    /** Whether the tool provides a specialized intention summary. */
+    @JsonProperty("hasSummariseIntention") Boolean hasSummariseIntention
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolFormat.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolFormat.java
new file mode 100644
index 0000000000..7af5ef2d45
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolFormat.java
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Custom grammar input format accepted by a built-in tool.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BuiltinToolFormat(
+    /** Custom input-format discriminator. */
+    @JsonProperty("type") BuiltinToolFormatType type,
+    /** Grammar syntax used by the format definition. */
+    @JsonProperty("syntax") String syntax,
+    /** Grammar definition accepted by the tool. */
+    @JsonProperty("definition") String definition
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolFormatType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolFormatType.java
new file mode 100644
index 0000000000..6239493671
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolFormatType.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Custom input-format kind.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum BuiltinToolFormatType {
+    /** The {@code grammar} variant. */
+    GRAMMAR("grammar");
+
+    private final String value;
+    BuiltinToolFormatType(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static BuiltinToolFormatType fromValue(String value) {
+        for (BuiltinToolFormatType v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown BuiltinToolFormatType value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolInputSchema.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolInputSchema.java
new file mode 100644
index 0000000000..764450b37e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolInputSchema.java
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * JSON Schema object accepted by a built-in tool.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BuiltinToolInputSchema(
+    /** Root type of the tool input schema. */
+    @JsonProperty("type") BuiltinToolInputSchemaType type
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolInputSchemaType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolInputSchemaType.java
new file mode 100644
index 0000000000..729f3329b5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinToolInputSchemaType.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Root JSON Schema type for a built-in tool input.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum BuiltinToolInputSchemaType {
+    /** The {@code object} variant. */
+    OBJECT("object");
+
+    private final String value;
+    BuiltinToolInputSchemaType(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static BuiltinToolInputSchemaType fromValue(String value) {
+        for (BuiltinToolInputSchemaType v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown BuiltinToolInputSchemaType value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CanvasAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CanvasAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CanvasActionInvokeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasActionInvokeParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CanvasActionInvokeParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasActionInvokeParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CanvasCloseParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasCloseParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CanvasCloseParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasCloseParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CanvasHostContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasHostContext.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CanvasHostContext.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasHostContext.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CanvasHostContextCapabilities.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasHostContextCapabilities.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CanvasHostContextCapabilities.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasHostContextCapabilities.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CanvasOpenParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasOpenParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CanvasOpenParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasOpenParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CanvasOpenResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasOpenResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CanvasOpenResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasOpenResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CanvasSessionContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasSessionContext.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CanvasSessionContext.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CanvasSessionContext.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CapiSessionOptions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CapiSessionOptions.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CapiSessionOptions.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CapiSessionOptions.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CardDigest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CardDigest.java
new file mode 100644
index 0000000000..f14f9abdfc
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CardDigest.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Semantic digest of a strictly parsed and schema-validated JSON MCP card. Both URL-backed and embedded cards are canonicalised with RFC 8785 JSON Canonicalization Scheme, encoded as UTF-8, and hashed with SHA-256.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CardDigest(
+    /** Digest algorithm and canonical representation */
+    @JsonProperty("algorithm") CardDigestAlgorithm algorithm,
+    /** SHA-256 digest of the RFC 8785 canonical UTF-8 bytes, encoded as exactly 64 lowercase hexadecimal characters. */
+    @JsonProperty("value") String value
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CardDigestAlgorithm.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CardDigestAlgorithm.java
new file mode 100644
index 0000000000..83a691705b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CardDigestAlgorithm.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Canonical digest algorithm for a validated MCP card
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CardDigestAlgorithm {
+    /** The {@code sha256-rfc8785} variant. */
+    SHA256_RFC8785("sha256-rfc8785");
+
+    private final String value;
+    CardDigestAlgorithm(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CardDigestAlgorithm fromValue(String value) {
+        for (CardDigestAlgorithm v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CardDigestAlgorithm value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogAuthenticationRequiredError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogAuthenticationRequiredError.java
new file mode 100644
index 0000000000..3433f0e977
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogAuthenticationRequiredError.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * An optional catalog authentication exchange did not establish the caller's identity. Anonymous search remains supported; this refusal is reserved for an operation that cannot continue after the attempted exchange. It is distinct from `policy-rejected` and from a network failure, and the reason identifies the recovery action.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogAuthenticationRequiredError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "authentication-required";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Why authentication failed. Only an expired credential justifies attempting a silent refresh; an absent or rejected credential requires sign-in. */
+    @JsonProperty("reason")
+    private CatalogAuthenticationRequiredReason reason;
+
+    /** Human-readable explanation, safe to surface. Never contains a credential or token, nor a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogAuthenticationRequiredReason getReason() { return reason; }
+    public void setReason(CatalogAuthenticationRequiredReason reason) { this.reason = reason; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogAuthenticationRequiredReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogAuthenticationRequiredReason.java
new file mode 100644
index 0000000000..1c87593273
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogAuthenticationRequiredReason.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Why the catalog authority did not accept the caller's identity
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogAuthenticationRequiredReason {
+    /** The {@code no-credential} variant. */
+    NO_CREDENTIAL("no-credential"),
+    /** The {@code credential-expired} variant. */
+    CREDENTIAL_EXPIRED("credential-expired"),
+    /** The {@code credential-rejected} variant. */
+    CREDENTIAL_REJECTED("credential-rejected");
+
+    private final String value;
+    CatalogAuthenticationRequiredReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogAuthenticationRequiredReason fromValue(String value) {
+        for (CatalogAuthenticationRequiredReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogAuthenticationRequiredReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogCandidateKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogCandidateKind.java
new file mode 100644
index 0000000000..e7316cf872
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogCandidateKind.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * What kind of resource a catalog candidate describes
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogCandidateKind {
+    /** The {@code mcp-server} variant. */
+    MCP_SERVER("mcp-server"),
+    /** The {@code ai-skill} variant. */
+    AI_SKILL("ai-skill");
+
+    private final String value;
+    CatalogCandidateKind(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogCandidateKind fromValue(String value) {
+        for (CatalogCandidateKind v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogCandidateKind value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogCapability.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogCapability.java
new file mode 100644
index 0000000000..bb1662ba27
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogCapability.java
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * A wire feature a caller can require of the catalog surface, negotiated per request. A grant means the runtime understands the feature's contract, not that the deployment has enabled the operation; typed unavailable results report availability separately.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogCapability {
+    /** The {@code mcp-server-card} variant. */
+    MCP_SERVER_CARD("mcp-server-card"),
+    /** The {@code legacy-mcp-server-card} variant. */
+    LEGACY_MCP_SERVER_CARD("legacy-mcp-server-card"),
+    /** The {@code ai-skill-discovery} variant. */
+    AI_SKILL_DISCOVERY("ai-skill-discovery"),
+    /** The {@code mcp-install-planning} variant. */
+    MCP_INSTALL_PLANNING("mcp-install-planning"),
+    /** The {@code multiple-transport-choice} variant. */
+    MULTIPLE_TRANSPORT_CHOICE("multiple-transport-choice");
+
+    private final String value;
+    CatalogCapability(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogCapability fromValue(String value) {
+        for (CatalogCapability v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogCapability value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogClientContract.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogClientContract.java
new file mode 100644
index 0000000000..62cf8db22c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogClientContract.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The protocol version and capability set a caller requires, supplied on every catalog request so negotiation cannot be skipped by omission.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CatalogClientContract(
+    /** SDK protocol version the caller was generated against. A caller below the runtime's minimum supported version is refused rather than served a partial result. */
+    @JsonProperty("protocolVersion") Long protocolVersion,
+    /** Wire features the caller requires the runtime to understand. Identifiers are bounded but extensible so a newer caller can negotiate with an older runtime. Requiring an unknown feature yields a typed refusal listing what is understood, never a partial grant. A grant does not promise that a deployment has enabled the operation; typed unavailable results report that separately. */
+    @JsonProperty("requiredCapabilities") List<String> requiredCapabilities
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogContractViolationError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogContractViolationError.java
new file mode 100644
index 0000000000..5951d75a5e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogContractViolationError.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * An upstream catalog response broke the wire contract. Most importantly, every result must carry exactly one of a URL or embedded data: a result carrying both, or neither, is refused here rather than being guessed at.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogContractViolationError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "contract-violation";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Which rule the response broke. */
+    @JsonProperty("reason")
+    private CatalogContractViolationReason reason;
+
+    /** Human-readable explanation, safe to surface. Never echoes response content, nor a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogContractViolationReason getReason() { return reason; }
+    public void setReason(CatalogContractViolationReason reason) { this.reason = reason; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogContractViolationReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogContractViolationReason.java
new file mode 100644
index 0000000000..f289d67666
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogContractViolationReason.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Which wire-contract rule an upstream response broke
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogContractViolationReason {
+    /** The {@code both-url-and-data} variant. */
+    BOTH_URL_AND_DATA("both-url-and-data"),
+    /** The {@code neither-url-nor-data} variant. */
+    NEITHER_URL_NOR_DATA("neither-url-nor-data"),
+    /** The {@code duplicate-identity} variant. */
+    DUPLICATE_IDENTITY("duplicate-identity"),
+    /** The {@code unknown-media-type} variant. */
+    UNKNOWN_MEDIA_TYPE("unknown-media-type");
+
+    private final String value;
+    CatalogContractViolationReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogContractViolationReason fromValue(String value) {
+        for (CatalogContractViolationReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogContractViolationReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogHandleRejectedError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogHandleRejectedError.java
new file mode 100644
index 0000000000..7469d6194d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogHandleRejectedError.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * A presented handle was not accepted. Handles are runtime-instance scoped, TTL-bound, and single-use, so each way of failing is reported distinctly.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogHandleRejectedError extends McpPlanInstallResult {
+
+    @JsonProperty("kind")
+    private final String kind = "handle-rejected";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Which kind of handle was presented. */
+    @JsonProperty("handleType")
+    private CatalogHandleType handleType;
+
+    /** Why the handle was rejected. */
+    @JsonProperty("reason")
+    private CatalogHandleRejectionReason reason;
+
+    /** Human-readable explanation, safe to surface. Never contains the handle itself, nor a query, URL, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogHandleType getHandleType() { return handleType; }
+    public void setHandleType(CatalogHandleType handleType) { this.handleType = handleType; }
+
+    public CatalogHandleRejectionReason getReason() { return reason; }
+    public void setReason(CatalogHandleRejectionReason reason) { this.reason = reason; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogHandleRejectionReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogHandleRejectionReason.java
new file mode 100644
index 0000000000..6db6b69365
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogHandleRejectionReason.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Why a presented handle was rejected
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogHandleRejectionReason {
+    /** The {@code invalid} variant. */
+    INVALID("invalid"),
+    /** The {@code stale} variant. */
+    STALE("stale"),
+    /** The {@code replayed} variant. */
+    REPLAYED("replayed"),
+    /** The {@code foreign} variant. */
+    FOREIGN("foreign");
+
+    private final String value;
+    CatalogHandleRejectionReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogHandleRejectionReason fromValue(String value) {
+        for (CatalogHandleRejectionReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogHandleRejectionReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogHandleType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogHandleType.java
new file mode 100644
index 0000000000..a14ceef85b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogHandleType.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Which kind of opaque handle was presented
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogHandleType {
+    /** The {@code candidate} variant. */
+    CANDIDATE("candidate"),
+    /** The {@code plan} variant. */
+    PLAN("plan");
+
+    private final String value;
+    CatalogHandleType(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogHandleType fromValue(String value) {
+        for (CatalogHandleType v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogHandleType value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogInvalidRequestError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogInvalidRequestError.java
new file mode 100644
index 0000000000..0f9eb7e769
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogInvalidRequestError.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * The request was rejected before any work was done, because a bounded field fell outside its permitted range or a required field was unusable.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogInvalidRequestError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "invalid-request";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Which request field was rejected. */
+    @JsonProperty("field")
+    private CatalogInvalidRequestField field;
+
+    /** Human-readable explanation, safe to surface. Never echoes the offending value, nor a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogInvalidRequestField getField() { return field; }
+    public void setField(CatalogInvalidRequestField field) { this.field = field; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogInvalidRequestField.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogInvalidRequestField.java
new file mode 100644
index 0000000000..b930640163
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogInvalidRequestField.java
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Which request field was rejected before any work was done
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogInvalidRequestField {
+    /** The {@code query} variant. */
+    QUERY("query"),
+    /** The {@code limit} variant. */
+    LIMIT("limit"),
+    /** The {@code kinds} variant. */
+    KINDS("kinds"),
+    /** The {@code contract} variant. */
+    CONTRACT("contract"),
+    /** The {@code source} variant. */
+    SOURCE("source"),
+    /** The {@code card} variant. */
+    CARD("card"),
+    /** The {@code scope} variant. */
+    SCOPE("scope");
+
+    private final String value;
+    CatalogInvalidRequestField(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogInvalidRequestField fromValue(String value) {
+        for (CatalogInvalidRequestField v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogInvalidRequestField value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogMalformedCardError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogMalformedCardError.java
new file mode 100644
index 0000000000..24cb5cae13
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogMalformedCardError.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * A card could not be parsed or did not satisfy its declared media type's schema.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogMalformedCardError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "malformed-card";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** How the card failed validation. */
+    @JsonProperty("reason")
+    private CatalogMalformedCardReason reason;
+
+    /** Media type the card was interpreted as, when it declared one this runtime recognises. */
+    @JsonProperty("mediaType")
+    private CatalogMediaType mediaType;
+
+    /** Human-readable explanation, safe to surface. Never echoes card content, nor a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogMalformedCardReason getReason() { return reason; }
+    public void setReason(CatalogMalformedCardReason reason) { this.reason = reason; }
+
+    public CatalogMediaType getMediaType() { return mediaType; }
+    public void setMediaType(CatalogMediaType mediaType) { this.mediaType = mediaType; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogMalformedCardReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogMalformedCardReason.java
new file mode 100644
index 0000000000..17c1a05407
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogMalformedCardReason.java
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * How a card failed validation
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogMalformedCardReason {
+    /** The {@code invalid-json} variant. */
+    INVALID_JSON("invalid-json"),
+    /** The {@code schema-violation} variant. */
+    SCHEMA_VIOLATION("schema-violation"),
+    /** The {@code unsupported-media-type} variant. */
+    UNSUPPORTED_MEDIA_TYPE("unsupported-media-type"),
+    /** The {@code missing-required-field} variant. */
+    MISSING_REQUIRED_FIELD("missing-required-field"),
+    /** The {@code size-limit-exceeded} variant. */
+    SIZE_LIMIT_EXCEEDED("size-limit-exceeded");
+
+    private final String value;
+    CatalogMalformedCardReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogMalformedCardReason fromValue(String value) {
+        for (CatalogMalformedCardReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogMalformedCardReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogMediaType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogMediaType.java
new file mode 100644
index 0000000000..1528b052ee
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogMediaType.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Media type a catalog card is interpreted as
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogMediaType {
+    /** The {@code application/mcp-server-card+json} variant. */
+    APPLICATION_MCP_SERVER_CARD_JSON("application/mcp-server-card+json"),
+    /** The {@code application/mcp-server+json} variant. */
+    APPLICATION_MCP_SERVER_JSON("application/mcp-server+json"),
+    /** The {@code application/ai-skill} variant. */
+    APPLICATION_AI_SKILL("application/ai-skill");
+
+    private final String value;
+    CatalogMediaType(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogMediaType fromValue(String value) {
+        for (CatalogMediaType v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogMediaType value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNegotiatedContract.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNegotiatedContract.java
new file mode 100644
index 0000000000..379525fc28
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNegotiatedContract.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The protocol version and capability set the runtime actually honoured for a successful catalog operation.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CatalogNegotiatedContract(
+    /** Protocol version of the runtime that served the request. */
+    @JsonProperty("runtimeProtocolVersion") Long runtimeProtocolVersion,
+    /** Wire features the runtime understood for this operation. Always a superset of the caller's required features, because any shortfall is a refusal instead. Operation availability remains a separate typed result. */
+    @JsonProperty("grantedCapabilities") List<CatalogCapability> grantedCapabilities
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNegotiationRefusedError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNegotiationRefusedError.java
new file mode 100644
index 0000000000..56e20d3b4e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNegotiationRefusedError.java
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The caller's protocol version or required capabilities cannot be honoured. Returned instead of a partial or ambiguous success.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogNegotiationRefusedError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "negotiation-refused";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Whether the version or the capability set was the problem. */
+    @JsonProperty("reason")
+    private CatalogNegotiationRefusedReason reason;
+
+    /** Protocol version of the runtime that refused the request. */
+    @JsonProperty("runtimeProtocolVersion")
+    private Long runtimeProtocolVersion;
+
+    /** Lowest caller protocol version this runtime will serve. */
+    @JsonProperty("minimumSupportedProtocolVersion")
+    private Long minimumSupportedProtocolVersion;
+
+    /** Every wire feature this runtime understands, so the caller can retry within that contract. This list does not imply that every deployment has enabled every operation. */
+    @JsonProperty("supportedCapabilities")
+    private List<CatalogCapability> supportedCapabilities;
+
+    /** The subset of the caller's bounded extensible capability identifiers this runtime cannot honour. */
+    @JsonProperty("unsupportedCapabilities")
+    private List<String> unsupportedCapabilities;
+
+    /** Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogNegotiationRefusedReason getReason() { return reason; }
+    public void setReason(CatalogNegotiationRefusedReason reason) { this.reason = reason; }
+
+    public Long getRuntimeProtocolVersion() { return runtimeProtocolVersion; }
+    public void setRuntimeProtocolVersion(Long runtimeProtocolVersion) { this.runtimeProtocolVersion = runtimeProtocolVersion; }
+
+    public Long getMinimumSupportedProtocolVersion() { return minimumSupportedProtocolVersion; }
+    public void setMinimumSupportedProtocolVersion(Long minimumSupportedProtocolVersion) { this.minimumSupportedProtocolVersion = minimumSupportedProtocolVersion; }
+
+    public List<CatalogCapability> getSupportedCapabilities() { return supportedCapabilities; }
+    public void setSupportedCapabilities(List<CatalogCapability> supportedCapabilities) { this.supportedCapabilities = supportedCapabilities; }
+
+    public List<String> getUnsupportedCapabilities() { return unsupportedCapabilities; }
+    public void setUnsupportedCapabilities(List<String> unsupportedCapabilities) { this.unsupportedCapabilities = unsupportedCapabilities; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNegotiationRefusedReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNegotiationRefusedReason.java
new file mode 100644
index 0000000000..ee86246b4a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNegotiationRefusedReason.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Why capability and protocol-version negotiation refused a caller
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogNegotiationRefusedReason {
+    /** The {@code unsupported-protocol-version} variant. */
+    UNSUPPORTED_PROTOCOL_VERSION("unsupported-protocol-version"),
+    /** The {@code unsupported-capability} variant. */
+    UNSUPPORTED_CAPABILITY("unsupported-capability");
+
+    private final String value;
+    CatalogNegotiationRefusedReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogNegotiationRefusedReason fromValue(String value) {
+        for (CatalogNegotiationRefusedReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogNegotiationRefusedReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNetworkFailureError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNetworkFailureError.java
new file mode 100644
index 0000000000..d4afb32c3d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNetworkFailureError.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * The runtime could not reach the catalog authority or retrieve a card. Covers being offline as well as transport-level failure.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogNetworkFailureError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "network-failure";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Categorised failure, low cardinality so it can be aggregated without carrying a URL. */
+    @JsonProperty("reason")
+    private CatalogNetworkFailureReason reason;
+
+    /** HTTP status code, when the failure was a rejected response. */
+    @JsonProperty("statusCode")
+    private Long statusCode;
+
+    /** Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogNetworkFailureReason getReason() { return reason; }
+    public void setReason(CatalogNetworkFailureReason reason) { this.reason = reason; }
+
+    public Long getStatusCode() { return statusCode; }
+    public void setStatusCode(Long statusCode) { this.statusCode = statusCode; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNetworkFailureReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNetworkFailureReason.java
new file mode 100644
index 0000000000..c28d1cc4a7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNetworkFailureReason.java
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Categorised network failure, low cardinality so it can be aggregated without carrying a URL
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogNetworkFailureReason {
+    /** The {@code offline} variant. */
+    OFFLINE("offline"),
+    /** The {@code dns} variant. */
+    DNS("dns"),
+    /** The {@code timeout} variant. */
+    TIMEOUT("timeout"),
+    /** The {@code tls} variant. */
+    TLS("tls"),
+    /** The {@code connection-refused} variant. */
+    CONNECTION_REFUSED("connection-refused"),
+    /** The {@code http-status} variant. */
+    HTTP_STATUS("http-status"),
+    /** The {@code response-too-large} variant. */
+    RESPONSE_TOO_LARGE("response-too-large"),
+    /** The {@code redirect-rejected} variant. */
+    REDIRECT_REJECTED("redirect-rejected");
+
+    private final String value;
+    CatalogNetworkFailureReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogNetworkFailureReason fromValue(String value) {
+        for (CatalogNetworkFailureReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogNetworkFailureReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNotInstallableError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNotInstallableError.java
new file mode 100644
index 0000000000..2ba3c84ec4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNotInstallableError.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * The candidate is discoverable but cannot be installed. `application/ai-skill` resolves here, because it stays searchable while remaining typed non-installable.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogNotInstallableError extends McpPlanInstallResult {
+
+    @JsonProperty("kind")
+    private final String kind = "not-installable";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Why the candidate cannot be installed. */
+    @JsonProperty("reason")
+    private CatalogNotInstallableReason reason;
+
+    /** Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogNotInstallableReason getReason() { return reason; }
+    public void setReason(CatalogNotInstallableReason reason) { this.reason = reason; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNotInstallableReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNotInstallableReason.java
new file mode 100644
index 0000000000..75abb619e2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogNotInstallableReason.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Why a discoverable candidate cannot be installed
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogNotInstallableReason {
+    /** The {@code kind-not-installable} variant. */
+    KIND_NOT_INSTALLABLE("kind-not-installable"),
+    /** The {@code ai-skill-not-installable} variant. */
+    AI_SKILL_NOT_INSTALLABLE("ai-skill-not-installable"),
+    /** The {@code policy-forbids} variant. */
+    POLICY_FORBIDS("policy-forbids");
+
+    private final String value;
+    CatalogNotInstallableReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogNotInstallableReason fromValue(String value) {
+        for (CatalogNotInstallableReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogNotInstallableReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogPolicyRejectedError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogPolicyRejectedError.java
new file mode 100644
index 0000000000..56542ba46e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogPolicyRejectedError.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Registry or enterprise policy refused the operation.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogPolicyRejectedError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "policy-rejected";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Which authority produced the decision. */
+    @JsonProperty("source")
+    private McpPlanPolicySource source;
+
+    /** Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public McpPlanPolicySource getSource() { return source; }
+    public void setSource(McpPlanPolicySource source) { this.source = source; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogSearchParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogSearchParams.java
new file mode 100644
index 0000000000..ee5e703621
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogSearchParams.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * A bounded catalog search. Both the query length and the result count are capped by the schema so a caller cannot request an unbounded scan.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CatalogSearchParams(
+    /** Protocol version and capabilities the caller requires. */
+    @JsonProperty("contract") CatalogClientContract contract,
+    /** Free-text search query. Never written to logs or telemetry. */
+    @JsonProperty("query") String query,
+    /** Maximum number of candidates to return. Defaults to 10 when omitted. */
+    @JsonProperty("limit") Long limit,
+    /** Restrict results to these candidate kinds. When omitted, every kind the runtime supports is searched. */
+    @JsonProperty("kinds") List<CatalogCandidateKind> kinds
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogSearchResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogSearchResult.java
new file mode 100644
index 0000000000..4bfbf32701
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogSearchResult.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import javax.annotation.processing.Generated;
+
+/**
+ * Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
+ *
+ * @since 1.0.0
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind", visible = true)
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = CatalogSearchSucceeded.class, name = "succeeded"),
+    @JsonSubTypes.Type(value = CatalogNegotiationRefusedError.class, name = "negotiation-refused"),
+    @JsonSubTypes.Type(value = CatalogUnsupportedKindError.class, name = "unsupported-kind"),
+    @JsonSubTypes.Type(value = CatalogInvalidRequestError.class, name = "invalid-request"),
+    @JsonSubTypes.Type(value = CatalogAuthenticationRequiredError.class, name = "authentication-required"),
+    @JsonSubTypes.Type(value = CatalogPolicyRejectedError.class, name = "policy-rejected"),
+    @JsonSubTypes.Type(value = CatalogNetworkFailureError.class, name = "network-failure"),
+    @JsonSubTypes.Type(value = CatalogUnsafeRetrievalError.class, name = "unsafe-retrieval"),
+    @JsonSubTypes.Type(value = CatalogMalformedCardError.class, name = "malformed-card"),
+    @JsonSubTypes.Type(value = CatalogContractViolationError.class, name = "contract-violation"),
+    @JsonSubTypes.Type(value = CatalogUnavailableError.class, name = "unavailable")
+})
+@JsonIgnoreProperties(ignoreUnknown = true)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public abstract class CatalogSearchResult {
+
+    /**
+     * Returns the discriminator value for this variant.
+     *
+     * @return the kind discriminator
+     */
+    public abstract String getKind();
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogSearchSucceeded.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogSearchSucceeded.java
new file mode 100644
index 0000000000..8ecd11788a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogSearchSucceeded.java
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * A completed catalog search: inert candidate summaries, each carrying a single-use handle.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogSearchSucceeded extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "succeeded";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Pseudonymous identifier for this search, issued by the runtime or by the catalog authority it queried and never by the caller, so it cannot be forged or replayed to attribute an install to a search that never happened. Always present on a success, so a result set can be tied to the installs it leads to. It identifies a search rather than a person: it is derived from no user, account, device, or query data, and must never be joined with user identity to re-identify anyone. */
+    @JsonProperty("searchId")
+    private String searchId;
+
+    /** Matching candidates, never more than the requested limit. All text is inert untrusted data. */
+    @JsonProperty("candidates")
+    private List<Object> candidates;
+
+    /** Whether further matches existed beyond the requested limit. */
+    @JsonProperty("truncated")
+    private Boolean truncated;
+
+    /** Protocol version and capabilities the runtime honoured. */
+    @JsonProperty("negotiated")
+    private CatalogNegotiatedContract negotiated;
+
+    public String getSearchId() { return searchId; }
+    public void setSearchId(String searchId) { this.searchId = searchId; }
+
+    public List<Object> getCandidates() { return candidates; }
+    public void setCandidates(List<Object> candidates) { this.candidates = candidates; }
+
+    public Boolean getTruncated() { return truncated; }
+    public void setTruncated(Boolean truncated) { this.truncated = truncated; }
+
+    public CatalogNegotiatedContract getNegotiated() { return negotiated; }
+    public void setNegotiated(CatalogNegotiatedContract negotiated) { this.negotiated = negotiated; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableError.java
new file mode 100644
index 0000000000..7f21c57085
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableError.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * The operation is not available on this runtime. Distinct from a network failure: nothing was attempted.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogUnavailableError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "unavailable";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Why the operation is unavailable. */
+    @JsonProperty("reason")
+    private CatalogUnavailableReason reason;
+
+    /** Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogUnavailableReason getReason() { return reason; }
+    public void setReason(CatalogUnavailableReason reason) { this.reason = reason; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableReason.java
new file mode 100644
index 0000000000..c7bf4dcd76
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableReason.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Why a catalog operation is not available on this runtime
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogUnavailableReason {
+    /** The {@code search-unavailable} variant. */
+    SEARCH_UNAVAILABLE("search-unavailable"),
+    /** The {@code planning-unavailable} variant. */
+    PLANNING_UNAVAILABLE("planning-unavailable"),
+    /** The {@code authority-not-configured} variant. */
+    AUTHORITY_NOT_CONFIGURED("authority-not-configured"),
+    /** The {@code disabled-by-policy} variant. */
+    DISABLED_BY_POLICY("disabled-by-policy");
+
+    private final String value;
+    CatalogUnavailableReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogUnavailableReason fromValue(String value) {
+        for (CatalogUnavailableReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogUnavailableReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableTransportError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableTransportError.java
new file mode 100644
index 0000000000..3c40687eac
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableTransportError.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * No transport this runtime can use is available for the requested server.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogUnavailableTransportError extends McpPlanInstallResult {
+
+    @JsonProperty("kind")
+    private final String kind = "unavailable-transport";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Why no transport could be offered. */
+    @JsonProperty("reason")
+    private CatalogUnavailableTransportReason reason;
+
+    /** Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogUnavailableTransportReason getReason() { return reason; }
+    public void setReason(CatalogUnavailableTransportReason reason) { this.reason = reason; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableTransportReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableTransportReason.java
new file mode 100644
index 0000000000..d532967313
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnavailableTransportReason.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Why no usable transport could be offered
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogUnavailableTransportReason {
+    /** The {@code no-eligible-transport} variant. */
+    NO_ELIGIBLE_TRANSPORT("no-eligible-transport"),
+    /** The {@code transport-not-supported} variant. */
+    TRANSPORT_NOT_SUPPORTED("transport-not-supported"),
+    /** The {@code remote-enumeration-unavailable} variant. */
+    REMOTE_ENUMERATION_UNAVAILABLE("remote-enumeration-unavailable");
+
+    private final String value;
+    CatalogUnavailableTransportReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogUnavailableTransportReason fromValue(String value) {
+        for (CatalogUnavailableTransportReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogUnavailableTransportReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnsafeRetrievalError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnsafeRetrievalError.java
new file mode 100644
index 0000000000..513ce5b80f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnsafeRetrievalError.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Retrieval was refused by the runtime's hardened fetch boundary before any request left the process, or before a redirect was followed.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogUnsafeRetrievalError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "unsafe-retrieval";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Which control refused the retrieval, low cardinality so it can be aggregated without carrying a URL. */
+    @JsonProperty("reason")
+    private CatalogUnsafeRetrievalReason reason;
+
+    /** Human-readable explanation, safe to surface. Never contains the refused URL, nor a query, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public CatalogUnsafeRetrievalReason getReason() { return reason; }
+    public void setReason(CatalogUnsafeRetrievalReason reason) { this.reason = reason; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnsafeRetrievalReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnsafeRetrievalReason.java
new file mode 100644
index 0000000000..e05931dac1
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnsafeRetrievalReason.java
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Which hardened-fetch control refused a retrieval
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CatalogUnsafeRetrievalReason {
+    /** The {@code blocked-scheme} variant. */
+    BLOCKED_SCHEME("blocked-scheme"),
+    /** The {@code credentials-in-url} variant. */
+    CREDENTIALS_IN_URL("credentials-in-url"),
+    /** The {@code blocked-address} variant. */
+    BLOCKED_ADDRESS("blocked-address"),
+    /** The {@code redirect-to-blocked-address} variant. */
+    REDIRECT_TO_BLOCKED_ADDRESS("redirect-to-blocked-address"),
+    /** The {@code proxy-rejected} variant. */
+    PROXY_REJECTED("proxy-rejected"),
+    /** The {@code host-not-permitted} variant. */
+    HOST_NOT_PERMITTED("host-not-permitted");
+
+    private final String value;
+    CatalogUnsafeRetrievalReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CatalogUnsafeRetrievalReason fromValue(String value) {
+        for (CatalogUnsafeRetrievalReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CatalogUnsafeRetrievalReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnsupportedKindError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnsupportedKindError.java
new file mode 100644
index 0000000000..06cc7bc5a8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CatalogUnsupportedKindError.java
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The request asked for a candidate kind this runtime does not serve.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CatalogUnsupportedKindError extends CatalogSearchResult {
+
+    @JsonProperty("kind")
+    private final String kind = "unsupported-kind";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** The kinds from the request that are not supported. */
+    @JsonProperty("requestedKinds")
+    private List<CatalogCandidateKind> requestedKinds;
+
+    /** Every candidate kind this runtime can serve. */
+    @JsonProperty("supportedKinds")
+    private List<CatalogCandidateKind> supportedKinds;
+
+    /** Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret. */
+    @JsonProperty("message")
+    private String message;
+
+    public List<CatalogCandidateKind> getRequestedKinds() { return requestedKinds; }
+    public void setRequestedKinds(List<CatalogCandidateKind> requestedKinds) { this.requestedKinds = requestedKinds; }
+
+    public List<CatalogCandidateKind> getSupportedKinds() { return supportedKinds; }
+    public void setSupportedKinds(List<CatalogCandidateKind> supportedKinds) { this.supportedKinds = supportedKinds; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CommandsInvocationEffectOutcome.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CommandsInvocationEffectOutcome.java
new file mode 100644
index 0000000000..79f3be8baf
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CommandsInvocationEffectOutcome.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Whether a pending slash-command invocation effect was applied or cancelled by the host.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CommandsInvocationEffectOutcome {
+    /** The {@code applied} variant. */
+    APPLIED("applied"),
+    /** The {@code cancelled} variant. */
+    CANCELLED("cancelled");
+
+    private final String value;
+    CommandsInvocationEffectOutcome(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CommandsInvocationEffectOutcome fromValue(String value) {
+        for (CommandsInvocationEffectOutcome v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CommandsInvocationEffectOutcome value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CommandsInvocationOrigin.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CommandsInvocationOrigin.java
new file mode 100644
index 0000000000..14d5906d34
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CommandsInvocationOrigin.java
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum CommandsInvocationOrigin {
+    /** The {@code settings} variant. */
+    SETTINGS("settings");
+
+    private final String value;
+    CommandsInvocationOrigin(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static CommandsInvocationOrigin fromValue(String value) {
+        for (CommandsInvocationOrigin v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown CommandsInvocationOrigin value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CommandsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CommandsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CommandsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CommandsListResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectClientInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectClientInfo.java
new file mode 100644
index 0000000000..e5b6b6f24d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectClientInfo.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Identity of the integrating host, declared once on the `server.connect` handshake so telemetry from this connection is attributed to a single, consistent surface. All fields are optional; omit them to keep the default attribution.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ConnectClientInfo(
+    /** Name of the host editor, e.g. `"vscode"`. */
+    @JsonProperty("editorName") String editorName,
+    /** Version of the host editor, e.g. `"1.124.2"`. Ignored unless it looks like a version string. */
+    @JsonProperty("editorVersion") String editorVersion,
+    /** Name of the Copilot extension within the host, e.g. `"copilot-chat"`. */
+    @JsonProperty("extensionName") String extensionName,
+    /** Version of the Copilot extension within the host, e.g. `"0.54.0"`. Ignored unless it looks like a version string. */
+    @JsonProperty("extensionVersion") String extensionVersion
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ConnectParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectParams.java
similarity index 83%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ConnectParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectParams.java
index 19172cb1b4..05f2534970 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ConnectParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectParams.java
@@ -14,7 +14,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Parameters for the `server.connect` handshake: an optional connection token and optional connection-level opt-ins (e.g. GitHub telemetry forwarding).
+ * Connection-level opt-ins for the `server.connect` handshake. Transport authentication is consumed by the native protocol boundary before dispatch.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
@@ -24,9 +24,11 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record ConnectParams(
-    /** Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN */
-    @JsonProperty("token") String token,
     /** Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the runtime forwards every internal telemetry event it emits — across all sessions, plus sessionless events — to this connection over the `gitHubTelemetry.event` notification. Regular events are also written to the runtime's normal GitHub/CTS path (dual-write); host-only compatibility events are forward-only and intentionally skip that path. Intended for first-party hosts that re-emit the events into their own telemetry stores. Both unrestricted and restricted events are forwarded, each tagged with a `restricted` discriminator; a backstop drops restricted events when restricted telemetry is disabled — using the process-global gate for ordinary events and an explicit session-scoped decision for host-only events. */
-    @JsonProperty("enableGitHubTelemetryForwarding") Boolean enableGitHubTelemetryForwarding
+    @JsonProperty("enableGitHubTelemetryForwarding") Boolean enableGitHubTelemetryForwarding,
+    /** Identity of the integrating host. Optional; omit it to keep the default attribution. */
+    @JsonProperty("clientInfo") ConnectClientInfo clientInfo,
+    /** Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN */
+    @JsonProperty("token") String token
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ConnectResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ConnectResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadata.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadata.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadata.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadataKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadataKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadataKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadataKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadataRepository.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadataRepository.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadataRepository.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectedRemoteSessionMetadataRepository.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ContentExclusionPathCheck.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ContentExclusionPathCheck.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ContentExclusionPathCheck.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ContentExclusionPathCheck.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ContextHeaviestMessage.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ContextHeaviestMessage.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ContextHeaviestMessage.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ContextHeaviestMessage.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ContextTier.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ContextTier.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ContextTier.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ContextTier.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotApiTokenAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotApiTokenAuthInfo.java
new file mode 100644
index 0000000000..2e6952f538
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotApiTokenAuthInfo.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication-info variant for direct Copilot API token auth sourced from environment variables, with public GitHub host.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class CopilotApiTokenAuthInfo extends AuthInfo {
+
+    @JsonProperty("type")
+    private final String type = "copilot-api-token";
+
+    @Override
+    public String getType() { return type; }
+
+    /** Authentication host (always the public GitHub host). */
+    @JsonProperty("host")
+    private String host;
+
+    /** Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set. */
+    @JsonProperty("copilotUser")
+    private CopilotUserResponse copilotUser;
+
+    public String getHost() { return host; }
+    public void setHost(String host) { this.host = host; }
+
+    public CopilotUserResponse getCopilotUser() { return copilotUser; }
+    public void setCopilotUser(CopilotUserResponse copilotUser) { this.copilotUser = copilotUser; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponse.java
new file mode 100644
index 0000000000..cd6d5c83bd
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponse.java
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CopilotUserResponse(
+    /** GitHub login of the authenticated user. */
+    @JsonProperty("login") String login,
+    /** Copilot access SKU identifier (e.g. `free_limited_copilot`, `copilot_for_business_seat_quota`) used to gate model and feature access. */
+    @JsonProperty("access_type_sku") String accessTypeSku,
+    /** Opaque analytics tracking identifier for the user, forwarded from the Copilot API. */
+    @JsonProperty("analytics_tracking_id") String analyticsTrackingId,
+    /** Date the Copilot seat was assigned to the user, if applicable. */
+    @JsonProperty("assigned_date") Object assignedDate,
+    /** Whether the user is eligible to sign up for the free/limited Copilot tier. */
+    @JsonProperty("can_signup_for_limited") Boolean canSignupForLimited,
+    /** Whether Copilot chat is enabled for the user. */
+    @JsonProperty("chat_enabled") Boolean chatEnabled,
+    /** Copilot plan name for the user (e.g. `individual`, `business`, `enterprise`). */
+    @JsonProperty("copilot_plan") String copilotPlan,
+    /** Whether `.copilotignore` content-exclusion support is enabled for the user. */
+    @JsonProperty("copilotignore_enabled") Boolean copilotignoreEnabled,
+    /** Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough. */
+    @JsonProperty("endpoints") CopilotUserResponseEndpoints endpoints,
+    /** Logins of the organizations the user belongs to. */
+    @JsonProperty("organization_login_list") List<String> organizationLoginList,
+    /** Organizations the user belongs to, each with an optional login and display name. */
+    @JsonProperty("organization_list") Object organizationList,
+    /** Whether the Codex agent is enabled for the user. */
+    @JsonProperty("codex_agent_enabled") Boolean codexAgentEnabled,
+    /** Whether MCP (Model Context Protocol) support is enabled for the user. */
+    @JsonProperty("is_mcp_enabled") Object isMcpEnabled,
+    /** Date the user's usage quota next resets, as a raw string from the Copilot API; see `quota_reset_date_utc` for the UTC-normalized value. */
+    @JsonProperty("quota_reset_date") String quotaResetDate,
+    /** Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries. */
+    @JsonProperty("quota_snapshots") CopilotUserResponseQuotaSnapshots quotaSnapshots,
+    /** Whether the user's telemetry is subject to restricted-data handling. */
+    @JsonProperty("restricted_telemetry") Boolean restrictedTelemetry,
+    /** Whether the user is a GitHub/Microsoft staff member. */
+    @JsonProperty("is_staff") Boolean isStaff,
+    /** Raw passthrough of the Copilot API `te` flag for the user (an opaque server-side eligibility signal surfaced in telemetry); not otherwise interpreted by the runtime. */
+    @JsonProperty("te") Boolean te,
+    /** Whether the account is on usage-based (token/AI-credit) billing rather than a fixed premium-request quota. */
+    @JsonProperty("token_based_billing") Boolean tokenBasedBilling,
+    /** Whether the user is able to upgrade their Copilot plan. */
+    @JsonProperty("can_upgrade_plan") Boolean canUpgradePlan,
+    /** UTC-normalized form of `quota_reset_date` (the date the user's usage quota next resets). */
+    @JsonProperty("quota_reset_date_utc") String quotaResetDateUtc,
+    /** Per-category quota allotments for free/limited-tier users, keyed by quota category. */
+    @JsonProperty("limited_user_quotas") Map<String, Double> limitedUserQuotas,
+    /** Date the free/limited-tier user's quotas next reset, as a raw string from the Copilot API. */
+    @JsonProperty("limited_user_reset_date") String limitedUserResetDate,
+    /** Per-category monthly quota allotments, keyed by quota category. */
+    @JsonProperty("monthly_quotas") Map<String, Double> monthlyQuotas,
+    /** Whether cloud session storage is enabled for the user. */
+    @JsonProperty("cloud_session_storage_enabled") Boolean cloudSessionStorageEnabled,
+    /** Whether CLI remote control is enabled for the user. */
+    @JsonProperty("cli_remote_control_enabled") Boolean cliRemoteControlEnabled
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseEndpoints.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseEndpoints.java
new file mode 100644
index 0000000000..3e4606559f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseEndpoints.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CopilotUserResponseEndpoints(
+    /** Copilot API endpoint URL. */
+    @JsonProperty("api") String api,
+    /** Origin-tracker endpoint URL. */
+    @JsonProperty("origin-tracker") String originTracker,
+    /** Copilot proxy endpoint URL. */
+    @JsonProperty("proxy") String proxy,
+    /** Copilot telemetry endpoint URL. */
+    @JsonProperty("telemetry") String telemetry,
+    /** Experimental-service endpoint URL. */
+    @JsonProperty("exp") String exp
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshots.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshots.java
new file mode 100644
index 0000000000..10c983bb40
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshots.java
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CopilotUserResponseQuotaSnapshots(
+    /** Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields. */
+    @JsonProperty("chat") CopilotUserResponseQuotaSnapshotsChat chat,
+    /** Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields. */
+    @JsonProperty("completions") CopilotUserResponseQuotaSnapshotsCompletions completions,
+    /** Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields. */
+    @JsonProperty("premium_interactions") CopilotUserResponseQuotaSnapshotsPremiumInteractions premiumInteractions
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshotsChat.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshotsChat.java
new file mode 100644
index 0000000000..94a516286b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshotsChat.java
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CopilotUserResponseQuotaSnapshotsChat(
+    /** Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement. */
+    @JsonProperty("entitlement") Double entitlement,
+    /** Count of additional pay-per-request usage consumed this period beyond the entitlement. */
+    @JsonProperty("overage_count") Double overageCount,
+    /** Whether usage may continue at pay-per-request rates once the entitlement is exhausted. */
+    @JsonProperty("overage_permitted") Boolean overagePermitted,
+    /** Percentage of the entitlement remaining at the snapshot timestamp. */
+    @JsonProperty("percent_remaining") Double percentRemaining,
+    /** Identifier of the quota bucket this snapshot describes. */
+    @JsonProperty("quota_id") String quotaId,
+    /** Amount of quota remaining at the snapshot timestamp. */
+    @JsonProperty("quota_remaining") Double quotaRemaining,
+    /** Remaining entitlement/quota amount at the snapshot timestamp. */
+    @JsonProperty("remaining") Double remaining,
+    /** Whether the entitlement for this category is unlimited. */
+    @JsonProperty("unlimited") Boolean unlimited,
+    /** UTC timestamp when this snapshot was captured. */
+    @JsonProperty("timestamp_utc") String timestampUtc,
+    /** Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets. */
+    @JsonProperty("has_quota") Boolean hasQuota,
+    /** Unix epoch time, in seconds, when this quota next resets. */
+    @JsonProperty("quota_reset_at") Double quotaResetAt,
+    /** Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count. */
+    @JsonProperty("token_based_billing") Boolean tokenBasedBilling
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshotsCompletions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshotsCompletions.java
new file mode 100644
index 0000000000..826b034ba0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshotsCompletions.java
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CopilotUserResponseQuotaSnapshotsCompletions(
+    /** Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement. */
+    @JsonProperty("entitlement") Double entitlement,
+    /** Count of additional pay-per-request usage consumed this period beyond the entitlement. */
+    @JsonProperty("overage_count") Double overageCount,
+    /** Whether usage may continue at pay-per-request rates once the entitlement is exhausted. */
+    @JsonProperty("overage_permitted") Boolean overagePermitted,
+    /** Percentage of the entitlement remaining at the snapshot timestamp. */
+    @JsonProperty("percent_remaining") Double percentRemaining,
+    /** Identifier of the quota bucket this snapshot describes. */
+    @JsonProperty("quota_id") String quotaId,
+    /** Amount of quota remaining at the snapshot timestamp. */
+    @JsonProperty("quota_remaining") Double quotaRemaining,
+    /** Remaining entitlement/quota amount at the snapshot timestamp. */
+    @JsonProperty("remaining") Double remaining,
+    /** Whether the entitlement for this category is unlimited. */
+    @JsonProperty("unlimited") Boolean unlimited,
+    /** UTC timestamp when this snapshot was captured. */
+    @JsonProperty("timestamp_utc") String timestampUtc,
+    /** Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets. */
+    @JsonProperty("has_quota") Boolean hasQuota,
+    /** Unix epoch time, in seconds, when this quota next resets. */
+    @JsonProperty("quota_reset_at") Double quotaResetAt,
+    /** Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count. */
+    @JsonProperty("token_based_billing") Boolean tokenBasedBilling
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshotsPremiumInteractions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshotsPremiumInteractions.java
new file mode 100644
index 0000000000..ca4a08b4f0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CopilotUserResponseQuotaSnapshotsPremiumInteractions.java
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record CopilotUserResponseQuotaSnapshotsPremiumInteractions(
+    /** Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement. */
+    @JsonProperty("entitlement") Double entitlement,
+    /** Count of additional pay-per-request usage consumed this period beyond the entitlement. */
+    @JsonProperty("overage_count") Double overageCount,
+    /** Whether usage may continue at pay-per-request rates once the entitlement is exhausted. */
+    @JsonProperty("overage_permitted") Boolean overagePermitted,
+    /** Percentage of the entitlement remaining at the snapshot timestamp. */
+    @JsonProperty("percent_remaining") Double percentRemaining,
+    /** Identifier of the quota bucket this snapshot describes. */
+    @JsonProperty("quota_id") String quotaId,
+    /** Amount of quota remaining at the snapshot timestamp. */
+    @JsonProperty("quota_remaining") Double quotaRemaining,
+    /** Remaining entitlement/quota amount at the snapshot timestamp. */
+    @JsonProperty("remaining") Double remaining,
+    /** Whether the entitlement for this category is unlimited. */
+    @JsonProperty("unlimited") Boolean unlimited,
+    /** UTC timestamp when this snapshot was captured. */
+    @JsonProperty("timestamp_utc") String timestampUtc,
+    /** Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets. */
+    @JsonProperty("has_quota") Boolean hasQuota,
+    /** Unix epoch time, in seconds, when this quota next resets. */
+    @JsonProperty("quota_reset_at") Double quotaResetAt,
+    /** Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count. */
+    @JsonProperty("token_based_billing") Boolean tokenBasedBilling
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/CurrentToolMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CurrentToolMetadata.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/CurrentToolMetadata.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/CurrentToolMetadata.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsCollectedEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsCollectedEntry.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsCollectedEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsCollectedEntry.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsEntry.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsEntry.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsEntryKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsEntryKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsEntryKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsEntryKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsInclude.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsInclude.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsInclude.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsInclude.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsRedaction.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsRedaction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsRedaction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsRedaction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsResultKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsResultKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsResultKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsResultKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsSkippedEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsSkippedEntry.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsSkippedEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsSkippedEntry.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DebugCollectLogsSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredCanvas.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredCanvas.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredCanvas.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredCanvas.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtension.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtension.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtension.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtension.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionPlugin.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionPlugin.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionPlugin.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionPlugin.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredExtensionSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredMcpServer.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredMcpServer.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredMcpServer.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredMcpServer.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredMcpServerType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredMcpServerType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/DiscoveredMcpServerType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/DiscoveredMcpServerType.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvAuthInfo.java
new file mode 100644
index 0000000000..ce96797903
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvAuthInfo.java
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication-info input variant for a token sourced from an environment variable, with host, optional login, token, and env var name.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class EnvAuthInfo extends AuthInfo {
+
+    @JsonProperty("type")
+    private final String type = "env";
+
+    @Override
+    public String getType() { return type; }
+
+    /** Authentication host (e.g. https://github.com or a GHES host). */
+    @JsonProperty("host")
+    private String host;
+
+    /** User login associated with the token. Undefined for server-to-server tokens (those starting with `ghs_`). */
+    @JsonProperty("login")
+    private String login;
+
+    /** The token value itself. Treat as a secret. */
+    @JsonProperty("token")
+    private String token;
+
+    /** Name of the environment variable the token was sourced from. */
+    @JsonProperty("envVar")
+    private String envVar;
+
+    /** Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set. */
+    @JsonProperty("copilotUser")
+    private CopilotUserResponse copilotUser;
+
+    public String getHost() { return host; }
+    public void setHost(String host) { this.host = host; }
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+
+    public String getToken() { return token; }
+    public void setToken(String token) { this.token = token; }
+
+    public String getEnvVar() { return envVar; }
+    public void setEnvVar(String envVar) { this.envVar = envVar; }
+
+    public CopilotUserResponse getCopilotUser() { return copilotUser; }
+    public void setCopilotUser(CopilotUserResponse copilotUser) { this.copilotUser = copilotUser; }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/EventsAgentScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EventsAgentScope.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/EventsAgentScope.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/EventsAgentScope.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/EventsCursorStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EventsCursorStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/EventsCursorStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/EventsCursorStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/EventsReadDirection.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EventsReadDirection.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/EventsReadDirection.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/EventsReadDirection.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/Extension.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Extension.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/Extension.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/Extension.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionLaunchProfile.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionLaunchProfile.java
new file mode 100644
index 0000000000..e7590c7f9e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionLaunchProfile.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Opaque integrator-owned process launch profile for one extension entrypoint.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ExtensionLaunchProfile(
+    /** Executable used to launch the extension entrypoint. */
+    @JsonProperty("executable") String executable,
+    /** Opaque integrator-defined arguments passed to the executable. The runtime does not append the extension entrypoint. */
+    @JsonProperty("args") List<String> args,
+    /** Opaque integrator-defined environment variables. Runtime-owned COPILOT_SDK_PATH, SESSION_ID, and COPILOT_EXTENSION_PARENT_PID values take precedence. */
+    @JsonProperty("env") Map<String, String> env
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionLaunchProviderResolveRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionLaunchProviderResolveRequest.java
new file mode 100644
index 0000000000..7b520f9067
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionLaunchProviderResolveRequest.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * A discovered extension entrypoint that the registered integrator may classify and resolve to an opaque launch profile.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ExtensionLaunchProviderResolveRequest(
+    /** Source-qualified extension identifier. */
+    @JsonProperty("id") String id,
+    /** Human-readable extension name. */
+    @JsonProperty("name") String name,
+    /** Absolute path to the discovered extension entrypoint. */
+    @JsonProperty("modulePath") String modulePath,
+    /** Discovery source for the extension entrypoint. */
+    @JsonProperty("source") ExtensionSource source
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionLaunchProviderResolveResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionLaunchProviderResolveResult.java
new file mode 100644
index 0000000000..8a43ad4af3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionLaunchProviderResolveResult.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * The launch profile for a supported entrypoint. Omit launch when the provider does not support the entrypoint.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ExtensionLaunchProviderResolveResult(
+    /** Opaque launch profile, omitted when this provider does not support the entrypoint. */
+    @JsonProperty("launch") ExtensionLaunchProfile launch
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ExtensionSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ExtensionSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ExtensionStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ExtensionStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ExtensionsDisableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionsDisableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ExtensionsDisableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionsDisableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ExtensionsDiscoverResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionsDiscoverResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ExtensionsDiscoverResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionsDiscoverResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ExtensionsEnableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionsEnableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ExtensionsEnableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExtensionsEnableParams.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExternalToolTextResultForLlmBinaryResultsForLlm.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExternalToolTextResultForLlmBinaryResultsForLlm.java
new file mode 100644
index 0000000000..9aec5d03a1
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExternalToolTextResultForLlmBinaryResultsForLlm.java
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Binary result returned by a tool for the model
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ExternalToolTextResultForLlmBinaryResultsForLlm(
+    /** Binary result type discriminator. Use "image" for images and "resource" for other binary data. */
+    @JsonProperty("type") ExternalToolTextResultForLlmBinaryResultsForLlmType type,
+    /** Base64-encoded binary data */
+    @JsonProperty("data") String data,
+    /** MIME type of the binary data */
+    @JsonProperty("mimeType") String mimeType,
+    /** Human-readable description of the binary data */
+    @JsonProperty("description") String description,
+    /** Optional metadata from the producing tool. */
+    @JsonProperty("metadata") Map<String, Object> metadata
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExternalToolTextResultForLlmBinaryResultsForLlmType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExternalToolTextResultForLlmBinaryResultsForLlmType.java
new file mode 100644
index 0000000000..d73e769b87
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ExternalToolTextResultForLlmBinaryResultsForLlmType.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ExternalToolTextResultForLlmBinaryResultsForLlmType {
+    /** The {@code image} variant. */
+    IMAGE("image"),
+    /** The {@code resource} variant. */
+    RESOURCE("resource");
+
+    private final String value;
+    ExternalToolTextResultForLlmBinaryResultsForLlmType(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ExternalToolTextResultForLlmBinaryResultsForLlmType fromValue(String value) {
+        for (ExternalToolTextResultForLlmBinaryResultsForLlmType v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ExternalToolTextResultForLlmBinaryResultsForLlmType value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryAbortParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryAbortParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryAbortParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryAbortParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentOptions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentOptions.java
similarity index 69%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentOptions.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentOptions.java
index 675e715e85..9910d4f7f5 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentOptions.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentOptions.java
@@ -26,6 +26,12 @@ public record FactoryAgentOptions(
     /** Optional JSON Schema for structured agent output. */
     @JsonProperty("schema") Object schema,
     /** Optional model identifier for the subagent. */
-    @JsonProperty("model") String model
+    @JsonProperty("model") String model,
+    /** Optional reasoning effort for the subagent. This field is accepted but not yet honored. */
+    @JsonProperty("reasoningEffort") String reasoningEffort,
+    /** Optional context tier for the subagent. This field is accepted but not yet honored. */
+    @JsonProperty("contextTier") ContextTier contextTier,
+    /** Optional custom agent name for the subagent. This field is accepted but not yet honored. */
+    @JsonProperty("agent") String agent
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentSummary.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentSummary.java
similarity index 65%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentSummary.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentSummary.java
index af20d8e810..d1bd2329b2 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentSummary.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryAgentSummary.java
@@ -21,18 +21,33 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record FactoryAgentSummary(
+    /** Stable direct-agent identifier. */
     @JsonProperty("agentId") String agentId,
+    /** Tool-call identifier that launched the agent. */
     @JsonProperty("toolCallId") String toolCallId,
+    /** Owning factory run identifier. */
     @JsonProperty("runId") String runId,
+    /** Phase identifier active when the agent was launched, or null. */
     @JsonProperty("phaseId") String phaseId,
+    /** Friendly, non-unique name intended for display */
     @JsonProperty("label") String label,
+    /** Friendly, non-unique name intended for display */
+    @JsonProperty("displayName") String displayName,
+    /** Registered agent type. */
     @JsonProperty("agentType") String agentType,
+    /** Current durable or live agent status. */
     @JsonProperty("status") String status,
+    /** Model requested when the agent was launched. */
     @JsonProperty("requestedModel") String requestedModel,
+    /** Concrete model resolved for the agent. */
     @JsonProperty("resolvedModel") String resolvedModel,
+    /** Epoch milliseconds when the agent started. */
     @JsonProperty("startedAt") Long startedAt,
+    /** Epoch milliseconds when the agent completed. */
     @JsonProperty("completedAt") Long completedAt,
+    /** Accumulated active agent time in milliseconds. */
     @JsonProperty("activeMs") Long activeMs,
+    /** Prompt-safe live activity text. */
     @JsonProperty("activity") String activity
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryCurrentPhase.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryCurrentPhase.java
similarity index 88%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryCurrentPhase.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryCurrentPhase.java
index 6a8de8e82c..e0a30f51a6 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryCurrentPhase.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryCurrentPhase.java
@@ -21,7 +21,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record FactoryCurrentPhase(
+    /** Current phase identifier. */
     @JsonProperty("id") String id,
+    /** Zero-based declared phase ordinal, or null for an undeclared phase. */
     @JsonProperty("ordinal") Long ordinal
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryDeclaredLimits.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryDeclaredLimits.java
similarity index 82%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryDeclaredLimits.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryDeclaredLimits.java
index 21f74646fb..7fa99b005b 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryDeclaredLimits.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryDeclaredLimits.java
@@ -21,9 +21,13 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record FactoryDeclaredLimits(
+    /** Maximum concurrently active subagents. */
     @JsonProperty("maxConcurrentSubagents") Long maxConcurrentSubagents,
+    /** Maximum total subagents spawned by the run. */
     @JsonProperty("maxTotalSubagents") Long maxTotalSubagents,
+    /** Maximum accumulated active execution time in seconds. */
     @JsonProperty("timeoutSeconds") Double timeoutSeconds,
+    /** Maximum AI credits consumed by subagents and descendants. */
     @JsonProperty("maxAiCredits") Double maxAiCredits
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryExecuteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryExecuteParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryExecuteParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryExecuteParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryExecuteResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryExecuteResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryExecuteResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryExecuteResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryLogLine.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryLogLine.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryLogLine.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryLogLine.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryLogLineKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryLogLineKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryLogLineKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryLogLineKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseObservation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseObservation.java
similarity index 62%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseObservation.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseObservation.java
index aa04ef5ba8..aa96e0cb90 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseObservation.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseObservation.java
@@ -21,18 +21,31 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record FactoryPhaseObservation(
+    /** Phase identifier. */
     @JsonProperty("id") String id,
+    /** Zero-based declared phase ordinal, or null for an undeclared phase. */
     @JsonProperty("ordinal") Long ordinal,
+    /** Human-readable phase title. */
     @JsonProperty("title") String title,
+    /** Optional human-readable phase detail. */
     @JsonProperty("detail") String detail,
+    /** Derived lifecycle state of the phase. */
     @JsonProperty("status") FactoryPhaseStatus status,
+    /** Most recent run attempt that entered this phase, or `0` if the phase has never been entered. */
     @JsonProperty("lastEnteredRunAttempt") Long lastEnteredRunAttempt,
+    /** Number of times execution entered this phase. */
     @JsonProperty("entryCount") Long entryCount,
+    /** Epoch milliseconds when this phase first started; for a skipped phase, the synthetic skip timestamp (equal to `completedAt`). */
     @JsonProperty("startedAt") Long startedAt,
+    /** Epoch milliseconds when this phase completed; for a skipped phase, the synthetic skip timestamp (equal to `startedAt`). */
     @JsonProperty("completedAt") Long completedAt,
+    /** Completed active time accumulated by this phase in milliseconds. */
     @JsonProperty("accumulatedActiveMs") Long accumulatedActiveMs,
+    /** Current live active time for this phase in milliseconds. */
     @JsonProperty("currentActiveMs") Long currentActiveMs,
+    /** Total direct agents associated with this phase. */
     @JsonProperty("totalAgentCount") Long totalAgentCount,
+    /** Direct agents in this phase that are currently live. */
     @JsonProperty("liveAgentCount") Long liveAgentCount
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryPhaseStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressLine.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressLine.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressLine.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressLine.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressPage.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressPage.java
similarity index 79%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressPage.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressPage.java
index 56732d8f47..76278a1585 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressPage.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryProgressPage.java
@@ -22,10 +22,15 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record FactoryProgressPage(
+    /** Progress records in sequence order. */
     @JsonProperty("records") List<FactoryProgressLine> records,
+    /** Oldest sequence number in this page, or null when empty. */
     @JsonProperty("oldestSeq") Long oldestSeq,
+    /** Newest sequence number in this page, or null when empty. */
     @JsonProperty("newestSeq") Long newestSeq,
+    /** Whether progress records older than this page exist. */
     @JsonProperty("hasMoreOlder") Boolean hasMoreOlder,
+    /** Whether progress records newer than this page exist. */
     @JsonProperty("hasMoreNewer") Boolean hasMoreNewer,
     /** Run revision reflected by this page. */
     @JsonProperty("revision") Long revision
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunConsumed.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunConsumed.java
similarity index 85%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunConsumed.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunConsumed.java
index 62cec5f730..a492db26f6 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunConsumed.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunConsumed.java
@@ -21,8 +21,11 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record FactoryRunConsumed(
+    /** Accumulated active execution time in milliseconds. */
     @JsonProperty("activeMs") Long activeMs,
+    /** Total subagents spawned by the run. */
     @JsonProperty("subagents") Long subagents,
+    /** AI usage consumed by the run in nano-AIU. */
     @JsonProperty("nanoAiu") Long nanoAiu
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunLimits.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunLimits.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunLimits.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunLimits.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunSummary.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunSummary.java
similarity index 62%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunSummary.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunSummary.java
index fb90885ee4..f482acfa16 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunSummary.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunSummary.java
@@ -21,24 +21,43 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record FactoryRunSummary(
+    /** Factory run identifier. */
     @JsonProperty("runId") String runId,
+    /** Registered factory name. */
     @JsonProperty("factoryName") String factoryName,
+    /** Human-readable factory description. */
     @JsonProperty("description") String description,
+    /** Current factory run status. */
     @JsonProperty("status") FactoryRunStatus status,
+    /** Monotonic durable run revision. */
     @JsonProperty("revision") Long revision,
+    /** Epoch milliseconds when the run was created. */
     @JsonProperty("createdAt") Long createdAt,
+    /** Epoch milliseconds when execution first started, or null before start. */
     @JsonProperty("startedAt") Long startedAt,
+    /** Epoch milliseconds when the durable run was last updated. */
     @JsonProperty("updatedAt") Long updatedAt,
+    /** Epoch milliseconds when the run completed, or null while nonterminal. */
     @JsonProperty("completedAt") Long completedAt,
+    /** Current phase identity, or null before any phase is entered. */
     @JsonProperty("currentPhase") FactoryCurrentPhase currentPhase,
+    /** Number of phases declared by the factory. */
     @JsonProperty("declaredPhaseCount") Long declaredPhaseCount,
+    /** Number of direct factory agents currently live. */
     @JsonProperty("liveAgentCount") Long liveAgentCount,
+    /** Total direct factory agents spawned across all attempts. */
     @JsonProperty("totalSpawnedAgentCount") Long totalSpawnedAgentCount,
+    /** Durable resource consumption. */
     @JsonProperty("consumed") FactoryRunConsumed consumed,
+    /** Resource ceilings declared by the factory. */
     @JsonProperty("declaredLimits") FactoryDeclaredLimits declaredLimits,
+    /** Approved effective resource ceilings, or null until approved. */
     @JsonProperty("approved") FactoryDeclaredLimits approved,
+    /** Epoch milliseconds when this live-overlay snapshot was observed. */
     @JsonProperty("observedAt") Long observedAt,
+    /** Epoch milliseconds when the current active segment started, or null while inactive. */
     @JsonProperty("activeSegmentStartedAt") Long activeSegmentStartedAt,
+    /** Terminal run outcome, or null while nonterminal. */
     @JsonProperty("terminal") FactoryRunTerminal terminal
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunTerminal.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunTerminal.java
similarity index 84%
rename from java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunTerminal.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunTerminal.java
index 231c1b8a11..bf9bfa7db4 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/FactoryRunTerminal.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FactoryRunTerminal.java
@@ -21,9 +21,13 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record FactoryRunTerminal(
+    /** Human-readable terminal reason. */
     @JsonProperty("reason") String reason,
+    /** Machine-readable terminal failure. */
     @JsonProperty("failure") Object failure,
+    /** Human-readable terminal error. */
     @JsonProperty("error") String error,
+    /** Prompt-safe preview of the completed result. */
     @JsonProperty("resultPreview") String resultPreview
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GhCliAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GhCliAuthInfo.java
new file mode 100644
index 0000000000..5bfc896f63
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GhCliAuthInfo.java
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication-info input variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class GhCliAuthInfo extends AuthInfo {
+
+    @JsonProperty("type")
+    private final String type = "gh-cli";
+
+    @Override
+    public String getType() { return type; }
+
+    /** Authentication host. */
+    @JsonProperty("host")
+    private String host;
+
+    /** User login as reported by `gh auth status`. */
+    @JsonProperty("login")
+    private String login;
+
+    /** The token returned by `gh auth token`. Treat as a secret. */
+    @JsonProperty("token")
+    private String token;
+
+    /** Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set. */
+    @JsonProperty("copilotUser")
+    private CopilotUserResponse copilotUser;
+
+    public String getHost() { return host; }
+    public void setHost(String host) { this.host = host; }
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+
+    public String getToken() { return token; }
+    public void setToken(String token) { this.token = token; }
+
+    public CopilotUserResponse getCopilotUser() { return copilotUser; }
+    public void setCopilotUser(CopilotUserResponse copilotUser) { this.copilotUser = copilotUser; }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryClientInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryClientInfo.java
similarity index 87%
rename from java/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryClientInfo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryClientInfo.java
index 7d7a1eaf72..b6bef1bffd 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryClientInfo.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryClientInfo.java
@@ -40,6 +40,10 @@ public record GitHubTelemetryClientInfo(
     /** Whether the user is a GitHub/Microsoft staff member. */
     @JsonProperty("is_staff") Boolean isStaff,
     /** Stable machine identifier for the device. */
-    @JsonProperty("dev_device_id") String devDeviceId
+    @JsonProperty("dev_device_id") String devDeviceId,
+    /** Distinct CPU model names for the host, comma-separated. */
+    @JsonProperty("cpu_model") String cpuModel,
+    /** Number of logical CPU cores on the host. */
+    @JsonProperty("cpu_count") Long cpuCount
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryEvent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryEvent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryEvent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryNotification.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryNotification.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryNotification.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTelemetryNotification.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireReason.java
new file mode 100644
index 0000000000..9f18889a03
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireReason.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Why the runtime is requesting a GitHub credential.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum GitHubTokenAcquireReason {
+    /** The {@code initial} variant. */
+    INITIAL("initial"),
+    /** The {@code refresh} variant. */
+    REFRESH("refresh");
+
+    private final String value;
+    GitHubTokenAcquireReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static GitHubTokenAcquireReason fromValue(String value) {
+        for (GitHubTokenAcquireReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown GitHubTokenAcquireReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireRequest.java
new file mode 100644
index 0000000000..59ba9d8ed5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireRequest.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Asks the SDK client to acquire a GitHub access token from an opaque callback registration.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record GitHubTokenAcquireRequest(
+    /** Opaque identifier generated by the SDK for this callback registration. */
+    @JsonProperty("registrationId") String registrationId,
+    /** Effective GitHub host for which the callback must return a token. */
+    @JsonProperty("host") String host,
+    /** Session receiving the token. Absent only before a cloud session has been assigned its id. */
+    @JsonProperty("sessionId") String sessionId,
+    /** Why the runtime is requesting a GitHub credential. */
+    @JsonProperty("reason") GitHubTokenAcquireReason reason
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireResult.java
new file mode 100644
index 0000000000..a20724c337
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireResult.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import javax.annotation.processing.Generated;
+
+/**
+ * SDK host response to a GitHub credential request.
+ *
+ * @since 1.0.0
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind", visible = true)
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = GitHubTokenAcquireResultToken.class, name = "token"),
+    @JsonSubTypes.Type(value = GitHubTokenAcquireResultCancelled.class, name = "cancelled")
+})
+@JsonIgnoreProperties(ignoreUnknown = true)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public abstract class GitHubTokenAcquireResult {
+
+    /**
+     * Returns the discriminator value for this variant.
+     *
+     * @return the kind discriminator
+     */
+    public abstract String getKind();
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireResultCancelled.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireResultCancelled.java
new file mode 100644
index 0000000000..40ab8d5f74
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireResultCancelled.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code cancelled} of {@link GitHubTokenAcquireResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class GitHubTokenAcquireResultCancelled extends GitHubTokenAcquireResult {
+
+    @JsonProperty("kind")
+    private final String kind = "cancelled";
+
+    @Override
+    public String getKind() { return kind; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireResultToken.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireResultToken.java
new file mode 100644
index 0000000000..cc250a54fd
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubTokenAcquireResultToken.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code token} of {@link GitHubTokenAcquireResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class GitHubTokenAcquireResultToken extends GitHubTokenAcquireResult {
+
+    @JsonProperty("kind")
+    private final String kind = "token";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** GitHub access token acquired by the SDK host. */
+    @JsonProperty("accessToken")
+    private String accessToken;
+
+    /** OAuth token type. Defaults to bearer when omitted. */
+    @JsonProperty("tokenType")
+    private String tokenType;
+
+    /** Remaining token lifetime in seconds when callback execution completes. It must exceed the one-hour preflight refresh threshold. */
+    @JsonProperty("expiresIn")
+    private Long expiresIn;
+
+    public String getAccessToken() { return accessToken; }
+    public void setAccessToken(String accessToken) { this.accessToken = accessToken; }
+
+    public String getTokenType() { return tokenType; }
+    public void setTokenType(String tokenType) { this.tokenType = tokenType; }
+
+    public Long getExpiresIn() { return expiresIn; }
+    public void setExpiresIn(Long expiresIn) { this.expiresIn = expiresIn; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HMACAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HMACAuthInfo.java
new file mode 100644
index 0000000000..06cebd66c5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HMACAuthInfo.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication-info input variant for GitHub-internal HMAC auth, carrying the public GitHub host and HMAC secret.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class HMACAuthInfo extends AuthInfo {
+
+    @JsonProperty("type")
+    private final String type = "hmac";
+
+    @Override
+    public String getType() { return type; }
+
+    /** Authentication host. HMAC auth always targets the public GitHub host. */
+    @JsonProperty("host")
+    private String host;
+
+    /** HMAC secret used to sign requests. */
+    @JsonProperty("hmac")
+    private String hmac;
+
+    /** Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set. */
+    @JsonProperty("copilotUser")
+    private CopilotUserResponse copilotUser;
+
+    public String getHost() { return host; }
+    public void setHost(String host) { this.host = host; }
+
+    public String getHmac() { return hmac; }
+    public void setHmac(String hmac) { this.hmac = hmac; }
+
+    public CopilotUserResponse getCopilotUser() { return copilotUser; }
+    public void setCopilotUser(CopilotUserResponse copilotUser) { this.copilotUser = copilotUser; }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HistoryCompactContextWindow.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryCompactContextWindow.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HistoryCompactContextWindow.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryCompactContextWindow.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HistoryFileRestoreSkipReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryFileRestoreSkipReason.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HistoryFileRestoreSkipReason.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryFileRestoreSkipReason.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindChangeType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindChangeType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindChangeType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindChangeType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindFilePreview.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindFilePreview.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindFilePreview.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindFilePreview.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindOutcome.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindOutcome.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindOutcome.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindOutcome.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindPoint.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindPoint.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindPoint.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindPoint.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindUnavailableReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindUnavailableReason.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindUnavailableReason.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistoryRewindUnavailableReason.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HistorySkippedFileRestore.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistorySkippedFileRestore.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HistorySkippedFileRestore.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HistorySkippedFileRestore.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HookInvokeRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HookInvokeRequest.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HookInvokeRequest.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HookInvokeRequest.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HookType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HookType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HookType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HookType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/HooksInvokeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HooksInvokeResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/HooksInvokeResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/HooksInvokeResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstalledPlugin.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstalledPlugin.java
similarity index 78%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstalledPlugin.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstalledPlugin.java
index 3da690f47b..e372049403 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/InstalledPlugin.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstalledPlugin.java
@@ -36,6 +36,8 @@ public record InstalledPlugin(
     /** Source for direct repo installs (when marketplace is empty) */
     @JsonProperty("source") Object source,
     /** Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs. */
-    @JsonProperty("source_sha") String sourceSha
+    @JsonProperty("source_sha") String sourceSha,
+    /** Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — those synthesized at session start for a directory/local marketplace, whose cache_path points at the real plugin directory on disk rather than a copy under the installed-plugins cache. Its presence is what marks a record as live, and no record carrying it is ever written to the persisted installedPlugins key. */
+    @JsonProperty("installed_from") String installedFrom
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstalledPluginInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstalledPluginInfo.java
similarity index 73%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstalledPluginInfo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstalledPluginInfo.java
index 2f4895690f..2c81e95f2b 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/InstalledPluginInfo.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstalledPluginInfo.java
@@ -30,6 +30,8 @@ public record InstalledPluginInfo(
     /** Installed version (when reported by the plugin manifest) */
     @JsonProperty("version") String version,
     /** Whether the plugin is currently enabled for new sessions */
-    @JsonProperty("enabled") Boolean enabled
+    @JsonProperty("enabled") Boolean enabled,
+    /** Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — a plugin belonging to a directory/local marketplace, which is loaded from its real directory on every pass instead of a copy under the installed-plugins cache. Its presence is what marks a listed plugin as live: such a plugin is always present on disk, so `enabled` is its only meaningful state and it is never "not installed". */
+    @JsonProperty("installedFrom") String installedFrom
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPath.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPath.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPath.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPath.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPathKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPathKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPathKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPathKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPathLocation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPathLocation.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPathLocation.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionDiscoveryPathLocation.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionSourceLocation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionSourceLocation.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionSourceLocation.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionSourceLocation.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionSourceType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionSourceType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionSourceType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionSourceType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestChunkRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestChunkRequest.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestChunkRequest.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestChunkRequest.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestChunkResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestChunkResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestChunkResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestChunkResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartRequest.java
similarity index 98%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartRequest.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartRequest.java
index b846fcf37c..a75733cb3a 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartRequest.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartRequest.java
@@ -31,6 +31,7 @@ public record LlmInferenceHttpRequestStartRequest(
     @JsonProperty("method") String method,
     /** Absolute request URL. */
     @JsonProperty("url") String url,
+    /** HTTP request headers, preserving multiple values per name. */
     @JsonProperty("headers") Map<String, List<String>> headers,
     /** Transport the runtime would otherwise use for this request. `http` (the default when absent) covers plain HTTP and SSE responses; `websocket` indicates a full-duplex message channel where each body chunk maps to one WebSocket message and the `binary` flag distinguishes text from binary frames. The SDK consumer uses this to decide whether to service the request with an HTTP client or a WebSocket client. It is the one piece of request metadata the consumer cannot reliably infer from the URL or headers alone. */
     @JsonProperty("transport") LlmInferenceHttpRequestStartTransport transport,
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartTransport.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartTransport.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartTransport.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpRequestStartTransport.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkError.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkError.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkError.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseChunkResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartParams.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartParams.java
index 69c26221b8..dddc6a315a 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartParams.java
@@ -32,6 +32,7 @@ public record LlmInferenceHttpResponseStartParams(
     @JsonProperty("status") Long status,
     /** Optional HTTP status reason phrase. */
     @JsonProperty("statusText") String statusText,
+    /** HTTP response headers, preserving multiple values per name. */
     @JsonProperty("headers") Map<String, List<String>> headers
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceHttpResponseStartResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceSetProviderResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceSetProviderResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceSetProviderResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LlmInferenceSetProviderResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/LocalSessionMetadataValue.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LocalSessionMetadataValue.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/LocalSessionMetadataValue.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/LocalSessionMetadataValue.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsReadResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsReadResult.java
new file mode 100644
index 0000000000..2018f62ce0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsReadResult.java
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Validated device-managed settings discovered before a session exists.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ManagedSettingsReadResult(
+    /** Validated, canonical managed-settings JSON. Omitted when no managed settings were discovered or when discovered settings failed validation. */
+    @JsonProperty("settingsJson") Object settingsJson,
+    /** Discovery or validation error text when managed settings could not be read safely. */
+    @JsonProperty("errorMessage") String errorMessage
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/MarketplaceInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/MarketplaceInfo.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/MarketplaceInfo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/MarketplaceInfo.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/MarketplacePluginInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/MarketplacePluginInfo.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/MarketplacePluginInfo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/MarketplacePluginInfo.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/MarketplaceRefreshEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/MarketplaceRefreshEntry.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/MarketplaceRefreshEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/MarketplaceRefreshEntry.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAllowedServer.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAllowedServer.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAllowedServer.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAllowedServer.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsDiagnoseCapability.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsDiagnoseCapability.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsDiagnoseCapability.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsDiagnoseCapability.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsDiagnoseServer.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsDiagnoseServer.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsDiagnoseServer.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsDiagnoseServer.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetails.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetails.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetails.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetails.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsAvailableDisplayMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsAvailableDisplayMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsAvailableDisplayMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsAvailableDisplayMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsDisplayMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsDisplayMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsDisplayMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsDisplayMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsPlatform.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsPlatform.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsPlatform.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsPlatform.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsTheme.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsTheme.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsTheme.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsHostContextDetailsTheme.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsResourceContent.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsResourceContent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsResourceContent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsResourceContent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetails.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetails.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetails.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetails.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsAvailableDisplayMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsAvailableDisplayMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsAvailableDisplayMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsAvailableDisplayMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsDisplayMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsDisplayMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsDisplayMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsDisplayMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsPlatform.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsPlatform.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsPlatform.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsPlatform.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsTheme.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsTheme.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsTheme.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpAppsSetHostContextDetailsTheme.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpConfigAddParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigAddParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpConfigAddParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigAddParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpConfigDisableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigDisableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpConfigDisableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigDisableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpConfigEnableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigEnableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpConfigEnableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigEnableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpConfigListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpConfigListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpConfigRemoveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigRemoveParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpConfigRemoveParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigRemoveParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpConfigUpdateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigUpdateParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpConfigUpdateParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfigUpdateParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpDiscoverParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpDiscoverParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpDiscoverParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpDiscoverParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpDiscoverResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpDiscoverResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpDiscoverResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpDiscoverResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpElicitationFormMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpElicitationFormMode.java
new file mode 100644
index 0000000000..8bb655e3e8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpElicitationFormMode.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Structured MCP elicitation mode.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum McpElicitationFormMode {
+    /** The {@code form} variant. */
+    FORM("form");
+
+    private final String value;
+    McpElicitationFormMode(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static McpElicitationFormMode fromValue(String value) {
+        for (McpElicitationFormMode v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown McpElicitationFormMode value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpExecuteSamplingRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpExecuteSamplingRequest.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpExecuteSamplingRequest.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpExecuteSamplingRequest.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpExecuteSamplingResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpExecuteSamplingResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpExecuteSamplingResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpExecuteSamplingResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpFailedServer.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpFailedServer.java
new file mode 100644
index 0000000000..36009e4915
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpFailedServer.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * MCP server whose connection attempt failed.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record McpFailedServer(
+    /** The config key of the server that failed to connect. */
+    @JsonProperty("name") String name,
+    /** The captured connection failure detail. */
+    @JsonProperty("error") String error
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpFilteredServer.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpFilteredServer.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpFilteredServer.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpFilteredServer.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpHostState.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpHostState.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpHostState.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpHostState.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpInstallPlan.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpInstallPlan.java
new file mode 100644
index 0000000000..7274ce2b7f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpInstallPlan.java
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * A normalised, inert description of what installing an MCP server would involve. Carries no raw card, no install specification, and no secret value.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record McpInstallPlan(
+    /** Opaque, runtime-instance scoped, TTL-bound, single-use handle for this plan. Rejected when stale, replayed, or presented to a different runtime instance. Never logged. */
+    @JsonProperty("planHandle") String planHandle,
+    /** ISO 8601 timestamp after which the plan handle is stale and will be rejected. Abandoning a plan needs no call: an unused handle simply expires, so cancellation before commit is side-effect free. */
+    @JsonProperty("planHandleExpiresAt") String planHandleExpiresAt,
+    /** Normalised identity of the server the plan would install. */
+    @JsonProperty("identity") McpPlanResourceIdentity identity,
+    /** Origin and semantic digest of the exact validated JSON MCP card content bound to this plan. */
+    @JsonProperty("provenance") McpPlanProvenance provenance,
+    /** Every eligible transport, so a host can present an explicit choice. A completed plan always has at least one; when none is eligible, planning returns `CatalogUnavailableTransportError` instead. */
+    @JsonProperty("transportChoices") List<Object> transportChoices,
+    /** Identifier of the choice the runtime would pick by default. Omitted when there is no eligible transport, or when the runtime expresses no preference. */
+    @JsonProperty("recommendedTransportChoiceId") String recommendedTransportChoiceId,
+    /** Configuration scope and key the plan would write to. */
+    @JsonProperty("target") McpPlanTarget target,
+    /** Outcome of evaluating the server against registry and enterprise policy. */
+    @JsonProperty("policy") McpPlanPolicyResult policy,
+    /** The configuration changes installing would make, described rather than serialised, so the mutable configuration payload stays behind the runtime boundary. */
+    @JsonProperty("configurationChanges") List<McpPlanConfigurationChange> configurationChanges,
+    /** Whether applying this plan would require an MCP reload to take effect. Planning itself never reloads. */
+    @JsonProperty("reloadRequired") Boolean reloadRequired,
+    /** Whether the plan cannot be applied without further input, because a required value has no default or a secret must be supplied. */
+    @JsonProperty("requiresInteractiveConfiguration") Boolean requiresInteractiveConfiguration
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpOauthLoginGrantType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthLoginGrantType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpOauthLoginGrantType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthLoginGrantType.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeNeedsAuthReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeNeedsAuthReason.java
new file mode 100644
index 0000000000..967a01aabc
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeNeedsAuthReason.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Why a passive MCP OAuth probe determined authentication is needed.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum McpOauthProbeNeedsAuthReason {
+    /** The {@code initial} variant. */
+    INITIAL("initial"),
+    /** The {@code refresh} variant. */
+    REFRESH("refresh"),
+    /** The {@code upscope} variant. */
+    UPSCOPE("upscope");
+
+    private final String value;
+    McpOauthProbeNeedsAuthReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static McpOauthProbeNeedsAuthReason fromValue(String value) {
+        for (McpOauthProbeNeedsAuthReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown McpOauthProbeNeedsAuthReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResult.java
new file mode 100644
index 0000000000..1a94e17142
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResult.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import javax.annotation.processing.Generated;
+
+/**
+ * Passive MCP OAuth probe result. `authenticated` means the server accepted the probe request while an OAuth-origin access token was attached; it does not prove the server required or independently validated that token. The probe does not make a second unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are reserved for API-call failures.
+ *
+ * @since 1.0.0
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "status", visible = true)
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = McpOauthProbeResultNoAuthRequired.class, name = "no-auth-required"),
+    @JsonSubTypes.Type(value = McpOauthProbeResultAuthenticated.class, name = "authenticated"),
+    @JsonSubTypes.Type(value = McpOauthProbeResultNeedsAuth.class, name = "needs-auth"),
+    @JsonSubTypes.Type(value = McpOauthProbeResultFailed.class, name = "failed")
+})
+@JsonIgnoreProperties(ignoreUnknown = true)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public abstract class McpOauthProbeResult {
+
+    /**
+     * Returns the discriminator value for this variant.
+     *
+     * @return the status discriminator
+     */
+    public abstract String getStatus();
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultAuthenticated.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultAuthenticated.java
new file mode 100644
index 0000000000..8af0d6ca4e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultAuthenticated.java
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.generated.McpOauthHttpResponse;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code authenticated} of {@link McpOauthProbeResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class McpOauthProbeResultAuthenticated extends McpOauthProbeResult {
+
+    @JsonProperty("status")
+    private final String status = "authenticated";
+
+    @Override
+    public String getStatus() { return status; }
+
+    /** HTTP response returned by the server. */
+    @JsonProperty("httpResponse")
+    private McpOauthHttpResponse httpResponse;
+
+    public McpOauthHttpResponse getHttpResponse() { return httpResponse; }
+    public void setHttpResponse(McpOauthHttpResponse httpResponse) { this.httpResponse = httpResponse; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultFailed.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultFailed.java
new file mode 100644
index 0000000000..a613265878
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultFailed.java
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.generated.McpOauthHttpResponse;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code failed} of {@link McpOauthProbeResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class McpOauthProbeResultFailed extends McpOauthProbeResult {
+
+    @JsonProperty("status")
+    private final String status = "failed";
+
+    @Override
+    public String getStatus() { return status; }
+
+    /** Human-readable probe failure detail. */
+    @JsonProperty("error")
+    private String error;
+
+    /** HTTP response returned by the server, when the probe reached the server and captured the complete response. */
+    @JsonProperty("httpResponse")
+    private McpOauthHttpResponse httpResponse;
+
+    public String getError() { return error; }
+    public void setError(String error) { this.error = error; }
+
+    public McpOauthHttpResponse getHttpResponse() { return httpResponse; }
+    public void setHttpResponse(McpOauthHttpResponse httpResponse) { this.httpResponse = httpResponse; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultNeedsAuth.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultNeedsAuth.java
new file mode 100644
index 0000000000..4cc54dfbe2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultNeedsAuth.java
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.generated.McpOauthHttpResponse;
+import com.github.copilot.generated.McpOauthWWWAuthenticateParams;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code needs-auth} of {@link McpOauthProbeResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class McpOauthProbeResultNeedsAuth extends McpOauthProbeResult {
+
+    @JsonProperty("status")
+    private final String status = "needs-auth";
+
+    @Override
+    public String getStatus() { return status; }
+
+    /** HTTP 401 or 403 response returned by the server. */
+    @JsonProperty("httpResponse")
+    private McpOauthHttpResponse httpResponse;
+
+    /** Why authentication is needed. */
+    @JsonProperty("reason")
+    private McpOauthProbeNeedsAuthReason reason;
+
+    /** Parsed WWW-Authenticate challenge parameters, when present and parseable. */
+    @JsonProperty("wwwAuthenticateParams")
+    private McpOauthWWWAuthenticateParams wwwAuthenticateParams;
+
+    public McpOauthHttpResponse getHttpResponse() { return httpResponse; }
+    public void setHttpResponse(McpOauthHttpResponse httpResponse) { this.httpResponse = httpResponse; }
+
+    public McpOauthProbeNeedsAuthReason getReason() { return reason; }
+    public void setReason(McpOauthProbeNeedsAuthReason reason) { this.reason = reason; }
+
+    public McpOauthWWWAuthenticateParams getWwwAuthenticateParams() { return wwwAuthenticateParams; }
+    public void setWwwAuthenticateParams(McpOauthWWWAuthenticateParams wwwAuthenticateParams) { this.wwwAuthenticateParams = wwwAuthenticateParams; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultNoAuthRequired.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultNoAuthRequired.java
new file mode 100644
index 0000000000..71ddbfc2ac
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpOauthProbeResultNoAuthRequired.java
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.generated.McpOauthHttpResponse;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code no-auth-required} of {@link McpOauthProbeResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class McpOauthProbeResultNoAuthRequired extends McpOauthProbeResult {
+
+    @JsonProperty("status")
+    private final String status = "no-auth-required";
+
+    @Override
+    public String getStatus() { return status; }
+
+    /** HTTP response returned by the server. */
+    @JsonProperty("httpResponse")
+    private McpOauthHttpResponse httpResponse;
+
+    public McpOauthHttpResponse getHttpResponse() { return httpResponse; }
+    public void setHttpResponse(McpOauthHttpResponse httpResponse) { this.httpResponse = httpResponse; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanConfigurationChange.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanConfigurationChange.java
new file mode 100644
index 0000000000..d419772111
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanConfigurationChange.java
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * One change applying the plan would make, described rather than serialised so the configuration payload stays behind the runtime boundary.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record McpPlanConfigurationChange(
+    /** Whether the change would create a new entry or modify an existing one. */
+    @JsonProperty("operation") McpPlanConfigurationOperation operation,
+    /** Scope the change would be written to. */
+    @JsonProperty("scope") McpPlanScope scope,
+    /** Configuration key the change applies to. */
+    @JsonProperty("configKey") String configKey,
+    /** Names of the configuration fields the change would set, without their values. */
+    @JsonProperty("changedFields") List<String> changedFields,
+    /** Secret placeholders the written configuration would reference. The constrained placeholder type cannot carry a literal secret value. */
+    @JsonProperty("secretReferences") List<String> secretReferences
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanConfigurationOperation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanConfigurationOperation.java
new file mode 100644
index 0000000000..a661db48ab
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanConfigurationOperation.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Whether a planned configuration change would create or modify an entry
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum McpPlanConfigurationOperation {
+    /** The {@code add} variant. */
+    ADD("add"),
+    /** The {@code update} variant. */
+    UPDATE("update");
+
+    private final String value;
+    McpPlanConfigurationOperation(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static McpPlanConfigurationOperation fromValue(String value) {
+        for (McpPlanConfigurationOperation v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown McpPlanConfigurationOperation value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanInstallParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanInstallParams.java
new file mode 100644
index 0000000000..7b182fe2d6
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanInstallParams.java
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record McpPlanInstallParams(
+    /** Protocol version and capabilities the caller requires. */
+    @JsonProperty("contract") CatalogClientContract contract,
+    /** What to plan: either a candidate handle from a previous search, or a card supplied directly. */
+    @JsonProperty("source") Object source,
+    /** Configuration scope the plan targets. Defaults to user scope when omitted. */
+    @JsonProperty("scope") McpPlanScope scope
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanInstallPlanned.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanInstallPlanned.java
new file mode 100644
index 0000000000..571353a384
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanInstallPlanned.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * A computed MCP install plan. Nothing has been applied: the plan describes what installing would change, and the plan handle is what a later apply operation would consume.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class McpPlanInstallPlanned extends McpPlanInstallResult {
+
+    @JsonProperty("kind")
+    private final String kind = "planned";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** The normalised plan. */
+    @JsonProperty("plan")
+    private McpInstallPlan plan;
+
+    /** Protocol version and capabilities the runtime honoured. */
+    @JsonProperty("negotiated")
+    private CatalogNegotiatedContract negotiated;
+
+    public McpInstallPlan getPlan() { return plan; }
+    public void setPlan(McpInstallPlan plan) { this.plan = plan; }
+
+    public CatalogNegotiatedContract getNegotiated() { return negotiated; }
+    public void setNegotiated(CatalogNegotiatedContract negotiated) { this.negotiated = negotiated; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanInstallResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanInstallResult.java
new file mode 100644
index 0000000000..d257703477
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanInstallResult.java
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import javax.annotation.processing.Generated;
+
+/**
+ * Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.
+ *
+ * @since 1.0.0
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind", visible = true)
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = McpPlanInstallPlanned.class, name = "planned"),
+    @JsonSubTypes.Type(value = CatalogNegotiationRefusedError.class, name = "negotiation-refused"),
+    @JsonSubTypes.Type(value = CatalogHandleRejectedError.class, name = "handle-rejected"),
+    @JsonSubTypes.Type(value = CatalogInvalidRequestError.class, name = "invalid-request"),
+    @JsonSubTypes.Type(value = CatalogAuthenticationRequiredError.class, name = "authentication-required"),
+    @JsonSubTypes.Type(value = CatalogPolicyRejectedError.class, name = "policy-rejected"),
+    @JsonSubTypes.Type(value = CatalogNetworkFailureError.class, name = "network-failure"),
+    @JsonSubTypes.Type(value = CatalogUnsafeRetrievalError.class, name = "unsafe-retrieval"),
+    @JsonSubTypes.Type(value = CatalogMalformedCardError.class, name = "malformed-card"),
+    @JsonSubTypes.Type(value = CatalogContractViolationError.class, name = "contract-violation"),
+    @JsonSubTypes.Type(value = CatalogUnavailableTransportError.class, name = "unavailable-transport"),
+    @JsonSubTypes.Type(value = CatalogNotInstallableError.class, name = "not-installable"),
+    @JsonSubTypes.Type(value = CatalogUnavailableError.class, name = "unavailable")
+})
+@JsonIgnoreProperties(ignoreUnknown = true)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public abstract class McpPlanInstallResult {
+
+    /**
+     * Returns the discriminator value for this variant.
+     *
+     * @return the kind discriminator
+     */
+    public abstract String getKind();
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanPolicyDecision.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanPolicyDecision.java
new file mode 100644
index 0000000000..be32c283a0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanPolicyDecision.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * What policy decided for a planned server
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum McpPlanPolicyDecision {
+    /** The {@code allowed} variant. */
+    ALLOWED("allowed"),
+    /** The {@code blocked} variant. */
+    BLOCKED("blocked"),
+    /** The {@code requires-approval} variant. */
+    REQUIRES_APPROVAL("requires-approval");
+
+    private final String value;
+    McpPlanPolicyDecision(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static McpPlanPolicyDecision fromValue(String value) {
+        for (McpPlanPolicyDecision v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown McpPlanPolicyDecision value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanPolicyResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanPolicyResult.java
new file mode 100644
index 0000000000..ee8d2ff0c1
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanPolicyResult.java
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Outcome of evaluating the planned server against registry and enterprise policy. Evaluation is read-only.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record McpPlanPolicyResult(
+    /** What policy decided for this server. */
+    @JsonProperty("decision") McpPlanPolicyDecision decision,
+    /** Which authority produced the decision. */
+    @JsonProperty("source") McpPlanPolicySource source,
+    /** Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret. */
+    @JsonProperty("reason") String reason
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanPolicySource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanPolicySource.java
new file mode 100644
index 0000000000..f6c0498f3b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanPolicySource.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Which authority produced a policy decision
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum McpPlanPolicySource {
+    /** The {@code none} variant. */
+    NONE("none"),
+    /** The {@code enterprise-allowlist} variant. */
+    ENTERPRISE_ALLOWLIST("enterprise-allowlist"),
+    /** The {@code registry-policy} variant. */
+    REGISTRY_POLICY("registry-policy"),
+    /** The {@code local-trust} variant. */
+    LOCAL_TRUST("local-trust");
+
+    private final String value;
+    McpPlanPolicySource(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static McpPlanPolicySource fromValue(String value) {
+        for (McpPlanPolicySource v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown McpPlanPolicySource value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanProvenance.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanProvenance.java
new file mode 100644
index 0000000000..5b7d6531d3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanProvenance.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Provenance of the exact validated JSON MCP card content bound privately to a completed plan and its opaque handle.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record McpPlanProvenance(
+    /** Authority associated with the validated card, without path, query, or credentials. Inert untrusted data. */
+    @JsonProperty("authority") String authority,
+    /** ISO 8601 timestamp at which the runtime completed strict parsing and schema validation of the card content. */
+    @JsonProperty("validatedAt") String validatedAt,
+    /** Semantic digest of the exact validated JSON content bound to the plan handle. */
+    @JsonProperty("cardDigest") CardDigest cardDigest,
+    /** JSON MCP media type the validated card was interpreted as. */
+    @JsonProperty("mediaType") McpServerCardMediaType mediaType
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanResourceIdentity.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanResourceIdentity.java
new file mode 100644
index 0000000000..abe525c1dc
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanResourceIdentity.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Normalised identity of the MCP server a plan targets, independent of how the card spelled it.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record McpPlanResourceIdentity(
+    /** Canonical, normalised name of the server, for example `io.github.owner/server`. */
+    @JsonProperty("canonicalName") String canonicalName,
+    /** Local configuration key the server would be recorded under. */
+    @JsonProperty("serverName") String serverName,
+    /** Version advertised by the card, when it declares one. */
+    @JsonProperty("version") String version,
+    /** Registry identifier of the server, when it came from a registry. */
+    @JsonProperty("registryId") String registryId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanScope.java
new file mode 100644
index 0000000000..41f5d72016
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanScope.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Configuration scope an MCP install plan targets
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum McpPlanScope {
+    /** The {@code user} variant. */
+    USER("user");
+
+    private final String value;
+    McpPlanScope(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static McpPlanScope fromValue(String value) {
+        for (McpPlanScope v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown McpPlanScope value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanTarget.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanTarget.java
new file mode 100644
index 0000000000..95362a4cca
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpPlanTarget.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Where a plan would be written.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record McpPlanTarget(
+    /** Configuration scope the plan targets. */
+    @JsonProperty("scope") McpPlanScope scope,
+    /** Configuration key the server would be recorded under within that scope. */
+    @JsonProperty("configKey") String configKey
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpResource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpResource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpResourceAnnotations.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResourceAnnotations.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpResourceAnnotations.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResourceAnnotations.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpResourceContent.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResourceContent.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpResourceContent.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResourceContent.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpResourceIcon.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResourceIcon.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpResourceIcon.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResourceIcon.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpResourceTemplate.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResourceTemplate.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpResourceTemplate.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpResourceTemplate.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpSamplingExecutionAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpSamplingExecutionAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpSamplingExecutionAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpSamplingExecutionAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpServer.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServer.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpServer.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServer.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerCardMediaType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerCardMediaType.java
new file mode 100644
index 0000000000..4258f7d4d4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerCardMediaType.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * JSON MCP card media type accepted for install planning
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum McpServerCardMediaType {
+    /** The {@code application/mcp-server-card+json} variant. */
+    APPLICATION_MCP_SERVER_CARD_JSON("application/mcp-server-card+json"),
+    /** The {@code application/mcp-server+json} variant. */
+    APPLICATION_MCP_SERVER_JSON("application/mcp-server+json");
+
+    private final String value;
+    McpServerCardMediaType(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static McpServerCardMediaType fromValue(String value) {
+        for (McpServerCardMediaType v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown McpServerCardMediaType value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpServerFailureInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerFailureInfo.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpServerFailureInfo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerFailureInfo.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpServerNeedsAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerNeedsAuthInfo.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpServerNeedsAuthInfo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerNeedsAuthInfo.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpServerSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpServerSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpServerStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpServerStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpSetEnvValueModeDetails.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpSetEnvValueModeDetails.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpSetEnvValueModeDetails.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpSetEnvValueModeDetails.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpTaskMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpTaskMetadata.java
new file mode 100644
index 0000000000..1b7fccb29f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpTaskMetadata.java
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Metadata controlling an MCP task's lifetime.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record McpTaskMetadata(
+    /** Task time-to-live. */
+    @JsonProperty("ttl") Long ttl
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpToolUi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpToolUi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpToolUi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpToolUi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpToolUiVisibility.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpToolUiVisibility.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpToolUiVisibility.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpToolUiVisibility.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/McpTools.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpTools.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/McpTools.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpTools.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/MemoryConfiguration.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/MemoryConfiguration.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/MemoryConfiguration.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/MemoryConfiguration.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotCurrentMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotCurrentMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotCurrentMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotCurrentMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadata.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadata.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadata.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadataRepository.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadataRepository.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadataRepository.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadataRepository.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadataTaskType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadataTaskType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadataTaskType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/MetadataSnapshotRemoteMetadataTaskType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/Model.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Model.java
similarity index 55%
rename from java/src/generated/java/com/github/copilot/generated/rpc/Model.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/Model.java
index f002df540d..a652e8f4f6 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/Model.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Model.java
@@ -34,9 +34,19 @@ public record Model(
     @JsonProperty("billing") ModelBilling billing,
     /** Supported reasoning effort levels (only present if model supports reasoning effort) */
     @JsonProperty("supportedReasoningEfforts") List<String> supportedReasoningEfforts,
+    /** Default reasoning effort level (only present if model supports reasoning effort) */
+    @JsonProperty("defaultReasoningEffort") String defaultReasoningEffort,
+    /** Context-window tiers this model offers, when the provider advertises them independently of tiered token pricing. Copilot models carry their tiers in `billing.tokenPrices`; a provider that has no pricing to publish (an agent host reached over AHP, for example) declares them here instead, so the model picker can still offer the tier toggle. */
+    @JsonProperty("supportedContextTiers") List<String> supportedContextTiers,
     /** Model capability category for grouping in the model picker */
     @JsonProperty("modelPickerCategory") ModelPickerCategory modelPickerCategory,
     /** Relative cost tier for token-based billing users */
-    @JsonProperty("modelPickerPriceCategory") ModelPickerPriceCategory modelPickerPriceCategory
+    @JsonProperty("modelPickerPriceCategory") ModelPickerPriceCategory modelPickerPriceCategory,
+    /** Warning text the service requires hosts to surface for this model. Present only when the service published at least one warning. */
+    @JsonProperty("warningText") ModelWarningText warningText,
+    /** Informational notices the service published for this model, such as an upcoming change or a recommended alternative. Present only when the service published at least one notice. Hosts should surface these without implying anything is wrong with the model. */
+    @JsonProperty("infoMessages") List<ModelMessage> infoMessages,
+    /** Warnings the service published for this model, such as a deprecated client version. Present only when the service published at least one warning. The model remains usable; hosts should surface these as advisory rather than blocking. */
+    @JsonProperty("warningMessages") List<ModelMessage> warningMessages
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBilling.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBilling.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelBilling.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBilling.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingPromo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBillingPromo.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingPromo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBillingPromo.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java
similarity index 93%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java
index 56e06fe22f..e6eae8c0e5 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java
@@ -31,6 +31,8 @@ public record ModelBillingTokenPrices(
     @JsonProperty("cacheReadPrice") Double cacheReadPrice,
     /** AI Credits cost per billing batch of cache-write (cache creation) tokens. */
     @JsonProperty("cacheWritePrice") Double cacheWritePrice,
+    /** AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens. */
+    @JsonProperty("cacheWrite1hPrice") Double cacheWrite1hPrice,
     /** Number of tokens per standard billing batch */
     @JsonProperty("batchSize") Long batchSize,
     /** Use maxPromptTokens instead. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens. */
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java
index bb67515793..7d108d3708 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java
@@ -31,6 +31,8 @@ public record ModelBillingTokenPricesLongContext(
     @JsonProperty("cacheReadPrice") Double cacheReadPrice,
     /** AI Credits cost per billing batch of cache-write (cache creation) tokens. */
     @JsonProperty("cacheWritePrice") Double cacheWritePrice,
+    /** AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens. */
+    @JsonProperty("cacheWrite1hPrice") Double cacheWrite1hPrice,
     /** Use maxPromptTokens instead. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens. */
     @JsonProperty("contextMax") Long contextMax,
     /** Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens. */
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilities.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilities.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilities.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilities.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesLimits.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesLimits.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesLimits.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesLimits.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesLimitsVision.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesLimitsVision.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesLimitsVision.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesLimitsVision.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverride.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverride.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverride.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverride.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideLimits.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideLimits.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideLimits.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideLimits.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideLimitsVision.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideLimitsVision.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideLimitsVision.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideLimitsVision.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideSupports.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideSupports.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideSupports.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesOverrideSupports.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesSupports.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesSupports.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesSupports.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelCapabilitiesSupports.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelChangeSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelChangeSource.java
new file mode 100644
index 0000000000..6e5d4ea8da
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelChangeSource.java
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Origin of an effective session model change.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ModelChangeSource {
+    /** The {@code model_command} variant. */
+    MODEL_COMMAND("model_command"),
+    /** The {@code settings_command} variant. */
+    SETTINGS_COMMAND("settings_command"),
+    /** The {@code config_command} variant. */
+    CONFIG_COMMAND("config_command"),
+    /** The {@code model_picker} variant. */
+    MODEL_PICKER("model_picker"),
+    /** The {@code managed_settings} variant. */
+    MANAGED_SETTINGS("managed_settings"),
+    /** The {@code repo_settings} variant. */
+    REPO_SETTINGS("repo_settings"),
+    /** The {@code startup} variant. */
+    STARTUP("startup"),
+    /** The {@code agent} variant. */
+    AGENT("agent"),
+    /** The {@code plan_mode} variant. */
+    PLAN_MODE("plan_mode"),
+    /** The {@code automatic} variant. */
+    AUTOMATIC("automatic"),
+    /** The {@code sdk} variant. */
+    SDK("sdk");
+
+    private final String value;
+    ModelChangeSource(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ModelChangeSource fromValue(String value) {
+        for (ModelChangeSource v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ModelChangeSource value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelMessage.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelMessage.java
new file mode 100644
index 0000000000..35e8a17386
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelMessage.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * A service-published message about a model, carrying a stable machine-readable code alongside human-readable text.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ModelMessage(
+    /** Stable machine-readable identifier for the message, such as `client_version_deprecated`. Hosts can key custom presentation off this; unrecognized codes should fall back to displaying `message`. */
+    @JsonProperty("code") String code,
+    /** Human-readable message text intended for display to the user. */
+    @JsonProperty("message") String message
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelPickerCategory.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerCategory.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelPickerCategory.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerCategory.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerPersistenceRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerPersistenceRequest.java
new file mode 100644
index 0000000000..48612cdfa5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerPersistenceRequest.java
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ModelPickerPersistenceRequest(
+    /** Filesystem and environment context used to resolve settings persistence. */
+    @JsonProperty("settingsContext") ModelPickerSettingsContext settingsContext,
+    /** Whether reasoning effort was explicitly selected and should be persisted. */
+    @JsonProperty("reasoningEffortExplicit") Boolean reasoningEffortExplicit,
+    /** Whether context tier was explicitly selected and should be persisted. */
+    @JsonProperty("contextTierExplicit") Boolean contextTierExplicit
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelPickerPriceCategory.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerPriceCategory.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelPickerPriceCategory.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerPriceCategory.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerSettingsContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerSettingsContext.java
new file mode 100644
index 0000000000..04eec742eb
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPickerSettingsContext.java
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Filesystem and environment context used to resolve model-picker settings.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ModelPickerSettingsContext(
+    /** Optional Copilot configuration directory containing persisted settings. */
+    @JsonProperty("configDir") String configDir,
+    /** User home directory used when resolving persisted settings. */
+    @JsonProperty("homeDirectory") String homeDirectory,
+    /** Environment variables consulted while resolving model-picker settings. */
+    @JsonProperty("environment") Map<String, Object> environment
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelPolicy.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPolicy.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelPolicy.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPolicy.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelPolicyState.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPolicyState.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelPolicyState.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelPolicyState.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelSwitchConfirmation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelSwitchConfirmation.java
new file mode 100644
index 0000000000..4a75be2b10
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelSwitchConfirmation.java
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ModelSwitchConfirmation(
+    /** Display name of the model that requires compaction confirmation. */
+    @JsonProperty("targetModelDisplayName") String targetModelDisplayName,
+    /** Current conversation token count before switching models. */
+    @JsonProperty("currentTokens") Double currentTokens,
+    /** Target model token limit used by the compaction preflight. */
+    @JsonProperty("targetLimit") Double targetLimit
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelWarningText.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelWarningText.java
new file mode 100644
index 0000000000..817be420c5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelWarningText.java
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Service-published warning text that hosts should display when presenting a model.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ModelWarningText(
+    /** Data-retention warning for the model. The text may contain Markdown links and should be rendered as Markdown when supported. */
+    @JsonProperty("dataRetention") String dataRetention
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelsGetBuiltInCatalogResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelsGetBuiltInCatalogResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelsGetBuiltInCatalogResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelsGetBuiltInCatalogResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelsListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelsListParams.java
similarity index 76%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelsListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelsListParams.java
index 3366ff61c4..d5bcad93ac 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ModelsListParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelsListParams.java
@@ -24,7 +24,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record ModelsListParams(
-    /** GitHub token for per-user model listing. When provided, resolves this token to determine the user's Copilot plan and available models instead of using the global auth. */
+    /** Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used. */
+    @JsonProperty("selectionId") String selectionId,
+    /** GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account. */
     @JsonProperty("gitHubToken") String gitHubToken
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ModelsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelsListResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/NamedProviderConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/NamedProviderConfig.java
new file mode 100644
index 0000000000..dc57bca4f3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/NamedProviderConfig.java
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * External SDK input for a named custom model provider. Ingested by the native protocol boundary before host dispatch.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record NamedProviderConfig(
+    /** Unique provider name used to qualify model selection IDs. */
+    @JsonProperty("name") String name,
+    /** Provider protocol family. */
+    @JsonProperty("type") ProviderConfigType type,
+    /** Wire API used to communicate with the provider. */
+    @JsonProperty("wireApi") ProviderConfigWireApi wireApi,
+    /** Transport used to communicate with the provider. */
+    @JsonProperty("transport") ProviderConfigTransport transport,
+    /** Base URL for provider API requests. */
+    @JsonProperty("baseUrl") String baseUrl,
+    /** Static API key used to authenticate provider requests. */
+    @JsonProperty("apiKey") String apiKey,
+    /** Static bearer token used to authenticate provider requests. */
+    @JsonProperty("bearerToken") String bearerToken,
+    /** Azure authentication configuration for the provider. */
+    @JsonProperty("azure") ProviderConfigAzure azure,
+    /** Additional HTTP headers included with provider requests. */
+    @JsonProperty("headers") Map<String, String> headers,
+    /** Whether the host supplies bearer tokens dynamically. */
+    @JsonProperty("hasBearerTokenProvider") Boolean hasBearerTokenProvider
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/OpenCanvasInstance.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OpenCanvasInstance.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/OpenCanvasInstance.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/OpenCanvasInstance.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicy.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicy.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicy.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicy.java
index 2864bbd99b..3efd398a0c 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicy.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicy.java
@@ -22,7 +22,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record OptionsUpdateAdditionalContentExclusionPolicy(
+    /** Content-exclusion rules to apply. */
     @JsonProperty("rules") List<OptionsUpdateAdditionalContentExclusionPolicyRule> rules,
+    /** Opaque policy update timestamp supplied by the host. */
     @JsonProperty("last_updated_at") Object lastUpdatedAt,
     /** Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration. */
     @JsonProperty("scope") OptionsUpdateAdditionalContentExclusionPolicyScope scope
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRule.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRule.java
similarity index 89%
rename from java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRule.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRule.java
index 135a7c7f85..047dc9fa01 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRule.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRule.java
@@ -22,8 +22,11 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record OptionsUpdateAdditionalContentExclusionPolicyRule(
+    /** Path patterns covered by this rule. */
     @JsonProperty("paths") List<String> paths,
+    /** Conditions of which at least one must match. */
     @JsonProperty("ifAnyMatch") List<String> ifAnyMatch,
+    /** Conditions none of which may match. */
     @JsonProperty("ifNoneMatch") List<String> ifNoneMatch,
     /** Source descriptor for a `session.options.update` content-exclusion rule, with source name and type. */
     @JsonProperty("source") OptionsUpdateAdditionalContentExclusionPolicyRuleSource source
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRuleSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRuleSource.java
similarity index 93%
rename from java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRuleSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRuleSource.java
index a363722801..43ec75b1a1 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRuleSource.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyRuleSource.java
@@ -21,7 +21,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record OptionsUpdateAdditionalContentExclusionPolicyRuleSource(
+    /** Name of the policy source. */
     @JsonProperty("name") String name,
+    /** Type of the policy source. */
     @JsonProperty("type") String type
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyScope.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyScope.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateAdditionalContentExclusionPolicyScope.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateContextTier.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateContextTier.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateContextTier.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateContextTier.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateEnvValueMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateEnvValueMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateEnvValueMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateEnvValueMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateReasoningSummary.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateReasoningSummary.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateReasoningSummary.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateReasoningSummary.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateToolFilterPrecedence.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateToolFilterPrecedence.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateToolFilterPrecedence.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/OptionsUpdateToolFilterPrecedence.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PendingPermissionRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PendingPermissionRequest.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PendingPermissionRequest.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PendingPermissionRequest.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionContext.java
new file mode 100644
index 0000000000..5200f4cd51
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionContext.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Optional informational context describing how and where the permission decision was made. This does not affect permission behavior.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record PermissionDecisionContext(
+    /** Disposition of the permission request as observed by the responding client. */
+    @JsonProperty("outcome") PermissionDecisionOutcome outcome,
+    /** Controlled reason or actor responsible for the response. */
+    @JsonProperty("source") PermissionDecisionSource source,
+    /** Client surface that submitted the response. */
+    @JsonProperty("surface") PermissionDecisionSurface surface,
+    /** Whether the responding client could ask a user interactively, was running headlessly, or had no response path. Omit when the client cannot determine this authoritatively. */
+    @JsonProperty("responseCapability") PermissionResponseCapability responseCapability
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionOutcome.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionOutcome.java
new file mode 100644
index 0000000000..d46c460a29
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionOutcome.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Disposition of a permission request as observed by the responding client.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum PermissionDecisionOutcome {
+    /** The {@code auto_approved} variant. */
+    AUTO_APPROVED("auto_approved"),
+    /** The {@code autopilot_denied} variant. */
+    AUTOPILOT_DENIED("autopilot_denied"),
+    /** The {@code prompted_user} variant. */
+    PROMPTED_USER("prompted_user");
+
+    private final String value;
+    PermissionDecisionOutcome(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static PermissionDecisionOutcome fromValue(String value) {
+        for (PermissionDecisionOutcome v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown PermissionDecisionOutcome value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionSource.java
new file mode 100644
index 0000000000..56f5793c5e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionSource.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Controlled reason or actor responsible for a permission response.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum PermissionDecisionSource {
+    /** The {@code assisted_approval} variant. */
+    ASSISTED_APPROVAL("assisted_approval"),
+    /** The {@code human_response} variant. */
+    HUMAN_RESPONSE("human_response"),
+    /** The {@code host_policy} variant. */
+    HOST_POLICY("host_policy"),
+    /** The {@code unattended_fallback} variant. */
+    UNATTENDED_FALLBACK("unattended_fallback");
+
+    private final String value;
+    PermissionDecisionSource(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static PermissionDecisionSource fromValue(String value) {
+        for (PermissionDecisionSource v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown PermissionDecisionSource value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionSurface.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionSurface.java
new file mode 100644
index 0000000000..c6d2db8c5f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionDecisionSurface.java
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Client surface that submitted a permission response.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum PermissionDecisionSurface {
+    /** The {@code tui} variant. */
+    TUI("tui"),
+    /** The {@code prompt_mode} variant. */
+    PROMPT_MODE("prompt_mode"),
+    /** The {@code copilot_app} variant. */
+    COPILOT_APP("copilot_app"),
+    /** The {@code acp} variant. */
+    ACP("acp"),
+    /** The {@code sdk} variant. */
+    SDK("sdk");
+
+    private final String value;
+    PermissionDecisionSurface(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static PermissionDecisionSurface fromValue(String value) {
+        for (PermissionDecisionSurface v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown PermissionDecisionSurface value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionLocationType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionLocationType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionLocationType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionLocationType.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionMode.java
new file mode 100644
index 0000000000..1f4ea9b6bc
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionMode.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Current or requested permission mode.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum PermissionMode {
+    /** The {@code manual} variant. */
+    MANUAL("manual"),
+    /** The {@code assisted} variant. */
+    ASSISTED("assisted"),
+    /** The {@code allow-all} variant. */
+    ALLOW_ALL("allow-all");
+
+    private final String value;
+    PermissionMode(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static PermissionMode fromValue(String value) {
+        for (PermissionMode v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown PermissionMode value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsSetAllowAllSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionModeSource.java
similarity index 68%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionsSetAllowAllSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionModeSource.java
index a7ff9ae9aa..534760c746 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsSetAllowAllSource.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionModeSource.java
@@ -10,30 +10,32 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
+ * Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK callers.
  *
  * @since 1.0.0
  */
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
-public enum PermissionsSetAllowAllSource {
+public enum PermissionModeSource {
     /** The {@code cli_flag} variant. */
     CLI_FLAG("cli_flag"),
     /** The {@code slash_command} variant. */
     SLASH_COMMAND("slash_command"),
     /** The {@code autopilot_confirmation} variant. */
     AUTOPILOT_CONFIRMATION("autopilot_confirmation"),
+    /** The {@code user_setting} variant. */
+    USER_SETTING("user_setting"),
     /** The {@code rpc} variant. */
     RPC("rpc");
 
     private final String value;
-    PermissionsSetAllowAllSource(String value) { this.value = value; }
+    PermissionModeSource(String value) { this.value = value; }
     @com.fasterxml.jackson.annotation.JsonValue
     public String getValue() { return value; }
     @com.fasterxml.jackson.annotation.JsonCreator
-    public static PermissionsSetAllowAllSource fromValue(String value) {
-        for (PermissionsSetAllowAllSource v : values()) {
+    public static PermissionModeSource fromValue(String value) {
+        for (PermissionModeSource v : values()) {
             if (v.value.equals(value)) return v;
         }
-        throw new IllegalArgumentException("Unknown PermissionsSetAllowAllSource value: " + value);
+        throw new IllegalArgumentException("Unknown PermissionModeSource value: " + value);
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionPathsConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionPathsConfig.java
similarity index 80%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionPathsConfig.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionPathsConfig.java
index 29aef6c66f..56dbd73dd8 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionPathsConfig.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionPathsConfig.java
@@ -24,7 +24,7 @@
 public record PermissionPathsConfig(
     /** If true, the runtime allows access to all paths without prompting. Equivalent to constructing an UnrestrictedPathManager. */
     @JsonProperty("unrestricted") Boolean unrestricted,
-    /** Additional directories to allow tool access to (in addition to the session's working directory). When `unrestricted` is true, these are still pre-populated on the UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention completion). */
+    /** Additional directories to allow tool access to (in addition to the session's working directory). Conventional `.github/skills/` and `.github/agents/` definitions under them also join the session catalogs when their subsystem gates are enabled, so supplying a directory is a trust decision for configuration stored there. When `unrestricted` is true, these are still pre-populated on the UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention completion). */
     @JsonProperty("additionalDirectories") List<String> additionalDirectories,
     /** Whether to include the system temp directory in the allowed list (defaults to true). Ignored when `unrestricted` is true. */
     @JsonProperty("includeTempDirectory") Boolean includeTempDirectory,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionResponseCapability.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionResponseCapability.java
new file mode 100644
index 0000000000..c52bfd3234
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionResponseCapability.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Response capability available to the client when it settled a permission request.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum PermissionResponseCapability {
+    /** The {@code interactive} variant. */
+    INTERACTIVE("interactive"),
+    /** The {@code headless} variant. */
+    HEADLESS("headless"),
+    /** The {@code none} variant. */
+    NONE("none");
+
+    private final String value;
+    PermissionResponseCapability(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static PermissionResponseCapability fromValue(String value) {
+        for (PermissionResponseCapability v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown PermissionResponseCapability value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionRule.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionRule.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionRule.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionRule.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionRulesSet.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionRulesSet.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionRulesSet.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionRulesSet.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionUrlsConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionUrlsConfig.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionUrlsConfig.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionUrlsConfig.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicy.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicy.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicy.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicy.java
index 249c7598d9..e451bfe490 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicy.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicy.java
@@ -22,7 +22,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record PermissionsConfigureAdditionalContentExclusionPolicy(
+    /** Content-exclusion rules to apply. */
     @JsonProperty("rules") List<PermissionsConfigureAdditionalContentExclusionPolicyRule> rules,
+    /** Opaque policy update timestamp supplied by the host. */
     @JsonProperty("last_updated_at") Object lastUpdatedAt,
     /** Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope` enumeration. */
     @JsonProperty("scope") PermissionsConfigureAdditionalContentExclusionPolicyScope scope
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRule.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRule.java
similarity index 90%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRule.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRule.java
index b1afc50fcd..4515f55d7c 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRule.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRule.java
@@ -22,8 +22,11 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record PermissionsConfigureAdditionalContentExclusionPolicyRule(
+    /** Path patterns covered by this rule. */
     @JsonProperty("paths") List<String> paths,
+    /** Conditions of which at least one must match. */
     @JsonProperty("ifAnyMatch") List<String> ifAnyMatch,
+    /** Conditions none of which may match. */
     @JsonProperty("ifNoneMatch") List<String> ifNoneMatch,
     /** Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type. */
     @JsonProperty("source") PermissionsConfigureAdditionalContentExclusionPolicyRuleSource source
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRuleSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRuleSource.java
similarity index 93%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRuleSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRuleSource.java
index f592ae7991..e4eae24027 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRuleSource.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyRuleSource.java
@@ -21,7 +21,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record PermissionsConfigureAdditionalContentExclusionPolicyRuleSource(
+    /** Name of the policy source. */
     @JsonProperty("name") String name,
+    /** Type of the policy source. */
     @JsonProperty("type") String type
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyScope.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyScope.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsConfigureAdditionalContentExclusionPolicyScope.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsModifyRulesScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsModifyRulesScope.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionsModifyRulesScope.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsModifyRulesScope.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsSetApproveAllSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsSetApproveAllSource.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionsSetApproveAllSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsSetApproveAllSource.java
index b86b09dfa3..0bf52d53df 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsSetApproveAllSource.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsSetApproveAllSource.java
@@ -22,6 +22,8 @@ public enum PermissionsSetApproveAllSource {
     SLASH_COMMAND("slash_command"),
     /** The {@code autopilot_confirmation} variant. */
     AUTOPILOT_CONFIRMATION("autopilot_confirmation"),
+    /** The {@code user_setting} variant. */
+    USER_SETTING("user_setting"),
     /** The {@code rpc} variant. */
     RPC("rpc");
 
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PingParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PingParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PingParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PingParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PingResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PingResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PingResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PingResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodoDependency.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodoDependency.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodoDependency.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodoDependency.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodosRow.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodosRow.java
similarity index 76%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodosRow.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodosRow.java
index bee0a48546..56e0e3dfcc 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodosRow.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PlanSqlTodosRow.java
@@ -28,6 +28,8 @@ public record PlanSqlTodosRow(
     /** Todo description. */
     @JsonProperty("description") String description,
     /** Todo status. */
-    @JsonProperty("status") String status
+    @JsonProperty("status") String status,
+    /** Todo creation time, as stored by the session SQL schema's `datetime('now')` default: `YYYY-MM-DD HH:MM:SS` in UTC. Lets clients attribute todos to the work item that created them (e.g. scoping a goal's progress to the todos it produced) rather than to the whole session. */
+    @JsonProperty("createdAt") String createdAt
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/Plugin.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Plugin.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/Plugin.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/Plugin.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginUpdateAllEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginUpdateAllEntry.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginUpdateAllEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginUpdateAllEntry.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsBuiltinSetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsBuiltinSetParams.java
new file mode 100644
index 0000000000..f0d77fe641
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsBuiltinSetParams.java
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Trusted built-in plugin directories to use for this runtime process.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record PluginsBuiltinSetParams(
+    /** Complete replacement set of trusted built-in plugin directories. Every entry must be an absolute local filesystem path no longer than 4096 characters. */
+    @JsonProperty("paths") List<String> paths
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsDisableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsDisableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsDisableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsDisableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsEnableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsEnableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsEnableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsEnableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsInstallParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsInstallParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsInstallParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsInstallParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsInstallResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsInstallResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsInstallResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsInstallResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesAddParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesAddParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesAddParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesAddParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesAddResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesAddResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesAddResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesAddResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesBrowseParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesBrowseParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesBrowseParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesBrowseParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesBrowseResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesBrowseResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesBrowseResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesBrowseResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRefreshParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRefreshParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRefreshParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRefreshParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRefreshResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRefreshResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRefreshResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRefreshResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRemoveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRemoveParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRemoveParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRemoveParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRemoveResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRemoveResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRemoveResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsMarketplacesRemoveResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsUninstallParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsUninstallParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsUninstallParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsUninstallParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateAllResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateAllResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateAllResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateAllResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/PluginsUpdateResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsAllowAllMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProtocolExternalToolDefer.java
similarity index 61%
rename from java/src/generated/java/com/github/copilot/generated/rpc/PermissionsAllowAllMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProtocolExternalToolDefer.java
index db24a2bad1..58f1ec24d5 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/PermissionsAllowAllMode.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProtocolExternalToolDefer.java
@@ -10,28 +10,26 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Current or requested allow-all mode.
+ * Controls whether the runtime may defer loading an external tool definition.
  *
  * @since 1.0.0
  */
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
-public enum PermissionsAllowAllMode {
-    /** The {@code off} variant. */
-    OFF("off"),
-    /** The {@code on} variant. */
-    ON("on"),
+public enum ProtocolExternalToolDefer {
     /** The {@code auto} variant. */
-    AUTO("auto");
+    AUTO("auto"),
+    /** The {@code never} variant. */
+    NEVER("never");
 
     private final String value;
-    PermissionsAllowAllMode(String value) { this.value = value; }
+    ProtocolExternalToolDefer(String value) { this.value = value; }
     @com.fasterxml.jackson.annotation.JsonValue
     public String getValue() { return value; }
     @com.fasterxml.jackson.annotation.JsonCreator
-    public static PermissionsAllowAllMode fromValue(String value) {
-        for (PermissionsAllowAllMode v : values()) {
+    public static ProtocolExternalToolDefer fromValue(String value) {
+        for (ProtocolExternalToolDefer v : values()) {
             if (v.value.equals(value)) return v;
         }
-        throw new IllegalArgumentException("Unknown PermissionsAllowAllMode value: " + value);
+        throw new IllegalArgumentException("Unknown ProtocolExternalToolDefer value: " + value);
     }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProtocolExternalToolDefinition.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProtocolExternalToolDefinition.java
new file mode 100644
index 0000000000..5e7095700c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProtocolExternalToolDefinition.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Serializable definition of a caller-implemented tool whose execution is handled over the SDK connection.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ProtocolExternalToolDefinition(
+    /** Unique model-visible tool name. */
+    @JsonProperty("name") String name,
+    /** Model-visible explanation of what the tool does. */
+    @JsonProperty("description") String description,
+    /** Optional human-readable display title. */
+    @JsonProperty("title") String title,
+    /** JSON Schema describing the tool's input arguments. */
+    @JsonProperty("parameters") Map<String, Object> parameters,
+    /** Whether this definition replaces a built-in tool with the same name. */
+    @JsonProperty("overridesBuiltInTool") Boolean overridesBuiltInTool,
+    /** Whether execution bypasses the normal tool permission prompt. */
+    @JsonProperty("skipPermission") Boolean skipPermission,
+    /** Tool-loading deferral policy. */
+    @JsonProperty("defer") ProtocolExternalToolDefer defer,
+    /** Whether the tool executes commands in a terminal. */
+    @JsonProperty("isTerminal") Boolean isTerminal,
+    /** Optional caller-defined metadata associated with the tool. */
+    @JsonProperty("metadata") Map<String, Object> metadata
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfig.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfig.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfig.java
index ee21c07d1b..25cc365ab0 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfig.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfig.java
@@ -38,6 +38,10 @@ public record ProviderConfig(
     @JsonProperty("azure") ProviderConfigAzure azure,
     /** Well-known model ID used for capability lookup. When set, agent behavior config and token limits are inferred from this model. */
     @JsonProperty("modelId") String modelId,
+    /** Overrides for model capabilities when they cannot be inferred from modelId. */
+    @JsonProperty("modelCapabilities") ModelCapabilitiesOverride modelCapabilities,
+    /** Provider name used for model and telemetry attribution. */
+    @JsonProperty("providerName") String providerName,
     /** The model identifier sent to the provider API for inference (the "wire" model), as opposed to modelId which is the well-known base. */
     @JsonProperty("wireModel") String wireModel,
     /** Maximum prompt/input tokens for the model. */
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigAzure.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigAzure.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigAzure.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigAzure.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigTransport.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigTransport.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigTransport.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigTransport.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigWireApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigWireApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigWireApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderConfigWireApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointTransport.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointTransport.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointTransport.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointTransport.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointWireApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointWireApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointWireApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderEndpointWireApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderModelConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderModelConfig.java
similarity index 87%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderModelConfig.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderModelConfig.java
index c9f2630ed3..8e92701bad 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderModelConfig.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderModelConfig.java
@@ -23,7 +23,7 @@
 public record ProviderModelConfig(
     /** Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`. */
     @JsonProperty("id") String id,
-    /** Name of the NamedProviderConfig that serves this model. */
+    /** Name of the configured provider that serves this model. */
     @JsonProperty("provider") String provider,
     /** The model name sent to the provider API for inference. Defaults to `id`. */
     @JsonProperty("wireModel") String wireModel,
@@ -32,11 +32,11 @@ public record ProviderModelConfig(
     /** Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`). */
     @JsonProperty("name") String name,
     /** Maximum prompt/input tokens for the model. */
-    @JsonProperty("maxPromptTokens") Double maxPromptTokens,
+    @JsonProperty("maxPromptTokens") Long maxPromptTokens,
     /** Maximum context window tokens for the model. */
-    @JsonProperty("maxContextWindowTokens") Double maxContextWindowTokens,
+    @JsonProperty("maxContextWindowTokens") Long maxContextWindowTokens,
     /** Maximum output tokens for the model. */
-    @JsonProperty("maxOutputTokens") Double maxOutputTokens,
+    @JsonProperty("maxOutputTokens") Long maxOutputTokens,
     /** Optional capability overrides (vision, tool_calls, reasoning, etc.). */
     @JsonProperty("capabilities") ModelCapabilitiesOverride capabilities
 ) {
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderSessionToken.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderSessionToken.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderSessionToken.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderSessionToken.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenParams.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenParams.java
index a3e3cad7eb..1181e3ec6c 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenParams.java
@@ -26,7 +26,7 @@
 public record ProviderTokenGetTokenParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
-    /** Name of the BYOK provider needing a token. For the legacy whole-session `provider` this is the implicit provider name; for named providers it is `NamedProviderConfig.name`. */
+    /** Name of the BYOK provider needing a token. For the legacy whole-session provider this is the implicit provider name; for named providers it is the configured provider name. */
     @JsonProperty("providerName") String providerName
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderTokenGetTokenResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/QueueInsertMessage.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/QueueInsertMessage.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/QueueInsertMessage.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/QueueInsertMessage.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/QueuePendingItems.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/QueuePendingItems.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/QueuePendingItems.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/QueuePendingItems.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/QueuePendingItemsKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/QueuePendingItemsKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/QueuePendingItemsKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/QueuePendingItemsKind.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ReasoningSummary.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ReasoningSummary.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ReasoningSummary.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ReasoningSummary.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RemoteControlConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteControlConfig.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RemoteControlConfig.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteControlConfig.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RemoteControlConfigExistingMcSession.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteControlConfigExistingMcSession.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RemoteControlConfigExistingMcSession.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteControlConfigExistingMcSession.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionHostStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionHostStatus.java
new file mode 100644
index 0000000000..50b6355d93
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionHostStatus.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * What a remote host says one of its sessions is doing right now. Deliberately coarse: this is what a host can report for EVERY session in a catalogue listing, without a client subscribing to each one. AHP's `SessionSummary.status` is the source today; `input-needed` covers both a permission prompt and an `ask_user` question, since the summary does not say which.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum RemoteSessionHostStatus {
+    /** The {@code idle} variant. */
+    IDLE("idle"),
+    /** The {@code working} variant. */
+    WORKING("working"),
+    /** The {@code input-needed} variant. */
+    INPUT_NEEDED("input-needed"),
+    /** The {@code error} variant. */
+    ERROR("error");
+
+    private final String value;
+    RemoteSessionHostStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static RemoteSessionHostStatus fromValue(String value) {
+        for (RemoteSessionHostStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown RemoteSessionHostStatus value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataRepository.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataRepository.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataRepository.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataRepository.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataTaskType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataTaskType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataTaskType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataTaskType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataValue.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataValue.java
similarity index 79%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataValue.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataValue.java
index 46f1077d9e..3ff7338d4a 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataValue.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMetadataValue.java
@@ -49,6 +49,10 @@ public record RemoteSessionMetadataValue(
     /** Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats. */
     @JsonProperty("staleAt") String staleAt,
     /** Server-side task state returned by GitHub. */
-    @JsonProperty("state") String state
+    @JsonProperty("state") String state,
+    /** Live status as the owning host reports it in its session listing, so a row for a session running elsewhere can show that it is running. Absent for hosts that publish no such status (the cloud task managers), which read as idle. */
+    @JsonProperty("hostStatus") RemoteSessionHostStatus hostStatus,
+    /** Host-supplied human description of what the session is doing right now ("running tests", "waiting for approval"). Optional in the protocol and absent on hosts that do not publish it, so never rely on it -- it enriches `hostStatus`, it does not replace it. */
+    @JsonProperty("hostActivity") String hostActivity
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionRepository.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionRepository.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionRepository.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemoteSessionRepository.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RpcCaller.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RpcCaller.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RpcCaller.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RpcCaller.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RpcMapper.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RpcMapper.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RpcMapper.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RpcMapper.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RunOptions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RunOptions.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/RunOptions.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/RunOptions.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfig.java
new file mode 100644
index 0000000000..9194ea9661
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfig.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Resolved sandbox configuration.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SandboxConfig(
+    /** Whether sandboxing is enabled for the session. */
+    @JsonProperty("enabled") Boolean enabled,
+    /** User-managed sandbox policy fragment merged into the auto-discovered base policy. */
+    @JsonProperty("userPolicy") SandboxConfigUserPolicy userPolicy,
+    /** Whether to auto-add the current working directory to readwritePaths. Default: true. */
+    @JsonProperty("addCurrentWorkingDirectory") Boolean addCurrentWorkingDirectory,
+    /** Credential-injection capability flags. */
+    @JsonProperty("auth") SandboxConfigAuth auth,
+    /** Whether to auto-grant read access to the tool directories discovered on PATH and in toolchain environment variables (GOROOT, CARGO_HOME, JAVA_HOME, VIRTUAL_ENV, and similar), and to common developer-tool caches, registries, and toolchains in their default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and up-front creation of) the scratch caches builds write on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so builds work without extra configuration; a relocated CARGO_HOME additionally gets its Cargo lock files granted read-write. Set to false to disable every grant listed above: user-installed toolchains (rustup, nvm, pyenv, conda, pipx) then need explicit userPolicy.filesystem entries — readonlyPaths to read them, plus readwriteFiles for a relocated CARGO_HOME's .package-cache and .global-cache, which Cargo locks on every build. Only these developer-tool grants are affected: the working directory (see addCurrentWorkingDirectory), temporary storage, session log paths, and system locations follow their own rules and stay granted, so commands still run. Default: true (enabled by default; set to false to opt out). */
+    @JsonProperty("allowDevToolAccess") Boolean allowDevToolAccess
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigAuth.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigAuth.java
new file mode 100644
index 0000000000..cb4efc78e7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigAuth.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Credential-injection capability flags applied while the sandbox is enabled. For the same capability independent of sandboxing, and matched to the credential's GitHub host, see `shell.credentials`; the two are additive.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SandboxConfigAuth(
+    /** Whether to inject git credentials as an `http.<url>.extraheader` so authenticated HTTPS git works inside the sandbox without the shell-based credential helper the sandbox blocks. github.com is served by the Copilot token; every other forge (Azure DevOps, GitHub Enterprise Server, GitLab, ...) by a credential the host resolves from the user's own helper before the sandbox is applied. Default: false (opt-in). */
+    @JsonProperty("git") Boolean git,
+    /** Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the OS keyring the sandbox blocks. Default: false (opt-in). */
+    @JsonProperty("gh") Boolean gh
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigSource.java
new file mode 100644
index 0000000000..73760b08a2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigSource.java
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Origin of the sandbox choice supplied by an internal client.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum SandboxConfigSource {
+    /** The {@code never_configured} variant. */
+    NEVER_CONFIGURED("never_configured"),
+    /** The {@code user_enabled} variant. */
+    USER_ENABLED("user_enabled"),
+    /** The {@code user_disabled} variant. */
+    USER_DISABLED("user_disabled"),
+    /** The {@code session_flag} variant. */
+    SESSION_FLAG("session_flag"),
+    /** The {@code session_disabled} variant. */
+    SESSION_DISABLED("session_disabled"),
+    /** The {@code unsupported_host} variant. */
+    UNSUPPORTED_HOST("unsupported_host"),
+    /** The {@code repository_policy} variant. */
+    REPOSITORY_POLICY("repository_policy");
+
+    private final String value;
+    SandboxConfigSource(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static SandboxConfigSource fromValue(String value) {
+        for (SandboxConfigSource v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown SandboxConfigSource value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicy.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicy.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicy.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicy.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyExperimental.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyExperimental.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyExperimental.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyExperimental.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyExperimentalSeatbelt.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyExperimentalSeatbelt.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyExperimentalSeatbelt.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyExperimentalSeatbelt.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyFilesystem.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyFilesystem.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyFilesystem.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyFilesystem.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyNetwork.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyNetwork.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyNetwork.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyNetwork.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyNetworkProxy.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyNetworkProxy.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyNetworkProxy.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicyNetworkProxy.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicySeatbelt.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicySeatbelt.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicySeatbelt.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxConfigUserPolicySeatbelt.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ScheduleEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ScheduleEntry.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ScheduleEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ScheduleEntry.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SecretsAddFilterValuesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SecretsAddFilterValuesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SecretsAddFilterValuesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SecretsAddFilterValuesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SecretsAddFilterValuesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SecretsAddFilterValuesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SecretsAddFilterValuesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SecretsAddFilterValuesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SendAgentMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SendAgentMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SendAgentMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SendAgentMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SendMessageItem.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SendMessageItem.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SendMessageItem.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SendMessageItem.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SendMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SendMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SendMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SendMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java
similarity index 91%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java
index a6ecb05547..0adbf18092 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java
@@ -28,7 +28,7 @@ public final class ServerAccountApi {
     }
 
     /**
-     * Optional GitHub token used to look up quota for a specific user instead of the global auth context.
+     * Optional opaque account selection or compatibility GitHub token used to look up quota.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -41,7 +41,7 @@ public CompletableFuture<AccountGetQuotaResult> getQuota() {
     }
 
     /**
-     * Optional GitHub token used to look up quota for a specific user instead of the global auth context.
+     * Optional opaque account selection or compatibility GitHub token used to look up quota.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -74,7 +74,7 @@ public CompletableFuture<List<AccountAllUsers>> getAllUsers() {
     }
 
     /**
-     * Credentials to store after successful authentication
+     * Credentials to validate and store. Omit login to resolve the authenticated user from the token.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerAgentRegistryApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentRegistryApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerAgentRegistryApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentRegistryApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerAgentsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerAgentsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentsApi.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerCatalogApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerCatalogApi.java
new file mode 100644
index 0000000000..9b320cbb39
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerCatalogApi.java
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.github.copilot.CopilotExperimental;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code catalog} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class ServerCatalogApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerCatalogApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * A bounded catalog search. Both the query length and the result count are capped by the schema so a caller cannot request an unbounded scan.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<CatalogSearchResult> search(CatalogSearchParams params) {
+        return caller.invoke("catalog.search", params, CatalogSearchResult.class);
+    }
+
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerCommandsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerCommandsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerCommandsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerCommandsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerExtensionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerExtensionsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerExtensionsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerExtensionsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerLlmInferenceApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerLlmInferenceApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerLlmInferenceApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerLlmInferenceApi.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerManagedSettingsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerManagedSettingsApi.java
new file mode 100644
index 0000000000..e85b7b987a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerManagedSettingsApi.java
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.github.copilot.CopilotExperimental;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code managedSettings} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class ServerManagedSettingsApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerManagedSettingsApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Validated device-managed settings discovered before a session exists.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<ManagedSettingsReadResult> read() {
+        return caller.invoke("managedSettings.read", java.util.Map.of(), ManagedSettingsReadResult.class);
+    }
+
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java
similarity index 74%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java
index b29c27fa4c..88dd7621fd 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java
@@ -41,4 +41,15 @@ public CompletableFuture<McpDiscoverResult> discover(McpDiscoverParams params) {
         return caller.invoke("mcp.discover", params, McpDiscoverResult.class);
     }
 
+    /**
+     * A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<McpPlanInstallResult> planInstall(McpPlanInstallParams params) {
+        return caller.invoke("mcp.planInstall", params, McpPlanInstallResult.class);
+    }
+
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerMcpConfigApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpConfigApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerMcpConfigApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpConfigApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerModelsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerModelsApi.java
similarity index 90%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerModelsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerModelsApi.java
index 0b14979707..e4fd3cbc53 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ServerModelsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerModelsApi.java
@@ -27,7 +27,7 @@ public final class ServerModelsApi {
     }
 
     /**
-     * Optional GitHub token used to list models for a specific user instead of the global auth context.
+     * Optional opaque account selection or compatibility GitHub token used to list models.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -40,7 +40,7 @@ public CompletableFuture<ModelsListResult> list() {
     }
 
     /**
-     * Optional GitHub token used to list models for a specific user instead of the global auth context.
+     * Optional opaque account selection or compatibility GitHub token used to list models.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java
index 20dc6ab15a..a7a28f5d1c 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java
@@ -21,12 +21,15 @@ public final class ServerPluginsApi {
 
     private final RpcCaller caller;
 
+    /** API methods for the {@code plugins.builtin} sub-namespace. */
+    public final ServerPluginsBuiltinApi builtin;
     /** API methods for the {@code plugins.marketplaces} sub-namespace. */
     public final ServerPluginsMarketplacesApi marketplaces;
 
     /** @param caller the RPC transport function */
     ServerPluginsApi(RpcCaller caller) {
         this.caller = caller;
+        this.builtin = new ServerPluginsBuiltinApi(caller);
         this.marketplaces = new ServerPluginsMarketplacesApi(caller);
     }
 
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsBuiltinApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsBuiltinApi.java
new file mode 100644
index 0000000000..0610fcb28e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsBuiltinApi.java
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.github.copilot.CopilotExperimental;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code plugins.builtin} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class ServerPluginsBuiltinApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerPluginsBuiltinApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Trusted built-in plugin directories to use for this runtime process.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> set(PluginsBuiltinSetParams params) {
+        return caller.invoke("plugins.builtin.set", params, Void.class);
+    }
+
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsMarketplacesApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsMarketplacesApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsMarketplacesApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsMarketplacesApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java
similarity index 83%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java
index e66f32737f..111cee2560 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java
@@ -37,6 +37,8 @@ public final class ServerRpc {
     public final ServerMcpApi mcp;
     /** API methods for the {@code extensions} namespace. */
     public final ServerExtensionsApi extensions;
+    /** API methods for the {@code catalog} namespace. */
+    public final ServerCatalogApi catalog;
     /** API methods for the {@code plugins} namespace. */
     public final ServerPluginsApi plugins;
     /** API methods for the {@code skills} namespace. */
@@ -49,6 +51,8 @@ public final class ServerRpc {
     public final ServerCommandsApi commands;
     /** API methods for the {@code user} namespace. */
     public final ServerUserApi user;
+    /** API methods for the {@code managedSettings} namespace. */
+    public final ServerManagedSettingsApi managedSettings;
     /** API methods for the {@code runtime} namespace. */
     public final ServerRuntimeApi runtime;
     /** API methods for the {@code sessionFs} namespace. */
@@ -73,12 +77,14 @@ public ServerRpc(RpcCaller caller) {
         this.secrets = new ServerSecretsApi(caller);
         this.mcp = new ServerMcpApi(caller);
         this.extensions = new ServerExtensionsApi(caller);
+        this.catalog = new ServerCatalogApi(caller);
         this.plugins = new ServerPluginsApi(caller);
         this.skills = new ServerSkillsApi(caller);
         this.agents = new ServerAgentsApi(caller);
         this.instructions = new ServerInstructionsApi(caller);
         this.commands = new ServerCommandsApi(caller);
         this.user = new ServerUserApi(caller);
+        this.managedSettings = new ServerManagedSettingsApi(caller);
         this.runtime = new ServerRuntimeApi(caller);
         this.sessionFs = new ServerSessionFsApi(caller);
         this.llmInference = new ServerLlmInferenceApi(caller);
@@ -98,7 +104,7 @@ public CompletableFuture<PingResult> ping(PingParams params) {
     }
 
     /**
-     * Parameters for the `server.connect` handshake: an optional connection token and optional connection-level opt-ins (e.g. GitHub telemetry forwarding).
+     * Connection-level opt-ins for the `server.connect` handshake. Transport authentication is consumed by the native protocol boundary before dispatch.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -108,4 +114,15 @@ public CompletableFuture<ConnectResult> connect(ConnectParams params) {
         return caller.invoke("connect", params, ConnectResult.class);
     }
 
+    /**
+     * Invokes {@code registerExtensionLaunchProvider}.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> registerExtensionLaunchProvider() {
+        return caller.invoke("registerExtensionLaunchProvider", java.util.Map.of(), Void.class);
+    }
+
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerRuntimeApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRuntimeApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerRuntimeApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRuntimeApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSecretsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSecretsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerSecretsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSecretsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSessionFsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionFsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerSessionFsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionFsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSessionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerSessionsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java
index 3498245262..b1d409d9d9 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java
@@ -23,6 +23,8 @@
 public record ServerSkill(
     /** Unique identifier for the skill */
     @JsonProperty("name") String name,
+    /** Canonical slash command name used to invoke the skill, without the leading '/' */
+    @JsonProperty("commandName") String commandName,
     /** Description of what the skill does */
     @JsonProperty("description") String description,
     /** Source location type (e.g., project, personal-copilot, plugin, builtin) */
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java
similarity index 74%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java
index 688288a118..c29770bf14 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java
@@ -37,4 +37,15 @@ public CompletableFuture<Void> setDisabledSkills(SkillsConfigSetDisabledSkillsPa
         return caller.invoke("skills.config.setDisabledSkills", params, Void.class);
     }
 
+    /**
+     * Adds or removes a single skill from the global disabled list, leaving every other entry untouched.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> setSkillDisabled(SkillsConfigSetSkillDisabledParams params) {
+        return caller.invoke("skills.config.setSkillDisabled", params, Void.class);
+    }
+
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerToolsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerToolsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerToolsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerToolsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerUserApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerUserApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerUserApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerUserApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerUserSettingsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerUserSettingsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ServerUserSettingsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerUserSettingsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAbortParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAbortParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAbortParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAbortParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAbortResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAbortResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAbortResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAbortResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentDeselectParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentDeselectParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentDeselectParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentDeselectParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentGetCurrentParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentGetCurrentParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentGetCurrentParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentGetCurrentParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentGetCurrentResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentGetCurrentResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentGetCurrentResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentGetCurrentResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentReloadParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentReloadParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentReloadParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentReloadParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentReloadResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentReloadResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentReloadResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentReloadResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSelectParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSelectParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSelectParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSelectParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSelectResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSelectResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSelectResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSelectResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSetPromptParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSetPromptParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSetPromptParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentSetPromptParams.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAuthStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAuthStatus.java
new file mode 100644
index 0000000000..6f9d876dd8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAuthStatus.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication status and account metadata for the session.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionAuthStatus(
+    /** Whether the session has resolved authentication */
+    @JsonProperty("isAuthenticated") Boolean isAuthenticated,
+    /** Authentication type */
+    @JsonProperty("authType") AuthInfoType authType,
+    /** Authentication host URL */
+    @JsonProperty("host") String host,
+    /** Authenticated login/username, if available */
+    @JsonProperty("login") String login,
+    /** Human-readable authentication status description */
+    @JsonProperty("statusMessage") String statusMessage,
+    /** Copilot plan tier (e.g., individual_pro, business) */
+    @JsonProperty("copilotPlan") String copilotPlan
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCancelAllBackgroundAgentsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCancelAllBackgroundAgentsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCancelAllBackgroundAgentsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCancelAllBackgroundAgentsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionInvokeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionInvokeParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionInvokeParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionInvokeParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionInvokeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionInvokeResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionInvokeResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionInvokeResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java
similarity index 94%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java
index 88a320e0be..e7cfc4be2f 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java
@@ -26,12 +26,15 @@ public final class SessionCanvasApi {
 
     /** API methods for the {@code canvas.action} sub-namespace. */
     public final SessionCanvasActionApi action;
+    /** API methods for the {@code canvas.provider} sub-namespace. */
+    public final SessionCanvasProviderApi provider;
 
     /** @param caller the RPC transport function */
     SessionCanvasApi(RpcCaller caller, String sessionId) {
         this.caller = caller;
         this.sessionId = sessionId;
         this.action = new SessionCanvasActionApi(caller, sessionId);
+        this.provider = new SessionCanvasProviderApi(caller, sessionId);
     }
 
     /**
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasCloseParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasCloseParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasCloseParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasCloseParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListOpenParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListOpenParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListOpenParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListOpenParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListOpenResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListOpenResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListOpenResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListOpenResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasOpenParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasOpenParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasOpenParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasOpenParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasOpenResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasOpenResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasOpenResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasOpenResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderApi.java
similarity index 61%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderApi.java
index 93fb871501..95fc7ca660 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderApi.java
@@ -12,12 +12,12 @@
 import javax.annotation.processing.Generated;
 
 /**
- * API methods for the {@code gitHubAuth} namespace.
+ * API methods for the {@code canvas.provider} namespace.
  *
  * @since 1.0.0
  */
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
-public final class SessionGitHubAuthApi {
+public final class SessionCanvasProviderApi {
 
     private static final com.fasterxml.jackson.databind.ObjectMapper MAPPER = RpcMapper.INSTANCE;
 
@@ -25,24 +25,29 @@ public final class SessionGitHubAuthApi {
     private final String sessionId;
 
     /** @param caller the RPC transport function */
-    SessionGitHubAuthApi(RpcCaller caller, String sessionId) {
+    SessionCanvasProviderApi(RpcCaller caller, String sessionId) {
         this.caller = caller;
         this.sessionId = sessionId;
     }
 
     /**
-     * Identifies the target session.
+     * Internal canvas provider registration parameters.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionGitHubAuthGetStatusResult> getStatus() {
-        return caller.invoke("session.gitHubAuth.getStatus", java.util.Map.of("sessionId", this.sessionId), SessionGitHubAuthGetStatusResult.class);
+    public CompletableFuture<Void> register(SessionCanvasProviderRegisterParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.canvas.provider.register", _p, Void.class);
     }
 
     /**
-     * New auth credentials to install on the session. Omit to leave credentials unchanged.
+     * Internal canvas provider unregistration parameters.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -51,10 +56,10 @@ public CompletableFuture<SessionGitHubAuthGetStatusResult> getStatus() {
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionGitHubAuthSetCredentialsResult> setCredentials(SessionGitHubAuthSetCredentialsParams params) {
+    public CompletableFuture<Void> unregister(SessionCanvasProviderUnregisterParams params) {
         com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
         _p.put("sessionId", this.sessionId);
-        return caller.invoke("session.gitHubAuth.setCredentials", _p, SessionGitHubAuthSetCredentialsResult.class);
+        return caller.invoke("session.canvas.provider.unregister", _p, Void.class);
     }
 
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderRegisterParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderRegisterParams.java
new file mode 100644
index 0000000000..3047576670
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderRegisterParams.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Internal canvas provider registration parameters.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionCanvasProviderRegisterParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Connection identifier for callback routing */
+    @JsonProperty("connectionId") String connectionId,
+    /** Provider metadata supplied by the host */
+    @JsonProperty("info") Object info,
+    /** Canvas contributions supplied by the provider */
+    @JsonProperty("canvases") List<Object> canvases
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderUnregisterParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderUnregisterParams.java
new file mode 100644
index 0000000000..f7b637ac65
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderUnregisterParams.java
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Internal canvas provider unregistration parameters.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionCanvasProviderUnregisterParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Connection identifier to unregister */
+    @JsonProperty("connectionId") String connectionId
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCapability.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCapability.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCapability.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCapability.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsApi.java
similarity index 87%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsApi.java
index facb3fcfc5..405819efce 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsApi.java
@@ -75,6 +75,22 @@ public CompletableFuture<SlashCommandInvocationResult> invoke(SessionCommandsInv
         return caller.invoke("session.commands.invoke", _p, SlashCommandInvocationResult.class);
     }
 
+    /**
+     * The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionCommandsFinalizeInvocationEffectResult> finalizeInvocationEffect(SessionCommandsFinalizeInvocationEffectParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.commands.finalizeInvocationEffect", _p, SessionCommandsFinalizeInvocationEffectResult.class);
+    }
+
     /**
      * Pending command request ID and an optional error if the client handler failed.
      * <p>
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsEnqueueParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsEnqueueParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsEnqueueParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsEnqueueParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsEnqueueResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsEnqueueResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsEnqueueResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsEnqueueResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsExecuteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsExecuteParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsExecuteParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsExecuteParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsExecuteResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsExecuteResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsExecuteResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsExecuteResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsFinalizeInvocationEffectParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsFinalizeInvocationEffectParams.java
new file mode 100644
index 0000000000..2a1b75f5b8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsFinalizeInvocationEffectParams.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionCommandsFinalizeInvocationEffectParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** The slash-command result object that produced the pending effect, echoed back unchanged. */
+    @JsonProperty("effect") Map<String, Object> effect,
+    /** Whether the host applied or cancelled the pending invocation effect. */
+    @JsonProperty("outcome") CommandsInvocationEffectOutcome outcome
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsFinalizeInvocationEffectResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsFinalizeInvocationEffectResult.java
new file mode 100644
index 0000000000..523a68564e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsFinalizeInvocationEffectResult.java
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Whether finalizing the invocation effect succeeded, and the failure reason when it did not.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionCommandsFinalizeInvocationEffectResult(
+    /** Whether the pending invocation effect was finalized successfully. */
+    @JsonProperty("success") Boolean success,
+    /** Failure reason when the invocation effect could not be finalized. */
+    @JsonProperty("error") String error
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsHandlePendingCommandParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsHandlePendingCommandParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsHandlePendingCommandParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsHandlePendingCommandParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsHandlePendingCommandResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsHandlePendingCommandResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsHandlePendingCommandResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsHandlePendingCommandResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsInvokeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsInvokeParams.java
similarity index 88%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsInvokeParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsInvokeParams.java
index 01d9488259..0921ba8ef5 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsInvokeParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsInvokeParams.java
@@ -29,6 +29,8 @@ public record SessionCommandsInvokeParams(
     /** Command name. Leading slashes are stripped and the name is matched case-insensitively. */
     @JsonProperty("name") String name,
     /** Raw input after the command name */
-    @JsonProperty("input") String input
+    @JsonProperty("input") String input,
+    /** Optional client surface that initiated the invocation */
+    @JsonProperty("origin") CommandsInvocationOrigin origin
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsRespondToQueuedCommandParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsRespondToQueuedCommandParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsRespondToQueuedCommandParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsRespondToQueuedCommandParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsRespondToQueuedCommandResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsRespondToQueuedCommandResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsRespondToQueuedCommandResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsRespondToQueuedCommandResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionItem.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionItem.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionItem.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionItem.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsGetTriggerCharactersParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsGetTriggerCharactersParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsGetTriggerCharactersParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsGetTriggerCharactersParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsGetTriggerCharactersResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsGetTriggerCharactersResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsGetTriggerCharactersResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsGetTriggerCharactersResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsRequestParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsRequestParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsRequestParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsRequestParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsRequestResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsRequestResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsRequestResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsRequestResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionCheckPathsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionCheckPathsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionCheckPathsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionCheckPathsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionCheckPathsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionCheckPathsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionCheckPathsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionCheckPathsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContext.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionContext.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContext.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionContextHostType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContextHostType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionContextHostType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContextHostType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionDebugApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionDebugApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionDebugCollectLogsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugCollectLogsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionDebugCollectLogsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugCollectLogsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionDebugCollectLogsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugCollectLogsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionDebugCollectLogsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugCollectLogsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadResult.java
similarity index 96%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadResult.java
index 767acc8795..857578d0fb 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReadResult.java
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.copilot.CopilotExperimental;
+import com.github.copilot.generated.SessionEvent;
 import java.util.List;
 import javax.annotation.processing.Generated;
 
@@ -26,7 +27,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionEventLogReadResult(
     /** Session events for this batch, merged into a single stream in creation order: durable (persisted) events and ephemeral events interleave exactly as they were emitted. Set `includeEphemeral: false` to receive only durable events. Ephemeral events are never replayable once pruned from the in-memory ring, so a consumer that needs them should keep reading with a non-zero `waitMs`. For a backward (tail-first) read, the returned window contains persisted events only, still in chronological (oldest-to-newest) append order. */
-    @JsonProperty("events") List<Object> events,
+    @JsonProperty("events") List<SessionEvent> events,
     /** Opaque cursor for the next read. Pass back unchanged in the next read.cursor to continue from where this read left off. Always present, even when no events were returned. For a backward read this cursor pages toward OLDER events; keep passing `direction: backward` with it (the cursor is also self-describing, so backward paging continues correctly). */
     @JsonProperty("cursor") String cursor,
     /** True when more events are available in the read's direction. For a forward read, true means the batch returned `max` events and more are available immediately. For a backward read, true means older persisted events remain before the returned window. */
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogRegisterInterestParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogRegisterInterestParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogRegisterInterestParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogRegisterInterestParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogRegisterInterestResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogRegisterInterestResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogRegisterInterestResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogRegisterInterestResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReleaseInterestParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReleaseInterestParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReleaseInterestParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReleaseInterestParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReleaseInterestResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReleaseInterestResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReleaseInterestResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogReleaseInterestResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogTailParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogTailParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogTailParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogTailParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogTailResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogTailResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogTailResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogTailResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsDisableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsDisableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsDisableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsDisableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsEnableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsEnableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsEnableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsEnableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReloadParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReloadParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReloadParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReloadParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsSendAttachmentsToMessageParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsSendAttachmentsToMessageParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsSendAttachmentsToMessageParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsSendAttachmentsToMessageParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryAgentParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryAgentParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryAgentParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryAgentParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryAgentResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryAgentResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryAgentResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryAgentResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryApi.java
similarity index 93%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryApi.java
index 6d15ac17c3..e0628ea3dc 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryApi.java
@@ -83,14 +83,19 @@ public CompletableFuture<SessionFactoryGetRunResult> getRun(SessionFactoryGetRun
     }
 
     /**
-     * Empty parameters for listing factory runs.
+     * Parameters for paging factory runs.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionFactoryListRunsResult> listRuns() {
-        return caller.invoke("session.factory.listRuns", java.util.Map.of("sessionId", this.sessionId), SessionFactoryListRunsResult.class);
+    public CompletableFuture<SessionFactoryListRunsResult> listRuns(SessionFactoryListRunsParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.factory.listRuns", _p, SessionFactoryListRunsResult.class);
     }
 
     /**
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryCancelParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryCancelParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryCancelParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryCancelParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryCancelResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryCancelResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryCancelResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryCancelResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailResult.java
similarity index 63%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailResult.java
index 5da6f4979c..01204cb832 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunDetailResult.java
@@ -25,27 +25,49 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionFactoryGetRunDetailResult(
+    /** Factory run identifier. */
     @JsonProperty("runId") String runId,
+    /** Registered factory name. */
     @JsonProperty("factoryName") String factoryName,
+    /** Human-readable factory description. */
     @JsonProperty("description") String description,
+    /** Current factory run status. */
     @JsonProperty("status") FactoryRunStatus status,
+    /** Monotonic durable run revision. */
     @JsonProperty("revision") Long revision,
+    /** Epoch milliseconds when the run was created. */
     @JsonProperty("createdAt") Long createdAt,
+    /** Epoch milliseconds when execution first started, or null before start. */
     @JsonProperty("startedAt") Long startedAt,
+    /** Epoch milliseconds when the durable run was last updated. */
     @JsonProperty("updatedAt") Long updatedAt,
+    /** Epoch milliseconds when the run completed, or null while nonterminal. */
     @JsonProperty("completedAt") Long completedAt,
+    /** Current phase identity, or null before any phase is entered. */
     @JsonProperty("currentPhase") FactoryCurrentPhase currentPhase,
+    /** Number of phases declared by the factory. */
     @JsonProperty("declaredPhaseCount") Long declaredPhaseCount,
+    /** Number of direct factory agents currently live. */
     @JsonProperty("liveAgentCount") Long liveAgentCount,
+    /** Total direct factory agents spawned across all attempts. */
     @JsonProperty("totalSpawnedAgentCount") Long totalSpawnedAgentCount,
+    /** Durable resource consumption. */
     @JsonProperty("consumed") FactoryRunConsumed consumed,
+    /** Resource ceilings declared by the factory. */
     @JsonProperty("declaredLimits") FactoryDeclaredLimits declaredLimits,
+    /** Approved effective resource ceilings, or null until approved. */
     @JsonProperty("approved") FactoryDeclaredLimits approved,
+    /** Epoch milliseconds when this live-overlay snapshot was observed. */
     @JsonProperty("observedAt") Long observedAt,
+    /** Epoch milliseconds when the current active segment started, or null while inactive. */
     @JsonProperty("activeSegmentStartedAt") Long activeSegmentStartedAt,
+    /** Terminal run outcome, or null while nonterminal. */
     @JsonProperty("terminal") FactoryRunTerminal terminal,
+    /** Lifecycle and timing observations for each factory phase. */
     @JsonProperty("phases") List<FactoryPhaseObservation> phases,
+    /** Durable identities and live statuses for direct factory agents. */
     @JsonProperty("agents") List<FactoryAgentSummary> agents,
+    /** Bidirectional page of durable factory progress. */
     @JsonProperty("progress") FactoryProgressPage progress
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressResult.java
similarity index 81%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressResult.java
index 369fa07c22..2a4cb78cb2 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunProgressResult.java
@@ -25,10 +25,15 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionFactoryGetRunProgressResult(
+    /** Progress records in sequence order. */
     @JsonProperty("records") List<FactoryProgressLine> records,
+    /** Oldest sequence number in this page, or null when empty. */
     @JsonProperty("oldestSeq") Long oldestSeq,
+    /** Newest sequence number in this page, or null when empty. */
     @JsonProperty("newestSeq") Long newestSeq,
+    /** Whether progress records older than this page exist. */
     @JsonProperty("hasMoreOlder") Boolean hasMoreOlder,
+    /** Whether progress records newer than this page exist. */
     @JsonProperty("hasMoreNewer") Boolean hasMoreNewer,
     /** Run revision reflected by this page. */
     @JsonProperty("revision") Long revision
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryGetRunResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalGetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalGetParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalGetParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalGetParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalGetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalGetResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalGetResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalGetResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalPutParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalPutParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalPutParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryJournalPutParams.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsParams.java
new file mode 100644
index 0000000000..41de4ae4a6
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsParams.java
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Parameters for paging factory runs.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionFactoryListRunsParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Exclusive forward cursor. */
+    @JsonProperty("afterSeq") Long afterSeq,
+    /** Exclusive backward cursor. */
+    @JsonProperty("beforeSeq") Long beforeSeq,
+    /** Maximum terminal runs to return. Defaults to 200 and is capped at 500. */
+    @JsonProperty("limit") Long limit
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsResult.java
new file mode 100644
index 0000000000..d081003e47
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsResult.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * A page of factory runs in durable creation order.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionFactoryListRunsResult(
+    /** Factory run summaries in durable creation order. */
+    @JsonProperty("runs") List<FactoryRunSummary> runs,
+    /** Oldest terminal-run cursor in this page, or null when the terminal window is empty. */
+    @JsonProperty("oldestSeq") Long oldestSeq,
+    /** Newest terminal-run cursor in this page, or null when the terminal window is empty. */
+    @JsonProperty("newestSeq") Long newestSeq,
+    /** Whether terminal runs newer than this page exist. */
+    @JsonProperty("hasMoreNewer") Boolean hasMoreNewer,
+    /** Number of terminal runs older than this page. */
+    @JsonProperty("omittedOlder") Long omittedOlder
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryLogParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryLogParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryLogParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryLogParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryResumeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryResumeParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryResumeParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryResumeParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryResumeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryResumeResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryResumeResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryResumeResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryRunParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryRunParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryRunParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryRunParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryRunResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryRunResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryRunResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryRunResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFleetApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFleetApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFleetStartParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetStartParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFleetStartParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetStartParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFleetStartResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetStartResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFleetStartResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetStartResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsAppendFileParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsAppendFileParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsAppendFileParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsAppendFileParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsError.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsError.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsError.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsErrorCode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsErrorCode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsErrorCode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsErrorCode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsExistsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsExistsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsExistsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsExistsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsExistsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsExistsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsExistsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsExistsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsMkdirParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsMkdirParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsMkdirParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsMkdirParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReadFileParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReadFileParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReadFileParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReadFileParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReadFileResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReadFileResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReadFileResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReadFileResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesEntry.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesEntry.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesEntryType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesEntryType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesEntryType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesEntryType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsReaddirWithTypesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsRenameParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsRenameParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsRenameParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsRenameParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsRmParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsRmParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsRmParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsRmParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderCapabilities.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderCapabilities.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderCapabilities.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderCapabilities.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderConventions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderConventions.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderConventions.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderConventions.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSetProviderResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteExistsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteExistsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteExistsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteExistsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteExistsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteExistsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteExistsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteExistsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteQueryType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionError.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionError.java
similarity index 89%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionError.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionError.java
index cbe170a298..e25eaed867 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionError.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionError.java
@@ -21,7 +21,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionFsSqliteTransactionError(
+    /** Machine-readable classification of the transaction failure. */
     @JsonProperty("errorClass") SessionFsSqliteTransactionErrorClass errorClass,
+    /** Human-readable transaction failure message. */
     @JsonProperty("message") String message
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionErrorClass.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionErrorClass.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionErrorClass.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionErrorClass.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionParams.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionParams.java
index f834d55957..f7699ff8f0 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionParams.java
@@ -27,6 +27,7 @@
 public record SessionFsSqliteTransactionParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
+    /** Ordered SQL statements to execute in one transaction. */
     @JsonProperty("statements") List<SessionFsSqliteTransactionStatement> statements
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionResult.java
similarity index 90%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionResult.java
index f9c799b9b2..1b662f4047 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionResult.java
@@ -25,7 +25,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionFsSqliteTransactionResult(
+    /** Per-statement query results in input order. */
     @JsonProperty("results") List<SessionFsSqliteQueryResult> results,
+    /** Classified transaction failure, when execution did not succeed. */
     @JsonProperty("error") SessionFsSqliteTransactionError error
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionStatement.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionStatement.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionStatement.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsSqliteTransactionStatement.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsStatParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsStatParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsStatParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsStatParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsStatResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsStatResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsStatResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsStatResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFsWriteFileParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsWriteFileParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFsWriteFileParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFsWriteFileParams.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthApi.java
new file mode 100644
index 0000000000..729979b5e2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthApi.java
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code gitHubAuth} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class SessionGitHubAuthApi {
+
+    private static final com.fasterxml.jackson.databind.ObjectMapper MAPPER = RpcMapper.INSTANCE;
+
+    private final RpcCaller caller;
+    private final String sessionId;
+
+    /** @param caller the RPC transport function */
+    SessionGitHubAuthApi(RpcCaller caller, String sessionId) {
+        this.caller = caller;
+        this.sessionId = sessionId;
+    }
+
+    /**
+     * Identifies the target session.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionGitHubAuthGetStatusResult> getStatus() {
+        return caller.invoke("session.gitHubAuth.getStatus", java.util.Map.of("sessionId", this.sessionId), SessionGitHubAuthGetStatusResult.class);
+    }
+
+    /**
+     * New auth credentials to install on the session. Omit to leave credentials unchanged.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionGitHubAuthSetCredentialsResult> setCredentials(SessionGitHubAuthSetCredentialsParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.gitHubAuth.setCredentials", _p, SessionGitHubAuthSetCredentialsResult.class);
+    }
+
+    /**
+     * Identifies the target session.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> getCurrentAuthInfo() {
+        return caller.invoke("session.gitHubAuth.getCurrentAuthInfo", java.util.Map.of("sessionId", this.sessionId), Void.class);
+    }
+
+    /**
+     * Identifies the target session.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<List<SessionAuthStatus>> getAllAuthAvailable() {
+        return caller.invoke("session.gitHubAuth.getAllAuthAvailable", java.util.Map.of("sessionId", this.sessionId), RpcMapper.INSTANCE.getTypeFactory().constructCollectionType(List.class, SessionAuthStatus.class));
+    }
+
+    /**
+     * Identifies the target session.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> refreshCopilotUser() {
+        return caller.invoke("session.gitHubAuth.refreshCopilotUser", java.util.Map.of("sessionId", this.sessionId), Void.class);
+    }
+
+    /**
+     * Internal GitHub login parameters.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<AuthInfo> login(SessionGitHubAuthLoginParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.gitHubAuth.login", _p, AuthInfo.class);
+    }
+
+    /**
+     * Parameters for switching the session's active authentication.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> switchToAuth(SessionGitHubAuthSwitchToAuthParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.gitHubAuth.switchToAuth", _p, Void.class);
+    }
+
+    /**
+     * Identifies the target session.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> logout() {
+        return caller.invoke("session.gitHubAuth.logout", java.util.Map.of("sessionId", this.sessionId), Void.class);
+    }
+
+    /**
+     * Parameters identifying a GitHub authentication to log out.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> logoutUser(SessionGitHubAuthLogoutUserParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.gitHubAuth.logoutUser", _p, Void.class);
+    }
+
+    /**
+     * Identifies the target session.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<List<AuthValidationError>> lastAuthErrors() {
+        return caller.invoke("session.gitHubAuth.lastAuthErrors", java.util.Map.of("sessionId", this.sessionId), RpcMapper.INSTANCE.getTypeFactory().constructCollectionType(List.class, AuthValidationError.class));
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetAllAuthAvailableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetAllAuthAvailableParams.java
new file mode 100644
index 0000000000..446642d743
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetAllAuthAvailableParams.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Identifies the target session.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionGitHubAuthGetAllAuthAvailableParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetCurrentAuthInfoParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetCurrentAuthInfoParams.java
new file mode 100644
index 0000000000..88838f951d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetCurrentAuthInfoParams.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Identifies the target session.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionGitHubAuthGetCurrentAuthInfoParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetStatusParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetStatusParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetStatusParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetStatusParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetStatusResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetStatusResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetStatusResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthGetStatusResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLastAuthErrorsParams.java
similarity index 91%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLastAuthErrorsParams.java
index e3b90f07f7..d4fc156b28 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLastAuthErrorsParams.java
@@ -14,7 +14,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Empty parameters for listing factory runs.
+ * Identifies the target session.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
@@ -23,7 +23,7 @@
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record SessionFactoryListRunsParams(
+public record SessionGitHubAuthLastAuthErrorsParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId
 ) {
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLoginParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLoginParams.java
new file mode 100644
index 0000000000..e0d777956f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLoginParams.java
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Internal GitHub login parameters.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionGitHubAuthLoginParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** GitHub host URL */
+    @JsonProperty("host") String host,
+    /** GitHub login */
+    @JsonProperty("login") String login,
+    /** GitHub authentication token */
+    @JsonProperty("token") String token,
+    /** Whether to persist the token after login */
+    @JsonProperty("persist") Boolean persist
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLogoutParams.java
similarity index 84%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLogoutParams.java
index 7d1ac45a9e..172778d616 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionFactoryListRunsResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLogoutParams.java
@@ -11,11 +11,10 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.copilot.CopilotExperimental;
-import java.util.List;
 import javax.annotation.processing.Generated;
 
 /**
- * Factory runs in durable creation order.
+ * Identifies the target session.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
@@ -24,7 +23,8 @@
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record SessionFactoryListRunsResult(
-    @JsonProperty("runs") List<FactoryRunSummary> runs
+public record SessionGitHubAuthLogoutParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLogoutUserParams.java
similarity index 82%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLogoutUserParams.java
index 4ea732727d..1aafec7811 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthLogoutUserParams.java
@@ -14,7 +14,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Agent interaction mode to apply to the session.
+ * Parameters identifying a GitHub authentication to log out.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
@@ -23,10 +23,10 @@
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record SessionModeSetParams(
+public record SessionGitHubAuthLogoutUserParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
-    /** The session mode the agent is operating in */
-    @JsonProperty("mode") SessionMode mode
+    /** Authentication information to log out */
+    @JsonProperty("authInfo") Object authInfo
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthRefreshCopilotUserParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthRefreshCopilotUserParams.java
new file mode 100644
index 0000000000..d0b9d33e56
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthRefreshCopilotUserParams.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Identifies the target session.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionGitHubAuthRefreshCopilotUserParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSetCredentialsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSetCredentialsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSetCredentialsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSetCredentialsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSetCredentialsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSetCredentialsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSetCredentialsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSetCredentialsResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSwitchToAuthParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSwitchToAuthParams.java
new file mode 100644
index 0000000000..7cd6f72b41
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthSwitchToAuthParams.java
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Parameters for switching the session's active authentication.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionGitHubAuthSwitchToAuthParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Authentication information to activate */
+    @JsonProperty("authInfo") Object authInfo,
+    /** Optional token paired with the authentication information */
+    @JsonProperty("token") String token
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryAbortManualCompactionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryAbortManualCompactionParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryAbortManualCompactionParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryAbortManualCompactionParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryAbortManualCompactionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryAbortManualCompactionResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryAbortManualCompactionResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryAbortManualCompactionResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCancelBackgroundCompactionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCancelBackgroundCompactionParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCancelBackgroundCompactionParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCancelBackgroundCompactionParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCancelBackgroundCompactionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCancelBackgroundCompactionResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCancelBackgroundCompactionResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCancelBackgroundCompactionResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryClearContextParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryClearContextParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryClearContextParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryClearContextParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryClearContextResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryClearContextResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryClearContextResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryClearContextResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCompactParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCompactParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCompactParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCompactParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCompactResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCompactResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCompactResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryCompactResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryListRewindPointsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryListRewindPointsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryListRewindPointsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryListRewindPointsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryListRewindPointsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryListRewindPointsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryListRewindPointsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryListRewindPointsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryPreviewRewindParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryPreviewRewindParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryPreviewRewindParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryPreviewRewindParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryPreviewRewindResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryPreviewRewindResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryPreviewRewindResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryPreviewRewindResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryRewindParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryRewindParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryRewindParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryRewindParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryRewindResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryRewindResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryRewindResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryRewindResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistorySummarizeForHandoffParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistorySummarizeForHandoffParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistorySummarizeForHandoffParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistorySummarizeForHandoffParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistorySummarizeForHandoffResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistorySummarizeForHandoffResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistorySummarizeForHandoffResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistorySummarizeForHandoffResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryTruncateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryTruncateParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryTruncateParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryTruncateParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryTruncateResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryTruncateResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryTruncateResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryTruncateResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionInstalledPlugin.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstalledPlugin.java
similarity index 78%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionInstalledPlugin.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstalledPlugin.java
index 1109f5f231..db8ea12026 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionInstalledPlugin.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstalledPlugin.java
@@ -36,6 +36,8 @@ public record SessionInstalledPlugin(
     /** Source descriptor for direct repo installs (when marketplace is empty) */
     @JsonProperty("source") Object source,
     /** Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs. */
-    @JsonProperty("source_sha") String sourceSha
+    @JsonProperty("source_sha") String sourceSha,
+    /** Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — those synthesized at session start for a directory/local marketplace, whose cache_path points at the real plugin directory on disk rather than a copy under the installed-plugins cache. Its presence is what marks a record as live, and no record carrying it is ever written to the persisted installedPlugins key. */
+    @JsonProperty("installed_from") String installedFrom
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsGetSourcesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsGetSourcesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsGetSourcesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsGetSourcesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsGetSourcesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsGetSourcesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsGetSourcesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsGetSourcesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionInterruptMainTurnParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInterruptMainTurnParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionInterruptMainTurnParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInterruptMainTurnParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionInterruptMainTurnResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInterruptMainTurnResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionInterruptMainTurnResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInterruptMainTurnResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionBaselineData.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionBaselineData.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionBaselineData.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionBaselineData.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionClientType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionClientType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionClientType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionClientType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionDetails.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionDetails.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionDetails.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionDetails.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionPredictParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionPredictParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionPredictParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionPredictParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResultAvailable.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResultAvailable.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResultAvailable.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResultAvailable.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResultUnavailable.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResultUnavailable.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResultUnavailable.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionResultUnavailable.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTier.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTier.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTier.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTier.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTierOption.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTierOption.java
similarity index 96%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTierOption.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTierOption.java
index f468e53e04..ad2a6f82c1 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTierOption.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionTierOption.java
@@ -21,6 +21,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionLimitPredictionTierOption(
+    /** Semantic usage tier. */
     @JsonProperty("tier") SessionLimitPredictionTier tier,
     /** AI-credit cap for this tier. */
     @JsonProperty("cap") Double cap
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionUnavailableReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionUnavailableReason.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionUnavailableReason.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionUnavailableReason.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitsConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitsConfig.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLimitsConfig.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitsConfig.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionListFilter.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionListFilter.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionListFilter.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionListFilter.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLogLevel.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLogLevel.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLogLevel.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLogLevel.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLogParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLogParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLogParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLogParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLogResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLogResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLogResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLogResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLspApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLspApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLspApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLspApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionLspInitializeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLspInitializeParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionLspInitializeParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLspInitializeParams.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedPermissions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedPermissions.java
new file mode 100644
index 0000000000..8d52a1eb1e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedPermissions.java
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Enterprise permission policy expressed with the runtime's managed permission-rule syntax.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionManagedPermissions(
+    /** When set to `disable`, prevents bypass/allow-all permission modes. `allow-auto-only` blocks full allow-all but permits advisory auto-approval. Any other value is accepted rather than failing the session, but is enforced as `disable`: the key is only present to restrict something, so a mode this runtime cannot interpret fails closed to the most restrictive one it knows. Omit the key entirely to impose no restriction. */
+    @JsonProperty("disableBypassPermissionsMode") String disableBypassPermissionsMode,
+    /** Permission rules that block matching operations. Deny has highest precedence. */
+    @JsonProperty("deny") List<String> deny,
+    /** Permission rules that require explicit human approval. */
+    @JsonProperty("ask") List<String> ask,
+    /** Permission rules that allow matching operations unless another managed source, deny, or ask rule restricts them. */
+    @JsonProperty("allow") List<String> allow
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettings.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettings.java
new file mode 100644
index 0000000000..cecaca8c17
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettings.java
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Managed settings an SDK host may inject at session startup. Only permissions are accepted in this initial contract.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionManagedSettings(
+    /** Managed permission policy injected by the SDK host. */
+    @JsonProperty("permissions") SessionManagedPermissions permissions
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java
similarity index 96%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java
index 1a75b92c1b..ed66b7bc15 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java
@@ -113,6 +113,17 @@ public CompletableFuture<Void> reload() {
         return caller.invoke("session.mcp.reload", java.util.Map.of("sessionId", this.sessionId), Void.class);
     }
 
+    /**
+     * Identifies the target session.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionMcpMoveLoadingToBackgroundResult> moveLoadingToBackground() {
+        return caller.invoke("session.mcp.moveLoadingToBackground", java.util.Map.of("sessionId", this.sessionId), SessionMcpMoveLoadingToBackgroundResult.class);
+    }
+
     /**
      * Opaque MCP reload configuration.
      * <p>
@@ -189,7 +200,7 @@ public CompletableFuture<SessionMcpRemoveGitHubResult> removeGitHub() {
     }
 
     /**
-     * Opaque auth info used to configure GitHub MCP.
+     * Credential-free authentication identity used to configure GitHub MCP.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsCallToolParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsCallToolParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsCallToolParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsCallToolParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsDiagnoseParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsDiagnoseParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsDiagnoseParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsDiagnoseParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsDiagnoseResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsDiagnoseResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsDiagnoseResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsDiagnoseResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsGetHostContextParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsGetHostContextParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsGetHostContextParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsGetHostContextParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsGetHostContextResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsGetHostContextResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsGetHostContextResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsGetHostContextResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsListToolsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsListToolsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsListToolsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsListToolsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsListToolsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsListToolsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsListToolsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsListToolsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsReadResourceParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsReadResourceParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsReadResourceParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsReadResourceParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsReadResourceResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsReadResourceResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsReadResourceResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsReadResourceResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsSetHostContextParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsSetHostContextParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsSetHostContextParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsSetHostContextParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpCancelSamplingExecutionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpCancelSamplingExecutionParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpCancelSamplingExecutionParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpCancelSamplingExecutionParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpCancelSamplingExecutionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpCancelSamplingExecutionResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpCancelSamplingExecutionResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpCancelSamplingExecutionResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubParams.java
similarity index 94%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubParams.java
index 2f709a8dda..e46a0af8f0 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubParams.java
@@ -14,7 +14,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Opaque auth info used to configure GitHub MCP.
+ * Credential-free authentication identity used to configure GitHub MCP.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpConfigureGitHubResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpDisableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpDisableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpDisableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpDisableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpEnableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpEnableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpEnableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpEnableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersHandlePendingHeadersRefreshRequestParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersHandlePendingHeadersRefreshRequestParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersHandlePendingHeadersRefreshRequestParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersHandlePendingHeadersRefreshRequestParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersHandlePendingHeadersRefreshRequestResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersHandlePendingHeadersRefreshRequestResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersHandlePendingHeadersRefreshRequestResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersHandlePendingHeadersRefreshRequestResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpIsServerRunningParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpIsServerRunningParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpIsServerRunningParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpIsServerRunningParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpIsServerRunningResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpIsServerRunningResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpIsServerRunningResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpIsServerRunningResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListToolsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListToolsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListToolsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListToolsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListToolsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListToolsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListToolsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListToolsResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpMoveLoadingToBackgroundParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpMoveLoadingToBackgroundParams.java
new file mode 100644
index 0000000000..9c3305c3bd
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpMoveLoadingToBackgroundParams.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Identifies the target session.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionMcpMoveLoadingToBackgroundParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpMoveLoadingToBackgroundResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpMoveLoadingToBackgroundResult.java
new file mode 100644
index 0000000000..8890481647
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpMoveLoadingToBackgroundResult.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Result of moving in-flight MCP loading to the background.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionMcpMoveLoadingToBackgroundResult(
+    /** Whether an in-flight MCP load was moved to the background, releasing turns that were waiting on it. False when no MCP load was in flight or the waiting turns had already been released. */
+    @JsonProperty("movedToBackground") Boolean movedToBackground
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java
similarity index 85%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java
index 1fdb292f84..cf4a3601ef 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java
@@ -78,6 +78,22 @@ public CompletableFuture<SessionMcpOauthLoginResult> login(SessionMcpOauthLoginP
         return caller.invoke("session.mcp.oauth.login", _p, SessionMcpOauthLoginResult.class);
     }
 
+    /**
+     * Remote MCP server name for a passive OAuth status probe.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<McpOauthProbeResult> probe(SessionMcpOauthProbeParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.mcp.oauth.probe", _p, McpOauthProbeResult.class);
+    }
+
     /**
      * Pending MCP OAuth request id to respond to.
      * <p>
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthAuthenticationStateChangedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthAuthenticationStateChangedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthAuthenticationStateChangedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthAuthenticationStateChangedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthHandlePendingRequestParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthHandlePendingRequestParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthHandlePendingRequestParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthHandlePendingRequestParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthHandlePendingRequestResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthHandlePendingRequestResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthHandlePendingRequestResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthHandlePendingRequestResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthLoginParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthLoginParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthLoginParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthLoginParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthLoginResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthLoginResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthLoginResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthLoginResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthProbeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthProbeParams.java
new file mode 100644
index 0000000000..1980398e08
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthProbeParams.java
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Remote MCP server name for a passive OAuth status probe.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionMcpOauthProbeParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Name of the configured remote MCP server to probe. */
+    @JsonProperty("serverName") String serverName
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthRespondParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthRespondParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthRespondParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthRespondParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthRespondResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthRespondResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthRespondResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthRespondResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRegisterExternalClientParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRegisterExternalClientParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRegisterExternalClientParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRegisterExternalClientParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigResult.java
similarity index 90%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigResult.java
index ba4fcf3b79..eba9a21c11 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpReloadWithConfigResult.java
@@ -28,6 +28,8 @@ public record SessionMcpReloadWithConfigResult(
     /** Servers filtered out before startup */
     @JsonProperty("filteredServers") List<McpFilteredServer> filteredServers,
     /** Non-default servers allowed by policy */
-    @JsonProperty("allowedServers") List<McpAllowedServer> allowedServers
+    @JsonProperty("allowedServers") List<McpAllowedServer> allowedServers,
+    /** Servers whose connection attempt failed. */
+    @JsonProperty("failedServers") List<McpFailedServer> failedServers
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRemoveGitHubParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRemoveGitHubParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRemoveGitHubParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRemoveGitHubParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRemoveGitHubResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRemoveGitHubResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRemoveGitHubResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRemoveGitHubResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListTemplatesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListTemplatesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListTemplatesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListTemplatesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListTemplatesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListTemplatesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListTemplatesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesListTemplatesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesReadParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesReadParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesReadParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesReadParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesReadResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesReadResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesReadResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesReadResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRestartServerParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRestartServerParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRestartServerParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpRestartServerParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetEnvValueModeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetEnvValueModeParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetEnvValueModeParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetEnvValueModeParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetEnvValueModeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetEnvValueModeResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetEnvValueModeResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetEnvValueModeResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpStartServerParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpStartServerParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpStartServerParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpStartServerParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpStopServerParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpStopServerParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpStopServerParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpStopServerParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpUnregisterExternalClientParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpUnregisterExternalClientParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMcpUnregisterExternalClientParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpUnregisterExternalClientParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataActivityParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataActivityParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataActivityParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataActivityParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataActivityResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataActivityResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataActivityResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataActivityResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java
similarity index 58%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java
index ef7fba44d9..c27f37afb0 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java
@@ -36,12 +36,47 @@ public record SessionMetadataGetContextAttributionResult(
     public record SessionMetadataGetContextAttributionResultContextAttribution(
         /** Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share. */
         @JsonProperty("totalTokens") Long totalTokens,
+        /** The concrete model id the entire breakdown was tokenized against (feeds the per-model token multiplier). Under `Auto` (Free/Student) this is the resolved model, not the literal `auto` sentinel, so totals are not undercounted. A single-model approximation of a potentially multi-model Auto session. */
+        @JsonProperty("modelId") String modelId,
+        /** How `modelId` was chosen. Not a closed set — tolerate unknown values. Known values today: `autoResolved` (the model Auto resolved to), `selected` (the user's explicitly selected model), `default` (a fallback before any model is known). */
+        @JsonProperty("modelSource") String modelSource,
+        /** Maximum prompt tokens the resolved model accepts — the denominator for a `##k/###k` context-usage display. Mirrors `SessionContextInfo.promptTokenLimit`. */
+        @JsonProperty("promptTokenLimit") Long promptTokenLimit,
+        /** Prompt limit plus the model's output reserve: the full context window `categories.freeSpace` and `categories.buffer` are measured against. Mirrors `SessionContextInfo.limit`. */
+        @JsonProperty("limit") Long limit,
+        /** Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`. */
+        @JsonProperty("bufferTokens") Long bufferTokens,
+        /** Token count at which background compaction starts. Mirrors `SessionContextInfo.compactionThreshold`. */
+        @JsonProperty("compactionThreshold") Long compactionThreshold,
+        /** The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`. */
+        @JsonProperty("categories") SessionMetadataGetContextAttributionResultContextAttributionCategories categories,
         /** Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`. */
         @JsonProperty("entries") List<SessionMetadataGetContextAttributionResultContextAttributionEntriesItem> entries,
         /** Successful compaction history for the session. */
         @JsonProperty("compactions") SessionMetadataGetContextAttributionResultContextAttributionCompactions compactions
     ) {
 
+        /** The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`. */
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        public record SessionMetadataGetContextAttributionResultContextAttributionCategories(
+            /** System prompt tokens, excluding custom instructions. */
+            @JsonProperty("systemPrompt") Long systemPrompt,
+            /** Custom-instructions tokens (0 when none are configured). */
+            @JsonProperty("customInstructions") Long customInstructions,
+            /** Non-MCP tool-definition tokens. */
+            @JsonProperty("systemTools") Long systemTools,
+            /** MCP tool-definition tokens. */
+            @JsonProperty("mcpTools") Long mcpTools,
+            /** Conversation (user/assistant/tool) message tokens. */
+            @JsonProperty("messages") Long messages,
+            /** Remaining unused window capacity (clamped at 0). */
+            @JsonProperty("freeSpace") Long freeSpace,
+            /** Output reserve plus post-blocking-threshold buffer. */
+            @JsonProperty("buffer") Long buffer
+        ) {
+        }
+
         @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonInclude(JsonInclude.Include.NON_NULL)
         public record SessionMetadataGetContextAttributionResultContextAttributionEntriesItem(
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextHeaviestMessagesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextHeaviestMessagesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextHeaviestMessagesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextHeaviestMessagesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextHeaviestMessagesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextHeaviestMessagesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextHeaviestMessagesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextHeaviestMessagesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataIsProcessingParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataIsProcessingParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataIsProcessingParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataIsProcessingParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataIsProcessingResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataIsProcessingResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataIsProcessingResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataIsProcessingResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecomputeContextTokensParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecomputeContextTokensParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecomputeContextTokensParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecomputeContextTokensParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecomputeContextTokensResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecomputeContextTokensResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecomputeContextTokensResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecomputeContextTokensResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecordContextChangeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecordContextChangeParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecordContextChangeParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataRecordContextChangeParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSetWorkingDirectoryParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSetWorkingDirectoryParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSetWorkingDirectoryParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSetWorkingDirectoryParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSetWorkingDirectoryResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSetWorkingDirectoryResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSetWorkingDirectoryResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSetWorkingDirectoryResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSnapshotParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSnapshotParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSnapshotParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSnapshotParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSnapshotResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSnapshotResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSnapshotResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataSnapshotResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java
similarity index 91%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java
index 58311ff651..0f4989a920 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java
@@ -51,10 +51,10 @@ public CompletableFuture<SessionMode> get() {
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<Void> set(SessionModeSetParams params) {
+    public CompletableFuture<SessionModeSetResult> set(SessionModeSetParams params) {
         com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
         _p.put("sessionId", this.sessionId);
-        return caller.invoke("session.mode.set", _p, Void.class);
+        return caller.invoke("session.mode.set", _p, SessionModeSetResult.class);
     }
 
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModeGetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeGetParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModeGetParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeGetParams.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetParams.java
new file mode 100644
index 0000000000..4c01d16d03
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetParams.java
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Agent interaction mode to apply to the session.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionModeSetParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** The session mode the agent is operating in */
+    @JsonProperty("mode") SessionMode mode,
+    /** Session whose plan-mode base state should be inherited. */
+    @JsonProperty("inheritPlanBaseFromSessionId") String inheritPlanBaseFromSessionId,
+    /** Whether a dedicated plan model is configured. */
+    @JsonProperty("planModelConfigured") Boolean planModelConfigured,
+    /** Dedicated model to use in plan mode, when configured. */
+    @JsonProperty("planModel") String planModel,
+    /** Reasoning effort to use with the dedicated plan model. */
+    @JsonProperty("planReasoningEffort") String planReasoningEffort,
+    /** Context tier to use with the dedicated plan model. */
+    @JsonProperty("planContextTier") String planContextTier,
+    /** Explicit response to a model-switch compaction preflight. */
+    @JsonProperty("compactionDecision") String compactionDecision,
+    /** Whether leaving plan mode should restore the session's previous model. */
+    @JsonProperty("restorePlanModel") Boolean restorePlanModel,
+    /** Whether the selected plan model should be persisted. */
+    @JsonProperty("persistPlanSelection") Boolean persistPlanSelection,
+    /** Settings context used when persisting the selected plan model. */
+    @JsonProperty("pickerSettingsContext") ModelPickerSettingsContext pickerSettingsContext,
+    /** Action to perform when leaving plan mode. */
+    @JsonProperty("planExitAction") String planExitAction
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetResult.java
new file mode 100644
index 0000000000..e3af446682
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetResult.java
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionModeSetResult(
+    /** Lifecycle status of the requested mode change. */
+    @JsonProperty("status") String status,
+    /** Whether applying the mode changed the active model. */
+    @JsonProperty("modelChanged") Boolean modelChanged,
+    /** Compaction confirmation required before the mode change can complete. */
+    @JsonProperty("confirmation") ModelSwitchConfirmation confirmation,
+    /** User-facing warning produced while applying the mode change. */
+    @JsonProperty("warning") String warning,
+    /** User-facing outcome message for the model switch triggered by the mode change. */
+    @JsonProperty("message") String message,
+    /** Deprecation warnings associated with the model selected by the mode change. */
+    @JsonProperty("deprecationWarnings") List<String> deprecationWarnings,
+    /** Whether the host must defer implementing the requested mode change. */
+    @JsonProperty("deferImplementation") Boolean deferImplementation,
+    /** Whether the host should arm an interactive continuation after the mode change. */
+    @JsonProperty("armInteractiveContinuation") Boolean armInteractiveContinuation
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java
similarity index 83%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java
index 9d20e86272..12777c9a1f 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java
@@ -57,6 +57,22 @@ public CompletableFuture<SessionModelSwitchToResult> switchTo(SessionModelSwitch
         return caller.invoke("session.model.switchTo", _p, SessionModelSwitchToResult.class);
     }
 
+    /**
+     * Managed, repository, and CLI model overrides to overlay onto the session at startup.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionModelApplyStartupOverlayResult> applyStartupOverlay(SessionModelApplyStartupOverlayParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.model.applyStartupOverlay", _p, SessionModelApplyStartupOverlayResult.class);
+    }
+
     /**
      * Reasoning effort level to apply to the currently selected model.
      * <p>
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApplyStartupOverlayParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApplyStartupOverlayParams.java
new file mode 100644
index 0000000000..a1d25ae7ec
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApplyStartupOverlayParams.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Managed, repository, and CLI model overrides to overlay onto the session at startup.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionModelApplyStartupOverlayParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Model required by device-managed policy, when configured. */
+    @JsonProperty("deviceManagedModel") String deviceManagedModel,
+    /** Model required by server-managed policy, when configured. */
+    @JsonProperty("serverManagedModel") String serverManagedModel,
+    /** Model selected by repository settings, when configured. */
+    @JsonProperty("repoModel") String repoModel,
+    /** Reasoning effort selected by repository settings, when configured. */
+    @JsonProperty("repoReasoningEffort") String repoReasoningEffort,
+    /** Context tier selected by repository settings, when configured. */
+    @JsonProperty("repoContextTier") String repoContextTier,
+    /** Model explicitly selected by the CLI, when provided. */
+    @JsonProperty("cliModel") String cliModel,
+    /** Whether the overlay is being applied while resuming a deferred session. */
+    @JsonProperty("deferredResume") Boolean deferredResume
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApplyStartupOverlayResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApplyStartupOverlayResult.java
new file mode 100644
index 0000000000..f29e249c32
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApplyStartupOverlayResult.java
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The model identifier active on the session after the switch.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionModelApplyStartupOverlayResult(
+    /** Currently active model identifier after the switch */
+    @JsonProperty("modelId") String modelId,
+    /** True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains. */
+    @JsonProperty("deferred") Boolean deferred,
+    /** Lifecycle result for the requested switch */
+    @JsonProperty("status") String status,
+    /** Compaction confirmation projection when status is confirmation_required */
+    @JsonProperty("confirmation") ModelSwitchConfirmation confirmation,
+    /** Persistence failure encountered after applying the model switch. */
+    @JsonProperty("persistenceError") String persistenceError,
+    /** User-facing outcome message for the model switch. */
+    @JsonProperty("message") String message,
+    /** User-facing warning produced while applying the model switch. */
+    @JsonProperty("warning") String warning,
+    /** Deprecation warnings associated with the selected model or options. */
+    @JsonProperty("deprecationWarnings") List<String> deprecationWarnings
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelPriceCategory.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelPriceCategory.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelPriceCategory.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelPriceCategory.java
index 295f6a01f0..be637e9488 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelPriceCategory.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelPriceCategory.java
@@ -21,7 +21,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionModelPriceCategory(
+    /** CAPI model identifier. */
     @JsonProperty("id") String id,
+    /** Cost category assigned to the model. */
     @JsonProperty("priceCategory") ModelPickerPriceCategory priceCategory
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSetReasoningEffortParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSetReasoningEffortParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSetReasoningEffortParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSetReasoningEffortParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSetReasoningEffortResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSetReasoningEffortResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSetReasoningEffortResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSetReasoningEffortResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java
similarity index 71%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java
index fe49e29761..a7c60d28cd 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java
@@ -38,7 +38,21 @@ public record SessionModelSwitchToParams(
     @JsonProperty("modelCapabilities") ModelCapabilitiesOverride modelCapabilities,
     /** Explicit context tier for the selected model. `"default"` / `"long_context"` apply the requested tier; omit this field to use normal model behavior with no explicit tier. */
     @JsonProperty("contextTier") ContextTier contextTier,
+    /** Origin to record on the effective `session.model_change` event. Defaults to `sdk` when omitted. */
+    @JsonProperty("source") ModelChangeSource source,
     /** When true, defer this switch (enqueue it) if another model change is already queued, even when no turn is active — so it drains last (FIFO) and wins over the already-queued change. Intended for genuine user-initiated model selections; internal restore/reapply switches omit it and apply immediately when no turn is active. When no other model change is queued this has no effect (a switch still applies immediately unless a turn is active). */
-    @JsonProperty("deferIfModelChangeQueued") Boolean deferIfModelChangeQueued
+    @JsonProperty("deferIfModelChangeQueued") Boolean deferIfModelChangeQueued,
+    /** Explicit response to a model-switch compaction preflight. Omit to request a confirmation projection when compaction is necessary. */
+    @JsonProperty("compactionDecision") String compactionDecision,
+    /** When true, evaluate context-window compaction policy before applying the switch. */
+    @JsonProperty("runCompactionPreflight") Boolean runCompactionPreflight,
+    /** Optional repository settings scope to persist after the switch commits. */
+    @JsonProperty("repoScope") String repoScope,
+    /** Settings scope used when persisting the selected model. */
+    @JsonProperty("modelChangeScope") String modelChangeScope,
+    /** Require the target to be currently available and enabled before applying the switch. */
+    @JsonProperty("requireAvailable") Boolean requireAvailable,
+    /** Optional settings context and explicit-override flags used to persist a picker selection. */
+    @JsonProperty("pickerPersistence") ModelPickerPersistenceRequest pickerPersistence
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToResult.java
similarity index 62%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToResult.java
index 030324a94b..fb143abc30 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToResult.java
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.copilot.CopilotExperimental;
+import java.util.List;
 import javax.annotation.processing.Generated;
 
 /**
@@ -27,6 +28,18 @@ public record SessionModelSwitchToResult(
     /** Currently active model identifier after the switch */
     @JsonProperty("modelId") String modelId,
     /** True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains. */
-    @JsonProperty("deferred") Boolean deferred
+    @JsonProperty("deferred") Boolean deferred,
+    /** Lifecycle result for the requested switch */
+    @JsonProperty("status") String status,
+    /** Compaction confirmation projection when status is confirmation_required */
+    @JsonProperty("confirmation") ModelSwitchConfirmation confirmation,
+    /** Persistence failure encountered after applying the model switch. */
+    @JsonProperty("persistenceError") String persistenceError,
+    /** User-facing outcome message for the model switch. */
+    @JsonProperty("message") String message,
+    /** User-facing warning produced while applying the model switch. */
+    @JsonProperty("warning") String warning,
+    /** Deprecation warnings associated with the selected model or options. */
+    @JsonProperty("deprecationWarnings") List<String> deprecationWarnings
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionNameApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionNameApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionNameGetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameGetParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionNameGetParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameGetParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionNameGetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameGetResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionNameGetResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameGetResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetAutoParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetAutoParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetAutoParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetAutoParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetAutoResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetAutoResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetAutoResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetAutoResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameSetParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java
similarity index 86%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java
index a8108e8292..34706a68e1 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java
@@ -47,6 +47,8 @@ public record SessionOpenOptions(
     @JsonProperty("expAssignments") Object expAssignments,
     /** Opt-in: self-fetch and enforce enterprise managed settings at session bootstrap. */
     @JsonProperty("enableManagedSettings") Boolean enableManagedSettings,
+    /** Permissions-only enterprise policy injected by the SDK host at session create or resume. Composes restrictively with self-fetched and device policy and is not persisted. */
+    @JsonProperty("managedSettings") SessionManagedSettings managedSettings,
     /** Opt in to capturing file changes for session rewind and session diff. Capture cannot reconstruct changes made before it was enabled. On create it starts capture from the first turn. It is also honored on resume: for a session that already has tracked prior turns, tracking continues automatically even if this is omitted; passing it on resume additionally enables tracking for an eligible session that has no prior root turn yet. Resuming a session whose prior root turns were never tracked has no restorable baseline, so tracking stays disabled for it and rewind reports file change tracking as unavailable; the resume itself still succeeds, so sessions that predate tracking remain loadable. The opt-in is only rejected when the session can never track (a subagent session, or one without local session storage). It is intentionally absent from the mutable options update because enabling it after edits have occurred would create an incomplete, misleading baseline. Subagents share the parent session's capture store and are not tracked as separate rewind points: a file a subagent writes is attributed to whichever root user turn was open when the capture was staged, just before the tool body ran. A turn cannot open while a staged capture is still in flight, so a subagent tool that staged under the spawning turn stays attributed to it however late the write lands, while a capture it stages after the user's next message belongs to that later turn. Attribution decides which turn's rewind point counts and file preview include that write; it does not narrow which rewinds revert it, because a rewind restores every capture from the selected turn onward, so the earlier spawning turn reverts it as well. */
     @JsonProperty("enableFileChangeTracking") Boolean enableFileChangeTracking,
     /** Feature-flag values resolved by the host. */
@@ -65,7 +67,7 @@ public record SessionOpenOptions(
     @JsonProperty("models") List<ProviderModelConfig> models,
     /** Working directory to anchor the session. */
     @JsonProperty("workingDirectory") String workingDirectory,
-    /** Additional directories the agent may access beyond the working directory. Each entry is granted to the session's file-access allow-list and surfaced to the model (system prompt context and `@`-mention completion). Absolute paths are recommended; a relative path is resolved against the session's working directory. Nonexistent or unresolvable entries are skipped with a warning. This is applied on both session creation and resume, and is not persisted: a resumed session that omits this option does not retain previously supplied directories (re-supply them, exactly as the CLI re-passes `--add-dir`). */
+    /** Additional directories the agent may access beyond the working directory. Each entry is granted to the session's file-access allow-list and surfaced to the model (system prompt context and `@`-mention completion). Conventional `.github/skills/` and `.github/agents/` definitions under each directory also join the session's project catalogs when their existing subsystem gates are enabled: added-root skills require both `enableConfigDiscovery` and effective `enableSkills`; added-root agents require `enableConfigDiscovery`. Supplying a directory therefore activates configuration from it and should be treated as a trust decision. Absolute paths are recommended; a relative path is resolved against the session's working directory. Nonexistent or unresolvable entries are skipped with a warning. This is applied during session creation and cold resume and is not persisted, so a cold resume must re-supply the directories. */
     @JsonProperty("additionalDirectories") List<String> additionalDirectories,
     /** Pre-resolved working-directory context for session startup. */
     @JsonProperty("workingDirectoryContext") SessionContext workingDirectoryContext,
@@ -97,14 +99,20 @@ public record SessionOpenOptions(
     @JsonProperty("shellProcessFlags") List<String> shellProcessFlags,
     /** Resolved sandbox configuration. */
     @JsonProperty("sandboxConfig") SandboxConfig sandboxConfig,
+    /** Origin of the sandbox choice. The runtime uses this only for internal telemetry provenance; managed policy is derived independently. */
+    @JsonProperty("sandboxConfigSource") SandboxConfigSource sandboxConfigSource,
     /** Whether interactive shell sessions are logged. */
     @JsonProperty("logInteractiveShells") Boolean logInteractiveShells,
     /** How MCP server environment values are interpreted. */
     @JsonProperty("envValueMode") SessionOpenOptionsEnvValueMode envValueMode,
+    /** MCP server names disabled for this session. Disabled servers are not started or authenticated on create or cold resume. */
+    @JsonProperty("disabledMcpServers") List<String> disabledMcpServers,
     /** Whether to include instructions from every MCP server in the system prompt instead of only allowlisted servers. */
     @JsonProperty("allowAllMcpServerInstructions") Boolean allowAllMcpServerInstructions,
     /** Additional directories to search for skills. */
     @JsonProperty("skillDirectories") List<String> skillDirectories,
+    /** Built-in skill names to include in this session. When specified, only these runtime-bundled skills are available. Skills from other sources with the same name remain available. */
+    @JsonProperty("includedBuiltinSkills") List<String> includedBuiltinSkills,
     /** Skill IDs disabled for this session. */
     @JsonProperty("disabledSkills") List<String> disabledSkills,
     /** Installed plugins visible to the session. */
@@ -121,7 +129,7 @@ public record SessionOpenOptions(
     @JsonProperty("trajectoryFile") String trajectoryFile,
     /** Whether model responses stream as delta events. */
     @JsonProperty("enableStreaming") Boolean enableStreaming,
-    /** Experimental: enable native model citations (Anthropic models today), normalized onto the `assistant.message` event. Off by default; may change or be removed while the citations surface is experimental. */
+    /** Experimental: enable native model citations for supported Anthropic and OpenAI models, normalized onto the `assistant.message` event. Off by default; may change or be removed while the citations surface is experimental. */
     @JsonProperty("enableCitations") Boolean enableCitations,
     /** Override URL for the Copilot API endpoint. */
     @JsonProperty("copilotUrl") String copilotUrl,
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicy.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicy.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicy.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicy.java
index bbc53711a4..3ee2252d16 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicy.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicy.java
@@ -22,7 +22,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionOpenOptionsAdditionalContentExclusionPolicy(
+    /** Content-exclusion rules to apply. */
     @JsonProperty("rules") List<SessionOpenOptionsAdditionalContentExclusionPolicyRule> rules,
+    /** Opaque policy update timestamp supplied by the host. */
     @JsonProperty("last_updated_at") Object lastUpdatedAt,
     /** Allowed values for the `SessionOpenOptionsAdditionalContentExclusionPolicyScope` enumeration. */
     @JsonProperty("scope") SessionOpenOptionsAdditionalContentExclusionPolicyScope scope
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRule.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRule.java
similarity index 89%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRule.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRule.java
index 403550ae24..480235747a 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRule.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRule.java
@@ -22,8 +22,11 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionOpenOptionsAdditionalContentExclusionPolicyRule(
+    /** Path patterns covered by this rule. */
     @JsonProperty("paths") List<String> paths,
+    /** Conditions of which at least one must match. */
     @JsonProperty("ifAnyMatch") List<String> ifAnyMatch,
+    /** Conditions none of which may match. */
     @JsonProperty("ifNoneMatch") List<String> ifNoneMatch,
     /** Source descriptor for a `sessions.open` content-exclusion rule, with source name and type. */
     @JsonProperty("source") SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource source
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource.java
similarity index 93%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource.java
index 9cfa5894cf..a119c9da76 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource.java
@@ -21,7 +21,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource(
+    /** Name of the policy source. */
     @JsonProperty("name") String name,
+    /** Type of the policy source. */
     @JsonProperty("type") String type
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyScope.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyScope.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsAdditionalContentExclusionPolicyScope.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsEnvValueMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsEnvValueMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsEnvValueMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsEnvValueMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsReasoningSummary.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsReasoningSummary.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsReasoningSummary.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptionsReasoningSummary.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java
index 080b47866b..2e8a069a4b 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java
@@ -74,6 +74,8 @@ public record SessionOptionsUpdateParams(
     @JsonProperty("shellProcessFlags") List<String> shellProcessFlags,
     /** Resolved sandbox configuration. */
     @JsonProperty("sandboxConfig") SandboxConfig sandboxConfig,
+    /** Origin of the sandbox choice. The runtime uses this only for internal telemetry provenance; managed policy is derived independently. */
+    @JsonProperty("sandboxConfigSource") SandboxConfigSource sandboxConfigSource,
     /** Whether interactive shell sessions are logged. */
     @JsonProperty("logInteractiveShells") Boolean logInteractiveShells,
     /** How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch). */
@@ -82,6 +84,8 @@ public record SessionOptionsUpdateParams(
     @JsonProperty("allowAllMcpServerInstructions") Boolean allowAllMcpServerInstructions,
     /** Additional directories to search for skills. */
     @JsonProperty("skillDirectories") List<String> skillDirectories,
+    /** Built-in skill names to include in this session. When specified, only these runtime-bundled skills are available. Skills from other sources with the same name remain available. Set to null to remove the allowlist restriction. */
+    @JsonProperty("includedBuiltinSkills") List<String> includedBuiltinSkills,
     /** Skill IDs that should be excluded from this session. */
     @JsonProperty("disabledSkills") List<String> disabledSkills,
     /** Whether to discover custom instructions on demand after successful file views (AGENTS.md / CLAUDE.md / .github/copilot-instructions.md surfacing). Combined with `skipCustomInstructions`. */
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java
similarity index 94%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java
index 25d2e36666..8b397f2d4d 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java
@@ -103,7 +103,7 @@ public CompletableFuture<SessionPermissionsSetApproveAllResult> setApproveAll(Se
     }
 
     /**
-     * Allow-all mode to apply for the session.
+     * Permission mode to apply for the session.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -112,10 +112,10 @@ public CompletableFuture<SessionPermissionsSetApproveAllResult> setApproveAll(Se
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionPermissionsSetAllowAllResult> setAllowAll(SessionPermissionsSetAllowAllParams params) {
+    public CompletableFuture<SessionPermissionsSetModeResult> setMode(SessionPermissionsSetModeParams params) {
         com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
         _p.put("sessionId", this.sessionId);
-        return caller.invoke("session.permissions.setAllowAll", _p, SessionPermissionsSetAllowAllResult.class);
+        return caller.invoke("session.permissions.setMode", _p, SessionPermissionsSetModeResult.class);
     }
 
     /**
@@ -125,8 +125,8 @@ public CompletableFuture<SessionPermissionsSetAllowAllResult> setAllowAll(Sessio
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionPermissionsGetAllowAllResult> getAllowAll() {
-        return caller.invoke("session.permissions.getAllowAll", java.util.Map.of("sessionId", this.sessionId), SessionPermissionsGetAllowAllResult.class);
+    public CompletableFuture<SessionPermissionsGetModeResult> getMode() {
+        return caller.invoke("session.permissions.getMode", java.util.Map.of("sessionId", this.sessionId), SessionPermissionsGetModeResult.class);
     }
 
     /**
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsConfigureParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsConfigureParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsConfigureParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsConfigureParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsConfigureResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsConfigureResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsConfigureResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsConfigureResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustAddTrustedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustAddTrustedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustAddTrustedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustAddTrustedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustAddTrustedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustAddTrustedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustAddTrustedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustAddTrustedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustIsTrustedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustIsTrustedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustIsTrustedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustIsTrustedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustIsTrustedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustIsTrustedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustIsTrustedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustIsTrustedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetAllowAllParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetModeParams.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetAllowAllParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetModeParams.java
index 761640a4fb..5d41d3c6a2 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetAllowAllParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetModeParams.java
@@ -23,7 +23,7 @@
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record SessionPermissionsGetAllowAllParams(
+public record SessionPermissionsGetModeParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId
 ) {
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetModeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetModeResult.java
new file mode 100644
index 0000000000..1ccb45375c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetModeResult.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Current permission mode.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionPermissionsGetModeResult(
+    /** Current permission mode */
+    @JsonProperty("mode") PermissionMode mode
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestParams.java
similarity index 82%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestParams.java
index 075dcee26a..a4d2ba67e5 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestParams.java
@@ -29,6 +29,8 @@ public record SessionPermissionsHandlePendingPermissionRequestParams(
     /** Request ID of the pending permission request */
     @JsonProperty("requestId") String requestId,
     /** The client's response to the pending permission prompt */
-    @JsonProperty("result") Object result
+    @JsonProperty("result") Object result,
+    /** Optional informational context describing how and where this response was made. Omit it to preserve legacy behavior without attributing an origin. */
+    @JsonProperty("decisionContext") PermissionDecisionContext decisionContext
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsHandlePendingPermissionRequestResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsAddToolApprovalParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsAddToolApprovalParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsAddToolApprovalParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsAddToolApprovalParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsAddToolApprovalResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsAddToolApprovalResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsAddToolApprovalResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsAddToolApprovalResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApplyParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApplyParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApplyParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApplyParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApplyResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApplyResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApplyResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApplyResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsResolveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsResolveParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsResolveParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsResolveParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsResolveResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsResolveResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsResolveResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsResolveResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsModifyRulesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsModifyRulesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsModifyRulesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsModifyRulesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsModifyRulesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsModifyRulesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsModifyRulesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsModifyRulesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsNotifyPromptShownParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsNotifyPromptShownParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsNotifyPromptShownParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsNotifyPromptShownParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsNotifyPromptShownResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsNotifyPromptShownResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsNotifyPromptShownResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsNotifyPromptShownResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddParams.java
similarity index 82%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddParams.java
index e5f35a2264..48ee26e0d9 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddParams.java
@@ -26,7 +26,7 @@
 public record SessionPermissionsPathsAddParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
-    /** Directory to add to the allow-list. The runtime resolves and validates the path before adding. */
+    /** Directory to add to the allow-list. The runtime resolves and validates the path before adding, then loads conventional `.github/skills/` and `.github/agents/` definitions under it when their subsystem gates are enabled. Adding the directory is therefore also a trust decision for configuration stored there. */
     @JsonProperty("path") String path
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsAddResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinAllowedDirectoriesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinAllowedDirectoriesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinAllowedDirectoriesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinAllowedDirectoriesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinAllowedDirectoriesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinAllowedDirectoriesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinAllowedDirectoriesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinAllowedDirectoriesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinWorkspaceParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinWorkspaceParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinWorkspaceParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinWorkspaceParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinWorkspaceResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinWorkspaceResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinWorkspaceResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsIsPathWithinWorkspaceResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsUpdatePrimaryParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsUpdatePrimaryParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsUpdatePrimaryParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsUpdatePrimaryParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsUpdatePrimaryResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsUpdatePrimaryResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsUpdatePrimaryResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsUpdatePrimaryResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPendingRequestsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPendingRequestsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPendingRequestsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPendingRequestsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPendingRequestsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPendingRequestsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPendingRequestsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPendingRequestsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsResetSessionApprovalsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsResetSessionApprovalsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsResetSessionApprovalsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsResetSessionApprovalsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsResetSessionApprovalsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsResetSessionApprovalsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsResetSessionApprovalsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsResetSessionApprovalsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetApproveAllParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetApproveAllParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetApproveAllParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetApproveAllParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetApproveAllResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetApproveAllResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetApproveAllResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetApproveAllResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetModeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetModeParams.java
new file mode 100644
index 0000000000..712d460243
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetModeParams.java
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Permission mode to apply for the session.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionPermissionsSetModeParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Permission mode to apply */
+    @JsonProperty("mode") PermissionMode mode,
+    /** Optional judge model id for assisted mode. When omitted, the session resolves the provider default: `gpt-5.5` for CAPI sessions and the active session model for BYOK sessions. */
+    @JsonProperty("assistedApprovalModel") String assistedApprovalModel,
+    /** Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK callers. */
+    @JsonProperty("source") PermissionModeSource source
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetAllowAllResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetModeResult.java
similarity index 73%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetAllowAllResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetModeResult.java
index 9b14d8f6ad..1ee34568ea 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetAllowAllResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetModeResult.java
@@ -14,7 +14,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Indicates whether the operation succeeded and reports the post-mutation state.
+ * Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
@@ -23,12 +23,10 @@
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record SessionPermissionsSetAllowAllResult(
+public record SessionPermissionsSetModeResult(
     /** Whether the operation succeeded */
     @JsonProperty("success") Boolean success,
-    /** Authoritative full allow-all state after the mutation */
-    @JsonProperty("enabled") Boolean enabled,
-    /** Authoritative allow-all mode after the mutation */
-    @JsonProperty("mode") PermissionsAllowAllMode mode
+    /** Authoritative permission mode after the mutation */
+    @JsonProperty("mode") PermissionMode mode
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetRequiredParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetRequiredParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetRequiredParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetRequiredParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetRequiredResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetRequiredResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetRequiredResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetRequiredResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsSetUnrestrictedModeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsSetUnrestrictedModeParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsSetUnrestrictedModeParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsSetUnrestrictedModeParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsSetUnrestrictedModeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsSetUnrestrictedModeResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsSetUnrestrictedModeResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsSetUnrestrictedModeResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanDeleteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanDeleteParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanDeleteParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanDeleteParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosResult.java
similarity index 91%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosResult.java
index 1230bbc02f..48dfd6e809 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosResult.java
@@ -25,7 +25,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionPlanReadSqlTodosResult(
-    /** Rows from the session SQL todos table, ordered by creation time and id. */
+    /** Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables. */
     @JsonProperty("rows") List<PlanSqlTodosRow> rows
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesResult.java
similarity index 89%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesResult.java
index 505d083036..4e2ad62e0d 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanReadSqlTodosWithDependenciesResult.java
@@ -25,7 +25,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionPlanReadSqlTodosWithDependenciesResult(
-    /** Rows from the session SQL todos table, ordered by creation time and id. Empty when no database, no todos table, or the SELECT failed. */
+    /** Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables. Empty when no database, no todos table, or the SELECT failed. */
     @JsonProperty("rows") List<PlanSqlTodosRow> rows,
     /** Edges from the session SQL todo_deps table. Empty when no database, no todo_deps table, or the SELECT failed. Read independently from `rows`, so a broken todo_deps table does not affect the rows result and vice versa. */
     @JsonProperty("dependencies") List<PlanSqlTodoDependency> dependencies
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanUpdateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanUpdateParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPlanUpdateParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanUpdateParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsReloadParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsReloadParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsReloadParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsReloadParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderGetEndpointParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderGetEndpointParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderGetEndpointParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderGetEndpointParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderGetEndpointResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderGetEndpointResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderGetEndpointResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderGetEndpointResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueBeginDeferredIdleDrainParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueBeginDeferredIdleDrainParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueBeginDeferredIdleDrainParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueBeginDeferredIdleDrainParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueBeginDeferredIdleDrainResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueBeginDeferredIdleDrainResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueBeginDeferredIdleDrainResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueBeginDeferredIdleDrainResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueClearParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueClearParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueClearParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueClearParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDeferSessionIdleParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDeferSessionIdleParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDeferSessionIdleParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDeferSessionIdleParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtParams.java
similarity index 94%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtParams.java
index bf16f9d35f..0187e814b8 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtParams.java
@@ -26,6 +26,7 @@
 public record SessionQueueDuplicateAtParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
+    /** Stable opaque ID of the queued item to duplicate. */
     @JsonProperty("id") String id
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueDuplicateAtResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueEnqueueResumePendingParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueEnqueueResumePendingParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueEnqueueResumePendingParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueEnqueueResumePendingParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueEnqueueResumePendingResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueEnqueueResumePendingResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueEnqueueResumePendingResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueEnqueueResumePendingResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueFinishDeferredIdleDrainParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueFinishDeferredIdleDrainParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueFinishDeferredIdleDrainParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueFinishDeferredIdleDrainParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueFinishDeferredIdleDrainResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueFinishDeferredIdleDrainResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueFinishDeferredIdleDrainResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueFinishDeferredIdleDrainResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueHasPendingParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueHasPendingParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueHasPendingParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueHasPendingParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueHasPendingResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueHasPendingResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueHasPendingResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueHasPendingResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtParams.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtParams.java
index 981aefb5fd..11f0f76533 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtParams.java
@@ -28,6 +28,7 @@ public record SessionQueueInsertAtParams(
     @JsonProperty("sessionId") String sessionId,
     /** Zero-based position in the public visible queue. Values outside the queue clamp to an end. */
     @JsonProperty("position") Long position,
+    /** Queued message contents and delivery metadata. */
     @JsonProperty("message") QueueInsertMessage message
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueInsertAtResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueMoveItemParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueMoveItemParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueMoveItemParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueMoveItemParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueMoveItemResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueMoveItemResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueMoveItemResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueMoveItemResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsResult.java
similarity index 82%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsResult.java
index 7b096480ca..a74d54e245 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueuePendingItemsResult.java
@@ -28,6 +28,8 @@ public record SessionQueuePendingItemsResult(
     /** Pending queued items in submission order. Includes user messages, queued slash commands, and queued model changes; omits internal system items. */
     @JsonProperty("items") List<QueuePendingItems> items,
     /** Display text for messages currently in the immediate steering queue (interjections sent during a running turn). */
-    @JsonProperty("steeringMessages") List<String> steeringMessages
+    @JsonProperty("steeringMessages") List<String> steeringMessages,
+    /** How many leading entries of `steeringMessages` have already been folded into the running turn (and so have an emitted `user.message`), as opposed to still waiting for one. Absent for hosts that do not distinguish the two. */
+    @JsonProperty("inFlightSteeringCount") Long inFlightSteeringCount
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueProcessParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueProcessParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueProcessParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueProcessParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtParams.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtParams.java
index bc7cd3e124..5e890f85d9 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtParams.java
@@ -26,6 +26,7 @@
 public record SessionQueueRemoveAtParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
+    /** Stable opaque ID of the queued item to remove. */
     @JsonProperty("id") String id
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveAtResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveMostRecentParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveMostRecentParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveMostRecentParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveMostRecentParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveMostRecentResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveMostRecentResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveMostRecentResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueRemoveMostRecentResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowParams.java
similarity index 93%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowParams.java
index 6381636a89..9d23f47eb4 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowParams.java
@@ -26,6 +26,7 @@
 public record SessionQueueSendNowParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
+    /** Stable opaque ID of the queued item to steer into the live turn. */
     @JsonProperty("id") String id
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSendNowResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSetDrainPausedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSetDrainPausedParams.java
similarity index 96%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSetDrainPausedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSetDrainPausedParams.java
index f51e33ea16..4674978d3e 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSetDrainPausedParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSetDrainPausedParams.java
@@ -26,6 +26,7 @@
 public record SessionQueueSetDrainPausedParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
+    /** Whether queued-lane draining should be paused. */
     @JsonProperty("paused") Boolean paused
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSnapshotParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSnapshotParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSnapshotParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSnapshotParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSnapshotResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSnapshotResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSnapshotResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueSnapshotResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextParams.java
similarity index 88%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextParams.java
index 139a5ba2a4..5f315d5724 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextParams.java
@@ -26,8 +26,11 @@
 public record SessionQueueUpdateTextParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
+    /** Stable opaque ID of the queued item to edit. */
     @JsonProperty("id") String id,
+    /** Replacement prompt sent to the model. */
     @JsonProperty("prompt") String prompt,
+    /** Optional replacement prompt displayed to the user. */
     @JsonProperty("displayPrompt") String displayPrompt
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueUpdateTextResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteDisableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteDisableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteDisableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteDisableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteEnableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteEnableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteEnableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteEnableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteEnableResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteEnableResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteEnableResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteEnableResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteNotifySteerableChangedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteNotifySteerableChangedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteNotifySteerableChangedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteNotifySteerableChangedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionRpc.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRpc.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionRpc.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRpc.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddAtParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddAtParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddAtParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddAtParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddAtResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddAtResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddAtResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddAtResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddCronParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddCronParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddCronParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddCronParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddCronResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddCronResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddCronResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddCronResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddSelfPacedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddSelfPacedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddSelfPacedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddSelfPacedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddSelfPacedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddSelfPacedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddSelfPacedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleAddSelfPacedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHasSelfPacedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHasSelfPacedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHasSelfPacedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHasSelfPacedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHasSelfPacedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHasSelfPacedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHasSelfPacedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHasSelfPacedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHydrateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHydrateParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHydrateParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleHydrateParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleRearmSelfPacedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleRearmSelfPacedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleRearmSelfPacedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleRearmSelfPacedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleRearmSelfPacedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleRearmSelfPacedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleRearmSelfPacedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleRearmSelfPacedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleStopParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleStopParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleStopParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleStopParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleStopResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleStopResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleStopResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleStopResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSendMessagesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendMessagesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSendMessagesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendMessagesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSendMessagesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendMessagesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSendMessagesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendMessagesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSendParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSendParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSendResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSendResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSendSystemNotificationParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendSystemNotificationParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSendSystemNotificationParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSendSystemNotificationParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsBuiltInToolAvailabilitySnapshot.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsBuiltInToolAvailabilitySnapshot.java
similarity index 89%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsBuiltInToolAvailabilitySnapshot.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsBuiltInToolAvailabilitySnapshot.java
index 98e6df29fa..8a714d5ccb 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsBuiltInToolAvailabilitySnapshot.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsBuiltInToolAvailabilitySnapshot.java
@@ -21,7 +21,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionSettingsBuiltInToolAvailabilitySnapshot(
+    /** Whether the report-progress tool is available. */
     @JsonProperty("reportProgress") Boolean reportProgress,
+    /** Whether the create-pull-request tool is available. */
     @JsonProperty("createPullRequest") Boolean createPullRequest
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateResult.java
similarity index 93%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateResult.java
index 1f4a7ed320..3ab56b8ca6 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsEvaluatePredicateResult.java
@@ -24,6 +24,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionSettingsEvaluatePredicateResult(
+    /** Whether the named settings predicate evaluated to enabled. */
     @JsonProperty("enabled") Boolean enabled
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsJobSnapshot.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsJobSnapshot.java
similarity index 87%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsJobSnapshot.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsJobSnapshot.java
index 463660d8a1..8a807e391c 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsJobSnapshot.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsJobSnapshot.java
@@ -21,8 +21,11 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionSettingsJobSnapshot(
+    /** GitHub Actions event type for the job. */
     @JsonProperty("eventType") String eventType,
+    /** Whether this is the workflow's trigger job. */
     @JsonProperty("isTriggerJob") Boolean isTriggerJob,
+    /** Availability of job-specific built-in tools. */
     @JsonProperty("builtInToolAvailability") SessionSettingsBuiltInToolAvailabilitySnapshot builtInToolAvailability
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsModelSnapshot.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsModelSnapshot.java
similarity index 83%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsModelSnapshot.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsModelSnapshot.java
index ce515c74db..e1eb54a251 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsModelSnapshot.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsModelSnapshot.java
@@ -21,9 +21,13 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionSettingsModelSnapshot(
+    /** Selected model identifier. */
     @JsonProperty("model") String model,
+    /** Default reasoning effort for the selected model. */
     @JsonProperty("defaultReasoningEffort") String defaultReasoningEffort,
+    /** Agent job identifier for the session. */
     @JsonProperty("instanceId") String instanceId,
+    /** Agent service callback URL for job and progress updates. */
     @JsonProperty("callbackUrl") String callbackUrl
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsOnlineEvaluationSnapshot.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsOnlineEvaluationSnapshot.java
similarity index 89%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsOnlineEvaluationSnapshot.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsOnlineEvaluationSnapshot.java
index b1a5be6f3a..999e1a2cbf 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsOnlineEvaluationSnapshot.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsOnlineEvaluationSnapshot.java
@@ -21,7 +21,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionSettingsOnlineEvaluationSnapshot(
+    /** Whether online evaluation is disabled. */
     @JsonProperty("disableOnlineEvaluation") Boolean disableOnlineEvaluation,
+    /** Whether online-evaluation output-file generation is enabled. */
     @JsonProperty("enableOnlineEvaluationOutputFile") Boolean enableOnlineEvaluationOutputFile
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsPredicateName.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsPredicateName.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsPredicateName.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsPredicateName.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsRepoSnapshot.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsRepoSnapshot.java
similarity index 74%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsRepoSnapshot.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsRepoSnapshot.java
index 960853c527..3651346bd8 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsRepoSnapshot.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsRepoSnapshot.java
@@ -21,17 +21,29 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionSettingsRepoSnapshot(
+    /** Repository name. */
     @JsonProperty("name") String name,
+    /** GitHub repository database ID. */
     @JsonProperty("id") Double id,
+    /** Checked-out repository branch. */
     @JsonProperty("branch") String branch,
+    /** Checked-out commit SHA. */
     @JsonProperty("commit") String commit,
+    /** Whether the repository is writable. */
     @JsonProperty("readWrite") Boolean readWrite,
+    /** Repository owner login. */
     @JsonProperty("ownerName") String ownerName,
+    /** GitHub repository owner database ID. */
     @JsonProperty("ownerId") Double ownerId,
+    /** GitHub server base URL. */
     @JsonProperty("serverUrl") String serverUrl,
+    /** GitHub server host name. */
     @JsonProperty("host") String host,
+    /** Protocol used to access the GitHub host. */
     @JsonProperty("hostProtocol") String hostProtocol,
+    /** GitHub secret-scanning service URL. */
     @JsonProperty("secretScanningUrl") String secretScanningUrl,
+    /** Number of commits in the pull request. */
     @JsonProperty("prCommitCount") Double prCommitCount
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotResult.java
similarity index 75%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotResult.java
index 0851474d64..1bcfe166fc 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsSnapshotResult.java
@@ -24,14 +24,23 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionSettingsSnapshotResult(
+    /** Agent runtime version selector copied from the session settings, such as `latest` or a runtime release identifier. */
     @JsonProperty("version") String version,
+    /** Name of the SDK client that created the session. */
     @JsonProperty("clientName") String clientName,
+    /** Session timeout in milliseconds. */
     @JsonProperty("timeoutMs") Double timeoutMs,
+    /** Session start time as Unix epoch milliseconds. */
     @JsonProperty("startTimeMs") Double startTimeMs,
+    /** Redacted repository and host settings. */
     @JsonProperty("repo") SessionSettingsRepoSnapshot repo,
+    /** Redacted model routing settings. */
     @JsonProperty("model") SessionSettingsModelSnapshot model,
+    /** Redacted validation and memory-tool settings. */
     @JsonProperty("validation") SessionSettingsValidationSnapshot validation,
+    /** Redacted job settings. */
     @JsonProperty("job") SessionSettingsJobSnapshot job,
+    /** Online-evaluation settings safe for SDK consumers. */
     @JsonProperty("onlineEvaluation") SessionSettingsOnlineEvaluationSnapshot onlineEvaluation
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsValidationSnapshot.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsValidationSnapshot.java
similarity index 74%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsValidationSnapshot.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsValidationSnapshot.java
index 375cfdfec1..314cc5b2b4 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsValidationSnapshot.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsValidationSnapshot.java
@@ -21,14 +21,23 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionSettingsValidationSnapshot(
+    /** General validation timeout budget in seconds. */
     @JsonProperty("timeout") Double timeout,
+    /** Dependabot validation timeout budget in seconds. */
     @JsonProperty("dependabotTimeout") Double dependabotTimeout,
+    /** Whether CodeQL validation is enabled. */
     @JsonProperty("codeqlEnabled") Boolean codeqlEnabled,
+    /** Whether code-review validation is enabled. */
     @JsonProperty("codeReviewEnabled") Boolean codeReviewEnabled,
+    /** Model used for code-review validation. */
     @JsonProperty("codeReviewModel") String codeReviewModel,
+    /** Whether advisory validation is enabled. */
     @JsonProperty("advisoryEnabled") Boolean advisoryEnabled,
+    /** Whether secret-scanning validation is enabled. */
     @JsonProperty("secretScanningEnabled") Boolean secretScanningEnabled,
+    /** Whether the memory-store tool is enabled. */
     @JsonProperty("memoryStoreEnabled") Boolean memoryStoreEnabled,
+    /** Whether the memory-vote tool is enabled. */
     @JsonProperty("memoryVoteEnabled") Boolean memoryVoteEnabled
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShellApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShellApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShellCancelUserRequestedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellCancelUserRequestedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShellCancelUserRequestedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellCancelUserRequestedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShellCancelUserRequestedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellCancelUserRequestedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShellCancelUserRequestedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellCancelUserRequestedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecuteUserRequestedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecuteUserRequestedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecuteUserRequestedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecuteUserRequestedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecuteUserRequestedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecuteUserRequestedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecuteUserRequestedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellExecuteUserRequestedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShellKillParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellKillParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShellKillParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellKillParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShellKillResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellKillResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShellKillResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellKillResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionShutdownParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShutdownParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionShutdownParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShutdownParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsDisableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsDisableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsDisableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsDisableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsEnableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsEnableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsEnableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsEnableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsEnsureLoadedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsEnsureLoadedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsEnsureLoadedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsEnsureLoadedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsGetInvokedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsGetInvokedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsGetInvokedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsGetInvokedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsGetInvokedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsGetInvokedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsGetInvokedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsGetInvokedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsReloadParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsReloadParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsReloadParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsReloadParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsReloadResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsReloadResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsReloadResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsReloadResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionSuspendParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSuspendParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionSuspendParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSuspendParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksCancelParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksCancelParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksCancelParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksCancelParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksCancelResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksCancelResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksCancelResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksCancelResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetCurrentPromotableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetCurrentPromotableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetCurrentPromotableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetCurrentPromotableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetCurrentPromotableResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetCurrentPromotableResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetCurrentPromotableResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetCurrentPromotableResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetProgressParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetProgressParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetProgressParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetProgressParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetProgressResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetProgressResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetProgressResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksGetProgressResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteCurrentToBackgroundParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteCurrentToBackgroundParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteCurrentToBackgroundParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteCurrentToBackgroundParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteCurrentToBackgroundResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteCurrentToBackgroundResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteCurrentToBackgroundResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteCurrentToBackgroundResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteToBackgroundParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteToBackgroundParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteToBackgroundParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteToBackgroundParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteToBackgroundResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteToBackgroundResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteToBackgroundResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksPromoteToBackgroundResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRefreshParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRefreshParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRefreshParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRefreshParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRemoveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRemoveParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRemoveParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRemoveParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRemoveResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRemoveResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRemoveResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksRemoveResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksSendMessageParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksSendMessageParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksSendMessageParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksSendMessageParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksSendMessageResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksSendMessageResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksSendMessageResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksSendMessageResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentParams.java
similarity index 95%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentParams.java
index 82daeec5e6..87da305a6c 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentParams.java
@@ -30,7 +30,7 @@ public record SessionTasksStartAgentParams(
     @JsonProperty("agentType") String agentType,
     /** Task prompt for the agent */
     @JsonProperty("prompt") String prompt,
-    /** Short name for the agent, used to generate a human-readable ID */
+    /** Friendly, non-unique name used when displaying the agent */
     @JsonProperty("name") String name,
     /** Short description of the task */
     @JsonProperty("description") String description,
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksStartAgentResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksWaitForPendingParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksWaitForPendingParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTasksWaitForPendingParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksWaitForPendingParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryGetEngagementIdParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryGetEngagementIdParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryGetEngagementIdParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryGetEngagementIdParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryGetEngagementIdResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryGetEngagementIdResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryGetEngagementIdResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryGetEngagementIdResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetrySetFeatureOverridesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetrySetFeatureOverridesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetrySetFeatureOverridesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetrySetFeatureOverridesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java
similarity index 52%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java
index 0f4b058827..62593a3588 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java
@@ -30,6 +30,54 @@ public final class SessionToolsApi {
         this.sessionId = sessionId;
     }
 
+    /**
+     * A tool name and arguments to execute through the session's native invocation pipeline.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> execute(SessionToolsExecuteParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.tools.execute", _p, Void.class);
+    }
+
+    /**
+     * Options controlling how Rust-owned built-in tool descriptors are materialized.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionToolsGetBuiltinDescriptorsResult> getBuiltinDescriptors(SessionToolsGetBuiltinDescriptorsParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.tools.getBuiltinDescriptors", _p, SessionToolsGetBuiltinDescriptorsResult.class);
+    }
+
+    /**
+     * Task-completion tool arguments and final result used to build a label-safe session event payload.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionToolsTaskCompleteEventDataResult> taskCompleteEventData(SessionToolsTaskCompleteEventDataParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.tools.taskCompleteEventData", _p, SessionToolsTaskCompleteEventDataResult.class);
+    }
+
     /**
      * Pending external tool call request ID, with the tool result or an error describing why it failed.
      * <p>
@@ -68,6 +116,22 @@ public CompletableFuture<SessionToolsGetCurrentMetadataResult> getCurrentMetadat
         return caller.invoke("session.tools.getCurrentMetadata", java.util.Map.of("sessionId", this.sessionId), SessionToolsGetCurrentMetadataResult.class);
     }
 
+    /**
+     * Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> set(SessionToolsSetParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.tools.set", _p, Void.class);
+    }
+
     /**
      * Subagent settings to apply to the current session
      * <p>
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsExecuteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsExecuteParams.java
new file mode 100644
index 0000000000..e60023c3aa
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsExecuteParams.java
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * A tool name and arguments to execute through the session's native invocation pipeline.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionToolsExecuteParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Name of the currently offered tool to execute. */
+    @JsonProperty("name") String name,
+    /** Arguments supplied to the tool. */
+    @JsonProperty("arguments") Object arguments,
+    /** Optional identifier used to correlate this invocation with its tool call. */
+    @JsonProperty("toolCallId") String toolCallId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetBuiltinDescriptorsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetBuiltinDescriptorsParams.java
new file mode 100644
index 0000000000..7740409548
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetBuiltinDescriptorsParams.java
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Options controlling how Rust-owned built-in tool descriptors are materialized.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionToolsGetBuiltinDescriptorsParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Whether line numbers should be omitted from the view tool descriptor. */
+    @JsonProperty("noViewLineNumbers") Boolean noViewLineNumbers,
+    /** Whether descriptors should favor fewer user-intervention prompts. */
+    @JsonProperty("reduceUserIntervention") Boolean reduceUserIntervention,
+    /** Whether tool descriptors should include authoring metadata. */
+    @JsonProperty("includeAuthor") Boolean includeAuthor,
+    /** Whether semantic skill lookup is available. */
+    @JsonProperty("skillEmbeddingEnabled") Boolean skillEmbeddingEnabled,
+    /** Shell-specific names and description lines for shell tools. */
+    @JsonProperty("shellConfig") ToolsShellDescriptorConfig shellConfig,
+    /** Whether shell commands may only run asynchronously. */
+    @JsonProperty("shellAsyncOnlyEnabled") Boolean shellAsyncOnlyEnabled,
+    /** Whether the configured shell supports PowerShell 7 syntax. */
+    @JsonProperty("shellSupportsPowerShell7Syntax") Boolean shellSupportsPowerShell7Syntax,
+    /** Default shell timeout in milliseconds. */
+    @JsonProperty("shellTimeoutMs") Double shellTimeoutMs,
+    /** Whether background task completion notifications are enabled. */
+    @JsonProperty("backgroundTaskNotificationsEnabled") Boolean backgroundTaskNotificationsEnabled
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetBuiltinDescriptorsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetBuiltinDescriptorsResult.java
new file mode 100644
index 0000000000..1f33321e73
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetBuiltinDescriptorsResult.java
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Rust-owned built-in tool descriptors for the session.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionToolsGetBuiltinDescriptorsResult(
+    /** Built-in tool descriptors materialized for the session. */
+    @JsonProperty("tools") List<BuiltinToolDescriptor> tools
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetCurrentMetadataParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetCurrentMetadataParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetCurrentMetadataParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetCurrentMetadataParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetCurrentMetadataResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetCurrentMetadataResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetCurrentMetadataResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsGetCurrentMetadataResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsHandlePendingToolCallParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsHandlePendingToolCallParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsHandlePendingToolCallParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsHandlePendingToolCallParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsHandlePendingToolCallResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsHandlePendingToolCallResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsHandlePendingToolCallResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsHandlePendingToolCallResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsInitializeAndValidateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsInitializeAndValidateParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsInitializeAndValidateParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsInitializeAndValidateParams.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsSetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsSetParams.java
new file mode 100644
index 0000000000..3edd6afad3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsSetParams.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionToolsSetParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Complete replacement list for the calling connection. */
+    @JsonProperty("tools") List<ProtocolExternalToolDefinition> tools
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsTaskCompleteEventDataParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsTaskCompleteEventDataParams.java
new file mode 100644
index 0000000000..9902fb8a99
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsTaskCompleteEventDataParams.java
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Task-completion tool arguments and final result used to build a label-safe session event payload.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionToolsTaskCompleteEventDataParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Arguments supplied to the completed task_complete tool call. */
+    @JsonProperty("toolArgs") Object toolArgs,
+    /** Final expanded result returned by the task_complete tool. */
+    @JsonProperty("finalResult") ToolResultExpanded finalResult
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsTaskCompleteEventDataResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsTaskCompleteEventDataResult.java
new file mode 100644
index 0000000000..f95ad8a76e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsTaskCompleteEventDataResult.java
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Task completion notification with summary from the agent
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionToolsTaskCompleteEventDataResult(
+    /** Summary of the completed task, provided by the agent */
+    @JsonProperty("summary") String summary,
+    /** Whether the task was accepted as complete. False when validation failed or completion was rejected or blocked by the reviewer */
+    @JsonProperty("success") Boolean success,
+    /** Semantic completion decision. Absent on legacy events and invalid tool calls */
+    @JsonProperty("outcome") TaskCompletionOutcome outcome,
+    /** Label-safe runtime rationale for the completion decision (e.g. a cancellation or pause/resume downgrade), when one applies. Reviewer-authored rationale is intentionally omitted here because this event has no IFC label channel; the reviewer's findings remain available through its own labeled sub-agent events */
+    @JsonProperty("reason") String reason,
+    /** Active autopilot objective ID evaluated by the completion reviewer */
+    @JsonProperty("objectiveId") Long objectiveId
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsUpdateSubagentSettingsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsUpdateSubagentSettingsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionToolsUpdateSubagentSettingsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsUpdateSubagentSettingsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationParams.java
similarity index 79%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationParams.java
index ad754767e5..72207e55bb 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationParams.java
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.copilot.CopilotExperimental;
+import java.util.Map;
 import javax.annotation.processing.Generated;
 
 /**
@@ -26,9 +27,15 @@
 public record SessionUiElicitationParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
+    /** Elicitation mode. Omitted and form are equivalent for structured elicitation. */
+    @JsonProperty("mode") McpElicitationFormMode mode,
     /** Message describing what information is needed from the user */
     @JsonProperty("message") String message,
     /** JSON Schema describing the form fields to present to the user */
-    @JsonProperty("requestedSchema") UIElicitationSchema requestedSchema
+    @JsonProperty("requestedSchema") UIElicitationSchema requestedSchema,
+    /** MCP request metadata. */
+    @JsonProperty("_meta") Map<String, Map<String, Object>> meta,
+    /** MCP task metadata. */
+    @JsonProperty("task") McpTaskMetadata task
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationResult.java
similarity index 89%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationResult.java
index b290cc7c64..bf250f9d7d 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiElicitationResult.java
@@ -28,6 +28,8 @@ public record SessionUiElicitationResult(
     /** The user's response: accept (submitted), decline (rejected), or cancel (dismissed) */
     @JsonProperty("action") UIElicitationResponseAction action,
     /** The form values submitted by the user (present when action is 'accept') */
-    @JsonProperty("content") Map<String, Object> content
+    @JsonProperty("content") Map<String, Object> content,
+    /** MCP response metadata. */
+    @JsonProperty("_meta") Map<String, Map<String, Object>> meta
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryResult.java
similarity index 84%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryResult.java
index 6ac9058b04..e8b6dd90cb 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiEphemeralQueryResult.java
@@ -14,7 +14,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Transient answer generated from current conversation context.
+ * Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
@@ -24,7 +24,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionUiEphemeralQueryResult(
-    /** Full assistant response text. */
+    /** Answer returned by the model */
     @JsonProperty("answer") String answer
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingAutoModeSwitchParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingAutoModeSwitchParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingAutoModeSwitchParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingAutoModeSwitchParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingAutoModeSwitchResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingAutoModeSwitchResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingAutoModeSwitchResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingAutoModeSwitchResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingElicitationParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingElicitationParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingElicitationParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingElicitationParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingElicitationResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingElicitationResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingElicitationResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingElicitationResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingExitPlanModeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingExitPlanModeParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingExitPlanModeParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingExitPlanModeParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingExitPlanModeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingExitPlanModeResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingExitPlanModeResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingExitPlanModeResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSamplingParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSamplingParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSamplingParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSamplingParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSamplingResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSamplingResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSamplingResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSamplingResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSessionLimitsExhaustedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSessionLimitsExhaustedParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSessionLimitsExhaustedParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSessionLimitsExhaustedParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSessionLimitsExhaustedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSessionLimitsExhaustedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSessionLimitsExhaustedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingSessionLimitsExhaustedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingUserInputParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingUserInputParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingUserInputParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingUserInputParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingUserInputResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingUserInputResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingUserInputResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiHandlePendingUserInputResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiRegisterDirectAutoModeSwitchHandlerParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiRegisterDirectAutoModeSwitchHandlerParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiRegisterDirectAutoModeSwitchHandlerParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiRegisterDirectAutoModeSwitchHandlerParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiRegisterDirectAutoModeSwitchHandlerResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiRegisterDirectAutoModeSwitchHandlerResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiRegisterDirectAutoModeSwitchHandlerResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiRegisterDirectAutoModeSwitchHandlerResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiUnregisterDirectAutoModeSwitchHandlerParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiUnregisterDirectAutoModeSwitchHandlerParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiUnregisterDirectAutoModeSwitchHandlerParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiUnregisterDirectAutoModeSwitchHandlerParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUiUnregisterDirectAutoModeSwitchHandlerResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiUnregisterDirectAutoModeSwitchHandlerResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUiUnregisterDirectAutoModeSwitchHandlerResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiUnregisterDirectAutoModeSwitchHandlerResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUsageApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUsageApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java
index 69db5a56d3..a38afd7042 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java
@@ -42,6 +42,8 @@ public record SessionUsageGetMetricsResult(
     @JsonProperty("codeChanges") UsageMetricsCodeChanges codeChanges,
     /** Per-model token and request metrics, keyed by model identifier */
     @JsonProperty("modelMetrics") Map<String, UsageMetricsModelMetric> modelMetrics,
+    /** Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`. */
+    @JsonProperty("agentMetrics") Map<String, UsageMetricsAgentMetric> agentMetrics,
     /** Currently active model identifier */
     @JsonProperty("currentModel") String currentModel,
     /** Input tokens from the most recent main-agent API call */
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityGetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityGetParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityGetParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityGetParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityGetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityGetResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityGetResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityGetResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilitySetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilitySetParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilitySetParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilitySetParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilitySetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilitySetResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilitySetResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilitySetResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContext.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContext.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContext.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContextHostType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContextHostType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContextHostType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContextHostType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryResult.java
similarity index 91%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryResult.java
index a50a0b5f53..6dd474df60 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAddSummaryResult.java
@@ -25,7 +25,9 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionWorkspacesAddSummaryResult(
+    /** Metadata for the persisted summary. */
     @JsonProperty("summary") Map<String, Object> summary,
+    /** Refreshed metadata for the containing workspace. */
     @JsonProperty("workspace") Map<String, Object> workspace
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesApi.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesApi.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesApi.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAutopilotObjectiveExistsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAutopilotObjectiveExistsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAutopilotObjectiveExistsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAutopilotObjectiveExistsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAutopilotObjectiveExistsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAutopilotObjectiveExistsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAutopilotObjectiveExistsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesAutopilotObjectiveExistsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesCreateFileParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesCreateFileParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesCreateFileParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesCreateFileParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDeleteAutopilotObjectiveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDeleteAutopilotObjectiveParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDeleteAutopilotObjectiveParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDeleteAutopilotObjectiveParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDeleteAutopilotObjectiveResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDeleteAutopilotObjectiveResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDeleteAutopilotObjectiveResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDeleteAutopilotObjectiveResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureResult.java
similarity index 71%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureResult.java
index 4a810fe121..c2d7e9ce37 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesEnsureResult.java
@@ -34,23 +34,39 @@ public record SessionWorkspacesEnsureResult(
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionWorkspacesEnsureResultWorkspace(
+        /** Stable workspace identifier. */
         @JsonProperty("id") String id,
+        /** Current working directory associated with the workspace. */
         @JsonProperty("cwd") String cwd,
+        /** Git repository root associated with the workspace. */
         @JsonProperty("git_root") String gitRoot,
+        /** Repository identifier associated with the workspace. */
         @JsonProperty("repository") String repository,
         /** Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration. */
         @JsonProperty("host_type") WorkspacesWorkspaceDetailsHostType hostType,
+        /** Current Git branch. */
         @JsonProperty("branch") String branch,
+        /** Workspace display name. */
         @JsonProperty("name") String name,
+        /** Name of the client that created the workspace. */
         @JsonProperty("client_name") String clientName,
+        /** Whether the workspace name was explicitly chosen by the user. */
         @JsonProperty("user_named") Boolean userNamed,
+        /** Number of persisted summaries in the workspace. */
         @JsonProperty("summary_count") Long summaryCount,
+        /** Timestamp when the workspace was created. */
         @JsonProperty("created_at") OffsetDateTime createdAt,
+        /** Timestamp when the workspace was last updated. */
         @JsonProperty("updated_at") OffsetDateTime updatedAt,
+        /** Whether the workspace session can be steered remotely. */
         @JsonProperty("remote_steerable") Boolean remoteSteerable,
+        /** Mission Control task identifier associated with the workspace. */
         @JsonProperty("mc_task_id") String mcTaskId,
+        /** Mission Control session identifier associated with the workspace. */
         @JsonProperty("mc_session_id") String mcSessionId,
+        /** Most recent Mission Control event identifier observed for the workspace. */
         @JsonProperty("mc_last_event_id") String mcLastEventId,
+        /** Whether the per-session Chronicle upgrade prompt was dismissed for the workspace. */
         @JsonProperty("chronicle_sync_dismissed") Boolean chronicleSyncDismissed
     ) {
     }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceResult.java
similarity index 71%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceResult.java
index 217ac7d449..6f4714a594 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesGetWorkspaceResult.java
@@ -34,23 +34,39 @@ public record SessionWorkspacesGetWorkspaceResult(
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionWorkspacesGetWorkspaceResultWorkspace(
+        /** Stable workspace identifier. */
         @JsonProperty("id") String id,
+        /** Current working directory associated with the workspace. */
         @JsonProperty("cwd") String cwd,
+        /** Git repository root associated with the workspace. */
         @JsonProperty("git_root") String gitRoot,
+        /** Repository identifier associated with the workspace. */
         @JsonProperty("repository") String repository,
         /** Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration. */
         @JsonProperty("host_type") WorkspacesWorkspaceDetailsHostType hostType,
+        /** Current Git branch. */
         @JsonProperty("branch") String branch,
+        /** Workspace display name. */
         @JsonProperty("name") String name,
+        /** Name of the client that created the workspace. */
         @JsonProperty("client_name") String clientName,
+        /** Whether the workspace name was explicitly chosen by the user. */
         @JsonProperty("user_named") Boolean userNamed,
+        /** Number of persisted summaries in the workspace. */
         @JsonProperty("summary_count") Long summaryCount,
+        /** Timestamp when the workspace was created. */
         @JsonProperty("created_at") OffsetDateTime createdAt,
+        /** Timestamp when the workspace was last updated. */
         @JsonProperty("updated_at") OffsetDateTime updatedAt,
+        /** Whether the workspace session can be steered remotely. */
         @JsonProperty("remote_steerable") Boolean remoteSteerable,
+        /** Mission Control task identifier associated with the workspace. */
         @JsonProperty("mc_task_id") String mcTaskId,
+        /** Mission Control session identifier associated with the workspace. */
         @JsonProperty("mc_session_id") String mcSessionId,
+        /** Most recent Mission Control event identifier observed for the workspace. */
         @JsonProperty("mc_last_event_id") String mcLastEventId,
+        /** Whether the per-session Chronicle upgrade prompt was dismissed for the workspace. */
         @JsonProperty("chronicle_sync_dismissed") Boolean chronicleSyncDismissed
     ) {
     }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListCheckpointsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListCheckpointsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListCheckpointsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListCheckpointsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListCheckpointsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListCheckpointsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListCheckpointsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListCheckpointsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListFilesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListFilesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListFilesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListFilesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListFilesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListFilesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListFilesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesListFilesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadAutopilotObjectiveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadAutopilotObjectiveParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadAutopilotObjectiveParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadAutopilotObjectiveParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadAutopilotObjectiveResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadAutopilotObjectiveResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadAutopilotObjectiveResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadAutopilotObjectiveResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadCheckpointParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadCheckpointParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadCheckpointParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadCheckpointParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadCheckpointResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadCheckpointResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadCheckpointResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadCheckpointResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadFileParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadFileParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadFileParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadFileParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadFileResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadFileResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadFileResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesReadFileResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesSaveLargePasteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesSaveLargePasteParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesSaveLargePasteParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesSaveLargePasteParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesSaveLargePasteResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesSaveLargePasteResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesSaveLargePasteResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesSaveLargePasteResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesResult.java
similarity index 71%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesResult.java
index caa44d0b7a..1dc348e67e 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesTruncateSummariesResult.java
@@ -34,23 +34,39 @@ public record SessionWorkspacesTruncateSummariesResult(
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionWorkspacesTruncateSummariesResultWorkspace(
+        /** Stable workspace identifier. */
         @JsonProperty("id") String id,
+        /** Current working directory associated with the workspace. */
         @JsonProperty("cwd") String cwd,
+        /** Git repository root associated with the workspace. */
         @JsonProperty("git_root") String gitRoot,
+        /** Repository identifier associated with the workspace. */
         @JsonProperty("repository") String repository,
         /** Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration. */
         @JsonProperty("host_type") WorkspacesWorkspaceDetailsHostType hostType,
+        /** Current Git branch. */
         @JsonProperty("branch") String branch,
+        /** Workspace display name. */
         @JsonProperty("name") String name,
+        /** Name of the client that created the workspace. */
         @JsonProperty("client_name") String clientName,
+        /** Whether the workspace name was explicitly chosen by the user. */
         @JsonProperty("user_named") Boolean userNamed,
+        /** Number of persisted summaries in the workspace. */
         @JsonProperty("summary_count") Long summaryCount,
+        /** Timestamp when the workspace was created. */
         @JsonProperty("created_at") OffsetDateTime createdAt,
+        /** Timestamp when the workspace was last updated. */
         @JsonProperty("updated_at") OffsetDateTime updatedAt,
+        /** Whether the workspace session can be steered remotely. */
         @JsonProperty("remote_steerable") Boolean remoteSteerable,
+        /** Mission Control task identifier associated with the workspace. */
         @JsonProperty("mc_task_id") String mcTaskId,
+        /** Mission Control session identifier associated with the workspace. */
         @JsonProperty("mc_session_id") String mcSessionId,
+        /** Most recent Mission Control event identifier observed for the workspace. */
         @JsonProperty("mc_last_event_id") String mcLastEventId,
+        /** Whether the per-session Chronicle upgrade prompt was dismissed for the workspace. */
         @JsonProperty("chronicle_sync_dismissed") Boolean chronicleSyncDismissed
     ) {
     }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataResult.java
similarity index 71%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataResult.java
index 84ec136616..03731650a8 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesUpdateMetadataResult.java
@@ -34,23 +34,39 @@ public record SessionWorkspacesUpdateMetadataResult(
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionWorkspacesUpdateMetadataResultWorkspace(
+        /** Stable workspace identifier. */
         @JsonProperty("id") String id,
+        /** Current working directory associated with the workspace. */
         @JsonProperty("cwd") String cwd,
+        /** Git repository root associated with the workspace. */
         @JsonProperty("git_root") String gitRoot,
+        /** Repository identifier associated with the workspace. */
         @JsonProperty("repository") String repository,
         /** Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration. */
         @JsonProperty("host_type") WorkspacesWorkspaceDetailsHostType hostType,
+        /** Current Git branch. */
         @JsonProperty("branch") String branch,
+        /** Workspace display name. */
         @JsonProperty("name") String name,
+        /** Name of the client that created the workspace. */
         @JsonProperty("client_name") String clientName,
+        /** Whether the workspace name was explicitly chosen by the user. */
         @JsonProperty("user_named") Boolean userNamed,
+        /** Number of persisted summaries in the workspace. */
         @JsonProperty("summary_count") Long summaryCount,
+        /** Timestamp when the workspace was created. */
         @JsonProperty("created_at") OffsetDateTime createdAt,
+        /** Timestamp when the workspace was last updated. */
         @JsonProperty("updated_at") OffsetDateTime updatedAt,
+        /** Whether the workspace session can be steered remotely. */
         @JsonProperty("remote_steerable") Boolean remoteSteerable,
+        /** Mission Control task identifier associated with the workspace. */
         @JsonProperty("mc_task_id") String mcTaskId,
+        /** Mission Control session identifier associated with the workspace. */
         @JsonProperty("mc_session_id") String mcSessionId,
+        /** Most recent Mission Control event identifier observed for the workspace. */
         @JsonProperty("mc_last_event_id") String mcLastEventId,
+        /** Whether the per-session Chronicle upgrade prompt was dismissed for the workspace. */
         @JsonProperty("chronicle_sync_dismissed") Boolean chronicleSyncDismissed
     ) {
     }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesWriteAutopilotObjectiveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesWriteAutopilotObjectiveParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesWriteAutopilotObjectiveParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesWriteAutopilotObjectiveParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesWriteAutopilotObjectiveResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesWriteAutopilotObjectiveResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesWriteAutopilotObjectiveResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesWriteAutopilotObjectiveResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsBulkDeleteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsBulkDeleteParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsBulkDeleteParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsBulkDeleteParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsBulkDeleteResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsBulkDeleteResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsBulkDeleteResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsBulkDeleteResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsCheckInUseParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCheckInUseParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsCheckInUseParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCheckInUseParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsCheckInUseResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCheckInUseResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsCheckInUseResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCheckInUseResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsCloseParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCloseParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsCloseParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCloseParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsConfigureSessionExtensionsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsConfigureSessionExtensionsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsConfigureSessionExtensionsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsConfigureSessionExtensionsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsConnectParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsConnectParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsConnectParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsConnectParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsConnectResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsConnectResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsConnectResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsConnectResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsDeleteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsDeleteParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsDeleteParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsDeleteParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsEnrichMetadataParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsEnrichMetadataParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsEnrichMetadataParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsEnrichMetadataParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsEnrichMetadataResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsEnrichMetadataResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsEnrichMetadataResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsEnrichMetadataResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByPrefixParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByPrefixParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByPrefixParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByPrefixParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByPrefixResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByPrefixResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByPrefixResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByPrefixResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByTaskIdParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByTaskIdParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByTaskIdParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByTaskIdParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByTaskIdResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByTaskIdResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByTaskIdResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsFindByTaskIdResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsForkParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsForkParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsForkParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsForkParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsForkResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsForkResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsForkResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsForkResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetBoardEntryCountParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetBoardEntryCountParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetBoardEntryCountParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetBoardEntryCountParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetBoardEntryCountResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetBoardEntryCountResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetBoardEntryCountResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetBoardEntryCountResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetEventFilePathParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetEventFilePathParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetEventFilePathParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetEventFilePathParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetEventFilePathResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetEventFilePathResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetEventFilePathResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetEventFilePathResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetLastForContextParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetLastForContextParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetLastForContextParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetLastForContextParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetLastForContextResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetLastForContextResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetLastForContextResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetLastForContextResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetMetadataParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetMetadataParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetMetadataParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetMetadataParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetMetadataResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetMetadataResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetMetadataResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetMetadataResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetPersistedRemoteSteerableParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetPersistedRemoteSteerableParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetPersistedRemoteSteerableParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetPersistedRemoteSteerableParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetPersistedRemoteSteerableResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetPersistedRemoteSteerableResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetPersistedRemoteSteerableResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetPersistedRemoteSteerableResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetRemoteControlStatusResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetRemoteControlStatusResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetRemoteControlStatusResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetRemoteControlStatusResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetSizesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetSizesResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsGetSizesResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsGetSizesResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsListNonEmptySessionIdsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsListNonEmptySessionIdsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsListNonEmptySessionIdsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsListNonEmptySessionIdsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsListNonEmptySessionIdsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsListNonEmptySessionIdsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsListNonEmptySessionIdsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsListNonEmptySessionIdsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsListResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadDeferredRepoHooksParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadDeferredRepoHooksParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadDeferredRepoHooksParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadDeferredRepoHooksParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadDeferredRepoHooksResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadDeferredRepoHooksResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadDeferredRepoHooksResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadDeferredRepoHooksResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenAttach.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenAttach.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenAttach.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenAttach.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenCloud.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenCloud.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenCloud.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenCloud.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenCreate.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenCreate.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenCreate.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenCreate.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenHandoff.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenHandoff.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenHandoff.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenHandoff.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenHandoffTaskType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenHandoffTaskType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenHandoffTaskType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenHandoffTaskType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgress.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgress.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgress.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgress.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgressStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgressStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgressStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgressStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgressStep.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgressStep.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgressStep.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenProgressStep.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenRemote.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenRemote.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenRemote.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenRemote.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResume.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResume.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResume.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResume.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResumeLast.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResumeLast.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResumeLast.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenResumeLast.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenStatus.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenStatus.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsOpenStatus.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsPruneOldParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsPruneOldParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsPruneOldParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsPruneOldParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsPruneOldResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsPruneOldResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsPruneOldResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsPruneOldResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionOptions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionOptions.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionOptions.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionOptions.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsRegisterExtensionToolsOnSessionResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsReleaseLockParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsReleaseLockParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsReleaseLockParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsReleaseLockParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsReloadPluginHooksParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsReloadPluginHooksParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsReloadPluginHooksParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsReloadPluginHooksParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsSaveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsSaveParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsSaveParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsSaveParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsSetAdditionalPluginsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsSetAdditionalPluginsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsSetAdditionalPluginsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsSetAdditionalPluginsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsSetRemoteControlSteeringParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsSetRemoteControlSteeringParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsSetRemoteControlSteeringParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsSetRemoteControlSteeringParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsSetRemoteControlSteeringResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsSetRemoteControlSteeringResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsSetRemoteControlSteeringResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsSetRemoteControlSteeringResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsStartRemoteControlParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsStartRemoteControlParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsStartRemoteControlParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsStartRemoteControlParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsStartRemoteControlResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsStartRemoteControlResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsStartRemoteControlResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsStartRemoteControlResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsStopRemoteControlParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsStopRemoteControlParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsStopRemoteControlParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsStopRemoteControlParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsStopRemoteControlResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsStopRemoteControlResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsStopRemoteControlResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsStopRemoteControlResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsTransferRemoteControlParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsTransferRemoteControlParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsTransferRemoteControlParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsTransferRemoteControlParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionsTransferRemoteControlResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsTransferRemoteControlResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SessionsTransferRemoteControlResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsTransferRemoteControlResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellCredentials.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellCredentials.java
new file mode 100644
index 0000000000..53567c98db
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellCredentials.java
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Command-scoped GitHub credential injection for the shell commands an agent runs.
+
+Each channel is opt-in and independent, and injection is scoped to the individual command
+spawn: the credential is resolved from the session's *current* authentication at every spawn
+and reaches only spawns whose script actually invokes `git` or `gh`. Because nothing is
+retained between spawns, replacing the session credential (`session.gitHubAuth.setCredentials`)
+changes what the next spawned command presents — which seeding a credential into the runtime
+process's own environment cannot do, since a child's environment is fixed at `exec`.
+
+The credential is matched to the host it authenticates to, so a github.com credential is never
+presented to a GitHub Enterprise host and vice versa. Where a channel cannot express that
+boundary it injects nothing rather than crossing it -- see `gh` below.
+
+This is independent of `sandboxConfig`: it is a decision about which identity the agent
+presents, not about what the agent may touch, and it works on every platform whether or not
+an OS sandboxing backend is available. `sandboxConfig.auth` remains the sandbox-scoped
+spelling and is additive with this one.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ShellCredentials(
+    /** Whether to authenticate the agent's `git` commands as the session's GitHub credential, by
+injecting an `http.<host>.extraheader` (plus `insteadOf` rewrites so SSH-spelled remotes for
+that host use the authenticated HTTPS transport). Applied only to a spawn that runs a
+remote-contacting `git` subcommand. Default: false (opt-in). */
+    @JsonProperty("git") Boolean git,
+    /** Whether to authenticate the agent's `gh` commands as the session's GitHub credential, by
+exporting `GH_TOKEN` to a spawn that runs `gh`. Any inherited `gh` credential is removed from
+spawns that do not, so the credential stays command-scoped.
+
+Applies to a github.com credential only. `gh` picks its credential variable from the host a
+command targets rather than the one the credential belongs to, and the command can choose that
+target, so `GH_ENTERPRISE_TOKEN` would offer a single-tenant enterprise credential to every
+other enterprise host. A session whose credential is enterprise-scoped therefore runs `gh`
+unauthenticated; its `git` commands are unaffected, because `http.<host>.extraheader` is scoped
+to one host by construction. Default: false (opt-in). */
+    @JsonProperty("gh") Boolean gh
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ShellInitProfile.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellInitProfile.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ShellInitProfile.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellInitProfile.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ShellInitScript.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellInitScript.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ShellInitScript.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellInitScript.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ShellInitScriptShell.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellInitScriptShell.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ShellInitScriptShell.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellInitScriptShell.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ShellKillSignal.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellKillSignal.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ShellKillSignal.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellKillSignal.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ShellOptions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellOptions.java
similarity index 91%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ShellOptions.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellOptions.java
index 596de0ef98..ea152a59fc 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ShellOptions.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShellOptions.java
@@ -37,6 +37,8 @@ public record ShellOptions(
     /** Flags passed to the active built-in shell process on startup, replacing its default flags.
 When omitted, the built-in Bash shell uses `--norc --noprofile`,
 and the built-in PowerShell shell uses `-NoProfile -NoLogo`. */
-    @JsonProperty("processFlags") List<String> processFlags
+    @JsonProperty("processFlags") List<String> processFlags,
+    /** Command-scoped GitHub credential injection for shell commands. */
+    @JsonProperty("credentials") ShellCredentials credentials
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ShutdownType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShutdownType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ShutdownType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ShutdownType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/Skill.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Skill.java
similarity index 92%
rename from java/src/generated/java/com/github/copilot/generated/rpc/Skill.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/Skill.java
index 4ad4116871..88e7eb1169 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/Skill.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Skill.java
@@ -23,6 +23,8 @@
 public record Skill(
     /** Unique identifier for the skill */
     @JsonProperty("name") String name,
+    /** Canonical slash command name used to invoke the skill, without the leading '/' */
+    @JsonProperty("commandName") String commandName,
     /** Description of what the skill does */
     @JsonProperty("description") String description,
     /** Source location type (e.g., project, personal-copilot, plugin, builtin) */
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SkillDiscoveryPath.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillDiscoveryPath.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SkillDiscoveryPath.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillDiscoveryPath.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SkillDiscoveryScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillDiscoveryScope.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SkillDiscoveryScope.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillDiscoveryScope.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SkillSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillSource.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SkillSource.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillSource.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SkillsConfigSetDisabledSkillsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsConfigSetDisabledSkillsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SkillsConfigSetDisabledSkillsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsConfigSetDisabledSkillsParams.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsConfigSetSkillDisabledParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsConfigSetSkillDisabledParams.java
new file mode 100644
index 0000000000..cce64217c2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsConfigSetSkillDisabledParams.java
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Adds or removes a single skill from the global disabled list, leaving every other entry untouched.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SkillsConfigSetSkillDisabledParams(
+    /** Name of the skill to add to or remove from the disabled list */
+    @JsonProperty("name") String name,
+    /** True to disable the skill, false to enable it */
+    @JsonProperty("disabled") Boolean disabled
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SkillsInvokedSkill.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsInvokedSkill.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SkillsInvokedSkill.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsInvokedSkill.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandAgentPromptResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandAgentPromptResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandAgentPromptResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandAgentPromptResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandCompletedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandCompletedResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandCompletedResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandCompletedResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInfo.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInfo.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInfo.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInput.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInput.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInput.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInput.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInputChoice.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInputChoice.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInputChoice.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInputChoice.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInputCompletion.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInputCompletion.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInputCompletion.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInputCompletion.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResult.java
similarity index 76%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResult.java
index 336c0eda84..9c0d0979cc 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResult.java
@@ -22,7 +22,11 @@
     @JsonSubTypes.Type(value = SlashCommandTextResult.class, name = "text"),
     @JsonSubTypes.Type(value = SlashCommandAgentPromptResult.class, name = "agent-prompt"),
     @JsonSubTypes.Type(value = SlashCommandCompletedResult.class, name = "completed"),
-    @JsonSubTypes.Type(value = SlashCommandSelectSubcommandResult.class, name = "select-subcommand")
+    @JsonSubTypes.Type(value = SlashCommandSelectSubcommandResult.class, name = "select-subcommand"),
+    @JsonSubTypes.Type(value = SlashCommandInvocationResultAddTimelineEntry.class, name = "add-timeline-entry"),
+    @JsonSubTypes.Type(value = SlashCommandInvocationResultShowDialog.class, name = "show-dialog"),
+    @JsonSubTypes.Type(value = SlashCommandInvocationResultSetModel.class, name = "set-model"),
+    @JsonSubTypes.Type(value = SlashCommandInvocationResultSetPlanModel.class, name = "set-plan-model")
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultAddTimelineEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultAddTimelineEntry.java
new file mode 100644
index 0000000000..890ed79664
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultAddTimelineEntry.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code add-timeline-entry} of {@link SlashCommandInvocationResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class SlashCommandInvocationResultAddTimelineEntry extends SlashCommandInvocationResult {
+
+    @JsonProperty("kind")
+    private final String kind = "add-timeline-entry";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Timeline entry the host should append. */
+    @JsonProperty("entry")
+    private SlashCommandTimelineEntry entry;
+
+    /** Optional text the host should prefill into the input editor. */
+    @JsonProperty("prefillInput")
+    private String prefillInput;
+
+    /** Whether command execution changed persisted runtime settings. */
+    @JsonProperty("runtimeSettingsChanged")
+    private Boolean runtimeSettingsChanged;
+
+    public SlashCommandTimelineEntry getEntry() { return entry; }
+    public void setEntry(SlashCommandTimelineEntry entry) { this.entry = entry; }
+
+    public String getPrefillInput() { return prefillInput; }
+    public void setPrefillInput(String prefillInput) { this.prefillInput = prefillInput; }
+
+    public Boolean getRuntimeSettingsChanged() { return runtimeSettingsChanged; }
+    public void setRuntimeSettingsChanged(Boolean runtimeSettingsChanged) { this.runtimeSettingsChanged = runtimeSettingsChanged; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultSetModel.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultSetModel.java
new file mode 100644
index 0000000000..95e4d8544c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultSetModel.java
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code set-model} of {@link SlashCommandInvocationResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class SlashCommandInvocationResultSetModel extends SlashCommandInvocationResult {
+
+    @JsonProperty("kind")
+    private final String kind = "set-model";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Model selected by the command. */
+    @JsonProperty("model")
+    private String model;
+
+    /** Settings scope modified by the command. */
+    @JsonProperty("scope")
+    private String scope;
+
+    /** User-facing warning produced while selecting the model. */
+    @JsonProperty("warning")
+    private String warning;
+
+    /** Reasoning effort selected for the model. */
+    @JsonProperty("reasoningEffort")
+    private String reasoningEffort;
+
+    /** User-settings snapshot to restore if the host cancels the model switch. */
+    @JsonProperty("revertOnCancel")
+    private Map<String, Object> revertOnCancel;
+
+    /** Repository settings scope modified by the command. */
+    @JsonProperty("repoScope")
+    private String repoScope;
+
+    /** Whether command execution changed persisted runtime settings. */
+    @JsonProperty("runtimeSettingsChanged")
+    private Boolean runtimeSettingsChanged;
+
+    public String getModel() { return model; }
+    public void setModel(String model) { this.model = model; }
+
+    public String getScope() { return scope; }
+    public void setScope(String scope) { this.scope = scope; }
+
+    public String getWarning() { return warning; }
+    public void setWarning(String warning) { this.warning = warning; }
+
+    public String getReasoningEffort() { return reasoningEffort; }
+    public void setReasoningEffort(String reasoningEffort) { this.reasoningEffort = reasoningEffort; }
+
+    public Map<String, Object> getRevertOnCancel() { return revertOnCancel; }
+    public void setRevertOnCancel(Map<String, Object> revertOnCancel) { this.revertOnCancel = revertOnCancel; }
+
+    public String getRepoScope() { return repoScope; }
+    public void setRepoScope(String repoScope) { this.repoScope = repoScope; }
+
+    public Boolean getRuntimeSettingsChanged() { return runtimeSettingsChanged; }
+    public void setRuntimeSettingsChanged(Boolean runtimeSettingsChanged) { this.runtimeSettingsChanged = runtimeSettingsChanged; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultSetPlanModel.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultSetPlanModel.java
new file mode 100644
index 0000000000..b57c5a0f52
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultSetPlanModel.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code set-plan-model} of {@link SlashCommandInvocationResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class SlashCommandInvocationResultSetPlanModel extends SlashCommandInvocationResult {
+
+    @JsonProperty("kind")
+    private final String kind = "set-plan-model";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Dedicated model selected for plan mode. */
+    @JsonProperty("planModel")
+    private String planModel;
+
+    /** User-facing confirmation message for the plan-model selection. */
+    @JsonProperty("message")
+    private String message;
+
+    /** Whether command execution changed persisted runtime settings. */
+    @JsonProperty("runtimeSettingsChanged")
+    private Boolean runtimeSettingsChanged;
+
+    public String getPlanModel() { return planModel; }
+    public void setPlanModel(String planModel) { this.planModel = planModel; }
+
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+
+    public Boolean getRuntimeSettingsChanged() { return runtimeSettingsChanged; }
+    public void setRuntimeSettingsChanged(Boolean runtimeSettingsChanged) { this.runtimeSettingsChanged = runtimeSettingsChanged; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultShowDialog.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultShowDialog.java
new file mode 100644
index 0000000000..c8ef4b0702
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandInvocationResultShowDialog.java
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Variant {@code show-dialog} of {@link SlashCommandInvocationResult}.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class SlashCommandInvocationResultShowDialog extends SlashCommandInvocationResult {
+
+    @JsonProperty("kind")
+    private final String kind = "show-dialog";
+
+    @Override
+    public String getKind() { return kind; }
+
+    /** Dialog the host should display. */
+    @JsonProperty("dialog")
+    private SlashCommandModelPickerDialog dialog;
+
+    /** Whether command execution changed persisted runtime settings. */
+    @JsonProperty("runtimeSettingsChanged")
+    private Boolean runtimeSettingsChanged;
+
+    public SlashCommandModelPickerDialog getDialog() { return dialog; }
+    public void setDialog(SlashCommandModelPickerDialog dialog) { this.dialog = dialog; }
+
+    public Boolean getRuntimeSettingsChanged() { return runtimeSettingsChanged; }
+    public void setRuntimeSettingsChanged(Boolean runtimeSettingsChanged) { this.runtimeSettingsChanged = runtimeSettingsChanged; }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandKind.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandKind.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandKind.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandModelPickerDialog.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandModelPickerDialog.java
new file mode 100644
index 0000000000..68ba4d29c5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandModelPickerDialog.java
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SlashCommandModelPickerDialog(
+    /** Discriminator for a model-picker dialog. */
+    @JsonProperty("kind") String kind,
+    /** Model that should be enabled before it can be selected. */
+    @JsonProperty("modelToEnable") String modelToEnable,
+    /** Settings scope the picker should modify. */
+    @JsonProperty("scope") String scope,
+    /** Model-selection target represented by the picker. */
+    @JsonProperty("target") String target
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandSelectSubcommandOption.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandSelectSubcommandOption.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandSelectSubcommandOption.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandSelectSubcommandOption.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandSelectSubcommandResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandSelectSubcommandResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandSelectSubcommandResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandSelectSubcommandResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandTextResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandTextResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SlashCommandTextResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandTextResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandTimelineEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandTimelineEntry.java
new file mode 100644
index 0000000000..a238d7fb67
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SlashCommandTimelineEntry.java
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SlashCommandTimelineEntry(
+    /** Timeline entry presentation type. */
+    @JsonProperty("type") String type,
+    /** Text displayed for the timeline entry. */
+    @JsonProperty("text") String text,
+    /** Optional URL associated with the timeline entry. */
+    @JsonProperty("url") String url
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SubagentSettingsEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SubagentSettingsEntry.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SubagentSettingsEntry.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SubagentSettingsEntry.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SubagentSettingsEntryContextTier.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SubagentSettingsEntryContextTier.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/SubagentSettingsEntryContextTier.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/SubagentSettingsEntryContextTier.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TaskCompletionDecision.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TaskCompletionDecision.java
new file mode 100644
index 0000000000..e8ed6ef167
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TaskCompletionDecision.java
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record TaskCompletionDecision(
+    /** Semantic result of evaluating the task completion request. */
+    @JsonProperty("outcome") TaskCompletionOutcome outcome,
+    /** Rationale for the completion decision, when one is available. */
+    @JsonProperty("reason") String reason,
+    /** Whether the rationale was derived from completion-reviewer output. */
+    @JsonProperty("reviewerDerived") Boolean reviewerDerived,
+    /** Information-flow metadata captured from the completion reviewer. */
+    @JsonProperty("reviewerResultMeta") Object reviewerResultMeta,
+    /** Active autopilot objective evaluated by the completion reviewer. */
+    @JsonProperty("objectiveId") Long objectiveId,
+    /** Whether completion was accepted after the reviewer-rejection budget was exhausted. */
+    @JsonProperty("completionRejectionBudgetExhausted") Boolean completionRejectionBudgetExhausted,
+    /** Objective eligibility token captured when the decision was evaluated. */
+    @JsonProperty("completionEligibilityToken") Long completionEligibilityToken
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TaskCompletionOutcome.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TaskCompletionOutcome.java
new file mode 100644
index 0000000000..18bf78cdc8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TaskCompletionOutcome.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Semantic result of evaluating a task completion request
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum TaskCompletionOutcome {
+    /** The {@code completed} variant. */
+    COMPLETED("completed"),
+    /** The {@code continue} variant. */
+    CONTINUE("continue"),
+    /** The {@code blocked} variant. */
+    BLOCKED("blocked");
+
+    private final String value;
+    TaskCompletionOutcome(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static TaskCompletionOutcome fromValue(String value) {
+        for (TaskCompletionOutcome v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown TaskCompletionOutcome value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TokenAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TokenAuthInfo.java
new file mode 100644
index 0000000000..77f580b862
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TokenAuthInfo.java
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication-info input variant for SDK-configured token authentication, carrying host and the secret token value.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class TokenAuthInfo extends AuthInfo {
+
+    @JsonProperty("type")
+    private final String type = "token";
+
+    @Override
+    public String getType() { return type; }
+
+    /** Authentication host. */
+    @JsonProperty("host")
+    private String host;
+
+    /** The token value itself. Treat as a secret. */
+    @JsonProperty("token")
+    private String token;
+
+    /** Opaque native GitHub credential registration backing this token identity, when applicable. */
+    @JsonProperty("registrationId")
+    private String registrationId;
+
+    /** Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set. */
+    @JsonProperty("copilotUser")
+    private CopilotUserResponse copilotUser;
+
+    public String getHost() { return host; }
+    public void setHost(String host) { this.host = host; }
+
+    public String getToken() { return token; }
+    public void setToken(String token) { this.token = token; }
+
+    public String getRegistrationId() { return registrationId; }
+    public void setRegistrationId(String registrationId) { this.registrationId = registrationId; }
+
+    public CopilotUserResponse getCopilotUser() { return copilotUser; }
+    public void setCopilotUser(CopilotUserResponse copilotUser) { this.copilotUser = copilotUser; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TokenProviderAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TokenProviderAuthInfo.java
new file mode 100644
index 0000000000..6bdb811e2b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/TokenProviderAuthInfo.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication-info variant backed by an SDK GitHub token callback. It carries routing metadata but never a plaintext token.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class TokenProviderAuthInfo extends AuthInfo {
+
+    @JsonProperty("type")
+    private final String type = "token-provider";
+
+    @Override
+    public String getType() { return type; }
+
+    /** Authentication host. */
+    @JsonProperty("host")
+    private String host;
+
+    /** Opaque SDK callback registration identifier. */
+    @JsonProperty("registrationId")
+    private String registrationId;
+
+    /** Snapshot of the authenticated user's Copilot subscription info, if known. */
+    @JsonProperty("copilotUser")
+    private CopilotUserResponse copilotUser;
+
+    public String getHost() { return host; }
+    public void setHost(String host) { this.host = host; }
+
+    public String getRegistrationId() { return registrationId; }
+    public void setRegistrationId(String registrationId) { this.registrationId = registrationId; }
+
+    public CopilotUserResponse getCopilotUser() { return copilotUser; }
+    public void setCopilotUser(CopilotUserResponse copilotUser) { this.copilotUser = copilotUser; }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/Tool.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Tool.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/Tool.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/Tool.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolResultExpanded.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolResultExpanded.java
new file mode 100644
index 0000000000..47527cfec8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolResultExpanded.java
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Expanded canonical result returned by a session tool.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ToolResultExpanded(
+    /** Text result returned to the model. */
+    @JsonProperty("textResultForLlm") String textResultForLlm,
+    /** Execution outcome classification. */
+    @JsonProperty("resultType") ToolResultType resultType,
+    /** Base64-encoded binary results returned to the model. */
+    @JsonProperty("binaryResultsForLlm") List<ExternalToolTextResultForLlmBinaryResultsForLlm> binaryResultsForLlm,
+    /** Detailed log content available for session display. */
+    @JsonProperty("sessionLog") String sessionLog,
+    /** Error message for an unsuccessful execution. */
+    @JsonProperty("error") String error,
+    /** Tool-specific telemetry payload. */
+    @JsonProperty("toolTelemetry") Object toolTelemetry,
+    /** Whether large-output post-processing should be skipped. */
+    @JsonProperty("skipLargeOutputProcessing") Boolean skipLargeOutputProcessing,
+    /** Messages to inject after the tool result. */
+    @JsonProperty("newMessages") List<ToolResultNewMessage> newMessages,
+    /** Structured content blocks returned to the model. */
+    @JsonProperty("contents") List<Object> contents,
+    /** Deferred tool names made available by this result. */
+    @JsonProperty("toolReferences") List<String> toolReferences,
+    /** Sources returned by the tool that the model may cite. */
+    @JsonProperty("citableSources") List<Object> citableSources,
+    /** Skill invocation metadata produced by the tool. */
+    @JsonProperty("skillInvocation") Object skillInvocation,
+    /** Whether post-tool-use failure hooks have already processed this result. */
+    @JsonProperty("postToolUseFailureHooksProcessed") Boolean postToolUseFailureHooksProcessed,
+    /** Optional UI resource produced by the tool. */
+    @JsonProperty("uiResource") Object uiResource,
+    /** Metadata propagated with the tool result, including information-flow labels. */
+    @JsonProperty("mcpMeta") Map<String, Object> mcpMeta,
+    /** Structured result content in addition to the model-facing text. */
+    @JsonProperty("structuredContent") Object structuredContent,
+    /** Completion-review decision produced by the task-completion tool. */
+    @JsonProperty("taskCompletionDecision") TaskCompletionDecision taskCompletionDecision
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolResultNewMessage.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolResultNewMessage.java
new file mode 100644
index 0000000000..da203a0e98
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolResultNewMessage.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * A message injected by a tool result.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ToolResultNewMessage(
+    /** Message content to inject after the tool result. */
+    @JsonProperty("content") String content,
+    /** Source attributed to the injected message. */
+    @JsonProperty("source") String source
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolResultType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolResultType.java
new file mode 100644
index 0000000000..bc3b5ae2ac
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolResultType.java
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Execution outcome classification.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ToolResultType {
+    /** The {@code success} variant. */
+    SUCCESS("success"),
+    /** The {@code failure} variant. */
+    FAILURE("failure"),
+    /** The {@code timeout} variant. */
+    TIMEOUT("timeout"),
+    /** The {@code rejected} variant. */
+    REJECTED("rejected"),
+    /** The {@code denied} variant. */
+    DENIED("denied");
+
+    private final String value;
+    ToolResultType(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ToolResultType fromValue(String value) {
+        for (ToolResultType v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ToolResultType value: " + value);
+    }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ToolsListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolsListParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ToolsListParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolsListParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ToolsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolsListResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/ToolsListResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolsListResult.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolsShellDescriptorConfig.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolsShellDescriptorConfig.java
new file mode 100644
index 0000000000..fdd5a716a5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ToolsShellDescriptorConfig.java
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Shell-specific names and description lines used to materialize built-in shell tool descriptors.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ToolsShellDescriptorConfig(
+    /** Stable shell type identifier. */
+    @JsonProperty("shellType") String shellType,
+    /** Human-readable shell name. */
+    @JsonProperty("displayName") String displayName,
+    /** Tool name used to start shell commands. */
+    @JsonProperty("shellToolName") String shellToolName,
+    /** Tool name used to read shell output. */
+    @JsonProperty("readShellToolName") String readShellToolName,
+    /** Tool name used to stop shell commands. */
+    @JsonProperty("stopShellToolName") String stopShellToolName,
+    /** Tool name used to list active shells. */
+    @JsonProperty("listShellsToolName") String listShellsToolName,
+    /** Additional model-facing shell description lines. */
+    @JsonProperty("descriptionLines") List<String> descriptionLines
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UIAutoModeSwitchResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIAutoModeSwitchResponse.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UIAutoModeSwitchResponse.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIAutoModeSwitchResponse.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponse.java
similarity index 87%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponse.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponse.java
index e157ee727b..d611a8b447 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponse.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponse.java
@@ -25,6 +25,8 @@ public record UIElicitationResponse(
     /** The user's response: accept (submitted), decline (rejected), or cancel (dismissed) */
     @JsonProperty("action") UIElicitationResponseAction action,
     /** The form values submitted by the user (present when action is 'accept') */
-    @JsonProperty("content") Map<String, Object> content
+    @JsonProperty("content") Map<String, Object> content,
+    /** MCP response metadata. */
+    @JsonProperty("_meta") Map<String, Map<String, Object>> meta
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponseAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponseAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponseAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIElicitationResponseAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UIElicitationSchema.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIElicitationSchema.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UIElicitationSchema.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIElicitationSchema.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UIExitPlanModeAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIExitPlanModeAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UIExitPlanModeAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIExitPlanModeAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UIExitPlanModeResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIExitPlanModeResponse.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UIExitPlanModeResponse.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIExitPlanModeResponse.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UIHandlePendingSamplingResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIHandlePendingSamplingResponse.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UIHandlePendingSamplingResponse.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIHandlePendingSamplingResponse.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UISessionLimitsExhaustedResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UISessionLimitsExhaustedResponse.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UISessionLimitsExhaustedResponse.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UISessionLimitsExhaustedResponse.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UISessionLimitsExhaustedResponseAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UISessionLimitsExhaustedResponseAction.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UISessionLimitsExhaustedResponseAction.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UISessionLimitsExhaustedResponseAction.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UIUserInputResponse.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIUserInputResponse.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UIUserInputResponse.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UIUserInputResponse.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsAgentMetric.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsAgentMetric.java
new file mode 100644
index 0000000000..457ba2109e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsAgentMetric.java
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageMetricsAgentMetric(
+    /** Configured agent name, when this is a subagent */
+    @JsonProperty("agentName") String agentName,
+    /** Human-readable label for this subagent invocation, copied from the originating `subagent.started` event. For task-tool subagents this is the invocation's task description rather than the agent's configured display name, so group by `agentName` for stable per-agent labels. */
+    @JsonProperty("agentDisplayName") String agentDisplayName,
+    /** Time spent in model API calls by this agent, in milliseconds */
+    @JsonProperty("totalApiDurationMs") Long totalApiDurationMs,
+    /** Accumulated nano-AI units cost for this agent */
+    @JsonProperty("totalNanoAiu") Double totalNanoAiu,
+    /** Per-model usage for this agent, keyed by model identifier */
+    @JsonProperty("modelMetrics") Map<String, UsageMetricsModelMetric> modelMetrics
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsCodeChanges.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsCodeChanges.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsCodeChanges.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsCodeChanges.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetric.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetric.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetric.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetric.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricRequests.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricRequests.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricRequests.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricRequests.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricTokenDetail.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricTokenDetail.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricTokenDetail.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricTokenDetail.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricUsage.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricUsage.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricUsage.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetricUsage.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsTokenDetail.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsTokenDetail.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsTokenDetail.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsTokenDetail.java
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserAuthInfo.java
new file mode 100644
index 0000000000..6f136a17c2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserAuthInfo.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authentication-info variant for OAuth user auth, with host and login; the token remains in the runtime secret store.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class UserAuthInfo extends AuthInfo {
+
+    @JsonProperty("type")
+    private final String type = "user";
+
+    @Override
+    public String getType() { return type; }
+
+    /** Authentication host. */
+    @JsonProperty("host")
+    private String host;
+
+    /** OAuth user login. */
+    @JsonProperty("login")
+    private String login;
+
+    /** Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set. */
+    @JsonProperty("copilotUser")
+    private CopilotUserResponse copilotUser;
+
+    public String getHost() { return host; }
+    public void setHost(String host) { this.host = host; }
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+
+    public CopilotUserResponse getCopilotUser() { return copilotUser; }
+    public void setCopilotUser(CopilotUserResponse copilotUser) { this.copilotUser = copilotUser; }
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UserSettingMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingMetadata.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UserSettingMetadata.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingMetadata.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetParams.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetParams.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetParams.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetResult.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetResult.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/Verbosity.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Verbosity.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/Verbosity.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/Verbosity.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChange.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChange.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChange.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChange.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChangeType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChangeType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChangeType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChangeType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffMode.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffMode.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffMode.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/WorkspaceSummaryHostType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceSummaryHostType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/WorkspaceSummaryHostType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceSummaryHostType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/WorkspacesCheckpoints.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspacesCheckpoints.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/WorkspacesCheckpoints.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspacesCheckpoints.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/WorkspacesWorkspaceDetailsHostType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspacesWorkspaceDetailsHostType.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/WorkspacesWorkspaceDetailsHostType.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspacesWorkspaceDetailsHostType.java
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/package-info.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/package-info.java
similarity index 100%
rename from java/src/generated/java/com/github/copilot/generated/rpc/package-info.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/package-info.java
diff --git a/java/src/main/java/com/github/copilot/AllowCopilotExperimental.java b/java/sdk/src/main/java/com/github/copilot/AllowCopilotExperimental.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/AllowCopilotExperimental.java
rename to java/sdk/src/main/java/com/github/copilot/AllowCopilotExperimental.java
diff --git a/java/src/main/java/com/github/copilot/CliServerManager.java b/java/sdk/src/main/java/com/github/copilot/CliServerManager.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CliServerManager.java
rename to java/sdk/src/main/java/com/github/copilot/CliServerManager.java
diff --git a/java/src/main/java/com/github/copilot/ConnectionState.java b/java/sdk/src/main/java/com/github/copilot/ConnectionState.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/ConnectionState.java
rename to java/sdk/src/main/java/com/github/copilot/ConnectionState.java
diff --git a/java/src/main/java/com/github/copilot/CopilotClient.java b/java/sdk/src/main/java/com/github/copilot/CopilotClient.java
similarity index 75%
rename from java/src/main/java/com/github/copilot/CopilotClient.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotClient.java
index 44878b87ec..ea2b0b67dd 100644
--- a/java/src/main/java/com/github/copilot/CopilotClient.java
+++ b/java/sdk/src/main/java/com/github/copilot/CopilotClient.java
@@ -5,8 +5,11 @@
 package com.github.copilot;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,8 +24,15 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.github.copilot.ffi.FfiRuntimeHost;
+import com.github.copilot.ffi.NativeRuntimeLoader;
 import com.github.copilot.rpc.CopilotClientMode;
 import com.github.copilot.rpc.CopilotClientOptions;
+import com.github.copilot.rpc.InProcessRuntimeConnection;
+import com.github.copilot.rpc.RuntimeConnection;
+import com.github.copilot.rpc.StdioRuntimeConnection;
+import com.github.copilot.rpc.TcpRuntimeConnection;
+import com.github.copilot.rpc.UriRuntimeConnection;
 import com.github.copilot.rpc.CreateSessionResponse;
 import com.github.copilot.generated.rpc.SessionOptionsUpdateParams;
 import com.github.copilot.generated.rpc.SessionInstalledPlugin;
@@ -107,11 +117,14 @@ public final class CopilotClient implements AutoCloseable {
     private final CliServerManager serverManager;
     private final LifecycleEventManager lifecycleManager = new LifecycleEventManager();
     private final Map<String, CopilotSession> sessions = new ConcurrentHashMap<>();
+    private final GitHubTokenProviderRegistry gitHubTokenProviders = new GitHubTokenProviderRegistry();
     private volatile CompletableFuture<Connection> connectionFuture;
     private volatile boolean disposed = false;
     private final String optionsHost;
     private final Integer optionsPort;
+    private final RuntimeConnection runtimeConnection;
     private final String effectiveConnectionToken;
+    private final Runnable closeHook;
     private volatile List<ModelInfo> modelsCache;
     private final Object modelsCacheLock = new Object();
 
@@ -131,7 +144,30 @@ public CopilotClient() {
      *             if mutually exclusive options are provided
      */
     public CopilotClient(CopilotClientOptions options) {
+        this(options, null);
+    }
+
+    CopilotClient(CopilotClientOptions options, Runnable closeHook) {
         this.options = options != null ? options : new CopilotClientOptions();
+        this.closeHook = closeHook;
+
+        // Resolve the transport: an explicit RuntimeConnection wins; otherwise the
+        // COPILOT_SDK_DEFAULT_CONNECTION env var, or the individual transport options.
+        RuntimeConnection requestedConnection = this.options.getConnection();
+        if (requestedConnection != null) {
+            validateEnvironmentOptions(this.options, requestedConnection);
+            validateConnectionConflicts(this.options, requestedConnection);
+            applyConnection(this.options, requestedConnection);
+        } else {
+            requestedConnection = resolveDefaultConnection(this.options);
+            validateEnvironmentOptions(this.options, requestedConnection);
+            // When the env var overrides inference (e.g. inprocess), validate that
+            // no legacy transport options conflict with the resolved connection.
+            if (requestedConnection != null) {
+                validateConnectionConflicts(this.options, requestedConnection);
+            }
+        }
+        this.runtimeConnection = requestedConnection;
 
         // When cliUrl is set, auto-correct useStdio since we're connecting via TCP
         if (this.options.getCliUrl() != null && !this.options.getCliUrl().isEmpty()) {
@@ -199,6 +235,275 @@ public CopilotClient(CopilotClientOptions options) {
         this.serverManager.setConnectionToken(this.effectiveConnectionToken);
     }
 
+    /**
+     * Environment variable that overrides the transport used when the caller does
+     * not set {@link CopilotClientOptions#setConnection(RuntimeConnection)}.
+     * Accepts {@code "inprocess"} or {@code "stdio"} (case-insensitive); unset
+     * keeps the transport selected by the individual transport options. Any other
+     * value is an error. Ignored when a connection is set explicitly.
+     */
+    static final String DEFAULT_CONNECTION_ENV_VAR = "COPILOT_SDK_DEFAULT_CONNECTION";
+
+    /**
+     * Resolves the connection to use when the caller did not set one, honoring
+     * {@link #DEFAULT_CONNECTION_ENV_VAR} and otherwise inferring the transport
+     * from the individual transport options.
+     */
+    private static RuntimeConnection resolveDefaultConnection(CopilotClientOptions options) {
+        return resolveDefaultConnection(options, System.getenv(DEFAULT_CONNECTION_ENV_VAR));
+    }
+
+    /**
+     * Resolves the default connection from an explicit environment-variable value.
+     * Package-private so tests can supply the value directly.
+     */
+    static RuntimeConnection resolveDefaultConnection(CopilotClientOptions options, String envValue) {
+        if (envValue != null && !envValue.isEmpty()) {
+            if ("inprocess".equalsIgnoreCase(envValue)) {
+                // Explicit subprocess options take precedence over the env var default.
+                if (options.getCliUrl() != null && !options.getCliUrl().isEmpty()) {
+                    return inferConnectionFromOptions(options);
+                }
+                if (options.getCliPath() != null && !options.getCliPath().isEmpty()) {
+                    return inferConnectionFromOptions(options);
+                }
+                if (options.getPort() != 0) {
+                    return inferConnectionFromOptions(options);
+                }
+                if (!options.isUseStdio() || options.getTcpConnectionToken() != null) {
+                    return inferConnectionFromOptions(options);
+                }
+                return RuntimeConnection.forInProcess();
+            }
+            if (!"stdio".equalsIgnoreCase(envValue)) {
+                throw new IllegalArgumentException("Invalid " + DEFAULT_CONNECTION_ENV_VAR + " value '" + envValue
+                        + "'. Expected 'inprocess', 'stdio', or unset.");
+            }
+        }
+
+        return inferConnectionFromOptions(options);
+    }
+
+    /**
+     * Maps the individual transport options onto the equivalent
+     * {@link RuntimeConnection}, preserving the behavior of clients written before
+     * connections existed.
+     */
+    private static RuntimeConnection inferConnectionFromOptions(CopilotClientOptions options) {
+        String cliUrl = options.getCliUrl();
+        List<String> args = options.getCliArgs() != null ? Arrays.asList(options.getCliArgs()) : null;
+        if (cliUrl != null && !cliUrl.isEmpty()) {
+            return RuntimeConnection.forUri(cliUrl).setConnectionToken(options.getTcpConnectionToken());
+        }
+        if (options.isUseStdio()) {
+            StdioRuntimeConnection stdio = RuntimeConnection.forStdio(options.getCliPath());
+            if (args != null) {
+                stdio.setArgs(args);
+            }
+            return stdio;
+        }
+        TcpRuntimeConnection tcp = RuntimeConnection.forTcp().setPath(options.getCliPath()).setPort(options.getPort())
+                .setConnectionToken(options.getTcpConnectionToken());
+        if (args != null) {
+            tcp.setArgs(args);
+        }
+        return tcp;
+    }
+
+    /**
+     * Rejects transport options that contradict the configured connection. Values
+     * that match what the connection implies are accepted so that constructing
+     * several clients from the same options instance stays valid.
+     */
+    private static void validateConnectionConflicts(CopilotClientOptions options, RuntimeConnection connection) {
+        String impliedPath = null;
+        String impliedUrl = null;
+        String impliedToken = null;
+        int impliedPort = 0;
+        boolean impliedUseStdio = true;
+        List<String> impliedArgs = null;
+
+        if (connection instanceof StdioRuntimeConnection stdio) {
+            impliedPath = stdio.getPath();
+            impliedArgs = stdio.getArgs();
+        } else if (connection instanceof TcpRuntimeConnection tcp) {
+            impliedPath = tcp.getPath();
+            impliedPort = tcp.getPort();
+            impliedToken = tcp.getConnectionToken();
+            impliedArgs = tcp.getArgs();
+            impliedUseStdio = false;
+        } else if (connection instanceof UriRuntimeConnection uri) {
+            impliedUrl = uri.getUrl();
+            impliedToken = uri.getConnectionToken();
+            impliedUseStdio = false;
+        }
+
+        rejectConflict("CliPath", options.getCliPath() != null && !options.getCliPath().equals(impliedPath));
+        rejectConflict("CliUrl", options.getCliUrl() != null && !options.getCliUrl().isEmpty()
+                && !options.getCliUrl().equals(impliedUrl));
+        rejectConflict("Port", options.getPort() != 0 && options.getPort() != impliedPort);
+        rejectConflict("TcpConnectionToken",
+                options.getTcpConnectionToken() != null && !options.getTcpConnectionToken().equals(impliedToken));
+        rejectConflict("UseStdio", !options.isUseStdio() && impliedUseStdio);
+        rejectConflict("CliArgs", options.getCliArgs() != null
+                && !Arrays.asList(options.getCliArgs()).equals(impliedArgs == null ? List.of() : impliedArgs));
+    }
+
+    private static void rejectConflict(String optionName, boolean conflicting) {
+        if (conflicting) {
+            throw new IllegalArgumentException("CopilotClientOptions." + optionName
+                    + " cannot be combined with CopilotClientOptions.setConnection(); configure the transport on the"
+                    + " RuntimeConnection instead.");
+        }
+    }
+
+    /**
+     * Projects the configured connection onto the individual transport options so
+     * that the rest of the client sees a single, consistent view of the transport.
+     */
+    private static void applyConnection(CopilotClientOptions options, RuntimeConnection connection) {
+        if (connection instanceof StdioRuntimeConnection stdio) {
+            options.setUseStdio(true);
+            if (stdio.getPath() != null) {
+                options.setCliPath(stdio.getPath());
+            }
+            applyConnectionArgs(options, stdio.getArgs());
+        } else if (connection instanceof TcpRuntimeConnection tcp) {
+            options.setUseStdio(false);
+            if (tcp.getPath() != null) {
+                options.setCliPath(tcp.getPath());
+            }
+            options.setPort(tcp.getPort());
+            if (tcp.getConnectionToken() != null) {
+                options.setTcpConnectionToken(tcp.getConnectionToken());
+            }
+            applyConnectionArgs(options, tcp.getArgs());
+        } else if (connection instanceof UriRuntimeConnection uri) {
+            options.setUseStdio(false);
+            options.setCliUrl(uri.getUrl());
+            if (uri.getConnectionToken() != null) {
+                options.setTcpConnectionToken(uri.getConnectionToken());
+            }
+        }
+    }
+
+    private static void applyConnectionArgs(CopilotClientOptions options, List<String> args) {
+        if (args != null) {
+            options.setCliArgs(args.toArray(new String[0]));
+        }
+    }
+
+    /**
+     * Rejects per-process options that the in-process transport cannot honor. These
+     * options are lowered onto a child process, but the in-process runtime runs
+     * inside the shared host process, whose single environment and working
+     * directory cannot carry per-client values.
+     */
+    private static void validateEnvironmentOptions(CopilotClientOptions options, RuntimeConnection connection) {
+        if (!(connection instanceof InProcessRuntimeConnection)) {
+            return;
+        }
+
+        rejectInProcessOption("Environment", options.getEnvironment() != null && !options.getEnvironment().isEmpty(),
+                "set the variables on the host process environment instead");
+        rejectInProcessOption("Telemetry", options.getTelemetry() != null,
+                "configure telemetry through the host process environment instead");
+        rejectInProcessOption("Cwd", options.getCwd() != null,
+                "set the process working directory before creating the client instead");
+        rejectInProcessOption("CliArgs", options.getCliArgs() != null && options.getCliArgs().length > 0,
+                "use the typed client options instead");
+    }
+
+    private static void rejectInProcessOption(String optionName, boolean present, String remedy) {
+        if (present) {
+            throw new IllegalArgumentException("CopilotClientOptions." + optionName
+                    + " is not supported with RuntimeConnection.forInProcess(): the in-process runtime shares the host"
+                    + " process, so per-client values cannot be honored; " + remedy + ".");
+        }
+    }
+
+    /**
+     * Duplex streams of an in-process runtime, together with the resource that owns
+     * its lifetime.
+     *
+     * @param receiveStream
+     *            stream carrying messages from the runtime
+     * @param sendStream
+     *            stream carrying messages to the runtime
+     * @param host
+     *            resource closed when the client stops
+     */
+    record InProcessTransport(InputStream receiveStream, OutputStream sendStream, AutoCloseable host) {
+    }
+
+    /**
+     * Opens the transport for the in-process runtime. Package-private so tests can
+     * substitute a fake for the native runtime.
+     */
+    @FunctionalInterface
+    interface InProcessTransportFactory {
+        /**
+         * Opens the in-process transport.
+         *
+         * @param options
+         *            client options used to configure the runtime
+         * @return the opened transport
+         * @throws IOException
+         *             if the runtime cannot be started
+         */
+        InProcessTransport open(CopilotClientOptions options) throws IOException;
+    }
+
+    private volatile InProcessTransportFactory inProcessTransportFactory = CopilotClient::openInProcessTransport;
+
+    /**
+     * Returns the resolved connection describing how this client reaches the
+     * runtime. Package-private test seam.
+     *
+     * @return the resolved connection
+     */
+    RuntimeConnection getRuntimeConnection() {
+        return runtimeConnection;
+    }
+
+    /**
+     * Replaces the in-process transport factory. Package-private test seam.
+     *
+     * @param factory
+     *            the factory to use
+     */
+    void setInProcessTransportFactory(InProcessTransportFactory factory) {
+        this.inProcessTransportFactory = java.util.Objects.requireNonNull(factory, "factory must not be null");
+    }
+
+    private static InProcessTransport openInProcessTransport(CopilotClientOptions options) throws IOException {
+        FfiRuntimeHost host = new FfiRuntimeHost();
+        try {
+            host.start(resolveInProcessEntrypoint(), options);
+        } catch (RuntimeException | Error e) {
+            host.close();
+            throw e;
+        }
+        return new InProcessTransport(host.getReceiveStream(), host.getSendStream(), host);
+    }
+
+    /**
+     * Resolves the runtime entrypoint handed to the in-process host. The copilot
+     * CLI executable is resolved from the same bundled location as
+     * {@code runtime.node} — no environment variables or PATH search.
+     */
+    private static String resolveInProcessEntrypoint() throws IOException {
+        return NativeRuntimeLoader.resolveEntrypoint().toString();
+    }
+
+    private static void closeRuntimeHost(AutoCloseable host) {
+        try {
+            host.close();
+        } catch (Exception e) {
+            LOG.log(Level.FINE, "Error closing in-process runtime host", e);
+        }
+    }
+
     /**
      * Starts the Copilot client and connects to the server.
      *
@@ -227,11 +532,15 @@ private CompletableFuture<Connection> startCore() {
 
     private Connection startCoreBody() {
         Process process = null;
+        JsonRpcClient rpc = null;
+        InProcessTransport inProcessTransport = null;
         long startNanos = System.nanoTime();
         try {
-            JsonRpcClient rpc;
-
-            if (optionsHost != null && optionsPort != null) {
+            if (runtimeConnection instanceof InProcessRuntimeConnection) {
+                // In-process runtime hosted in this process (no child process)
+                inProcessTransport = inProcessTransportFactory.open(options);
+                rpc = JsonRpcClient.fromStreams(inProcessTransport.receiveStream(), inProcessTransport.sendStream());
+            } else if (optionsHost != null && optionsPort != null) {
                 // External server (TCP)
                 rpc = serverManager.connectToServer(null, optionsHost, optionsPort);
             } else {
@@ -245,11 +554,14 @@ private Connection startCoreBody() {
             LoggingHelpers.logTiming(LOG, Level.FINE, "CopilotClient.start transport setup complete. Elapsed={Elapsed}",
                     startNanos);
 
-            Connection connection = new Connection(rpc, process, new ServerRpc(rpc::invoke));
+            JsonRpcClient connectedRpc = rpc;
+            Connection connection = new Connection(connectedRpc, process, new ServerRpc(connectedRpc::invoke),
+                    inProcessTransport == null ? null : inProcessTransport.host());
 
             // Register handlers for server-to-client calls
-            RpcHandlerDispatcher dispatcher = new RpcHandlerDispatcher(sessions, lifecycleManager::dispatch, executor);
-            dispatcher.registerHandlers(rpc);
+            RpcHandlerDispatcher dispatcher = new RpcHandlerDispatcher(sessions, lifecycleManager::dispatch, executor,
+                    gitHubTokenProviders);
+            dispatcher.registerHandlers(connectedRpc);
 
             // Register the LLM inference request handler when configured.
             com.github.copilot.CopilotRequestHandler requestHandler = this.options.getRequestHandler();
@@ -257,7 +569,7 @@ private Connection startCoreBody() {
             if (hasLlmInference) {
                 LlmInferenceAdapter llmAdapter = new LlmInferenceAdapter(requestHandler,
                         () -> connection.serverRpc().llmInference, executor);
-                llmAdapter.registerHandlers(rpc);
+                llmAdapter.registerHandlers(connectedRpc);
             }
 
             // Register the GitHub telemetry forwarding handler when configured.
@@ -265,7 +577,7 @@ private Connection startCoreBody() {
                     .getOnGitHubTelemetry();
             if (onGitHubTelemetry != null) {
                 GitHubTelemetryAdapter telemetryAdapter = new GitHubTelemetryAdapter(onGitHubTelemetry);
-                telemetryAdapter.registerHandlers(rpc);
+                telemetryAdapter.registerHandlers(connectedRpc);
             }
 
             // Verify protocol version
@@ -273,6 +585,15 @@ private Connection startCoreBody() {
             LoggingHelpers.logTiming(LOG, Level.FINE,
                     "CopilotClient.start protocol verification complete. Elapsed={Elapsed}", startNanos);
 
+            var builtinPluginDirectories = options.getBuiltinPluginDirectories();
+            if (builtinPluginDirectories != null && !builtinPluginDirectories.isEmpty()) {
+                var paths = new ArrayList<String>(builtinPluginDirectories.size());
+                for (var path : builtinPluginDirectories) {
+                    paths.add(path.toString());
+                }
+                connection.rpc.invoke("plugins.builtin.set", Map.of("paths", paths), Void.class).join();
+            }
+
             // Register as the runtime's LLM inference provider once connected.
             if (hasLlmInference) {
                 connection.serverRpc().llmInference.setProvider().join();
@@ -289,6 +610,16 @@ private Connection startCoreBody() {
             if (process != null) {
                 cleanupCliProcess(process, true);
             }
+            if (rpc != null) {
+                try {
+                    rpc.close();
+                } catch (Exception closeError) {
+                    LOG.log(Level.FINE, "Error closing RPC after failed startup", closeError);
+                }
+            }
+            if (inProcessTransport != null) {
+                closeRuntimeHost(inProcessTransport.host());
+            }
             String stderr = serverManager.getStderrOutput();
             if (!stderr.isEmpty()) {
                 throw new CompletionException(new IOException(
@@ -398,6 +729,7 @@ public CompletableFuture<Void> stop() {
             closeFutures.add(future);
         }
         sessions.clear();
+        gitHubTokenProviders.clear();
 
         return CompletableFuture.allOf(closeFutures.toArray(new CompletableFuture[0]))
                 .thenCompose(v -> cleanupConnection(true));
@@ -411,6 +743,7 @@ public CompletableFuture<Void> stop() {
     public CompletableFuture<Void> forceStop() {
         disposed = true;
         sessions.clear();
+        gitHubTokenProviders.clear();
         // Dispatch the blocking shutdownOwnedExecutor() on a dedicated thread:
         // cleanupConnection() is chained off async work running on the owned
         // executor, so a plain whenComplete(...) here could land the awaitTermination
@@ -438,7 +771,7 @@ private CompletableFuture<Void> cleanupConnection(boolean gracefulRuntimeShutdow
             }
 
             CompletableFuture<Void> shutdownFuture = CompletableFuture.completedFuture(null);
-            if (gracefulRuntimeShutdown && connection.process != null) {
+            if (gracefulRuntimeShutdown && (connection.process != null || connection.runtimeHost != null)) {
                 long runtimeShutdownStartNanos = System.nanoTime();
                 shutdownFuture = connection.rpc.invoke("runtime.shutdown", Map.of(), Void.class)
                         .orTimeout(RUNTIME_SHUTDOWN_TIMEOUT_SECONDS, TimeUnit.SECONDS)
@@ -465,6 +798,9 @@ private CompletableFuture<Void> cleanupConnection(boolean gracefulRuntimeShutdow
                 if (connection.process != null) {
                     cleanupCliProcess(connection.process, !gracefulRuntimeShutdown || error != null);
                 }
+                if (connection.runtimeHost != null) {
+                    closeRuntimeHost(connection.runtimeHost);
+                }
                 return (Void) null;
             });
         }).thenCompose(result -> result);
@@ -541,6 +877,10 @@ public CompletableFuture<CopilotSession> createSession(SessionConfig config) {
                             + "For example, to allow all permissions, use: "
                             + "new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)"));
         }
+        if (config.getGitHubToken() != null && config.getGitHubTokenProvider() != null) {
+            return CompletableFuture.failedFuture(
+                    new IllegalArgumentException("gitHubToken and gitHubTokenProvider are mutually exclusive"));
+        }
         return ensureConnected().thenCompose(connection -> {
             long totalNanos = System.nanoTime();
             // For cloud sessions, let the CLI/server assign the session id
@@ -646,6 +986,16 @@ public CompletableFuture<CopilotSession> createSession(SessionConfig config) {
                 }
             }
 
+            GitHubTokenProviderRegistry.Registration tokenRegistration = config.getGitHubTokenProvider() == null
+                    ? null
+                    : gitHubTokenProviders.register(config.getGitHubTokenProvider());
+            if (tokenRegistration != null) {
+                request.setGitHubTokenProviderRegistrationId(tokenRegistration.id());
+                if (preRegisteredSessionHolder[0] != null) {
+                    preRegisteredSessionHolder[0].setGitHubTokenProviderRegistration(tokenRegistration);
+                }
+            }
+
             long rpcNanos = System.nanoTime();
             return connection.rpc.invoke("session.create", request, CreateSessionResponse.class)
                     .thenCompose(response -> {
@@ -664,6 +1014,9 @@ public CompletableFuture<CopilotSession> createSession(SessionConfig config) {
                         CopilotSession session = preRegisteredSessionHolder[0] != null
                                 ? preRegisteredSessionHolder[0]
                                 : initializeSession.apply(returnedId);
+                        if (tokenRegistration != null) {
+                            session.setGitHubTokenProviderRegistration(tokenRegistration);
+                        }
                         registeredIdHolder[0] = returnedId;
                         CompletableFuture<?> interest = config.getOnMcpAuthRequest() != null
                                 ? session.getRpc().eventLog.registerInterest(
@@ -678,8 +1031,13 @@ public CompletableFuture<CopilotSession> createSession(SessionConfig config) {
                             return updateSessionOptionsForMode(session, config.getSkipCustomInstructions().orElse(null),
                                     config.getCustomAgentsLocalOnly().orElse(null),
                                     config.getCoauthorEnabled().orElse(null),
-                                    config.getManageScheduleEnabled().orElse(null));
+                                    config.getManageScheduleEnabled().orElse(null), config.getIncludedBuiltinSkills());
                         }).thenApply(v -> {
+                            if (tokenRegistration != null) {
+                                tokenRegistration.claim(session.getSessionId());
+                            } else {
+                                gitHubTokenProviders.retire(session.getSessionId());
+                            }
                             LoggingHelpers.logTiming(LOG, Level.FINE,
                                     "CopilotClient.createSession complete. Elapsed={Elapsed}, SessionId="
                                             + session.getSessionId(),
@@ -690,6 +1048,9 @@ public CompletableFuture<CopilotSession> createSession(SessionConfig config) {
                         if (registeredIdHolder[0] != null) {
                             sessions.remove(registeredIdHolder[0]);
                         }
+                        if (tokenRegistration != null) {
+                            tokenRegistration.close();
+                        }
                         LoggingHelpers.logTiming(LOG, Level.WARNING, ex,
                                 "CopilotClient.createSession failed. Elapsed={Elapsed}, SessionId="
                                         + (registeredIdHolder[0] != null ? registeredIdHolder[0] : "<unassigned>"),
@@ -737,10 +1098,15 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
                             + "For example, to allow all permissions, use: "
                             + "new ResumeSessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)"));
         }
+        if (config.getGitHubToken() != null && config.getGitHubTokenProvider() != null) {
+            return CompletableFuture.failedFuture(
+                    new IllegalArgumentException("gitHubToken and gitHubTokenProvider are mutually exclusive"));
+        }
         return ensureConnected().thenCompose(connection -> {
             long totalNanos = System.nanoTime();
             // Register the session before the RPC call to avoid missing early events.
             long setupNanos = System.nanoTime();
+            CopilotSession replacedSession = sessions.get(sessionId);
             var session = new CopilotSession(sessionId, connection.rpc);
             session.setExecutor(executor);
             SessionRequestBuilder.configureSession(session, config);
@@ -805,6 +1171,14 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
                 }
             }
 
+            GitHubTokenProviderRegistry.Registration tokenRegistration = config.getGitHubTokenProvider() == null
+                    ? null
+                    : gitHubTokenProviders.register(config.getGitHubTokenProvider());
+            if (tokenRegistration != null) {
+                request.setGitHubTokenProviderRegistrationId(tokenRegistration.id());
+                session.setGitHubTokenProviderRegistration(tokenRegistration);
+            }
+
             long rpcNanos = System.nanoTime();
             return connection.rpc.invoke("session.resume", request, ResumeSessionResponse.class)
                     .thenCompose(response -> {
@@ -834,15 +1208,20 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
                             session.setActiveSessionId(returnedId);
                             sessions.put(returnedId, session);
                         }
-
                         return updateSessionOptionsForMode(session, config.getSkipCustomInstructions().orElse(null),
                                 config.getCustomAgentsLocalOnly().orElse(null),
                                 config.getCoauthorEnabled().orElse(null),
-                                config.getManageScheduleEnabled().orElse(null)).thenApply(v -> {
+                                config.getManageScheduleEnabled().orElse(null), config.getIncludedBuiltinSkills())
+                                .thenApply(v -> {
                                     LoggingHelpers.logTiming(LOG, Level.FINE,
                                             "CopilotClient.resumeSession complete. Elapsed={Elapsed}, SessionId="
                                                     + sessionId,
                                             totalNanos);
+                                    if (tokenRegistration != null) {
+                                        tokenRegistration.claim(session.getSessionId());
+                                    } else {
+                                        gitHubTokenProviders.retire(session.getSessionId());
+                                    }
                                     return session;
                                 });
                     }).exceptionally(ex -> {
@@ -852,6 +1231,12 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
                         if (!sessionId.equals(activeId)) {
                             sessions.remove(activeId);
                         }
+                        if (replacedSession != null) {
+                            sessions.putIfAbsent(sessionId, replacedSession);
+                        }
+                        if (tokenRegistration != null) {
+                            tokenRegistration.close();
+                        }
                         LoggingHelpers.logTiming(LOG, Level.WARNING, ex,
                                 "CopilotClient.resumeSession failed. Elapsed={Elapsed}, SessionId=" + sessionId,
                                 totalNanos);
@@ -860,14 +1245,22 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
         });
     }
 
+    CompletableFuture<Void> updateSessionOptionsForMode(CopilotSession session, Boolean skipCustomInstructions,
+            Boolean customAgentsLocalOnly, Boolean coauthorEnabled, Boolean manageScheduleEnabled) {
+        return updateSessionOptionsForMode(session, skipCustomInstructions, customAgentsLocalOnly, coauthorEnabled,
+                manageScheduleEnabled, null);
+    }
+
     /**
      * Applies the post-create / post-resume {@code session.options.update} patch.
      * <p>
      * In {@link CopilotClientMode#EMPTY EMPTY} mode this defaults the four
      * overridable feature flags to safe values (caller values from the config win);
-     * {@code installedPlugins=[]} is unconditional under empty mode so apps that
-     * need plugins must switch modes. In {@link CopilotClientMode#COPILOT_CLI
-     * COPILOT_CLI} mode only explicitly-set fields are forwarded.
+     * {@code installedPlugins=[]} is unconditional under empty mode.
+     * {@code includedBuiltinSkills} defaults to an empty list, but callers can
+     * explicitly allow selected runtime-bundled skills. In
+     * {@link CopilotClientMode#COPILOT_CLI COPILOT_CLI} mode only explicitly-set
+     * fields are forwarded.
      *
      * @param session
      *            the session to patch
@@ -879,16 +1272,21 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
      *            caller-supplied value, or {@code null} if not set
      * @param manageScheduleEnabled
      *            caller-supplied value, or {@code null} if not set
+     * @param includedBuiltinSkills
+     *            caller-supplied built-in skill allowlist, or {@code null} if not
+     *            set
      * @return a future that completes when the patch has been applied
      */
     CompletableFuture<Void> updateSessionOptionsForMode(CopilotSession session, Boolean skipCustomInstructions,
-            Boolean customAgentsLocalOnly, Boolean coauthorEnabled, Boolean manageScheduleEnabled) {
+            Boolean customAgentsLocalOnly, Boolean coauthorEnabled, Boolean manageScheduleEnabled,
+            List<String> includedBuiltinSkills) {
 
         Boolean patchSkip = null;
         Boolean patchAgents = null;
         Boolean patchCoauthor = null;
         Boolean patchSchedule = null;
         List<SessionInstalledPlugin> patchPlugins = null;
+        List<String> patchSkills = null;
         boolean hasAnyPatch = false;
 
         if (options.getMode() == CopilotClientMode.EMPTY) {
@@ -897,6 +1295,7 @@ CompletableFuture<Void> updateSessionOptionsForMode(CopilotSession session, Bool
             patchCoauthor = coauthorEnabled != null ? coauthorEnabled : false;
             patchSchedule = manageScheduleEnabled != null ? manageScheduleEnabled : false;
             patchPlugins = List.of();
+            patchSkills = includedBuiltinSkills != null ? includedBuiltinSkills : List.of();
             hasAnyPatch = true;
         } else {
             if (skipCustomInstructions != null) {
@@ -915,6 +1314,10 @@ CompletableFuture<Void> updateSessionOptionsForMode(CopilotSession session, Bool
                 patchSchedule = manageScheduleEnabled;
                 hasAnyPatch = true;
             }
+            if (includedBuiltinSkills != null) {
+                patchSkills = includedBuiltinSkills;
+                hasAnyPatch = true;
+            }
         }
 
         if (!hasAnyPatch) {
@@ -945,10 +1348,12 @@ CompletableFuture<Void> updateSessionOptionsForMode(CopilotSession session, Bool
                 null, // shellInitProfile
                 null, // shellProcessFlags
                 null, // sandboxConfig
+                null, // sandboxConfigSource
                 null, // logInteractiveShells
                 null, // envValueMode
                 null, // allowAllMcpServerInstructions
                 null, // skillDirectories
+                patchSkills, // includedBuiltinSkills
                 null, // disabledSkills
                 null, // enableOnDemandInstructionDiscovery
                 null, // maxInlineBinaryBytes
@@ -1171,7 +1576,10 @@ public CompletableFuture<Void> deleteSession(String sessionId) {
                     if (!response.success()) {
                         throw new RuntimeException("Failed to delete session " + sessionId + ": " + response.error());
                     }
-                    sessions.remove(sessionId);
+                    CopilotSession session = sessions.remove(sessionId);
+                    if (session != null) {
+                        session.releaseGitHubTokenProviderRegistration();
+                    }
                 }));
     }
 
@@ -1353,6 +1761,9 @@ public void close() {
             LOG.log(Level.FINE, "Error during close", e);
         } finally {
             shutdownOwnedExecutor();
+            if (closeHook != null) {
+                closeHook.run();
+            }
         }
     }
 
@@ -1392,7 +1803,8 @@ private void shutdownOwnedExecutor() {
         }
     }
 
-    private static record Connection(JsonRpcClient rpc, Process process, ServerRpc serverRpc) {
+    private static record Connection(JsonRpcClient rpc, Process process, ServerRpc serverRpc,
+            AutoCloseable runtimeHost) {
     };
 
 }
diff --git a/java/src/main/java/com/github/copilot/CopilotExperimental.java b/java/sdk/src/main/java/com/github/copilot/CopilotExperimental.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CopilotExperimental.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotExperimental.java
diff --git a/java/src/main/java/com/github/copilot/CopilotExperimentalProcessor.java b/java/sdk/src/main/java/com/github/copilot/CopilotExperimentalProcessor.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CopilotExperimentalProcessor.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotExperimentalProcessor.java
diff --git a/java/src/main/java/com/github/copilot/CopilotRequestContext.java b/java/sdk/src/main/java/com/github/copilot/CopilotRequestContext.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CopilotRequestContext.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotRequestContext.java
diff --git a/java/src/main/java/com/github/copilot/CopilotRequestHandler.java b/java/sdk/src/main/java/com/github/copilot/CopilotRequestHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CopilotRequestHandler.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotRequestHandler.java
diff --git a/java/src/main/java/com/github/copilot/CopilotRequestTransport.java b/java/sdk/src/main/java/com/github/copilot/CopilotRequestTransport.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CopilotRequestTransport.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotRequestTransport.java
diff --git a/java/src/main/java/com/github/copilot/CopilotSession.java b/java/sdk/src/main/java/com/github/copilot/CopilotSession.java
similarity index 97%
rename from java/src/main/java/com/github/copilot/CopilotSession.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotSession.java
index b977b69a12..f3a35967d3 100644
--- a/java/src/main/java/com/github/copilot/CopilotSession.java
+++ b/java/sdk/src/main/java/com/github/copilot/CopilotSession.java
@@ -57,6 +57,7 @@
 import com.github.copilot.generated.SessionErrorEvent;
 import com.github.copilot.generated.SessionEvent;
 import com.github.copilot.generated.SessionIdleEvent;
+import com.github.copilot.generated.SessionMode;
 import com.github.copilot.generated.rpc.OpenCanvasInstance;
 import com.github.copilot.rpc.AgentInfo;
 import com.github.copilot.rpc.AutoModeSwitchHandler;
@@ -198,6 +199,7 @@ public final class CopilotSession implements AutoCloseable {
     private volatile Map<String, java.util.function.Function<String, CompletableFuture<String>>> transformCallbacks;
     private final ScheduledExecutorService timeoutScheduler;
     private volatile Executor executor;
+    private volatile GitHubTokenProviderRegistry.Registration gitHubTokenProviderRegistration;
 
     /** Tracks whether this session instance has been terminated via close(). */
     private volatile boolean isTerminated = false;
@@ -252,6 +254,18 @@ void setExecutor(Executor executor) {
         this.executor = executor;
     }
 
+    void setGitHubTokenProviderRegistration(GitHubTokenProviderRegistry.Registration registration) {
+        this.gitHubTokenProviderRegistration = registration;
+    }
+
+    synchronized void releaseGitHubTokenProviderRegistration() {
+        GitHubTokenProviderRegistry.Registration registration = gitHubTokenProviderRegistration;
+        gitHubTokenProviderRegistration = null;
+        if (registration != null) {
+            registration.close();
+        }
+    }
+
     /**
      * Gets the unique identifier for this session.
      *
@@ -549,7 +563,8 @@ public CompletableFuture<AssistantMessageEvent> sendAndWait(MessageOptions optio
                                     + sessionId,
                             totalNanos);
                 }
-            } else if (evt instanceof SessionIdleEvent) {
+            } else if (evt instanceof SessionIdleEvent idleEvent
+                    && (idleEvent.getData() == null || idleEvent.getData().mode() != SessionMode.AUTOPILOT)) {
                 LoggingHelpers.logTiming(LOG, Level.FINE,
                         "CopilotSession.sendAndWait idle received. Elapsed={Elapsed}, SessionId=" + sessionId,
                         totalNanos);
@@ -1001,7 +1016,7 @@ private void executeToolAndRespondAsync(String requestId, String toolName, Strin
      * future completes exceptionally.
      */
     private SessionUiHandlePendingElicitationParams buildElicitationCancelParams(String requestId) {
-        var cancelResult = new UIElicitationResponse(UIElicitationResponseAction.CANCEL, null);
+        var cancelResult = new UIElicitationResponse(UIElicitationResponseAction.CANCEL, null, null);
         return new SessionUiHandlePendingElicitationParams(sessionId, requestId, cancelResult);
     }
 
@@ -1025,8 +1040,8 @@ private void executePermissionAndRespondAsync(String requestId, PermissionReques
                             return;
                         }
                         getRpc().permissions.handlePendingPermissionRequest(
-                                new SessionPermissionsHandlePendingPermissionRequestParams(sessionId, requestId,
-                                        result));
+                                new SessionPermissionsHandlePendingPermissionRequestParams(sessionId, requestId, result,
+                                        result.getDecisionContext()));
                     } catch (Exception e) {
                         LOG.log(Level.WARNING, "Error sending permission result for requestId=" + requestId, e);
                     }
@@ -1036,8 +1051,8 @@ private void executePermissionAndRespondAsync(String requestId, PermissionReques
                         PermissionRequestResult denied = new PermissionRequestResult();
                         denied.setKind(PermissionRequestResultKind.DENIED_COULD_NOT_REQUEST_FROM_USER);
                         getRpc().permissions.handlePendingPermissionRequest(
-                                new SessionPermissionsHandlePendingPermissionRequestParams(sessionId, requestId,
-                                        denied));
+                                new SessionPermissionsHandlePendingPermissionRequestParams(sessionId, requestId, denied,
+                                        null));
                     } catch (Exception e) {
                         LOG.log(Level.WARNING, "Error sending permission denied for requestId=" + requestId, e);
                     }
@@ -1049,7 +1064,8 @@ private void executePermissionAndRespondAsync(String requestId, PermissionReques
                     PermissionRequestResult denied = new PermissionRequestResult();
                     denied.setKind(PermissionRequestResultKind.DENIED_COULD_NOT_REQUEST_FROM_USER);
                     getRpc().permissions.handlePendingPermissionRequest(
-                            new SessionPermissionsHandlePendingPermissionRequestParams(sessionId, requestId, denied));
+                            new SessionPermissionsHandlePendingPermissionRequestParams(sessionId, requestId, denied,
+                                    null));
                 } catch (Exception sendEx) {
                     LOG.log(Level.WARNING, "Error sending permission denied for requestId=" + requestId, sendEx);
                 }
@@ -1212,7 +1228,7 @@ private void handleElicitationRequestAsync(ElicitationContext context, String re
                                 ? result.getAction().getValue()
                                 : ElicitationResultAction.CANCEL.getValue();
                         var parsedAction = UIElicitationResponseAction.fromValue(actionStr);
-                        var elicitationResult = new UIElicitationResponse(parsedAction, result.getContent());
+                        var elicitationResult = new UIElicitationResponse(parsedAction, result.getContent(), null);
                         getRpc().ui.handlePendingElicitation(
                                 new SessionUiHandlePendingElicitationParams(sessionId, requestId, elicitationResult));
                     } catch (Exception e) {
@@ -1267,10 +1283,10 @@ private final class SessionUiApiImpl implements SessionUiApi {
         @Override
         public CompletableFuture<ElicitationResult> elicitation(ElicitationParams params) {
             assertElicitation();
-            return getRpc().ui.elicitation(new SessionUiElicitationParams(sessionId, params.getMessage(),
+            return getRpc().ui.elicitation(new SessionUiElicitationParams(sessionId, null, params.getMessage(),
                     new UIElicitationSchema(params.getRequestedSchema().getType(),
-                            params.getRequestedSchema().getProperties(), params.getRequestedSchema().getRequired())))
-                    .thenApply(resp -> {
+                            params.getRequestedSchema().getProperties(), params.getRequestedSchema().getRequired()),
+                    null, null)).thenApply(resp -> {
                         var result = new ElicitationResult();
                         if (resp.action() != null) {
                             for (ElicitationResultAction a : ElicitationResultAction.values()) {
@@ -1292,8 +1308,9 @@ public CompletableFuture<ElicitationResult> elicitation(ElicitationParams params
         public CompletableFuture<Boolean> confirm(String message) {
             assertElicitation();
             var field = Map.of("type", "boolean", "default", (Object) true);
-            return getRpc().ui.elicitation(new SessionUiElicitationParams(sessionId, message,
-                    new UIElicitationSchema("object", Map.of("confirmed", (Object) field), List.of("confirmed"))))
+            return getRpc().ui
+                    .elicitation(new SessionUiElicitationParams(sessionId, null, message, new UIElicitationSchema(
+                            "object", Map.of("confirmed", (Object) field), List.of("confirmed")), null, null))
                     .thenApply(resp -> {
                         if (resp.action() == UIElicitationResponseAction.ACCEPT && resp.content() != null) {
                             Object val = resp.content().get("confirmed");
@@ -1315,8 +1332,9 @@ public CompletableFuture<Boolean> confirm(String message) {
         public CompletableFuture<String> select(String message, String[] options) {
             assertElicitation();
             var field = Map.of("type", (Object) "string", "enum", (Object) options);
-            return getRpc().ui.elicitation(new SessionUiElicitationParams(sessionId, message,
-                    new UIElicitationSchema("object", Map.of("selection", (Object) field), List.of("selection"))))
+            return getRpc().ui
+                    .elicitation(new SessionUiElicitationParams(sessionId, null, message, new UIElicitationSchema(
+                            "object", Map.of("selection", (Object) field), List.of("selection")), null, null))
                     .thenApply(resp -> {
                         if (resp.action() == UIElicitationResponseAction.ACCEPT && resp.content() != null) {
                             Object val = resp.content().get("selection");
@@ -1345,9 +1363,8 @@ public CompletableFuture<String> input(String message, InputOptions options) {
                 if (options.getDefaultValue() != null)
                     field.put("default", options.getDefaultValue());
             }
-            return getRpc().ui
-                    .elicitation(new SessionUiElicitationParams(sessionId, message,
-                            new UIElicitationSchema("object", Map.of("value", (Object) field), List.of("value"))))
+            return getRpc().ui.elicitation(new SessionUiElicitationParams(sessionId, null, message,
+                    new UIElicitationSchema("object", Map.of("value", (Object) field), List.of("value")), null, null))
                     .thenApply(resp -> {
                         if (resp.action() == UIElicitationResponseAction.ACCEPT && resp.content() != null) {
                             Object val = resp.content().get("value");
@@ -1993,10 +2010,8 @@ public CompletableFuture<Void> abort() {
      */
     public CompletableFuture<Void> setModel(String model, String reasoningEffort) {
         ensureNotTerminated();
-        return getRpc().model
-                .switchTo(
-                        new SessionModelSwitchToParams(sessionId, model, reasoningEffort, null, null, null, null, null))
-                .thenApply(r -> null);
+        return getRpc().model.switchTo(new SessionModelSwitchToParams(sessionId, model, reasoningEffort, null, null,
+                null, null, null, null, null, null, null, null, null, null)).thenApply(r -> null);
     }
 
     /**
@@ -2076,8 +2091,10 @@ public CompletableFuture<Void> setModel(String model, String reasoningEffort, St
         var generatedReasoningSummary = reasoningSummary == null
                 ? null
                 : com.github.copilot.generated.rpc.ReasoningSummary.fromValue(reasoningSummary);
-        return getRpc().model.switchTo(new SessionModelSwitchToParams(sessionId, model, reasoningEffort,
-                generatedReasoningSummary, null, generatedCapabilities, null, null)).thenApply(r -> null);
+        return getRpc().model
+                .switchTo(new SessionModelSwitchToParams(sessionId, model, reasoningEffort, generatedReasoningSummary,
+                        null, generatedCapabilities, null, null, null, null, null, null, null, null, null))
+                .thenApply(r -> null);
     }
 
     /**
@@ -2299,6 +2316,7 @@ public void close() {
         }
 
         timeoutScheduler.shutdownNow();
+        releaseGitHubTokenProviderRegistration();
 
         try {
             rpc.invoke("session.destroy", Map.of("sessionId", sessionId), Void.class).get(5, TimeUnit.SECONDS);
diff --git a/java/src/main/java/com/github/copilot/CopilotWebSocketCloseStatus.java b/java/sdk/src/main/java/com/github/copilot/CopilotWebSocketCloseStatus.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CopilotWebSocketCloseStatus.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotWebSocketCloseStatus.java
diff --git a/java/src/main/java/com/github/copilot/CopilotWebSocketForwarder.java b/java/sdk/src/main/java/com/github/copilot/CopilotWebSocketForwarder.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CopilotWebSocketForwarder.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotWebSocketForwarder.java
diff --git a/java/src/main/java/com/github/copilot/CopilotWebSocketHandler.java b/java/sdk/src/main/java/com/github/copilot/CopilotWebSocketHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CopilotWebSocketHandler.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotWebSocketHandler.java
diff --git a/java/src/main/java/com/github/copilot/CopilotWebSocketMessage.java b/java/sdk/src/main/java/com/github/copilot/CopilotWebSocketMessage.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/CopilotWebSocketMessage.java
rename to java/sdk/src/main/java/com/github/copilot/CopilotWebSocketMessage.java
diff --git a/java/src/main/java/com/github/copilot/EventErrorHandler.java b/java/sdk/src/main/java/com/github/copilot/EventErrorHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/EventErrorHandler.java
rename to java/sdk/src/main/java/com/github/copilot/EventErrorHandler.java
diff --git a/java/src/main/java/com/github/copilot/EventErrorPolicy.java b/java/sdk/src/main/java/com/github/copilot/EventErrorPolicy.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/EventErrorPolicy.java
rename to java/sdk/src/main/java/com/github/copilot/EventErrorPolicy.java
diff --git a/java/src/main/java/com/github/copilot/ExtractedTransforms.java b/java/sdk/src/main/java/com/github/copilot/ExtractedTransforms.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/ExtractedTransforms.java
rename to java/sdk/src/main/java/com/github/copilot/ExtractedTransforms.java
diff --git a/java/src/main/java/com/github/copilot/GitHubTelemetryAdapter.java b/java/sdk/src/main/java/com/github/copilot/GitHubTelemetryAdapter.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/GitHubTelemetryAdapter.java
rename to java/sdk/src/main/java/com/github/copilot/GitHubTelemetryAdapter.java
diff --git a/java/sdk/src/main/java/com/github/copilot/GitHubTokenProviderRegistry.java b/java/sdk/src/main/java/com/github/copilot/GitHubTokenProviderRegistry.java
new file mode 100644
index 0000000000..59b4f61469
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/GitHubTokenProviderRegistry.java
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import com.github.copilot.rpc.GitHubTokenProvider;
+
+final class GitHubTokenProviderRegistry {
+
+    private final Map<String, GitHubTokenProvider> providers = new HashMap<>();
+    private final Map<String, String> sessionOwners = new HashMap<>();
+
+    synchronized Registration register(GitHubTokenProvider provider) {
+        String id = UUID.randomUUID().toString();
+        providers.put(id, provider);
+        return new Registration(this, id);
+    }
+
+    synchronized GitHubTokenProvider get(String registrationId) {
+        return providers.get(registrationId);
+    }
+
+    private synchronized void claim(String registrationId, String sessionId) {
+        String previous = sessionOwners.put(sessionId, registrationId);
+        if (previous != null && !previous.equals(registrationId)) {
+            providers.remove(previous);
+        }
+    }
+
+    private synchronized void unregister(String registrationId) {
+        providers.remove(registrationId);
+        sessionOwners.values().removeIf(registrationId::equals);
+    }
+
+    synchronized void retire(String sessionId) {
+        String registrationId = sessionOwners.remove(sessionId);
+        if (registrationId != null) {
+            providers.remove(registrationId);
+        }
+    }
+
+    synchronized void clear() {
+        providers.clear();
+        sessionOwners.clear();
+    }
+
+    static final class Registration implements AutoCloseable {
+
+        private final GitHubTokenProviderRegistry registry;
+        private final String id;
+        private boolean closed;
+
+        private Registration(GitHubTokenProviderRegistry registry, String id) {
+            this.registry = registry;
+            this.id = id;
+        }
+
+        String id() {
+            return id;
+        }
+
+        void claim(String sessionId) {
+            registry.claim(id, sessionId);
+        }
+
+        @Override
+        public synchronized void close() {
+            if (!closed) {
+                closed = true;
+                registry.unregister(id);
+            }
+        }
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/InternalExecutorProvider.java b/java/sdk/src/main/java/com/github/copilot/InternalExecutorProvider.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/InternalExecutorProvider.java
rename to java/sdk/src/main/java/com/github/copilot/InternalExecutorProvider.java
diff --git a/java/src/main/java/com/github/copilot/JsonRpcClient.java b/java/sdk/src/main/java/com/github/copilot/JsonRpcClient.java
similarity index 82%
rename from java/src/main/java/com/github/copilot/JsonRpcClient.java
rename to java/sdk/src/main/java/com/github/copilot/JsonRpcClient.java
index 5303c4f500..7eda069d23 100644
--- a/java/src/main/java/com/github/copilot/JsonRpcClient.java
+++ b/java/sdk/src/main/java/com/github/copilot/JsonRpcClient.java
@@ -18,6 +18,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -27,6 +28,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.github.copilot.rpc.JsonRpcError;
 import com.github.copilot.rpc.JsonRpcRequest;
@@ -46,6 +48,7 @@ class JsonRpcClient implements AutoCloseable {
     private final OutputStream outputStream;
     private final Socket socket;
     private final Process process;
+    private final boolean ownsStreams;
     private final AtomicLong requestIdCounter = new AtomicLong(0);
     private final Map<Long, CompletableFuture<JsonNode>> pendingRequests = new ConcurrentHashMap<>();
     private final Map<String, BiConsumer<String, JsonNode>> notificationHandlers = new ConcurrentHashMap<>();
@@ -53,15 +56,29 @@ class JsonRpcClient implements AutoCloseable {
     private volatile boolean running = true;
 
     private JsonRpcClient(InputStream inputStream, OutputStream outputStream, Socket socket, Process process) {
+        this(inputStream, outputStream, socket, process, false);
+    }
+
+    private JsonRpcClient(InputStream inputStream, OutputStream outputStream, Socket socket, Process process,
+            boolean ownsStreams) {
+        this(inputStream, outputStream, socket, process, ownsStreams, null);
+    }
+
+    private JsonRpcClient(InputStream inputStream, OutputStream outputStream, Socket socket, Process process,
+            boolean ownsStreams, Consumer<JsonRpcClient> initializer) {
         this.inputStream = inputStream;
         this.outputStream = outputStream;
         this.socket = socket;
         this.process = process;
+        this.ownsStreams = ownsStreams;
         this.readerExecutor = Executors.newSingleThreadExecutor(r -> {
             Thread t = new Thread(r, "jsonrpc-reader");
             t.setDaemon(true);
             return t;
         });
+        if (initializer != null) {
+            initializer.accept(this);
+        }
         startReader();
     }
 
@@ -93,6 +110,19 @@ public static JsonRpcClient fromSocket(Socket socket) throws IOException {
         return new JsonRpcClient(socket.getInputStream(), socket.getOutputStream(), socket, null);
     }
 
+    static JsonRpcClient fromSocket(Socket socket, Consumer<JsonRpcClient> initializer) throws IOException {
+        return new JsonRpcClient(socket.getInputStream(), socket.getOutputStream(), socket, null, false, initializer);
+    }
+
+    /**
+     * Creates a JSON-RPC client over arbitrary input/output streams. The client
+     * takes ownership of the streams and closes them when {@link #close()} is
+     * called.
+     */
+    public static JsonRpcClient fromStreams(InputStream inputStream, OutputStream outputStream) {
+        return new JsonRpcClient(inputStream, outputStream, null, null, true);
+    }
+
     /**
      * Registers a handler for JSON-RPC method calls (requests/notifications from
      * server).
@@ -191,7 +221,39 @@ private synchronized void sendMessage(Object message) throws IOException {
         outputStream.write(content);
         outputStream.flush();
 
-        LOG.fine("Sent: " + json);
+        if (LOG.isLoggable(Level.FINE)) {
+            LOG.fine("Sent: " + redactCredentialsForLogging(json));
+        }
+    }
+
+    static String redactCredentialsForLogging(String json) {
+        try {
+            JsonNode root = MAPPER.readTree(json);
+            redactCredentials(root);
+            return MAPPER.writeValueAsString(root);
+        } catch (JsonProcessingException error) {
+            return "<unable to render JSON-RPC message safely>";
+        }
+    }
+
+    private static void redactCredentials(JsonNode node) {
+        if (node.isObject()) {
+            var object = (ObjectNode) node;
+            object.properties().forEach(entry -> {
+                if (isCredentialField(entry.getKey())) {
+                    object.put(entry.getKey(), "<redacted>");
+                } else {
+                    redactCredentials(entry.getValue());
+                }
+            });
+        } else if (node.isArray()) {
+            node.forEach(JsonRpcClient::redactCredentials);
+        }
+    }
+
+    private static boolean isCredentialField(String name) {
+        return name.equals("accessToken") || name.equals("gitHubToken") || name.equals("bearerToken")
+                || name.equals("apiKey");
     }
 
     private void startReader() {
@@ -344,6 +406,19 @@ public void close() {
         if (process != null) {
             process.destroy();
         }
+
+        if (ownsStreams) {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                LOG.log(Level.FINE, "Error closing input stream", e);
+            }
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                LOG.log(Level.FINE, "Error closing output stream", e);
+            }
+        }
     }
 
     public boolean isConnected() {
diff --git a/java/src/main/java/com/github/copilot/JsonRpcException.java b/java/sdk/src/main/java/com/github/copilot/JsonRpcException.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/JsonRpcException.java
rename to java/sdk/src/main/java/com/github/copilot/JsonRpcException.java
diff --git a/java/src/main/java/com/github/copilot/LifecycleEventManager.java b/java/sdk/src/main/java/com/github/copilot/LifecycleEventManager.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/LifecycleEventManager.java
rename to java/sdk/src/main/java/com/github/copilot/LifecycleEventManager.java
diff --git a/java/src/main/java/com/github/copilot/LlmInferenceAdapter.java b/java/sdk/src/main/java/com/github/copilot/LlmInferenceAdapter.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/LlmInferenceAdapter.java
rename to java/sdk/src/main/java/com/github/copilot/LlmInferenceAdapter.java
diff --git a/java/src/main/java/com/github/copilot/LlmInferenceExchange.java b/java/sdk/src/main/java/com/github/copilot/LlmInferenceExchange.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/LlmInferenceExchange.java
rename to java/sdk/src/main/java/com/github/copilot/LlmInferenceExchange.java
diff --git a/java/src/main/java/com/github/copilot/LlmWebSocketResponseBridge.java b/java/sdk/src/main/java/com/github/copilot/LlmWebSocketResponseBridge.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/LlmWebSocketResponseBridge.java
rename to java/sdk/src/main/java/com/github/copilot/LlmWebSocketResponseBridge.java
diff --git a/java/src/main/java/com/github/copilot/LoggingHelpers.java b/java/sdk/src/main/java/com/github/copilot/LoggingHelpers.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/LoggingHelpers.java
rename to java/sdk/src/main/java/com/github/copilot/LoggingHelpers.java
diff --git a/java/src/main/java/com/github/copilot/RpcHandlerDispatcher.java b/java/sdk/src/main/java/com/github/copilot/RpcHandlerDispatcher.java
similarity index 87%
rename from java/src/main/java/com/github/copilot/RpcHandlerDispatcher.java
rename to java/sdk/src/main/java/com/github/copilot/RpcHandlerDispatcher.java
index d2dff958dc..0dd8a5dc98 100644
--- a/java/src/main/java/com/github/copilot/RpcHandlerDispatcher.java
+++ b/java/sdk/src/main/java/com/github/copilot/RpcHandlerDispatcher.java
@@ -20,7 +20,12 @@
 import com.github.copilot.rpc.AutoModeSwitchRequest;
 import com.github.copilot.rpc.ExitPlanModeRequest;
 import com.github.copilot.rpc.BearerTokenProvider;
+import com.github.copilot.rpc.GitHubTokenProviderArgs;
+import com.github.copilot.rpc.GitHubTokenProviderResult;
 import com.github.copilot.rpc.ProviderTokenArgs;
+import com.github.copilot.generated.rpc.GitHubTokenAcquireRequest;
+import com.github.copilot.generated.rpc.GitHubTokenAcquireResultCancelled;
+import com.github.copilot.generated.rpc.GitHubTokenAcquireResultToken;
 import com.github.copilot.rpc.PermissionRequestResult;
 import com.github.copilot.rpc.PermissionRequestResultKind;
 import com.github.copilot.rpc.SessionLifecycleEvent;
@@ -51,6 +56,7 @@ final class RpcHandlerDispatcher {
     private final Map<String, CopilotSession> sessions;
     private final LifecycleEventDispatcher lifecycleDispatcher;
     private final Executor executor;
+    private final GitHubTokenProviderRegistry gitHubTokenProviders;
 
     /**
      * Creates a dispatcher with session registry and lifecycle dispatcher.
@@ -63,10 +69,11 @@ final class RpcHandlerDispatcher {
      *            the executor for async dispatch, or {@code null} for default
      */
     RpcHandlerDispatcher(Map<String, CopilotSession> sessions, LifecycleEventDispatcher lifecycleDispatcher,
-            Executor executor) {
+            Executor executor, GitHubTokenProviderRegistry gitHubTokenProviders) {
         this.sessions = sessions;
         this.lifecycleDispatcher = lifecycleDispatcher;
         this.executor = executor;
+        this.gitHubTokenProviders = gitHubTokenProviders;
     }
 
     /**
@@ -92,6 +99,71 @@ void registerHandlers(JsonRpcClient rpc) {
                 (requestId, params) -> handleSystemMessageTransform(rpc, requestId, params));
         rpc.registerMethodHandler("providerToken.getToken",
                 (requestId, params) -> handleProviderTokenGetToken(rpc, requestId, params));
+        rpc.registerMethodHandler("gitHubToken.getToken",
+                (requestId, params) -> handleGitHubTokenGetToken(rpc, requestId, params));
+    }
+
+    private void handleGitHubTokenGetToken(JsonRpcClient rpc, String requestId, JsonNode params) {
+        runAsync(() -> {
+            final long requestIdLong = parseRequestId(requestId, "gitHubToken.getToken");
+            if (requestIdLong == -1) {
+                return;
+            }
+            try {
+                GitHubTokenAcquireRequest request = MAPPER.treeToValue(params, GitHubTokenAcquireRequest.class);
+                var provider = gitHubTokenProviders.get(request.registrationId());
+                if (provider == null) {
+                    rpc.sendErrorResponse(requestIdLong, -32603, "Unknown GitHub token provider registration");
+                    return;
+                }
+
+                var resultFuture = provider
+                        .getToken(new GitHubTokenProviderArgs(request.host(), request.sessionId(), request.reason()));
+                if (resultFuture == null) {
+                    rpc.sendErrorResponse(requestIdLong, -32603, "GitHub token provider returned a null future");
+                    return;
+                }
+                resultFuture.thenAccept(result -> sendGitHubTokenResult(rpc, requestIdLong, result))
+                        .exceptionally(error -> {
+                            try {
+                                Throwable cause = error instanceof java.util.concurrent.CompletionException
+                                        && error.getCause() != null ? error.getCause() : error;
+                                rpc.sendErrorResponse(requestIdLong, -32603,
+                                        "GitHub token provider failed: " + cause.getMessage());
+                            } catch (IOException sendError) {
+                                LOG.log(Level.SEVERE, "Error sending GitHub token provider error", sendError);
+                            }
+                            return null;
+                        });
+            } catch (Exception error) {
+                try {
+                    rpc.sendErrorResponse(requestIdLong, -32603,
+                            "GitHub token provider handler failed: " + error.getMessage());
+                } catch (IOException sendError) {
+                    LOG.log(Level.SEVERE, "Error sending GitHub token provider handler error", sendError);
+                }
+            }
+        });
+    }
+
+    private void sendGitHubTokenResult(JsonRpcClient rpc, long requestId, GitHubTokenProviderResult result) {
+        try {
+            if (result == null) {
+                rpc.sendErrorResponse(requestId, -32603, "GitHub token provider returned a null result");
+                return;
+            }
+            if (result.isCancelled()) {
+                rpc.sendResponse(requestId, new GitHubTokenAcquireResultCancelled());
+                return;
+            }
+            var wireResult = new GitHubTokenAcquireResultToken();
+            wireResult.setAccessToken(result.getAccessToken());
+            wireResult.setExpiresIn(result.getExpiresIn());
+            wireResult.setTokenType(result.getTokenType());
+            rpc.sendResponse(requestId, wireResult);
+        } catch (IOException error) {
+            LOG.log(Level.SEVERE, "Error sending GitHub token provider result", error);
+        }
     }
 
     private void handleSessionEvent(JsonNode params) {
diff --git a/java/src/main/java/com/github/copilot/SdkProtocolVersion.java b/java/sdk/src/main/java/com/github/copilot/SdkProtocolVersion.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/SdkProtocolVersion.java
rename to java/sdk/src/main/java/com/github/copilot/SdkProtocolVersion.java
diff --git a/java/src/main/java/com/github/copilot/SessionRequestBuilder.java b/java/sdk/src/main/java/com/github/copilot/SessionRequestBuilder.java
similarity index 96%
rename from java/src/main/java/com/github/copilot/SessionRequestBuilder.java
rename to java/sdk/src/main/java/com/github/copilot/SessionRequestBuilder.java
index 62c7120252..4254c04ec4 100644
--- a/java/src/main/java/com/github/copilot/SessionRequestBuilder.java
+++ b/java/sdk/src/main/java/com/github/copilot/SessionRequestBuilder.java
@@ -130,6 +130,7 @@ static CreateSessionRequest buildCreateRequest(SessionConfig config, String sess
         request.setModels(config.getModels());
         config.getEnableSessionTelemetry().ifPresent(request::setEnableSessionTelemetry);
         config.getEnableCitations().ifPresent(request::setEnableCitations);
+        config.getEnableFileChangeTracking().ifPresent(request::setEnableFileChangeTracking);
         request.setSessionLimits(config.getSessionLimits());
         experimentalModeForMode(mode, config.getEnableExperimentalMode().orElse(null))
                 .ifPresent(request::setIsExperimentalMode);
@@ -160,6 +161,7 @@ static CreateSessionRequest buildCreateRequest(SessionConfig config, String sess
         request.setToolSearch(config.getToolSearch());
         request.setMemory(config.getMemory());
         request.setDisabledSkills(config.getDisabledSkills());
+        request.setDisabledMcpServers(config.getDisabledMcpServers());
         request.setConfigDirectory(config.getConfigDirectory());
         config.getEnableConfigDiscovery().ifPresent(request::setEnableConfigDiscovery);
         config.getSkipEmbeddingRetrieval().ifPresent(request::setSkipEmbeddingRetrieval);
@@ -200,6 +202,7 @@ static CreateSessionRequest buildCreateRequest(SessionConfig config, String sess
         request.setCloud(config.getCloud());
         request.setExpAssignments(config.getExpAssignments());
         config.getEnableManagedSettings().ifPresent(request::setEnableManagedSettings);
+        request.setManagedSettings(config.getManagedSettings());
 
         return request;
     }
@@ -263,6 +266,7 @@ static ResumeSessionRequest buildResumeRequest(String sessionId, ResumeSessionCo
         request.setModels(config.getModels());
         config.getEnableSessionTelemetry().ifPresent(request::setEnableSessionTelemetry);
         config.getEnableCitations().ifPresent(request::setEnableCitations);
+        config.getEnableFileChangeTracking().ifPresent(request::setEnableFileChangeTracking);
         request.setSessionLimits(config.getSessionLimits());
         experimentalModeForMode(mode, config.getEnableExperimentalMode().orElse(null))
                 .ifPresent(request::setIsExperimentalMode);
@@ -309,6 +313,7 @@ static ResumeSessionRequest buildResumeRequest(String sessionId, ResumeSessionCo
         request.setToolSearch(config.getToolSearch());
         request.setMemory(config.getMemory());
         request.setDisabledSkills(config.getDisabledSkills());
+        request.setDisabledMcpServers(config.getDisabledMcpServers());
         request.setInfiniteSessions(config.getInfiniteSessions());
         request.setModelCapabilities(config.getModelCapabilities());
 
@@ -335,6 +340,7 @@ static ResumeSessionRequest buildResumeRequest(String sessionId, ResumeSessionCo
         request.setRemoteSession(config.getRemoteSession());
         request.setExpAssignments(config.getExpAssignments());
         config.getEnableManagedSettings().ifPresent(request::setEnableManagedSettings);
+        request.setManagedSettings(config.getManagedSettings());
 
         return request;
     }
@@ -372,7 +378,8 @@ static void configureSession(CopilotSession session, SessionConfig config) {
         if (config.getOnPermissionRequest() != null) {
             session.registerPermissionHandler(config.getOnPermissionRequest());
         }
-        session.setManagedSettingsEnabled(config.getEnableManagedSettings().orElse(false));
+        session.setManagedSettingsEnabled(
+                config.getEnableManagedSettings().orElse(false) || config.getManagedSettings() != null);
         if (config.getOnMcpAuthRequest() != null) {
             session.registerMcpAuthHandler(config.getOnMcpAuthRequest());
         }
@@ -423,7 +430,8 @@ static void configureSession(CopilotSession session, ResumeSessionConfig config)
         if (config.getOnPermissionRequest() != null) {
             session.registerPermissionHandler(config.getOnPermissionRequest());
         }
-        session.setManagedSettingsEnabled(config.getEnableManagedSettings().orElse(false));
+        session.setManagedSettingsEnabled(
+                config.getEnableManagedSettings().orElse(false) || config.getManagedSettings() != null);
         if (config.getOnMcpAuthRequest() != null) {
             session.registerMcpAuthHandler(config.getOnMcpAuthRequest());
         }
diff --git a/java/src/main/java/com/github/copilot/SystemMessageMode.java b/java/sdk/src/main/java/com/github/copilot/SystemMessageMode.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/SystemMessageMode.java
rename to java/sdk/src/main/java/com/github/copilot/SystemMessageMode.java
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/FfiOutputStream.java b/java/sdk/src/main/java/com/github/copilot/ffi/FfiOutputStream.java
new file mode 100644
index 0000000000..4198f08f02
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/FfiOutputStream.java
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+final class FfiOutputStream extends OutputStream {
+
+    private final NativeBinding nativeBinding;
+    private final AtomicInteger connectionId;
+    private final AtomicBoolean closing;
+    private final ReentrantLock operationLock;
+
+    FfiOutputStream(NativeBinding nativeBinding, AtomicInteger connectionId, AtomicBoolean closing,
+            ReentrantLock operationLock) {
+        this.nativeBinding = Objects.requireNonNull(nativeBinding, "nativeBinding must not be null");
+        this.connectionId = Objects.requireNonNull(connectionId, "connectionId must not be null");
+        this.closing = Objects.requireNonNull(closing, "closing must not be null");
+        this.operationLock = Objects.requireNonNull(operationLock, "operationLock must not be null");
+    }
+
+    @Override
+    public void write(int b) throws IOException {
+        write(new byte[]{(byte) b}, 0, 1);
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        Objects.requireNonNull(b, "buffer must not be null");
+        if (off < 0 || len < 0 || off + len > b.length) {
+            throw new IndexOutOfBoundsException("Invalid off/len for buffer of length " + b.length);
+        }
+        if (len == 0) {
+            return;
+        }
+
+        operationLock.lock();
+        try {
+            if (closing.get()) {
+                throw new IOException("The in-process runtime connection is closed.");
+            }
+            int id = connectionId.get();
+            if (id == 0) {
+                throw new IOException("The in-process runtime connection is closed.");
+            }
+
+            byte[] payload = (off == 0 && len == b.length) ? b : Arrays.copyOfRange(b, off, off + len);
+            if (!nativeBinding.connectionWrite(id, payload, payload.length)) {
+                throw new IOException("Failed to write a frame to the in-process runtime connection.");
+            }
+        } finally {
+            operationLock.unlock();
+        }
+    }
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/FfiRuntimeHost.java b/java/sdk/src/main/java/com/github/copilot/ffi/FfiRuntimeHost.java
new file mode 100644
index 0000000000..5e7d2d461a
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/FfiRuntimeHost.java
@@ -0,0 +1,347 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.copilot.rpc.CopilotClientMode;
+import com.github.copilot.rpc.CopilotClientOptions;
+
+import com.sun.jna.Pointer;
+
+/**
+ * Manages the in-process FFI runtime lifecycle.
+ */
+public final class FfiRuntimeHost implements AutoCloseable {
+
+    private static final Logger LOG = Logger.getLogger(FfiRuntimeHost.class.getName());
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    private final NativeBinding nativeBinding;
+    private final QueueInputStream receiveStream;
+    private final AtomicBoolean closing = new AtomicBoolean(false);
+    private final AtomicBoolean disposed = new AtomicBoolean(false);
+    private final AtomicInteger serverId = new AtomicInteger(0);
+    private final AtomicInteger connectionId = new AtomicInteger(0);
+    private final AtomicInteger activeCallbacks = new AtomicInteger(0);
+    private final Object callbackDrainMonitor = new Object();
+    private final ReentrantLock operationLock = new ReentrantLock();
+    private final FfiOutputStream sendStream;
+    private final String libraryPath;
+
+    private volatile OutboundCallback callbackRef;
+
+    /**
+     * Creates an FFI runtime host using the resolved bundled native library.
+     *
+     * @throws IOException
+     *             if the runtime library cannot be resolved
+     */
+    public FfiRuntimeHost() throws IOException {
+        this(resolveLibraryPath(), null, new QueueInputStream());
+    }
+
+    FfiRuntimeHost(NativeBinding nativeBinding, String libraryPath) {
+        this(nativeBinding, libraryPath, new QueueInputStream());
+    }
+
+    FfiRuntimeHost(NativeBinding nativeBinding, String libraryPath, QueueInputStream receiveStream) {
+        this.nativeBinding = Objects.requireNonNull(nativeBinding, "nativeBinding must not be null");
+        this.receiveStream = Objects.requireNonNull(receiveStream, "receiveStream must not be null");
+        this.sendStream = new FfiOutputStream(this.nativeBinding, this.connectionId, this.closing, this.operationLock);
+        this.libraryPath = libraryPath;
+    }
+
+    private FfiRuntimeHost(Path libraryPath, NativeBinding nativeBinding, QueueInputStream receiveStream) {
+        this(nativeBinding == null ? new JnaNativeBinding(libraryPath) : nativeBinding, libraryPath.toString(),
+                receiveStream);
+    }
+
+    private static Path resolveLibraryPath() throws IOException {
+        return NativeRuntimeLoader.resolve();
+    }
+
+    /**
+     * Starts the in-process runtime and opens a connection.
+     *
+     * @param entrypointPath
+     *            runtime entrypoint path passed in {@code argv_json}
+     * @param options
+     *            client options used to construct {@code argv_json} and
+     *            {@code env_json}
+     */
+    public void start(String entrypointPath, CopilotClientOptions options) {
+        Objects.requireNonNull(entrypointPath, "entrypointPath must not be null");
+        Objects.requireNonNull(options, "options must not be null");
+        if (disposed.get()) {
+            throw new IllegalStateException("FfiRuntimeHost is already closed.");
+        }
+        if (serverId.get() != 0 || connectionId.get() != 0) {
+            throw new IllegalStateException("FfiRuntimeHost has already been started.");
+        }
+
+        byte[] argvJson = buildArgvJson(entrypointPath, options);
+        byte[] envJson = buildEnvJson(options);
+        int hostHandle = runHostStartOnBlockingThread(argvJson, envJson);
+        if (hostHandle == 0) {
+            String lib = libraryPath != null ? libraryPath : "<unknown>";
+            throw new IllegalStateException(
+                    "copilot_runtime_host_start failed (library '" + lib + "', entrypoint '" + entrypointPath + "').");
+        }
+
+        // Hold operationLock while publishing handles to serialize with close().
+        // Recheck disposed in case close() ran while hostStart was blocking.
+        operationLock.lock();
+        try {
+            if (disposed.get()) {
+                try {
+                    nativeBinding.hostShutdown(hostHandle);
+                } catch (Throwable ignored) {
+                    // Best effort
+                }
+                throw new IllegalStateException("FfiRuntimeHost was closed during startup.");
+            }
+            serverId.set(hostHandle);
+
+            OutboundCallback callback = createOutboundCallback();
+            callbackRef = callback;
+            int connHandle = nativeBinding.connectionOpen(hostHandle, callback, Pointer.NULL, null, 0, null, 0, null,
+                    0);
+            if (connHandle == 0) {
+                try {
+                    nativeBinding.hostShutdown(hostHandle);
+                } catch (Throwable ignored) {
+                    // Best effort
+                }
+                serverId.set(0);
+                callbackRef = null;
+                throw new IllegalStateException("copilot_runtime_connection_open failed.");
+            }
+            connectionId.set(connHandle);
+            LOG.fine(() -> "Started FFI runtime host. Library=" + libraryPath + ", serverId=" + hostHandle
+                    + ", connectionId=" + connHandle);
+        } finally {
+            operationLock.unlock();
+        }
+    }
+
+    public InputStream getReceiveStream() {
+        return receiveStream;
+    }
+
+    public OutputStream getSendStream() {
+        return sendStream;
+    }
+
+    @Override
+    public void close() {
+        if (!disposed.compareAndSet(false, true)) {
+            return;
+        }
+
+        closing.set(true);
+
+        operationLock.lock();
+        try {
+            int connHandle = connectionId.getAndSet(0);
+            if (connHandle != 0) {
+                try {
+                    nativeBinding.connectionClose(connHandle);
+                } catch (Throwable t) {
+                    LOG.log(Level.FINE, "Failed to close FFI connection", t);
+                }
+            }
+        } finally {
+            operationLock.unlock();
+        }
+
+        drainActiveCallbacks();
+
+        int hostHandle = serverId.getAndSet(0);
+        if (hostHandle != 0) {
+            try {
+                nativeBinding.hostShutdown(hostHandle);
+            } catch (Throwable t) {
+                LOG.log(Level.FINE, "Failed to shut down FFI host", t);
+            }
+        }
+
+        try {
+            receiveStream.close();
+        } catch (Throwable ignored) {
+            // never throw from close
+        }
+
+        callbackRef = null;
+    }
+
+    private void drainActiveCallbacks() {
+        while (activeCallbacks.get() > 0) {
+            synchronized (callbackDrainMonitor) {
+                if (activeCallbacks.get() == 0) {
+                    return;
+                }
+                try {
+                    callbackDrainMonitor.wait(10L);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
+            }
+        }
+    }
+
+    private OutboundCallback createOutboundCallback() {
+        return (userData, data, len) -> {
+            if (closing.get()) {
+                return;
+            }
+            activeCallbacks.incrementAndGet();
+            try {
+                int length = len.intValue();
+                if (closing.get() || data == null || length <= 0) {
+                    return;
+                }
+                byte[] bytes = data.getByteArray(0, length);
+                if (!closing.get()) {
+                    receiveStream.enqueue(bytes);
+                }
+            } catch (Throwable t) {
+                LOG.log(Level.WARNING, "Exception in FFI outbound callback", t);
+            } finally {
+                if (activeCallbacks.decrementAndGet() == 0) {
+                    synchronized (callbackDrainMonitor) {
+                        callbackDrainMonitor.notifyAll();
+                    }
+                }
+            }
+        };
+    }
+
+    private int runHostStartOnBlockingThread(byte[] argvJson, byte[] envJson) {
+        ReaderThreadFactory readerThreadFactory = new ReaderThreadFactory();
+        ExecutorService executor = Executors
+                .newSingleThreadExecutor(runnable -> readerThreadFactory.create(runnable, "copilot-ffi-host-start"));
+        try {
+            Future<Integer> future = executor.submit(() -> nativeBinding.hostStart(argvJson, argvJson.length, envJson,
+                    envJson == null ? 0 : envJson.length));
+            return future.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IllegalStateException("Interrupted while starting in-process runtime host.", e);
+        } catch (ExecutionException e) {
+            Throwable cause = e.getCause();
+            if (cause instanceof RuntimeException runtimeException) {
+                throw runtimeException;
+            }
+            throw new IllegalStateException("Failed to start in-process runtime host.", cause);
+        } finally {
+            executor.shutdownNow();
+            try {
+                executor.awaitTermination(5, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    private static byte[] buildArgvJson(String entrypointPath, CopilotClientOptions options) {
+        List<String> argv = new ArrayList<>();
+        if (entrypointPath.toLowerCase().endsWith(".js")) {
+            argv.add("node");
+        }
+        argv.add(entrypointPath);
+        argv.add("--embedded-host");
+        argv.add("--no-auto-update");
+
+        String logLevel = options.getLogLevel();
+        if (logLevel != null && !logLevel.isBlank()) {
+            argv.add("--log-level");
+            argv.add(logLevel);
+        }
+
+        String gitHubToken = options.getGitHubToken();
+        if (gitHubToken != null && !gitHubToken.isEmpty()) {
+            argv.add("--auth-token-env");
+            argv.add("COPILOT_SDK_AUTH_TOKEN");
+        }
+
+        boolean useLoggedInUser = options.getUseLoggedInUser().orElse(gitHubToken == null || gitHubToken.isEmpty());
+        if (!useLoggedInUser) {
+            argv.add("--no-auto-login");
+        }
+
+        if (options.getSessionIdleTimeoutSeconds().isPresent()
+                && options.getSessionIdleTimeoutSeconds().getAsInt() > 0) {
+            argv.add("--session-idle-timeout");
+            argv.add(String.valueOf(options.getSessionIdleTimeoutSeconds().getAsInt()));
+        }
+
+        if (options.isRemote()) {
+            argv.add("--remote");
+        }
+
+        String[] cliArgs = options.getCliArgs();
+        if (cliArgs != null && cliArgs.length > 0) {
+            for (String arg : cliArgs) {
+                if (arg != null && !arg.isBlank()) {
+                    argv.add(arg);
+                }
+            }
+        }
+
+        return jsonBytes(argv);
+    }
+
+    private static byte[] buildEnvJson(CopilotClientOptions options) {
+        Map<String, String> env = new LinkedHashMap<>();
+
+        String token = options.getGitHubToken();
+        if (token != null && !token.isEmpty()) {
+            env.put("COPILOT_SDK_AUTH_TOKEN", token);
+        }
+        String copilotHome = options.getCopilotHome();
+        if (copilotHome != null && !copilotHome.isEmpty()) {
+            env.put("COPILOT_HOME", copilotHome);
+        }
+        if (options.getMode() == CopilotClientMode.EMPTY) {
+            env.put("COPILOT_DISABLE_KEYTAR", "1");
+        }
+
+        if (env.isEmpty()) {
+            return null;
+        }
+        return jsonBytes(env);
+    }
+
+    private static byte[] jsonBytes(Object value) {
+        try {
+            return MAPPER.writeValueAsString(value).getBytes(StandardCharsets.UTF_8);
+        } catch (JsonProcessingException e) {
+            throw new IllegalStateException("Failed to serialize FFI JSON parameter.", e);
+        }
+    }
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/JnaNativeBinding.java b/java/sdk/src/main/java/com/github/copilot/ffi/JnaNativeBinding.java
new file mode 100644
index 0000000000..ba3c3c40a5
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/JnaNativeBinding.java
@@ -0,0 +1,295 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Logger;
+
+/**
+ * JNA-backed implementation of {@link NativeBinding}.
+ *
+ * <p>
+ * Loads the {@code runtime.node} native library by absolute path and delegates
+ * each {@link NativeBinding} method to the corresponding
+ * {@code copilot_runtime_*} C ABI export.
+ *
+ * <h2>Library-never-unloads pattern</h2>
+ * <p>
+ * The loaded JNA library handle is held in a {@code static} field and is never
+ * released. Native worker threads spawned by the runtime outlive any individual
+ * {@code FfiRuntimeHost} instance; unloading the library while those threads
+ * are active would cause a crash. This mirrors the Rust runtime's own
+ * {@code OnceLock<Mutex<HashMap<PathBuf, &'static Library>>>} pattern.
+ *
+ * <h2>Duplicate-load guard</h2>
+ * <p>
+ * Loading a library from a <em>different</em> absolute path in the same JVM
+ * process is rejected with {@link IllegalStateException}. Loading from the
+ * <em>same</em> path more than once is silently accepted.
+ *
+ * <h2>Active-callback tracking</h2>
+ * <p>
+ * The {@link #activeCallbacks} counter is incremented when the native runtime
+ * enters the outbound callback and decremented when the callback returns.
+ * Callers (e.g. {@code FfiRuntimeHost}) must drain this counter to zero before
+ * calling {@link #connectionClose} or {@link #hostShutdown}.
+ *
+ * <h2>Callback lifetime</h2>
+ * <p>
+ * The native runtime can invoke an outbound callback after connection close and
+ * host shutdown return. Each JNA callback wrapper is therefore retained for the
+ * lifetime of the JVM. After host shutdown, its Java delegate is detached so a
+ * late native invocation safely becomes a no-op without retaining the complete
+ * host object graph.
+ *
+ * <h2>GraalVM Native Image</h2>
+ * <p>
+ * JNA callback upcalls are not supported under GraalVM Native Image. InProcess
+ * transport is not available in native-image executables; use subprocess
+ * transport instead.
+ */
+final class JnaNativeBinding implements NativeBinding {
+
+    private static final Logger LOG = Logger.getLogger(JnaNativeBinding.class.getName());
+
+    /**
+     * JNA inner interface mapping the five {@code copilot_runtime_*} C ABI exports.
+     */
+    interface CopilotRuntimeLibrary extends Library {
+        /** Corresponds to {@code copilot_runtime_host_start}. */
+        int copilot_runtime_host_start(byte[] argvJson, SizeT argvJsonLen, byte[] envJson, SizeT envJsonLen);
+
+        /**
+         * Corresponds to {@code copilot_runtime_host_shutdown}.
+         *
+         * <p>
+         * Returns {@code byte} (not Java {@code boolean}) because the Rust ABI exports
+         * a one-byte {@code bool}. JNA maps Java {@code boolean} as a 32-bit C
+         * {@code int}, which would read three extra bytes.
+         */
+        byte copilot_runtime_host_shutdown(int serverId);
+
+        /** Corresponds to {@code copilot_runtime_connection_open}. */
+        int copilot_runtime_connection_open(int serverId, OutboundCallback callback, Pointer userData, byte[] extSource,
+                SizeT extSourceLen, byte[] extName, SizeT extNameLen, byte[] connToken, SizeT connTokenLen);
+
+        /**
+         * Corresponds to {@code copilot_runtime_connection_write}.
+         *
+         * @see #copilot_runtime_host_shutdown for why this returns {@code byte}
+         */
+        byte copilot_runtime_connection_write(int connectionId, byte[] data, SizeT dataLen);
+
+        /**
+         * Corresponds to {@code copilot_runtime_connection_close}.
+         *
+         * @see #copilot_runtime_host_shutdown for why this returns {@code byte}
+         */
+        byte copilot_runtime_connection_close(int connectionId);
+    }
+
+    // -------------------------------------------------------------------------
+    // Process-wide singleton — never unloaded
+    // -------------------------------------------------------------------------
+
+    private static final Object LOAD_LOCK = new Object();
+
+    /** Absolute path of the library that was first loaded into this JVM process. */
+    private static volatile Path loadedPath;
+
+    /** The loaded JNA library interface. Never released after first set. */
+    private static volatile CopilotRuntimeLibrary loadedLib;
+
+    /**
+     * Process-lifetime roots for JNA callback trampolines. Native code can invoke a
+     * callback after connection and host teardown return, so entries are never
+     * removed in production.
+     */
+    private static final Set<OutboundCallback> RETAINED_CALLBACKS = ConcurrentHashMap.newKeySet();
+
+    // -------------------------------------------------------------------------
+    // Instance state
+    // -------------------------------------------------------------------------
+
+    /**
+     * The library interface used by this instance for all delegated calls.
+     *
+     * <p>
+     * For the production path ({@link #JnaNativeBinding(Path)}), this is always the
+     * same object as {@link #loadedLib} (the static singleton). For the test path
+     * ({@link #JnaNativeBinding(CopilotRuntimeLibrary)}), this may be a stub or
+     * mock without modifying the static singleton.
+     */
+    private final CopilotRuntimeLibrary lib;
+
+    /**
+     * Count of callbacks currently executing on native threads. Must reach zero
+     * before {@link #connectionClose} or {@link #hostShutdown} is called.
+     */
+    final AtomicInteger activeCallbacks = new AtomicInteger(0);
+
+    /**
+     * Callback registrations keyed by connection handle.
+     * <p>
+     * Registrations remain here through connection close because native callbacks
+     * can still arrive. Successful host shutdown detaches their Java delegates; the
+     * wrappers themselves remain rooted by {@link #RETAINED_CALLBACKS}.
+     */
+    private final Map<Integer, CallbackRegistration> callbackRegistrations = new ConcurrentHashMap<>();
+
+    private static final class CallbackRegistration {
+        private final int serverId;
+        private final AtomicReference<OutboundCallback> delegate;
+        private final AtomicInteger activeCallbacks;
+        private final OutboundCallback wrapper;
+
+        private CallbackRegistration(int serverId, OutboundCallback delegate, AtomicInteger activeCallbacks) {
+            this.serverId = serverId;
+            this.delegate = new AtomicReference<>(delegate);
+            this.activeCallbacks = activeCallbacks;
+            this.wrapper = this::invoke;
+        }
+
+        private void invoke(Pointer userData, Pointer data, SizeT len) {
+            activeCallbacks.incrementAndGet();
+            try {
+                OutboundCallback callback = delegate.get();
+                if (callback != null) {
+                    callback.invoke(userData, data, len);
+                }
+            } finally {
+                activeCallbacks.decrementAndGet();
+            }
+        }
+
+        private void detach() {
+            delegate.set(null);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Constructors
+    // -------------------------------------------------------------------------
+
+    /**
+     * Loads (or re-uses) the native library at the given absolute path.
+     *
+     * @param libraryPath
+     *            absolute path to the {@code runtime.node} native library
+     * @throws IllegalStateException
+     *             if a <em>different</em> library path has already been loaded in
+     *             this JVM process
+     */
+    JnaNativeBinding(Path libraryPath) {
+        Path absPath = libraryPath.toAbsolutePath().normalize();
+        synchronized (LOAD_LOCK) {
+            if (loadedLib == null) {
+                LOG.fine(() -> "Loading native library from: " + absPath);
+                try {
+                    loadedLib = Native.load(absPath.toString(), CopilotRuntimeLibrary.class);
+                } catch (UnsatisfiedLinkError e) {
+                    throw new IllegalStateException("Failed to load native library from '" + absPath + "'", e);
+                }
+                loadedPath = absPath;
+                LOG.fine(() -> "Native library loaded: " + absPath);
+            } else if (!absPath.equals(loadedPath)) {
+                throw new IllegalStateException("An in-process FFI runtime library is already loaded from '"
+                        + loadedPath + "'; loading a different library from '" + absPath
+                        + "' in the same process is not supported.");
+            }
+        }
+        this.lib = loadedLib;
+    }
+
+    /**
+     * Testing constructor — accepts a pre-built {@link CopilotRuntimeLibrary}
+     * directly, bypassing disk I/O and the static singleton guard.
+     *
+     * <p>
+     * This constructor is package-private and intended solely for unit tests.
+     *
+     * @param library
+     *            a {@link CopilotRuntimeLibrary} stub or mock for testing
+     */
+    JnaNativeBinding(CopilotRuntimeLibrary library) {
+        // Testing seam — skip the static singleton guard.
+        this.lib = library;
+    }
+
+    // -------------------------------------------------------------------------
+    // NativeBinding delegation
+    // -------------------------------------------------------------------------
+
+    @Override
+    public int hostStart(byte[] argvJson, int argvJsonLen, byte[] envJson, int envJsonLen) {
+        return lib.copilot_runtime_host_start(argvJson, new SizeT(argvJsonLen), envJson, new SizeT(envJsonLen));
+    }
+
+    @Override
+    public boolean hostShutdown(int serverId) {
+        boolean shutdown = lib.copilot_runtime_host_shutdown(serverId) != 0;
+        if (shutdown) {
+            callbackRegistrations.forEach((connectionId, registration) -> {
+                if (registration.serverId == serverId && callbackRegistrations.remove(connectionId, registration)) {
+                    registration.detach();
+                }
+            });
+        }
+        return shutdown;
+    }
+
+    @Override
+    public int connectionOpen(int serverId, OutboundCallback callback, Pointer userData, byte[] extSource,
+            int extSourceLen, byte[] extName, int extNameLen, byte[] connToken, int connTokenLen) {
+        CallbackRegistration registration = new CallbackRegistration(serverId, callback, activeCallbacks);
+        int connectionId = lib.copilot_runtime_connection_open(serverId, registration.wrapper, userData, extSource,
+                new SizeT(extSourceLen), extName, new SizeT(extNameLen), connToken, new SizeT(connTokenLen));
+        if (connectionId != 0) {
+            RETAINED_CALLBACKS.add(registration.wrapper);
+            callbackRegistrations.put(connectionId, registration);
+        }
+        return connectionId;
+    }
+
+    @Override
+    public boolean connectionWrite(int connectionId, byte[] data, int dataLen) {
+        return lib.copilot_runtime_connection_write(connectionId, data, new SizeT(dataLen)) != 0;
+    }
+
+    @Override
+    public boolean connectionClose(int connectionId) {
+        return lib.copilot_runtime_connection_close(connectionId) != 0;
+    }
+
+    // -------------------------------------------------------------------------
+    // Testing support
+    // -------------------------------------------------------------------------
+
+    /**
+     * Resets the process-wide static state for unit tests.
+     *
+     * <p>
+     * <strong>Must only be called from test code.</strong> Resets
+     * {@link #loadedPath} and {@link #loadedLib} so that a subsequent
+     * {@link #JnaNativeBinding(Path)} call can load a different library. In
+     * production, the library is never unloaded.
+     */
+    static void resetForTesting() {
+        synchronized (LOAD_LOCK) {
+            loadedPath = null;
+            loadedLib = null;
+            RETAINED_CALLBACKS.clear();
+        }
+    }
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/NativeBinding.java b/java/sdk/src/main/java/com/github/copilot/ffi/NativeBinding.java
new file mode 100644
index 0000000000..3aa8ca9e4d
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/NativeBinding.java
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import com.sun.jna.Pointer;
+
+/**
+ * Internal abstraction over the Copilot runtime C ABI.
+ *
+ * <p>
+ * Defines the five {@code extern "C"} entry points exposed by the native
+ * {@code runtime.node} library. The JNA-backed implementation
+ * ({@link JnaNativeBinding}) delegates to these through JNA. A future FFM
+ * implementation may be substituted via the multi-release JAR mechanism without
+ * changing callers.
+ *
+ * <p>
+ * All classes in {@code com.github.copilot.ffi} are internal; consumers must
+ * not reference them directly.
+ *
+ * <h2>C ABI entry points</h2>
+ * <ul>
+ * <li>{@code copilot_runtime_host_start} — start the runtime host</li>
+ * <li>{@code copilot_runtime_host_shutdown} — shut down the runtime host</li>
+ * <li>{@code copilot_runtime_connection_open} — open a bidirectional
+ * connection</li>
+ * <li>{@code copilot_runtime_connection_write} — write a JSON-RPC frame to the
+ * runtime</li>
+ * <li>{@code copilot_runtime_connection_close} — close a connection</li>
+ * </ul>
+ *
+ * <h2>Wire format</h2>
+ * <p>
+ * All frames use LSP {@code Content-Length} header framing, identical to the
+ * stdio transport. No special encoding or decoding is needed at the FFI
+ * boundary.
+ */
+interface NativeBinding {
+
+    /**
+     * Starts the runtime host.
+     *
+     * <p>
+     * Blocks for up to ~30 s while the worker boots and connects back. Must not be
+     * called on an async/reactive executor thread.
+     *
+     * @param argvJson
+     *            UTF-8 JSON array of strings: the entrypoint and required flags
+     * @param argvJsonLen
+     *            byte length of {@code argvJson}
+     * @param envJson
+     *            UTF-8 JSON object of environment overrides, or {@code null} when
+     *            empty
+     * @param envJsonLen
+     *            byte length of {@code envJson}, or {@code 0} when {@code envJson}
+     *            is null
+     * @return server handle ({@code 0} on failure)
+     */
+    int hostStart(byte[] argvJson, int argvJsonLen, byte[] envJson, int envJsonLen);
+
+    /**
+     * Shuts down the runtime host.
+     *
+     * @param serverId
+     *            non-zero server handle returned by {@link #hostStart}
+     * @return {@code true} on success
+     */
+    boolean hostShutdown(int serverId);
+
+    /**
+     * Opens a bidirectional connection and registers the outbound data callback.
+     *
+     * <p>
+     * The {@code extSource}, {@code extName}, and {@code connToken} parameters are
+     * reserved extension points. All current SDK implementations pass
+     * {@code null}/0 for all three.
+     *
+     * @param serverId
+     *            non-zero server handle returned by {@link #hostStart}
+     * @param callback
+     *            JNA callback invoked by the runtime on native threads when
+     *            outbound data is available; must be held as a strong reference by
+     *            the caller
+     * @param userData
+     *            opaque cookie passed back to {@code callback} unchanged; pass
+     *            {@link Pointer#NULL}
+     * @param extSource
+     *            reserved; pass {@code null}
+     * @param extSourceLen
+     *            byte length of {@code extSource}; pass {@code 0}
+     * @param extName
+     *            reserved; pass {@code null}
+     * @param extNameLen
+     *            byte length of {@code extName}; pass {@code 0}
+     * @param connToken
+     *            reserved; pass {@code null}
+     * @param connTokenLen
+     *            byte length of {@code connToken}; pass {@code 0}
+     * @return connection handle ({@code 0} on failure)
+     */
+    int connectionOpen(int serverId, OutboundCallback callback, Pointer userData, byte[] extSource, int extSourceLen,
+            byte[] extName, int extNameLen, byte[] connToken, int connTokenLen);
+
+    /**
+     * Writes a JSON-RPC frame to the runtime.
+     *
+     * <p>
+     * The native side copies the buffer synchronously before returning; the byte
+     * array does not need to survive past this call.
+     *
+     * @param connectionId
+     *            non-zero connection handle returned by {@link #connectionOpen}
+     * @param data
+     *            frame bytes
+     * @param dataLen
+     *            byte length of {@code data}
+     * @return {@code true} on success
+     */
+    boolean connectionWrite(int connectionId, byte[] data, int dataLen);
+
+    /**
+     * Closes a connection.
+     *
+     * @param connectionId
+     *            non-zero connection handle returned by {@link #connectionOpen}
+     * @return {@code true} on success
+     */
+    boolean connectionClose(int connectionId);
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/NativeRuntimeLoader.java b/java/sdk/src/main/java/com/github/copilot/ffi/NativeRuntimeLoader.java
new file mode 100644
index 0000000000..6733f4afb2
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/NativeRuntimeLoader.java
@@ -0,0 +1,506 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.channels.FileChannel;
+import java.nio.file.AccessDeniedException;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+import java.util.Properties;
+
+/**
+ * Locates the {@code runtime.node} native binary, extracts it to a versioned
+ * cache directory, and returns the filesystem path for JNA to load.
+ *
+ * <p>
+ * Resolution order:
+ * <ol>
+ * <li><strong>{@code COPILOT_CLI_PATH}</strong> — checks for
+ * {@code runtime.node} alongside the configured CLI or in its npm
+ * {@code prebuilds/<classifier>} directory before any classpath or platform
+ * work.</li>
+ * <li><strong>Classpath resource</strong>
+ * {@code native/<classifier>/runtime.node} — extracted atomically to
+ * {@code ~/.copilot/runtime-cache/<sdk-version>/<native-version>/<classifier>/runtime.node}.</li>
+ * <li><strong>PATH compatibility fallback</strong> — finds {@code copilot} on
+ * {@code PATH} and accepts only a flat sibling {@code runtime.node}. This
+ * fallback does not support normal npm or Homebrew installation layouts.</li>
+ * </ol>
+ */
+public final class NativeRuntimeLoader {
+
+    static final String RUNTIME_FILENAME = "runtime.node";
+    static final String CLI_FILENAME = "copilot";
+    static final String CLI_FILENAME_WINDOWS = "copilot.exe";
+    static final String PLATFORM_PROPERTIES_FILENAME = "platform.properties";
+    /** Environment variable that overrides where the runtime is loaded from. */
+    public static final String COPILOT_CLI_PATH_ENV = "COPILOT_CLI_PATH";
+    static final String VERSION_RESOURCE = "copilot-runtime.properties";
+
+    /**
+     * Abstraction for the atomic publish step, enabling deterministic failure
+     * injection in tests while preserving {@link StandardCopyOption#ATOMIC_MOVE} in
+     * production.
+     */
+    @FunctionalInterface
+    interface AtomicPublisher {
+        /**
+         * Atomically publishes {@code temp} to {@code cached}.
+         *
+         * @param temp
+         *            fully-written temporary file in the same directory as
+         *            {@code cached}
+         * @param cached
+         *            intended final location
+         * @throws IOException
+         *             if the move fails
+         */
+        void publish(Path temp, Path cached) throws IOException;
+    }
+
+    /**
+     * Production publisher: {@link Files#move} with
+     * {@link StandardCopyOption#ATOMIC_MOVE}.
+     */
+    static final AtomicPublisher DEFAULT_PUBLISHER = (temp, cached) -> {
+        try {
+            Files.move(temp, cached, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+        } catch (AtomicMoveNotSupportedException ex) {
+            throw new IllegalStateException("Filesystem does not support atomic moves; cannot safely publish "
+                    + RUNTIME_FILENAME + " to " + cached, ex);
+        } catch (FileAlreadyExistsException | AccessDeniedException ex) {
+            // Windows can report AccessDeniedException instead of
+            // FileAlreadyExistsException when another publisher wins the race.
+            try {
+                if (isValidCachedFile(cached)) {
+                    return;
+                }
+            } catch (IOException ignored) {
+                // fall through to the error below
+            }
+            throw new IllegalStateException(
+                    "Concurrent extraction race: target already exists but is not a valid file: " + cached, ex);
+        }
+    };
+
+    private NativeRuntimeLoader() {
+    }
+
+    /**
+     * Resolves the filesystem path to the {@code runtime.node} binary.
+     *
+     * <p>
+     * Follows the three-step resolution order documented on this class. The
+     * returned path is guaranteed to refer to a regular, non-empty file at the time
+     * of return.
+     *
+     * @return absolute path to the {@code runtime.node} binary
+     * @throws IOException
+     *             if the binary cannot be located or extracted
+     * @throws IllegalStateException
+     *             if required resources are missing or extraction fails
+     */
+    public static Path resolve() throws IOException {
+        String cliPathEnv = System.getenv(COPILOT_CLI_PATH_ENV);
+        Path cliOverride = resolveFromCliPath(cliPathEnv);
+        if (cliOverride != null) {
+            return cliOverride;
+        }
+
+        ClassLoader loader = NativeRuntimeLoader.class.getClassLoader();
+        String classifier = PlatformDetector.detectClassifier();
+        String version = readVersion(loader);
+        Path cacheBase = defaultCacheBase();
+        return resolve(null, findRuntimeOnPath(), cacheBase, loader, classifier, version);
+    }
+
+    /**
+     * Resolves the copilot CLI executable from the same location as the bundled
+     * {@code runtime.node}. The CLI is used as {@code argv[0]} in
+     * {@code copilot_runtime_host_start} — the Rust runtime spawns it as a child
+     * process.
+     *
+     * <p>
+     * This method calls {@link #resolve()} to locate {@code runtime.node}, then
+     * looks for the {@code copilot} executable in the same directory. Both
+     * artifacts are extracted from the classifier JAR together.
+     *
+     * @return absolute path to the {@code copilot} CLI executable
+     * @throws IOException
+     *             if the CLI executable cannot be located
+     */
+    public static Path resolveEntrypoint() throws IOException {
+        String configuredCli = System.getenv(COPILOT_CLI_PATH_ENV);
+        return resolveEntrypoint(configuredCli, resolve());
+    }
+
+    static Path resolveEntrypoint(String configuredCli, Path runtimePath) throws IOException {
+        if (configuredCli != null && !configuredCli.isBlank()) {
+            Path configuredPath = Path.of(configuredCli).toAbsolutePath().normalize();
+            if (resolveFromCliPath(configuredCli) != null && Files.isRegularFile(configuredPath)
+                    && Files.size(configuredPath) > 0) {
+                return configuredPath;
+            }
+        }
+
+        Path parent = runtimePath.getParent();
+        String cliName = isWindows() ? CLI_FILENAME_WINDOWS : CLI_FILENAME;
+        Path cliPath = parent.resolve(cliName);
+        if (Files.isRegularFile(cliPath) && Files.size(cliPath) > 0) {
+            return cliPath;
+        }
+        throw new IOException("Copilot CLI executable not found at " + cliPath
+                + " — the classifier JAR must contain both runtime.node and the copilot binary");
+    }
+
+    /**
+     * Reads the SDK version from the filtered {@code copilot-runtime.properties}
+     * resource.
+     *
+     * @return the version string
+     * @throws IOException
+     *             if the resource cannot be read
+     * @throws IllegalStateException
+     *             if the resource is missing or the version property is blank
+     */
+    static String readVersion(ClassLoader loader) throws IOException {
+        URL resource = loader.getResource(VERSION_RESOURCE);
+        if (resource == null) {
+            throw new IllegalStateException("Missing version resource: " + VERSION_RESOURCE
+                    + " — ensure Maven resource filtering has run (mvn process-resources)");
+        }
+        Properties props = new Properties();
+        try (InputStream in = resource.openStream()) {
+            props.load(in);
+        }
+        String version = props.getProperty("version");
+        if (version == null || version.isBlank()) {
+            throw new IllegalStateException("Blank or missing 'version' property in " + VERSION_RESOURCE
+                    + " — check Maven resource filtering configuration");
+        }
+        return version;
+    }
+
+    private static String readNativePackageVersion(ClassLoader loader, String classifier) throws IOException {
+        String resourcePath = "native/" + classifier + "/" + PLATFORM_PROPERTIES_FILENAME;
+        URL resource = loader.getResource(resourcePath);
+        if (resource == null) {
+            throw new FileNotFoundException("Native runtime metadata not found on classpath: " + resourcePath
+                    + " — add the matching classifier JAR to the classpath");
+        }
+
+        Properties props = new Properties();
+        try (InputStream in = resource.openStream()) {
+            props.load(in);
+        }
+        String version = props.getProperty("version");
+        if (version == null || version.isBlank()) {
+            throw new IllegalStateException("Blank or missing 'version' property in " + resourcePath);
+        }
+        return version;
+    }
+
+    /**
+     * Resolves the runtime binary path using the given parameters. Package-private
+     * to allow injection of test doubles in unit tests.
+     */
+    static Path resolve(String cliPathEnv, Path cacheBase, ClassLoader loader, String classifier, String version)
+            throws IOException {
+        return resolve(cliPathEnv, cacheBase, loader, classifier, version, null, DEFAULT_PUBLISHER);
+    }
+
+    static Path resolve(String cliPathEnv, String bundledCliPath, Path cacheBase, ClassLoader loader, String classifier,
+            String version) throws IOException {
+        Path bundledCliDir = bundledCliPath == null ? null : Path.of(bundledCliPath).toAbsolutePath().getParent();
+        return resolve(cliPathEnv, cacheBase, loader, classifier, version, bundledCliDir, DEFAULT_PUBLISHER);
+    }
+
+    static Path resolve(String cliPathEnv, Path cacheBase, ClassLoader loader, String classifier, String version,
+            Path bundledCliDir) throws IOException {
+        return resolve(cliPathEnv, cacheBase, loader, classifier, version, bundledCliDir, DEFAULT_PUBLISHER);
+    }
+
+    static Path resolve(String cliPathEnv, Path cacheBase, ClassLoader loader, String classifier, String version,
+            Path bundledCliDir, AtomicPublisher publisher) throws IOException {
+        Path cliOverride = resolveFromCliPath(cliPathEnv);
+        if (cliOverride != null) {
+            return cliOverride;
+        }
+
+        return resolveFromClasspathOrBundledCli(cacheBase, loader, classifier, version, bundledCliDir, publisher);
+    }
+
+    /**
+     * Checks for {@code runtime.node} alongside the configured CLI.
+     *
+     * <p>
+     * Checks, in order, the flat bundled layout ({@code runtime.node} directly next
+     * to the CLI) and the npm package layout
+     * ({@code prebuilds/<classifier>/runtime.node} next to the CLI), matching the
+     * two layouts the {@code @github/copilot-<platform>} packages may ship.
+     */
+    static Path resolveFromCliPath(String cliPathStr) throws IOException {
+        if (cliPathStr == null || cliPathStr.isBlank()) {
+            return null;
+        }
+        Path cliPath = Path.of(cliPathStr).toAbsolutePath().normalize();
+        Path parent = cliPath.getParent();
+
+        Path flat = parent.resolve(RUNTIME_FILENAME);
+        if (Files.isRegularFile(flat) && Files.size(flat) > 0) {
+            return flat;
+        }
+
+        Path prebuilt = parent.resolve("prebuilds").resolve(PlatformDetector.detectClassifier())
+                .resolve(RUNTIME_FILENAME);
+        if (Files.isRegularFile(prebuilt) && Files.size(prebuilt) > 0) {
+            return prebuilt;
+        }
+
+        return null;
+    }
+
+    /**
+     * Extracts the classpath resource {@code native/<classifier>/runtime.node} to
+     * the versioned cache directory, using an atomic publish sequence to prevent
+     * readers from observing a partially-written file. Uses
+     * {@link #DEFAULT_PUBLISHER}.
+     *
+     * @param cacheBase
+     *            root cache directory (e.g. {@code ~/.copilot/runtime-cache})
+     * @param loader
+     *            class loader used to open the classpath resource
+     * @param classifier
+     *            platform classifier (e.g. {@code linux-x64})
+     * @param version
+     *            SDK version used as part of the cache key
+     * @return path to the extracted {@code runtime.node} binary
+     * @throws IOException
+     *             if I/O or the atomic rename fails
+     * @throws IllegalStateException
+     *             if the classpath resource is missing or empty, or if the
+     *             filesystem does not support atomic moves
+     */
+    static Path extractToCache(Path cacheBase, ClassLoader loader, String classifier, String version)
+            throws IOException {
+        return extractToCache(cacheBase, loader, classifier, version, DEFAULT_PUBLISHER);
+    }
+
+    /**
+     * Extracts the classpath resource to the versioned cache directory with an
+     * injectable publisher. Package-private for unit tests.
+     *
+     * @param cacheBase
+     *            root cache directory
+     * @param loader
+     *            class loader used to open the classpath resource
+     * @param classifier
+     *            platform classifier
+     * @param version
+     *            SDK version used as part of the cache key
+     * @param publisher
+     *            atomic publish implementation
+     * @return path to the extracted {@code runtime.node} binary
+     * @throws IOException
+     *             if I/O or the atomic rename fails
+     * @throws IllegalStateException
+     *             if the classpath resource is missing or empty
+     */
+    static Path extractToCache(Path cacheBase, ClassLoader loader, String classifier, String version,
+            AtomicPublisher publisher) throws IOException {
+        String resourcePath = "native/" + classifier + "/" + RUNTIME_FILENAME;
+        String nativeVersion = readNativePackageVersion(loader, classifier);
+        Path cacheDir = cacheBase.resolve(version).resolve(nativeVersion).resolve(classifier);
+        Path cached = cacheDir.resolve(RUNTIME_FILENAME);
+
+        // Step 1 — fast path: return an existing valid cache entry.
+        if (isValidCachedFile(cached)) {
+            extractCliToCache(cacheDir, loader, classifier, publisher);
+            return cached;
+        }
+
+        // Step 2 — locate the classpath resource before creating any files.
+        URL resource = loader.getResource(resourcePath);
+        if (resource == null) {
+            throw new FileNotFoundException("Native runtime not found on classpath: " + resourcePath
+                    + " — add the matching classifier JAR to the classpath");
+        }
+
+        // Step 3 — ensure the cache directory exists.
+        Files.createDirectories(cacheDir);
+
+        // Step 4 — write to a unique sibling temp file, then publish atomically.
+        Path temp = Files.createTempFile(cacheDir, "runtime-tmp-", ".node");
+        try {
+            copyResourceToTemp(resource, resourcePath, temp);
+            publisher.publish(temp, cached);
+        } finally {
+            tryDelete(temp);
+        }
+
+        // Step 5 — also extract the copilot CLI executable alongside runtime.node.
+        extractCliToCache(cacheDir, loader, classifier, publisher);
+
+        return cached;
+    }
+
+    /**
+     * Extracts the copilot CLI executable from the classpath to the same cache
+     * directory as {@code runtime.node}. Idempotent — skips extraction if already
+     * present and valid.
+     */
+    static void extractCliToCache(Path cacheDir, ClassLoader loader, String classifier, AtomicPublisher publisher)
+            throws IOException {
+        String cliName = isWindows() ? CLI_FILENAME_WINDOWS : CLI_FILENAME;
+        String cliResourcePath = "native/" + classifier + "/" + cliName;
+        Path cachedCli = cacheDir.resolve(cliName);
+
+        if (isValidCachedCli(cachedCli)) {
+            return;
+        }
+
+        URL cliResource = loader.getResource(cliResourcePath);
+        if (cliResource == null) {
+            // CLI not on classpath — this is allowed for the COPILOT_CLI_PATH fallback
+            // path but will fail later in resolveEntrypoint() if InProcess is selected.
+            return;
+        }
+
+        Files.createDirectories(cacheDir);
+        Path temp = Files.createTempFile(cacheDir, "cli-tmp-", "");
+        try {
+            copyResourceToTemp(cliResource, cliResourcePath, temp);
+            makeExecutable(temp);
+            publisher.publish(temp, cachedCli);
+        } finally {
+            tryDelete(temp);
+        }
+
+        if (!isValidCachedCli(cachedCli)) {
+            throw new IOException("Published Copilot CLI is not a non-empty executable file: " + cachedCli);
+        }
+    }
+
+    /**
+     * Tries source 2 (classpath extraction) first and falls back to source 3
+     * (bundled-CLI sibling) only when the classpath resource is absent.
+     */
+    private static Path resolveFromClasspathOrBundledCli(Path cacheBase, ClassLoader loader, String classifier,
+            String version, Path bundledCliDir, AtomicPublisher publisher) throws IOException {
+        // Source 2: classpath resource.
+        try {
+            return extractToCache(cacheBase, loader, classifier, version, publisher);
+        } catch (FileNotFoundException ex) {
+            // Source 3: runtime.node alongside the bundled CLI binary.
+            if (bundledCliDir != null) {
+                Path candidate = bundledCliDir.resolve(RUNTIME_FILENAME);
+                try {
+                    if (isValidCachedFile(candidate)) {
+                        return candidate;
+                    }
+                } catch (IOException ignored) {
+                    // fall through and rethrow the original classpath error
+                }
+            }
+            throw ex;
+        }
+    }
+
+    private static boolean isValidCachedFile(Path path) throws IOException {
+        if (!Files.isRegularFile(path)) {
+            return false;
+        }
+        return Files.size(path) > 0;
+    }
+
+    private static boolean isValidCachedCli(Path path) throws IOException {
+        return isValidCachedFile(path) && (isWindows() || Files.isExecutable(path));
+    }
+
+    private static void makeExecutable(Path path) throws IOException {
+        if (isWindows()) {
+            return;
+        }
+        final boolean executableSet;
+        try {
+            executableSet = path.toFile().setExecutable(true, false);
+        } catch (SecurityException ex) {
+            throw new IOException("Failed to make Copilot CLI executable: " + path, ex);
+        }
+        if (!executableSet || !Files.isExecutable(path)) {
+            throw new IOException("Failed to make Copilot CLI executable: " + path);
+        }
+    }
+
+    private static void copyResourceToTemp(URL resource, String resourcePath, Path temp) throws IOException {
+        try (InputStream in = resource.openStream()) {
+            long bytesWritten = Files.copy(in, temp, StandardCopyOption.REPLACE_EXISTING);
+            if (bytesWritten == 0) {
+                throw new IllegalStateException("Classpath resource is empty: " + resourcePath);
+            }
+        }
+        // Flush OS buffers to durable storage before the atomic rename.
+        try (FileChannel channel = FileChannel.open(temp, StandardOpenOption.WRITE)) {
+            channel.force(true);
+        }
+    }
+
+    /**
+     * Finds the Copilot CLI executable on the {@code PATH}.
+     *
+     * @return the absolute CLI path, or {@code null} if none was found
+     */
+    public static String findRuntimeOnPath() {
+        String pathValue = System.getenv("PATH");
+        if (pathValue == null || pathValue.isBlank()) {
+            return null;
+        }
+
+        String[] executableNames = isWindows()
+                ? new String[]{"copilot.exe", "copilot.cmd", "copilot.bat", "copilot"}
+                : new String[]{"copilot"};
+        for (String directory : pathValue.split(java.io.File.pathSeparator)) {
+            if (directory.isBlank()) {
+                continue;
+            }
+            for (String executableName : executableNames) {
+                Path candidate = Path.of(directory, executableName);
+                if (Files.isRegularFile(candidate)) {
+                    try {
+                        return candidate.toRealPath().toString();
+                    } catch (IOException ignored) {
+                        return candidate.toAbsolutePath().normalize().toString();
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private static boolean isWindows() {
+        return System.getProperty("os.name", "").toLowerCase(java.util.Locale.ROOT).contains("win");
+    }
+
+    private static void tryDelete(Path path) {
+        try {
+            Files.deleteIfExists(path);
+        } catch (IOException ignored) {
+            // Best-effort cleanup; an orphaned temp file in the cache directory is benign.
+        }
+    }
+
+    private static Path defaultCacheBase() {
+        return Path.of(System.getProperty("user.home"), ".copilot", "runtime-cache");
+    }
+
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/OutboundCallback.java b/java/sdk/src/main/java/com/github/copilot/ffi/OutboundCallback.java
new file mode 100644
index 0000000000..597feea9e0
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/OutboundCallback.java
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import com.sun.jna.Callback;
+import com.sun.jna.Pointer;
+
+/**
+ * JNA callback interface for the runtime-to-Java outbound data path.
+ *
+ * <p>
+ * The native runtime invokes this callback on a native thread when data is
+ * ready to be delivered to the Java side. JNA automatically attaches the native
+ * thread to the JVM before dispatching the callback.
+ *
+ * <p>
+ * <strong>Buffer lifetime:</strong> The {@code data} pointer is only valid for
+ * the duration of the callback invocation. Implementations must copy the bytes
+ * out (e.g. {@code data.getByteArray(0, len)}) before returning.
+ *
+ * <p>
+ * <strong>GC protection:</strong> Instances must be held as strong-reference
+ * fields for as long as native code may invoke the callback. If the instance is
+ * garbage-collected, the function pointer becomes dangling and the JVM will
+ * crash.
+ */
+@FunctionalInterface
+interface OutboundCallback extends Callback {
+
+    /**
+     * Invoked by the native runtime when outbound data is available.
+     *
+     * @param userData
+     *            opaque cookie passed through unchanged from
+     *            {@code copilot_runtime_connection_open}; always
+     *            {@code Pointer.NULL} in this SDK
+     * @param data
+     *            pointer to the outbound byte buffer; valid only for the duration
+     *            of this invocation
+     * @param len
+     *            byte length of the buffer pointed to by {@code data}
+     */
+    void invoke(Pointer userData, Pointer data, SizeT len);
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/PlatformDetector.java b/java/sdk/src/main/java/com/github/copilot/ffi/PlatformDetector.java
new file mode 100644
index 0000000000..466cf794bc
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/PlatformDetector.java
@@ -0,0 +1,303 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Detects the current platform and resolves the runtime classifier.
+ */
+public final class PlatformDetector {
+    private static final int ELF_HEADER_PROBE_BYTES = 2048;
+    private static final int ELF_MAGIC_0 = 0x7F;
+    private static final int ELF_MAGIC_1 = 'E';
+    private static final int ELF_MAGIC_2 = 'L';
+    private static final int ELF_MAGIC_3 = 'F';
+    private static final int ELF_CLASS_32 = 1;
+    private static final int ELF_CLASS_64 = 2;
+    private static final int ELF_DATA_LITTLE_ENDIAN = 1;
+    private static final int ELF_DATA_BIG_ENDIAN = 2;
+    private static final int ELF32_PROGRAM_HEADER_SIZE = 32;
+    private static final int ELF64_PROGRAM_HEADER_SIZE = 56;
+    private static final int PT_INTERP = 3;
+
+    private static final Set<String> SUPPORTED_CLASSIFIERS = Set.of("linux-x64", "linux-arm64", "linuxmusl-x64",
+            "linuxmusl-arm64", "darwin-x64", "darwin-arm64", "win32-x64", "win32-arm64");
+
+    private static final Map<ClassifierKey, String> CLASSIFIER_BY_KEY = Map.ofEntries(
+            Map.entry(new ClassifierKey("linux", "x64", LinuxLibc.GLIBC), "linux-x64"),
+            Map.entry(new ClassifierKey("linux", "arm64", LinuxLibc.GLIBC), "linux-arm64"),
+            Map.entry(new ClassifierKey("linux", "x64", LinuxLibc.MUSL), "linuxmusl-x64"),
+            Map.entry(new ClassifierKey("linux", "arm64", LinuxLibc.MUSL), "linuxmusl-arm64"),
+            Map.entry(new ClassifierKey("linux", "x64", LinuxLibc.UNKNOWN), "linux-x64"),
+            Map.entry(new ClassifierKey("linux", "arm64", LinuxLibc.UNKNOWN), "linux-arm64"),
+            Map.entry(new ClassifierKey("darwin", "x64", LinuxLibc.UNKNOWN), "darwin-x64"),
+            Map.entry(new ClassifierKey("darwin", "arm64", LinuxLibc.UNKNOWN), "darwin-arm64"),
+            Map.entry(new ClassifierKey("win32", "x64", LinuxLibc.UNKNOWN), "win32-x64"),
+            Map.entry(new ClassifierKey("win32", "arm64", LinuxLibc.UNKNOWN), "win32-arm64"));
+
+    private PlatformDetector() {
+    }
+
+    /**
+     * Linux C runtime classification.
+     */
+    public enum LinuxLibc {
+        /** GNU libc runtime. */
+        GLIBC,
+
+        /** musl libc runtime. */
+        MUSL,
+
+        /** Unknown or undetectable runtime. */
+        UNKNOWN
+    }
+
+    /**
+     * Detects the normalized operating system identifier.
+     *
+     * @return {@code darwin}, {@code linux}, or {@code win32}
+     */
+    public static String detectOs() {
+        return detectOs(System.getProperty("os.name", ""));
+    }
+
+    /**
+     * Detects the normalized architecture identifier.
+     *
+     * @return {@code x64} or {@code arm64}
+     */
+    public static String detectArch() {
+        return detectArch(System.getProperty("os.arch", ""));
+    }
+
+    /**
+     * Detects the Linux libc variant using {@code /proc/self/exe} PT_INTERP.
+     *
+     * @return Linux libc classification; {@code UNKNOWN} on non-Linux or parse
+     *         failures
+     */
+    public static LinuxLibc detectLinuxLibc() {
+        if (!"linux".equals(detectOs())) {
+            return LinuxLibc.UNKNOWN;
+        }
+        return detectLinuxLibc(Path.of("/proc/self/exe"));
+    }
+
+    /**
+     * Detects the runtime classifier for the current platform.
+     *
+     * @return platform classifier string
+     */
+    public static String detectClassifier() {
+        return detectClassifier(detectOs(), detectArch(), detectLinuxLibc());
+    }
+
+    static String detectOs(String osName) {
+        String normalized = osName.toLowerCase(Locale.ROOT);
+        if (normalized.contains("mac") || normalized.contains("darwin")) {
+            return "darwin";
+        }
+        if (normalized.contains("win")) {
+            return "win32";
+        }
+        if (normalized.contains("linux")) {
+            return "linux";
+        }
+        throw new IllegalStateException("Unsupported os.name: " + osName);
+    }
+
+    static String detectArch(String osArch) {
+        String normalized = osArch.toLowerCase(Locale.ROOT).replace('-', '_');
+        if (normalized.equals("amd64") || normalized.equals("x86_64") || normalized.equals("x64")) {
+            return "x64";
+        }
+        if (normalized.equals("aarch64") || normalized.equals("arm64")) {
+            return "arm64";
+        }
+        throw new IllegalStateException("Unsupported os.arch: " + osArch);
+    }
+
+    static LinuxLibc detectLinuxLibc(Path executablePath) {
+        try {
+            return detectLinuxLibc(readPrefix(executablePath, ELF_HEADER_PROBE_BYTES));
+        } catch (IOException ex) {
+            return LinuxLibc.UNKNOWN;
+        }
+    }
+
+    static LinuxLibc detectLinuxLibc(byte[] elfPrefix) throws IOException {
+        String interpreter = readElfPtInterp(elfPrefix);
+        if (interpreter.contains("/ld-musl-")) {
+            return LinuxLibc.MUSL;
+        }
+        if (interpreter.contains("/ld-linux-")) {
+            return LinuxLibc.GLIBC;
+        }
+        return LinuxLibc.UNKNOWN;
+    }
+
+    static String detectClassifier(String os, String arch, LinuxLibc linuxLibc) {
+        LinuxLibc classifierLibc = "linux".equals(os) ? linuxLibc : LinuxLibc.UNKNOWN;
+        String classifier = CLASSIFIER_BY_KEY.get(new ClassifierKey(os, arch, classifierLibc));
+        if (classifier == null || !SUPPORTED_CLASSIFIERS.contains(classifier)) {
+            throw new IllegalStateException(
+                    "Unsupported platform tuple: os=" + os + ", arch=" + arch + ", libc=" + classifierLibc);
+        }
+        return classifier;
+    }
+
+    static Set<String> supportedClassifiers() {
+        return SUPPORTED_CLASSIFIERS;
+    }
+
+    private static String readElfPtInterp(byte[] probe) throws IOException {
+        int size = probe.length;
+        if (size < 64) {
+            throw new IOException("ELF probe too small: " + size + " bytes");
+        }
+        if ((probe[0] & 0xFF) != ELF_MAGIC_0 || (probe[1] & 0xFF) != ELF_MAGIC_1 || (probe[2] & 0xFF) != ELF_MAGIC_2
+                || (probe[3] & 0xFF) != ELF_MAGIC_3) {
+            throw new IOException("Not an ELF executable");
+        }
+
+        int elfClass = probe[4] & 0xFF;
+        int elfData = probe[5] & 0xFF;
+        if (elfData != ELF_DATA_LITTLE_ENDIAN && elfData != ELF_DATA_BIG_ENDIAN) {
+            throw new IOException("Unsupported ELF data encoding: " + elfData);
+        }
+        boolean littleEndian = elfData == ELF_DATA_LITTLE_ENDIAN;
+
+        long phoff;
+        int phentsize;
+        int phnum;
+        int minimumPhentsize;
+        if (elfClass == ELF_CLASS_64) {
+            phoff = readUInt64(probe, 32, littleEndian);
+            phentsize = readUInt16(probe, 54, littleEndian);
+            phnum = readUInt16(probe, 56, littleEndian);
+            minimumPhentsize = ELF64_PROGRAM_HEADER_SIZE;
+        } else if (elfClass == ELF_CLASS_32) {
+            phoff = readUInt32(probe, 28, littleEndian);
+            phentsize = readUInt16(probe, 42, littleEndian);
+            phnum = readUInt16(probe, 44, littleEndian);
+            minimumPhentsize = ELF32_PROGRAM_HEADER_SIZE;
+        } else {
+            throw new IOException("Unsupported ELF class: " + elfClass);
+        }
+
+        if (phoff < 0 || phoff >= size) {
+            throw new IOException("Program header table offset outside probe window: " + phoff);
+        }
+        if (phentsize < minimumPhentsize || phnum <= 0) {
+            throw new IOException("Invalid ELF program header metadata: phentsize=" + phentsize + ", phnum=" + phnum);
+        }
+
+        for (int i = 0; i < phnum; i++) {
+            long baseLong = phoff + ((long) i * phentsize);
+            if (baseLong < 0 || baseLong > Integer.MAX_VALUE) {
+                break;
+            }
+            int base = (int) baseLong;
+            if (base + phentsize > size) {
+                break;
+            }
+
+            long pType = readUInt32(probe, base, littleEndian);
+            if (pType != PT_INTERP) {
+                continue;
+            }
+
+            long pOffset;
+            long pFileSize;
+            if (elfClass == ELF_CLASS_64) {
+                pOffset = readUInt64(probe, base + 8, littleEndian);
+                pFileSize = readUInt64(probe, base + 32, littleEndian);
+            } else {
+                pOffset = readUInt32(probe, base + 4, littleEndian);
+                pFileSize = readUInt32(probe, base + 16, littleEndian);
+            }
+
+            if (pOffset < 0 || pFileSize <= 0 || pOffset > Integer.MAX_VALUE || pFileSize > Integer.MAX_VALUE) {
+                throw new IOException("Invalid PT_INTERP bounds");
+            }
+
+            int start = (int) pOffset;
+            int end = start + (int) pFileSize;
+            if (end > size) {
+                throw new IOException("PT_INTERP extends past probe window; increase probe size");
+            }
+
+            int nulIndex = start;
+            while (nulIndex < end && probe[nulIndex] != 0) {
+                nulIndex++;
+            }
+            if (nulIndex == start) {
+                throw new IOException("Empty PT_INTERP segment");
+            }
+            return new String(probe, start, nulIndex - start, StandardCharsets.UTF_8);
+        }
+
+        throw new IOException("ELF PT_INTERP segment not found");
+    }
+
+    private static byte[] readPrefix(Path path, int maxBytes) throws IOException {
+        byte[] buffer = new byte[maxBytes];
+        int total = 0;
+        try (InputStream in = Files.newInputStream(path)) {
+            while (total < maxBytes) {
+                int read = in.read(buffer, total, maxBytes - total);
+                if (read < 0) {
+                    break;
+                }
+                total += read;
+            }
+        }
+        byte[] resized = new byte[total];
+        System.arraycopy(buffer, 0, resized, 0, total);
+        return resized;
+    }
+
+    private static int readUInt16(byte[] data, int offset, boolean littleEndian) {
+        int b0 = data[offset] & 0xFF;
+        int b1 = data[offset + 1] & 0xFF;
+        return littleEndian ? (b0 | (b1 << 8)) : ((b0 << 8) | b1);
+    }
+
+    private static long readUInt32(byte[] data, int offset, boolean littleEndian) {
+        long b0 = data[offset] & 0xFFL;
+        long b1 = data[offset + 1] & 0xFFL;
+        long b2 = data[offset + 2] & 0xFFL;
+        long b3 = data[offset + 3] & 0xFFL;
+        if (littleEndian) {
+            return b0 | (b1 << 8) | (b2 << 16) | (b3 << 24);
+        }
+        return (b0 << 24) | (b1 << 16) | (b2 << 8) | b3;
+    }
+
+    private static long readUInt64(byte[] data, int offset, boolean littleEndian) {
+        long result = 0L;
+        if (littleEndian) {
+            for (int i = 7; i >= 0; i--) {
+                result = (result << 8) | (data[offset + i] & 0xFFL);
+            }
+            return result;
+        }
+        for (int i = 0; i < 8; i++) {
+            result = (result << 8) | (data[offset + i] & 0xFFL);
+        }
+        return result;
+    }
+
+    private record ClassifierKey(String os, String arch, LinuxLibc libc) {
+    }
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/QueueInputStream.java b/java/sdk/src/main/java/com/github/copilot/ffi/QueueInputStream.java
new file mode 100644
index 0000000000..977182d5f4
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/QueueInputStream.java
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * {@link InputStream} backed by a {@link BlockingQueue} of byte-array chunks.
+ *
+ * <p>
+ * Used by the in-process FFI transport to bridge native callback frames into
+ * the JSON-RPC reader.
+ */
+public class QueueInputStream extends InputStream {
+
+    private static final byte[] EOF_SENTINEL = new byte[0];
+
+    private final BlockingQueue<byte[]> queue;
+    private final AtomicBoolean closed = new AtomicBoolean(false);
+
+    private byte[] currentChunk;
+    private int currentOffset;
+    private boolean eof;
+
+    /**
+     * Creates a queue-backed input stream with an unbounded queue.
+     */
+    public QueueInputStream() {
+        this(new LinkedBlockingQueue<>());
+    }
+
+    /**
+     * Testing constructor that injects a queue implementation.
+     *
+     * @param queue
+     *            backing queue
+     */
+    QueueInputStream(BlockingQueue<byte[]> queue) {
+        this.queue = Objects.requireNonNull(queue, "queue must not be null");
+    }
+
+    void enqueue(byte[] bytes) {
+        if (bytes == null || bytes.length == 0 || closed.get()) {
+            return;
+        }
+        queue.offer(bytes);
+    }
+
+    @Override
+    public int read() throws IOException {
+        byte[] one = new byte[1];
+        int read = read(one, 0, 1);
+        if (read == -1) {
+            return -1;
+        }
+        return one[0] & 0xFF;
+    }
+
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException {
+        Objects.requireNonNull(b, "buffer must not be null");
+        if (off < 0 || len < 0 || off + len > b.length) {
+            throw new IndexOutOfBoundsException("Invalid off/len for buffer of length " + b.length);
+        }
+        if (len == 0) {
+            return 0;
+        }
+        if (eof) {
+            return -1;
+        }
+
+        while (currentChunk == null || currentOffset >= currentChunk.length) {
+            byte[] next;
+            try {
+                next = queue.take();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new IOException("Interrupted while waiting for callback data", e);
+            }
+            if (next == EOF_SENTINEL) {
+                eof = true;
+                return -1;
+            }
+            if (next.length == 0) {
+                continue;
+            }
+            currentChunk = next;
+            currentOffset = 0;
+        }
+
+        int available = currentChunk.length - currentOffset;
+        int toCopy = Math.min(available, len);
+        System.arraycopy(currentChunk, currentOffset, b, off, toCopy);
+        currentOffset += toCopy;
+        return toCopy;
+    }
+
+    @Override
+    public int available() {
+        if (currentChunk == null || currentOffset >= currentChunk.length) {
+            return 0;
+        }
+        return currentChunk.length - currentOffset;
+    }
+
+    @Override
+    public void close() {
+        if (closed.compareAndSet(false, true)) {
+            queue.offer(EOF_SENTINEL);
+        }
+    }
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/ReaderThreadFactory.java b/java/sdk/src/main/java/com/github/copilot/ffi/ReaderThreadFactory.java
new file mode 100644
index 0000000000..b0824fa9a7
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/ReaderThreadFactory.java
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+/**
+ * Creates reader threads for FFI queue consumption.
+ *
+ * <p>
+ * Baseline (JDK 17) implementation creates a daemon platform thread. The JDK 25
+ * multi-release overlay switches this to a virtual thread with the same
+ * package-private API.
+ */
+final class ReaderThreadFactory {
+
+    Thread create(Runnable task, String name) {
+        Thread thread = new Thread(task, name);
+        thread.setDaemon(true);
+        return thread;
+    }
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/ffi/SizeT.java b/java/sdk/src/main/java/com/github/copilot/ffi/SizeT.java
new file mode 100644
index 0000000000..5bec1c327c
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/SizeT.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import com.sun.jna.IntegerType;
+import com.sun.jna.Native;
+
+/**
+ * JNA type mapping for the C {@code size_t} type.
+ *
+ * <p>
+ * {@code size_t} is pointer-sized: 8 bytes on 64-bit platforms, 4 bytes on
+ * 32-bit. Using Java {@code int} (always 4 bytes) would silently truncate on
+ * 64-bit, and using {@link com.sun.jna.NativeLong} would be wrong on Windows
+ * x64 where C {@code long} is 4 bytes but {@code size_t} is 8 bytes.
+ *
+ * <p>
+ * This class uses {@link Native#SIZE_T_SIZE} so JNA marshals the correct width
+ * on every platform.
+ */
+public final class SizeT extends IntegerType {
+
+    /** Zero-valued instance; required by JNA for return-type instantiation. */
+    public SizeT() {
+        this(0);
+    }
+
+    /**
+     * Creates a {@code size_t} with the given value.
+     *
+     * @param value
+     *            the numeric value (unsigned, but stored as signed long)
+     */
+    public SizeT(long value) {
+        super(Native.SIZE_T_SIZE, value, true);
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/package-info.java b/java/sdk/src/main/java/com/github/copilot/package-info.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/package-info.java
rename to java/sdk/src/main/java/com/github/copilot/package-info.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AgentInfo.java b/java/sdk/src/main/java/com/github/copilot/rpc/AgentInfo.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AgentInfo.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AgentInfo.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AgentMode.java b/java/sdk/src/main/java/com/github/copilot/rpc/AgentMode.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AgentMode.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AgentMode.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AgentStopHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/AgentStopHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AgentStopHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AgentStopHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AgentStopHookInput.java b/java/sdk/src/main/java/com/github/copilot/rpc/AgentStopHookInput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AgentStopHookInput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AgentStopHookInput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AgentStopHookOutput.java b/java/sdk/src/main/java/com/github/copilot/rpc/AgentStopHookOutput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AgentStopHookOutput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AgentStopHookOutput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/Attachment.java b/java/sdk/src/main/java/com/github/copilot/rpc/Attachment.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/Attachment.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/Attachment.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AutoModeSwitchHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/AutoModeSwitchHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AutoModeSwitchHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AutoModeSwitchHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AutoModeSwitchInvocation.java b/java/sdk/src/main/java/com/github/copilot/rpc/AutoModeSwitchInvocation.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AutoModeSwitchInvocation.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AutoModeSwitchInvocation.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AutoModeSwitchRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/AutoModeSwitchRequest.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AutoModeSwitchRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AutoModeSwitchRequest.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AutoModeSwitchResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/AutoModeSwitchResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AutoModeSwitchResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AutoModeSwitchResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/AzureOptions.java b/java/sdk/src/main/java/com/github/copilot/rpc/AzureOptions.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/AzureOptions.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/AzureOptions.java
diff --git a/java/src/main/java/com/github/copilot/rpc/BearerTokenProvider.java b/java/sdk/src/main/java/com/github/copilot/rpc/BearerTokenProvider.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/BearerTokenProvider.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/BearerTokenProvider.java
diff --git a/java/src/main/java/com/github/copilot/rpc/BlobAttachment.java b/java/sdk/src/main/java/com/github/copilot/rpc/BlobAttachment.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/BlobAttachment.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/BlobAttachment.java
diff --git a/java/src/main/java/com/github/copilot/rpc/BuiltInTools.java b/java/sdk/src/main/java/com/github/copilot/rpc/BuiltInTools.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/BuiltInTools.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/BuiltInTools.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CapiSessionOptions.java b/java/sdk/src/main/java/com/github/copilot/rpc/CapiSessionOptions.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CapiSessionOptions.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CapiSessionOptions.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CloudSessionOptions.java b/java/sdk/src/main/java/com/github/copilot/rpc/CloudSessionOptions.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CloudSessionOptions.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CloudSessionOptions.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CloudSessionRepository.java b/java/sdk/src/main/java/com/github/copilot/rpc/CloudSessionRepository.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CloudSessionRepository.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CloudSessionRepository.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CommandContext.java b/java/sdk/src/main/java/com/github/copilot/rpc/CommandContext.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CommandContext.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CommandContext.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CommandDefinition.java b/java/sdk/src/main/java/com/github/copilot/rpc/CommandDefinition.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CommandDefinition.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CommandDefinition.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CommandHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/CommandHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CommandHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CommandHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CommandWireDefinition.java b/java/sdk/src/main/java/com/github/copilot/rpc/CommandWireDefinition.java
similarity index 92%
rename from java/src/main/java/com/github/copilot/rpc/CommandWireDefinition.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CommandWireDefinition.java
index 20b8d5b63d..892f124d58 100644
--- a/java/src/main/java/com/github/copilot/rpc/CommandWireDefinition.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/CommandWireDefinition.java
@@ -31,7 +31,7 @@ public CommandWireDefinition() {
     /** Creates a definition with name and description. */
     public CommandWireDefinition(String name, String description) {
         this.name = name;
-        this.description = description;
+        this.description = description == null ? "" : description;
     }
 
     /** Gets the command name. @return the name */
@@ -52,7 +52,7 @@ public String getDescription() {
 
     /** Sets the description. @param description the description @return this */
     public CommandWireDefinition setDescription(String description) {
-        this.description = description;
+        this.description = description == null ? "" : description;
         return this;
     }
 }
diff --git a/java/src/main/java/com/github/copilot/rpc/CopilotClientMode.java b/java/sdk/src/main/java/com/github/copilot/rpc/CopilotClientMode.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CopilotClientMode.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CopilotClientMode.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CopilotClientOptions.java b/java/sdk/src/main/java/com/github/copilot/rpc/CopilotClientOptions.java
similarity index 89%
rename from java/src/main/java/com/github/copilot/rpc/CopilotClientOptions.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CopilotClientOptions.java
index 0d4494d738..d3515509b5 100644
--- a/java/src/main/java/com/github/copilot/rpc/CopilotClientOptions.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/CopilotClientOptions.java
@@ -4,11 +4,15 @@
 
 package com.github.copilot.rpc;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Function;
@@ -19,8 +23,6 @@
 import com.github.copilot.CopilotExperimental;
 import com.github.copilot.CopilotRequestHandler;
 import com.github.copilot.generated.rpc.GitHubTelemetryNotification;
-import java.util.Optional;
-import java.util.OptionalInt;
 
 /**
  * Configuration options for creating a
@@ -48,9 +50,11 @@ public class CopilotClientOptions {
     @Deprecated
     private boolean autoRestart;
     private boolean autoStart = true;
+    private List<Path> builtinPluginDirectories;
     private String[] cliArgs;
     private String cliPath;
     private String cliUrl;
+    private RuntimeConnection connection;
     private String copilotHome;
     private String cwd;
     private Map<String, String> environment;
@@ -119,6 +123,40 @@ public CopilotClientOptions setAutoStart(boolean autoStart) {
         return this;
     }
 
+    /**
+     * Gets the trusted plugin directories bundled by the host.
+     *
+     * @return a copy of the configured absolute paths, or {@code null}
+     */
+    public List<Path> getBuiltinPluginDirectories() {
+        return builtinPluginDirectories != null ? new ArrayList<>(builtinPluginDirectories) : null;
+    }
+
+    /**
+     * Sets trusted plugin directories bundled by the host. Every path must be
+     * absolute. When non-empty, the complete set is registered during startup
+     * before sessions can be created.
+     *
+     * @param paths
+     *            absolute plugin directory paths, or {@code null}/empty to disable
+     * @return this options instance for method chaining
+     */
+    public CopilotClientOptions setBuiltinPluginDirectories(List<Path> paths) {
+        if (paths == null || paths.isEmpty()) {
+            this.builtinPluginDirectories = null;
+            return this;
+        }
+        for (Path path : paths) {
+            Objects.requireNonNull(path, "builtin plugin directory path must not be null");
+            if (!path.isAbsolute()) {
+                throw new IllegalArgumentException(
+                        "BuiltinPluginDirectories must contain only absolute paths: " + path);
+            }
+        }
+        this.builtinPluginDirectories = new ArrayList<>(paths);
+        return this;
+    }
+
     /**
      * Gets the extra CLI arguments.
      * <p>
@@ -204,6 +242,41 @@ public CopilotClientOptions setCliUrl(String cliUrl) {
         return this;
     }
 
+    /**
+     * Gets the connection that selects how the client reaches the Copilot runtime.
+     *
+     * @return the connection, or {@code null} to infer the transport from
+     *         {@link #isUseStdio()}, {@link #getCliUrl()} and {@link #getCliPath()}
+     */
+    @JsonIgnore
+    @CopilotExperimental
+    public RuntimeConnection getConnection() {
+        return connection;
+    }
+
+    /**
+     * Sets the connection that selects how the client reaches the Copilot runtime.
+     * <p>
+     * When set, the connection takes precedence over the transport-selecting
+     * options {@link #setUseStdio(boolean)}, {@link #setCliUrl(String)},
+     * {@link #setCliPath(String)}, {@link #setPort(int)} and
+     * {@link #setTcpConnectionToken(String)}; combining a connection with
+     * conflicting values for any of those options makes the client constructor
+     * throw {@link IllegalArgumentException}. Values that match what the connection
+     * implies are accepted, so the same options instance can be reused across
+     * multiple client constructions.
+     *
+     * @param connection
+     *            the connection, or {@code null} to infer the transport from the
+     *            individual transport options
+     * @return this options instance for method chaining
+     */
+    @CopilotExperimental
+    public CopilotClientOptions setConnection(RuntimeConnection connection) {
+        this.connection = connection;
+        return this;
+    }
+
     /**
      * Gets the base directory for Copilot data (session state, config, etc.).
      *
@@ -248,13 +321,11 @@ public String getCwd() {
      * Sets the working directory for the CLI process.
      *
      * @param cwd
-     *            the working directory path (must not be {@code null} or empty)
+     *            the working directory path, or {@code null} to clear
      * @return this options instance for method chaining
-     * @throws IllegalArgumentException
-     *             if {@code cwd} is {@code null} or empty
      */
     public CopilotClientOptions setCwd(String cwd) {
-        this.cwd = Objects.requireNonNull(cwd, "cwd must not be null");
+        this.cwd = cwd;
         return this;
     }
 
@@ -751,9 +822,13 @@ public CopilotClientOptions clone() {
         CopilotClientOptions copy = new CopilotClientOptions();
         copy.autoRestart = this.autoRestart;
         copy.autoStart = this.autoStart;
+        copy.builtinPluginDirectories = this.builtinPluginDirectories != null
+                ? new ArrayList<>(this.builtinPluginDirectories)
+                : null;
         copy.cliArgs = this.cliArgs != null ? this.cliArgs.clone() : null;
         copy.cliPath = this.cliPath;
         copy.cliUrl = this.cliUrl;
+        copy.connection = this.connection;
         copy.copilotHome = this.copilotHome;
         copy.cwd = this.cwd;
         copy.environment = this.environment != null ? new java.util.HashMap<>(this.environment) : null;
diff --git a/java/src/main/java/com/github/copilot/rpc/CopilotExpAssignmentResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/CopilotExpAssignmentResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CopilotExpAssignmentResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CopilotExpAssignmentResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java
similarity index 94%
rename from java/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java
index 44cb8145c3..403893987d 100644
--- a/java/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java
@@ -80,6 +80,9 @@ public final class CreateSessionRequest {
     @JsonProperty("enableCitations")
     private Boolean enableCitations;
 
+    @JsonProperty("enableFileChangeTracking")
+    private Boolean enableFileChangeTracking;
+
     @JsonProperty("sessionLimits")
     private SessionLimitsConfig sessionLimits;
 
@@ -152,6 +155,9 @@ public final class CreateSessionRequest {
     @JsonProperty("disabledSkills")
     private List<String> disabledSkills;
 
+    @JsonProperty("disabledMcpServers")
+    private List<String> disabledMcpServers;
+
     @JsonProperty("configDir")
     private String configDirectory;
 
@@ -218,6 +224,9 @@ public final class CreateSessionRequest {
     @JsonProperty("gitHubToken")
     private String gitHubToken;
 
+    @JsonProperty("gitHubTokenProviderRegistrationId")
+    private String gitHubTokenProviderRegistrationId;
+
     @JsonProperty("remoteSession")
     private String remoteSession;
 
@@ -231,6 +240,10 @@ public final class CreateSessionRequest {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean enableManagedSettings;
 
+    @JsonProperty("managedSettings")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private ManagedSettings managedSettings;
+
     /** Gets the model name. @return the model */
     public String getModel() {
         return model;
@@ -427,6 +440,21 @@ public void setEnableCitations(boolean enableCitations) {
         this.enableCitations = enableCitations;
     }
 
+    /** Gets the file change tracking flag. @return the flag */
+    public Boolean getEnableFileChangeTracking() {
+        return enableFileChangeTracking;
+    }
+
+    /**
+     * Sets the file change tracking flag.
+     *
+     * @param enableFileChangeTracking
+     *            the flag
+     */
+    public void setEnableFileChangeTracking(boolean enableFileChangeTracking) {
+        this.enableFileChangeTracking = enableFileChangeTracking;
+    }
+
     /** Gets the session limits. @return the session limits */
     public SessionLimitsConfig getSessionLimits() {
         return sessionLimits;
@@ -697,6 +725,18 @@ public void setDisabledSkills(List<String> disabledSkills) {
         this.disabledSkills = disabledSkills;
     }
 
+    /** Gets disabled MCP server names. @return the server names */
+    public List<String> getDisabledMcpServers() {
+        return disabledMcpServers == null ? null : Collections.unmodifiableList(disabledMcpServers);
+    }
+
+    /**
+     * Sets disabled MCP server names. @param disabledMcpServers the server names
+     */
+    public void setDisabledMcpServers(List<String> disabledMcpServers) {
+        this.disabledMcpServers = disabledMcpServers;
+    }
+
     /** Gets config directory. @return the config directory path */
     public String getConfigDirectory() {
         return configDirectory;
@@ -1024,6 +1064,21 @@ public void setGitHubToken(String gitHubToken) {
         this.gitHubToken = gitHubToken;
     }
 
+    /**
+     * Gets the token-provider registration ID. @return the opaque registration ID
+     */
+    public String getGitHubTokenProviderRegistrationId() {
+        return gitHubTokenProviderRegistrationId;
+    }
+
+    /**
+     * Sets the token-provider registration ID. @param registrationId the opaque
+     * registration ID
+     */
+    public void setGitHubTokenProviderRegistrationId(String registrationId) {
+        this.gitHubTokenProviderRegistrationId = registrationId;
+    }
+
     /** Gets the remote session mode. @return the remote session mode */
     public String getRemoteSession() {
         return remoteSession;
@@ -1080,4 +1135,17 @@ public void setEnableManagedSettings(boolean enableManagedSettings) {
     public void clearEnableManagedSettings() {
         this.enableManagedSettings = null;
     }
+
+    /** @return host-injected managed settings, or {@code null} when unset */
+    public ManagedSettings getManagedSettings() {
+        return managedSettings;
+    }
+
+    /**
+     * @param managedSettings
+     *            host-injected managed settings
+     */
+    public void setManagedSettings(ManagedSettings managedSettings) {
+        this.managedSettings = managedSettings;
+    }
 }
diff --git a/java/src/main/java/com/github/copilot/rpc/CreateSessionResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/CreateSessionResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CreateSessionResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CreateSessionResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/CustomAgentConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/CustomAgentConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/CustomAgentConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/CustomAgentConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/DefaultAgentConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/DefaultAgentConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/DefaultAgentConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/DefaultAgentConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/DeleteSessionResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/DeleteSessionResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/DeleteSessionResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/DeleteSessionResponse.java
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/DisableBypassPermissionsModes.java b/java/sdk/src/main/java/com/github/copilot/rpc/DisableBypassPermissionsModes.java
new file mode 100644
index 0000000000..cf98f0526d
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/DisableBypassPermissionsModes.java
@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+package com.github.copilot.rpc;
+
+/**
+ * Known values for the managed bypass-permissions policy.
+ *
+ * <p>
+ * The wire contract is an open string so callers can pass newer fail-closed
+ * modes directly to
+ * {@link ManagedSettingsPermissions#setDisableBypassPermissionsMode(String)}.
+ */
+public final class DisableBypassPermissionsModes {
+    /** Turns off bypass-permissions mode. */
+    public static final String DISABLE = "disable";
+
+    /** Permits bypass only for automatic operations. */
+    public static final String ALLOW_AUTO_ONLY = "allow-auto-only";
+
+    private DisableBypassPermissionsModes() {
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/rpc/ElicitationContext.java b/java/sdk/src/main/java/com/github/copilot/rpc/ElicitationContext.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ElicitationContext.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ElicitationContext.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ElicitationHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/ElicitationHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ElicitationHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ElicitationHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ElicitationParams.java b/java/sdk/src/main/java/com/github/copilot/rpc/ElicitationParams.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ElicitationParams.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ElicitationParams.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ElicitationResult.java b/java/sdk/src/main/java/com/github/copilot/rpc/ElicitationResult.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ElicitationResult.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ElicitationResult.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ElicitationResultAction.java b/java/sdk/src/main/java/com/github/copilot/rpc/ElicitationResultAction.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ElicitationResultAction.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ElicitationResultAction.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ElicitationSchema.java b/java/sdk/src/main/java/com/github/copilot/rpc/ElicitationSchema.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ElicitationSchema.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ElicitationSchema.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ExitPlanModeHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/ExitPlanModeHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ExitPlanModeHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ExitPlanModeHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ExitPlanModeInvocation.java b/java/sdk/src/main/java/com/github/copilot/rpc/ExitPlanModeInvocation.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ExitPlanModeInvocation.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ExitPlanModeInvocation.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ExitPlanModeRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/ExitPlanModeRequest.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ExitPlanModeRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ExitPlanModeRequest.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ExitPlanModeResult.java b/java/sdk/src/main/java/com/github/copilot/rpc/ExitPlanModeResult.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ExitPlanModeResult.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ExitPlanModeResult.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ExpConfigEntry.java b/java/sdk/src/main/java/com/github/copilot/rpc/ExpConfigEntry.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ExpConfigEntry.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ExpConfigEntry.java
diff --git a/java/src/main/java/com/github/copilot/rpc/GetAuthStatusResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/GetAuthStatusResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/GetAuthStatusResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/GetAuthStatusResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/GetForegroundSessionResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/GetForegroundSessionResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/GetForegroundSessionResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/GetForegroundSessionResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/GetLastSessionIdResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/GetLastSessionIdResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/GetLastSessionIdResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/GetLastSessionIdResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/GetMessagesResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/GetMessagesResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/GetMessagesResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/GetMessagesResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/GetModelsResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/GetModelsResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/GetModelsResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/GetModelsResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/GetSessionMetadataResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/GetSessionMetadataResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/GetSessionMetadataResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/GetSessionMetadataResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/GetStatusResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/GetStatusResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/GetStatusResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/GetStatusResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/GitHubMcpToolConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/GitHubMcpToolConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/GitHubMcpToolConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/GitHubMcpToolConfig.java
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/GitHubTokenProvider.java b/java/sdk/src/main/java/com/github/copilot/rpc/GitHubTokenProvider.java
new file mode 100644
index 0000000000..daefc2f8d8
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/GitHubTokenProvider.java
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.rpc;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Acquires rotating GitHub tokens for one session.
+ * <p>
+ * Implementations return either a token with a positive remaining lifetime or
+ * an explicit cancellation. Production GitHub tokens typically last eight
+ * hours. Initial cancellation, callback errors, and invalid token responses
+ * reject session creation or resume instead of falling back to ambient
+ * authentication.
+ *
+ * @since 1.0.0
+ */
+@FunctionalInterface
+public interface GitHubTokenProvider {
+
+    /**
+     * Acquires a GitHub token for the supplied host and session context.
+     *
+     * @param args
+     *            callback context
+     * @return a future containing a token or cancellation result
+     */
+    CompletableFuture<GitHubTokenProviderResult> getToken(GitHubTokenProviderArgs args);
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/GitHubTokenProviderArgs.java b/java/sdk/src/main/java/com/github/copilot/rpc/GitHubTokenProviderArgs.java
new file mode 100644
index 0000000000..283d3c4c7f
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/GitHubTokenProviderArgs.java
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.rpc;
+
+import com.github.copilot.generated.rpc.GitHubTokenAcquireReason;
+
+/**
+ * Context supplied when a session needs a GitHub token.
+ *
+ * @param host
+ *            effective GitHub host for which a token is required
+ * @param sessionId
+ *            session receiving the token, or {@code null} before a cloud
+ *            session has been assigned an ID
+ * @param reason
+ *            whether this is the initial acquisition or a refresh
+ * @since 1.0.0
+ */
+public record GitHubTokenProviderArgs(String host, String sessionId, GitHubTokenAcquireReason reason) {
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/GitHubTokenProviderResult.java b/java/sdk/src/main/java/com/github/copilot/rpc/GitHubTokenProviderResult.java
new file mode 100644
index 0000000000..9425286431
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/GitHubTokenProviderResult.java
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.rpc;
+
+import java.util.Objects;
+
+/**
+ * Result of acquiring a session-scoped GitHub token.
+ * <p>
+ * Token values are redacted from {@link #toString()}.
+ *
+ * @since 1.0.0
+ */
+public final class GitHubTokenProviderResult {
+
+    private final String accessToken;
+    private final long expiresIn;
+    private final String tokenType;
+    private final boolean cancelled;
+
+    private GitHubTokenProviderResult(String accessToken, long expiresIn, String tokenType, boolean cancelled) {
+        this.accessToken = accessToken;
+        this.expiresIn = expiresIn;
+        this.tokenType = tokenType;
+        this.cancelled = cancelled;
+    }
+
+    /**
+     * Creates a token result.
+     *
+     * @param accessToken
+     *            GitHub access token
+     * @param expiresIn
+     *            positive remaining lifetime in seconds when the callback completes
+     * @return the token result
+     */
+    public static GitHubTokenProviderResult token(String accessToken, long expiresIn) {
+        return token(accessToken, expiresIn, null);
+    }
+
+    /**
+     * Creates a token result with an explicit OAuth token type.
+     *
+     * @param accessToken
+     *            GitHub access token
+     * @param expiresIn
+     *            positive remaining lifetime in seconds when the callback completes
+     * @param tokenType
+     *            OAuth token type, or {@code null} to use the runtime's bearer
+     *            default
+     * @return the token result
+     */
+    public static GitHubTokenProviderResult token(String accessToken, long expiresIn, String tokenType) {
+        Objects.requireNonNull(accessToken, "accessToken must not be null");
+        return new GitHubTokenProviderResult(accessToken, expiresIn, tokenType, false);
+    }
+
+    /**
+     * Creates an explicit cancellation result.
+     *
+     * @return the cancellation result
+     */
+    public static GitHubTokenProviderResult cancelled() {
+        return new GitHubTokenProviderResult(null, 0, null, true);
+    }
+
+    /**
+     * Gets whether acquisition was cancelled.
+     *
+     * @return {@code true} for a cancellation result
+     */
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    /**
+     * Gets the access token.
+     *
+     * @return the token, or {@code null} for cancellation
+     */
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    /**
+     * Gets the remaining token lifetime.
+     *
+     * @return remaining lifetime in seconds
+     */
+    public long getExpiresIn() {
+        return expiresIn;
+    }
+
+    /**
+     * Gets the OAuth token type.
+     *
+     * @return token type, or {@code null} for the runtime default
+     */
+    public String getTokenType() {
+        return tokenType;
+    }
+
+    @Override
+    public String toString() {
+        if (cancelled) {
+            return "GitHubTokenProviderResult{cancelled}";
+        }
+        return "GitHubTokenProviderResult{accessToken=<redacted>, expiresIn=" + expiresIn + ", tokenType=" + tokenType
+                + "}";
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/rpc/HookInvocation.java b/java/sdk/src/main/java/com/github/copilot/rpc/HookInvocation.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/HookInvocation.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/HookInvocation.java
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/InProcessRuntimeConnection.java b/java/sdk/src/main/java/com/github/copilot/rpc/InProcessRuntimeConnection.java
new file mode 100644
index 0000000000..274f8b89dc
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/InProcessRuntimeConnection.java
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.rpc;
+
+import com.github.copilot.CopilotExperimental;
+
+/**
+ * Hosts the runtime in-process by loading its native library and communicating
+ * over the C ABI — no child process is spawned by the SDK for JSON-RPC
+ * transport. Construct with {@link RuntimeConnection#forInProcess()}.
+ * <p>
+ * The in-process runtime is self-contained: it carries everything it needs and
+ * requires no external installation. Because it runs inside the host process,
+ * per-client process settings ({@code environment}, {@code telemetry},
+ * {@code cwd}, and {@code cliArgs}) are rejected; configure those on the host
+ * process instead, or use a child-process connection.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+public final class InProcessRuntimeConnection extends RuntimeConnection {
+
+    InProcessRuntimeConnection() {
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/rpc/InfiniteSessionConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/InfiniteSessionConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/InfiniteSessionConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/InfiniteSessionConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/InputOptions.java b/java/sdk/src/main/java/com/github/copilot/rpc/InputOptions.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/InputOptions.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/InputOptions.java
diff --git a/java/src/main/java/com/github/copilot/rpc/JsonRpcError.java b/java/sdk/src/main/java/com/github/copilot/rpc/JsonRpcError.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/JsonRpcError.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/JsonRpcError.java
diff --git a/java/src/main/java/com/github/copilot/rpc/JsonRpcRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/JsonRpcRequest.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/JsonRpcRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/JsonRpcRequest.java
diff --git a/java/src/main/java/com/github/copilot/rpc/JsonRpcResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/JsonRpcResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/JsonRpcResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/JsonRpcResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/LargeToolOutputConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/LargeToolOutputConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/LargeToolOutputConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/LargeToolOutputConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ListSessionsResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/ListSessionsResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ListSessionsResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ListSessionsResponse.java
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/ManagedSettings.java b/java/sdk/src/main/java/com/github/copilot/rpc/ManagedSettings.java
new file mode 100644
index 0000000000..39e8fcf55a
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ManagedSettings.java
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+package com.github.copilot.rpc;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Managed settings an SDK host may inject at session create or resume.
+ *
+ * <p>
+ * The initial public contract is permissions-only.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public final class ManagedSettings {
+    @JsonProperty("permissions")
+    private ManagedSettingsPermissions permissions;
+
+    /** @return the managed permission policy, or {@code null} when unset */
+    public ManagedSettingsPermissions getPermissions() {
+        return permissions;
+    }
+
+    /**
+     * @param permissions
+     *            managed permission policy
+     * @return this settings object
+     */
+    public ManagedSettings setPermissions(ManagedSettingsPermissions permissions) {
+        this.permissions = permissions;
+        return this;
+    }
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/ManagedSettingsPermissions.java b/java/sdk/src/main/java/com/github/copilot/rpc/ManagedSettingsPermissions.java
new file mode 100644
index 0000000000..6755d959b3
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ManagedSettingsPermissions.java
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+package com.github.copilot.rpc;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Enterprise permission policy injected by an SDK host at session startup.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public final class ManagedSettingsPermissions {
+    @JsonProperty("disableBypassPermissionsMode")
+    private String disableBypassPermissionsMode;
+
+    @JsonProperty("deny")
+    private List<String> deny;
+
+    @JsonProperty("ask")
+    private List<String> ask;
+
+    @JsonProperty("allow")
+    private List<String> allow;
+
+    /** @return the bypass-permissions policy, or {@code null} when unset */
+    public String getDisableBypassPermissionsMode() {
+        return disableBypassPermissionsMode;
+    }
+
+    /**
+     * Restricts bypass/allow-all permission modes. See
+     * {@link DisableBypassPermissionsModes} for known values. Newer values are
+     * forwarded unchanged so runtime policies remain fail-closed.
+     *
+     * @param value
+     *            bypass-permissions policy
+     * @return this policy
+     */
+    public ManagedSettingsPermissions setDisableBypassPermissionsMode(String value) {
+        this.disableBypassPermissionsMode = value;
+        return this;
+    }
+
+    /** @return rules that deny matching operations, or {@code null} when unset */
+    public List<String> getDeny() {
+        return deny;
+    }
+
+    /**
+     * @param rules
+     *            deny rules
+     * @return this policy
+     */
+    public ManagedSettingsPermissions setDeny(List<String> rules) {
+        this.deny = rules == null ? null : new ArrayList<>(rules);
+        return this;
+    }
+
+    /** @return rules that require approval, or {@code null} when unset */
+    public List<String> getAsk() {
+        return ask;
+    }
+
+    /**
+     * @param rules
+     *            ask rules
+     * @return this policy
+     */
+    public ManagedSettingsPermissions setAsk(List<String> rules) {
+        this.ask = rules == null ? null : new ArrayList<>(rules);
+        return this;
+    }
+
+    /** @return rules that allow matching operations, or {@code null} when unset */
+    public List<String> getAllow() {
+        return allow;
+    }
+
+    /**
+     * @param rules
+     *            allow rules
+     * @return this policy
+     */
+    public ManagedSettingsPermissions setAllow(List<String> rules) {
+        this.allow = rules == null ? null : new ArrayList<>(rules);
+        return this;
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/rpc/McpAuthHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/McpAuthHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/McpAuthHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/McpAuthHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/McpAuthInvocation.java b/java/sdk/src/main/java/com/github/copilot/rpc/McpAuthInvocation.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/McpAuthInvocation.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/McpAuthInvocation.java
diff --git a/java/src/main/java/com/github/copilot/rpc/McpAuthRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/McpAuthRequest.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/McpAuthRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/McpAuthRequest.java
diff --git a/java/src/main/java/com/github/copilot/rpc/McpAuthResult.java b/java/sdk/src/main/java/com/github/copilot/rpc/McpAuthResult.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/McpAuthResult.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/McpAuthResult.java
diff --git a/java/src/main/java/com/github/copilot/rpc/McpAuthToken.java b/java/sdk/src/main/java/com/github/copilot/rpc/McpAuthToken.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/McpAuthToken.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/McpAuthToken.java
diff --git a/java/src/main/java/com/github/copilot/rpc/McpHttpServerConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/McpHttpServerConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/McpHttpServerConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/McpHttpServerConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/McpServerConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/McpServerConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/McpServerConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/McpServerConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/McpStdioServerConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/McpStdioServerConfig.java
similarity index 99%
rename from java/src/main/java/com/github/copilot/rpc/McpStdioServerConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/McpStdioServerConfig.java
index 8ce739ffbd..c68aecb63f 100644
--- a/java/src/main/java/com/github/copilot/rpc/McpStdioServerConfig.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/McpStdioServerConfig.java
@@ -45,7 +45,7 @@ public final class McpStdioServerConfig extends McpServerConfig {
     @JsonProperty("env")
     private Map<String, String> env;
 
-    @JsonProperty("workingDirectory")
+    @JsonProperty("cwd")
     private String workingDirectory;
 
     /**
diff --git a/java/src/main/java/com/github/copilot/rpc/MemoryConfiguration.java b/java/sdk/src/main/java/com/github/copilot/rpc/MemoryConfiguration.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/MemoryConfiguration.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/MemoryConfiguration.java
diff --git a/java/src/main/java/com/github/copilot/rpc/MessageAttachment.java b/java/sdk/src/main/java/com/github/copilot/rpc/MessageAttachment.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/MessageAttachment.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/MessageAttachment.java
diff --git a/java/src/main/java/com/github/copilot/rpc/MessageOptions.java b/java/sdk/src/main/java/com/github/copilot/rpc/MessageOptions.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/MessageOptions.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/MessageOptions.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ModelBilling.java b/java/sdk/src/main/java/com/github/copilot/rpc/ModelBilling.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ModelBilling.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ModelBilling.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ModelCapabilities.java b/java/sdk/src/main/java/com/github/copilot/rpc/ModelCapabilities.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ModelCapabilities.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ModelCapabilities.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ModelCapabilitiesOverride.java b/java/sdk/src/main/java/com/github/copilot/rpc/ModelCapabilitiesOverride.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ModelCapabilitiesOverride.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ModelCapabilitiesOverride.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ModelInfo.java b/java/sdk/src/main/java/com/github/copilot/rpc/ModelInfo.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ModelInfo.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ModelInfo.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ModelLimits.java b/java/sdk/src/main/java/com/github/copilot/rpc/ModelLimits.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ModelLimits.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ModelLimits.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ModelPolicy.java b/java/sdk/src/main/java/com/github/copilot/rpc/ModelPolicy.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ModelPolicy.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ModelPolicy.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ModelSupports.java b/java/sdk/src/main/java/com/github/copilot/rpc/ModelSupports.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ModelSupports.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ModelSupports.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ModelVisionLimits.java b/java/sdk/src/main/java/com/github/copilot/rpc/ModelVisionLimits.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ModelVisionLimits.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ModelVisionLimits.java
diff --git a/java/src/main/java/com/github/copilot/rpc/NamedProviderConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/NamedProviderConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/NamedProviderConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/NamedProviderConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ParamCoercion.java b/java/sdk/src/main/java/com/github/copilot/rpc/ParamCoercion.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ParamCoercion.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ParamCoercion.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ParamSchema.java b/java/sdk/src/main/java/com/github/copilot/rpc/ParamSchema.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ParamSchema.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ParamSchema.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PermissionHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/PermissionHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PermissionHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PermissionHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PermissionInvocation.java b/java/sdk/src/main/java/com/github/copilot/rpc/PermissionInvocation.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PermissionInvocation.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PermissionInvocation.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PermissionRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/PermissionRequest.java
similarity index 93%
rename from java/src/main/java/com/github/copilot/rpc/PermissionRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PermissionRequest.java
index a3297bfb2c..fc49332b8a 100644
--- a/java/src/main/java/com/github/copilot/rpc/PermissionRequest.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/PermissionRequest.java
@@ -5,8 +5,10 @@
 package com.github.copilot.rpc;
 
 import java.io.IOException;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -45,6 +47,14 @@ public class PermissionRequest {
 
     private Map<String, Object> extensionData;
 
+    @JsonAnySetter
+    private void setExtensionDataEntry(String key, Object value) {
+        if (extensionData == null) {
+            extensionData = new LinkedHashMap<>();
+        }
+        extensionData.put(key, value);
+    }
+
     private static final class ManagedApprovalRequiredDeserializer extends JsonDeserializer<Boolean> {
 
         @Override
diff --git a/java/src/main/java/com/github/copilot/rpc/PermissionRequestResult.java b/java/sdk/src/main/java/com/github/copilot/rpc/PermissionRequestResult.java
similarity index 74%
rename from java/src/main/java/com/github/copilot/rpc/PermissionRequestResult.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PermissionRequestResult.java
index 2e5c60100a..6546291cf7 100644
--- a/java/src/main/java/com/github/copilot/rpc/PermissionRequestResult.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/PermissionRequestResult.java
@@ -6,8 +6,10 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.generated.rpc.PermissionDecisionContext;
 
 /**
  * Result of a permission request decision.
@@ -42,6 +44,15 @@ public final class PermissionRequestResult {
     @JsonProperty("feedback")
     private String feedback;
 
+    /**
+     * Optional provenance describing how and where this decision was made. Never
+     * serialized inside the result — the SDK forwards it as a sibling of
+     * {@code result} so the runtime can attribute {@code auto_approval_decision}
+     * telemetry.
+     */
+    @JsonIgnore
+    private PermissionDecisionContext decisionContext;
+
     /**
      * Creates a result that approves this single request.
      *
@@ -168,4 +179,35 @@ public PermissionRequestResult setFeedback(String feedback) {
         this.feedback = feedback;
         return this;
     }
+
+    /**
+     * Gets the optional provenance describing how and where this decision was made.
+     * <p>
+     * This value is never serialized inside the result JSON; the SDK forwards it as
+     * a sibling of {@code result} when responding to the runtime.
+     *
+     * @return the decision context, or {@code null} if none was attached
+     * @since 1.3.0
+     */
+    public PermissionDecisionContext getDecisionContext() {
+        return decisionContext;
+    }
+
+    /**
+     * Sets provenance describing how and where this decision was made, so the
+     * runtime can attribute {@code auto_approval_decision} telemetry.
+     * <p>
+     * Calling this method more than once replaces any previously set context. The
+     * context is never serialized inside the result; the SDK forwards it as a
+     * sibling of {@code result}.
+     *
+     * @param decisionContext
+     *            the decision context, or {@code null} to attach none
+     * @return this result for method chaining
+     * @since 1.3.0
+     */
+    public PermissionRequestResult setDecisionContext(PermissionDecisionContext decisionContext) {
+        this.decisionContext = decisionContext;
+        return this;
+    }
 }
diff --git a/java/src/main/java/com/github/copilot/rpc/PermissionRequestResultKind.java b/java/sdk/src/main/java/com/github/copilot/rpc/PermissionRequestResultKind.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PermissionRequestResultKind.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PermissionRequestResultKind.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PingResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/PingResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PingResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PingResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PostToolUseFailureHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseFailureHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PostToolUseFailureHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseFailureHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PostToolUseFailureHookInput.java b/java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseFailureHookInput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PostToolUseFailureHookInput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseFailureHookInput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PostToolUseFailureHookOutput.java b/java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseFailureHookOutput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PostToolUseFailureHookOutput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseFailureHookOutput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PostToolUseHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PostToolUseHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PostToolUseHookInput.java b/java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseHookInput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PostToolUseHookInput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseHookInput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PostToolUseHookOutput.java b/java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseHookOutput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PostToolUseHookOutput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PostToolUseHookOutput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PreMcpToolCallHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/PreMcpToolCallHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PreMcpToolCallHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PreMcpToolCallHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PreMcpToolCallHookInput.java b/java/sdk/src/main/java/com/github/copilot/rpc/PreMcpToolCallHookInput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PreMcpToolCallHookInput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PreMcpToolCallHookInput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PreMcpToolCallHookOutput.java b/java/sdk/src/main/java/com/github/copilot/rpc/PreMcpToolCallHookOutput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PreMcpToolCallHookOutput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PreMcpToolCallHookOutput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PreToolUseHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/PreToolUseHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PreToolUseHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PreToolUseHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PreToolUseHookInput.java b/java/sdk/src/main/java/com/github/copilot/rpc/PreToolUseHookInput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PreToolUseHookInput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PreToolUseHookInput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/PreToolUseHookOutput.java b/java/sdk/src/main/java/com/github/copilot/rpc/PreToolUseHookOutput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/PreToolUseHookOutput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/PreToolUseHookOutput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ProviderConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/ProviderConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ProviderConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ProviderConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ProviderModelConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/ProviderModelConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ProviderModelConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ProviderModelConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ProviderTokenArgs.java b/java/sdk/src/main/java/com/github/copilot/rpc/ProviderTokenArgs.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ProviderTokenArgs.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ProviderTokenArgs.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java
similarity index 92%
rename from java/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java
index 05b73e88a9..a55c3454e7 100644
--- a/java/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java
@@ -53,6 +53,7 @@ public class ResumeSessionConfig {
     private List<ProviderModelConfig> models;
     private Boolean enableSessionTelemetry;
     private Boolean enableCitations;
+    private Boolean enableFileChangeTracking;
     private SessionLimitsConfig sessionLimits;
     private Boolean enableExperimentalMode;
     private Boolean skipCustomInstructions;
@@ -88,12 +89,14 @@ public class ResumeSessionConfig {
     private DefaultAgentConfig defaultAgent;
     private String agent;
     private List<String> skillDirectories;
+    private List<String> includedBuiltinSkills;
     private List<String> instructionDirectories;
     private List<String> pluginDirectories;
     private LargeToolOutputConfig largeOutput;
     private ToolSearchConfig toolSearch;
     private MemoryConfiguration memory;
     private List<String> disabledSkills;
+    private List<String> disabledMcpServers;
     private InfiniteSessionConfig infiniteSessions;
     private Consumer<SessionEvent> onEvent;
     private List<CommandDefinition> commands;
@@ -103,9 +106,12 @@ public class ResumeSessionConfig {
     private boolean enableMcpApps;
     private GitHubMcpToolConfig githubMcpToolConfig;
     private String gitHubToken;
+    @JsonIgnore
+    private GitHubTokenProvider gitHubTokenProvider;
     private String remoteSession;
     private CopilotExpAssignmentResponse expAssignments;
     private Boolean enableManagedSettings;
+    private ManagedSettings managedSettings;
 
     /**
      * Gets the AI model to use.
@@ -451,6 +457,41 @@ public ResumeSessionConfig clearEnableCitations() {
         return this;
     }
 
+    /**
+     * Gets whether file change tracking is enabled for rewind and cumulative
+     * session diff.
+     *
+     * @return an {@link java.util.Optional} containing the setting, or
+     *         {@link java.util.Optional#empty()} for the default
+     */
+    @JsonIgnore
+    public Optional<Boolean> getEnableFileChangeTracking() {
+        return Optional.ofNullable(enableFileChangeTracking);
+    }
+
+    /**
+     * Enables or disables file change tracking when the resumed session has a valid
+     * baseline. Earlier untracked changes cannot be reconstructed.
+     *
+     * @param enableFileChangeTracking
+     *            whether to enable file change tracking
+     * @return this config instance for method chaining
+     */
+    public ResumeSessionConfig setEnableFileChangeTracking(boolean enableFileChangeTracking) {
+        this.enableFileChangeTracking = enableFileChangeTracking;
+        return this;
+    }
+
+    /**
+     * Clears the file change tracking setting, reverting to the default behavior.
+     *
+     * @return this instance for method chaining
+     */
+    public ResumeSessionConfig clearEnableFileChangeTracking() {
+        this.enableFileChangeTracking = null;
+        return this;
+    }
+
     /**
      * Gets the limits for this session's current accounting window.
      *
@@ -1451,6 +1492,28 @@ public ResumeSessionConfig setSkillDirectories(List<String> skillDirectories) {
         return this;
     }
 
+    /**
+     * Gets the runtime-bundled skill allowlist.
+     *
+     * @return the built-in skill names, or {@code null} when unspecified
+     */
+    public List<String> getIncludedBuiltinSkills() {
+        return includedBuiltinSkills == null ? null : Collections.unmodifiableList(includedBuiltinSkills);
+    }
+
+    /**
+     * Sets the runtime-bundled skill allowlist. In empty mode, omitting this option
+     * excludes all built-in skills; specifying names opts those built-ins back in.
+     *
+     * @param includedBuiltinSkills
+     *            the built-in skill names to allow
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setIncludedBuiltinSkills(List<String> includedBuiltinSkills) {
+        this.includedBuiltinSkills = includedBuiltinSkills;
+        return this;
+    }
+
     /**
      * Gets the additional directories to search for custom instruction files.
      *
@@ -1577,6 +1640,29 @@ public ResumeSessionConfig setDisabledSkills(List<String> disabledSkills) {
         return this;
     }
 
+    /**
+     * Gets exact MCP server names disabled for this session.
+     *
+     * @return the disabled MCP server names, or {@code null} when none are disabled
+     */
+    public List<String> getDisabledMcpServers() {
+        return disabledMcpServers == null ? null : Collections.unmodifiableList(disabledMcpServers);
+    }
+
+    /**
+     * Sets exact MCP server names to disable for this session. Disabled servers are
+     * not started or authenticated on create or cold resume; a resident resume
+     * cannot stop servers already running.
+     *
+     * @param disabledMcpServers
+     *            the server names to disable
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setDisabledMcpServers(List<String> disabledMcpServers) {
+        this.disabledMcpServers = disabledMcpServers;
+        return this;
+    }
+
     /**
      * Gets the infinite session configuration.
      *
@@ -1803,6 +1889,33 @@ public ResumeSessionConfig setGitHubToken(String gitHubToken) {
         return this;
     }
 
+    /**
+     * Gets the rotating GitHub token provider for the resumed session.
+     *
+     * @return the provider, or {@code null} when a static token is used
+     */
+    public GitHubTokenProvider getGitHubTokenProvider() {
+        return gitHubTokenProvider;
+    }
+
+    /**
+     * Sets the rotating GitHub token provider for the resumed session.
+     * <p>
+     * The provider receives only the effective host, optional assigned session ID,
+     * and acquisition reason. It must return a positive remaining lifetime in
+     * seconds when its callback completes. Production GitHub tokens typically last
+     * eight hours. This option is mutually exclusive with
+     * {@link #setGitHubToken(String)}.
+     *
+     * @param gitHubTokenProvider
+     *            provider used for initial acquisition and refresh
+     * @return this config instance for method chaining
+     */
+    public ResumeSessionConfig setGitHubTokenProvider(GitHubTokenProvider gitHubTokenProvider) {
+        this.gitHubTokenProvider = gitHubTokenProvider;
+        return this;
+    }
+
     /**
      * Gets the per-session remote behavior control.
      * <p>
@@ -1886,6 +1999,24 @@ public ResumeSessionConfig setEnableManagedSettings(boolean enableManagedSetting
         return this;
     }
 
+    /** @return host-injected managed settings, or {@code null} when unset */
+    public ManagedSettings getManagedSettings() {
+        return managedSettings;
+    }
+
+    /**
+     * Supplies permissions-only managed settings for this resume. The value
+     * replaces the prior injected layer and is not persisted.
+     *
+     * @param managedSettings
+     *            the host-injected managed settings
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setManagedSettings(ManagedSettings managedSettings) {
+        this.managedSettings = managedSettings;
+        return this;
+    }
+
     /**
      * Creates a shallow clone of this {@code ResumeSessionConfig} instance.
      * <p>
@@ -1915,6 +2046,7 @@ public ResumeSessionConfig clone() {
         copy.models = this.models != null ? new ArrayList<>(this.models) : null;
         copy.enableSessionTelemetry = this.enableSessionTelemetry;
         copy.enableCitations = this.enableCitations;
+        copy.enableFileChangeTracking = this.enableFileChangeTracking;
         copy.sessionLimits = this.sessionLimits;
         copy.enableExperimentalMode = this.enableExperimentalMode;
         copy.reasoningEffort = this.reasoningEffort;
@@ -1946,6 +2078,9 @@ public ResumeSessionConfig clone() {
         copy.defaultAgent = this.defaultAgent;
         copy.agent = this.agent;
         copy.skillDirectories = this.skillDirectories != null ? new ArrayList<>(this.skillDirectories) : null;
+        copy.includedBuiltinSkills = this.includedBuiltinSkills != null
+                ? new ArrayList<>(this.includedBuiltinSkills)
+                : null;
         copy.instructionDirectories = this.instructionDirectories != null
                 ? new ArrayList<>(this.instructionDirectories)
                 : null;
@@ -1954,6 +2089,7 @@ public ResumeSessionConfig clone() {
         copy.toolSearch = this.toolSearch;
         copy.memory = this.memory;
         copy.disabledSkills = this.disabledSkills != null ? new ArrayList<>(this.disabledSkills) : null;
+        copy.disabledMcpServers = this.disabledMcpServers != null ? new ArrayList<>(this.disabledMcpServers) : null;
         copy.infiniteSessions = this.infiniteSessions;
         copy.onEvent = this.onEvent;
         copy.commands = this.commands != null ? new ArrayList<>(this.commands) : null;
@@ -1964,9 +2100,11 @@ public ResumeSessionConfig clone() {
         copy.enableMcpApps = this.enableMcpApps;
         copy.githubMcpToolConfig = this.githubMcpToolConfig;
         copy.gitHubToken = this.gitHubToken;
+        copy.gitHubTokenProvider = this.gitHubTokenProvider;
         copy.remoteSession = this.remoteSession;
         copy.expAssignments = this.expAssignments;
         copy.enableManagedSettings = this.enableManagedSettings;
+        copy.managedSettings = this.managedSettings;
         return copy;
     }
 }
diff --git a/java/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java
similarity index 94%
rename from java/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java
index a0ecc2ed5c..9b8e897fda 100644
--- a/java/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java
@@ -82,6 +82,9 @@ public final class ResumeSessionRequest {
     @JsonProperty("enableCitations")
     private Boolean enableCitations;
 
+    @JsonProperty("enableFileChangeTracking")
+    private Boolean enableFileChangeTracking;
+
     @JsonProperty("sessionLimits")
     private SessionLimitsConfig sessionLimits;
 
@@ -192,6 +195,9 @@ public final class ResumeSessionRequest {
     @JsonProperty("disabledSkills")
     private List<String> disabledSkills;
 
+    @JsonProperty("disabledMcpServers")
+    private List<String> disabledMcpServers;
+
     @JsonProperty("infiniteSessions")
     private InfiniteSessionConfig infiniteSessions;
 
@@ -223,6 +229,9 @@ public final class ResumeSessionRequest {
     @JsonProperty("gitHubToken")
     private String gitHubToken;
 
+    @JsonProperty("gitHubTokenProviderRegistrationId")
+    private String gitHubTokenProviderRegistrationId;
+
     @JsonProperty("remoteSession")
     private String remoteSession;
 
@@ -233,6 +242,10 @@ public final class ResumeSessionRequest {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean enableManagedSettings;
 
+    @JsonProperty("managedSettings")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private ManagedSettings managedSettings;
+
     /** Gets the session ID. @return the session ID */
     public String getSessionId() {
         return sessionId;
@@ -432,6 +445,21 @@ public void setEnableCitations(boolean enableCitations) {
         this.enableCitations = enableCitations;
     }
 
+    /** Gets the file change tracking flag. @return the flag */
+    public Boolean getEnableFileChangeTracking() {
+        return enableFileChangeTracking;
+    }
+
+    /**
+     * Sets the file change tracking flag.
+     *
+     * @param enableFileChangeTracking
+     *            the flag
+     */
+    public void setEnableFileChangeTracking(boolean enableFileChangeTracking) {
+        this.enableFileChangeTracking = enableFileChangeTracking;
+    }
+
     /** Gets the session limits. @return the session limits */
     public SessionLimitsConfig getSessionLimits() {
         return sessionLimits;
@@ -913,6 +941,18 @@ public void setDisabledSkills(List<String> disabledSkills) {
         this.disabledSkills = disabledSkills;
     }
 
+    /** Gets disabled MCP server names. @return the server names */
+    public List<String> getDisabledMcpServers() {
+        return disabledMcpServers == null ? null : Collections.unmodifiableList(disabledMcpServers);
+    }
+
+    /**
+     * Sets disabled MCP server names. @param disabledMcpServers the server names
+     */
+    public void setDisabledMcpServers(List<String> disabledMcpServers) {
+        this.disabledMcpServers = disabledMcpServers;
+    }
+
     /** Gets infinite sessions config. @return the infinite sessions config */
     public InfiniteSessionConfig getInfiniteSessions() {
         return infiniteSessions;
@@ -1049,6 +1089,21 @@ public void setGitHubToken(String gitHubToken) {
         this.gitHubToken = gitHubToken;
     }
 
+    /**
+     * Gets the token-provider registration ID. @return the opaque registration ID
+     */
+    public String getGitHubTokenProviderRegistrationId() {
+        return gitHubTokenProviderRegistrationId;
+    }
+
+    /**
+     * Sets the token-provider registration ID. @param registrationId the opaque
+     * registration ID
+     */
+    public void setGitHubTokenProviderRegistrationId(String registrationId) {
+        this.gitHubTokenProviderRegistrationId = registrationId;
+    }
+
     /** Gets the remote session mode. @return the remote session mode */
     public String getRemoteSession() {
         return remoteSession;
@@ -1095,4 +1150,17 @@ public void setEnableManagedSettings(boolean enableManagedSettings) {
     public void clearEnableManagedSettings() {
         this.enableManagedSettings = null;
     }
+
+    /** @return host-injected managed settings, or {@code null} when unset */
+    public ManagedSettings getManagedSettings() {
+        return managedSettings;
+    }
+
+    /**
+     * @param managedSettings
+     *            host-injected managed settings
+     */
+    public void setManagedSettings(ManagedSettings managedSettings) {
+        this.managedSettings = managedSettings;
+    }
 }
diff --git a/java/src/main/java/com/github/copilot/rpc/ResumeSessionResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ResumeSessionResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionResponse.java
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/RuntimeConnection.java b/java/sdk/src/main/java/com/github/copilot/rpc/RuntimeConnection.java
new file mode 100644
index 0000000000..a0c8eec5c6
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/RuntimeConnection.java
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.rpc;
+
+import com.github.copilot.CopilotExperimental;
+
+/**
+ * Configures how a {@link com.github.copilot.CopilotClient} connects to the
+ * Copilot runtime.
+ * <p>
+ * Instances are created through the factory methods on this class and assigned
+ * with {@link CopilotClientOptions#setConnection(RuntimeConnection)}:
+ *
+ * <pre>{@code
+ * // Spawn a runtime child process and talk over stdin/stdout (the default).
+ * new CopilotClientOptions().setConnection(RuntimeConnection.forStdio());
+ *
+ * // Spawn a runtime child process listening on a TCP socket.
+ * new CopilotClientOptions().setConnection(RuntimeConnection.forTcp().setPath("/usr/local/bin/copilot"));
+ *
+ * // Connect to an already-running runtime.
+ * new CopilotClientOptions().setConnection(RuntimeConnection.forUri("localhost:3000"));
+ * }</pre>
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+public abstract sealed class RuntimeConnection
+        permits StdioRuntimeConnection, TcpRuntimeConnection, UriRuntimeConnection, InProcessRuntimeConnection {
+
+    RuntimeConnection() {
+    }
+
+    /**
+     * Spawns a runtime child process and communicates over its stdin/stdout. This
+     * is the default when no connection is configured.
+     *
+     * @return a new stdio connection
+     */
+    public static StdioRuntimeConnection forStdio() {
+        return new StdioRuntimeConnection();
+    }
+
+    /**
+     * Spawns a runtime child process at the given path and communicates over its
+     * stdin/stdout.
+     *
+     * @param path
+     *            path to the runtime executable, or {@code null} to use the runtime
+     *            discovered on the {@code PATH}
+     * @return a new stdio connection
+     */
+    public static StdioRuntimeConnection forStdio(String path) {
+        return new StdioRuntimeConnection().setPath(path);
+    }
+
+    /**
+     * Spawns a runtime child process that listens on a TCP socket and connects to
+     * it.
+     *
+     * @return a new TCP connection
+     */
+    public static TcpRuntimeConnection forTcp() {
+        return new TcpRuntimeConnection();
+    }
+
+    /**
+     * Connects to an already-running runtime at the given URL.
+     *
+     * @param url
+     *            URL of the runtime to connect to; accepts {@code "port"},
+     *            {@code "host:port"}, or a full URL
+     * @return a new URI connection
+     * @throws IllegalArgumentException
+     *             if {@code url} is {@code null} or empty
+     */
+    public static UriRuntimeConnection forUri(String url) {
+        return new UriRuntimeConnection(url);
+    }
+
+    /**
+     * Hosts the runtime in-process by loading its native library and communicating
+     * over the C ABI — no child process is spawned by the SDK for JSON-RPC
+     * transport.
+     *
+     * @return a new in-process connection
+     */
+    @CopilotExperimental
+    public static InProcessRuntimeConnection forInProcess() {
+        return new InProcessRuntimeConnection();
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/rpc/SectionOverride.java b/java/sdk/src/main/java/com/github/copilot/rpc/SectionOverride.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SectionOverride.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SectionOverride.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SectionOverrideAction.java b/java/sdk/src/main/java/com/github/copilot/rpc/SectionOverrideAction.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SectionOverrideAction.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SectionOverrideAction.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SendMessageRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/SendMessageRequest.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SendMessageRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SendMessageRequest.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SendMessageResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/SendMessageResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SendMessageResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SendMessageResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionCapabilities.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionCapabilities.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionCapabilities.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionCapabilities.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionConfig.java
similarity index 92%
rename from java/src/main/java/com/github/copilot/rpc/SessionConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionConfig.java
index e36a027933..9f6ddb5efa 100644
--- a/java/src/main/java/com/github/copilot/rpc/SessionConfig.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/SessionConfig.java
@@ -57,6 +57,7 @@ public class SessionConfig {
     private List<ProviderModelConfig> models;
     private Boolean enableSessionTelemetry;
     private Boolean enableCitations;
+    private Boolean enableFileChangeTracking;
     private SessionLimitsConfig sessionLimits;
     private Boolean enableExperimentalMode;
     private Boolean skipCustomInstructions;
@@ -78,12 +79,14 @@ public class SessionConfig {
     private String agent;
     private InfiniteSessionConfig infiniteSessions;
     private List<String> skillDirectories;
+    private List<String> includedBuiltinSkills;
     private List<String> instructionDirectories;
     private List<String> pluginDirectories;
     private LargeToolOutputConfig largeOutput;
     private ToolSearchConfig toolSearch;
     private MemoryConfiguration memory;
     private List<String> disabledSkills;
+    private List<String> disabledMcpServers;
     private String configDirectory;
     private Boolean enableConfigDiscovery;
     private Boolean skipEmbeddingRetrieval;
@@ -103,10 +106,13 @@ public class SessionConfig {
     private boolean enableMcpApps;
     private GitHubMcpToolConfig githubMcpToolConfig;
     private String gitHubToken;
+    @JsonIgnore
+    private GitHubTokenProvider gitHubTokenProvider;
     private String remoteSession;
     private CloudSessionOptions cloud;
     private CopilotExpAssignmentResponse expAssignments;
     private Boolean enableManagedSettings;
+    private ManagedSettings managedSettings;
 
     /**
      * Gets the custom session ID.
@@ -554,6 +560,40 @@ public SessionConfig clearEnableCitations() {
         return this;
     }
 
+    /**
+     * Gets whether file change tracking is enabled for rewind and cumulative
+     * session diff.
+     *
+     * @return an {@link java.util.Optional} containing the setting, or
+     *         {@link java.util.Optional#empty()} for the default
+     */
+    @JsonIgnore
+    public Optional<Boolean> getEnableFileChangeTracking() {
+        return Optional.ofNullable(enableFileChangeTracking);
+    }
+
+    /**
+     * Enables or disables file change tracking from the first turn.
+     *
+     * @param enableFileChangeTracking
+     *            whether to enable file change tracking
+     * @return this config instance for method chaining
+     */
+    public SessionConfig setEnableFileChangeTracking(boolean enableFileChangeTracking) {
+        this.enableFileChangeTracking = enableFileChangeTracking;
+        return this;
+    }
+
+    /**
+     * Clears the file change tracking setting, reverting to the default behavior.
+     *
+     * @return this instance for method chaining
+     */
+    public SessionConfig clearEnableFileChangeTracking() {
+        this.enableFileChangeTracking = null;
+        return this;
+    }
+
     /**
      * Gets the limits for this session's current accounting window.
      *
@@ -1138,6 +1178,28 @@ public SessionConfig setSkillDirectories(List<String> skillDirectories) {
         return this;
     }
 
+    /**
+     * Gets the runtime-bundled skill allowlist.
+     *
+     * @return the built-in skill names, or {@code null} when unspecified
+     */
+    public List<String> getIncludedBuiltinSkills() {
+        return includedBuiltinSkills == null ? null : Collections.unmodifiableList(includedBuiltinSkills);
+    }
+
+    /**
+     * Sets the runtime-bundled skill allowlist. In empty mode, omitting this option
+     * excludes all built-in skills; specifying names opts those built-ins back in.
+     *
+     * @param includedBuiltinSkills
+     *            the built-in skill names to allow
+     * @return this config instance for method chaining
+     */
+    public SessionConfig setIncludedBuiltinSkills(List<String> includedBuiltinSkills) {
+        this.includedBuiltinSkills = includedBuiltinSkills;
+        return this;
+    }
+
     /**
      * Gets the additional directories to search for custom instruction files.
      *
@@ -1268,6 +1330,29 @@ public SessionConfig setDisabledSkills(List<String> disabledSkills) {
         return this;
     }
 
+    /**
+     * Gets exact MCP server names disabled for this session.
+     *
+     * @return the disabled MCP server names, or {@code null} when none are disabled
+     */
+    public List<String> getDisabledMcpServers() {
+        return disabledMcpServers == null ? null : Collections.unmodifiableList(disabledMcpServers);
+    }
+
+    /**
+     * Sets exact MCP server names to disable for this session. Disabled servers are
+     * not started or authenticated on create or cold resume; a resident resume
+     * cannot stop servers already running.
+     *
+     * @param disabledMcpServers
+     *            the server names to disable
+     * @return this config for method chaining
+     */
+    public SessionConfig setDisabledMcpServers(List<String> disabledMcpServers) {
+        this.disabledMcpServers = disabledMcpServers;
+        return this;
+    }
+
     /**
      * Gets the custom configuration directory.
      *
@@ -1885,6 +1970,33 @@ public SessionConfig setGitHubToken(String gitHubToken) {
         return this;
     }
 
+    /**
+     * Gets the rotating GitHub token provider for this session.
+     *
+     * @return the provider, or {@code null} when a static token is used
+     */
+    public GitHubTokenProvider getGitHubTokenProvider() {
+        return gitHubTokenProvider;
+    }
+
+    /**
+     * Sets the rotating GitHub token provider for this session.
+     * <p>
+     * The provider receives only the effective host, optional assigned session ID,
+     * and acquisition reason. It must return a positive remaining lifetime in
+     * seconds when its callback completes. Production GitHub tokens typically last
+     * eight hours. This option is mutually exclusive with
+     * {@link #setGitHubToken(String)}.
+     *
+     * @param gitHubTokenProvider
+     *            provider used for initial acquisition and refresh
+     * @return this config instance for method chaining
+     */
+    public SessionConfig setGitHubTokenProvider(GitHubTokenProvider gitHubTokenProvider) {
+        this.gitHubTokenProvider = gitHubTokenProvider;
+        return this;
+    }
+
     /**
      * Gets the per-session remote behavior control.
      * <p>
@@ -2003,10 +2115,11 @@ public Optional<Boolean> getEnableManagedSettings() {
      * (bypass-permissions policy) at session bootstrap.
      * <p>
      * When {@code true}, the runtime self-fetches enterprise managed settings using
-     * the session's {@link #getGitHubToken() gitHubToken}. Requires
-     * {@code gitHubToken} to be set; if omitted, the runtime is expected to reject
-     * session creation (fail-closed). When unset, behaves exactly as before.
-     * Serialized on the wire as {@code enableManagedSettings}.
+     * the session's static {@link #getGitHubToken() gitHubToken} or
+     * {@link #getGitHubTokenProvider() gitHubTokenProvider}. Requires one of those
+     * credentials; if both are omitted, the runtime is expected to reject session
+     * creation (fail-closed). When unset, behaves exactly as before. Serialized on
+     * the wire as {@code enableManagedSettings}.
      *
      * @param enableManagedSettings
      *            {@code true} to opt into self-fetching managed settings
@@ -2017,6 +2130,29 @@ public SessionConfig setEnableManagedSettings(boolean enableManagedSettings) {
         return this;
     }
 
+    /**
+     * Gets host-injected managed settings for this session.
+     *
+     * @return the managed settings, or {@code null} when unset
+     */
+    public ManagedSettings getManagedSettings() {
+        return managedSettings;
+    }
+
+    /**
+     * Supplies permissions-only managed settings at session startup. The runtime
+     * validates and composes this policy restrictively with self-fetched and device
+     * policy. Re-supply it on resume because it is not persisted.
+     *
+     * @param managedSettings
+     *            the host-injected managed settings
+     * @return this config instance for method chaining
+     */
+    public SessionConfig setManagedSettings(ManagedSettings managedSettings) {
+        this.managedSettings = managedSettings;
+        return this;
+    }
+
     /**
      * Creates a shallow clone of this {@code SessionConfig} instance.
      * <p>
@@ -2050,6 +2186,7 @@ public SessionConfig clone() {
         copy.models = this.models != null ? new ArrayList<>(this.models) : null;
         copy.enableSessionTelemetry = this.enableSessionTelemetry;
         copy.enableCitations = this.enableCitations;
+        copy.enableFileChangeTracking = this.enableFileChangeTracking;
         copy.sessionLimits = this.sessionLimits;
         copy.enableExperimentalMode = this.enableExperimentalMode;
         copy.skipCustomInstructions = this.skipCustomInstructions;
@@ -2071,6 +2208,9 @@ public SessionConfig clone() {
         copy.agent = this.agent;
         copy.infiniteSessions = this.infiniteSessions;
         copy.skillDirectories = this.skillDirectories != null ? new ArrayList<>(this.skillDirectories) : null;
+        copy.includedBuiltinSkills = this.includedBuiltinSkills != null
+                ? new ArrayList<>(this.includedBuiltinSkills)
+                : null;
         copy.instructionDirectories = this.instructionDirectories != null
                 ? new ArrayList<>(this.instructionDirectories)
                 : null;
@@ -2079,6 +2219,7 @@ public SessionConfig clone() {
         copy.toolSearch = this.toolSearch;
         copy.memory = this.memory;
         copy.disabledSkills = this.disabledSkills != null ? new ArrayList<>(this.disabledSkills) : null;
+        copy.disabledMcpServers = this.disabledMcpServers != null ? new ArrayList<>(this.disabledMcpServers) : null;
         copy.configDirectory = this.configDirectory;
         copy.enableConfigDiscovery = this.enableConfigDiscovery;
         copy.skipEmbeddingRetrieval = this.skipEmbeddingRetrieval;
@@ -2099,10 +2240,12 @@ public SessionConfig clone() {
         copy.enableMcpApps = this.enableMcpApps;
         copy.githubMcpToolConfig = this.githubMcpToolConfig;
         copy.gitHubToken = this.gitHubToken;
+        copy.gitHubTokenProvider = this.gitHubTokenProvider;
         copy.remoteSession = this.remoteSession;
         copy.cloud = this.cloud;
         copy.expAssignments = this.expAssignments;
         copy.enableManagedSettings = this.enableManagedSettings;
+        copy.managedSettings = this.managedSettings;
         return copy;
     }
 }
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionContext.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionContext.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionContext.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionContext.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionEndHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionEndHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionEndHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionEndHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionEndHookInput.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionEndHookInput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionEndHookInput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionEndHookInput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionEndHookOutput.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionEndHookOutput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionEndHookOutput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionEndHookOutput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionHooks.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionHooks.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionHooks.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionHooks.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionLifecycleEvent.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionLifecycleEvent.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionLifecycleEvent.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionLifecycleEvent.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionLifecycleEventMetadata.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionLifecycleEventMetadata.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionLifecycleEventMetadata.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionLifecycleEventMetadata.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionLifecycleEventTypes.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionLifecycleEventTypes.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionLifecycleEventTypes.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionLifecycleEventTypes.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionLifecycleHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionLifecycleHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionLifecycleHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionLifecycleHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionListFilter.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionListFilter.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionListFilter.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionListFilter.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionMetadata.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionMetadata.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionMetadata.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionMetadata.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionStartHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionStartHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionStartHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionStartHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionStartHookInput.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionStartHookInput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionStartHookInput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionStartHookInput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionStartHookOutput.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionStartHookOutput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionStartHookOutput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionStartHookOutput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionUiApi.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionUiApi.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionUiApi.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionUiApi.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SessionUiCapabilities.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionUiCapabilities.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SessionUiCapabilities.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SessionUiCapabilities.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SetForegroundSessionRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/SetForegroundSessionRequest.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SetForegroundSessionRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SetForegroundSessionRequest.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SetForegroundSessionResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/SetForegroundSessionResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SetForegroundSessionResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SetForegroundSessionResponse.java
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/StdioRuntimeConnection.java b/java/sdk/src/main/java/com/github/copilot/rpc/StdioRuntimeConnection.java
new file mode 100644
index 0000000000..7d0923e0fe
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/StdioRuntimeConnection.java
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.rpc;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.github.copilot.CopilotExperimental;
+
+/**
+ * Spawns a runtime child process and communicates over its stdin/stdout.
+ * Construct with {@link RuntimeConnection#forStdio()} or
+ * {@link RuntimeConnection#forStdio(String)}.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+public final class StdioRuntimeConnection extends RuntimeConnection {
+
+    private String path;
+    private List<String> args;
+
+    StdioRuntimeConnection() {
+    }
+
+    /**
+     * Returns the path to the runtime executable.
+     *
+     * @return the path, or {@code null} to use the runtime discovered on the
+     *         {@code PATH}
+     */
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * Sets the path to the runtime executable.
+     *
+     * @param path
+     *            the path, or {@code null} to use the runtime discovered on the
+     *            {@code PATH}
+     * @return this instance for method chaining
+     */
+    public StdioRuntimeConnection setPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Returns the extra command-line arguments passed to the runtime process.
+     *
+     * @return the arguments, or {@code null} if none are configured
+     */
+    public List<String> getArgs() {
+        return args;
+    }
+
+    /**
+     * Sets extra command-line arguments passed to the runtime process.
+     *
+     * @param args
+     *            the arguments, or {@code null} for none
+     * @return this instance for method chaining
+     */
+    public StdioRuntimeConnection setArgs(List<String> args) {
+        this.args = args == null ? null : new ArrayList<>(args);
+        return this;
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/rpc/SystemMessageConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/SystemMessageConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SystemMessageConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SystemMessageConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SystemMessageSections.java b/java/sdk/src/main/java/com/github/copilot/rpc/SystemMessageSections.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SystemMessageSections.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SystemMessageSections.java
diff --git a/java/src/main/java/com/github/copilot/rpc/SystemPromptSections.java b/java/sdk/src/main/java/com/github/copilot/rpc/SystemPromptSections.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/SystemPromptSections.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/SystemPromptSections.java
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/TcpRuntimeConnection.java b/java/sdk/src/main/java/com/github/copilot/rpc/TcpRuntimeConnection.java
new file mode 100644
index 0000000000..648321a219
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/TcpRuntimeConnection.java
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.rpc;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.github.copilot.CopilotExperimental;
+
+/**
+ * Spawns a runtime child process listening on a TCP socket and connects to it.
+ * Construct with {@link RuntimeConnection#forTcp()}.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+public final class TcpRuntimeConnection extends RuntimeConnection {
+
+    private String path;
+    private int port;
+    private String connectionToken;
+    private List<String> args;
+
+    TcpRuntimeConnection() {
+    }
+
+    /**
+     * Returns the path to the runtime executable.
+     *
+     * @return the path, or {@code null} to use the runtime discovered on the
+     *         {@code PATH}
+     */
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * Sets the path to the runtime executable.
+     *
+     * @param path
+     *            the path, or {@code null} to use the runtime discovered on the
+     *            {@code PATH}
+     * @return this instance for method chaining
+     */
+    public TcpRuntimeConnection setPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Returns the TCP port the spawned runtime listens on.
+     *
+     * @return the port, or {@code 0} to auto-allocate a free port
+     */
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * Sets the TCP port the spawned runtime listens on.
+     *
+     * @param port
+     *            the port, or {@code 0} (the default) to auto-allocate a free port
+     * @return this instance for method chaining
+     */
+    public TcpRuntimeConnection setPort(int port) {
+        this.port = port;
+        return this;
+    }
+
+    /**
+     * Returns the shared secret the SDK sends to the spawned runtime to
+     * authenticate the TCP connection.
+     *
+     * @return the token, or {@code null} to generate one automatically
+     */
+    public String getConnectionToken() {
+        return connectionToken;
+    }
+
+    /**
+     * Sets the shared secret the SDK sends to the spawned runtime to authenticate
+     * the TCP connection.
+     *
+     * @param connectionToken
+     *            the token, or {@code null} to generate one automatically
+     * @return this instance for method chaining
+     */
+    public TcpRuntimeConnection setConnectionToken(String connectionToken) {
+        this.connectionToken = connectionToken;
+        return this;
+    }
+
+    /**
+     * Returns the extra command-line arguments passed to the runtime process.
+     *
+     * @return the arguments, or {@code null} if none are configured
+     */
+    public List<String> getArgs() {
+        return args;
+    }
+
+    /**
+     * Sets extra command-line arguments passed to the runtime process.
+     *
+     * @param args
+     *            the arguments, or {@code null} for none
+     * @return this instance for method chaining
+     */
+    public TcpRuntimeConnection setArgs(List<String> args) {
+        this.args = args == null ? null : new ArrayList<>(args);
+        return this;
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/rpc/TelemetryConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/TelemetryConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/TelemetryConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/TelemetryConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ToolBinaryResult.java b/java/sdk/src/main/java/com/github/copilot/rpc/ToolBinaryResult.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ToolBinaryResult.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ToolBinaryResult.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ToolDefer.java b/java/sdk/src/main/java/com/github/copilot/rpc/ToolDefer.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ToolDefer.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ToolDefer.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ToolDefinition.java b/java/sdk/src/main/java/com/github/copilot/rpc/ToolDefinition.java
similarity index 93%
rename from java/src/main/java/com/github/copilot/rpc/ToolDefinition.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ToolDefinition.java
index ccf0ef5309..de274b66a1 100644
--- a/java/src/main/java/com/github/copilot/rpc/ToolDefinition.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ToolDefinition.java
@@ -78,6 +78,11 @@
  * @param metadata
  *            opaque, host-defined metadata; keys are namespaced and not part of
  *            the stable public API; {@code null} when unset
+ * @param isTerminal
+ *            when {@code true}, a successful call to this tool ends the agent
+ *            turn: the runtime's tool phase halts instead of feeding the result
+ *            back to the model for another round; {@code null} or {@code false}
+ *            leaves the turn running
  * @see SessionConfig#setTools(java.util.List)
  * @see ToolHandler
  * @since 1.0.0
@@ -87,13 +92,13 @@ public record ToolDefinition(@JsonProperty("name") String name, @JsonProperty("d
         @JsonProperty("parameters") Object parameters, @JsonIgnore ToolHandler handler,
         @JsonProperty("overridesBuiltInTool") Boolean overridesBuiltInTool,
         @JsonProperty("skipPermission") Boolean skipPermission, @JsonProperty("defer") ToolDefer defer,
-        @JsonProperty("metadata") Map<String, Object> metadata) {
+        @JsonProperty("metadata") Map<String, Object> metadata, @JsonProperty("isTerminal") Boolean isTerminal) {
 
     /**
-     * Creates a tool definition without a {@code metadata} bag.
+     * Creates a tool definition without a {@code metadata} bag or terminality hint.
      * <p>
      * Convenience overload equivalent to the canonical constructor with
-     * {@code metadata} set to {@code null}.
+     * {@code metadata} and {@code isTerminal} set to {@code null}.
      *
      * @param name
      *            the unique name of the tool
@@ -114,7 +119,37 @@ public record ToolDefinition(@JsonProperty("name") String name, @JsonProperty("d
      */
     public ToolDefinition(String name, String description, Object parameters, ToolHandler handler,
             Boolean overridesBuiltInTool, Boolean skipPermission, ToolDefer defer) {
-        this(name, description, parameters, handler, overridesBuiltInTool, skipPermission, defer, null);
+        this(name, description, parameters, handler, overridesBuiltInTool, skipPermission, defer, null, null);
+    }
+
+    /**
+     * Creates a tool definition without a terminality hint.
+     * <p>
+     * Convenience overload equivalent to the canonical constructor with
+     * {@code isTerminal} set to {@code null}.
+     *
+     * @param name
+     *            the unique name of the tool
+     * @param description
+     *            a description of what the tool does
+     * @param parameters
+     *            the JSON Schema for the tool's parameters
+     * @param handler
+     *            the handler function to execute when invoked
+     * @param overridesBuiltInTool
+     *            whether this tool overrides a built-in tool; {@code null} for the
+     *            default
+     * @param skipPermission
+     *            whether the tool may run without a permission check; {@code null}
+     *            for the default
+     * @param defer
+     *            the deferral mode; {@code null} lets the runtime decide
+     * @param metadata
+     *            the opaque, host-defined metadata; {@code null} when unset
+     */
+    public ToolDefinition(String name, String description, Object parameters, ToolHandler handler,
+            Boolean overridesBuiltInTool, Boolean skipPermission, ToolDefer defer, Map<String, Object> metadata) {
+        this(name, description, parameters, handler, overridesBuiltInTool, skipPermission, defer, metadata, null);
     }
 
     /**
@@ -304,7 +339,8 @@ public static List<ToolDefinition> fromClass(Class<?> clazz) {
      */
     @CopilotExperimental
     public ToolDefinition overridesBuiltInTool(boolean value) {
-        return new ToolDefinition(name, description, parameters, handler, value, skipPermission, defer, metadata);
+        return new ToolDefinition(name, description, parameters, handler, value, skipPermission, defer, metadata,
+                isTerminal);
     }
 
     /**
@@ -318,7 +354,8 @@ public ToolDefinition overridesBuiltInTool(boolean value) {
      */
     @CopilotExperimental
     public ToolDefinition skipPermission(boolean value) {
-        return new ToolDefinition(name, description, parameters, handler, overridesBuiltInTool, value, defer, metadata);
+        return new ToolDefinition(name, description, parameters, handler, overridesBuiltInTool, value, defer, metadata,
+                isTerminal);
     }
 
     /**
@@ -333,7 +370,7 @@ public ToolDefinition skipPermission(boolean value) {
     @CopilotExperimental
     public ToolDefinition defer(ToolDefer value) {
         return new ToolDefinition(name, description, parameters, handler, overridesBuiltInTool, skipPermission, value,
-                metadata);
+                metadata, isTerminal);
     }
 
     /**
@@ -348,7 +385,22 @@ public ToolDefinition defer(ToolDefer value) {
     @CopilotExperimental
     public ToolDefinition metadata(Map<String, Object> value) {
         return new ToolDefinition(name, description, parameters, handler, overridesBuiltInTool, skipPermission, defer,
-                value);
+                value, isTerminal);
+    }
+
+    /**
+     * Returns a copy with the {@code isTerminal} flag set.
+     *
+     * @param value
+     *            {@code true} to end the agent turn after a successful call to this
+     *            tool
+     * @return a new {@code ToolDefinition} with the flag applied
+     * @since 1.0.11
+     */
+    @CopilotExperimental
+    public ToolDefinition isTerminal(boolean value) {
+        return new ToolDefinition(name, description, parameters, handler, overridesBuiltInTool, skipPermission, defer,
+                metadata, value);
     }
 
     // ------------------------------------------------------------------
diff --git a/java/src/main/java/com/github/copilot/rpc/ToolHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/ToolHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ToolHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ToolHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ToolInvocation.java b/java/sdk/src/main/java/com/github/copilot/rpc/ToolInvocation.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ToolInvocation.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ToolInvocation.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ToolResultObject.java b/java/sdk/src/main/java/com/github/copilot/rpc/ToolResultObject.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ToolResultObject.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ToolResultObject.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ToolSearchConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/ToolSearchConfig.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ToolSearchConfig.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ToolSearchConfig.java
diff --git a/java/src/main/java/com/github/copilot/rpc/ToolSet.java b/java/sdk/src/main/java/com/github/copilot/rpc/ToolSet.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/ToolSet.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/ToolSet.java
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/UriRuntimeConnection.java b/java/sdk/src/main/java/com/github/copilot/rpc/UriRuntimeConnection.java
new file mode 100644
index 0000000000..c260985845
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/UriRuntimeConnection.java
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.rpc;
+
+import com.github.copilot.CopilotExperimental;
+
+/**
+ * Connects to an already-running runtime at the configured URL. Construct with
+ * {@link RuntimeConnection#forUri(String)}.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+public final class UriRuntimeConnection extends RuntimeConnection {
+
+    private final String url;
+    private String connectionToken;
+
+    UriRuntimeConnection(String url) {
+        if (url == null || url.isEmpty()) {
+            throw new IllegalArgumentException("UriRuntimeConnection url must be a non-empty string");
+        }
+        this.url = url;
+    }
+
+    /**
+     * Returns the URL of the runtime to connect to.
+     *
+     * @return the URL; accepts {@code "port"}, {@code "host:port"}, or a full URL
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * Returns the shared secret used to authenticate the connection.
+     *
+     * @return the token, or {@code null} if the runtime does not require one
+     */
+    public String getConnectionToken() {
+        return connectionToken;
+    }
+
+    /**
+     * Sets the shared secret used to authenticate the connection.
+     *
+     * @param connectionToken
+     *            the token, or {@code null} if the runtime does not require one
+     * @return this instance for method chaining
+     */
+    public UriRuntimeConnection setConnectionToken(String connectionToken) {
+        this.connectionToken = connectionToken;
+        return this;
+    }
+}
diff --git a/java/src/main/java/com/github/copilot/rpc/UserInputHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserInputHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserInputHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserInputHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/UserInputInvocation.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserInputInvocation.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserInputInvocation.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserInputInvocation.java
diff --git a/java/src/main/java/com/github/copilot/rpc/UserInputRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserInputRequest.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserInputRequest.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserInputRequest.java
diff --git a/java/src/main/java/com/github/copilot/rpc/UserInputResponse.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserInputResponse.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserInputResponse.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserInputResponse.java
diff --git a/java/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHookInput.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHookInput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHookInput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHookInput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHookOutput.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHookOutput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHookOutput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserPromptSubmittedHookOutput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/UserPromptTransformedHandler.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserPromptTransformedHandler.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserPromptTransformedHandler.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserPromptTransformedHandler.java
diff --git a/java/src/main/java/com/github/copilot/rpc/UserPromptTransformedHookInput.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserPromptTransformedHookInput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserPromptTransformedHookInput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserPromptTransformedHookInput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/UserPromptTransformedHookOutput.java b/java/sdk/src/main/java/com/github/copilot/rpc/UserPromptTransformedHookOutput.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/UserPromptTransformedHookOutput.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/UserPromptTransformedHookOutput.java
diff --git a/java/src/main/java/com/github/copilot/rpc/package-info.java b/java/sdk/src/main/java/com/github/copilot/rpc/package-info.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/rpc/package-info.java
rename to java/sdk/src/main/java/com/github/copilot/rpc/package-info.java
diff --git a/java/src/main/java/com/github/copilot/tool/CopilotTool.java b/java/sdk/src/main/java/com/github/copilot/tool/CopilotTool.java
similarity index 97%
rename from java/src/main/java/com/github/copilot/tool/CopilotTool.java
rename to java/sdk/src/main/java/com/github/copilot/tool/CopilotTool.java
index db9e3ca62d..28cd759288 100644
--- a/java/src/main/java/com/github/copilot/tool/CopilotTool.java
+++ b/java/sdk/src/main/java/com/github/copilot/tool/CopilotTool.java
@@ -48,6 +48,9 @@
     /** Whether to skip permission checks. */
     boolean skipPermission() default false;
 
+    /** Whether a successful call to this tool ends the agent turn. */
+    boolean isTerminal() default false;
+
     /** Defer configuration for this tool. */
     ToolDefer defer() default ToolDefer.NONE;
 
diff --git a/java/src/main/java/com/github/copilot/tool/CopilotToolMetadataProvider.java b/java/sdk/src/main/java/com/github/copilot/tool/CopilotToolMetadataProvider.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/tool/CopilotToolMetadataProvider.java
rename to java/sdk/src/main/java/com/github/copilot/tool/CopilotToolMetadataProvider.java
diff --git a/java/src/main/java/com/github/copilot/tool/CopilotToolParam.java b/java/sdk/src/main/java/com/github/copilot/tool/CopilotToolParam.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/tool/CopilotToolParam.java
rename to java/sdk/src/main/java/com/github/copilot/tool/CopilotToolParam.java
diff --git a/java/src/main/java/com/github/copilot/tool/CopilotToolProcessor.java b/java/sdk/src/main/java/com/github/copilot/tool/CopilotToolProcessor.java
similarity index 99%
rename from java/src/main/java/com/github/copilot/tool/CopilotToolProcessor.java
rename to java/sdk/src/main/java/com/github/copilot/tool/CopilotToolProcessor.java
index dbc6921afa..f88c1ac7c8 100644
--- a/java/src/main/java/com/github/copilot/tool/CopilotToolProcessor.java
+++ b/java/sdk/src/main/java/com/github/copilot/tool/CopilotToolProcessor.java
@@ -317,6 +317,7 @@ private void writeToolDefinition(PrintWriter out, ExecutableElement method) {
         String description = annotation.value();
         boolean overridesBuiltIn = annotation.overridesBuiltInTool();
         boolean skipPermission = annotation.skipPermission();
+        boolean isTerminal = annotation.isTerminal();
         com.github.copilot.rpc.ToolDefer defer = annotation.defer();
 
         // Generate schema with @CopilotToolParam metadata (descriptions, names,
@@ -329,6 +330,7 @@ private void writeToolDefinition(PrintWriter out, ExecutableElement method) {
         // Use the record constructor directly so all flags apply independently
         String overridesArg = overridesBuiltIn ? "Boolean.TRUE" : "null";
         String skipPermArg = skipPermission ? "Boolean.TRUE" : "null";
+        String isTerminalArg = isTerminal ? "Boolean.TRUE" : "null";
         String deferArg = defer != com.github.copilot.rpc.ToolDefer.NONE ? "ToolDefer." + defer.name() : "null";
 
         out.println("            new ToolDefinition(");
@@ -341,7 +343,8 @@ private void writeToolDefinition(PrintWriter out, ExecutableElement method) {
         out.println("                " + overridesArg + ",");
         out.println("                " + skipPermArg + ",");
         out.println("                " + deferArg + ",");
-        out.println("                " + metadataSource(annotation));
+        out.println("                " + metadataSource(annotation) + ",");
+        out.println("                " + isTerminalArg);
         out.print("            )");
     }
 
diff --git a/java/src/main/java/com/github/copilot/tool/Param.java b/java/sdk/src/main/java/com/github/copilot/tool/Param.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/tool/Param.java
rename to java/sdk/src/main/java/com/github/copilot/tool/Param.java
diff --git a/java/src/main/java/com/github/copilot/tool/SchemaGenerator.java b/java/sdk/src/main/java/com/github/copilot/tool/SchemaGenerator.java
similarity index 100%
rename from java/src/main/java/com/github/copilot/tool/SchemaGenerator.java
rename to java/sdk/src/main/java/com/github/copilot/tool/SchemaGenerator.java
diff --git a/java/src/main/java/module-info.java b/java/sdk/src/main/java/module-info.java
similarity index 94%
rename from java/src/main/java/module-info.java
rename to java/sdk/src/main/java/module-info.java
index 38bc1f93d5..8bc2dbd55c 100644
--- a/java/src/main/java/module-info.java
+++ b/java/sdk/src/main/java/module-info.java
@@ -12,6 +12,7 @@
     requires com.fasterxml.jackson.datatype.jsr310;
     requires static com.github.spotbugs.annotations;
     requires static java.compiler;
+    requires static com.sun.jna;
     requires java.net.http;
     requires java.logging;
 
@@ -25,6 +26,7 @@
     opens com.github.copilot.generated to com.fasterxml.jackson.databind;
     opens com.github.copilot.generated.rpc to com.fasterxml.jackson.databind;
     opens com.github.copilot.rpc to com.fasterxml.jackson.databind;
+    opens com.github.copilot.ffi to com.sun.jna;
 
     provides javax.annotation.processing.Processor
             with com.github.copilot.CopilotExperimentalProcessor, com.github.copilot.tool.CopilotToolProcessor;
diff --git a/java/src/main/java25/com/github/copilot/InternalExecutorProvider.java b/java/sdk/src/main/java25/com/github/copilot/InternalExecutorProvider.java
similarity index 100%
rename from java/src/main/java25/com/github/copilot/InternalExecutorProvider.java
rename to java/sdk/src/main/java25/com/github/copilot/InternalExecutorProvider.java
diff --git a/java/sdk/src/main/java25/com/github/copilot/ffi/ReaderThreadFactory.java b/java/sdk/src/main/java25/com/github/copilot/ffi/ReaderThreadFactory.java
new file mode 100644
index 0000000000..a67346b889
--- /dev/null
+++ b/java/sdk/src/main/java25/com/github/copilot/ffi/ReaderThreadFactory.java
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+/**
+ * JDK 25 multi-release variant of {@link ReaderThreadFactory}.
+ */
+final class ReaderThreadFactory {
+
+    Thread create(Runnable task, String name) {
+        return Thread.ofVirtual().name(name).unstarted(task);
+    }
+}
diff --git a/java/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/java/sdk/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from java/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to java/sdk/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/java/sdk/src/main/resources/copilot-runtime.properties b/java/sdk/src/main/resources/copilot-runtime.properties
new file mode 100644
index 0000000000..2900464443
--- /dev/null
+++ b/java/sdk/src/main/resources/copilot-runtime.properties
@@ -0,0 +1,3 @@
+# This file is processed by Maven resource filtering.
+# The ${project.version} placeholder is replaced at build time.
+version=${project.version}
diff --git a/java/src/test/java/com/github/copilot/AgentInfoTest.java b/java/sdk/src/test/java/com/github/copilot/AgentInfoTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/AgentInfoTest.java
rename to java/sdk/src/test/java/com/github/copilot/AgentInfoTest.java
diff --git a/java/src/test/java/com/github/copilot/AgentModeTest.java b/java/sdk/src/test/java/com/github/copilot/AgentModeTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/AgentModeTest.java
rename to java/sdk/src/test/java/com/github/copilot/AgentModeTest.java
diff --git a/java/src/test/java/com/github/copilot/AskUserTest.java b/java/sdk/src/test/java/com/github/copilot/AskUserTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/AskUserTest.java
rename to java/sdk/src/test/java/com/github/copilot/AskUserTest.java
diff --git a/java/sdk/src/test/java/com/github/copilot/BuiltinPluginDirectoriesTest.java b/java/sdk/src/test/java/com/github/copilot/BuiltinPluginDirectoriesTest.java
new file mode 100644
index 0000000000..fa353e6277
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/BuiltinPluginDirectoriesTest.java
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.copilot.rpc.CopilotClientOptions;
+
+class BuiltinPluginDirectoriesTest {
+
+    @Test
+    void defaultAndEmptyDoNotCallRpc() throws Exception {
+        assertDoesNotCallRpc(new CopilotClientOptions());
+        assertDoesNotCallRpc(new CopilotClientOptions().setBuiltinPluginDirectories(List.of()));
+    }
+
+    @Test
+    void configuredDirectoriesCallRpcOnceBeforeStartCompletes() throws Exception {
+        var paths = List.of(Path.of("").toAbsolutePath().resolve("plugins/core"),
+                Path.of("").toAbsolutePath().resolve("plugins/github"));
+
+        try (var server = new FakeRuntimeServer();
+                var client = new CopilotClient(
+                        new CopilotClientOptions().setCliUrl(server.url()).setBuiltinPluginDirectories(paths))) {
+            client.start().get(15, TimeUnit.SECONDS);
+
+            assertEquals(1, server.builtinSetCount());
+            JsonNode params = server.awaitBuiltinParams();
+            assertEquals(paths.get(0).toString(), params.path("paths").get(0).asText());
+            assertEquals(paths.get(1).toString(), params.path("paths").get(1).asText());
+        }
+    }
+
+    @Test
+    void relativeDirectoryIsRejected() {
+        assertThrows(IllegalArgumentException.class,
+                () -> new CopilotClientOptions().setBuiltinPluginDirectories(List.of(Path.of("plugins/core"))));
+    }
+
+    private static void assertDoesNotCallRpc(CopilotClientOptions options) throws Exception {
+        try (var server = new FakeRuntimeServer(); var client = new CopilotClient(options.setCliUrl(server.url()))) {
+            client.start().get(15, TimeUnit.SECONDS);
+            assertEquals(0, server.builtinSetCount());
+        }
+    }
+
+    private static final class FakeRuntimeServer implements AutoCloseable {
+
+        private final ServerSocket serverSocket;
+        private final Thread acceptThread;
+        private final CompletableFuture<JsonRpcClient> ready = new CompletableFuture<>();
+        private final CompletableFuture<JsonNode> builtinParams = new CompletableFuture<>();
+        private final AtomicInteger builtinSetCount = new AtomicInteger();
+
+        FakeRuntimeServer() throws IOException {
+            serverSocket = new ServerSocket(0);
+            acceptThread = new Thread(this::acceptLoop, "builtin-plugin-runtime");
+            acceptThread.setDaemon(true);
+            acceptThread.start();
+        }
+
+        String url() {
+            return "127.0.0.1:" + serverSocket.getLocalPort();
+        }
+
+        int builtinSetCount() {
+            return builtinSetCount.get();
+        }
+
+        JsonNode awaitBuiltinParams() throws Exception {
+            return builtinParams.get(15, TimeUnit.SECONDS);
+        }
+
+        private void acceptLoop() {
+            try {
+                Socket socket = serverSocket.accept();
+                JsonRpcClient server = JsonRpcClient.fromSocket(socket);
+                server.registerMethodHandler("connect", (id, params) -> respond(server, id,
+                        Map.of("ok", true, "protocolVersion", 3, "version", "test")));
+                server.registerMethodHandler("plugins.builtin.set", (id, params) -> {
+                    builtinSetCount.incrementAndGet();
+                    builtinParams.complete(params);
+                    respond(server, id, Map.of());
+                });
+                ready.complete(server);
+            } catch (IOException e) {
+                ready.completeExceptionally(e);
+                builtinParams.completeExceptionally(e);
+            }
+        }
+
+        private static void respond(JsonRpcClient server, String id, Object result) {
+            if (id == null) {
+                return;
+            }
+            try {
+                server.sendResponse(id, result);
+            } catch (IOException e) {
+                // Connection teardown can race the response during test cleanup.
+            }
+        }
+
+        @Override
+        public void close() throws Exception {
+            JsonRpcClient server = ready.getNow(null);
+            if (server != null) {
+                server.close();
+            }
+            serverSocket.close();
+        }
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/ByokBearerTokenProviderE2ETest.java b/java/sdk/src/test/java/com/github/copilot/ByokBearerTokenProviderE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ByokBearerTokenProviderE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/ByokBearerTokenProviderE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/CapiProxy.java b/java/sdk/src/test/java/com/github/copilot/CapiProxy.java
similarity index 92%
rename from java/src/test/java/com/github/copilot/CapiProxy.java
rename to java/sdk/src/test/java/com/github/copilot/CapiProxy.java
index 6484f05818..3124cc3d6b 100644
--- a/java/src/test/java/com/github/copilot/CapiProxy.java
+++ b/java/sdk/src/test/java/com/github/copilot/CapiProxy.java
@@ -57,16 +57,15 @@ public class CapiProxy implements AutoCloseable {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
     private static final Pattern LISTENING_PATTERN = Pattern.compile("Listening: (http://[^\\s]+)(?:\\s+(\\{.*\\}))?$");
+    private static final HttpClient HTTP_CLIENT = HttpClient.newHttpClient();
 
     private Process process;
     private String proxyUrl;
     private String connectProxyUrl;
     private String caFilePath;
-    private final HttpClient httpClient;
     private BufferedReader stdoutReader;
 
     public CapiProxy() {
-        this.httpClient = HttpClient.newHttpClient();
     }
 
     /**
@@ -93,9 +92,10 @@ public String start() throws IOException, InterruptedException {
         // Start the harness server using npx tsx
         // On Windows, npx is installed as npx.cmd which requires cmd /c to launch
         boolean isWindows = System.getProperty("os.name").toLowerCase().contains("win");
+        String npxPath = resolveCommand(isWindows ? "npx.cmd" : "npx");
         var pb = isWindows
-                ? new ProcessBuilder("cmd", "/c", "npx", "tsx", "server.ts")
-                : new ProcessBuilder("npx", "tsx", "server.ts");
+                ? new ProcessBuilder(System.getenv("COMSPEC"), "/c", npxPath, "tsx", "server.ts")
+                : new ProcessBuilder(npxPath, "tsx", "server.ts");
         pb.directory(harnessDir.toFile());
         pb.redirectErrorStream(false);
         // Tell the replaying proxy to fail fast on unmatched requests rather than
@@ -211,7 +211,7 @@ public void configure(String filePath, String workDir, TestInfo testInfo) throws
         HttpRequest request = HttpRequest.newBuilder().uri(URI.create(proxyUrl + "/config"))
                 .header("Content-Type", "application/json").POST(HttpRequest.BodyPublishers.ofString(body)).build();
 
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        HttpResponse<String> response = HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofString());
         if (response.statusCode() != 200) {
             throw new IOException("Proxy config failed with status " + response.statusCode() + ": " + response.body());
         }
@@ -233,7 +233,7 @@ public List<Map<String, Object>> getExchanges() throws IOException, InterruptedE
 
         HttpRequest request = HttpRequest.newBuilder().uri(URI.create(proxyUrl + "/exchanges")).GET().build();
 
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        HttpResponse<String> response = HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofString());
         if (response.statusCode() != 200) {
             throw new IOException("Failed to get exchanges: " + response.statusCode());
         }
@@ -283,7 +283,7 @@ public void setCopilotUserByToken(String token, String login, String copilotPlan
         HttpRequest request = HttpRequest.newBuilder().uri(URI.create(proxyUrl + "/copilot-user-config"))
                 .header("Content-Type", "application/json").POST(HttpRequest.BodyPublishers.ofString(body)).build();
 
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        HttpResponse<String> response = HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofString());
         if (response.statusCode() != 200) {
             throw new IOException(
                     "Failed to set copilot user config: " + response.statusCode() + ": " + response.body());
@@ -330,7 +330,7 @@ public void setCopilotUserByToken(String token, Map<String, Object> response)
         HttpRequest request = HttpRequest.newBuilder().uri(URI.create(proxyUrl + "/copilot-user-config"))
                 .header("Content-Type", "application/json").POST(HttpRequest.BodyPublishers.ofString(body)).build();
 
-        HttpResponse<String> response2 = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        HttpResponse<String> response2 = HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofString());
         if (response2.statusCode() != 200) {
             throw new IOException(
                     "Failed to set copilot user config: " + response2.statusCode() + ": " + response2.body());
@@ -375,7 +375,7 @@ public void stop(boolean skipWritingCache) throws IOException, InterruptedExcept
                 HttpRequest request = HttpRequest.newBuilder().uri(URI.create(stopUrl))
                         .POST(HttpRequest.BodyPublishers.noBody()).build();
 
-                httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+                HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofString());
             } catch (Exception e) {
                 // Best effort - ignore errors
             }
@@ -516,6 +516,24 @@ private Path findHarnessDirectory() {
         return null;
     }
 
+    /**
+     * Resolves a command name to its absolute path by searching the system
+     * {@code PATH}. Falls back to the original name if not found.
+     */
+    private static String resolveCommand(String command) {
+        String pathEnv = System.getenv("PATH");
+        if (pathEnv == null) {
+            return command;
+        }
+        for (String dir : pathEnv.split(java.io.File.pathSeparator)) {
+            Path candidate = Path.of(dir, command);
+            if (java.nio.file.Files.isExecutable(candidate)) {
+                return candidate.toAbsolutePath().toString();
+            }
+        }
+        return command;
+    }
+
     /**
      * Test information record for configuring the proxy.
      */
diff --git a/java/sdk/src/test/java/com/github/copilot/CapiProxyTest.java b/java/sdk/src/test/java/com/github/copilot/CapiProxyTest.java
new file mode 100644
index 0000000000..9ac044a2b8
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/CapiProxyTest.java
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.reflect.Modifier;
+
+import org.junit.jupiter.api.Test;
+
+class CapiProxyTest {
+
+    @Test
+    void proxyInstancesShareHttpClientResources() throws Exception {
+        var field = CapiProxy.class.getDeclaredField("HTTP_CLIENT");
+        assertTrue(Modifier.isStatic(field.getModifiers()),
+                "E2E contexts must not retain one HttpClient selector manager per test class");
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/CapiSessionOptionsTest.java b/java/sdk/src/test/java/com/github/copilot/CapiSessionOptionsTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/CapiSessionOptionsTest.java
rename to java/sdk/src/test/java/com/github/copilot/CapiSessionOptionsTest.java
diff --git a/java/src/test/java/com/github/copilot/CliServerManagerTest.java b/java/sdk/src/test/java/com/github/copilot/CliServerManagerTest.java
similarity index 96%
rename from java/src/test/java/com/github/copilot/CliServerManagerTest.java
rename to java/sdk/src/test/java/com/github/copilot/CliServerManagerTest.java
index b445d6153a..68555a35b4 100644
--- a/java/src/test/java/com/github/copilot/CliServerManagerTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/CliServerManagerTest.java
@@ -70,18 +70,13 @@ void connectToServerTcpMode() throws Exception {
         }
     }
 
-    private static Process startBlockingProcess() throws IOException {
-        boolean isWindows = System.getProperty("os.name").toLowerCase().contains("windows");
-        return (isWindows ? new ProcessBuilder("cmd", "/c", "more") : new ProcessBuilder("cat")).start();
-    }
-
     @Test
     void connectToServerStdioMode() throws Exception {
         var options = new CopilotClientOptions();
         var manager = new CliServerManager(options);
 
         // Create a dummy process for stdio mode
-        Process process = startBlockingProcess();
+        Process process = new TestProcess();
         try {
             JsonRpcClient client = manager.connectToServer(process, null, null);
             assertNotNull(client);
diff --git a/java/src/test/java/com/github/copilot/ClientOptionsE2ETest.java b/java/sdk/src/test/java/com/github/copilot/ClientOptionsE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ClientOptionsE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/ClientOptionsE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/ClosedSessionGuardTest.java b/java/sdk/src/test/java/com/github/copilot/ClosedSessionGuardTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ClosedSessionGuardTest.java
rename to java/sdk/src/test/java/com/github/copilot/ClosedSessionGuardTest.java
diff --git a/java/src/test/java/com/github/copilot/CommandsTest.java b/java/sdk/src/test/java/com/github/copilot/CommandsTest.java
similarity index 97%
rename from java/src/test/java/com/github/copilot/CommandsTest.java
rename to java/sdk/src/test/java/com/github/copilot/CommandsTest.java
index 0da8822a2b..f5f8424391 100644
--- a/java/src/test/java/com/github/copilot/CommandsTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/CommandsTest.java
@@ -95,7 +95,7 @@ void buildCreateRequestIncludesCommandWireDefinitions() {
         assertEquals("deploy", request.getCommands().get(0).getName());
         assertEquals("Deploy", request.getCommands().get(0).getDescription());
         assertEquals("rollback", request.getCommands().get(1).getName());
-        assertNull(request.getCommands().get(1).getDescription());
+        assertEquals("", request.getCommands().get(1).getDescription());
     }
 
     @Test
@@ -130,11 +130,11 @@ void commandWireDefinitionHasNameAndDescription() {
     }
 
     @Test
-    void commandWireDefinitionNullDescriptionAllowed() {
+    void commandWireDefinitionNormalizesNullDescription() {
         var wire = new CommandWireDefinition("rollback", null);
 
         assertEquals("rollback", wire.getName());
-        assertNull(wire.getDescription());
+        assertEquals("", wire.getDescription());
     }
 
     @Test
diff --git a/java/src/test/java/com/github/copilot/CompactionTest.java b/java/sdk/src/test/java/com/github/copilot/CompactionTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/CompactionTest.java
rename to java/sdk/src/test/java/com/github/copilot/CompactionTest.java
diff --git a/java/src/test/java/com/github/copilot/ConfigCloneTest.java b/java/sdk/src/test/java/com/github/copilot/ConfigCloneTest.java
similarity index 95%
rename from java/src/test/java/com/github/copilot/ConfigCloneTest.java
rename to java/sdk/src/test/java/com/github/copilot/ConfigCloneTest.java
index a8e7fb2e0b..4c5a3fbef0 100644
--- a/java/src/test/java/com/github/copilot/ConfigCloneTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/ConfigCloneTest.java
@@ -120,6 +120,7 @@ void sessionConfigCloneBasic() {
         original.setReasoningSummary("detailed");
         original.setContextTier("long_context");
         original.setPluginDirectories(List.of("/plugins/a", "/plugins/b"));
+        original.setDisabledMcpServers(List.of("local-files", "remote-github"));
         original.setLargeOutput(
                 new LargeToolOutputConfig().setEnabled(true).setMaxSizeBytes(1024L).setOutputDirectory("/tmp/out"));
         original.setMemory(new MemoryConfiguration().setEnabled(true));
@@ -133,6 +134,7 @@ void sessionConfigCloneBasic() {
         assertEquals(original.getReasoningSummary(), cloned.getReasoningSummary());
         assertEquals(original.getContextTier(), cloned.getContextTier());
         assertEquals(original.getPluginDirectories(), cloned.getPluginDirectories());
+        assertEquals(original.getDisabledMcpServers(), cloned.getDisabledMcpServers());
         assertEquals(original.getLargeOutput(), cloned.getLargeOutput());
         assertEquals(original.getMemory(), cloned.getMemory());
         assertEquals(original.isStreaming(), cloned.isStreaming());
@@ -146,6 +148,7 @@ void sessionConfigListIndependence() {
         toolList.add("bash");
         original.setAvailableTools(toolList);
         original.setInstructionDirectories(new ArrayList<>(List.of("/path/a", "/path/b")));
+        original.setDisabledMcpServers(new ArrayList<>(List.of("local-files")));
 
         SessionConfig cloned = original.clone();
 
@@ -156,6 +159,7 @@ void sessionConfigListIndependence() {
         assertEquals(2, cloned.getAvailableTools().size());
         assertEquals(3, original.getAvailableTools().size());
         assertEquals(List.of("/path/a", "/path/b"), cloned.getInstructionDirectories());
+        assertEquals(List.of("local-files"), cloned.getDisabledMcpServers());
     }
 
     @Test
@@ -177,13 +181,14 @@ void sessionConfigSessionPolicyOptionsCloned() {
         var sessionLimits = new SessionLimitsConfig(30.0);
         var excludedAgents = new ArrayList<>(List.of("explore"));
         SessionConfig original = new SessionConfig().setExcludedBuiltInAgents(excludedAgents).setEnableCitations(true)
-                .setSessionLimits(sessionLimits);
+                .setEnableFileChangeTracking(true).setSessionLimits(sessionLimits);
 
         SessionConfig cloned = original.clone();
         excludedAgents.add("task");
 
         assertEquals(List.of("explore"), cloned.getExcludedBuiltInAgents());
         assertTrue(cloned.getEnableCitations().orElse(false));
+        assertTrue(cloned.getEnableFileChangeTracking().orElse(false));
         assertSame(sessionLimits, cloned.getSessionLimits());
     }
 
@@ -194,6 +199,7 @@ void resumeSessionConfigCloneBasic() {
         original.setReasoningSummary("none");
         original.setContextTier("long_context");
         original.setPluginDirectories(List.of("/plugins/r"));
+        original.setDisabledMcpServers(List.of("local-files-r"));
         original.setLargeOutput(
                 new LargeToolOutputConfig().setEnabled(false).setMaxSizeBytes(2048L).setOutputDirectory("/tmp/resume"));
         original.setMemory(new MemoryConfiguration().setEnabled(false));
@@ -205,6 +211,7 @@ void resumeSessionConfigCloneBasic() {
         assertEquals(original.getReasoningSummary(), cloned.getReasoningSummary());
         assertEquals(original.getContextTier(), cloned.getContextTier());
         assertEquals(original.getPluginDirectories(), cloned.getPluginDirectories());
+        assertEquals(original.getDisabledMcpServers(), cloned.getDisabledMcpServers());
         assertEquals(original.getLargeOutput(), cloned.getLargeOutput());
         assertEquals(original.getMemory(), cloned.getMemory());
         assertEquals(original.isStreaming(), cloned.isStreaming());
@@ -229,13 +236,14 @@ void resumeSessionConfigSessionPolicyOptionsCloned() {
         var sessionLimits = new SessionLimitsConfig(30.0);
         var excludedAgents = new ArrayList<>(List.of("explore"));
         ResumeSessionConfig original = new ResumeSessionConfig().setExcludedBuiltInAgents(excludedAgents)
-                .setEnableCitations(true).setSessionLimits(sessionLimits);
+                .setEnableCitations(true).setEnableFileChangeTracking(true).setSessionLimits(sessionLimits);
 
         ResumeSessionConfig cloned = original.clone();
         excludedAgents.add("task");
 
         assertEquals(List.of("explore"), cloned.getExcludedBuiltInAgents());
         assertTrue(cloned.getEnableCitations().orElse(false));
+        assertTrue(cloned.getEnableFileChangeTracking().orElse(false));
         assertSame(sessionLimits, cloned.getSessionLimits());
     }
 
@@ -377,6 +385,15 @@ void copilotClientOptionsSetEnvironmentNullClearsExisting() {
         assertTrue(env == null || env.isEmpty());
     }
 
+    @Test
+    void copilotClientOptionsSetCwdNullClearsExisting() {
+        CopilotClientOptions opts = new CopilotClientOptions().setCwd("/tmp");
+
+        opts.setCwd(null);
+
+        assertNull(opts.getCwd());
+    }
+
     @Test
     @SuppressWarnings("deprecation")
     void copilotClientOptionsDeprecatedGithubToken() {
diff --git a/java/src/test/java/com/github/copilot/CopilotClientModeTest.java b/java/sdk/src/test/java/com/github/copilot/CopilotClientModeTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/CopilotClientModeTest.java
rename to java/sdk/src/test/java/com/github/copilot/CopilotClientModeTest.java
diff --git a/java/src/test/java/com/github/copilot/CopilotClientTest.java b/java/sdk/src/test/java/com/github/copilot/CopilotClientTest.java
similarity index 93%
rename from java/src/test/java/com/github/copilot/CopilotClientTest.java
rename to java/sdk/src/test/java/com/github/copilot/CopilotClientTest.java
index d977563aeb..4cfd7f4c48 100644
--- a/java/src/test/java/com/github/copilot/CopilotClientTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/CopilotClientTest.java
@@ -8,6 +8,8 @@
 import org.junit.jupiter.api.Test;
 
 import com.github.copilot.rpc.CopilotClientOptions;
+import com.github.copilot.rpc.DeleteSessionResponse;
+import com.github.copilot.rpc.GitHubTokenProviderResult;
 import com.github.copilot.rpc.PermissionHandler;
 import com.github.copilot.rpc.PingResponse;
 import com.github.copilot.rpc.SessionConfig;
@@ -111,6 +113,35 @@ void testForceStopAndExternalStopDoNotRequestRuntimeShutdown() throws Exception
         verify(externalRpc, never()).invoke(eq("runtime.shutdown"), any(), eq(Void.class));
     }
 
+    @Test
+    @SuppressWarnings("unchecked")
+    void testDeleteSessionReleasesGitHubTokenProvider() throws Exception {
+        var client = new CopilotClient(new CopilotClientOptions().setAutoStart(false));
+        var rpc = mock(JsonRpcClient.class);
+        when(rpc.invoke(eq("session.delete"), any(), eq(DeleteSessionResponse.class)))
+                .thenReturn(CompletableFuture.completedFuture(new DeleteSessionResponse(true, null)));
+        when(rpc.invoke(eq("session.destroy"), any(), eq(Void.class)))
+                .thenReturn(CompletableFuture.completedFuture(null));
+        setConnectionFuture(client, rpc, null);
+
+        var registry = new GitHubTokenProviderRegistry();
+        var registration = registry
+                .register(args -> CompletableFuture.completedFuture(GitHubTokenProviderResult.cancelled()));
+        var session = new CopilotSession("delete-session", rpc);
+        session.setGitHubTokenProviderRegistration(registration);
+        Field sessionsField = CopilotClient.class.getDeclaredField("sessions");
+        sessionsField.setAccessible(true);
+        ((Map<String, CopilotSession>) sessionsField.get(client)).put(session.getSessionId(), session);
+
+        try {
+            client.deleteSession(session.getSessionId()).join();
+            assertNull(registry.get(registration.id()));
+        } finally {
+            session.close();
+            client.close();
+        }
+    }
+
     @Test
     void testClientConstruction() {
         var client = new CopilotClient();
@@ -610,9 +641,9 @@ void testListModels_WithCustomHandler_WorksWithoutStart() throws Exception {
     private static void setConnectionFuture(CopilotClient client, JsonRpcClient rpc, Process process) throws Exception {
         var connectionClass = Class.forName("com.github.copilot.CopilotClient$Connection");
         var constructor = connectionClass.getDeclaredConstructor(JsonRpcClient.class, Process.class,
-                com.github.copilot.generated.rpc.ServerRpc.class);
+                com.github.copilot.generated.rpc.ServerRpc.class, AutoCloseable.class);
         constructor.setAccessible(true);
-        var connection = constructor.newInstance(rpc, process, null);
+        var connection = constructor.newInstance(rpc, process, null, null);
 
         Field field = CopilotClient.class.getDeclaredField("connectionFuture");
         field.setAccessible(true);
diff --git a/java/sdk/src/test/java/com/github/copilot/CopilotClientTransportTest.java b/java/sdk/src/test/java/com/github/copilot/CopilotClientTransportTest.java
new file mode 100644
index 0000000000..46223d56d8
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/CopilotClientTransportTest.java
@@ -0,0 +1,387 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.Pipe;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.copilot.rpc.CopilotClientOptions;
+import com.github.copilot.rpc.InProcessRuntimeConnection;
+import com.github.copilot.rpc.RuntimeConnection;
+import com.github.copilot.rpc.StdioRuntimeConnection;
+import com.github.copilot.rpc.TcpRuntimeConnection;
+import com.github.copilot.rpc.TelemetryConfig;
+import com.github.copilot.rpc.UriRuntimeConnection;
+
+/**
+ * Unit tests for transport selection through {@link RuntimeConnection}: the
+ * in-process code path, {@code COPILOT_SDK_DEFAULT_CONNECTION} resolution, the
+ * backward-compatibility bridge from the individual transport options, and
+ * option validation.
+ */
+@AllowCopilotExperimental
+class CopilotClientTransportTest {
+
+    // ===== In-process routing =====
+
+    @Test
+    void inProcessConnectionStartsThroughInProcessRuntimeHost() throws Exception {
+        var options = new CopilotClientOptions().setConnection(RuntimeConnection.forInProcess());
+        try (var runtime = new FakeInProcessRuntime(); var client = new CopilotClient(options)) {
+            client.setInProcessTransportFactory(runtime::open);
+
+            client.start().get(30, TimeUnit.SECONDS);
+
+            assertTrue(runtime.opened.get(), "The in-process runtime must be used for an in-process connection");
+            assertInstanceOf(InProcessRuntimeConnection.class, client.getRuntimeConnection());
+
+            client.stop().get(30, TimeUnit.SECONDS);
+            assertTrue(runtime.closed.get(), "Stopping the client must close the in-process runtime host");
+        }
+    }
+
+    @Test
+    void inProcessStartupFailurePropagates() {
+        var options = new CopilotClientOptions().setConnection(RuntimeConnection.forInProcess());
+        try (var client = new CopilotClient(options)) {
+            client.setInProcessTransportFactory(opts -> {
+                throw new IOException("no runtime available");
+            });
+            var failure = assertThrows(Exception.class, () -> client.start().get(30, TimeUnit.SECONDS));
+            assertTrue(rootMessage(failure).contains("no runtime available"));
+        }
+    }
+
+    @Test
+    void cliTransportDoesNotUseTheInProcessRuntime() throws Exception {
+        var options = new CopilotClientOptions().setCliUrl("127.0.0.1:1");
+        try (var client = new CopilotClient(options)) {
+            client.setInProcessTransportFactory(opts -> {
+                throw new AssertionError("The in-process runtime must not be used for a CLI transport");
+            });
+
+            assertThrows(Exception.class, () -> client.start().get(30, TimeUnit.SECONDS));
+            assertInstanceOf(UriRuntimeConnection.class, client.getRuntimeConnection());
+        }
+    }
+
+    // ===== COPILOT_SDK_DEFAULT_CONNECTION resolution =====
+
+    @Test
+    void defaultConnectionEnvVarSelectsInProcess() {
+        var connection = CopilotClient.resolveDefaultConnection(new CopilotClientOptions(), "inprocess");
+        assertInstanceOf(InProcessRuntimeConnection.class, connection);
+        assertInstanceOf(InProcessRuntimeConnection.class,
+                CopilotClient.resolveDefaultConnection(new CopilotClientOptions(), "InProcess"));
+    }
+
+    @Test
+    void defaultConnectionEnvVarStdioAndUnsetKeepTheConfiguredTransport() {
+        assertInstanceOf(StdioRuntimeConnection.class,
+                CopilotClient.resolveDefaultConnection(new CopilotClientOptions(), "stdio"));
+        assertInstanceOf(StdioRuntimeConnection.class,
+                CopilotClient.resolveDefaultConnection(new CopilotClientOptions(), null));
+        assertInstanceOf(TcpRuntimeConnection.class,
+                CopilotClient.resolveDefaultConnection(new CopilotClientOptions().setUseStdio(false), ""));
+        assertInstanceOf(TcpRuntimeConnection.class, CopilotClient.resolveDefaultConnection(
+                new CopilotClientOptions().setUseStdio(false).setTcpConnectionToken("secret"), "inprocess"));
+    }
+
+    @Test
+    void defaultConnectionEnvVarRejectsUnknownValues() {
+        var error = assertThrows(IllegalArgumentException.class,
+                () -> CopilotClient.resolveDefaultConnection(new CopilotClientOptions(), "websocket"));
+        assertTrue(error.getMessage().contains(CopilotClient.DEFAULT_CONNECTION_ENV_VAR));
+    }
+
+    // ===== Backward-compatibility bridge =====
+
+    @Test
+    void legacyStdioOptionsInferStdioConnection() {
+        try (var client = new CopilotClient(new CopilotClientOptions().setCliPath("/usr/local/bin/copilot"))) {
+            var connection = assertInstanceOf(StdioRuntimeConnection.class, client.getRuntimeConnection());
+            assertEquals("/usr/local/bin/copilot", connection.getPath());
+        }
+    }
+
+    @Test
+    void legacyTcpOptionsInferTcpConnection() {
+        var options = new CopilotClientOptions().setUseStdio(false).setPort(4321).setTcpConnectionToken("secret");
+        try (var client = new CopilotClient(options)) {
+            var connection = assertInstanceOf(TcpRuntimeConnection.class, client.getRuntimeConnection());
+            assertEquals(4321, connection.getPort());
+            assertEquals("secret", connection.getConnectionToken());
+        }
+    }
+
+    @Test
+    void legacyCliUrlInfersUriConnection() {
+        try (var client = new CopilotClient(new CopilotClientOptions().setCliUrl("localhost:3000"))) {
+            var connection = assertInstanceOf(UriRuntimeConnection.class, client.getRuntimeConnection());
+            assertEquals("localhost:3000", connection.getUrl());
+        }
+    }
+
+    // ===== Connection applied to the transport options =====
+
+    @Test
+    void connectionIsProjectedOntoTransportOptions() {
+        var stdio = new CopilotClientOptions().setConnection(RuntimeConnection.forStdio("/opt/copilot"));
+        try (var client = new CopilotClient(stdio)) {
+            assertTrue(stdio.isUseStdio());
+            assertEquals("/opt/copilot", stdio.getCliPath());
+        }
+
+        var tcp = new CopilotClientOptions().setConnection(
+                RuntimeConnection.forTcp().setPort(4321).setConnectionToken("secret").setArgs(List.of("--extra")));
+        try (var client = new CopilotClient(tcp)) {
+            assertFalse(tcp.isUseStdio());
+            assertEquals(4321, tcp.getPort());
+            assertEquals("secret", tcp.getTcpConnectionToken());
+            assertEquals(List.of("--extra"), List.of(tcp.getCliArgs()));
+        }
+
+        var uri = new CopilotClientOptions().setConnection(RuntimeConnection.forUri("localhost:3000"));
+        try (var client = new CopilotClient(uri)) {
+            assertFalse(uri.isUseStdio());
+            assertEquals("localhost:3000", uri.getCliUrl());
+        }
+    }
+
+    // ===== Conflicting configuration =====
+
+    @Test
+    void connectionCannotBeCombinedWithTransportOptions() {
+        assertConflict(new CopilotClientOptions().setConnection(RuntimeConnection.forStdio())
+                .setCliPath("/usr/local/bin/copilot"), "CliPath");
+        assertConflict(
+                new CopilotClientOptions().setConnection(RuntimeConnection.forInProcess()).setCliUrl("localhost:3000"),
+                "CliUrl");
+        assertConflict(new CopilotClientOptions().setConnection(RuntimeConnection.forStdio()).setUseStdio(false),
+                "UseStdio");
+        assertConflict(new CopilotClientOptions().setConnection(RuntimeConnection.forTcp()).setPort(4321), "Port");
+        assertConflict(
+                new CopilotClientOptions().setConnection(RuntimeConnection.forTcp()).setTcpConnectionToken("secret"),
+                "TcpConnectionToken");
+        assertConflict(new CopilotClientOptions().setConnection(RuntimeConnection.forStdio())
+                .setCliArgs(new String[]{"--extra"}), "CliArgs");
+    }
+
+    @Test
+    void connectionCanBeReusedForSeveralClients() {
+        var options = new CopilotClientOptions().setConnection(RuntimeConnection.forStdio("/opt/copilot"));
+        try (var first = new CopilotClient(options); var second = new CopilotClient(options)) {
+            assertInstanceOf(StdioRuntimeConnection.class, first.getRuntimeConnection());
+            assertInstanceOf(StdioRuntimeConnection.class, second.getRuntimeConnection());
+        }
+    }
+
+    private static void assertConflict(CopilotClientOptions options, String optionName) {
+        var error = assertThrows(IllegalArgumentException.class, () -> new CopilotClient(options));
+        assertTrue(error.getMessage().contains(optionName), "Expected '" + optionName + "' in: " + error.getMessage());
+    }
+
+    // ===== Options rejected for the in-process transport =====
+
+    @Test
+    void inProcessRejectsPerProcessOptions() {
+        assertInProcessRejected(new CopilotClientOptions().setEnvironment(Map.of("FOO", "bar")), "Environment");
+        assertInProcessRejected(new CopilotClientOptions().setTelemetry(new TelemetryConfig()), "Telemetry");
+        assertInProcessRejected(new CopilotClientOptions().setCwd("/tmp"), "Cwd");
+        assertInProcessRejected(new CopilotClientOptions().setCliArgs(new String[]{"--extra"}), "CliArgs");
+    }
+
+    @Test
+    void e2eContextClearsInProcessIncompatibleOptions() throws Exception {
+        try (var context = E2ETestContext.create()) {
+            var options = new CopilotClientOptions().setConnection(RuntimeConnection.forInProcess())
+                    .setEnvironment(Map.of("TEST_KEY", "test-value")).setCwd(context.getWorkDir().toString())
+                    .setCliArgs(new String[]{"--subprocess-only"});
+
+            try (var client = context.createClient(options)) {
+                assertInstanceOf(InProcessRuntimeConnection.class, client.getRuntimeConnection());
+                assertTrue(options.getEnvironment() == null || options.getEnvironment().isEmpty());
+                assertEquals(null, options.getCwd());
+                assertTrue(options.getCliArgs() == null || options.getCliArgs().length == 0);
+            }
+        }
+    }
+
+    private static void assertInProcessRejected(CopilotClientOptions options, String optionName) {
+        options.setConnection(RuntimeConnection.forInProcess());
+        var error = assertThrows(IllegalArgumentException.class, () -> new CopilotClient(options));
+        assertTrue(error.getMessage().contains(optionName), "Expected '" + optionName + "' in: " + error.getMessage());
+        assertTrue(error.getMessage().contains("forInProcess"),
+                "Expected the in-process transport to be named in: " + error.getMessage());
+    }
+
+    private static String rootMessage(Throwable error) {
+        Throwable cause = error;
+        while (cause.getCause() != null) {
+            cause = cause.getCause();
+        }
+        return String.valueOf(cause.getMessage());
+    }
+
+    /**
+     * Minimal loopback stand-in for the in-process runtime: it speaks just enough
+     * JSON-RPC for {@link CopilotClient#start()} to complete, so the test can
+     * assert that the client wires its transport to the in-process host rather than
+     * to a child process.
+     */
+    private static final class FakeInProcessRuntime implements AutoCloseable {
+
+        private static final ObjectMapper MAPPER = new ObjectMapper();
+
+        private final AtomicBoolean opened = new AtomicBoolean();
+        private final AtomicBoolean closed = new AtomicBoolean();
+        private final BytePipe toClient;
+        private final BytePipe toRuntime;
+        private final InputStream runtimeInput;
+        private final OutputStream runtimeOutput;
+        private final Thread responder;
+
+        FakeInProcessRuntime() throws IOException {
+            this.toClient = new BytePipe();
+            this.toRuntime = new BytePipe();
+            this.runtimeInput = toRuntime.inputStream();
+            this.runtimeOutput = toClient.outputStream();
+            this.responder = new Thread(this::respondToRequests, "fake-inprocess-runtime");
+            this.responder.setDaemon(true);
+            this.responder.start();
+        }
+
+        CopilotClient.InProcessTransport open(CopilotClientOptions options) {
+            opened.set(true);
+            return new CopilotClient.InProcessTransport(toClient.inputStream(), toRuntime.outputStream(), this::close);
+        }
+
+        @Override
+        public void close() {
+            if (!closed.compareAndSet(false, true)) {
+                return;
+            }
+            toRuntime.close();
+            toClient.close();
+        }
+
+        private void respondToRequests() {
+            try {
+                while (!closed.get()) {
+                    JsonNode request = readMessage(runtimeInput);
+                    if (request == null) {
+                        return;
+                    }
+                    if (!request.hasNonNull("id")) {
+                        continue;
+                    }
+                    var response = MAPPER.createObjectNode();
+                    response.put("jsonrpc", "2.0");
+                    response.set("id", request.get("id"));
+                    var result = response.putObject("result");
+                    if ("connect".equals(request.path("method").asText())) {
+                        result.put("protocolVersion", SdkProtocolVersion.get());
+                    }
+                    writeMessage(runtimeOutput, response);
+                }
+            } catch (IOException e) {
+                // The streams are closed when the client shuts down.
+            }
+        }
+
+        private static JsonNode readMessage(InputStream in) throws IOException {
+            int contentLength = -1;
+            var line = new ByteArrayOutputStream();
+            while (true) {
+                int b = in.read();
+                if (b == -1) {
+                    return null;
+                }
+                if (b == '\n') {
+                    String header = line.toString(StandardCharsets.UTF_8).trim();
+                    line.reset();
+                    if (header.isEmpty()) {
+                        break;
+                    }
+                    if (header.toLowerCase(Locale.ROOT).startsWith("content-length:")) {
+                        contentLength = Integer.parseInt(header.substring(header.indexOf(':') + 1).trim());
+                    }
+                } else if (b != '\r') {
+                    line.write(b);
+                }
+            }
+            if (contentLength < 0) {
+                throw new IOException("Missing Content-Length header");
+            }
+            byte[] body = in.readNBytes(contentLength);
+            if (body.length != contentLength) {
+                return null;
+            }
+            return MAPPER.readTree(body);
+        }
+
+        private static void writeMessage(OutputStream out, JsonNode message) throws IOException {
+            byte[] body = MAPPER.writeValueAsBytes(message);
+            out.write(("Content-Length: " + body.length + "\r\n\r\n").getBytes(StandardCharsets.UTF_8));
+            out.write(body);
+            out.flush();
+        }
+    }
+
+    /**
+     * Duplex byte channel used by {@link FakeInProcessRuntime} to emulate the
+     * streams of an in-process runtime.
+     */
+    private static final class BytePipe {
+
+        private final Pipe pipe;
+
+        BytePipe() throws IOException {
+            this.pipe = Pipe.open();
+        }
+
+        InputStream inputStream() {
+            return Channels.newInputStream(pipe.source());
+        }
+
+        OutputStream outputStream() {
+            return Channels.newOutputStream(pipe.sink());
+        }
+
+        void close() {
+            closeQuietly(pipe.sink());
+            closeQuietly(pipe.source());
+        }
+
+        private static void closeQuietly(Closeable closeable) {
+            try {
+                closeable.close();
+            } catch (IOException e) {
+                // Nothing useful to do while tearing down a test pipe.
+            }
+        }
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/CopilotExperimentalProcessorTest.java b/java/sdk/src/test/java/com/github/copilot/CopilotExperimentalProcessorTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/CopilotExperimentalProcessorTest.java
rename to java/sdk/src/test/java/com/github/copilot/CopilotExperimentalProcessorTest.java
diff --git a/java/src/test/java/com/github/copilot/CopilotRequestCancelErrorE2ETest.java b/java/sdk/src/test/java/com/github/copilot/CopilotRequestCancelErrorE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/CopilotRequestCancelErrorE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/CopilotRequestCancelErrorE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/CopilotRequestHandlerE2ETest.java b/java/sdk/src/test/java/com/github/copilot/CopilotRequestHandlerE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/CopilotRequestHandlerE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/CopilotRequestHandlerE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/CopilotRequestSessionIdE2ETest.java b/java/sdk/src/test/java/com/github/copilot/CopilotRequestSessionIdE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/CopilotRequestSessionIdE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/CopilotRequestSessionIdE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/CopilotRequestTestSupport.java b/java/sdk/src/test/java/com/github/copilot/CopilotRequestTestSupport.java
similarity index 99%
rename from java/src/test/java/com/github/copilot/CopilotRequestTestSupport.java
rename to java/sdk/src/test/java/com/github/copilot/CopilotRequestTestSupport.java
index ecbf92068f..aa173ef30e 100644
--- a/java/src/test/java/com/github/copilot/CopilotRequestTestSupport.java
+++ b/java/sdk/src/test/java/com/github/copilot/CopilotRequestTestSupport.java
@@ -72,7 +72,8 @@ static CopilotClient newLlmClient(E2ETestContext ctx, CopilotRequestHandler hand
                 env.put(entry.substring(0, eq), entry.substring(eq + 1));
             }
         }
-        return ctx.createClient(new CopilotClientOptions().setEnvironment(env).setRequestHandler(handler));
+        return ctx.createClient(
+                new CopilotClientOptions().setCliPath(ctx.getCliPath()).setEnvironment(env).setRequestHandler(handler));
     }
 
     /**
diff --git a/java/src/test/java/com/github/copilot/CopilotSessionTest.java b/java/sdk/src/test/java/com/github/copilot/CopilotSessionTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/CopilotSessionTest.java
rename to java/sdk/src/test/java/com/github/copilot/CopilotSessionTest.java
diff --git a/java/src/test/java/com/github/copilot/CreateSessionReKeyEntryTest.java b/java/sdk/src/test/java/com/github/copilot/CreateSessionReKeyEntryTest.java
similarity index 99%
rename from java/src/test/java/com/github/copilot/CreateSessionReKeyEntryTest.java
rename to java/sdk/src/test/java/com/github/copilot/CreateSessionReKeyEntryTest.java
index 156c968489..79e968cd39 100644
--- a/java/src/test/java/com/github/copilot/CreateSessionReKeyEntryTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/CreateSessionReKeyEntryTest.java
@@ -170,8 +170,9 @@ private static void injectConnection(CopilotClient client, JsonRpcClient rpc) th
 
         var ctor = connClass.getDeclaredConstructors()[0];
         ctor.setAccessible(true);
-        // Connection(JsonRpcClient rpc, Process process, ServerRpc serverRpc)
-        Object connection = ctor.newInstance(rpc, null, null);
+        // Connection(JsonRpcClient rpc, Process process, ServerRpc serverRpc,
+        // AutoCloseable runtimeHost)
+        Object connection = ctor.newInstance(rpc, null, null, null);
 
         Field f = CopilotClient.class.getDeclaredField("connectionFuture");
         f.setAccessible(true);
diff --git a/java/src/test/java/com/github/copilot/DataObjectCoverageTest.java b/java/sdk/src/test/java/com/github/copilot/DataObjectCoverageTest.java
similarity index 89%
rename from java/src/test/java/com/github/copilot/DataObjectCoverageTest.java
rename to java/sdk/src/test/java/com/github/copilot/DataObjectCoverageTest.java
index f38a038368..c0b0324e3c 100644
--- a/java/src/test/java/com/github/copilot/DataObjectCoverageTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/DataObjectCoverageTest.java
@@ -8,6 +8,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.copilot.rpc.CustomAgentConfig;
@@ -139,6 +140,27 @@ void permissionRequestSetExtensionData() {
         assertEquals("value", req.getExtensionData().get("key"));
     }
 
+    @Test
+    void permissionRequestPreservesMcpExtensionData() {
+        var request = PermissionRequest.fromJsonValue(
+                java.util.Map.of("kind", "mcp", "serverName", "playwright", "toolName", "playwright-browser_navigate",
+                        "args", java.util.Map.of("url", "http://127.0.0.1:8106/docs/target-app/")));
+
+        assertEquals("mcp", request.getKind());
+        assertEquals("playwright", request.getExtensionData().get("serverName"));
+        assertEquals("playwright-browser_navigate", request.getExtensionData().get("toolName"));
+        @SuppressWarnings("unchecked")
+        var args = (java.util.Map<String, Object>) request.getExtensionData().get("args");
+        assertEquals("http://127.0.0.1:8106/docs/target-app/", args.get("url"));
+    }
+
+    @Test
+    void permissionRequestWithoutExtensionDataPreservesNull() {
+        var request = PermissionRequest.fromJsonValue(java.util.Map.of("kind", "read", "toolCallId", "tool-123"));
+
+        assertNull(request.getExtensionData());
+    }
+
     // ===== SectionOverride setContent =====
 
     @Test
@@ -303,6 +325,15 @@ void mcpStdioServerConfigCoversGettersAndFluentSetters() {
         assertEquals(30, cfg.getTimeout());
     }
 
+    @Test
+    void mcpStdioServerConfigSerializesWorkingDirectoryAsCwd() {
+        var json = new ObjectMapper()
+                .valueToTree(new McpStdioServerConfig().setCommand("node").setWorkingDirectory("/workspace"));
+
+        assertEquals("/workspace", json.path("cwd").asText());
+        assertFalse(json.has("workingDirectory"));
+    }
+
     @Test
     void modelCapabilitiesOverrideCoversNestedSupportsAndLimits() {
         var supports = new ModelCapabilitiesOverride.Supports().setVision(true).setReasoningEffort(false);
diff --git a/java/src/test/java/com/github/copilot/DocumentationSamplesTest.java b/java/sdk/src/test/java/com/github/copilot/DocumentationSamplesTest.java
similarity index 99%
rename from java/src/test/java/com/github/copilot/DocumentationSamplesTest.java
rename to java/sdk/src/test/java/com/github/copilot/DocumentationSamplesTest.java
index f7170f4fde..4e1396aa93 100644
--- a/java/src/test/java/com/github/copilot/DocumentationSamplesTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/DocumentationSamplesTest.java
@@ -132,7 +132,7 @@ private static String stripStringsAndComments(String input) {
     private static List<Path> documentationFiles() throws IOException {
         Path root = Path.of("").toAbsolutePath();
         List<Path> files = new ArrayList<>();
-        files.add(root.resolve("README.md"));
+        files.add(root.resolve("../README.md"));
         files.add(root.resolve("jbang-example.java"));
         return files;
     }
diff --git a/java/src/test/java/com/github/copilot/E2ETestContext.java b/java/sdk/src/test/java/com/github/copilot/E2ETestContext.java
similarity index 77%
rename from java/src/test/java/com/github/copilot/E2ETestContext.java
rename to java/sdk/src/test/java/com/github/copilot/E2ETestContext.java
index f524b33dab..cb302a8cd2 100644
--- a/java/src/test/java/com/github/copilot/E2ETestContext.java
+++ b/java/sdk/src/test/java/com/github/copilot/E2ETestContext.java
@@ -18,7 +18,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.github.copilot.ffi.InProcessEnvGuard;
 import com.github.copilot.rpc.CopilotClientOptions;
+import com.github.copilot.rpc.InProcessRuntimeConnection;
+import com.github.copilot.rpc.RuntimeConnection;
 
 /**
  * E2E test context that manages the test environment including the CapiProxy,
@@ -62,8 +65,8 @@ public class E2ETestContext implements AutoCloseable {
      */
     private static final String DEFAULT_GITHUB_TOKEN = "fake-token-for-e2e-tests";
     private static final Pattern SNAKE_CASE = Pattern.compile("[^a-zA-Z0-9]");
-    private static final Pattern USER_CONTENT_PATTERN = Pattern
-            .compile("^\\s+-\\s+role:\\s+user\\s*$\\s+content:\\s*(.+?)$", Pattern.MULTILINE);
+    private static final Pattern USER_ROLE_PATTERN = Pattern.compile("^(\\s*)-\\s+role:\\s+user\\s*$");
+    private static final Pattern CONTENT_PATTERN = Pattern.compile("^(\\s*)content:\\s*(.*)$");
 
     private final String cliPath;
     private final Path homeDir;
@@ -71,6 +74,7 @@ public class E2ETestContext implements AutoCloseable {
     private String proxyUrl;
     private final CapiProxy proxy;
     private final Path repoRoot;
+    private final List<InProcessEnvGuard> inProcessEnvGuards = new ArrayList<>();
     private Path currentSnapshotFile;
 
     private E2ETestContext(String cliPath, Path homeDir, Path workDir, String proxyUrl, CapiProxy proxy,
@@ -223,25 +227,109 @@ public List<String> getExpectedUserPrompts() {
             return List.of();
         }
         try {
-            String content = Files.readString(currentSnapshotFile);
-            List<String> prompts = new ArrayList<>();
-            Matcher matcher = USER_CONTENT_PATTERN.matcher(content);
-            while (matcher.find()) {
-                String prompt = matcher.group(1).trim();
-                // Remove quotes if present
-                if ((prompt.startsWith("\"") && prompt.endsWith("\""))
-                        || (prompt.startsWith("'") && prompt.endsWith("'"))) {
-                    prompt = prompt.substring(1, prompt.length() - 1);
+            return parseExpectedUserPrompts(Files.readString(currentSnapshotFile));
+        } catch (IOException e) {
+            LOG.warning("Failed to read snapshot file: " + e.getMessage());
+            return List.of();
+        }
+    }
+
+    static List<String> parseExpectedUserPrompts(String yaml) {
+        String[] lines = yaml.split("\\R", -1);
+        List<String> prompts = new ArrayList<>();
+
+        for (int i = 0; i < lines.length; i++) {
+            Matcher roleMatcher = USER_ROLE_PATTERN.matcher(lines[i]);
+            if (!roleMatcher.matches()) {
+                continue;
+            }
+
+            int roleIndent = roleMatcher.group(1).length();
+            for (i++; i < lines.length; i++) {
+                String line = lines[i];
+                if (!line.isBlank() && leadingWhitespace(line) <= roleIndent) {
+                    i--;
+                    break;
+                }
+
+                Matcher contentMatcher = CONTENT_PATTERN.matcher(line);
+                if (!contentMatcher.matches()) {
+                    continue;
                 }
-                if (!prompts.contains(prompt)) {
+
+                int contentIndent = contentMatcher.group(1).length();
+                String value = contentMatcher.group(2).trim();
+                List<String> continuation = new ArrayList<>();
+                while (i + 1 < lines.length
+                        && (lines[i + 1].isBlank() || leadingWhitespace(lines[i + 1]) > contentIndent)) {
+                    continuation.add(lines[++i]);
+                }
+
+                String prompt = isBlockScalar(value)
+                        ? parseBlockScalar(value.charAt(0), continuation)
+                        : parsePlainScalar(value, continuation);
+                if (!prompt.isEmpty() && !prompts.contains(prompt)) {
                     prompts.add(prompt);
                 }
+                break;
+            }
+        }
+
+        return prompts;
+    }
+
+    private static String parsePlainScalar(String firstLine, List<String> continuation) {
+        StringBuilder value = new StringBuilder(unquote(firstLine));
+        for (String line : continuation) {
+            if (!line.isBlank()) {
+                if (!value.isEmpty()) {
+                    value.append(' ');
+                }
+                value.append(line.trim());
             }
-            return prompts;
-        } catch (IOException e) {
-            LOG.warning("Failed to read snapshot file: " + e.getMessage());
-            return List.of();
         }
+        return value.toString();
+    }
+
+    private static String parseBlockScalar(char style, List<String> lines) {
+        int contentIndent = lines.stream().filter(line -> !line.isBlank()).mapToInt(E2ETestContext::leadingWhitespace)
+                .min().orElse(0);
+        StringBuilder value = new StringBuilder();
+        boolean previousWasContent = false;
+        for (String line : lines) {
+            String text = line.isBlank() ? "" : line.substring(Math.min(contentIndent, line.length()));
+            if (text.isEmpty()) {
+                value.append('\n');
+                previousWasContent = false;
+            } else {
+                if (previousWasContent) {
+                    value.append(style == '>' ? ' ' : '\n');
+                }
+                value.append(text);
+                previousWasContent = true;
+            }
+        }
+        return value.toString().stripTrailing();
+    }
+
+    private static boolean isBlockScalar(String value) {
+        return value.matches("[>|][+-]?");
+    }
+
+    private static String unquote(String value) {
+        if (value.length() >= 2 && ((value.startsWith("\"") && value.endsWith("\""))
+                || (value.startsWith("'") && value.endsWith("'")))) {
+            return value.substring(1, value.length() - 1);
+        }
+        return value;
+    }
+
+    private static int leadingWhitespace(String value) {
+        int index = 0;
+        while (index < value.length() && Character.isWhitespace(value.charAt(index))) {
+            index++;
+        }
+        return index;
     }
 
     /**
@@ -322,10 +410,8 @@ public Map<String, String> getEnvironment() {
      * @return a new CopilotClient
      */
     public CopilotClient createClient() {
-        CopilotClientOptions options = new CopilotClientOptions().setCliPath(cliPath).setCwd(workDir.toString())
-                .setEnvironment(getEnvironment()).setGitHubToken(DEFAULT_GITHUB_TOKEN);
-
-        return new CopilotClient(options);
+        CopilotClientOptions options = new CopilotClientOptions().setGitHubToken(DEFAULT_GITHUB_TOKEN);
+        return createClient(options);
     }
 
     /**
@@ -338,6 +424,31 @@ public CopilotClient createClient() {
      * @return a new CopilotClient
      */
     public CopilotClient createClient(CopilotClientOptions options) {
+        CopilotClient client = applyContextOptions(options);
+        if (client != null) {
+            return client;
+        }
+        if (options.getGitHubToken() == null) {
+            options.setGitHubToken(DEFAULT_GITHUB_TOKEN);
+        }
+
+        return new CopilotClient(options);
+    }
+
+    private CopilotClient applyContextOptions(CopilotClientOptions options) {
+        if (isInProcessMode(options)) {
+            InProcessEnvGuard guard = new InProcessEnvGuard(buildInProcessEnvironment(options));
+            inProcessEnvGuards.add(guard);
+            try {
+                options.setEnvironment(null);
+                options.setCwd(null);
+                options.setCliArgs(null);
+                return new CopilotClient(options, guard::close);
+            } catch (RuntimeException e) {
+                guard.close();
+                throw e;
+            }
+        }
         if (options.getCliPath() == null) {
             options.setCliPath(cliPath);
         }
@@ -347,11 +458,30 @@ public CopilotClient createClient(CopilotClientOptions options) {
         if (options.getEnvironment() == null || options.getEnvironment().isEmpty()) {
             options.setEnvironment(getEnvironment());
         }
-        if (options.getGitHubToken() == null) {
-            options.setGitHubToken(DEFAULT_GITHUB_TOKEN);
+        return null;
+    }
+
+    private boolean isInProcessMode(CopilotClientOptions options) {
+        RuntimeConnection connection = options.getConnection();
+        if (connection != null) {
+            return connection instanceof InProcessRuntimeConnection;
+        }
+        if (options.getRequestHandler() != null || options.getCliUrl() != null || options.getCliPath() != null
+                || options.getPort() != 0) {
+            return false;
         }
+        String defaultConnection = System.getenv("COPILOT_SDK_DEFAULT_CONNECTION");
+        return defaultConnection != null && "inprocess".equalsIgnoreCase(defaultConnection.trim());
+    }
 
-        return new CopilotClient(options);
+    private Map<String, String> buildInProcessEnvironment(CopilotClientOptions options) {
+        Map<String, String> env = new HashMap<>(getEnvironment());
+        Map<String, String> optionEnvironment = options.getEnvironment();
+        if (optionEnvironment != null && !optionEnvironment.isEmpty()) {
+            env.putAll(optionEnvironment);
+            options.setEnvironment(null);
+        }
+        return env;
     }
 
     /**
@@ -428,6 +558,9 @@ public void initializeProxy() throws IOException, InterruptedException {
 
     @Override
     public void close() throws Exception {
+        for (int i = inProcessEnvGuards.size() - 1; i >= 0; i--) {
+            inProcessEnvGuards.get(i).close();
+        }
         proxy.stop();
 
         // Clean up temp directories (best effort)
diff --git a/java/sdk/src/test/java/com/github/copilot/E2ETestContextTest.java b/java/sdk/src/test/java/com/github/copilot/E2ETestContextTest.java
new file mode 100644
index 0000000000..bf307f6547
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/E2ETestContextTest.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+class E2ETestContextTest {
+
+    @Test
+    void expectedUserPromptsParseFoldedBlockScalars() {
+        String snapshot = """
+                conversations:
+                  - messages:
+                      - role: user
+                        content: First prompt
+                          continued here.
+                      - role: assistant
+                        content: response
+                      - role: user
+                        content: >-
+                          <system_notification>
+
+                          Agent completed successfully.
+
+                          </system_notification>
+                """;
+
+        assertEquals(
+                List.of("First prompt continued here.",
+                        "<system_notification>\nAgent completed successfully.\n</system_notification>"),
+                E2ETestContext.parseExpectedUserPrompts(snapshot));
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/ElicitationTest.java b/java/sdk/src/test/java/com/github/copilot/ElicitationTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ElicitationTest.java
rename to java/sdk/src/test/java/com/github/copilot/ElicitationTest.java
diff --git a/java/src/test/java/com/github/copilot/ErrorHandlingTest.java b/java/sdk/src/test/java/com/github/copilot/ErrorHandlingTest.java
similarity index 94%
rename from java/src/test/java/com/github/copilot/ErrorHandlingTest.java
rename to java/sdk/src/test/java/com/github/copilot/ErrorHandlingTest.java
index 32579ffc4e..46f6741a04 100644
--- a/java/src/test/java/com/github/copilot/ErrorHandlingTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/ErrorHandlingTest.java
@@ -158,6 +158,10 @@ void testShouldHandlePermissionHandlerErrorsGracefully_deniesPermission() throws
                             || content.contains("permission") || content.contains("denied"),
                     "Response should indicate permission was denied: " + content);
 
+            // Verify that the error handler was wired correctly. Whether error events are
+            // actually emitted depends on the CLI version and the scenario's replay data.
+            LOG.info("Collected " + errorEvents.size() + " error event(s) from permission handler crash");
+
             session.close();
         }
     }
@@ -198,9 +202,10 @@ void testPermissionHandlerErrors_sessionErrorEventContainsDetails() throws Excep
             session.close();
         }
 
-        // Note: Whether error events are emitted depends on the CLI version and
-        // scenario
-        // This test verifies the handler can receive them when they occur
+        // Whether error events are emitted depends on the CLI version and scenario.
+        // This test verifies the handler can receive them when they occur.
+        // Access the list to confirm it was populated (even if empty is acceptable).
+        LOG.info("Collected " + errorEvents.size() + " error event(s)");
     }
 
     /**
diff --git a/java/src/test/java/com/github/copilot/EventFidelityTest.java b/java/sdk/src/test/java/com/github/copilot/EventFidelityTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/EventFidelityTest.java
rename to java/sdk/src/test/java/com/github/copilot/EventFidelityTest.java
diff --git a/java/src/test/java/com/github/copilot/ExecutorWiringTest.java b/java/sdk/src/test/java/com/github/copilot/ExecutorWiringTest.java
similarity index 95%
rename from java/src/test/java/com/github/copilot/ExecutorWiringTest.java
rename to java/sdk/src/test/java/com/github/copilot/ExecutorWiringTest.java
index 78764db0fb..a8319475c6 100644
--- a/java/src/test/java/com/github/copilot/ExecutorWiringTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/ExecutorWiringTest.java
@@ -86,8 +86,7 @@ int getTaskCount() {
     }
 
     private CopilotClientOptions createOptionsWithExecutor(TrackingExecutor executor) {
-        CopilotClientOptions options = new CopilotClientOptions().setCliPath(ctx.getCliPath())
-                .setCwd(ctx.getWorkDir().toString()).setEnvironment(ctx.getEnvironment()).setExecutor(executor)
+        CopilotClientOptions options = new CopilotClientOptions().setExecutor(executor)
                 .setGitHubToken("fake-token-for-e2e-tests");
         return options;
     }
@@ -111,7 +110,7 @@ void testClientStartUsesProvidedExecutor() throws Exception {
         TrackingExecutor trackingExecutor = new TrackingExecutor(ForkJoinPool.commonPool());
         int beforeStart = trackingExecutor.getTaskCount();
 
-        try (CopilotClient client = new CopilotClient(createOptionsWithExecutor(trackingExecutor))) {
+        try (CopilotClient client = ctx.createClient(createOptionsWithExecutor(trackingExecutor))) {
             client.start().get(30, TimeUnit.SECONDS);
 
             assertTrue(trackingExecutor.getTaskCount() > beforeStart,
@@ -156,7 +155,7 @@ void testToolCallDispatchUsesProvidedExecutor() throws Exception {
                 });
 
         // Reset count after client construction to isolate tool-call dispatch
-        try (CopilotClient client = new CopilotClient(createOptionsWithExecutor(trackingExecutor))) {
+        try (CopilotClient client = ctx.createClient(createOptionsWithExecutor(trackingExecutor))) {
             CopilotSession session = client.createSession(new SessionConfig().setTools(List.of(encryptTool))
                     .setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
 
@@ -198,7 +197,7 @@ void testPermissionDispatchUsesProvidedExecutor() throws Exception {
         var config = new SessionConfig().setOnPermissionRequest((request, invocation) -> CompletableFuture
                 .completedFuture(new PermissionRequestResult().setKind(PermissionRequestResultKind.APPROVED)));
 
-        try (CopilotClient client = new CopilotClient(createOptionsWithExecutor(trackingExecutor))) {
+        try (CopilotClient client = ctx.createClient(createOptionsWithExecutor(trackingExecutor))) {
             CopilotSession session = client.createSession(config).get();
 
             Path testFile = ctx.getWorkDir().resolve("test.txt");
@@ -247,7 +246,7 @@ void testUserInputDispatchUsesProvidedExecutor() throws Exception {
                             .completedFuture(new UserInputResponse().setAnswer(answer).setWasFreeform(wasFreeform));
                 });
 
-        try (CopilotClient client = new CopilotClient(createOptionsWithExecutor(trackingExecutor))) {
+        try (CopilotClient client = ctx.createClient(createOptionsWithExecutor(trackingExecutor))) {
             CopilotSession session = client.createSession(config).get();
 
             int beforeSend = trackingExecutor.getTaskCount();
@@ -286,7 +285,7 @@ void testHooksDispatchUsesProvidedExecutor() throws Exception {
                 .setHooks(new SessionHooks().setOnPreToolUse(
                         (input, invocation) -> CompletableFuture.completedFuture(PreToolUseHookOutput.allow())));
 
-        try (CopilotClient client = new CopilotClient(createOptionsWithExecutor(trackingExecutor))) {
+        try (CopilotClient client = ctx.createClient(createOptionsWithExecutor(trackingExecutor))) {
             CopilotSession session = client.createSession(config).get();
 
             Path testFile = ctx.getWorkDir().resolve("hello.txt");
@@ -342,7 +341,7 @@ void testClientStopUsesProvidedExecutor() throws Exception {
                     return CompletableFuture.completedFuture(input.toUpperCase());
                 });
 
-        CopilotClient client = new CopilotClient(createOptionsWithExecutor(trackingExecutor));
+        CopilotClient client = ctx.createClient(createOptionsWithExecutor(trackingExecutor));
         client.createSession(new SessionConfig().setTools(List.of(encryptTool))
                 .setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
 
diff --git a/java/src/test/java/com/github/copilot/FakeUpstreamServer.java b/java/sdk/src/test/java/com/github/copilot/FakeUpstreamServer.java
similarity index 97%
rename from java/src/test/java/com/github/copilot/FakeUpstreamServer.java
rename to java/sdk/src/test/java/com/github/copilot/FakeUpstreamServer.java
index 7af60d4d38..909cd14069 100644
--- a/java/src/test/java/com/github/copilot/FakeUpstreamServer.java
+++ b/java/sdk/src/test/java/com/github/copilot/FakeUpstreamServer.java
@@ -162,7 +162,10 @@ private void serveHttp(InputStream in, OutputStream out, String path, Map<String
 
     private void serveWebSocket(InputStream in, OutputStream out, Map<String, String> headers) throws Exception {
         String key = headers.get("sec-websocket-key");
-        MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
+        // SHA-1 is mandated by the WebSocket protocol (RFC 6455 §4.2.2) for the
+        // Sec-WebSocket-Accept handshake hash. This is NOT used for security purposes.
+        @SuppressWarnings("codeql[java/weak-cryptographic-algorithm]")
+        MessageDigest sha1 = MessageDigest.getInstance("SHA-1"); // lgtm[java/weak-cryptographic-algorithm]
         byte[] digest = sha1.digest((key + WS_MAGIC).getBytes(StandardCharsets.US_ASCII));
         String accept = Base64.getEncoder().encodeToString(digest);
         String response = "HTTP/1.1 101 Switching Protocols\r\n" + "Upgrade: websocket\r\n" + "Connection: Upgrade\r\n"
diff --git a/java/src/test/java/com/github/copilot/ForwardCompatibilityTest.java b/java/sdk/src/test/java/com/github/copilot/ForwardCompatibilityTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ForwardCompatibilityTest.java
rename to java/sdk/src/test/java/com/github/copilot/ForwardCompatibilityTest.java
diff --git a/java/src/test/java/com/github/copilot/GitHubTelemetryForwardingIT.java b/java/sdk/src/test/java/com/github/copilot/GitHubTelemetryForwardingIT.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/GitHubTelemetryForwardingIT.java
rename to java/sdk/src/test/java/com/github/copilot/GitHubTelemetryForwardingIT.java
diff --git a/java/src/test/java/com/github/copilot/GitHubTelemetryTest.java b/java/sdk/src/test/java/com/github/copilot/GitHubTelemetryTest.java
similarity index 91%
rename from java/src/test/java/com/github/copilot/GitHubTelemetryTest.java
rename to java/sdk/src/test/java/com/github/copilot/GitHubTelemetryTest.java
index 8e35bd9a92..7b0deb9977 100644
--- a/java/src/test/java/com/github/copilot/GitHubTelemetryTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/GitHubTelemetryTest.java
@@ -259,23 +259,24 @@ void sendTelemetry(Object params) throws Exception {
         private void acceptLoop() {
             try {
                 Socket socket = serverSocket.accept();
-                JsonRpcClient server = JsonRpcClient.fromSocket(socket);
-                server.registerMethodHandler("connect", (id, params) -> {
-                    connectParams.complete(params);
-                    respond(server, id, Map.of("protocolVersion", 2));
+                JsonRpcClient server = JsonRpcClient.fromSocket(socket, rpc -> {
+                    rpc.registerMethodHandler("connect", (id, params) -> {
+                        connectParams.complete(params);
+                        respond(rpc, id, Map.of("protocolVersion", 2));
+                    });
+                    rpc.registerMethodHandler("session.create", (id, params) -> {
+                        createParams.complete(params);
+                        respond(rpc, id, Map.of("sessionId", params.path("sessionId").asText("created"),
+                                "workspacePath", "/workspace"));
+                    });
+                    rpc.registerMethodHandler("session.resume", (id, params) -> {
+                        resumeParams.complete(params);
+                        respond(rpc, id, Map.of("sessionId", params.path("sessionId").asText("resume-1"),
+                                "workspacePath", "/workspace"));
+                    });
+                    rpc.registerMethodHandler("session.destroy", (id, params) -> respond(rpc, id, Map.of()));
+                    rpc.registerMethodHandler("runtime.shutdown", (id, params) -> respond(rpc, id, Map.of()));
                 });
-                server.registerMethodHandler("session.create", (id, params) -> {
-                    createParams.complete(params);
-                    respond(server, id, Map.of("sessionId", params.path("sessionId").asText("created"), "workspacePath",
-                            "/workspace"));
-                });
-                server.registerMethodHandler("session.resume", (id, params) -> {
-                    resumeParams.complete(params);
-                    respond(server, id, Map.of("sessionId", params.path("sessionId").asText("resume-1"),
-                            "workspacePath", "/workspace"));
-                });
-                server.registerMethodHandler("session.destroy", (id, params) -> respond(server, id, Map.of()));
-                server.registerMethodHandler("runtime.shutdown", (id, params) -> respond(server, id, Map.of()));
                 ready.complete(server);
             } catch (IOException e) {
                 ready.completeExceptionally(e);
diff --git a/java/sdk/src/test/java/com/github/copilot/GitHubTokenProviderRegistryTest.java b/java/sdk/src/test/java/com/github/copilot/GitHubTokenProviderRegistryTest.java
new file mode 100644
index 0000000000..8f2c7d3314
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/GitHubTokenProviderRegistryTest.java
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+
+import org.junit.jupiter.api.Test;
+
+import com.github.copilot.rpc.GitHubTokenProviderResult;
+import com.github.copilot.rpc.PermissionHandler;
+import com.github.copilot.rpc.ResumeSessionConfig;
+import com.github.copilot.rpc.SessionConfig;
+
+class GitHubTokenProviderRegistryTest {
+
+    @Test
+    void staticTokenAndProviderAreMutuallyExclusive() {
+        try (var client = new CopilotClient()) {
+            var create = new SessionConfig().setGitHubToken("static")
+                    .setGitHubTokenProvider(
+                            args -> CompletableFuture.completedFuture(GitHubTokenProviderResult.cancelled()))
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL);
+            var createError = assertThrows(CompletionException.class, () -> client.createSession(create).join());
+            assertInstanceOf(IllegalArgumentException.class, createError.getCause());
+
+            var resume = new ResumeSessionConfig().setGitHubToken("static")
+                    .setGitHubTokenProvider(
+                            args -> CompletableFuture.completedFuture(GitHubTokenProviderResult.cancelled()))
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL);
+            var resumeError = assertThrows(CompletionException.class,
+                    () -> client.resumeSession("session", resume).join());
+            assertInstanceOf(IllegalArgumentException.class, resumeError.getCause());
+        }
+    }
+
+    @Test
+    void registrationRollbackAndResumeReplacementAreIsolated() {
+        var registry = new GitHubTokenProviderRegistry();
+        var first = registry.register(args -> CompletableFuture.completedFuture(GitHubTokenProviderResult.cancelled()));
+        var second = registry
+                .register(args -> CompletableFuture.completedFuture(GitHubTokenProviderResult.cancelled()));
+
+        assertNotNull(registry.get(first.id()));
+        assertNotNull(registry.get(second.id()));
+        first.claim("session-1");
+        second.claim("session-1");
+        assertNull(registry.get(first.id()));
+        assertNotNull(registry.get(second.id()));
+
+        first.close();
+        assertNotNull(registry.get(second.id()));
+        second.close();
+        assertNull(registry.get(second.id()));
+
+        var retired = registry
+                .register(args -> CompletableFuture.completedFuture(GitHubTokenProviderResult.cancelled()));
+        retired.claim("session-2");
+        registry.retire("session-2");
+        assertNull(registry.get(retired.id()));
+
+        var failed = registry
+                .register(args -> CompletableFuture.completedFuture(GitHubTokenProviderResult.cancelled()));
+        failed.close();
+        assertNull(registry.get(failed.id()));
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/HooksTest.java b/java/sdk/src/test/java/com/github/copilot/HooksTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/HooksTest.java
rename to java/sdk/src/test/java/com/github/copilot/HooksTest.java
diff --git a/java/src/test/java/com/github/copilot/InternalExecutorProviderIT.java b/java/sdk/src/test/java/com/github/copilot/InternalExecutorProviderIT.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/InternalExecutorProviderIT.java
rename to java/sdk/src/test/java/com/github/copilot/InternalExecutorProviderIT.java
diff --git a/java/src/test/java/com/github/copilot/InternalExecutorProviderProbe.java b/java/sdk/src/test/java/com/github/copilot/InternalExecutorProviderProbe.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/InternalExecutorProviderProbe.java
rename to java/sdk/src/test/java/com/github/copilot/InternalExecutorProviderProbe.java
diff --git a/java/src/test/java/com/github/copilot/InternalExecutorProviderTest.java b/java/sdk/src/test/java/com/github/copilot/InternalExecutorProviderTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/InternalExecutorProviderTest.java
rename to java/sdk/src/test/java/com/github/copilot/InternalExecutorProviderTest.java
diff --git a/java/src/test/java/com/github/copilot/JsonIncludeNonNullTest.java b/java/sdk/src/test/java/com/github/copilot/JsonIncludeNonNullTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/JsonIncludeNonNullTest.java
rename to java/sdk/src/test/java/com/github/copilot/JsonIncludeNonNullTest.java
diff --git a/java/src/test/java/com/github/copilot/JsonRpcClientTest.java b/java/sdk/src/test/java/com/github/copilot/JsonRpcClientTest.java
similarity index 94%
rename from java/src/test/java/com/github/copilot/JsonRpcClientTest.java
rename to java/sdk/src/test/java/com/github/copilot/JsonRpcClientTest.java
index 3491ac8ab4..009f15c200 100644
--- a/java/src/test/java/com/github/copilot/JsonRpcClientTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/JsonRpcClientTest.java
@@ -115,6 +115,22 @@ void testNotify() throws Exception {
         }
     }
 
+    @Test
+    void testCredentialValuesAreRedactedOnlyFromDiagnosticRendering() throws Exception {
+        String json = """
+                {"jsonrpc":"2.0","result":{"accessToken":"secret","nested":{"gitHubToken":"static"}},
+                "metadata":{"tokenType":"Bearer"}}
+                """;
+
+        String rendered = JsonRpcClient.redactCredentialsForLogging(json);
+
+        assertFalse(rendered.contains("secret"));
+        assertFalse(rendered.contains("static"));
+        assertEquals("<redacted>", MAPPER.readTree(rendered).at("/result/accessToken").asText());
+        assertEquals("<redacted>", MAPPER.readTree(rendered).at("/result/nested/gitHubToken").asText());
+        assertEquals("Bearer", MAPPER.readTree(rendered).at("/metadata/tokenType").asText());
+    }
+
     // ---- isConnected() ----
 
     @Test
@@ -133,14 +149,9 @@ void testIsConnectedWithSocketClosed() throws Exception {
         pair.serverSocket.close();
     }
 
-    private static Process startBlockingProcess() throws IOException {
-        boolean isWindows = System.getProperty("os.name").toLowerCase().contains("windows");
-        return (isWindows ? new ProcessBuilder("cmd", "/c", "more") : new ProcessBuilder("cat")).start();
-    }
-
     @Test
     void testIsConnectedWithProcess() throws Exception {
-        Process proc = startBlockingProcess();
+        Process proc = new TestProcess();
         try (var client = JsonRpcClient.fromProcess(proc)) {
             assertTrue(client.isConnected());
         }
@@ -148,7 +159,7 @@ void testIsConnectedWithProcess() throws Exception {
 
     @Test
     void testIsConnectedWithProcessDead() throws Exception {
-        Process proc = startBlockingProcess();
+        Process proc = new TestProcess();
         var client = JsonRpcClient.fromProcess(proc);
         proc.destroy();
         proc.waitFor(5, TimeUnit.SECONDS);
@@ -160,7 +171,7 @@ void testIsConnectedWithProcessDead() throws Exception {
 
     @Test
     void testGetProcessReturnsProcess() throws Exception {
-        Process proc = startBlockingProcess();
+        Process proc = new TestProcess();
         try (var client = JsonRpcClient.fromProcess(proc)) {
             assertSame(proc, client.getProcess());
         }
diff --git a/java/src/test/java/com/github/copilot/LifecycleEventManagerTest.java b/java/sdk/src/test/java/com/github/copilot/LifecycleEventManagerTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/LifecycleEventManagerTest.java
rename to java/sdk/src/test/java/com/github/copilot/LifecycleEventManagerTest.java
diff --git a/java/src/test/java/com/github/copilot/LowLevelToolDefinitionIT.java b/java/sdk/src/test/java/com/github/copilot/LowLevelToolDefinitionIT.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/LowLevelToolDefinitionIT.java
rename to java/sdk/src/test/java/com/github/copilot/LowLevelToolDefinitionIT.java
diff --git a/java/sdk/src/test/java/com/github/copilot/ManagedSettingsTest.java b/java/sdk/src/test/java/com/github/copilot/ManagedSettingsTest.java
new file mode 100644
index 0000000000..d6341b26c5
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ManagedSettingsTest.java
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+package com.github.copilot;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.copilot.rpc.DisableBypassPermissionsModes;
+import com.github.copilot.rpc.ManagedSettings;
+import com.github.copilot.rpc.ManagedSettingsPermissions;
+import com.github.copilot.rpc.PermissionRequestResult;
+import com.github.copilot.rpc.ResumeSessionConfig;
+import com.github.copilot.rpc.SessionConfig;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.jupiter.api.Test;
+
+class ManagedSettingsTest {
+    @Test
+    void forwardsManagedSettingsOnCreateAndResume() throws Exception {
+        var permissions = new ManagedSettingsPermissions()
+                .setDisableBypassPermissionsMode(DisableBypassPermissionsModes.DISABLE).setDeny(List.of("Shell(rm *)"))
+                .setAsk(List.of("Domain(publish.example)")).setAllow(List.of("Read(**)"));
+        var managedSettings = new ManagedSettings().setPermissions(permissions);
+
+        var create = SessionRequestBuilder.buildCreateRequest(
+                new SessionConfig().setEnableManagedSettings(true).setManagedSettings(managedSettings),
+                "managed-create");
+        var resume = SessionRequestBuilder.buildResumeRequest("managed-resume",
+                new ResumeSessionConfig().setEnableManagedSettings(true).setManagedSettings(managedSettings));
+
+        assertEquals(managedSettings, create.getManagedSettings());
+        assertEquals(managedSettings, resume.getManagedSettings());
+        var json = new ObjectMapper().writeValueAsString(create);
+        assertTrue(json.contains("\"enableManagedSettings\":true"));
+        assertTrue(json.contains("\"managedSettings\":{\"permissions\""));
+        assertTrue(json.contains("\"disableBypassPermissionsMode\":\"disable\""));
+    }
+
+    @Test
+    void acceptsFutureBypassPermissionsModes() throws Exception {
+        var permissions = new ManagedSettingsPermissions().setDisableBypassPermissionsMode("future-fail-closed-mode");
+        var json = new ObjectMapper().writeValueAsString(permissions);
+
+        assertTrue(json.contains("\"disableBypassPermissionsMode\":\"future-fail-closed-mode\""));
+    }
+
+    @Test
+    void preservesExplicitEmptyPermissionArrays() throws Exception {
+        // Security-critical: a present empty allow list admits nothing, while an
+        // absent (null) list imposes no such restriction. Jackson NON_NULL must
+        // emit an explicit empty array as `[]` and omit null fields, so the two
+        // remain distinguishable on the wire.
+        var permissions = new ManagedSettingsPermissions().setDeny(List.of()).setAsk(List.of()).setAllow(List.of());
+        var managedSettings = new ManagedSettings().setPermissions(permissions);
+        var create = SessionRequestBuilder.buildCreateRequest(new SessionConfig().setManagedSettings(managedSettings),
+                "managed-empty");
+
+        var json = new ObjectMapper().writeValueAsString(create);
+        assertTrue(json.contains("\"deny\":[]"), json);
+        assertTrue(json.contains("\"ask\":[]"), json);
+        assertTrue(json.contains("\"allow\":[]"), json);
+    }
+
+    @Test
+    void distinguishesExplicitEmptyAllowFromAbsentAllow() throws Exception {
+        // Present empty allow admits nothing; the null deny/ask must be omitted.
+        var permissions = new ManagedSettingsPermissions().setAllow(List.of());
+        var managedSettings = new ManagedSettings().setPermissions(permissions);
+        var create = SessionRequestBuilder.buildCreateRequest(new SessionConfig().setManagedSettings(managedSettings),
+                "managed-mixed");
+
+        var json = new ObjectMapper().writeValueAsString(create);
+        assertTrue(json.contains("\"allow\":[]"), json);
+        assertFalse(json.contains("\"deny\""), json);
+        assertFalse(json.contains("\"ask\""), json);
+    }
+
+    @Test
+    void directInjectionEnablesManagedSafeguards() throws Exception {
+        var session = new CopilotSession("session-1", null);
+        var settings = new ManagedSettings().setPermissions(new ManagedSettingsPermissions());
+        var managedSettingsEnabled = new AtomicBoolean();
+        var config = new SessionConfig().setManagedSettings(settings).setOnPermissionRequest((request, invocation) -> {
+            managedSettingsEnabled.set(invocation.isManagedSettingsEnabled());
+            return CompletableFuture.completedFuture(PermissionRequestResult.noResult());
+        });
+
+        SessionRequestBuilder.configureSession(session, config);
+        session.handlePermissionRequest(new ObjectMapper().readTree("{\"kind\":\"read\"}")).get();
+
+        assertTrue(managedSettingsEnabled.get());
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/McpAndAgentsTest.java b/java/sdk/src/test/java/com/github/copilot/McpAndAgentsTest.java
similarity index 99%
rename from java/src/test/java/com/github/copilot/McpAndAgentsTest.java
rename to java/sdk/src/test/java/com/github/copilot/McpAndAgentsTest.java
index f39e56eab3..06d9dca39e 100644
--- a/java/src/test/java/com/github/copilot/McpAndAgentsTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/McpAndAgentsTest.java
@@ -131,7 +131,6 @@ void testShouldAcceptMcpServerConfigurationOnSessionResume() throws Exception {
             CopilotSession session1 = client
                     .createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
             String sessionId = session1.getSessionId();
-            session1.sendAndWait(new MessageOptions().setPrompt("What is 1+1?")).get(60, TimeUnit.SECONDS);
 
             // Resume with MCP servers
             var mcpServers = createTestMcpServers("test-server");
diff --git a/java/src/test/java/com/github/copilot/McpAuthInterestRegistrationTest.java b/java/sdk/src/test/java/com/github/copilot/McpAuthInterestRegistrationTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/McpAuthInterestRegistrationTest.java
rename to java/sdk/src/test/java/com/github/copilot/McpAuthInterestRegistrationTest.java
diff --git a/java/src/test/java/com/github/copilot/McpOAuthE2ETest.java b/java/sdk/src/test/java/com/github/copilot/McpOAuthE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/McpOAuthE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/McpOAuthE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/McpOAuthResumeE2ETest.java b/java/sdk/src/test/java/com/github/copilot/McpOAuthResumeE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/McpOAuthResumeE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/McpOAuthResumeE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/MessageAttachmentTest.java b/java/sdk/src/test/java/com/github/copilot/MessageAttachmentTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/MessageAttachmentTest.java
rename to java/sdk/src/test/java/com/github/copilot/MessageAttachmentTest.java
diff --git a/java/src/test/java/com/github/copilot/MetadataApiTest.java b/java/sdk/src/test/java/com/github/copilot/MetadataApiTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/MetadataApiTest.java
rename to java/sdk/src/test/java/com/github/copilot/MetadataApiTest.java
diff --git a/java/src/test/java/com/github/copilot/ModeHandlersTest.java b/java/sdk/src/test/java/com/github/copilot/ModeHandlersTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ModeHandlersTest.java
rename to java/sdk/src/test/java/com/github/copilot/ModeHandlersTest.java
diff --git a/java/src/test/java/com/github/copilot/ModelInfoTest.java b/java/sdk/src/test/java/com/github/copilot/ModelInfoTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ModelInfoTest.java
rename to java/sdk/src/test/java/com/github/copilot/ModelInfoTest.java
diff --git a/java/src/test/java/com/github/copilot/ModuleDescriptorTest.java b/java/sdk/src/test/java/com/github/copilot/ModuleDescriptorTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ModuleDescriptorTest.java
rename to java/sdk/src/test/java/com/github/copilot/ModuleDescriptorTest.java
diff --git a/java/src/test/java/com/github/copilot/MultiProviderConfigTest.java b/java/sdk/src/test/java/com/github/copilot/MultiProviderConfigTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/MultiProviderConfigTest.java
rename to java/sdk/src/test/java/com/github/copilot/MultiProviderConfigTest.java
diff --git a/java/src/test/java/com/github/copilot/MultiProviderRegistryE2ETest.java b/java/sdk/src/test/java/com/github/copilot/MultiProviderRegistryE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/MultiProviderRegistryE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/MultiProviderRegistryE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/OptionalApiAndJacksonTest.java b/java/sdk/src/test/java/com/github/copilot/OptionalApiAndJacksonTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/OptionalApiAndJacksonTest.java
rename to java/sdk/src/test/java/com/github/copilot/OptionalApiAndJacksonTest.java
diff --git a/java/src/test/java/com/github/copilot/PerSessionAuthTest.java b/java/sdk/src/test/java/com/github/copilot/PerSessionAuthTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/PerSessionAuthTest.java
rename to java/sdk/src/test/java/com/github/copilot/PerSessionAuthTest.java
diff --git a/java/src/test/java/com/github/copilot/PermissionRequestResultKindTest.java b/java/sdk/src/test/java/com/github/copilot/PermissionRequestResultKindTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/PermissionRequestResultKindTest.java
rename to java/sdk/src/test/java/com/github/copilot/PermissionRequestResultKindTest.java
diff --git a/java/src/test/java/com/github/copilot/PermissionRequestResultTest.java b/java/sdk/src/test/java/com/github/copilot/PermissionRequestResultTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/PermissionRequestResultTest.java
rename to java/sdk/src/test/java/com/github/copilot/PermissionRequestResultTest.java
diff --git a/java/src/test/java/com/github/copilot/PermissionsTest.java b/java/sdk/src/test/java/com/github/copilot/PermissionsTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/PermissionsTest.java
rename to java/sdk/src/test/java/com/github/copilot/PermissionsTest.java
diff --git a/java/src/test/java/com/github/copilot/PreMcpToolCallHookTest.java b/java/sdk/src/test/java/com/github/copilot/PreMcpToolCallHookTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/PreMcpToolCallHookTest.java
rename to java/sdk/src/test/java/com/github/copilot/PreMcpToolCallHookTest.java
diff --git a/java/src/test/java/com/github/copilot/ProviderConfigTest.java b/java/sdk/src/test/java/com/github/copilot/ProviderConfigTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ProviderConfigTest.java
rename to java/sdk/src/test/java/com/github/copilot/ProviderConfigTest.java
diff --git a/java/src/test/java/com/github/copilot/ProviderEndpointE2ETest.java b/java/sdk/src/test/java/com/github/copilot/ProviderEndpointE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ProviderEndpointE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/ProviderEndpointE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/RemoteSessionTest.java b/java/sdk/src/test/java/com/github/copilot/RemoteSessionTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/RemoteSessionTest.java
rename to java/sdk/src/test/java/com/github/copilot/RemoteSessionTest.java
diff --git a/java/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java b/java/sdk/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java
similarity index 88%
rename from java/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java
rename to java/sdk/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java
index 76c2d41b29..1cb3ae82ec 100644
--- a/java/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java
@@ -15,6 +15,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 
 import org.junit.jupiter.api.AfterEach;
@@ -32,6 +33,9 @@
 import com.github.copilot.rpc.ToolDefinition;
 import com.github.copilot.rpc.ToolResultObject;
 import com.github.copilot.rpc.UserInputResponse;
+import com.github.copilot.generated.rpc.GitHubTokenAcquireReason;
+import com.github.copilot.rpc.GitHubTokenProviderArgs;
+import com.github.copilot.rpc.GitHubTokenProviderResult;
 
 /**
  * Unit tests for {@link RpcHandlerDispatcher} focusing on coverage gaps
@@ -51,6 +55,7 @@ class RpcHandlerDispatcherTest {
     private RpcHandlerDispatcher dispatcher;
     private InputStream responseStream;
     private Map<String, BiConsumer<String, JsonNode>> handlers;
+    private GitHubTokenProviderRegistry gitHubTokenProviders;
 
     @BeforeEach
     void setup() throws Exception {
@@ -66,7 +71,8 @@ void setup() throws Exception {
 
         sessions = new ConcurrentHashMap<>();
         lifecycleEvents = new CopyOnWriteArrayList<>();
-        dispatcher = new RpcHandlerDispatcher(sessions, lifecycleEvents::add, null);
+        gitHubTokenProviders = new GitHubTokenProviderRegistry();
+        dispatcher = new RpcHandlerDispatcher(sessions, lifecycleEvents::add, null, gitHubTokenProviders);
         dispatcher.registerHandlers(rpc);
 
         // Extract the registered handlers via reflection so we can invoke them directly
@@ -119,6 +125,57 @@ private CopilotSession createSession(String sessionId) {
         return session;
     }
 
+    @Test
+    void gitHubTokenCallbackMapsRequestAndTokenResult() throws Exception {
+        AtomicReference<GitHubTokenProviderArgs> received = new AtomicReference<>();
+        var registration = gitHubTokenProviders.register(args -> {
+            received.set(args);
+            return CompletableFuture.completedFuture(GitHubTokenProviderResult.token("secret", 28_800, "bearer"));
+        });
+        ObjectNode params = MAPPER.createObjectNode();
+        params.put("registrationId", registration.id());
+        params.put("host", "github.example");
+        params.put("sessionId", "session-1");
+        params.put("reason", "initial");
+
+        invokeHandler("gitHubToken.getToken", "80", params);
+
+        JsonNode response = readResponse();
+        assertEquals("token", response.at("/result/kind").asText());
+        assertEquals("secret", response.at("/result/accessToken").asText());
+        assertEquals(28_800, response.at("/result/expiresIn").asLong());
+        assertEquals("github.example", received.get().host());
+        assertEquals("session-1", received.get().sessionId());
+        assertEquals(GitHubTokenAcquireReason.INITIAL, received.get().reason());
+    }
+
+    @Test
+    void gitHubTokenCallbackPreservesCancellationAndErrors() throws Exception {
+        var cancelled = gitHubTokenProviders
+                .register(args -> CompletableFuture.completedFuture(GitHubTokenProviderResult.cancelled()));
+        ObjectNode cancelledParams = MAPPER.createObjectNode();
+        cancelledParams.put("registrationId", cancelled.id());
+        cancelledParams.put("host", "github.com");
+        cancelledParams.put("reason", "refresh");
+        invokeHandler("gitHubToken.getToken", "81", cancelledParams);
+        assertEquals("cancelled", readResponse().at("/result/kind").asText());
+
+        var failed = gitHubTokenProviders.register(
+                args -> CompletableFuture.failedFuture(new IllegalStateException("credential service unavailable")));
+        ObjectNode failedParams = cancelledParams.deepCopy();
+        failedParams.put("registrationId", failed.id());
+        invokeHandler("gitHubToken.getToken", "82", failedParams);
+        JsonNode error = readResponse();
+        assertEquals(-32603, error.at("/error/code").asInt());
+        assertTrue(error.at("/error/message").asText().contains("credential service unavailable"));
+
+        failedParams.put("registrationId", "unknown");
+        invokeHandler("gitHubToken.getToken", "83", failedParams);
+        JsonNode unknown = readResponse();
+        assertEquals(-32603, unknown.at("/error/code").asInt());
+        assertTrue(unknown.at("/error/message").asText().contains("Unknown GitHub token provider registration"));
+    }
+
     // ===== session.event tests =====
 
     @Test
diff --git a/java/src/test/java/com/github/copilot/RpcServerE2ETest.java b/java/sdk/src/test/java/com/github/copilot/RpcServerE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/RpcServerE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/RpcServerE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/RpcServerMiscE2ETest.java b/java/sdk/src/test/java/com/github/copilot/RpcServerMiscE2ETest.java
similarity index 98%
rename from java/src/test/java/com/github/copilot/RpcServerMiscE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/RpcServerMiscE2ETest.java
index 1db801d841..3b06e4d1f7 100644
--- a/java/src/test/java/com/github/copilot/RpcServerMiscE2ETest.java
+++ b/java/sdk/src/test/java/com/github/copilot/RpcServerMiscE2ETest.java
@@ -106,7 +106,8 @@ void testShouldLoginListGetCurrentAuthAndLogoutAccount() throws Exception {
             users.stream().filter(user -> accountLogin(user).equals(login)).findFirst()
                     .ifPresent(user -> assertEquals(token, user.token()));
 
-            var logout = client.getRpc().account.logout(new AccountLogoutParams(authInfo)).get(30, TimeUnit.SECONDS);
+            var logout = client.getRpc().account.logout(new AccountLogoutParams(null, authInfo)).get(30,
+                    TimeUnit.SECONDS);
             assertFalse(logout.hasMoreUsers());
             assertNull(client.getRpc().account.getCurrentAuth().get(30, TimeUnit.SECONDS).authInfo());
         }
diff --git a/java/src/test/java/com/github/copilot/RpcSessionStateExtrasE2ETest.java b/java/sdk/src/test/java/com/github/copilot/RpcSessionStateExtrasE2ETest.java
similarity index 96%
rename from java/src/test/java/com/github/copilot/RpcSessionStateExtrasE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/RpcSessionStateExtrasE2ETest.java
index 5022d2a563..18045f3e86 100644
--- a/java/src/test/java/com/github/copilot/RpcSessionStateExtrasE2ETest.java
+++ b/java/sdk/src/test/java/com/github/copilot/RpcSessionStateExtrasE2ETest.java
@@ -59,14 +59,13 @@ void testShouldAddByokProviderAndModelAtRuntime() throws Exception {
                                 ProviderConfigWireApi.COMPLETIONS, null, "https://models.example.test/v1",
                                 "provider-key", null, null, Map.of("x-provider", "java"), null)),
                         List.of(new ProviderModelConfig("small", "java-e2e-provider", null, null, "Java Added Model",
-                                4096.0, null, null, null))))
+                                4096L, null, null, null))))
                         .get(30, TimeUnit.SECONDS);
                 assertEquals(1, result.models().size());
 
                 var selectionId = "java-e2e-provider/small";
-                session.getRpc().model
-                        .switchTo(new SessionModelSwitchToParams(null, selectionId, null, null, null, null, null, null))
-                        .get(30, TimeUnit.SECONDS);
+                session.getRpc().model.switchTo(new SessionModelSwitchToParams(null, selectionId, null, null, null,
+                        null, null, null, null, null, null, null, null, null, null)).get(30, TimeUnit.SECONDS);
                 var current = session.getRpc().model.getCurrent().get(30, TimeUnit.SECONDS);
                 assertEquals(selectionId, current.modelId());
             }
diff --git a/java/src/test/java/com/github/copilot/RpcTasksAndHandlersE2ETest.java b/java/sdk/src/test/java/com/github/copilot/RpcTasksAndHandlersE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/RpcTasksAndHandlersE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/RpcTasksAndHandlersE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/RpcWrappersTest.java b/java/sdk/src/test/java/com/github/copilot/RpcWrappersTest.java
similarity index 99%
rename from java/src/test/java/com/github/copilot/RpcWrappersTest.java
rename to java/sdk/src/test/java/com/github/copilot/RpcWrappersTest.java
index 1f1785cba7..3bb9001f35 100644
--- a/java/src/test/java/com/github/copilot/RpcWrappersTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/RpcWrappersTest.java
@@ -205,7 +205,8 @@ void sessionRpc_model_switchTo_merges_sessionId_with_extra_params() {
         var session = new SessionRpc(stub, "sess-xyz");
 
         // switchTo takes extra params beyond sessionId
-        var switchParams = new SessionModelSwitchToParams(null, "gpt-5", null, null, null, null, null, null);
+        var switchParams = new SessionModelSwitchToParams(null, "gpt-5", null, null, null, null, null, null, null, null,
+                null, null, null, null, null);
         session.model.switchTo(switchParams);
 
         assertEquals(1, stub.calls.size());
diff --git a/java/src/test/java/com/github/copilot/SchedulerShutdownRaceTest.java b/java/sdk/src/test/java/com/github/copilot/SchedulerShutdownRaceTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/SchedulerShutdownRaceTest.java
rename to java/sdk/src/test/java/com/github/copilot/SchedulerShutdownRaceTest.java
diff --git a/java/src/test/java/com/github/copilot/SessionCanvasSnapshotTest.java b/java/sdk/src/test/java/com/github/copilot/SessionCanvasSnapshotTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/SessionCanvasSnapshotTest.java
rename to java/sdk/src/test/java/com/github/copilot/SessionCanvasSnapshotTest.java
diff --git a/java/src/test/java/com/github/copilot/SessionConfigE2ETest.java b/java/sdk/src/test/java/com/github/copilot/SessionConfigE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/SessionConfigE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/SessionConfigE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/SessionEventDeserializationTest.java b/java/sdk/src/test/java/com/github/copilot/SessionEventDeserializationTest.java
similarity index 96%
rename from java/src/test/java/com/github/copilot/SessionEventDeserializationTest.java
rename to java/sdk/src/test/java/com/github/copilot/SessionEventDeserializationTest.java
index fc978ed65b..8d9b70a348 100644
--- a/java/src/test/java/com/github/copilot/SessionEventDeserializationTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SessionEventDeserializationTest.java
@@ -113,6 +113,54 @@ void testParseSessionIdleEvent() throws Exception {
         assertEquals("session.idle", event.getType());
     }
 
+    @Test
+    void testManagedSettingsResolvedClientProvenance() throws Exception {
+        assertEquals("server", ManagedSettingsResolvedSource.SERVER.getValue());
+        assertEquals("device", ManagedSettingsResolvedSource.DEVICE.getValue());
+        assertEquals("client", ManagedSettingsResolvedSource.CLIENT.getValue());
+        assertEquals("mixed", ManagedSettingsResolvedSource.MIXED.getValue());
+        assertEquals("none", ManagedSettingsResolvedSource.NONE.getValue());
+
+        String clientJson = """
+                {
+                    "type": "session.managed_settings_resolved",
+                    "data": {
+                        "source": "client",
+                        "serverManaged": false,
+                        "deviceManaged": false,
+                        "clientManaged": true,
+                        "failClosed": false,
+                        "bypassPermissionsDisabled": true,
+                        "managedKeys": ["permissions"]
+                    }
+                }
+                """;
+
+        var clientEvent = assertInstanceOf(SessionManagedSettingsResolvedEvent.class, parseJson(clientJson));
+        assertEquals(ManagedSettingsResolvedSource.CLIENT, clientEvent.getData().source());
+        assertEquals(Boolean.TRUE, clientEvent.getData().clientManaged());
+        assertTrue(MAPPER.writeValueAsString(clientEvent).contains("\"clientManaged\":true"));
+
+        String mixedJson = """
+                {
+                    "type": "session.managed_settings_resolved",
+                    "data": {
+                        "source": "mixed",
+                        "serverManaged": true,
+                        "deviceManaged": true,
+                        "failClosed": false,
+                        "bypassPermissionsDisabled": true,
+                        "managedKeys": ["permissions"]
+                    }
+                }
+                """;
+
+        var mixedEvent = assertInstanceOf(SessionManagedSettingsResolvedEvent.class, parseJson(mixedJson));
+        assertEquals(ManagedSettingsResolvedSource.MIXED, mixedEvent.getData().source());
+        assertNull(mixedEvent.getData().clientManaged());
+        assertFalse(MAPPER.writeValueAsString(mixedEvent).contains("\"clientManaged\""));
+    }
+
     @Test
     void testParseSessionInfoEvent() throws Exception {
         String json = """
@@ -897,15 +945,16 @@ void testParseEmptyJson() throws Exception {
     @Test
     void testParseAllEventTypes() throws Exception {
         String[] types = {"session.start", "session.resume", "session.error", "session.idle", "session.info",
-                "session.model_change", "session.mode_changed", "session.plan_changed",
-                "session.workspace_file_changed", "session.handoff", "session.truncation", "session.snapshot_rewind",
-                "session.usage_info", "session.compaction_start", "session.compaction_complete", "user.message",
-                "pending_messages.modified", "assistant.turn_start", "assistant.intent", "assistant.reasoning",
-                "assistant.reasoning_delta", "assistant.message", "assistant.message_delta", "assistant.turn_end",
-                "assistant.usage", "abort", "tool.user_requested", "tool.execution_start",
-                "tool.execution_partial_result", "tool.execution_progress", "tool.execution_complete",
-                "subagent.started", "subagent.completed", "subagent.failed", "subagent.selected", "hook.start",
-                "hook.end", "system.message", "session.shutdown", "skill.invoked"};
+                "session.model_change", "session.mode_changed", "session.managed_settings_resolved",
+                "session.managed_settings_enforced", "session.plan_changed", "session.workspace_file_changed",
+                "session.handoff", "session.truncation", "session.snapshot_rewind", "session.usage_info",
+                "session.compaction_start", "session.compaction_complete", "user.message", "pending_messages.modified",
+                "assistant.turn_start", "assistant.intent", "assistant.reasoning", "assistant.reasoning_delta",
+                "assistant.message", "assistant.message_delta", "assistant.turn_end", "assistant.usage", "abort",
+                "tool.user_requested", "tool.execution_start", "tool.execution_partial_result",
+                "tool.execution_progress", "tool.execution_complete", "subagent.started", "subagent.completed",
+                "subagent.failed", "subagent.selected", "hook.start", "hook.end", "system.message", "session.shutdown",
+                "skill.invoked"};
 
         for (String type : types) {
             String json = """
diff --git a/java/src/test/java/com/github/copilot/SessionEventHandlingTest.java b/java/sdk/src/test/java/com/github/copilot/SessionEventHandlingTest.java
similarity index 94%
rename from java/src/test/java/com/github/copilot/SessionEventHandlingTest.java
rename to java/sdk/src/test/java/com/github/copilot/SessionEventHandlingTest.java
index bd38d4962e..a1a22674b9 100644
--- a/java/src/test/java/com/github/copilot/SessionEventHandlingTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SessionEventHandlingTest.java
@@ -5,11 +5,14 @@
 package com.github.copilot;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
 
 import java.io.Closeable;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -24,7 +27,10 @@
 import com.github.copilot.generated.SessionEvent;
 import com.github.copilot.generated.AssistantMessageEvent;
 import com.github.copilot.generated.SessionIdleEvent;
+import com.github.copilot.generated.SessionMode;
 import com.github.copilot.generated.SessionStartEvent;
+import com.github.copilot.rpc.MessageOptions;
+import com.github.copilot.rpc.SendMessageResponse;
 
 /**
  * Unit tests for session event handling API.
@@ -85,6 +91,33 @@ void testTypedEventHandler() {
         assertEquals("Second message", receivedMessages.get(1).getData().content());
     }
 
+    @Test
+    void testSendAndWaitSkipsAutopilotContinuationIdle() throws Exception {
+        var rpc = mock(JsonRpcClient.class);
+        when(rpc.invoke(eq("session.send"), any(), eq(SendMessageResponse.class)))
+                .thenReturn(CompletableFuture.completedFuture(new SendMessageResponse("message-1")));
+        when(rpc.invoke(eq("session.destroy"), any(), eq(Void.class)))
+                .thenReturn(CompletableFuture.completedFuture(null));
+        session = new CopilotSession("test-session-id", rpc);
+
+        try {
+            var pending = session.sendAndWait(new MessageOptions().setPrompt("keep going"));
+
+            dispatchEvent(createAssistantMessageEvent("intermediate"));
+            dispatchEvent(createSessionIdleEvent(SessionMode.AUTOPILOT));
+            assertFalse(pending.isDone(), "Autopilot continuation idle must not complete sendAndWait");
+
+            dispatchEvent(createAssistantMessageEvent("final"));
+            dispatchEvent(createSessionIdleEvent(SessionMode.INTERACTIVE));
+
+            var result = pending.get(5, TimeUnit.SECONDS);
+            assertNotNull(result);
+            assertEquals("final", result.getData().content());
+        } finally {
+            session.close();
+        }
+    }
+
     @Test
     void testMultipleTypedHandlers() {
         var messages = new ArrayList<AssistantMessageEvent>();
@@ -865,7 +898,7 @@ private SessionStartEvent createSessionStartEvent(String sessionId) {
     private AssistantMessageEvent createAssistantMessageEvent(String content) {
         var event = new AssistantMessageEvent();
         var data = new AssistantMessageEvent.AssistantMessageEventData(null, null, content, null, null, null, null,
-                null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+                null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
         event.setData(data);
         return event;
     }
@@ -873,4 +906,10 @@ private AssistantMessageEvent createAssistantMessageEvent(String content) {
     private SessionIdleEvent createSessionIdleEvent() {
         return new SessionIdleEvent();
     }
+
+    private SessionIdleEvent createSessionIdleEvent(SessionMode mode) {
+        var event = new SessionIdleEvent();
+        event.setData(new SessionIdleEvent.SessionIdleEventData(null, mode));
+        return event;
+    }
 }
diff --git a/java/src/test/java/com/github/copilot/SessionEventsE2ETest.java b/java/sdk/src/test/java/com/github/copilot/SessionEventsE2ETest.java
similarity index 98%
rename from java/src/test/java/com/github/copilot/SessionEventsE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/SessionEventsE2ETest.java
index 161839a533..dad75db528 100644
--- a/java/src/test/java/com/github/copilot/SessionEventsE2ETest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SessionEventsE2ETest.java
@@ -5,6 +5,7 @@
 package com.github.copilot;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.file.Files;
@@ -184,6 +185,9 @@ void testShouldReceiveSessionEvents_assistantUsageEvent() throws Exception {
             // Usage events may or may not be emitted depending on the model/API version
             // This test verifies the event handler works when they are emitted
             // We don't assert they must be present since it depends on the backend
+            if (!usageEvents.isEmpty()) {
+                assertNotNull(usageEvents.get(0).getData(), "Usage event should carry data");
+            }
         }
     }
 
diff --git a/java/src/test/java/com/github/copilot/SessionHandlerTest.java b/java/sdk/src/test/java/com/github/copilot/SessionHandlerTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/SessionHandlerTest.java
rename to java/sdk/src/test/java/com/github/copilot/SessionHandlerTest.java
diff --git a/java/src/test/java/com/github/copilot/SessionRequestBuilderTest.java b/java/sdk/src/test/java/com/github/copilot/SessionRequestBuilderTest.java
similarity index 95%
rename from java/src/test/java/com/github/copilot/SessionRequestBuilderTest.java
rename to java/sdk/src/test/java/com/github/copilot/SessionRequestBuilderTest.java
index 54773662c5..9d76d18ee2 100644
--- a/java/src/test/java/com/github/copilot/SessionRequestBuilderTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SessionRequestBuilderTest.java
@@ -26,6 +26,7 @@
 import com.github.copilot.rpc.ExitPlanModeResult;
 import com.github.copilot.rpc.ExpConfigEntry;
 import com.github.copilot.rpc.GitHubMcpToolConfig;
+import com.github.copilot.rpc.GitHubTokenProviderResult;
 import com.github.copilot.rpc.LargeToolOutputConfig;
 import com.github.copilot.rpc.MemoryConfiguration;
 import com.github.copilot.rpc.ResumeSessionConfig;
@@ -56,6 +57,27 @@ void testBuildCreateRequestNullConfig() {
         assertEquals("direct", request.getEnvValueMode(), "envValueMode should be 'direct' even for null config");
     }
 
+    @Test
+    void testGitHubTokenProviderRegistrationWireFieldHasExactCasing() throws Exception {
+        var create = SessionRequestBuilder.buildCreateRequest(new SessionConfig(), "create-session");
+        create.setGitHubTokenProviderRegistrationId("create-registration");
+        var resume = SessionRequestBuilder.buildResumeRequest("resume-session", new ResumeSessionConfig());
+        resume.setGitHubTokenProviderRegistrationId("resume-registration");
+        var mapper = JsonRpcClient.getObjectMapper();
+
+        assertEquals("create-registration",
+                mapper.readTree(mapper.writeValueAsBytes(create)).path("gitHubTokenProviderRegistrationId").asText());
+        assertEquals("resume-registration",
+                mapper.readTree(mapper.writeValueAsBytes(resume)).path("gitHubTokenProviderRegistrationId").asText());
+        assertFalse(mapper.readTree(mapper.writeValueAsBytes(create)).has("gitHubToken"));
+    }
+
+    @Test
+    void testGitHubTokenProviderResultRedactsToken() {
+        var result = GitHubTokenProviderResult.token("do-not-print", 28_800);
+        assertFalse(result.toString().contains("do-not-print"));
+    }
+
     @Test
     void testBuildCreateRequestHooksNonNullButEmpty() {
         // Hooks object exists but hasHooks() returns false
@@ -169,13 +191,17 @@ void testBuildCreateRequestSetsContextTier() {
     }
 
     @Test
-    void testBuildCreateRequestSetsPluginDirectoriesAndLargeOutput() {
+    void testBuildCreateRequestSetsPluginDirectoriesAndLargeOutput() throws Exception {
         var largeOutput = new LargeToolOutputConfig().setEnabled(true).setMaxSizeBytes(1024L)
                 .setOutputDirectory("/tmp/out");
-        var config = new SessionConfig().setPluginDirectories(List.of("/plugins/a")).setLargeOutput(largeOutput);
+        var config = new SessionConfig().setPluginDirectories(List.of("/plugins/a"))
+                .setDisabledMcpServers(List.of("local-files", "remote-github")).setLargeOutput(largeOutput);
         CreateSessionRequest request = SessionRequestBuilder.buildCreateRequest(config);
         assertEquals(List.of("/plugins/a"), request.getPluginDirectories());
+        assertEquals(List.of("local-files", "remote-github"), request.getDisabledMcpServers());
         assertEquals(largeOutput, request.getLargeOutput());
+        assertTrue(JsonRpcClient.getObjectMapper().writeValueAsString(request)
+                .contains("\"disabledMcpServers\":[\"local-files\",\"remote-github\"]"));
     }
 
     @Test
@@ -225,12 +251,13 @@ void testBuildCreateRequestForwardsExplicitMcpOAuthTokenStorage() {
     void testBuildCreateRequestForwardsSessionPolicyOptions() {
         var sessionLimits = new SessionLimitsConfig(30.0);
         var config = new SessionConfig().setExcludedBuiltInAgents(List.of("explore")).setEnableCitations(true)
-                .setSessionLimits(sessionLimits);
+                .setEnableFileChangeTracking(true).setSessionLimits(sessionLimits);
 
         CreateSessionRequest request = SessionRequestBuilder.buildCreateRequest(config, "session-policy");
 
         assertEquals(List.of("explore"), request.getExcludedBuiltInAgents());
         assertTrue(request.getEnableCitations());
+        assertTrue(request.getEnableFileChangeTracking());
         assertSame(sessionLimits, request.getSessionLimits());
     }
 
@@ -430,12 +457,13 @@ void testBuildResumeRequestForwardsExplicitMcpOAuthTokenStorage() {
     void testBuildResumeRequestForwardsSessionPolicyOptions() {
         var sessionLimits = new SessionLimitsConfig(30.0);
         var config = new ResumeSessionConfig().setExcludedBuiltInAgents(List.of("explore")).setEnableCitations(true)
-                .setSessionLimits(sessionLimits);
+                .setEnableFileChangeTracking(true).setSessionLimits(sessionLimits);
 
         ResumeSessionRequest request = SessionRequestBuilder.buildResumeRequest("sid-policy", config);
 
         assertEquals(List.of("explore"), request.getExcludedBuiltInAgents());
         assertTrue(request.getEnableCitations());
+        assertTrue(request.getEnableFileChangeTracking());
         assertSame(sessionLimits, request.getSessionLimits());
     }
 
@@ -460,13 +488,17 @@ void testBuildResumeRequestSetsContextTier() {
     }
 
     @Test
-    void testBuildResumeRequestSetsPluginDirectoriesAndLargeOutput() {
+    void testBuildResumeRequestSetsPluginDirectoriesAndLargeOutput() throws Exception {
         var largeOutput = new LargeToolOutputConfig().setEnabled(false).setMaxSizeBytes(2048L)
                 .setOutputDirectory("/tmp/resume");
-        var config = new ResumeSessionConfig().setPluginDirectories(List.of("/plugins/r")).setLargeOutput(largeOutput);
+        var config = new ResumeSessionConfig().setPluginDirectories(List.of("/plugins/r"))
+                .setDisabledMcpServers(List.of("local-files-r")).setLargeOutput(largeOutput);
         ResumeSessionRequest request = SessionRequestBuilder.buildResumeRequest("sid-16", config);
         assertEquals(List.of("/plugins/r"), request.getPluginDirectories());
+        assertEquals(List.of("local-files-r"), request.getDisabledMcpServers());
         assertEquals(largeOutput, request.getLargeOutput());
+        assertTrue(JsonRpcClient.getObjectMapper().writeValueAsString(request)
+                .contains("\"disabledMcpServers\":[\"local-files-r\"]"));
     }
 
     @Test
diff --git a/java/src/test/java/com/github/copilot/SessionTodosChangedTest.java b/java/sdk/src/test/java/com/github/copilot/SessionTodosChangedTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/SessionTodosChangedTest.java
rename to java/sdk/src/test/java/com/github/copilot/SessionTodosChangedTest.java
diff --git a/java/src/test/java/com/github/copilot/SkillsTest.java b/java/sdk/src/test/java/com/github/copilot/SkillsTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/SkillsTest.java
rename to java/sdk/src/test/java/com/github/copilot/SkillsTest.java
diff --git a/java/src/test/java/com/github/copilot/SlashCommandsIT.java b/java/sdk/src/test/java/com/github/copilot/SlashCommandsIT.java
similarity index 94%
rename from java/src/test/java/com/github/copilot/SlashCommandsIT.java
rename to java/sdk/src/test/java/com/github/copilot/SlashCommandsIT.java
index 634c0bad9b..998d533bb3 100644
--- a/java/src/test/java/com/github/copilot/SlashCommandsIT.java
+++ b/java/sdk/src/test/java/com/github/copilot/SlashCommandsIT.java
@@ -22,6 +22,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import com.github.copilot.e2e.SkipInProcess;
+
 import com.github.copilot.generated.rpc.SessionCommandsListResult;
 import com.github.copilot.generated.rpc.SessionCommandsInvokeParams;
 import com.github.copilot.generated.rpc.SlashCommandAgentPromptResult;
@@ -41,6 +43,7 @@
  * Requires the CLI to be installed and the user to be signed in. Uses
  * {@link TestUtil#findCliPath()} so the test harness binary is found in CI.
  */
+@SkipInProcess("Requires a live signed-in CLI subprocess and logged-in-user transport behavior rather than the replayed in-process harness")
 class SlashCommandsIT {
 
     private static CopilotClient client;
@@ -90,9 +93,9 @@ void listCommandsReturnsAtLeast20() throws Exception {
     @Test
     void autoPilotToggle() throws Exception {
         SlashCommandInvocationResult first = session.getRpc().commands
-                .invoke(new SessionCommandsInvokeParams(null, "autopilot", null)).get(15, TimeUnit.SECONDS);
+                .invoke(new SessionCommandsInvokeParams(null, "autopilot", null, null)).get(15, TimeUnit.SECONDS);
         SlashCommandInvocationResult second = session.getRpc().commands
-                .invoke(new SessionCommandsInvokeParams(null, "autopilot", null)).get(15, TimeUnit.SECONDS);
+                .invoke(new SessionCommandsInvokeParams(null, "autopilot", null, null)).get(15, TimeUnit.SECONDS);
 
         String firstOutput = extractDisplayText(first);
         String secondOutput = extractDisplayText(second);
@@ -125,7 +128,7 @@ void autoPilotToggle() throws Exception {
     @Test
     void listDirs() throws Exception {
         SlashCommandInvocationResult result = session.getRpc().commands
-                .invoke(new SessionCommandsInvokeParams(null, "list-dirs", null)).get(15, TimeUnit.SECONDS);
+                .invoke(new SessionCommandsInvokeParams(null, "list-dirs", null, null)).get(15, TimeUnit.SECONDS);
 
         String output = extractDisplayText(result);
         assertTrue(Pattern.compile("(?s)^.*Total: [0-9]+ directories.*$").matcher(output).matches(),
@@ -144,19 +147,20 @@ void addDir() throws Exception {
         String addDirPathString = addDirPath.toString();
 
         SlashCommandInvocationResult beforeListResult = session.getRpc().commands
-                .invoke(new SessionCommandsInvokeParams(null, "list-dirs", null)).get(15, TimeUnit.SECONDS);
+                .invoke(new SessionCommandsInvokeParams(null, "list-dirs", null, null)).get(15, TimeUnit.SECONDS);
         String beforeListOutput = extractDisplayText(beforeListResult);
         System.out.println("/list-dirs (before /add-dir) result:");
         System.out.println(beforeListOutput);
 
         SlashCommandInvocationResult addDirResult = session.getRpc().commands
-                .invoke(new SessionCommandsInvokeParams(null, "add-dir", addDirPathString)).get(15, TimeUnit.SECONDS);
+                .invoke(new SessionCommandsInvokeParams(null, "add-dir", addDirPathString, null))
+                .get(15, TimeUnit.SECONDS);
         String addDirOutput = extractDisplayText(addDirResult);
         System.out.println("/add-dir result:");
         System.out.println(addDirOutput);
 
         SlashCommandInvocationResult afterListResult = session.getRpc().commands
-                .invoke(new SessionCommandsInvokeParams(null, "list-dirs", null)).get(15, TimeUnit.SECONDS);
+                .invoke(new SessionCommandsInvokeParams(null, "list-dirs", null, null)).get(15, TimeUnit.SECONDS);
         String afterListOutput = extractDisplayText(afterListResult);
         System.out.println("/list-dirs (after /add-dir) result:");
         System.out.println(afterListOutput);
@@ -168,7 +172,7 @@ void addDir() throws Exception {
     @Test
     void usage() throws Exception {
         SlashCommandInvocationResult result = session.getRpc().commands
-                .invoke(new SessionCommandsInvokeParams(null, "usage", null)).get(15, TimeUnit.SECONDS);
+                .invoke(new SessionCommandsInvokeParams(null, "usage", null, null)).get(15, TimeUnit.SECONDS);
 
         String output = extractDisplayText(result);
         assertTrue(Pattern.compile("(?s)^.*Changes:.*$").matcher(output).matches(),
diff --git a/java/src/test/java/com/github/copilot/StreamingFidelityTest.java b/java/sdk/src/test/java/com/github/copilot/StreamingFidelityTest.java
similarity index 86%
rename from java/src/test/java/com/github/copilot/StreamingFidelityTest.java
rename to java/sdk/src/test/java/com/github/copilot/StreamingFidelityTest.java
index bc4999a16f..3701cf9c13 100644
--- a/java/src/test/java/com/github/copilot/StreamingFidelityTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/StreamingFidelityTest.java
@@ -249,33 +249,37 @@ void testShouldNotProduceDeltasAfterSessionResumeWithStreamingDisabled() throws
      */
     @Test
     void testShouldEmitStreamingDeltasWithReasoningEffortConfigured() throws Exception {
-        ctx.configureForTest("streaming_fidelity", "should_emit_streaming_deltas_with_reasoning_effort_configured");
+        try (E2ETestContext isolatedContext = E2ETestContext.create()) {
+            isolatedContext.configureForTest("streaming_fidelity",
+                    "should_emit_streaming_deltas_with_reasoning_effort_configured");
 
-        try (CopilotClient client = ctx.createClient()) {
-            CopilotSession session = client
-                    .createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
-                            .setModel("gpt-5.4").setStreaming(true).setReasoningEffort("high"))
-                    .get();
+            try (CopilotClient client = isolatedContext.createClient()) {
+                CopilotSession session = client
+                        .createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+                                .setModel("gpt-5.4").setStreaming(true).setReasoningEffort("high"))
+                        .get();
 
-            List<SessionEvent> events = new ArrayList<>();
-            session.on(events::add);
+                List<SessionEvent> events = new ArrayList<>();
+                session.on(events::add);
 
-            session.sendAndWait(new MessageOptions().setPrompt("What is 15 * 17?")).get(60, TimeUnit.SECONDS);
+                session.sendAndWait(new MessageOptions().setPrompt("What is 15 * 17?")).get(60, TimeUnit.SECONDS);
 
-            // With streaming + reasoning effort, we should still get content deltas
-            List<AssistantMessageDeltaEvent> deltaEvents = events.stream()
-                    .filter(e -> e instanceof AssistantMessageDeltaEvent).map(e -> (AssistantMessageDeltaEvent) e)
-                    .toList();
-            assertFalse(deltaEvents.isEmpty(), "Should have received delta events with reasoning effort configured");
+                // With streaming + reasoning effort, we should still get content deltas
+                List<AssistantMessageDeltaEvent> deltaEvents = events.stream()
+                        .filter(e -> e instanceof AssistantMessageDeltaEvent).map(e -> (AssistantMessageDeltaEvent) e)
+                        .toList();
+                assertFalse(deltaEvents.isEmpty(),
+                        "Should have received delta events with reasoning effort configured");
 
-            // And a final assistant.message with the answer
-            List<AssistantMessageEvent> assistantEvents = events.stream()
-                    .filter(e -> e instanceof AssistantMessageEvent).map(e -> (AssistantMessageEvent) e).toList();
-            assertFalse(assistantEvents.isEmpty(), "Should have received assistant message events");
-            assertTrue(assistantEvents.get(assistantEvents.size() - 1).getData().content().contains("255"),
-                    "Response should contain 255");
+                // And a final assistant.message with the answer
+                List<AssistantMessageEvent> assistantEvents = events.stream()
+                        .filter(e -> e instanceof AssistantMessageEvent).map(e -> (AssistantMessageEvent) e).toList();
+                assertFalse(assistantEvents.isEmpty(), "Should have received assistant message events");
+                assertTrue(assistantEvents.get(assistantEvents.size() - 1).getData().content().contains("255"),
+                        "Response should contain 255");
 
-            session.close();
+                session.close();
+            }
         }
     }
 }
diff --git a/java/src/test/java/com/github/copilot/SubagentHooksE2ETest.java b/java/sdk/src/test/java/com/github/copilot/SubagentHooksE2ETest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/SubagentHooksE2ETest.java
rename to java/sdk/src/test/java/com/github/copilot/SubagentHooksE2ETest.java
diff --git a/java/src/test/java/com/github/copilot/SystemMessageSectionsIT.java b/java/sdk/src/test/java/com/github/copilot/SystemMessageSectionsIT.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/SystemMessageSectionsIT.java
rename to java/sdk/src/test/java/com/github/copilot/SystemMessageSectionsIT.java
diff --git a/java/src/test/java/com/github/copilot/TelemetryConfigTest.java b/java/sdk/src/test/java/com/github/copilot/TelemetryConfigTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/TelemetryConfigTest.java
rename to java/sdk/src/test/java/com/github/copilot/TelemetryConfigTest.java
diff --git a/java/sdk/src/test/java/com/github/copilot/TestProcess.java b/java/sdk/src/test/java/com/github/copilot/TestProcess.java
new file mode 100644
index 0000000000..f7187ae676
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/TestProcess.java
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+final class TestProcess extends Process {
+
+    private final CountDownLatch terminated = new CountDownLatch(1);
+
+    @Override
+    public OutputStream getOutputStream() {
+        return OutputStream.nullOutputStream();
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        return InputStream.nullInputStream();
+    }
+
+    @Override
+    public InputStream getErrorStream() {
+        return InputStream.nullInputStream();
+    }
+
+    @Override
+    public int waitFor() throws InterruptedException {
+        terminated.await();
+        return 0;
+    }
+
+    @Override
+    public boolean waitFor(long timeout, TimeUnit unit) throws InterruptedException {
+        return terminated.await(timeout, unit);
+    }
+
+    @Override
+    public int exitValue() {
+        if (isAlive()) {
+            throw new IllegalThreadStateException("Process has not exited");
+        }
+        return 0;
+    }
+
+    @Override
+    public void destroy() {
+        terminated.countDown();
+    }
+
+    @Override
+    public Process destroyForcibly() {
+        destroy();
+        return this;
+    }
+
+    @Override
+    public boolean isAlive() {
+        return terminated.getCount() > 0;
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/TestUtil.java b/java/sdk/src/test/java/com/github/copilot/TestUtil.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/TestUtil.java
rename to java/sdk/src/test/java/com/github/copilot/TestUtil.java
diff --git a/java/src/test/java/com/github/copilot/TimeoutEdgeCaseTest.java b/java/sdk/src/test/java/com/github/copilot/TimeoutEdgeCaseTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/TimeoutEdgeCaseTest.java
rename to java/sdk/src/test/java/com/github/copilot/TimeoutEdgeCaseTest.java
diff --git a/java/src/test/java/com/github/copilot/ToolDefinitionTest.java b/java/sdk/src/test/java/com/github/copilot/ToolDefinitionTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ToolDefinitionTest.java
rename to java/sdk/src/test/java/com/github/copilot/ToolDefinitionTest.java
diff --git a/java/src/test/java/com/github/copilot/ToolInvocationTest.java b/java/sdk/src/test/java/com/github/copilot/ToolInvocationTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ToolInvocationTest.java
rename to java/sdk/src/test/java/com/github/copilot/ToolInvocationTest.java
diff --git a/java/src/test/java/com/github/copilot/ToolResultObjectSerializationTest.java b/java/sdk/src/test/java/com/github/copilot/ToolResultObjectSerializationTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ToolResultObjectSerializationTest.java
rename to java/sdk/src/test/java/com/github/copilot/ToolResultObjectSerializationTest.java
diff --git a/java/src/test/java/com/github/copilot/ToolResultsTest.java b/java/sdk/src/test/java/com/github/copilot/ToolResultsTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ToolResultsTest.java
rename to java/sdk/src/test/java/com/github/copilot/ToolResultsTest.java
diff --git a/java/src/test/java/com/github/copilot/ToolSetTest.java b/java/sdk/src/test/java/com/github/copilot/ToolSetTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ToolSetTest.java
rename to java/sdk/src/test/java/com/github/copilot/ToolSetTest.java
diff --git a/java/src/test/java/com/github/copilot/ToolsTest.java b/java/sdk/src/test/java/com/github/copilot/ToolsTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ToolsTest.java
rename to java/sdk/src/test/java/com/github/copilot/ToolsTest.java
diff --git a/java/src/test/java/com/github/copilot/UpdateSessionOptionsForModeTest.java b/java/sdk/src/test/java/com/github/copilot/UpdateSessionOptionsForModeTest.java
similarity index 88%
rename from java/src/test/java/com/github/copilot/UpdateSessionOptionsForModeTest.java
rename to java/sdk/src/test/java/com/github/copilot/UpdateSessionOptionsForModeTest.java
index d02ea3097d..24b4257a52 100644
--- a/java/src/test/java/com/github/copilot/UpdateSessionOptionsForModeTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/UpdateSessionOptionsForModeTest.java
@@ -10,6 +10,7 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
@@ -144,6 +145,8 @@ void copilotCliMode_skipCustomInstructionsSet_patchContainsOnlyThatField() throw
             assertTrue(pair.lastParams.path("manageScheduleEnabled").isMissingNode(),
                     "manageScheduleEnabled should be absent");
             assertTrue(pair.lastParams.path("installedPlugins").isMissingNode(), "installedPlugins should be absent");
+            assertTrue(pair.lastParams.path("includedBuiltinSkills").isMissingNode(),
+                    "includedBuiltinSkills should be absent in COPILOT_CLI mode");
             client.close();
         }
     }
@@ -154,13 +157,14 @@ void copilotCliMode_allFieldsSet_allPropagated() throws Exception {
             var session = new CopilotSession("sess-1", pair.rpcClient);
             var client = new CopilotClient(new CopilotClientOptions().setAutoStart(false));
 
-            client.updateSessionOptionsForMode(session, false, true, true, false).get();
+            client.updateSessionOptionsForMode(session, false, true, true, false, List.of("code-review")).get();
 
             assertEquals("session.options.update", pair.lastMethod);
             assertFalse(pair.lastParams.get("skipCustomInstructions").asBoolean());
             assertTrue(pair.lastParams.get("customAgentsLocalOnly").asBoolean());
             assertTrue(pair.lastParams.get("coauthorEnabled").asBoolean());
             assertFalse(pair.lastParams.get("manageScheduleEnabled").asBoolean());
+            assertEquals("code-review", pair.lastParams.get("includedBuiltinSkills").get(0).asText());
             client.close();
         }
     }
@@ -197,6 +201,9 @@ void emptyMode_noFieldsSet_safeDefaultsSent() throws Exception {
             assertFalse(pair.lastParams.get("manageScheduleEnabled").asBoolean(), "default: schedule disabled");
             assertTrue(pair.lastParams.get("installedPlugins").isArray(), "installedPlugins should be empty array");
             assertEquals(0, pair.lastParams.get("installedPlugins").size());
+            assertTrue(pair.lastParams.get("includedBuiltinSkills").isArray(),
+                    "includedBuiltinSkills should be empty array");
+            assertEquals(0, pair.lastParams.get("includedBuiltinSkills").size());
             client.close();
         }
     }
@@ -218,6 +225,25 @@ void emptyMode_callerOverridesWin() throws Exception {
             assertTrue(pair.lastParams.get("installedPlugins").isArray(),
                     "installedPlugins always empty in EMPTY mode");
             assertEquals(0, pair.lastParams.get("installedPlugins").size());
+            assertTrue(pair.lastParams.get("includedBuiltinSkills").isArray(),
+                    "includedBuiltinSkills always empty in EMPTY mode");
+            assertEquals(0, pair.lastParams.get("includedBuiltinSkills").size());
+            client.close();
+        }
+    }
+
+    @Test
+    void emptyMode_explicitBuiltinSkillAllowlistWins() throws Exception {
+        try (var pair = new AutoReplyPair()) {
+            var session = new CopilotSession("sess-1", pair.rpcClient);
+            var client = new CopilotClient(new CopilotClientOptions().setMode(CopilotClientMode.EMPTY)
+                    .setCopilotHome("/tmp/copilot-home").setAutoStart(false));
+
+            client.updateSessionOptionsForMode(session, null, null, null, null, List.of("code-review")).get();
+
+            assertEquals("session.options.update", pair.lastMethod);
+            assertEquals(1, pair.lastParams.get("includedBuiltinSkills").size());
+            assertEquals("code-review", pair.lastParams.get("includedBuiltinSkills").get(0).asText());
             client.close();
         }
     }
diff --git a/java/src/test/java/com/github/copilot/ZeroTimeoutContractTest.java b/java/sdk/src/test/java/com/github/copilot/ZeroTimeoutContractTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/ZeroTimeoutContractTest.java
rename to java/sdk/src/test/java/com/github/copilot/ZeroTimeoutContractTest.java
diff --git a/java/src/test/java/com/github/copilot/e2e/ErgonomicTestTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/e2e/ErgonomicTestTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/e2e/ErgonomicTestTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/e2e/ErgonomicTestTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/e2e/ErgonomicTestTools.java b/java/sdk/src/test/java/com/github/copilot/e2e/ErgonomicTestTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/e2e/ErgonomicTestTools.java
rename to java/sdk/src/test/java/com/github/copilot/e2e/ErgonomicTestTools.java
diff --git a/java/src/test/java/com/github/copilot/e2e/ErgonomicToolDefinitionIT.java b/java/sdk/src/test/java/com/github/copilot/e2e/ErgonomicToolDefinitionIT.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/e2e/ErgonomicToolDefinitionIT.java
rename to java/sdk/src/test/java/com/github/copilot/e2e/ErgonomicToolDefinitionIT.java
diff --git a/java/sdk/src/test/java/com/github/copilot/e2e/InProcessTransportIT.java b/java/sdk/src/test/java/com/github/copilot/e2e/InProcessTransportIT.java
new file mode 100644
index 0000000000..23408faa2a
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/e2e/InProcessTransportIT.java
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.e2e;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.github.copilot.AllowCopilotExperimental;
+import com.github.copilot.CopilotClient;
+import com.github.copilot.CopilotSession;
+import com.github.copilot.E2ETestContext;
+import com.github.copilot.ffi.InProcessEnvGuard;
+import com.github.copilot.generated.AssistantMessageEvent;
+import com.github.copilot.generated.SessionIdleEvent;
+import com.github.copilot.rpc.CopilotClientOptions;
+import com.github.copilot.rpc.MessageOptions;
+import com.github.copilot.rpc.PermissionHandler;
+import com.github.copilot.rpc.PingResponse;
+import com.github.copilot.rpc.RuntimeConnection;
+import com.github.copilot.rpc.SessionConfig;
+
+/**
+ * Failsafe integration test for the in-process (FFI) transport.
+ *
+ * <p>
+ * Loads the real {@code runtime.node} native library into this test process via
+ * {@link com.github.copilot.ffi.FfiRuntimeHost}. Coverage includes both a
+ * purely local {@code ping} round-trip and a replay-backed session turn that
+ * exercises authentication, tool initialization, model traffic, and
+ * asynchronous session event delivery over the FFI transport.
+ *
+ * <p>
+ * {@link InProcessEnvGuard} demonstrates how the harness redirects the native
+ * runtime's HTTP traffic to the replay proxy (via {@code COPILOT_API_URL}) for
+ * tests that need session/message round trips over the in-process transport:
+ * the native library reads environment variables from the live OS process
+ * environment block, not from the JVM's {@code System.getenv()} snapshot, so
+ * only a JNA-backed native call can make it visible to code already loaded
+ * in-process.
+ *
+ * <p>
+ * Run with {@code mvn verify -Pinprocess} from the {@code java} reactor root,
+ * which builds the {@code copilot-sdk-java-runtime} artifact and sets
+ * {@code COPILOT_CLI_PATH} to the pinned CLI whose sibling {@code runtime.node}
+ * this test loads, and forces {@code forkCount=1} because the FFI host and env
+ * guard mutate process-global state.
+ *
+ * <p>
+ * {@link RequireInProcess} disables this test unless the {@code -Pinprocess}
+ * profile is active: without it, the {@code copilot-sdk-java-runtime}
+ * classifier JAR providing {@code runtime.node} is not on the classpath, so the
+ * test would fail with a {@code FileNotFoundException} rather than being
+ * skipped.
+ */
+@AllowCopilotExperimental
+@RequireInProcess
+class InProcessTransportIT {
+
+    private static E2ETestContext ctx;
+
+    @BeforeAll
+    static void setup() throws Exception {
+        ctx = E2ETestContext.create();
+    }
+
+    @AfterAll
+    static void teardown() throws Exception {
+        if (ctx != null) {
+            ctx.close();
+        }
+    }
+
+    @Test
+    void shouldStartPingAndStopOverInProcessFfi() throws Exception {
+        // Route the native runtime's HTTP traffic (should it make any) at the
+        // replay proxy, mirroring how a session-level in-process test would
+        // redirect COPILOT_API_URL. `ping` never reaches the network, but this
+        // demonstrates the guard's intended usage for future in-process tests.
+        // COPILOT_CLI_PATH is intentionally NOT set here: NativeRuntimeLoader and
+        // CopilotClient.resolveInProcessEntrypoint() read it via
+        // System.getenv(), which is a JVM-startup-time snapshot that native
+        // setenv() calls made after the JVM starts cannot update — it must be
+        // set before the JVM starts (see the -Pinprocess Maven profile).
+        try (InProcessEnvGuard envGuard = new InProcessEnvGuard(Map.of("COPILOT_API_URL", ctx.getProxyUrl()))) {
+            CopilotClientOptions options = new CopilotClientOptions().setConnection(RuntimeConnection.forInProcess());
+            try (CopilotClient client = new CopilotClient(options)) {
+                client.start().get();
+
+                PingResponse pong = client.ping("ffi message").get();
+                assertEquals("pong: ffi message", pong.message());
+                assertNotNull(pong.timestamp());
+
+                client.stop().get();
+            }
+        }
+    }
+
+    @Test
+    void shouldCreateSessionAndCompleteTurnOverInProcessFfi() throws Exception {
+        ctx.configureForTest("session", "should_receive_session_events");
+
+        try (CopilotClient client = ctx.createClient();
+                CopilotSession session = client
+                        .createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL))
+                        .get(30, TimeUnit.SECONDS)) {
+            var idleReceived = new CompletableFuture<SessionIdleEvent>();
+            session.on(SessionIdleEvent.class, idleReceived::complete);
+
+            AssistantMessageEvent response = session.sendAndWait(new MessageOptions().setPrompt("What is 100+200?"))
+                    .get(60, TimeUnit.SECONDS);
+
+            assertNotNull(response);
+            assertEquals("100 + 200 = 300", response.getData().content());
+            assertNotNull(idleReceived.get(5, TimeUnit.SECONDS));
+        }
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/e2e/RequireInProcess.java b/java/sdk/src/test/java/com/github/copilot/e2e/RequireInProcess.java
new file mode 100644
index 0000000000..12de4e5b73
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/e2e/RequireInProcess.java
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.e2e;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Enables an annotated test class or method only when the E2E suite runs under
+ * the in-process (FFI) transport, i.e. when
+ * {@code COPILOT_SDK_DEFAULT_CONNECTION} is set to {@code inprocess}.
+ *
+ * <p>
+ * Use this for tests that require the real {@code runtime.node} native library
+ * to be present on the classpath, which only the {@code -Pinprocess} Maven
+ * profile guarantees (see {@link InProcessTransportIT}). Without this profile,
+ * standard {@code mvn verify} runs would fail with a
+ * {@code FileNotFoundException} because the classifier JAR providing
+ * {@code runtime.node} is not on the classpath.
+ * </p>
+ *
+ * <p>
+ * The inverse of {@link SkipInProcess}.
+ * </p>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@ExtendWith(RequireInProcess.Condition.class)
+public @interface RequireInProcess {
+
+    /**
+     * Explains why the annotated test requires the in-process transport.
+     *
+     * @return the skip reason used when the in-process transport is not active
+     */
+    String value() default "Requires the -Pinprocess Maven profile";
+
+    /**
+     * JUnit 5 execution condition backing {@link RequireInProcess}.
+     */
+    public static final class Condition implements org.junit.jupiter.api.extension.ExecutionCondition {
+
+        private static final String DEFAULT_CONNECTION_ENV_VAR = "COPILOT_SDK_DEFAULT_CONNECTION";
+
+        @Override
+        public org.junit.jupiter.api.extension.ConditionEvaluationResult evaluateExecutionCondition(
+                org.junit.jupiter.api.extension.ExtensionContext context) {
+            String envValue = System.getenv(DEFAULT_CONNECTION_ENV_VAR);
+            if ("inprocess".equalsIgnoreCase(envValue)) {
+                return org.junit.jupiter.api.extension.ConditionEvaluationResult
+                        .enabled("Running under the in-process transport");
+            }
+            String reason = context.getElement().map(element -> element.getAnnotation(RequireInProcess.class))
+                    .map(RequireInProcess::value).orElse("Requires the -Pinprocess Maven profile");
+            return org.junit.jupiter.api.extension.ConditionEvaluationResult.disabled(reason);
+        }
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/e2e/RewindIT.java b/java/sdk/src/test/java/com/github/copilot/e2e/RewindIT.java
new file mode 100644
index 0000000000..9598aac6f4
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/e2e/RewindIT.java
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.e2e;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.github.copilot.AllowCopilotExperimental;
+import com.github.copilot.CopilotClient;
+import com.github.copilot.CopilotSession;
+import com.github.copilot.E2ETestContext;
+import com.github.copilot.generated.AssistantMessageEvent;
+import com.github.copilot.generated.rpc.HistoryRewindMode;
+import com.github.copilot.generated.rpc.HistoryRewindOutcome;
+import com.github.copilot.generated.rpc.SessionHistoryListRewindPointsResult;
+import com.github.copilot.generated.rpc.SessionHistoryPreviewRewindParams;
+import com.github.copilot.generated.rpc.SessionHistoryRewindParams;
+import com.github.copilot.rpc.MessageOptions;
+import com.github.copilot.rpc.PermissionHandler;
+import com.github.copilot.rpc.SessionConfig;
+
+@AllowCopilotExperimental
+class RewindIT {
+
+    private static final String FILE_NAME = "rewind-sdk.txt";
+    private static final String FILE_CONTENT = "SDK rewind content";
+
+    private static E2ETestContext ctx;
+
+    @BeforeAll
+    static void setup() throws Exception {
+        ctx = E2ETestContext.create();
+    }
+
+    @AfterAll
+    static void teardown() throws Exception {
+        if (ctx != null) {
+            ctx.close();
+        }
+    }
+
+    @Test
+    void shouldRestoreTrackedFileAndConversation() throws Exception {
+        ctx.configureForTest("rewind", "should_restore_tracked_file_and_conversation");
+        Path filePath = ctx.getWorkDir().resolve(FILE_NAME);
+
+        try (CopilotClient client = ctx.createClient();
+                CopilotSession session = client
+                        .createSession(
+                                new SessionConfig().setModel("claude-sonnet-4.5").setEnableFileChangeTracking(true)
+                                        .setOnPermissionRequest(PermissionHandler.APPROVE_ALL))
+                        .get(30, TimeUnit.SECONDS)) {
+            AssistantMessageEvent response = session
+                    .sendAndWait(new MessageOptions().setPrompt(
+                            "Use the create tool to create " + FILE_NAME + " containing exactly " + FILE_CONTENT
+                                    + ". After the tool succeeds, reply with exactly SDK_REWIND_DONE."),
+                            30_000)
+                    .get(60, TimeUnit.SECONDS);
+
+            assertNotNull(response);
+            assertEquals("SDK_REWIND_DONE", response.getData().content());
+            assertEquals(FILE_CONTENT, Files.readString(filePath));
+
+            SessionHistoryListRewindPointsResult rewindPoints = waitForRewindPoints(session);
+            assertTrue(Boolean.TRUE.equals(rewindPoints.fileChangeTrackingEnabled()));
+            assertEquals(1, rewindPoints.points().size());
+            var rewindPoint = rewindPoints.points().get(0);
+            assertTrue(Boolean.TRUE.equals(rewindPoint.canRestoreFiles()));
+            assertEquals(1L, rewindPoint.fileCount());
+
+            var preview = session.getRpc().history
+                    .previewRewind(new SessionHistoryPreviewRewindParams(null, rewindPoint.eventId()))
+                    .get(10, TimeUnit.SECONDS);
+            assertTrue(Boolean.TRUE.equals(preview.available()));
+            assertEquals(1, preview.files().size());
+            assertSamePath(filePath, preview.files().get(0).path());
+
+            var rewind = session.getRpc().history.rewind(new SessionHistoryRewindParams(null, rewindPoint.eventId(),
+                    HistoryRewindMode.CONVERSATION_AND_FILES)).get(10, TimeUnit.SECONDS);
+            assertEquals(HistoryRewindOutcome.SUCCESS, rewind.outcome());
+            assertTrue(rewind.eventsRemoved() != null && rewind.eventsRemoved() > 0);
+            assertEquals(1, rewind.restoredFiles().size());
+            assertSamePath(filePath, rewind.restoredFiles().get(0));
+            assertFalse(Files.exists(filePath));
+
+            var events = session.getMessages().get(10, TimeUnit.SECONDS);
+            assertTrue(events.stream().noneMatch(event -> event.getId().toString().equals(rewindPoint.eventId())));
+        }
+    }
+
+    private static SessionHistoryListRewindPointsResult waitForRewindPoints(CopilotSession session) throws Exception {
+        long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(10);
+        SessionHistoryListRewindPointsResult result;
+        do {
+            result = session.getRpc().history.listRewindPoints().get(10, TimeUnit.SECONDS);
+            if (result.unavailableReason() == null && !result.points().isEmpty()
+                    && Boolean.TRUE.equals(result.points().get(0).canRestoreFiles())) {
+                return result;
+            }
+            TimeUnit.MILLISECONDS.sleep(100);
+        } while (System.nanoTime() < deadline);
+
+        assertNull(result.unavailableReason(), "Timed out waiting for rewind points to become available");
+        assertFalse(result.points().isEmpty(), "Timed out waiting for a rewind point");
+        assertTrue(Boolean.TRUE.equals(result.points().get(0).canRestoreFiles()),
+                "Timed out waiting for rewind file restoration to become available");
+        return result;
+    }
+
+    private static void assertSamePath(Path expected, String actual) {
+        String expectedPath = expected.toAbsolutePath().normalize().toString();
+        String actualPath = Path.of(actual).toAbsolutePath().normalize().toString();
+        if (System.getProperty("os.name").startsWith("Windows")) {
+            assertTrue(expectedPath.equalsIgnoreCase(actualPath));
+        } else {
+            assertEquals(expectedPath, actualPath);
+        }
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/e2e/SkipInProcess.java b/java/sdk/src/test/java/com/github/copilot/e2e/SkipInProcess.java
new file mode 100644
index 0000000000..3f626e133f
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/e2e/SkipInProcess.java
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.e2e;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Disables an annotated test class or method when the E2E suite runs under the
+ * in-process (FFI) transport, i.e. when {@code COPILOT_SDK_DEFAULT_CONNECTION}
+ * is set to {@code inprocess}.
+ *
+ * <p>
+ * Use this for tests that rely on per-client process settings the in-process
+ * transport cannot honor — for example per-client environment variables, since
+ * the in-process runtime shares the host process's single environment (see
+ * {@link com.github.copilot.rpc.InProcessRuntimeConnection} and
+ * <a href="https://github.com/github/copilot-sdk/issues/1934">issue #1934</a>).
+ * </p>
+ *
+ * <p>
+ * Mirrors {@code skip_inprocess(reason)} in the Rust E2E harness.
+ * </p>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@ExtendWith(SkipInProcess.Condition.class)
+public @interface SkipInProcess {
+
+    /**
+     * Explains why the annotated test is incompatible with the in-process
+     * transport.
+     *
+     * @return the skip reason
+     */
+    String value() default "Not supported under the in-process (FFI) transport";
+
+    /**
+     * JUnit 5 execution condition backing {@link SkipInProcess}.
+     */
+    public static final class Condition implements org.junit.jupiter.api.extension.ExecutionCondition {
+
+        private static final String DEFAULT_CONNECTION_ENV_VAR = "COPILOT_SDK_DEFAULT_CONNECTION";
+
+        @Override
+        public org.junit.jupiter.api.extension.ConditionEvaluationResult evaluateExecutionCondition(
+                org.junit.jupiter.api.extension.ExtensionContext context) {
+            String envValue = System.getenv(DEFAULT_CONNECTION_ENV_VAR);
+            if (!"inprocess".equalsIgnoreCase(envValue)) {
+                return org.junit.jupiter.api.extension.ConditionEvaluationResult
+                        .enabled("Not running under the in-process transport");
+            }
+            String reason = context.getElement().map(element -> element.getAnnotation(SkipInProcess.class))
+                    .map(SkipInProcess::value).orElse("Not supported under the in-process (FFI) transport");
+            return org.junit.jupiter.api.extension.ConditionEvaluationResult.disabled(reason);
+        }
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/ffi/FfiRuntimeHostTest.java b/java/sdk/src/test/java/com/github/copilot/ffi/FfiRuntimeHostTest.java
new file mode 100644
index 0000000000..cc98d24f6b
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ffi/FfiRuntimeHostTest.java
@@ -0,0 +1,362 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.copilot.rpc.CopilotClientMode;
+import com.github.copilot.rpc.CopilotClientOptions;
+import com.sun.jna.Memory;
+import com.sun.jna.Pointer;
+
+class FfiRuntimeHostTest {
+
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    @Test
+    void startBuildsExpectedArgvAndEnvJson() throws Exception {
+        class RecordingBinding implements NativeBinding {
+            byte[] argv;
+            byte[] env;
+
+            @Override
+            public int hostStart(byte[] argvJson, int argvJsonLen, byte[] envJson, int envJsonLen) {
+                this.argv = argvJson;
+                this.env = envJson;
+                return 11;
+            }
+
+            @Override
+            public boolean hostShutdown(int serverId) {
+                return true;
+            }
+
+            @Override
+            public int connectionOpen(int serverId, OutboundCallback callback, Pointer userData, byte[] extSource,
+                    int extSourceLen, byte[] extName, int extNameLen, byte[] connToken, int connTokenLen) {
+                return 21;
+            }
+
+            @Override
+            public boolean connectionWrite(int connectionId, byte[] data, int dataLen) {
+                return true;
+            }
+
+            @Override
+            public boolean connectionClose(int connectionId) {
+                return true;
+            }
+        }
+
+        RecordingBinding binding = new RecordingBinding();
+        CopilotClientOptions options = new CopilotClientOptions().setLogLevel("debug").setGitHubToken("gh-token")
+                .setCopilotHome("/tmp/copilot-home").setUseLoggedInUser(false).setSessionIdleTimeoutSeconds(42)
+                .setRemote(true).setMode(CopilotClientMode.EMPTY).setCliArgs(new String[]{"--extra-flag"});
+
+        FfiRuntimeHost host = new FfiRuntimeHost(binding, "/tmp/runtime.node");
+        host.start("/tmp/entrypoint.js", options);
+
+        List<String> argv = MAPPER.readValue(binding.argv, new TypeReference<List<String>>() {
+        });
+        assertEquals("node", argv.get(0));
+        assertEquals("/tmp/entrypoint.js", argv.get(1));
+        assertTrue(argv.contains("--embedded-host"));
+        assertTrue(argv.contains("--no-auto-update"));
+        assertTrue(argv.contains("--auth-token-env"));
+        assertTrue(argv.contains("COPILOT_SDK_AUTH_TOKEN"));
+        assertTrue(argv.contains("--no-auto-login"));
+        assertTrue(argv.contains("--session-idle-timeout"));
+        assertTrue(argv.contains("42"));
+        assertTrue(argv.contains("--remote"));
+        assertTrue(argv.contains("--extra-flag"));
+
+        Map<String, String> env = MAPPER.readValue(binding.env, new TypeReference<Map<String, String>>() {
+        });
+        assertEquals("gh-token", env.get("COPILOT_SDK_AUTH_TOKEN"));
+        assertEquals("/tmp/copilot-home", env.get("COPILOT_HOME"));
+        assertEquals("1", env.get("COPILOT_DISABLE_KEYTAR"));
+    }
+
+    @Test
+    void callbackExceptionIsContainedAndDoesNotEscapeAcrossFfiBoundary() {
+        AtomicBoolean callbackReturned = new AtomicBoolean(false);
+        NativeBinding binding = new NativeBinding() {
+            @Override
+            public int hostStart(byte[] argvJson, int argvJsonLen, byte[] envJson, int envJsonLen) {
+                return 1;
+            }
+
+            @Override
+            public boolean hostShutdown(int serverId) {
+                return true;
+            }
+
+            @Override
+            public int connectionOpen(int serverId, OutboundCallback callback, Pointer userData, byte[] extSource,
+                    int extSourceLen, byte[] extName, int extNameLen, byte[] connToken, int connTokenLen) {
+                Memory mem = new Memory(5);
+                mem.write(0, "hello".getBytes(StandardCharsets.UTF_8), 0, 5);
+                callback.invoke(Pointer.NULL, mem, new SizeT(5));
+                callbackReturned.set(true);
+                return 2;
+            }
+
+            @Override
+            public boolean connectionWrite(int connectionId, byte[] data, int dataLen) {
+                return true;
+            }
+
+            @Override
+            public boolean connectionClose(int connectionId) {
+                return true;
+            }
+        };
+
+        QueueInputStream throwingStream = new QueueInputStream() {
+            @Override
+            void enqueue(byte[] bytes) {
+                throw new RuntimeException("boom");
+            }
+        };
+
+        FfiRuntimeHost host = new FfiRuntimeHost(binding, "test-lib", throwingStream);
+        assertDoesNotThrow(() -> host.start("/tmp/entrypoint", new CopilotClientOptions()));
+        assertTrue(callbackReturned.get(), "callback should return normally even when enqueue throws");
+    }
+
+    @Test
+    void closeNeverThrowsEvenWhenNativeCloseFails() {
+        NativeBinding binding = new NativeBinding() {
+            @Override
+            public int hostStart(byte[] argvJson, int argvJsonLen, byte[] envJson, int envJsonLen) {
+                return 5;
+            }
+
+            @Override
+            public boolean hostShutdown(int serverId) {
+                throw new RuntimeException("shutdown failed");
+            }
+
+            @Override
+            public int connectionOpen(int serverId, OutboundCallback callback, Pointer userData, byte[] extSource,
+                    int extSourceLen, byte[] extName, int extNameLen, byte[] connToken, int connTokenLen) {
+                return 9;
+            }
+
+            @Override
+            public boolean connectionWrite(int connectionId, byte[] data, int dataLen) {
+                return true;
+            }
+
+            @Override
+            public boolean connectionClose(int connectionId) {
+                throw new RuntimeException("close failed");
+            }
+        };
+
+        FfiRuntimeHost host = new FfiRuntimeHost(binding, "test-lib");
+        host.start("/tmp/entrypoint", new CopilotClientOptions());
+        assertDoesNotThrow(host::close);
+    }
+
+    @Test
+    void failedConnectionOpenReleasesHostForSequentialStartup() {
+        AtomicInteger starts = new AtomicInteger();
+        AtomicInteger shutdowns = new AtomicInteger();
+        NativeBinding binding = new NativeBinding() {
+            @Override
+            public int hostStart(byte[] argvJson, int argvJsonLen, byte[] envJson, int envJsonLen) {
+                return starts.incrementAndGet();
+            }
+
+            @Override
+            public boolean hostShutdown(int serverId) {
+                shutdowns.incrementAndGet();
+                return true;
+            }
+
+            @Override
+            public int connectionOpen(int serverId, OutboundCallback callback, Pointer userData, byte[] extSource,
+                    int extSourceLen, byte[] extName, int extNameLen, byte[] connToken, int connTokenLen) {
+                return serverId == 1 ? 0 : 22;
+            }
+
+            @Override
+            public boolean connectionWrite(int connectionId, byte[] data, int dataLen) {
+                return true;
+            }
+
+            @Override
+            public boolean connectionClose(int connectionId) {
+                return true;
+            }
+        };
+
+        try (FfiRuntimeHost failedHost = new FfiRuntimeHost(binding, "test-lib")) {
+            assertThrows(IllegalStateException.class,
+                    () -> failedHost.start("/tmp/entrypoint", new CopilotClientOptions()));
+        }
+        assertEquals(1, shutdowns.get(), "failed connection startup must release its native host");
+
+        try (FfiRuntimeHost nextHost = new FfiRuntimeHost(binding, "test-lib")) {
+            assertDoesNotThrow(() -> nextHost.start("/tmp/entrypoint", new CopilotClientOptions()));
+        }
+        assertEquals(2, shutdowns.get(), "the sequential host must also shut down cleanly");
+    }
+
+    @Test
+    void writeAndCloseAreSerializedByOperationLock() throws Exception {
+        CountDownLatch writeStarted = new CountDownLatch(1);
+        CountDownLatch allowWriteToFinish = new CountDownLatch(1);
+        AtomicInteger writes = new AtomicInteger(0);
+
+        NativeBinding binding = new NativeBinding() {
+            @Override
+            public int hostStart(byte[] argvJson, int argvJsonLen, byte[] envJson, int envJsonLen) {
+                return 3;
+            }
+
+            @Override
+            public boolean hostShutdown(int serverId) {
+                return true;
+            }
+
+            @Override
+            public int connectionOpen(int serverId, OutboundCallback callback, Pointer userData, byte[] extSource,
+                    int extSourceLen, byte[] extName, int extNameLen, byte[] connToken, int connTokenLen) {
+                return 4;
+            }
+
+            @Override
+            public boolean connectionWrite(int connectionId, byte[] data, int dataLen) {
+                writes.incrementAndGet();
+                writeStarted.countDown();
+                try {
+                    allowWriteToFinish.await(5, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+                return true;
+            }
+
+            @Override
+            public boolean connectionClose(int connectionId) {
+                return true;
+            }
+        };
+
+        FfiRuntimeHost host = new FfiRuntimeHost(binding, "test-lib");
+        host.start("/tmp/entrypoint", new CopilotClientOptions());
+
+        CompletableFuture<Void> writer = CompletableFuture.runAsync(() -> {
+            try {
+                host.getSendStream().write("ping".getBytes(StandardCharsets.UTF_8));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        assertTrue(writeStarted.await(2, TimeUnit.SECONDS));
+        CompletableFuture<Void> closer = CompletableFuture.runAsync(host::close);
+        allowWriteToFinish.countDown();
+
+        writer.get(5, TimeUnit.SECONDS);
+        closer.get(5, TimeUnit.SECONDS);
+        assertEquals(1, writes.get());
+        assertThrows(IOException.class, () -> host.getSendStream().write("late".getBytes(StandardCharsets.UTF_8)));
+    }
+
+    @Test
+    void closeDrainsActiveCallbacksBeforeHostShutdown() throws Exception {
+        CountDownLatch callbackEntered = new CountDownLatch(1);
+        CountDownLatch allowCallbackToReturn = new CountDownLatch(1);
+        AtomicBoolean shutdownObservedAfterCallbackReturn = new AtomicBoolean(false);
+        AtomicBoolean callbackFinished = new AtomicBoolean(false);
+        AtomicReference<OutboundCallback> callbackRef = new AtomicReference<>();
+
+        NativeBinding binding = new NativeBinding() {
+            @Override
+            public int hostStart(byte[] argvJson, int argvJsonLen, byte[] envJson, int envJsonLen) {
+                return 7;
+            }
+
+            @Override
+            public boolean hostShutdown(int serverId) {
+                shutdownObservedAfterCallbackReturn.set(callbackFinished.get());
+                return true;
+            }
+
+            @Override
+            public int connectionOpen(int serverId, OutboundCallback callback, Pointer userData, byte[] extSource,
+                    int extSourceLen, byte[] extName, int extNameLen, byte[] connToken, int connTokenLen) {
+                callbackRef.set(callback);
+                return 8;
+            }
+
+            @Override
+            public boolean connectionWrite(int connectionId, byte[] data, int dataLen) {
+                return true;
+            }
+
+            @Override
+            public boolean connectionClose(int connectionId) {
+                return true;
+            }
+        };
+
+        QueueInputStream blockingStream = new QueueInputStream() {
+            @Override
+            void enqueue(byte[] bytes) {
+                callbackEntered.countDown();
+                try {
+                    allowCallbackToReturn.await(5, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+                callbackFinished.set(true);
+                super.enqueue(bytes);
+            }
+        };
+
+        FfiRuntimeHost host = new FfiRuntimeHost(binding, "test-lib", blockingStream);
+        host.start("/tmp/entrypoint", new CopilotClientOptions());
+        assertNotNull(callbackRef.get());
+
+        CompletableFuture<Void> callbackFuture = CompletableFuture.runAsync(() -> {
+            Memory mem = new Memory(1);
+            mem.setByte(0, (byte) 'x');
+            callbackRef.get().invoke(Pointer.NULL, mem, new SizeT(1));
+        });
+
+        assertTrue(callbackEntered.await(2, TimeUnit.SECONDS));
+        CompletableFuture<Void> closeFuture = CompletableFuture.runAsync(host::close);
+        Thread.sleep(150);
+        assertFalse(closeFuture.isDone(), "close should wait for active callback to drain");
+        allowCallbackToReturn.countDown();
+        callbackFuture.get(5, TimeUnit.SECONDS);
+        closeFuture.get(5, TimeUnit.SECONDS);
+        assertTrue(shutdownObservedAfterCallbackReturn.get(), "host_shutdown should run after callback drains");
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/ffi/InProcessEnvGuard.java b/java/sdk/src/test/java/com/github/copilot/ffi/InProcessEnvGuard.java
new file mode 100644
index 0000000000..43df713715
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ffi/InProcessEnvGuard.java
@@ -0,0 +1,192 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.WString;
+
+/**
+ * Mutates the live process environment block so that native code loaded
+ * in-process (e.g. {@code runtime.node} via JNA) observes the given environment
+ * variables, and restores the previous values on {@link #close()}.
+ *
+ * <p>
+ * Java has no public API to modify the process-level environment block:
+ * {@code System.setProperty()} only writes the JVM property bag, and
+ * {@code System.getenv()} is an immutable startup-time snapshot. Native code
+ * loaded via JNA reads the OS environment directly
+ * ({@code GetEnvironmentVariableW} on Windows, {@code getenv()} on POSIX), so
+ * the only way to make it see an overridden value is to call the OS API
+ * directly through JNA.
+ * </p>
+ *
+ * <p>
+ * This mirrors the Rust {@code InProcessEnvGuard}
+ * ({@code rust/tests/e2e/support.rs}) and the .NET
+ * {@code InProcessEnvIsolation}
+ * ({@code dotnet/test/Harness/InProcessEnvIsolation.cs}).
+ * </p>
+ *
+ * <p>
+ * <strong>Thread safety:</strong> this guard mutates process-global state.
+ * Tests that use it must run with test concurrency 1 (see the
+ * {@code -Pinprocess} Maven profile, which sets {@code failsafe.forkCount=1}
+ * and disables parallel execution).
+ * </p>
+ */
+public final class InProcessEnvGuard implements AutoCloseable {
+
+    private static final Logger LOG = Logger.getLogger(InProcessEnvGuard.class.getName());
+
+    /**
+     * Environment variables suppressed because replay snapshots expect Bearer/OAuth
+     * auth.
+     */
+    private static final List<String> SUPPRESSED_KEYS = List.of("COPILOT_HMAC_KEY", "CAPI_HMAC_KEY");
+
+    /**
+     * Windows kernel32: sets or deletes a variable in the process environment
+     * block.
+     */
+    private interface Kernel32Env extends Library {
+        boolean SetEnvironmentVariableW(WString lpName, WString lpValue);
+
+        int GetEnvironmentVariableW(WString lpName, char[] lpBuffer, int nSize);
+    }
+
+    /** POSIX libc: sets or deletes a variable in the process environment block. */
+    private interface LibcEnv extends Library {
+        int setenv(String name, String value, int overwrite);
+
+        int unsetenv(String name);
+
+        /** Returns null if the variable is not set. */
+        String getenv(String name);
+    }
+
+    /**
+     * Sentinel indicating the variable was not set (distinct from empty string).
+     */
+    private static final String ABSENT_SENTINEL = new String("\0ABSENT\0");
+
+    /**
+     * name -> previous value ({@code null} means the variable was not set before).
+     */
+    private final List<Map.Entry<String, String>> saved = new ArrayList<>();
+    private boolean closed;
+
+    /**
+     * Applies {@code applyEnv} to the native process environment block, saving the
+     * previous values for restoration by {@link #close()}. Also suppresses
+     * {@code COPILOT_HMAC_KEY} / {@code CAPI_HMAC_KEY} if present, since the replay
+     * proxy expects Bearer/OAuth auth rather than HMAC.
+     *
+     * @param applyEnv
+     *            environment variables to apply; values must not be {@code null}
+     */
+    public InProcessEnvGuard(Map<String, String> applyEnv) {
+        for (Map.Entry<String, String> entry : applyEnv.entrySet()) {
+            apply(entry.getKey(), entry.getValue());
+        }
+        for (String key : SUPPRESSED_KEYS) {
+            String previous = nativeGetEnv(key);
+            if (previous != null && !previous.isEmpty()) {
+                apply(key, null);
+            }
+        }
+    }
+
+    private void apply(String name, String value) {
+        String previous = nativeGetEnv(name);
+        saved.add(Map.entry(name, previous == null ? ABSENT_SENTINEL : previous));
+        nativeSetEnv(name, value);
+    }
+
+    /**
+     * Restores every environment variable this guard touched to the value it had
+     * before construction.
+     */
+    @Override
+    public synchronized void close() {
+        if (closed) {
+            return;
+        }
+        closed = true;
+        List<Map.Entry<String, String>> reversed = new ArrayList<>(saved);
+        Collections.reverse(reversed);
+        for (Map.Entry<String, String> entry : reversed) {
+            // ABSENT_SENTINEL uses a value ("\0ABSENT\0") impossible in real env vars.
+            String restoreValue = ABSENT_SENTINEL.equals(entry.getValue()) ? null : entry.getValue();
+            nativeSetEnv(entry.getKey(), restoreValue);
+        }
+    }
+
+    private static String nativeGetEnv(String name) {
+        if (isWindows()) {
+            return nativeGetEnvWindows(name);
+        } else {
+            return nativeGetEnvUnix(name);
+        }
+    }
+
+    private static String nativeGetEnvWindows(String name) {
+        Kernel32Env kernel32 = Native.load("kernel32", Kernel32Env.class);
+        char[] buffer = new char[32767];
+        int len = kernel32.GetEnvironmentVariableW(new WString(name), buffer, buffer.length);
+        if (len == 0) {
+            // Variable not set (or error — treat as absent)
+            return null;
+        }
+        return new String(buffer, 0, len);
+    }
+
+    private static String nativeGetEnvUnix(String name) {
+        LibcEnv libc = Native.load("c", LibcEnv.class);
+        return libc.getenv(name);
+    }
+
+    private static void nativeSetEnv(String name, String value) {
+        if (isWindows()) {
+            nativeSetEnvWindows(name, value);
+        } else {
+            nativeSetEnvUnix(name, value);
+        }
+    }
+
+    private static void nativeSetEnvWindows(String name, String value) {
+        Kernel32Env kernel32 = Native.load("kernel32", Kernel32Env.class);
+        boolean ok = kernel32.SetEnvironmentVariableW(new WString(name), value != null ? new WString(value) : null);
+        if (!ok) {
+            LOG.warning("SetEnvironmentVariableW failed for key=" + name);
+        }
+    }
+
+    private static void nativeSetEnvUnix(String name, String value) {
+        LibcEnv libc = Native.load("c", LibcEnv.class);
+        if (value != null) {
+            int rc = libc.setenv(name, value, 1);
+            if (rc != 0) {
+                LOG.warning("setenv() failed for key=" + name + " rc=" + rc);
+            }
+        } else {
+            int rc = libc.unsetenv(name);
+            if (rc != 0) {
+                LOG.warning("unsetenv() failed for key=" + name + " rc=" + rc);
+            }
+        }
+    }
+
+    private static boolean isWindows() {
+        return System.getProperty("os.name", "").toLowerCase(Locale.ROOT).contains("win");
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/ffi/JnaNativeBindingTest.java b/java/sdk/src/test/java/com/github/copilot/ffi/JnaNativeBindingTest.java
new file mode 100644
index 0000000000..e37a7cfc82
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ffi/JnaNativeBindingTest.java
@@ -0,0 +1,346 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import com.sun.jna.Pointer;
+
+import java.lang.ref.WeakReference;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+/**
+ * Unit tests for {@link JnaNativeBinding}.
+ *
+ * <p>
+ * Delegation and callback-tracking tests use a stub
+ * {@link JnaNativeBinding.CopilotRuntimeLibrary}. Library-loading guard tests
+ * exercise {@link JnaNativeBinding} directly against the real
+ * {@code runtime.node} when it is available on the test classpath.
+ *
+ * <p>
+ * Tests that require the packaged native runtime are conditionally skipped when
+ * it is unavailable (for example, when not running with {@code -Pinprocess}).
+ */
+class JnaNativeBindingTest {
+
+    // -------------------------------------------------------------------------
+    // Stub CopilotRuntimeLibrary for delegation tests
+    // -------------------------------------------------------------------------
+
+    /**
+     * Minimal stub for testing {@link JnaNativeBinding} delegation without disk
+     * I/O.
+     */
+    private static class StubRuntimeLibrary implements JnaNativeBinding.CopilotRuntimeLibrary {
+        int hostStartReturn = 1;
+        byte hostShutdownReturn = 1;
+        int connectionOpenReturn = 1;
+        byte connectionWriteReturn = 1;
+        byte connectionCloseReturn = 1;
+
+        byte[] lastArgvJson;
+        int lastArgvJsonLen;
+        int lastServerId;
+        int lastConnectionId;
+        OutboundCallback lastCallback;
+
+        @Override
+        public int copilot_runtime_host_start(byte[] argvJson, SizeT argvJsonLen, byte[] envJson, SizeT envJsonLen) {
+            lastArgvJson = argvJson;
+            lastArgvJsonLen = argvJsonLen.intValue();
+            return hostStartReturn;
+        }
+
+        @Override
+        public byte copilot_runtime_host_shutdown(int serverId) {
+            lastServerId = serverId;
+            return hostShutdownReturn;
+        }
+
+        @Override
+        public int copilot_runtime_connection_open(int serverId, OutboundCallback callback, Pointer userData,
+                byte[] extSource, SizeT extSourceLen, byte[] extName, SizeT extNameLen, byte[] connToken,
+                SizeT connTokenLen) {
+            lastServerId = serverId;
+            lastCallback = callback;
+            return connectionOpenReturn;
+        }
+
+        @Override
+        public byte copilot_runtime_connection_write(int connectionId, byte[] data, SizeT dataLen) {
+            lastConnectionId = connectionId;
+            return connectionWriteReturn;
+        }
+
+        @Override
+        public byte copilot_runtime_connection_close(int connectionId) {
+            lastConnectionId = connectionId;
+            return connectionCloseReturn;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Helpers
+    // -------------------------------------------------------------------------
+
+    private static Path resolveNativeLib() {
+        try {
+            return NativeRuntimeLoader.resolve();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    @AfterEach
+    void resetStaticState() {
+        JnaNativeBinding.resetForTesting();
+    }
+
+    // =========================================================================
+    // Delegation via testing constructor (stub — no disk I/O)
+    // =========================================================================
+
+    @Test
+    void hostStartDelegatesToLibraryAndReturnsHandle() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.hostStartReturn = 77;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+
+        byte[] argv = "[\"copilot\"]".getBytes(StandardCharsets.UTF_8);
+        int result = binding.hostStart(argv, argv.length, null, 0);
+
+        assertEquals(77, result, "hostStart should return the stub's configured value");
+        assertEquals(argv, stub.lastArgvJson, "argv bytes should be passed through unchanged");
+        assertEquals(argv.length, stub.lastArgvJsonLen);
+    }
+
+    @Test
+    void hostStartReturnsZeroOnFailure() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.hostStartReturn = 0;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+
+        byte[] argv = "[\"copilot\"]".getBytes(StandardCharsets.UTF_8);
+        assertEquals(0, binding.hostStart(argv, argv.length, null, 0), "hostStart must return 0 to signal failure");
+    }
+
+    @Test
+    void hostShutdownDelegatesToLibrary() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.hostShutdownReturn = 1;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+
+        assertTrue(binding.hostShutdown(42));
+        assertEquals(42, stub.lastServerId);
+    }
+
+    @Test
+    void hostShutdownReturnsFalseOnFailure() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.hostShutdownReturn = 0;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+        assertFalse(binding.hostShutdown(1));
+    }
+
+    @Test
+    void connectionOpenDelegatesToLibrary() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.connectionOpenReturn = 55;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+
+        OutboundCallback noop = (ud, data, len) -> {
+        };
+        int connId = binding.connectionOpen(42, noop, Pointer.NULL, null, 0, null, 0, null, 0);
+
+        assertEquals(55, connId, "connectionOpen should return the stub's configured handle");
+        assertEquals(42, stub.lastServerId);
+    }
+
+    @Test
+    void connectionOpenReturnsZeroOnFailure() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.connectionOpenReturn = 0;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+
+        OutboundCallback noop = (ud, data, len) -> {
+        };
+        assertEquals(0, binding.connectionOpen(1, noop, Pointer.NULL, null, 0, null, 0, null, 0),
+                "connectionOpen must return 0 to signal failure");
+    }
+
+    @Test
+    void connectionWriteDelegatesToLibrary() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.connectionWriteReturn = 1;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+
+        byte[] data = "hello".getBytes(StandardCharsets.UTF_8);
+        assertTrue(binding.connectionWrite(7, data, data.length));
+        assertEquals(7, stub.lastConnectionId);
+    }
+
+    @Test
+    void connectionWriteReturnsFalseOnFailure() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.connectionWriteReturn = 0;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+
+        byte[] data = "x".getBytes(StandardCharsets.UTF_8);
+        assertFalse(binding.connectionWrite(1, data, data.length),
+                "connectionWrite must propagate false return from the library");
+    }
+
+    @Test
+    void connectionCloseDelegatesToLibrary() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.connectionCloseReturn = 1;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+        assertTrue(binding.connectionClose(7));
+        assertEquals(7, stub.lastConnectionId);
+    }
+
+    @Test
+    void connectionCloseReturnsFalseOnFailure() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.connectionCloseReturn = 0;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+        assertFalse(binding.connectionClose(1));
+    }
+
+    @Test
+    void activeCallbacksStartsAtZero() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+        assertEquals(0, binding.activeCallbacks.get(), "Active callback counter must start at zero");
+    }
+
+    @Test
+    void callbackWrapperRemainsReachableAfterConnectionClose() throws InterruptedException {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.connectionOpenReturn = 99;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+        AtomicInteger invocations = new AtomicInteger();
+
+        WeakReference<OutboundCallback> callbackReference = openAndCloseConnection(binding, stub,
+                (userData, data, len) -> invocations.incrementAndGet());
+
+        awaitGarbageCollection(callbackReference);
+
+        OutboundCallback callback = callbackReference.get();
+        assertNotNull(callback, "Callback wrapper must remain strongly reachable after connection close");
+        callback.invoke(Pointer.NULL, Pointer.NULL, new SizeT(0));
+        assertEquals(1, invocations.get(), "A callback queued before close must remain safely invocable");
+    }
+
+    private static WeakReference<OutboundCallback> openAndCloseConnection(JnaNativeBinding binding,
+            StubRuntimeLibrary stub, OutboundCallback callback) {
+        int connectionId = binding.connectionOpen(1, callback, Pointer.NULL, null, 0, null, 0, null, 0);
+        assertEquals(99, connectionId);
+        assertNotNull(stub.lastCallback);
+
+        WeakReference<OutboundCallback> callbackReference = new WeakReference<>(stub.lastCallback);
+        stub.lastCallback = null;
+        assertTrue(binding.connectionClose(connectionId));
+        return callbackReference;
+    }
+
+    private static void awaitGarbageCollection(WeakReference<?> reference) throws InterruptedException {
+        for (int attempt = 0; attempt < 20 && reference.get() != null; attempt++) {
+            System.gc();
+            System.runFinalization();
+            Thread.sleep(10);
+        }
+    }
+
+    // =========================================================================
+    // Duplicate-load guard
+    // =========================================================================
+
+    @Test
+    void loadFromDifferentPathThrowsIllegalState(@TempDir Path tempDir) throws Exception {
+        Path nativeLib = resolveNativeLib();
+        assumeTrue(nativeLib != null, "Native runtime not available (run with -Pinprocess)");
+        Path altPath = tempDir.resolve("runtime-copy-alt.node");
+        Files.copy(nativeLib, altPath);
+
+        new JnaNativeBinding(nativeLib);
+
+        IllegalStateException ex = assertThrows(IllegalStateException.class, () -> new JnaNativeBinding(altPath));
+
+        String msg = ex.getMessage();
+        assertTrue(msg.contains("already loaded from"), "Diagnostic must mention 'already loaded from', got: " + msg);
+        assertTrue(msg.contains(nativeLib.toString()), "Diagnostic must contain path A, got: " + msg);
+        assertTrue(msg.contains(altPath.toString()), "Diagnostic must contain path B, got: " + msg);
+    }
+
+    @Test
+    void duplicateLoadDiagnosticMentionsNotSupported(@TempDir Path tempDir) throws Exception {
+        Path nativeLib = resolveNativeLib();
+        assumeTrue(nativeLib != null, "Native runtime not available (run with -Pinprocess)");
+        Path altPath = tempDir.resolve("runtime-copy-b.node");
+        Files.copy(nativeLib, altPath);
+
+        new JnaNativeBinding(nativeLib);
+
+        IllegalStateException ex = assertThrows(IllegalStateException.class, () -> new JnaNativeBinding(altPath));
+        assertTrue(ex.getMessage().contains("not supported"),
+                "Diagnostic must mention 'not supported', got: " + ex.getMessage());
+    }
+
+    @Test
+    void resetForTestingAllowsReloadFromDifferentPath() throws Exception {
+        Path nativeLib = resolveNativeLib();
+        assumeTrue(nativeLib != null, "Native runtime not available (run with -Pinprocess)");
+        Path altDir = Path.of("target", "jna-test-runtime");
+        Files.createDirectories(altDir);
+        Path altPath = altDir.resolve("runtime-copy-reset.node");
+        Files.copy(nativeLib, altPath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+
+        new JnaNativeBinding(nativeLib);
+
+        JnaNativeBinding.resetForTesting();
+
+        // After reset, a different path must succeed.
+        new JnaNativeBinding(altPath);
+    }
+
+    @Test
+    void activeCallbackCountIsIncrementedDuringCallback() {
+        StubRuntimeLibrary stub = new StubRuntimeLibrary();
+        stub.connectionOpenReturn = 99;
+        JnaNativeBinding binding = new JnaNativeBinding(stub);
+
+        AtomicInteger observedDuringCallback = new AtomicInteger(-1);
+
+        OutboundCallback userCallback = (userData, data, len) -> {
+            // Observe binding.activeCallbacks while inside the callback
+            observedDuringCallback.set(binding.activeCallbacks.get());
+        };
+
+        binding.connectionOpen(1, userCallback, Pointer.NULL, null, 0, null, 0, null, 0);
+
+        // The stub captured the tracked wrapper — invoke it to trigger tracking
+        assertNotNull(stub.lastCallback, "Stub must have captured the tracked callback");
+        stub.lastCallback.invoke(Pointer.NULL, Pointer.NULL, new SizeT(0));
+
+        assertEquals(1, observedDuringCallback.get(), "binding.activeCallbacks must be 1 during callback execution");
+        assertEquals(0, binding.activeCallbacks.get(),
+                "binding.activeCallbacks must return to 0 after callback completes");
+    }
+
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/ffi/NativeRuntimeLoaderTest.java b/java/sdk/src/test/java/com/github/copilot/ffi/NativeRuntimeLoaderTest.java
new file mode 100644
index 0000000000..fc8bd51011
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ffi/NativeRuntimeLoaderTest.java
@@ -0,0 +1,584 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+class NativeRuntimeLoaderTest {
+
+    private static final String TEST_CLASSIFIER = PlatformDetector.detectClassifier();
+    private static final String OTHER_CLASSIFIER = TEST_CLASSIFIER.equals("darwin-arm64")
+            ? "linux-x64"
+            : "darwin-arm64";
+    private static final String TEST_CLI_FILENAME = TEST_CLASSIFIER.startsWith("win32")
+            ? NativeRuntimeLoader.CLI_FILENAME_WINDOWS
+            : NativeRuntimeLoader.CLI_FILENAME;
+    private static final String TEST_VERSION = "1.2.3-test";
+    private static final String TEST_NATIVE_VERSION = "0.0.1-test";
+    private static final byte[] FAKE_BINARY_CONTENT = "fake runtime.node binary content".getBytes();
+    private static final byte[] FAKE_CLI_CONTENT = "fake copilot CLI content".getBytes();
+    private static final byte[] OTHER_BINARY_CONTENT = "other runtime.node binary content".getBytes();
+    private static final byte[] OTHER_CLI_CONTENT = "other copilot CLI content".getBytes();
+
+    // -------------------------------------------------------------------------
+    // Version properties resource reading
+    // -------------------------------------------------------------------------
+
+    @Test
+    void readVersionReturnsVersionFromPropertiesResource(@TempDir Path tempDir) throws Exception {
+        ClassLoader loader = classLoaderWithVersionResource(tempDir, "1.0.5-preview");
+        assertEquals("1.0.5-preview", NativeRuntimeLoader.readVersion(loader));
+    }
+
+    @Test
+    void readVersionThrowsWhenResourceMissing() {
+        ClassLoader emptyLoader = new URLClassLoader(new URL[0], null);
+        IllegalStateException ex = assertThrows(IllegalStateException.class,
+                () -> NativeRuntimeLoader.readVersion(emptyLoader));
+        assertTrue(ex.getMessage().contains(NativeRuntimeLoader.VERSION_RESOURCE));
+    }
+
+    @Test
+    void readVersionThrowsWhenVersionPropertyIsBlank(@TempDir Path tempDir) throws Exception {
+        ClassLoader loader = classLoaderWithVersionResource(tempDir, "  ");
+        IllegalStateException ex = assertThrows(IllegalStateException.class,
+                () -> NativeRuntimeLoader.readVersion(loader));
+        assertTrue(ex.getMessage().contains("version"));
+    }
+
+    // -------------------------------------------------------------------------
+    // COPILOT_CLI_PATH override
+    // -------------------------------------------------------------------------
+
+    @Test
+    void resolveFromCliPathReturnsSiblingWhenRuntimeNodeExists(@TempDir Path tempDir) throws Exception {
+        Path fakeCliPath = tempDir.resolve("copilot");
+        Files.createFile(fakeCliPath);
+        Path runtimeNode = tempDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        Files.write(runtimeNode, FAKE_BINARY_CONTENT);
+
+        Path result = NativeRuntimeLoader.resolveFromCliPath(fakeCliPath.toString());
+
+        assertEquals(runtimeNode, result);
+    }
+
+    @Test
+    void resolveFromCliPathReturnsNullWhenRuntimeNodeMissing(@TempDir Path tempDir) throws Exception {
+        Path fakeCliPath = tempDir.resolve("copilot");
+        Files.createFile(fakeCliPath);
+
+        assertNull(NativeRuntimeLoader.resolveFromCliPath(fakeCliPath.toString()));
+    }
+
+    @Test
+    void resolveFromCliPathReturnsNullWhenEnvIsNull() throws Exception {
+        assertNull(NativeRuntimeLoader.resolveFromCliPath(null));
+    }
+
+    @Test
+    void resolveFromCliPathReturnsNullWhenEnvIsBlank() throws Exception {
+        assertNull(NativeRuntimeLoader.resolveFromCliPath("   "));
+    }
+
+    @Test
+    void resolveFromCliPathReturnsNullWhenRuntimeNodeIsEmpty(@TempDir Path tempDir) throws Exception {
+        Path fakeCliPath = tempDir.resolve("copilot");
+        Files.createFile(fakeCliPath);
+        Path runtimeNode = tempDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        Files.createFile(runtimeNode); // empty file
+
+        assertNull(NativeRuntimeLoader.resolveFromCliPath(fakeCliPath.toString()));
+    }
+
+    @Test
+    void resolveFromCliPathReturnsPrebuildsPathWhenFlatRuntimeNodeIsMissing(@TempDir Path tempDir) throws Exception {
+        Path fakeCliPath = tempDir.resolve("copilot");
+        Files.createFile(fakeCliPath);
+        Path prebuiltDir = tempDir.resolve("prebuilds").resolve(PlatformDetector.detectClassifier());
+        Files.createDirectories(prebuiltDir);
+        Path runtimeNode = prebuiltDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        Files.write(runtimeNode, FAKE_BINARY_CONTENT);
+
+        Path result = NativeRuntimeLoader.resolveFromCliPath(fakeCliPath.toString());
+
+        assertEquals(runtimeNode, result);
+    }
+
+    @Test
+    void resolveFromCliPathPrefersFlatRuntimeNodeOverPrebuildsPath(@TempDir Path tempDir) throws Exception {
+        Path fakeCliPath = tempDir.resolve("copilot");
+        Files.createFile(fakeCliPath);
+        Path flatRuntimeNode = tempDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        Files.write(flatRuntimeNode, FAKE_BINARY_CONTENT);
+        Path prebuiltDir = tempDir.resolve("prebuilds").resolve(PlatformDetector.detectClassifier());
+        Files.createDirectories(prebuiltDir);
+        Files.write(prebuiltDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME), OTHER_BINARY_CONTENT);
+
+        Path result = NativeRuntimeLoader.resolveFromCliPath(fakeCliPath.toString());
+
+        assertEquals(flatRuntimeNode, result);
+    }
+
+    @Test
+    void resolveEntrypointUsesConfiguredCliWhenRuntimeIsInPrebuilds(@TempDir Path tempDir) throws Exception {
+        Path cli = Files.writeString(tempDir.resolve("copilot"), "fake cli");
+        Path runtimeDir = tempDir.resolve("prebuilds").resolve(PlatformDetector.detectClassifier());
+        Files.createDirectories(runtimeDir);
+        Path runtime = Files.write(runtimeDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME), FAKE_BINARY_CONTENT);
+
+        assertEquals(cli, NativeRuntimeLoader.resolveEntrypoint(cli.toString(), runtime));
+    }
+
+    @Test
+    void resolveFromCliPathReturnsAbsolutePathForRelativeCliPath() throws Exception {
+        Path workingDirectory = Path.of("").toAbsolutePath();
+        Path fakeCliDir = Files.createTempDirectory(Path.of("target").toAbsolutePath(), "relative-cli-test-");
+        Path fakeCliPath = fakeCliDir.resolve("copilot");
+        Files.createFile(fakeCliPath);
+        Path runtimeNode = fakeCliDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        Files.write(runtimeNode, FAKE_BINARY_CONTENT);
+
+        Path relativeCliPath = workingDirectory.relativize(fakeCliPath);
+
+        assertEquals(runtimeNode, NativeRuntimeLoader.resolveFromCliPath(relativeCliPath.toString()));
+    }
+
+    @Test
+    void cliPathOverrideTakesPriorityOverClasspathExtraction(@TempDir Path tempDir) throws Exception {
+        // Create a valid runtime.node alongside the fake CLI path
+        Path fakeCliDir = tempDir.resolve("cli-dir");
+        Files.createDirectories(fakeCliDir);
+        Path fakeCliPath = fakeCliDir.resolve("copilot");
+        Files.createFile(fakeCliPath);
+        Path runtimeNode = fakeCliDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        Files.write(runtimeNode, FAKE_BINARY_CONTENT);
+
+        // Source 2 is also available (should be ignored)
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+
+        Path result = NativeRuntimeLoader.resolve(fakeCliPath.toString(), cacheBase, loader, TEST_CLASSIFIER,
+                TEST_VERSION);
+
+        assertEquals(runtimeNode, result, "Source 1 (COPILOT_CLI_PATH) must take priority over classpath extraction");
+    }
+
+    // -------------------------------------------------------------------------
+    // Source 2: classpath extraction to cache
+    // -------------------------------------------------------------------------
+
+    @Test
+    void extractToCacheCopiesResourceToVersionedCacheDirectory(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+
+        Path result = NativeRuntimeLoader.extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION);
+
+        Path expected = cacheBase.resolve(TEST_VERSION).resolve(TEST_NATIVE_VERSION).resolve(TEST_CLASSIFIER)
+                .resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        assertEquals(expected, result);
+        assertTrue(Files.isRegularFile(result));
+        assertTrue(Files.size(result) > 0);
+    }
+
+    @Test
+    void extractToCacheReturnsCachedFileOnSecondCall(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+
+        Path first = NativeRuntimeLoader.extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION);
+        long modifiedAfterFirstExtraction = Files.getLastModifiedTime(first).toMillis();
+
+        // Small delay so modification time would differ if the file were rewritten
+        Thread.sleep(50);
+
+        Path second = NativeRuntimeLoader.extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION);
+        long modifiedAfterSecondCall = Files.getLastModifiedTime(second).toMillis();
+
+        assertEquals(first, second);
+        assertEquals(modifiedAfterFirstExtraction, modifiedAfterSecondCall,
+                "Cached file must not be overwritten on cache hit");
+    }
+
+    @Test
+    void changedNativeVersionDoesNotReuseCachedArtifactsForSameSdkVersion(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader firstLoader = classLoaderWithNativeArtifacts(tempDir.resolve("native-v1"), TEST_CLASSIFIER, "1.0.0",
+                FAKE_BINARY_CONTENT, FAKE_CLI_CONTENT);
+        ClassLoader secondLoader = classLoaderWithNativeArtifacts(tempDir.resolve("native-v2"), TEST_CLASSIFIER,
+                "1.1.0", OTHER_BINARY_CONTENT, OTHER_CLI_CONTENT);
+
+        Path firstRuntime = NativeRuntimeLoader.extractToCache(cacheBase, firstLoader, TEST_CLASSIFIER, TEST_VERSION);
+        Path secondRuntime = NativeRuntimeLoader.extractToCache(cacheBase, secondLoader, TEST_CLASSIFIER, TEST_VERSION);
+
+        assertNotEquals(firstRuntime, secondRuntime, "Different native versions must use different cache entries");
+        assertBytesEqual(FAKE_BINARY_CONTENT, Files.readAllBytes(firstRuntime));
+        assertBytesEqual(FAKE_CLI_CONTENT, Files.readAllBytes(firstRuntime.getParent().resolve(TEST_CLI_FILENAME)));
+        assertBytesEqual(OTHER_BINARY_CONTENT, Files.readAllBytes(secondRuntime));
+        assertBytesEqual(OTHER_CLI_CONTENT, Files.readAllBytes(secondRuntime.getParent().resolve(TEST_CLI_FILENAME)));
+    }
+
+    @Test
+    void extractToCacheThrowsWhenClasspathResourceMissing(@TempDir Path tempDir) {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader emptyLoader = new URLClassLoader(new URL[0], null);
+
+        assertThrows(IOException.class,
+                () -> NativeRuntimeLoader.extractToCache(cacheBase, emptyLoader, TEST_CLASSIFIER, TEST_VERSION));
+    }
+
+    @Test
+    void extractToCacheThrowsWhenNativeMetadataMissing(@TempDir Path tempDir) throws Exception {
+        Path resourceDir = tempDir.resolve("native").resolve(TEST_CLASSIFIER);
+        Files.createDirectories(resourceDir);
+        Files.write(resourceDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME), FAKE_BINARY_CONTENT);
+        ClassLoader loader = new URLClassLoader(new URL[]{tempDir.toUri().toURL()}, null);
+
+        IOException ex = assertThrows(IOException.class, () -> NativeRuntimeLoader
+                .extractToCache(tempDir.resolve("cache"), loader, TEST_CLASSIFIER, TEST_VERSION));
+
+        assertTrue(ex.getMessage().contains("platform.properties"));
+    }
+
+    @Test
+    void extractedBinaryContentsMatchClasspathResource(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+
+        Path result = NativeRuntimeLoader.extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION);
+
+        byte[] extracted = Files.readAllBytes(result);
+        assertBytesEqual(FAKE_BINARY_CONTENT, extracted);
+    }
+
+    @Test
+    void extractToCacheFiltersClasspathByClassifier(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        writeRuntimeResource(tempDir, TEST_CLASSIFIER, FAKE_BINARY_CONTENT);
+        writeRuntimeResource(tempDir, OTHER_CLASSIFIER, OTHER_BINARY_CONTENT);
+        ClassLoader loader = new URLClassLoader(new URL[]{tempDir.toUri().toURL()}, null);
+
+        Path result = NativeRuntimeLoader.extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION);
+
+        assertTrue(result.toString().contains(TEST_CLASSIFIER), "Cache path must include the classifier: " + result);
+        assertBytesEqual(FAKE_BINARY_CONTENT, Files.readAllBytes(result));
+    }
+
+    @Test
+    void extractToCacheRepairsInvalidCacheEntry(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        Path cached = cacheBase.resolve(TEST_VERSION).resolve(TEST_NATIVE_VERSION).resolve(TEST_CLASSIFIER)
+                .resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        Files.createDirectories(cached.getParent());
+        Files.createFile(cached);
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+
+        Path result = NativeRuntimeLoader.extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION);
+
+        assertEquals(cached, result);
+        assertBytesEqual(FAKE_BINARY_CONTENT, Files.readAllBytes(result));
+    }
+
+    @Test
+    void nonExecutableCachedCliIsNotAcceptedAsValid(@TempDir Path tempDir) throws Exception {
+        assumeTrue(!TEST_CLASSIFIER.startsWith("win32"));
+        assumeTrue(Files.getFileStore(tempDir).supportsFileAttributeView("posix"));
+        Path cacheBase = tempDir.resolve("cache");
+        Path cacheDir = cacheBase.resolve(TEST_VERSION).resolve(TEST_NATIVE_VERSION).resolve(TEST_CLASSIFIER);
+        Files.createDirectories(cacheDir);
+        Files.write(cacheDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME), FAKE_BINARY_CONTENT);
+        Path cachedCli = Files.write(cacheDir.resolve(TEST_CLI_FILENAME), FAKE_CLI_CONTENT);
+        Files.setPosixFilePermissions(cachedCli, PosixFilePermissions.fromString("rw-------"));
+        ClassLoader loader = classLoaderWithRuntimeAndCliResources(tempDir, TEST_CLASSIFIER);
+
+        NativeRuntimeLoader.extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION);
+
+        assertTrue(Files.isExecutable(cachedCli), "A non-executable cached CLI must be repaired or replaced");
+    }
+
+    // -------------------------------------------------------------------------
+    // Source 3: bundled-CLI sibling
+    // -------------------------------------------------------------------------
+
+    @Test
+    void bundledCliSiblingIsUsedWhenClasspathResourceAbsent(@TempDir Path tempDir) throws Exception {
+        Path bundledCliDir = tempDir.resolve("bundled-cli");
+        Files.createDirectories(bundledCliDir);
+        Path runtimeNode = bundledCliDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        Files.write(runtimeNode, FAKE_BINARY_CONTENT);
+
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader emptyLoader = new URLClassLoader(new URL[0], null); // no classpath resource
+
+        Path result = NativeRuntimeLoader.resolve(null, cacheBase, emptyLoader, TEST_CLASSIFIER, TEST_VERSION,
+                bundledCliDir);
+
+        assertEquals(runtimeNode, result,
+                "Source 3 (bundled-CLI sibling) must be used when classpath resource is absent");
+    }
+
+    @Test
+    void classpathResourceWinsOverBundledCliSibling(@TempDir Path tempDir) throws Exception {
+        // Source 3: bundled CLI dir with runtime.node (should NOT win)
+        Path bundledCliDir = tempDir.resolve("bundled-cli");
+        Files.createDirectories(bundledCliDir);
+        Files.write(bundledCliDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME), "bundled".getBytes());
+
+        // Source 2: classpath resource (should win)
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+
+        Path result = NativeRuntimeLoader.resolve(null, cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION,
+                bundledCliDir);
+
+        Path expectedFromClasspath = cacheBase.resolve(TEST_VERSION).resolve(TEST_NATIVE_VERSION)
+                .resolve(TEST_CLASSIFIER).resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        assertEquals(expectedFromClasspath, result,
+                "Source 2 (classpath) must win over source 3 (bundled-CLI sibling)");
+        assertNotEquals(bundledCliDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME), result);
+    }
+
+    @Test
+    void bundledCliSiblingIsIgnoredWhenRuntimeNodeMissing(@TempDir Path tempDir) {
+        Path bundledCliDir = tempDir.resolve("bundled-cli-no-runtime");
+        // bundledCliDir doesn't even exist — no runtime.node present
+
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader emptyLoader = new URLClassLoader(new URL[0], null);
+
+        // Both source 2 and source 3 absent: must throw (the classpath error)
+        IOException ex = assertThrows(IOException.class, () -> NativeRuntimeLoader.resolve(null, cacheBase, emptyLoader,
+                TEST_CLASSIFIER, TEST_VERSION, bundledCliDir));
+        assertTrue(ex.getMessage().contains("classpath"), "Error should mention classpath: " + ex.getMessage());
+    }
+
+    // -------------------------------------------------------------------------
+    // Atomic publication test seam
+    // -------------------------------------------------------------------------
+
+    @Test
+    void defaultPublisherMovesSourceToTarget(@TempDir Path tempDir) throws Exception {
+        Path temp = Files.createTempFile(tempDir, "runtime-tmp-", ".node");
+        Files.write(temp, FAKE_BINARY_CONTENT);
+        Path target = tempDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+
+        NativeRuntimeLoader.DEFAULT_PUBLISHER.publish(temp, target);
+
+        assertTrue(Files.isRegularFile(target), "Target must exist after publication");
+        assertTrue(Files.size(target) > 0, "Target must be non-empty");
+        assertFalse(Files.exists(temp), "Source temp file must be absent after atomic move");
+    }
+
+    @Test
+    void cliIsExecutableBeforeAtomicPublication(@TempDir Path tempDir) throws Exception {
+        assumeTrue(!TEST_CLASSIFIER.startsWith("win32"));
+        assumeTrue(Files.getFileStore(tempDir).supportsFileAttributeView("posix"));
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeAndCliResources(tempDir, TEST_CLASSIFIER);
+        NativeRuntimeLoader.AtomicPublisher publisher = (temp, cached) -> {
+            if (cached.getFileName().toString().equals(TEST_CLI_FILENAME)) {
+                assertTrue(Files.isExecutable(temp), "CLI temp file must be executable before atomic publication");
+            }
+            Files.move(temp, cached, StandardCopyOption.REPLACE_EXISTING);
+        };
+
+        NativeRuntimeLoader.extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION, publisher);
+    }
+
+    @Test
+    void extractionCleansUpTempFileWhenPublicationFails(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+
+        // Capture the temp path so we can verify it was deleted
+        Path[] capturedTemp = {null};
+        NativeRuntimeLoader.AtomicPublisher failingPublisher = (temp, cached) -> {
+            capturedTemp[0] = temp;
+            throw new AtomicMoveNotSupportedException(temp.toString(), cached.toString(),
+                    "filesystem does not support atomic moves — test");
+        };
+
+        assertThrows(AtomicMoveNotSupportedException.class, () -> NativeRuntimeLoader.extractToCache(cacheBase, loader,
+                TEST_CLASSIFIER, TEST_VERSION, failingPublisher));
+
+        assertNotNull(capturedTemp[0], "Publisher must have been invoked");
+        assertFalse(Files.exists(capturedTemp[0]), "Temp file must be deleted after failed publication");
+    }
+
+    @Test
+    void extractionCleansUpTempFileWhenPublisherThrowsIllegalStateException(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+
+        Path[] capturedTemp = {null};
+        NativeRuntimeLoader.AtomicPublisher unsupportedPublisher = (temp, cached) -> {
+            capturedTemp[0] = temp;
+            // Simulate the wrapping that DEFAULT_PUBLISHER performs for
+            // AtomicMoveNotSupportedException
+            throw new IllegalStateException("Filesystem does not support atomic moves; cannot safely publish "
+                    + NativeRuntimeLoader.RUNTIME_FILENAME + " to " + cached);
+        };
+
+        IllegalStateException ex = assertThrows(IllegalStateException.class, () -> NativeRuntimeLoader
+                .extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION, unsupportedPublisher));
+
+        assertTrue(ex.getMessage().contains("atomic moves"),
+                "Error message should describe the atomic-move failure: " + ex.getMessage());
+        assertNotNull(capturedTemp[0], "Publisher must have been invoked");
+        assertFalse(Files.exists(capturedTemp[0]), "Temp file must be deleted after failed atomic publication");
+    }
+
+    // -------------------------------------------------------------------------
+    // Concurrent extraction safety
+    // -------------------------------------------------------------------------
+
+    @Test
+    void concurrentExtractionByMultipleThreadsBothSucceed(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+        int threadCount = 8;
+        CountDownLatch startGate = new CountDownLatch(1);
+        ExecutorService pool = Executors.newFixedThreadPool(threadCount);
+        List<Future<Path>> futures = new ArrayList<>();
+
+        for (int i = 0; i < threadCount; i++) {
+            futures.add(pool.submit(() -> {
+                startGate.await();
+                return NativeRuntimeLoader.extractToCache(cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION);
+            }));
+        }
+
+        startGate.countDown();
+        pool.shutdown();
+        assertTrue(pool.awaitTermination(10, TimeUnit.SECONDS));
+
+        Path expected = cacheBase.resolve(TEST_VERSION).resolve(TEST_NATIVE_VERSION).resolve(TEST_CLASSIFIER)
+                .resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        for (Future<Path> future : futures) {
+            Path result = future.get();
+            assertEquals(expected, result);
+            assertTrue(Files.isRegularFile(result));
+            assertTrue(Files.size(result) > 0);
+        }
+        try (var files = Files.list(expected.getParent())) {
+            assertEquals(List.of(expected), files.toList(), "Concurrent extraction must clean up temporary files");
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // resolve() -- full three-source resolution chain
+    // -------------------------------------------------------------------------
+
+    @Test
+    void resolveWithNullCliEnvExtractsFromClasspath(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader loader = classLoaderWithRuntimeResource(tempDir, TEST_CLASSIFIER);
+
+        Path result = NativeRuntimeLoader.resolve(null, cacheBase, loader, TEST_CLASSIFIER, TEST_VERSION);
+
+        assertNotNull(result);
+        assertTrue(Files.isRegularFile(result));
+        assertTrue(Files.size(result) > 0);
+    }
+
+    @Test
+    void resolveThrowsWhenNoSourceIsAvailable(@TempDir Path tempDir) {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader emptyLoader = new URLClassLoader(new URL[0], null);
+
+        // No CLI env, no classpath resource, no bundled-CLI dir → throw
+        assertThrows(IOException.class,
+                () -> NativeRuntimeLoader.resolve(null, cacheBase, emptyLoader, TEST_CLASSIFIER, TEST_VERSION));
+    }
+
+    @Test
+    void resolveFallsBackToRuntimeAlongsideBundledCli(@TempDir Path tempDir) throws Exception {
+        Path cacheBase = tempDir.resolve("cache");
+        ClassLoader emptyLoader = new URLClassLoader(new URL[0], null);
+        Path bundledCli = tempDir.resolve("copilot");
+        Files.createFile(bundledCli);
+        Path runtimeNode = tempDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME);
+        Files.write(runtimeNode, FAKE_BINARY_CONTENT);
+
+        Path result = NativeRuntimeLoader.resolve(null, bundledCli.toString(), cacheBase, emptyLoader, TEST_CLASSIFIER,
+                TEST_VERSION);
+
+        assertEquals(runtimeNode, result);
+    }
+
+    // -------------------------------------------------------------------------
+    // Helpers
+    // -------------------------------------------------------------------------
+
+    private static ClassLoader classLoaderWithVersionResource(Path tempDir, String version) throws IOException {
+        Path propsFile = tempDir.resolve(NativeRuntimeLoader.VERSION_RESOURCE);
+        Files.writeString(propsFile, "version=" + version + "\n");
+        return new URLClassLoader(new URL[]{tempDir.toUri().toURL()}, null);
+    }
+
+    private static ClassLoader classLoaderWithRuntimeResource(Path tempDir, String classifier) throws IOException {
+        writeRuntimeResource(tempDir, classifier, FAKE_BINARY_CONTENT);
+        return new URLClassLoader(new URL[]{tempDir.toUri().toURL()}, null);
+    }
+
+    private static ClassLoader classLoaderWithRuntimeAndCliResources(Path tempDir, String classifier)
+            throws IOException {
+        writeRuntimeResource(tempDir, classifier, FAKE_BINARY_CONTENT);
+        Path resourceDir = tempDir.resolve("native").resolve(classifier);
+        Files.write(resourceDir.resolve(TEST_CLI_FILENAME), FAKE_CLI_CONTENT);
+        return new URLClassLoader(new URL[]{tempDir.toUri().toURL()}, null);
+    }
+
+    private static ClassLoader classLoaderWithNativeArtifacts(Path tempDir, String classifier, String nativeVersion,
+            byte[] runtimeContent, byte[] cliContent) throws IOException {
+        writeRuntimeResource(tempDir, classifier, runtimeContent);
+        Path resourceDir = tempDir.resolve("native").resolve(classifier);
+        Files.write(resourceDir.resolve(TEST_CLI_FILENAME), cliContent);
+        Files.writeString(resourceDir.resolve("platform.properties"),
+                "classifier=" + classifier + "\nversion=" + nativeVersion + "\n");
+        return new URLClassLoader(new URL[]{tempDir.toUri().toURL()}, null);
+    }
+
+    private static void writeRuntimeResource(Path tempDir, String classifier, byte[] content) throws IOException {
+        Path resourceDir = tempDir.resolve("native").resolve(classifier);
+        Files.createDirectories(resourceDir);
+        Files.write(resourceDir.resolve(NativeRuntimeLoader.RUNTIME_FILENAME), content);
+        Files.writeString(resourceDir.resolve("platform.properties"),
+                "classifier=" + classifier + "\nversion=" + TEST_NATIVE_VERSION + "\n");
+    }
+
+    private static void assertBytesEqual(byte[] expected, byte[] actual) {
+        assertEquals(expected.length, actual.length, "Array lengths differ");
+        for (int i = 0; i < expected.length; i++) {
+            assertEquals(expected[i], actual[i], "Byte differs at index " + i);
+        }
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/ffi/PlatformDetectorTest.java b/java/sdk/src/test/java/com/github/copilot/ffi/PlatformDetectorTest.java
new file mode 100644
index 0000000000..82049ea6af
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ffi/PlatformDetectorTest.java
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+class PlatformDetectorTest {
+
+    @Test
+    void detectOsMapsSupportedNames() {
+        withSystemProperty("os.name", "Mac OS X", () -> assertEquals("darwin", PlatformDetector.detectOs()));
+        withSystemProperty("os.name", "Darwin", () -> assertEquals("darwin", PlatformDetector.detectOs()));
+        withSystemProperty("os.name", "Windows 11", () -> assertEquals("win32", PlatformDetector.detectOs()));
+        withSystemProperty("os.name", "Linux", () -> assertEquals("linux", PlatformDetector.detectOs()));
+    }
+
+    @Test
+    void detectOsThrowsForUnsupportedSystem() {
+        withSystemProperty("os.name", "Solaris",
+                () -> assertThrows(IllegalStateException.class, PlatformDetector::detectOs));
+    }
+
+    @Test
+    void detectArchMapsSupportedAliases() {
+        withSystemProperty("os.arch", "amd64", () -> assertEquals("x64", PlatformDetector.detectArch()));
+        withSystemProperty("os.arch", "x86_64", () -> assertEquals("x64", PlatformDetector.detectArch()));
+        withSystemProperty("os.arch", "x64", () -> assertEquals("x64", PlatformDetector.detectArch()));
+        withSystemProperty("os.arch", "aarch64", () -> assertEquals("arm64", PlatformDetector.detectArch()));
+        withSystemProperty("os.arch", "arm64", () -> assertEquals("arm64", PlatformDetector.detectArch()));
+    }
+
+    @Test
+    void detectArchThrowsForUnsupportedArchitecture() {
+        withSystemProperty("os.arch", "ppc64",
+                () -> assertThrows(IllegalStateException.class, PlatformDetector::detectArch));
+    }
+
+    @Test
+    void detectLinuxLibcParsesGlibcInterpPath() throws Exception {
+        byte[] glibcProbe = buildElf64ProbeWithInterp("/lib64/ld-linux-x86-64.so.2");
+        assertEquals(PlatformDetector.LinuxLibc.GLIBC, PlatformDetector.detectLinuxLibc(glibcProbe));
+    }
+
+    @Test
+    void detectLinuxLibcParsesMuslInterpPath() throws Exception {
+        byte[] muslProbe = buildElf64ProbeWithInterp("/lib/ld-musl-x86_64.so.1");
+        assertEquals(PlatformDetector.LinuxLibc.MUSL, PlatformDetector.detectLinuxLibc(muslProbe));
+    }
+
+    @Test
+    void detectLinuxLibcOnLinuxReturnsRecognizedValue() {
+        withSystemProperty("os.name", "Linux", () -> {
+            PlatformDetector.LinuxLibc libc = PlatformDetector.detectLinuxLibc();
+            assertTrue(libc == PlatformDetector.LinuxLibc.GLIBC || libc == PlatformDetector.LinuxLibc.MUSL
+                    || libc == PlatformDetector.LinuxLibc.UNKNOWN);
+        });
+    }
+
+    @Test
+    void detectLinuxLibcReturnsUnknownOutsideLinux() {
+        withSystemProperty("os.name", "Windows 11",
+                () -> assertEquals(PlatformDetector.LinuxLibc.UNKNOWN, PlatformDetector.detectLinuxLibc()));
+    }
+
+    @Test
+    void detectClassifierReturnsClassifierForCurrentLinuxLibc() {
+        PlatformDetector.LinuxLibc libc = PlatformDetector.detectLinuxLibc();
+        String expected = libc == PlatformDetector.LinuxLibc.MUSL ? "linuxmusl-x64" : "linux-x64";
+
+        withSystemProperties("Linux", "amd64", () -> assertEquals(expected, PlatformDetector.detectClassifier()));
+    }
+
+    @Test
+    void detectClassifierAllowListCoversAllSupportedValues() {
+        Set<String> expected = Set.of("linux-x64", "linux-arm64", "linuxmusl-x64", "linuxmusl-arm64", "darwin-x64",
+                "darwin-arm64", "win32-x64", "win32-arm64");
+        assertEquals(expected, PlatformDetector.supportedClassifiers());
+
+        Set<String> resolved = new LinkedHashSet<>();
+        resolved.add(PlatformDetector.detectClassifier("linux", "x64", PlatformDetector.LinuxLibc.GLIBC));
+        resolved.add(PlatformDetector.detectClassifier("linux", "arm64", PlatformDetector.LinuxLibc.GLIBC));
+        resolved.add(PlatformDetector.detectClassifier("linux", "x64", PlatformDetector.LinuxLibc.MUSL));
+        resolved.add(PlatformDetector.detectClassifier("linux", "arm64", PlatformDetector.LinuxLibc.MUSL));
+        resolved.add(PlatformDetector.detectClassifier("darwin", "x64", PlatformDetector.LinuxLibc.UNKNOWN));
+        resolved.add(PlatformDetector.detectClassifier("darwin", "arm64", PlatformDetector.LinuxLibc.UNKNOWN));
+        resolved.add(PlatformDetector.detectClassifier("win32", "x64", PlatformDetector.LinuxLibc.UNKNOWN));
+        resolved.add(PlatformDetector.detectClassifier("win32", "arm64", PlatformDetector.LinuxLibc.UNKNOWN));
+
+        assertEquals(expected, resolved);
+    }
+
+    @Test
+    void detectClassifierFailsFastForUnsupportedTuple() {
+        assertThrows(IllegalStateException.class,
+                () -> PlatformDetector.detectClassifier("darwin", "mips64", PlatformDetector.LinuxLibc.UNKNOWN));
+    }
+
+    @Test
+    void detectClassifierFailsForUnsupportedCurrentPlatform() {
+        withSystemProperties("Solaris", "amd64",
+                () -> assertThrows(IllegalStateException.class, PlatformDetector::detectClassifier));
+    }
+
+    @Test
+    void detectLinuxLibcReturnsUnknownWhenElfParsingFails() {
+        byte[] invalidProbe = new byte[64];
+        Arrays.fill(invalidProbe, (byte) 1);
+
+        assertThrows(IOException.class, () -> PlatformDetector.detectLinuxLibc(invalidProbe));
+    }
+
+    @Test
+    void detectLinuxLibcReturnsUnknownForTruncatedProgramHeader(@TempDir Path tempDir) throws IOException {
+        byte[] malformedProbe = buildElf64ProbeWithInterp("/lib64/ld-linux-x86-64.so.2");
+        writeLe64(malformedProbe, 32, malformedProbe.length - 1);
+        writeLe16(malformedProbe, 54, 1);
+        Path executable = tempDir.resolve("malformed-elf");
+        Files.write(executable, malformedProbe);
+
+        assertEquals(PlatformDetector.LinuxLibc.UNKNOWN, PlatformDetector.detectLinuxLibc(executable));
+    }
+
+    private static void withSystemProperties(String osName, String osArch, Runnable action) {
+        String previousOsName = System.getProperty("os.name");
+        String previousOsArch = System.getProperty("os.arch");
+        try {
+            System.setProperty("os.name", osName);
+            System.setProperty("os.arch", osArch);
+            action.run();
+        } finally {
+            restoreProperty("os.name", previousOsName);
+            restoreProperty("os.arch", previousOsArch);
+        }
+    }
+
+    private static void withSystemProperty(String key, String value, Runnable action) {
+        String previousValue = System.getProperty(key);
+        try {
+            System.setProperty(key, value);
+            action.run();
+        } finally {
+            restoreProperty(key, previousValue);
+        }
+    }
+
+    private static void restoreProperty(String key, String value) {
+        if (value == null) {
+            System.clearProperty(key);
+        } else {
+            System.setProperty(key, value);
+        }
+    }
+
+    private static byte[] buildElf64ProbeWithInterp(String interpreterPath) {
+        byte[] interpBytes = interpreterPath.getBytes(StandardCharsets.UTF_8);
+        byte[] probe = new byte[512];
+
+        probe[0] = 0x7F;
+        probe[1] = 'E';
+        probe[2] = 'L';
+        probe[3] = 'F';
+        probe[4] = 2;
+        probe[5] = 1;
+
+        int phoff = 64;
+        int phentsize = 56;
+        int phnum = 1;
+        int interpOffset = 256;
+        int interpSize = interpBytes.length + 1;
+
+        writeLe64(probe, 32, phoff);
+        writeLe16(probe, 54, phentsize);
+        writeLe16(probe, 56, phnum);
+
+        int pHeader = phoff;
+        writeLe32(probe, pHeader, 3);
+        writeLe64(probe, pHeader + 8, interpOffset);
+        writeLe64(probe, pHeader + 32, interpSize);
+
+        System.arraycopy(interpBytes, 0, probe, interpOffset, interpBytes.length);
+        probe[interpOffset + interpBytes.length] = 0;
+        return probe;
+    }
+
+    private static void writeLe16(byte[] buffer, int offset, int value) {
+        buffer[offset] = (byte) (value & 0xFF);
+        buffer[offset + 1] = (byte) ((value >>> 8) & 0xFF);
+    }
+
+    private static void writeLe32(byte[] buffer, int offset, int value) {
+        buffer[offset] = (byte) (value & 0xFF);
+        buffer[offset + 1] = (byte) ((value >>> 8) & 0xFF);
+        buffer[offset + 2] = (byte) ((value >>> 16) & 0xFF);
+        buffer[offset + 3] = (byte) ((value >>> 24) & 0xFF);
+    }
+
+    private static void writeLe64(byte[] buffer, int offset, long value) {
+        for (int i = 0; i < 8; i++) {
+            buffer[offset + i] = (byte) ((value >>> (8 * i)) & 0xFF);
+        }
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/ffi/QueueInputStreamTest.java b/java/sdk/src/test/java/com/github/copilot/ffi/QueueInputStreamTest.java
new file mode 100644
index 0000000000..6fd9616706
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ffi/QueueInputStreamTest.java
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.ffi;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+
+class QueueInputStreamTest {
+
+    @Test
+    void readReturnsEnqueuedBytesAcrossMultipleChunks() throws Exception {
+        QueueInputStream stream = new QueueInputStream();
+        stream.enqueue("hello ".getBytes(StandardCharsets.UTF_8));
+        stream.enqueue("world".getBytes(StandardCharsets.UTF_8));
+
+        byte[] buffer = new byte[11];
+        int first = stream.read(buffer, 0, 6);
+        int second = stream.read(buffer, 6, 5);
+
+        assertEquals(6, first);
+        assertEquals(5, second);
+        assertArrayEquals("hello world".getBytes(StandardCharsets.UTF_8), buffer);
+    }
+
+    @Test
+    void readBlocksUntilDataArrives() throws Exception {
+        QueueInputStream stream = new QueueInputStream();
+
+        CompletableFuture<Integer> readFuture = CompletableFuture.supplyAsync(() -> {
+            try {
+                return stream.read();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        Thread.sleep(100);
+        stream.enqueue(new byte[]{(byte) 'A'});
+
+        assertEquals((int) 'A', readFuture.get(2, TimeUnit.SECONDS));
+    }
+
+    @Test
+    void closeSignalsEndOfStream() throws Exception {
+        QueueInputStream stream = new QueueInputStream();
+        stream.enqueue("x".getBytes(StandardCharsets.UTF_8));
+
+        assertEquals('x', stream.read());
+        stream.close();
+        assertEquals(-1, stream.read());
+    }
+
+    @Test
+    void closeUnblocksPendingReadWithEof() throws Exception {
+        QueueInputStream stream = new QueueInputStream();
+
+        CompletableFuture<Integer> readFuture = CompletableFuture.supplyAsync(() -> {
+            try {
+                return stream.read();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        Thread.sleep(100);
+        stream.close();
+
+        assertEquals(-1, readFuture.get(2, TimeUnit.SECONDS));
+        assertTrue(readFuture.isDone());
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/generated/GeneratedEventTypesCoverageTest.java b/java/sdk/src/test/java/com/github/copilot/generated/GeneratedEventTypesCoverageTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/generated/GeneratedEventTypesCoverageTest.java
rename to java/sdk/src/test/java/com/github/copilot/generated/GeneratedEventTypesCoverageTest.java
diff --git a/java/src/test/java/com/github/copilot/generated/GeneratedTypesJacksonRoundTripTest.java b/java/sdk/src/test/java/com/github/copilot/generated/GeneratedTypesJacksonRoundTripTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/generated/GeneratedTypesJacksonRoundTripTest.java
rename to java/sdk/src/test/java/com/github/copilot/generated/GeneratedTypesJacksonRoundTripTest.java
diff --git a/java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java b/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java
similarity index 98%
rename from java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java
rename to java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java
index f3b3f98083..fd0fdaaea1 100644
--- a/java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java
@@ -126,7 +126,8 @@ void sessionRpc_mode_set_merges_sessionId() {
         var stub = new StubCaller();
         var session = new SessionRpc(stub, "sess-mode-set");
 
-        var modeParams = new SessionModeSetParams(null, null);
+        var modeParams = new SessionModeSetParams(null, null, null, null, null, null, null, null, null, null, null,
+                null);
         session.mode.set(modeParams);
 
         assertEquals(1, stub.calls.size());
@@ -466,7 +467,7 @@ void sessionRpc_ui_elicitation_merges_sessionId() {
         var stub = new StubCaller();
         var session = new SessionRpc(stub, "sess-ui");
 
-        var uiParams = new SessionUiElicitationParams(null, "Please provide info", null);
+        var uiParams = new SessionUiElicitationParams(null, null, "Please provide info", null, null, null);
         session.ui.elicitation(uiParams);
 
         assertEquals(1, stub.calls.size());
@@ -498,7 +499,7 @@ void sessionRpc_permissions_handlePendingPermissionRequest_merges_sessionId() {
         var stub = new StubCaller();
         var session = new SessionRpc(stub, "sess-perm");
 
-        var permParams = new SessionPermissionsHandlePendingPermissionRequestParams(null, "req-perm-1", "allow");
+        var permParams = new SessionPermissionsHandlePendingPermissionRequestParams(null, "req-perm-1", "allow", null);
         session.permissions.handlePendingPermissionRequest(permParams);
 
         assertEquals(1, stub.calls.size());
diff --git a/java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java b/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
similarity index 97%
rename from java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
rename to java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
index 3b8a716c7d..602089d012 100644
--- a/java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
@@ -301,7 +301,8 @@ void sessionModeGetParams_record() {
 
     @Test
     void sessionModeSetParams_record() {
-        var params = new SessionModeSetParams("sess-30", SessionMode.PLAN);
+        var params = new SessionModeSetParams("sess-30", SessionMode.PLAN, null, null, null, null, null, null, null,
+                null, null, null);
         assertEquals("sess-30", params.sessionId());
         assertEquals(SessionMode.PLAN, params.mode());
     }
@@ -326,7 +327,7 @@ void sessionModelGetCurrentParams_record() {
     @Test
     void sessionModelSwitchToParams_record() {
         var params = new SessionModelSwitchToParams("sess-32", "claude-sonnet-4.5", "high", null, null, null, null,
-                null);
+                null, null, null, null, null, null, null, null);
         assertEquals("sess-32", params.sessionId());
         assertEquals("claude-sonnet-4.5", params.modelId());
         assertEquals("high", params.reasoningEffort());
@@ -338,10 +339,11 @@ void sessionModelSwitchToParams_record() {
 
     @Test
     void sessionPermissionsHandlePendingPermissionRequestParams_record() {
-        var params = new SessionPermissionsHandlePendingPermissionRequestParams("sess-33", "req-1", "allow");
+        var params = new SessionPermissionsHandlePendingPermissionRequestParams("sess-33", "req-1", "allow", null);
         assertEquals("sess-33", params.sessionId());
         assertEquals("req-1", params.requestId());
         assertEquals("allow", params.result());
+        assertNull(params.decisionContext());
     }
 
     @Test
@@ -434,7 +436,7 @@ void sessionToolsHandlePendingToolCallParams_record() {
 
     @Test
     void sessionUiElicitationParams_record() {
-        var params = new SessionUiElicitationParams("sess-45", "What is your name?", null);
+        var params = new SessionUiElicitationParams("sess-45", null, "What is your name?", null, null, null);
         assertEquals("sess-45", params.sessionId());
         assertEquals("What is your name?", params.message());
         assertNull(params.requestedSchema());
@@ -660,7 +662,7 @@ void sessionModelGetCurrentResult_record() {
 
     @Test
     void sessionModelSwitchToResult_record() {
-        var result = new SessionModelSwitchToResult("gpt-5", true);
+        var result = new SessionModelSwitchToResult("gpt-5", true, null, null, null, null, null, null);
         assertEquals("gpt-5", result.modelId());
         assertEquals(true, result.deferred());
     }
@@ -706,11 +708,12 @@ void sessionShellKillResult_record() {
 
     @Test
     void sessionSkillsListResult_nested() {
-        var item = new Skill("deploy", "Deploy the app", SkillSource.PROJECT, true, true, "/skills/deploy.md", null,
-                null);
+        var item = new Skill("deploy", "deploy", "Deploy the app", SkillSource.PROJECT, true, true, "/skills/deploy.md",
+                null, null);
         var result = new SessionSkillsListResult(List.of(item));
         assertEquals(1, result.skills().size());
         assertEquals("deploy", result.skills().get(0).name());
+        assertEquals("deploy", result.skills().get(0).commandName());
         assertEquals(SkillSource.PROJECT, result.skills().get(0).source());
         assertTrue(result.skills().get(0).enabled());
     }
@@ -729,7 +732,7 @@ void sessionToolsHandlePendingToolCallResult_record() {
 
     @Test
     void sessionUiElicitationResult_accept() {
-        var result = new SessionUiElicitationResult(UIElicitationResponseAction.ACCEPT, Map.of("name", "Alice"));
+        var result = new SessionUiElicitationResult(UIElicitationResponseAction.ACCEPT, Map.of("name", "Alice"), null);
         assertEquals(UIElicitationResponseAction.ACCEPT, result.action());
         assertEquals("Alice", result.content().get("name"));
     }
@@ -754,8 +757,8 @@ void sessionUiHandlePendingElicitationResult_record() {
     @Test
     void sessionUsageGetMetricsResult_nested() {
         var changes = new UsageMetricsCodeChanges(100L, 50L, 5L, null);
-        var result = new SessionUsageGetMetricsResult(0.5, 10L, null, null, 2000L, null, changes, null, "gpt-5", 1000L,
-                500L);
+        var result = new SessionUsageGetMetricsResult(0.5, 10L, null, null, 2000L, null, changes, null, null, "gpt-5",
+                1000L, 500L);
         assertEquals(0.5, result.totalPremiumRequestCost());
         assertEquals(10L, result.totalUserRequests());
         assertNotNull(result.codeChanges());
@@ -815,7 +818,8 @@ void modelsListResult_nested() {
         var policy = new ModelPolicy(ModelPolicyState.ENABLED, null);
         var promo = new ModelBillingPromo("summer-2026", 25.0, "2026-08-01T00:00:00Z", "Summer discount");
         var billing = new ModelBilling(1.0, null, null, promo);
-        var modelItem = new Model("gpt-5", "GPT-5", capabilities, policy, billing, null, null, null);
+        var modelItem = new Model("gpt-5", "GPT-5", capabilities, policy, billing, null, null, null, null, null, null,
+                null, null);
         var result = new ModelsListResult(List.of(modelItem));
 
         assertEquals(1, result.models().size());
@@ -851,7 +855,8 @@ void sessionModelSwitchToParams_nested_records() {
         var limits = new ModelCapabilitiesOverrideLimits(100000L, 8192L, 128000L, limitsVision);
         var supports = new ModelCapabilitiesOverrideSupports(true, true, null);
         var capabilities = new ModelCapabilitiesOverride(supports, limits);
-        var params = new SessionModelSwitchToParams("sess-m", "gpt-5", null, null, null, capabilities, null, null);
+        var params = new SessionModelSwitchToParams("sess-m", "gpt-5", null, null, null, capabilities, null, null, null,
+                null, null, null, null, null, null);
 
         assertEquals("gpt-5", params.modelId());
         assertNotNull(params.modelCapabilities());
@@ -866,7 +871,7 @@ void sessionModelSwitchToParams_nested_records() {
     @Test
     void sessionUiElicitationParams_nested_schema() {
         var schema = new UIElicitationSchema("object", Map.of("name", Map.of("type", "string")), List.of("name"));
-        var params = new SessionUiElicitationParams("sess-elicit", "Please fill form", schema);
+        var params = new SessionUiElicitationParams("sess-elicit", null, "Please fill form", schema, null, null);
         assertEquals("sess-elicit", params.sessionId());
         assertEquals("object", params.requestedSchema().type());
         assertTrue(params.requestedSchema().required().contains("name"));
diff --git a/java/src/test/java/com/github/copilot/rpc/ParamCoercionTest.java b/java/sdk/src/test/java/com/github/copilot/rpc/ParamCoercionTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/ParamCoercionTest.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/ParamCoercionTest.java
diff --git a/java/src/test/java/com/github/copilot/rpc/ParamSchemaTest.java b/java/sdk/src/test/java/com/github/copilot/rpc/ParamSchemaTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/ParamSchemaTest.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/ParamSchemaTest.java
diff --git a/java/sdk/src/test/java/com/github/copilot/rpc/PermissionRequestResultDecisionContextTest.java b/java/sdk/src/test/java/com/github/copilot/rpc/PermissionRequestResultDecisionContextTest.java
new file mode 100644
index 0000000000..1097b9ea0e
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/rpc/PermissionRequestResultDecisionContextTest.java
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.rpc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.copilot.generated.rpc.PermissionDecisionContext;
+import com.github.copilot.generated.rpc.PermissionDecisionOutcome;
+import com.github.copilot.generated.rpc.PermissionDecisionSource;
+import com.github.copilot.generated.rpc.PermissionDecisionSurface;
+import com.github.copilot.generated.rpc.SessionPermissionsHandlePendingPermissionRequestParams;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Verifies that {@link PermissionRequestResult} carries an optional
+ * {@link PermissionDecisionContext} as a sibling of {@code result} — never
+ * nested inside the serialized result — when the SDK forwards a permission
+ * response to the runtime.
+ */
+class PermissionRequestResultDecisionContextTest {
+
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    private static PermissionDecisionContext sampleContext() {
+        return new PermissionDecisionContext(PermissionDecisionOutcome.AUTO_APPROVED,
+                PermissionDecisionSource.HOST_POLICY, PermissionDecisionSurface.SDK, null);
+    }
+
+    @Test
+    void setDecisionContextForwardsContextAsSiblingOfResult() throws Exception {
+        var result = PermissionRequestResult.approveOnce().setDecisionContext(sampleContext());
+        var params = new SessionPermissionsHandlePendingPermissionRequestParams("session-1", "req-1", result,
+                result.getDecisionContext());
+
+        JsonNode json = MAPPER.valueToTree(params);
+
+        assertTrue(json.has("decisionContext"), "decisionContext must be a top-level sibling of result");
+        assertEquals("host_policy", json.get("decisionContext").get("source").asText());
+        assertEquals("auto_approved", json.get("decisionContext").get("outcome").asText());
+        assertEquals("sdk", json.get("decisionContext").get("surface").asText());
+        assertFalse(json.get("result").has("decisionContext"), "decisionContext must NOT be nested inside result");
+    }
+
+    @Test
+    void withoutContextOmitsDecisionContextKey() throws Exception {
+        var result = PermissionRequestResult.approveOnce();
+        assertNull(result.getDecisionContext());
+
+        var params = new SessionPermissionsHandlePendingPermissionRequestParams("session-1", "req-1", result,
+                result.getDecisionContext());
+
+        JsonNode json = MAPPER.valueToTree(params);
+
+        // Generated params record is @JsonInclude(NON_NULL), so a null
+        // decisionContext is omitted entirely — byte-identical to legacy behavior.
+        assertFalse(json.has("decisionContext"), "decisionContext key must be absent when no context is supplied");
+    }
+
+    @Test
+    void setDecisionContextTwiceReplacesRatherThanNests() {
+        var first = sampleContext();
+        var second = new PermissionDecisionContext(PermissionDecisionOutcome.PROMPTED_USER,
+                PermissionDecisionSource.HUMAN_RESPONSE, PermissionDecisionSurface.TUI, null);
+
+        var result = PermissionRequestResult.approveOnce().setDecisionContext(first).setDecisionContext(second);
+
+        assertSame(second, result.getDecisionContext(), "second setDecisionContext must replace the first, not nest");
+    }
+
+    @Test
+    void serializingResultWithContextDoesNotEmitContextInsideResult() throws Exception {
+        var result = PermissionRequestResult.approveOnce().setDecisionContext(sampleContext());
+
+        JsonNode resultJson = MAPPER.valueToTree(result);
+
+        assertFalse(resultJson.has("decisionContext"),
+                "@JsonIgnore must keep decisionContext out of the serialized result");
+        assertEquals(PermissionRequestResultKind.APPROVED.getValue(), resultJson.get("kind").asText());
+    }
+
+    @Test
+    void setDecisionContextAcceptsNullAsNoContext() {
+        var result = PermissionRequestResult.approveOnce().setDecisionContext(sampleContext());
+
+        result.setDecisionContext(null);
+
+        assertNull(result.getDecisionContext(), "null must clear the context rather than throwing");
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/rpc/RecordInvocationArgs.java b/java/sdk/src/test/java/com/github/copilot/rpc/RecordInvocationArgs.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/RecordInvocationArgs.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/RecordInvocationArgs.java
diff --git a/java/src/test/java/com/github/copilot/rpc/ToolDefinitionFromObjectTest.java b/java/sdk/src/test/java/com/github/copilot/rpc/ToolDefinitionFromObjectTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/ToolDefinitionFromObjectTest.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/ToolDefinitionFromObjectTest.java
diff --git a/java/sdk/src/test/java/com/github/copilot/rpc/ToolDefinitionIsTerminalTest.java b/java/sdk/src/test/java/com/github/copilot/rpc/ToolDefinitionIsTerminalTest.java
new file mode 100644
index 0000000000..850dfa251f
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/rpc/ToolDefinitionIsTerminalTest.java
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+package com.github.copilot.rpc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+/** Wire-level coverage for {@link ToolDefinition#isTerminal()}. */
+class ToolDefinitionIsTerminalTest {
+
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    @Test
+    void isTerminalSerializesAsCamelCaseWhenSet() throws Exception {
+        ToolDefinition definition = new ToolDefinition("clear_context", "Clear the conversation",
+                Map.of("type", "object"), null, null, null, null, null, true);
+
+        JsonNode node = MAPPER.valueToTree(definition);
+
+        assertTrue(node.has("isTerminal"), "isTerminal should be serialized");
+        assertTrue(node.get("isTerminal").asBoolean(), "isTerminal should be true");
+    }
+
+    @Test
+    void isTerminalIsOmittedWhenNull() throws Exception {
+        ToolDefinition definition = new ToolDefinition("plain", "A plain tool", Map.of("type", "object"), null, null,
+                null, null, null, null);
+
+        JsonNode node = MAPPER.valueToTree(definition);
+
+        assertFalse(node.has("isTerminal"), "isTerminal should be omitted when null");
+    }
+
+    @Test
+    void sevenArgumentConstructorStillCompilesAndLeavesTerminalityUnset() throws Exception {
+        // Guards source compatibility for call sites written before isTerminal
+        // was added as a record component.
+        ToolDefinition definition = new ToolDefinition("legacy", "Legacy call site", Map.of("type", "object"), null,
+                null, null, null);
+
+        assertEquals(null, definition.isTerminal());
+        assertFalse(MAPPER.valueToTree(definition).has("isTerminal"));
+    }
+}
diff --git a/java/src/test/java/com/github/copilot/rpc/ToolDefinitionLambdaTest.java b/java/sdk/src/test/java/com/github/copilot/rpc/ToolDefinitionLambdaTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/ToolDefinitionLambdaTest.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/ToolDefinitionLambdaTest.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/ArgCoercionTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/ArgCoercionTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/ArgCoercionTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/ArgCoercionTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/ArgCoercionTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/ArgCoercionTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/ArgCoercionTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/ArgCoercionTools.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/DateTimeTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/DateTimeTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/DateTimeTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/DateTimeTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/DateTimeTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/DateTimeTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/DateTimeTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/DateTimeTools.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/DefaultValueTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/DefaultValueTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/DefaultValueTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/DefaultValueTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/DefaultValueTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/DefaultValueTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/DefaultValueTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/DefaultValueTools.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/InvocationAwareTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/InvocationAwareTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/InvocationAwareTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/InvocationAwareTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/InvocationAwareTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/InvocationAwareTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/InvocationAwareTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/InvocationAwareTools.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/MultiReturnTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/MultiReturnTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/MultiReturnTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/MultiReturnTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/MultiReturnTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/MultiReturnTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/MultiReturnTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/MultiReturnTools.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/OptionalParamTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/OptionalParamTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/OptionalParamTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/OptionalParamTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/OptionalParamTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/OptionalParamTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/OptionalParamTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/OptionalParamTools.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/OverrideTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/OverrideTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/OverrideTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/OverrideTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/OverrideTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/OverrideTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/OverrideTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/OverrideTools.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/SimpleTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/SimpleTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/SimpleTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/SimpleTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/SimpleTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/SimpleTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/SimpleTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/SimpleTools.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/StaticInvocationTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/StaticInvocationTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/StaticInvocationTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/StaticInvocationTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/StaticInvocationTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/StaticInvocationTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/StaticInvocationTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/StaticInvocationTools.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/StaticTools$$CopilotToolMeta.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/StaticTools$$CopilotToolMeta.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/StaticTools$$CopilotToolMeta.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/StaticTools$$CopilotToolMeta.java
diff --git a/java/src/test/java/com/github/copilot/rpc/fixtures/StaticTools.java b/java/sdk/src/test/java/com/github/copilot/rpc/fixtures/StaticTools.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/rpc/fixtures/StaticTools.java
rename to java/sdk/src/test/java/com/github/copilot/rpc/fixtures/StaticTools.java
diff --git a/java/src/test/java/com/github/copilot/tool/CopilotToolAnnotationTest.java b/java/sdk/src/test/java/com/github/copilot/tool/CopilotToolAnnotationTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/tool/CopilotToolAnnotationTest.java
rename to java/sdk/src/test/java/com/github/copilot/tool/CopilotToolAnnotationTest.java
diff --git a/java/src/test/java/com/github/copilot/tool/CopilotToolProcessorTest.java b/java/sdk/src/test/java/com/github/copilot/tool/CopilotToolProcessorTest.java
similarity index 97%
rename from java/src/test/java/com/github/copilot/tool/CopilotToolProcessorTest.java
rename to java/sdk/src/test/java/com/github/copilot/tool/CopilotToolProcessorTest.java
index f0623d92ed..e7012c644f 100644
--- a/java/src/test/java/com/github/copilot/tool/CopilotToolProcessorTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/tool/CopilotToolProcessorTest.java
@@ -620,8 +620,8 @@ public String doSomething(@CopilotToolParam("Input") String input) {
         assertFalse(generated.contains("Map.<String, Object>of("),
                 "Expected no metadata map for a tool without metadata, got:\n" + generated);
         String normalizedGenerated = generated.replace("\r\n", "\n").replace('\r', '\n');
-        assertTrue(normalizedGenerated.contains("                null\n            )"),
-                "Expected metadata constructor argument to be null when metadata is absent, got:\n" + generated);
+        assertTrue(normalizedGenerated.contains("                null,\n                null\n            )"),
+                "Expected metadata and isTerminal constructor arguments to be null when absent, got:\n" + generated);
     }
 
     @Test
@@ -1243,6 +1243,28 @@ public String grep(@CopilotToolParam("Query") String query) {
                 "Expected Boolean.TRUE for overridesBuiltInTool, got:\n" + generated);
     }
 
+    @Test
+    void generatesTerminalTool_whenIsTerminal() {
+        String source = """
+                package test;
+                import com.github.copilot.tool.CopilotTool;
+                public class TerminalTools {
+                    @CopilotTool(value = "Ends the turn", isTerminal = true)
+                    public String finish() {
+                        return "done";
+                    }
+                }
+                """;
+
+        CompilationResult result = compileWithProcessor(List.of(inMemorySource("test.TerminalTools", source)));
+        assertNoErrors(result);
+        String generated = result.getGeneratedSource("test.TerminalTools$$CopilotToolMeta");
+        String normalizedGenerated = generated.replace("\r\n", "\n").replace('\r', '\n');
+        assertTrue(normalizedGenerated.contains(
+                "                null,\n                null,\n                null,\n                null,\n                Boolean.TRUE\n            )"),
+                "Expected Boolean.TRUE for isTerminal in the final constructor position, got:\n" + generated);
+    }
+
     // ── Test: Combined flags all apply independently ────────────────────────────
 
     @Test
@@ -1252,7 +1274,8 @@ void generatesCombinedFlags() {
                 import com.github.copilot.tool.CopilotTool;
                 import com.github.copilot.rpc.ToolDefer;
                 public class CombinedTools {
-                    @CopilotTool(value = "Combined", overridesBuiltInTool = true, skipPermission = true, defer = ToolDefer.AUTO)
+                    @CopilotTool(value = "Combined", overridesBuiltInTool = true, skipPermission = true,
+                        isTerminal = true, defer = ToolDefer.AUTO)
                     public String doAll() {
                         return "done";
                     }
@@ -1268,11 +1291,10 @@ public String doAll() {
         assertTrue(generated.contains("Boolean.TRUE"),
                 "Expected Boolean.TRUE for override/skipPermission, got:\n" + generated);
         assertTrue(generated.contains("ToolDefer.AUTO"), "Expected ToolDefer.AUTO, got:\n" + generated);
-        // Count Boolean.TRUE occurrences — should be 2 (overridesBuiltInTool +
-        // skipPermission)
+        // Count Boolean.TRUE occurrences — override, skipPermission, and isTerminal.
         long boolCount = generated.lines().filter(l -> l.contains("Boolean.TRUE")).count();
-        assertEquals(2, boolCount,
-                "Expected 2 Boolean.TRUE lines (overridesBuiltInTool + skipPermission), got:\n" + generated);
+        assertEquals(3, boolCount,
+                "Expected 3 Boolean.TRUE lines (override + skipPermission + isTerminal), got:\n" + generated);
     }
 
     // ── Test: ToolDefer.NONE results in regular create ──────────────────────────
diff --git a/java/src/test/java/com/github/copilot/tool/ParamTest.java b/java/sdk/src/test/java/com/github/copilot/tool/ParamTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/tool/ParamTest.java
rename to java/sdk/src/test/java/com/github/copilot/tool/ParamTest.java
diff --git a/java/src/test/java/com/github/copilot/tool/SchemaGeneratorTest.java b/java/sdk/src/test/java/com/github/copilot/tool/SchemaGeneratorTest.java
similarity index 100%
rename from java/src/test/java/com/github/copilot/tool/SchemaGeneratorTest.java
rename to java/sdk/src/test/java/com/github/copilot/tool/SchemaGeneratorTest.java
diff --git a/java/src/test/prompts/PROMPT-smoke-test.md b/java/sdk/src/test/prompts/PROMPT-smoke-test.md
similarity index 100%
rename from java/src/test/prompts/PROMPT-smoke-test.md
rename to java/sdk/src/test/prompts/PROMPT-smoke-test.md
diff --git a/java/src/test/resources/logging-debug.properties b/java/sdk/src/test/resources/logging-debug.properties
similarity index 100%
rename from java/src/test/resources/logging-debug.properties
rename to java/sdk/src/test/resources/logging-debug.properties
diff --git a/java/src/test/resources/logging.properties b/java/sdk/src/test/resources/logging.properties
similarity index 100%
rename from java/src/test/resources/logging.properties
rename to java/sdk/src/test/resources/logging.properties
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/NamedProviderConfig.java b/java/src/generated/java/com/github/copilot/generated/rpc/NamedProviderConfig.java
deleted file mode 100644
index 9ee1c5a956..0000000000
--- a/java/src/generated/java/com/github/copilot/generated/rpc/NamedProviderConfig.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------------------------------------------*/
-
-// AUTO-GENERATED FILE - DO NOT EDIT
-// Generated from: api.schema.json
-
-package com.github.copilot.generated.rpc;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Map;
-import javax.annotation.processing.Generated;
-
-/**
- * A named BYOK provider connection (transport + credentials).
- *
- * @since 1.0.0
- */
-@javax.annotation.processing.Generated("copilot-sdk-codegen")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown = true)
-public record NamedProviderConfig(
-    /** Stable identifier referenced by BYOK model definitions. Must not contain '/'. */
-    @JsonProperty("name") String name,
-    /** Provider type. Defaults to "openai" for generic OpenAI-compatible APIs. */
-    @JsonProperty("type") ProviderConfigType type,
-    /** Wire API format (openai/azure only). Defaults to "completions". */
-    @JsonProperty("wireApi") ProviderConfigWireApi wireApi,
-    /** Provider transport. Defaults to "http". */
-    @JsonProperty("transport") ProviderConfigTransport transport,
-    /** API endpoint URL. */
-    @JsonProperty("baseUrl") String baseUrl,
-    /** API key. Optional for local providers like Ollama. */
-    @JsonProperty("apiKey") String apiKey,
-    /** Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set. */
-    @JsonProperty("bearerToken") String bearerToken,
-    /** Azure-specific provider options. */
-    @JsonProperty("azure") ProviderConfigAzure azure,
-    /** Custom HTTP headers to include in all outbound requests to the provider. */
-    @JsonProperty("headers") Map<String, String> headers,
-    /** When true, the SDK client supplies bearer tokens on demand: the runtime calls the client-session `providerToken.getToken` callback before each request and applies the returned token as an `Authorization: Bearer <token>` header. This is the bearer/OAuth scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens (including Anthropic's), not a provider-specific API-key header such as Anthropic's `x-api-key`. The token-acquiring function itself stays on the SDK side and is never serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`, the callback takes precedence: the runtime applies the token returned by `providerToken.getToken` as the `Authorization: Bearer` header for each request and does not send the static credential. */
-    @JsonProperty("hasBearerTokenProvider") Boolean hasBearerTokenProvider
-) {
-}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfig.java b/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfig.java
deleted file mode 100644
index be4f2abe20..0000000000
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SandboxConfig.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------------------------------------------*/
-
-// AUTO-GENERATED FILE - DO NOT EDIT
-// Generated from: api.schema.json
-
-package com.github.copilot.generated.rpc;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import javax.annotation.processing.Generated;
-
-/**
- * Resolved sandbox configuration.
- *
- * @since 1.0.0
- */
-@javax.annotation.processing.Generated("copilot-sdk-codegen")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown = true)
-public record SandboxConfig(
-    /** Whether sandboxing is enabled for the session. */
-    @JsonProperty("enabled") Boolean enabled,
-    /** User-managed sandbox policy fragment merged into the auto-discovered base policy. */
-    @JsonProperty("userPolicy") SandboxConfigUserPolicy userPolicy,
-    /** Whether to auto-add the current working directory to readwritePaths. Default: true. */
-    @JsonProperty("addCurrentWorkingDirectory") Boolean addCurrentWorkingDirectory,
-    /** Whether to inject the Copilot GitHub token as an `http.<host>.extraheader` so authenticated HTTPS git works inside the sandbox without the shell-based credential helper the sandbox blocks. Default: false (opt-in). */
-    @JsonProperty("gitAuth") Boolean gitAuth,
-    /** Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the OS keyring the sandbox blocks. Default: false (opt-in). */
-    @JsonProperty("ghAuth") Boolean ghAuth,
-    /** Whether to auto-grant read access to common developer-tool caches, registries, and toolchains in their default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and, on Unix, up-front creation of) the scratch caches builds write on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so builds work without exporting CARGO_HOME/GOPATH/etc. Default: true (enabled by default; set to false to opt out). */
-    @JsonProperty("allowDevToolCaches") Boolean allowDevToolCaches
-) {
-}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetAllowAllResult.java b/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetAllowAllResult.java
deleted file mode 100644
index 28d9915df2..0000000000
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsGetAllowAllResult.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------------------------------------------*/
-
-// AUTO-GENERATED FILE - DO NOT EDIT
-// Generated from: api.schema.json
-
-package com.github.copilot.generated.rpc;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.copilot.CopilotExperimental;
-import javax.annotation.processing.Generated;
-
-/**
- * Current allow-all permission mode.
- *
- * @apiNote This method is experimental and may change in a future version.
- * @since 1.0.0
- */
-@CopilotExperimental
-@javax.annotation.processing.Generated("copilot-sdk-codegen")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown = true)
-public record SessionPermissionsGetAllowAllResult(
-    /** Whether full allow-all permissions are currently active */
-    @JsonProperty("enabled") Boolean enabled,
-    /** Current allow-all mode */
-    @JsonProperty("mode") PermissionsAllowAllMode mode
-) {
-}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetAllowAllParams.java b/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetAllowAllParams.java
deleted file mode 100644
index f31646f766..0000000000
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsSetAllowAllParams.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------------------------------------------*/
-
-// AUTO-GENERATED FILE - DO NOT EDIT
-// Generated from: api.schema.json
-
-package com.github.copilot.generated.rpc;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.copilot.CopilotExperimental;
-import javax.annotation.processing.Generated;
-
-/**
- * Allow-all mode to apply for the session.
- *
- * @apiNote This method is experimental and may change in a future version.
- * @since 1.0.0
- */
-@CopilotExperimental
-@javax.annotation.processing.Generated("copilot-sdk-codegen")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown = true)
-public record SessionPermissionsSetAllowAllParams(
-    /** Target session identifier */
-    @JsonProperty("sessionId") String sessionId,
-    /** Allow-all mode to apply. `on` enables full allow-all; `auto` enables advisory LLM auto-approval; `off` disables both. */
-    @JsonProperty("mode") PermissionsAllowAllMode mode,
-    /** Legacy full allow-all toggle. Prefer `mode`; when `mode` is omitted, `enabled: true` is treated as `mode: "on"` and any other value is treated as `mode: "off"`. */
-    @JsonProperty("enabled") Boolean enabled,
-    /** Optional model id for the `auto` mode auto-approval LLM judging. Only meaningful when `mode` is `auto`; ignored otherwise. When omitted, the session resolves a default judge model: `gpt-5.5` for CAPI sessions and the session's active model for BYOK sessions. */
-    @JsonProperty("model") String model,
-    /** Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers. */
-    @JsonProperty("source") PermissionsSetAllowAllSource source
-) {
-}
diff --git a/nodejs/.npmrc b/nodejs/.npmrc
new file mode 100644
index 0000000000..100721e01a
--- /dev/null
+++ b/nodejs/.npmrc
@@ -0,0 +1 @@
+omit-lockfile-registry-resolved=true
diff --git a/nodejs/README.md b/nodejs/README.md
index eec674ce4e..93f9c3fa6b 100644
--- a/nodejs/README.md
+++ b/nodejs/README.md
@@ -137,12 +137,25 @@ Create a new conversation session.
 - `infiniteSessions?: InfiniteSessionConfig` - Configure automatic context compaction (see below)
 - `workingDirectory?: string` - Working directory for the session (default: runtime process cwd).
 - `enableSessionStore?: boolean` - Enables the cross-session store for search and retrieval across sessions. When unset in `"copilot-cli"` mode, the runtime default applies (enabled). In `"empty"` mode, defaults to disabled.
+- `gitHubTokenProvider?: GitHubTokenProvider` - Acquires rotating, session-scoped GitHub tokens. Token results require a positive `expiresIn` value in seconds remaining when the callback completes; production tokens typically last eight hours. Cannot be combined with `gitHubToken`.
 - `provider?: ProviderConfig` - Custom API provider configuration (BYOK - Bring Your Own Key). See [Custom Providers](#custom-providers) section.
 - `onPermissionRequest?: PermissionHandler` - Optional handler called before each tool execution to approve or deny it. When omitted, permission requests are emitted as events and left pending for manual resolution. `approveAll` approves requests when managed settings are disabled and throws when `enableManagedSettings` is true. Custom handlers can inspect `managedApprovalRequired` for human-facing confirmation logic. See [Permission Handling](#permission-handling) section.
 - `onUserInputRequest?: UserInputHandler` - Handler for user input requests from the agent. Enables the `ask_user` tool. See [User Input Requests](#user-input-requests) section.
 - `onElicitationRequest?: ElicitationHandler` - Handler for elicitation requests dispatched by the server. Enables this client to present form-based UI dialogs on behalf of the agent or other session participants. See [Elicitation Requests](#elicitation-requests) section.
 - `hooks?: SessionHooks` - Hook handlers for session lifecycle events. See [Session Hooks](#session-hooks) section.
 
+```typescript
+const session = await client.createSession({
+    gitHubTokenProvider: async ({ host }) => ({
+        kind: "token",
+        accessToken: await acquireTokenForHost(host),
+        expiresIn: 8 * 60 * 60,
+    }),
+});
+```
+
+Initial acquisition runs during session creation or resume. Cancellation, provider errors, and invalid token responses reject that operation instead of falling back to ambient authentication. Idle sessions refresh only before their next credential-consuming operation; there is no background refresh timer.
+
 ##### `resumeSession(sessionId: string, config?: ResumeSessionConfig): Promise<CopilotSession>`
 
 Resume an existing session. Returns the session with `workspacePath` populated if infinite sessions were enabled.
diff --git a/nodejs/docs/extensions.md b/nodejs/docs/extensions.md
index d33a733120..3b7161f055 100644
--- a/nodejs/docs/extensions.md
+++ b/nodejs/docs/extensions.md
@@ -53,6 +53,27 @@ const session = await joinSession({
 
 The `session` object provides methods for sending messages, logging to the timeline, listening to events, and accessing the RPC API. See the `.d.ts` files in the SDK package for full type information.
 
+## Requesting Sensitive Environment Variables
+
+The CLI strips sensitive environment variables (for example `GITHUB_TOKEN`) from every extension process before it starts. An extension that needs one asks for it by name:
+
+```js
+import { joinSession } from "@github/copilot-sdk/extension";
+
+const session = await joinSession({
+    requestedEnvironmentVariables: ["GITHUB_TOKEN"],
+});
+
+// Granted values are in process.env once joinSession resolves.
+const token = process.env.GITHUB_TOKEN;
+```
+
+The CLI prompts the user with the extension's name and the exact list of variables requested. If the user approves, only those variables reach this extension and their values are written into `process.env` before `joinSession()` resolves. If the user denies, `joinSession()` rejects, the extension does not load, and its tools never reach the model.
+
+An approval is remembered against the exact set of names the user saw, so an extension that later asks for an additional variable prompts again. Names that are unset, or that the CLI does not filter from extensions, are not prompted for.
+
+An approved extension can pass a granted value to anything it starts, so ask only for what the extension genuinely needs.
+
 ## Further Reading
 
 - `examples.md` — Practical code examples for tools, hooks, events, and complete extensions
diff --git a/nodejs/docs/factories.md b/nodejs/docs/factories.md
index 0c1f0f09a0..903a3de8b1 100644
--- a/nodejs/docs/factories.md
+++ b/nodejs/docs/factories.md
@@ -16,11 +16,12 @@ const reviewChanged = defineFactory({
             "Review changed files and verify the findings. " +
             "args: { files: string[] } — the paths to review.",
         phases: [{ title: "Review" }, { title: "Verify" }],
-        limits: {
-            maxConcurrentSubagents: 3,
-            maxTotalSubagents: 10,
-            timeoutSeconds: 90.5,
-            maxAiCredits: 5,
+        argsSchema: {
+            type: "object",
+            required: ["files"],
+            properties: {
+                files: { type: "array", items: { type: "string" } },
+            },
         },
     },
     run: async (ctx) => {
@@ -41,9 +42,19 @@ const reviewChanged = defineFactory({
 const session = await joinSession({ factories: [reviewChanged] });
 ```
 
-Factory metadata contains a stable `name`, a human-readable `description`, declared `phases`, and optional `limits`. Phase entries contain a `title` and optional `detail`.
+Factory metadata contains a stable `name`, a human-readable `description`, declared `phases`, an optional `argsSchema`, and optional `limits`. Phase entries contain a `title` and optional `detail`.
 
-There is no declared schema for `ctx.args`. The `run_factory` tool forwards `args` verbatim and its parameter is untyped, so **the `description` is the only thing telling an agent what arguments to supply** — state the expected shape there whenever a factory reads `ctx.args`, as the example above does. Arguments supplied by an extension calling `session.factory.run(...)` directly are typed through `defineFactory<TArgs>`, but that typing does not reach the model. A factory that reads `ctx.args` should validate it rather than assume a shape.
+## Declaring an argument shape
+
+A factory that reads `ctx.args` should declare `meta.argsSchema`, as the example above does. When the model invokes the factory through the `run_factory` tool, the CLI validates `args` against the declaration **before** the run starts.
+
+Declaring one turns an expensive failure into a cheap one. With a schema, a malformed call is rejected up front — the model gets a correction hint and retries, and no run row, permission prompt, or credit spend happens. Without one, nothing validates: the run starts, takes a user approval, spends credits, and then dies inside the factory body with a confusing error. Agents can read the declared shape with `factories_manage` using `operation: "inspect"`.
+
+Enforcement covers structure — types, required properties, and enum or const values. Finer constraints such as `minLength`, `pattern`, or `additionalProperties` are recorded in the declaration but not enforced. The accepted vocabulary is the `FactoryJsonSchema` subset also used for subagent structured output: `type`, `required`, `enum`, `const`, recursive `properties`/`items`, and `anyOf`/`oneOf`/`allOf`. A `type` is one of `null`, `boolean`, `integer`, `number`, `string`, `array`, or `object`, or a non-empty array of those such as `["object", "null"]`. A declaration outside that subset is rejected at registration.
+
+`argsSchema` is optional and backward compatible. A factory that omits it behaves exactly as before, so **the `description` is then the only thing telling an agent what arguments to supply** — state the expected shape there.
+
+Validation covers the model's `run_factory` path only. An extension calling `session.factory.run(...)` directly is not validated against `argsSchema`; those arguments are typed through `defineFactory<TArgs>` instead, and that typing does not reach the model. So a factory that reads `ctx.args` should still validate it rather than assume a shape — the declared subset does not enforce every constraint, and it does not run at all on the SDK path.
 
 `defineFactory<TArgs, TResult>` accepts a `run(context)` function returning `Promise<TResult>`, where `TResult` is `JsonValue | void`. Objects, arrays, strings, numbers, booleans, and `null` are valid results. Returning `undefined` completes the factory with no result. Other non-JSON values are rejected.
 
@@ -53,7 +64,7 @@ The `run()` context provides:
 
 - `ctx.runId`: Stable ID reused across resumed attempts.
 - `ctx.args`: Invocation arguments, forwarded verbatim. When the caller omits `args`, this is `{}` rather than `undefined`.
-- `ctx.agent(prompt, options?)`: Runs one factory-owned subagent. Options are exactly `label`, `schema`, and `model`. See [Subagent calls](#subagent-calls).
+- `ctx.agent(prompt, options?)`: Runs one factory-owned subagent. Options are exactly `label`, `schema`, `model`, `agent`, `reasoningEffort`, and `contextTier`. See [Subagent calls](#subagent-calls).
 - `ctx.parallel(thunks)`: Runs thunks concurrently and awaits all of them (a barrier). A thunk that throws becomes `null` in the result array, so one failed item does not lose the rest. Cancellation and hard runtime failures (`ResponseError`, `ConnectionError`) are the exception — those propagate and reject the whole call, because they mean the run itself is in trouble rather than one item having failed. Handle them at run level; do not assume every failure arrives as a `null`. Rejects above 4096 items.
 - `ctx.pipeline(items, ...stages)`: Flows each item through every stage without a barrier between stages, so one item can be in a later stage while another is still in an earlier one. Each stage is called as `(previous, item, index)`, where `previous` is the prior stage's result and `item` is the original input. A stage that throws drops that item to `null` and skips its remaining stages, with the same exception for cancellation and hard runtime failures. Rejects above 4096 items.
 - `ctx.phase(title)`: Starts a named progress phase. This sets a single run-global value, so calling it from inside concurrent `parallel`/`pipeline` stages races. Call it at run-level transitions and distinguish concurrent work by `label` instead.
@@ -61,7 +72,7 @@ The `run()` context provides:
 - `ctx.step(key, producer, options?)`: Journals the producer's JSON result under a stable key so a resume replays it without re-running the producer. A journaled (default) producer must return a JSON-serializable value; `undefined` or a non-JSON value is rejected. Pass `{ volatile: true }` to bypass the journal and run the producer every time.
 
   The key is the *sole* identity: neither the producer body nor its inputs contribute to it. A resume replays the cached value for a matching key even if the producer has since changed, so version the key (`"scan-v2"`) whenever its inputs or meaning change. Journaled producers are best-effort at-least-once and may run again across crashes or concurrent same-key callers, so keep side effects idempotent.
-- `ctx.session`: The full session returned by `joinSession`.
+- `ctx.session`: The session returned by `joinSession`. It refuses calls that start or resume a factory run. Call `extensions_manage` with `operation: "guide"` to read more about the session APIs.
 - `ctx.signal`: Cooperative cancellation signal for extension work and subprocesses.
 - `ctx.factory(...)`: Always rejects because nested factories are not supported.
 
@@ -104,7 +115,14 @@ See [factory-patterns.md](./factory-patterns.md) for composable orchestration pa
 
 ## Resource limits
 
-Limits may be declared in `meta.limits` and overridden per invocation. All limits must be positive when present.
+Limits may be declared in `meta.limits` and overridden per invocation. Every limit is optional and must be positive when present; an omitted limit leaves that dimension unbounded, except that an omitted `maxConcurrentSubagents` falls back to `maxTotalSubagents`, so a declared total cap also bounds concurrency.
+
+Set a ceiling only from real knowledge of what the factory costs, or because the user named one. A guessed ceiling does not make a run safer: it stops a healthy run partway with `factory_limit_reached`, after that run has already spent credits. An agent authoring or invoking a factory on the user's behalf has no basis for estimating a number, so it should leave `limits` unset and bound the work with the factory's own counters instead. Omitting limits does not remove oversight of a model-initiated run: `run_factory` requests permission first, and that prompt shows the effective limits. SDK-initiated `run` and `resume` do not request permission, so an SDK caller that wants a ceiling sets it deliberately, from the cost it already knows.
+
+```js
+// Only when the cost profile is known, or the user asked for this ceiling.
+limits: { maxTotalSubagents: 10 },
+```
 
 - `maxConcurrentSubagents`: Positive integer concurrent-subagent cap. Additional subagents wait in a queue. Queueing applies backpressure and does not fail the run.
 - `maxTotalSubagents`: Positive integer cumulative admission cap. An attempted subagent beyond the cap ends the attempt with failure kind `maxTotalSubagents`.
@@ -156,7 +174,7 @@ session.factory.resume(
 ): Promise<FactoryRunResult>;
 ```
 
-Both resolve with the run envelope (`FactoryRunResult`) for **every** outcome — `completed`, `error`, `halted`, and `cancelled` alike. Inspect `status` and read `result` only when the run completed; a limit breach carries a typed `failure`. A declined fresh run is not a pre-execution failure: the run row already exists by the time the prompt is answered, so it resolves with a terminal `cancelled` envelope carrying the run ID. Only failures that occur *before* a run exists reject: an unknown factory name or an already-active session. Pre-execution resume failures, including a declined reapproval, throw `FactoryResumeError`, whose `code` is one of `not_found`, `non_resumable`, `already_active`, `reapproval_declined`, or `no_approval_provider`.
+Both resolve with the run envelope (`FactoryRunResult`) for **every** outcome — `completed`, `error`, `halted`, and `cancelled` alike. Inspect `status` and read `result` only when the run completed; a limit breach carries a typed `failure`. SDK-initiated `run` and `resume` do not request permission, so they have no declined outcome. The model's `run_factory` tool requests permission before the durable row exists; declining it creates no run row. An SDK-initiated run is refused only when the session already has its maximum number of active top-level runs. Pre-execution resume failures throw `FactoryResumeError`, whose `code` is one of `not_found`, `non_resumable`, `already_active`, `factory_already_running`, `factory_limits_invalid`, `factory_session_disposed`, `factory_storage_unavailable`, or `factory_storage_corrupt`.
 
 An agent that no longer has a prior run's ID in context can recover it with `factories_manage` and `operation: "runs"`, which lists the session's factory runs with their IDs and statuses. This matters for resume: a run that reached a limit keeps its journal, so resuming it replays completed work for free, while restarting it from scratch pays for that work twice.
 
@@ -193,7 +211,7 @@ async ({ args, agent, phase }) => {
 };
 ```
 
-Authoring registers the factory but does not run it. Invoke it afterwards with `run_factory`. Use `factories_manage` with `operation: "list"` to see the factories already registered in the session and `operation: "inspect"` to read one factory's description, phases, and limits before running it.
+Authoring registers the factory but does not run it. Invoke it afterwards with `run_factory`. Use `factories_manage` with `operation: "list"` to see the factories already registered in the session and `operation: "inspect"` to read one factory's description, phases, declared argument shape, and limits before running it.
 
 ## Observe a run
 
@@ -210,7 +228,7 @@ const page = await session.factory.getRunProgress(runId, {
 });
 ```
 
-- `listRuns()` returns summaries in durable creation order.
+- `listRuns()` returns the newest default page of this session's durable factory runs.
 - `getRunDetail(runId)` returns phases, prompt-safe agent summaries, and the latest progress page.
 - `getRunProgress(runId, options?)` pages progress forward, backward, by phase, or from the latest tail.
 
diff --git a/nodejs/docs/factory-patterns.md b/nodejs/docs/factory-patterns.md
index 66c6d13b1f..8ae403d55a 100644
--- a/nodejs/docs/factory-patterns.md
+++ b/nodejs/docs/factory-patterns.md
@@ -189,6 +189,6 @@ Compose these freely.
 
 Match the orchestration to what was asked. A quick check wants a couple of subagents and single-vote verification; a request to be thorough or comprehensive wants a larger finder pool, a three-to-five vote adversarial pass, and a synthesis stage.
 
-There is no in-script budget object. Scale with your own counters, as in the loop patterns above, and treat the declared limits as the safety ceiling rather than the control mechanism. Only `agent()` spawns are throttled, by `maxConcurrentSubagents` falling back to `maxTotalSubagents`; with neither declared there is no built-in concurrency cap, so declare one before fanning out widely. `parallel` itself is `Promise.all`, so non-agent work in a thunk runs fully concurrently regardless.
+There is no in-script budget object. Scale with your own counters, as in the loop patterns above, and treat any declared limits as the safety ceiling rather than the control mechanism. Only `agent()` spawns are throttled, by `maxConcurrentSubagents` falling back to `maxTotalSubagents`; with neither declared there is no built-in concurrency cap, so bound a wide fan-out with the factory's own counters. Do not invent a ceiling to compensate, and see [Resource limits](./factories.md#resource-limits) for when declaring one is appropriate. `parallel` itself is `Promise.all`, so non-agent work in a thunk runs fully concurrently regardless.
 
 These patterns are not exhaustive. Compose novel harnesses — tournament brackets, self-repair loops, staged escalation — when the task calls for it.
diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json
index b3c43e9275..84430ac141 100644
--- a/nodejs/package-lock.json
+++ b/nodejs/package-lock.json
@@ -9,7 +9,7 @@
             "version": "0.0.0-dev",
             "license": "MIT",
             "dependencies": {
-                "@github/copilot": "^1.0.78",
+                "@github/copilot": "^1.0.81-11",
                 "koffi": "^3.1.0",
                 "vscode-jsonrpc": "^8.2.1",
                 "zod": "^4.3.6"
@@ -40,7 +40,6 @@
         },
         "node_modules/@apidevtools/json-schema-ref-parser": {
             "version": "11.9.3",
-            "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-11.9.3.tgz",
             "integrity": "sha512-60vepv88RwcJtSHrD6MjIL6Ta3SOYbgfnkHb+ppAVK+o9mXprRtulx7VlRl3lN3bbvysAfCS7WMVfhUYemB0IQ==",
             "dev": true,
             "license": "MIT",
@@ -58,7 +57,6 @@
         },
         "node_modules/@emnapi/core": {
             "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
             "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
             "dev": true,
             "license": "MIT",
@@ -70,7 +68,6 @@
         },
         "node_modules/@emnapi/runtime": {
             "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
             "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
             "dev": true,
             "license": "MIT",
@@ -81,7 +78,6 @@
         },
         "node_modules/@emnapi/wasi-threads": {
             "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
             "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==",
             "dev": true,
             "license": "MIT",
@@ -92,7 +88,6 @@
         },
         "node_modules/@esbuild/aix-ppc64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
             "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
             "cpu": [
                 "ppc64"
@@ -109,7 +104,6 @@
         },
         "node_modules/@esbuild/android-arm": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
             "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
             "cpu": [
                 "arm"
@@ -126,7 +120,6 @@
         },
         "node_modules/@esbuild/android-arm64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
             "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
             "cpu": [
                 "arm64"
@@ -143,7 +136,6 @@
         },
         "node_modules/@esbuild/android-x64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
             "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
             "cpu": [
                 "x64"
@@ -160,7 +152,6 @@
         },
         "node_modules/@esbuild/darwin-arm64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
             "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
             "cpu": [
                 "arm64"
@@ -177,7 +168,6 @@
         },
         "node_modules/@esbuild/darwin-x64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
             "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
             "cpu": [
                 "x64"
@@ -194,7 +184,6 @@
         },
         "node_modules/@esbuild/freebsd-arm64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
             "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
             "cpu": [
                 "arm64"
@@ -211,7 +200,6 @@
         },
         "node_modules/@esbuild/freebsd-x64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
             "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
             "cpu": [
                 "x64"
@@ -228,7 +216,6 @@
         },
         "node_modules/@esbuild/linux-arm": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
             "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
             "cpu": [
                 "arm"
@@ -245,7 +232,6 @@
         },
         "node_modules/@esbuild/linux-arm64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
             "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
             "cpu": [
                 "arm64"
@@ -262,7 +248,6 @@
         },
         "node_modules/@esbuild/linux-ia32": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
             "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
             "cpu": [
                 "ia32"
@@ -279,7 +264,6 @@
         },
         "node_modules/@esbuild/linux-loong64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
             "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
             "cpu": [
                 "loong64"
@@ -296,7 +280,6 @@
         },
         "node_modules/@esbuild/linux-mips64el": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
             "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
             "cpu": [
                 "mips64el"
@@ -313,7 +296,6 @@
         },
         "node_modules/@esbuild/linux-ppc64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
             "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
             "cpu": [
                 "ppc64"
@@ -330,7 +312,6 @@
         },
         "node_modules/@esbuild/linux-riscv64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
             "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
             "cpu": [
                 "riscv64"
@@ -347,7 +328,6 @@
         },
         "node_modules/@esbuild/linux-s390x": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
             "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
             "cpu": [
                 "s390x"
@@ -364,7 +344,6 @@
         },
         "node_modules/@esbuild/linux-x64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
             "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
             "cpu": [
                 "x64"
@@ -381,7 +360,6 @@
         },
         "node_modules/@esbuild/netbsd-arm64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
             "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
             "cpu": [
                 "arm64"
@@ -398,7 +376,6 @@
         },
         "node_modules/@esbuild/netbsd-x64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
             "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
             "cpu": [
                 "x64"
@@ -415,7 +392,6 @@
         },
         "node_modules/@esbuild/openbsd-arm64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
             "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
             "cpu": [
                 "arm64"
@@ -432,7 +408,6 @@
         },
         "node_modules/@esbuild/openbsd-x64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
             "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
             "cpu": [
                 "x64"
@@ -449,7 +424,6 @@
         },
         "node_modules/@esbuild/openharmony-arm64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
             "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
             "cpu": [
                 "arm64"
@@ -466,7 +440,6 @@
         },
         "node_modules/@esbuild/sunos-x64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
             "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
             "cpu": [
                 "x64"
@@ -483,7 +456,6 @@
         },
         "node_modules/@esbuild/win32-arm64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
             "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
             "cpu": [
                 "arm64"
@@ -500,7 +472,6 @@
         },
         "node_modules/@esbuild/win32-ia32": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
             "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
             "cpu": [
                 "ia32"
@@ -517,7 +488,6 @@
         },
         "node_modules/@esbuild/win32-x64": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
             "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
             "cpu": [
                 "x64"
@@ -534,7 +504,6 @@
         },
         "node_modules/@eslint-community/eslint-utils": {
             "version": "4.9.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
             "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
             "dev": true,
             "license": "MIT",
@@ -553,7 +522,6 @@
         },
         "node_modules/@eslint-community/regexpp": {
             "version": "4.12.2",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
             "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
             "dev": true,
             "license": "MIT",
@@ -563,7 +531,6 @@
         },
         "node_modules/@eslint/config-array": {
             "version": "0.21.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
             "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
             "dev": true,
             "license": "Apache-2.0",
@@ -578,7 +545,6 @@
         },
         "node_modules/@eslint/config-array/node_modules/minimatch": {
             "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
             "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
@@ -591,7 +557,6 @@
         },
         "node_modules/@eslint/config-helpers": {
             "version": "0.4.2",
-            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
             "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
             "dev": true,
             "license": "Apache-2.0",
@@ -604,7 +569,6 @@
         },
         "node_modules/@eslint/core": {
             "version": "0.17.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
             "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
             "dev": true,
             "license": "Apache-2.0",
@@ -617,7 +581,6 @@
         },
         "node_modules/@eslint/eslintrc": {
             "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
             "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
             "dev": true,
             "license": "MIT",
@@ -641,7 +604,6 @@
         },
         "node_modules/@eslint/eslintrc/node_modules/ignore": {
             "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
             "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
             "dev": true,
             "license": "MIT",
@@ -651,7 +613,6 @@
         },
         "node_modules/@eslint/eslintrc/node_modules/minimatch": {
             "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
             "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
@@ -664,7 +625,6 @@
         },
         "node_modules/@eslint/js": {
             "version": "9.39.2",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
             "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
             "dev": true,
             "license": "MIT",
@@ -677,7 +637,6 @@
         },
         "node_modules/@eslint/object-schema": {
             "version": "2.1.7",
-            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
             "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
             "dev": true,
             "license": "Apache-2.0",
@@ -687,7 +646,6 @@
         },
         "node_modules/@eslint/plugin-kit": {
             "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
             "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
             "dev": true,
             "license": "Apache-2.0",
@@ -700,9 +658,8 @@
             }
         },
         "node_modules/@github/copilot": {
-            "version": "1.0.78",
-            "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.78.tgz",
-            "integrity": "sha512-jn+8HLZC3R7d6K1/1g9L1iWNKzBVS3JdVcx40r3aWyS5r+MLV1OPNp0fo5OfRMCDIm3NmEaaoqypi9sQkCXuiQ==",
+            "version": "1.0.81-11",
+            "integrity": "sha512-F7hZ6G6fhWH4uq862mbs2JE3nL0KIVBOc94/EFOdEjux3oHUQst9a06gKibEJS6VRULaYTXzatA1EAgNC9dzFA==",
             "license": "SEE LICENSE IN LICENSE.md",
             "dependencies": {
                 "detect-libc": "^2.1.2"
@@ -711,20 +668,19 @@
                 "copilot": "npm-loader.js"
             },
             "optionalDependencies": {
-                "@github/copilot-darwin-arm64": "1.0.78",
-                "@github/copilot-darwin-x64": "1.0.78",
-                "@github/copilot-linux-arm64": "1.0.78",
-                "@github/copilot-linux-x64": "1.0.78",
-                "@github/copilot-linuxmusl-arm64": "1.0.78",
-                "@github/copilot-linuxmusl-x64": "1.0.78",
-                "@github/copilot-win32-arm64": "1.0.78",
-                "@github/copilot-win32-x64": "1.0.78"
+                "@github/copilot-darwin-arm64": "1.0.81-11",
+                "@github/copilot-darwin-x64": "1.0.81-11",
+                "@github/copilot-linux-arm64": "1.0.81-11",
+                "@github/copilot-linux-x64": "1.0.81-11",
+                "@github/copilot-linuxmusl-arm64": "1.0.81-11",
+                "@github/copilot-linuxmusl-x64": "1.0.81-11",
+                "@github/copilot-win32-arm64": "1.0.81-11",
+                "@github/copilot-win32-x64": "1.0.81-11"
             }
         },
         "node_modules/@github/copilot-darwin-arm64": {
-            "version": "1.0.78",
-            "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.78.tgz",
-            "integrity": "sha512-P11+VyWg8ad0WlywGtO2d7AxqTLJv4hkUicFg6Ycth5lfk00aCu/74YOOZSPO6C2bBBJhAza7oAdmauM6KEojw==",
+            "version": "1.0.81-11",
+            "integrity": "sha512-3eLs71CLnJH9RNnESnv4esipZPeGXMlBxQeKXwZY+crwcW2RAR8YuovQyfoZ/5by1PLPbYrOjXNfQL6kXSisrA==",
             "cpu": [
                 "arm64"
             ],
@@ -738,9 +694,8 @@
             }
         },
         "node_modules/@github/copilot-darwin-x64": {
-            "version": "1.0.78",
-            "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.78.tgz",
-            "integrity": "sha512-stimP3WDFs2GU8nJzTJbtRpZViV4bsf80yg7QrFq+G4RISQ3Nihg/3/H0U6UQF1+txMJ/Ohmb5RFYxSw1Hj2sw==",
+            "version": "1.0.81-11",
+            "integrity": "sha512-GdFLiUC8UL9k6K+woG8AyL3zBafd0Br1TIPDV5iiZsyBtTe4g67FjL7DGCYDt6AN9G43jWdK0M0InoNDVq1K1A==",
             "cpu": [
                 "x64"
             ],
@@ -754,9 +709,8 @@
             }
         },
         "node_modules/@github/copilot-linux-arm64": {
-            "version": "1.0.78",
-            "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.78.tgz",
-            "integrity": "sha512-K31PRKGTm252V1Lof7ypjg283R2QSm3BgoCvZfX2taos4wqC3SaTozSQKwW3dgrAx7A3G3SGEoilVCNqfigdZA==",
+            "version": "1.0.81-11",
+            "integrity": "sha512-C4hcAow5CdaVJITbdtGqFgxWpW7TqwyCPNn8OtcbvdWeiKcfOBDrgkvbsezG98/5Ovs3HWxZRT4oZqCEmGF9Ww==",
             "cpu": [
                 "arm64"
             ],
@@ -770,9 +724,8 @@
             }
         },
         "node_modules/@github/copilot-linux-x64": {
-            "version": "1.0.78",
-            "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.78.tgz",
-            "integrity": "sha512-QK3oMtAn9dIv+1u1kx0xNpZNtZxdI+uZVIyLl7myp+Oh2Uj8BLagVv6a7uP0cDphO3TgfIdlvpepCe5MIcx0fw==",
+            "version": "1.0.81-11",
+            "integrity": "sha512-izu0PwWx+wL4zxacO6cd6r0zMMMQ3pTz+2euWcAd7HCJ/CIR6+YYfjU3TI3TPBZ9zDLZGoxHKYYPfJ1ZbSTzEg==",
             "cpu": [
                 "x64"
             ],
@@ -786,9 +739,8 @@
             }
         },
         "node_modules/@github/copilot-linuxmusl-arm64": {
-            "version": "1.0.78",
-            "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.78.tgz",
-            "integrity": "sha512-F/0cTMsz6ug4yiXn3RKaCAMsLR261U5Njb6G9Y/HeAI7ES/tKEo2t5SHuvgXaIH4mYiZsRvfDKdX7c0WgBX/Jg==",
+            "version": "1.0.81-11",
+            "integrity": "sha512-uWGUjaxOSMu6dKFWcTvXGUUp76vC3OV7nlSupecRkQ7gA3OxdrrB8rXE5/leC606Hk6oe9Wl7wKCH9EwuZ6afg==",
             "cpu": [
                 "arm64"
             ],
@@ -802,9 +754,8 @@
             }
         },
         "node_modules/@github/copilot-linuxmusl-x64": {
-            "version": "1.0.78",
-            "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.78.tgz",
-            "integrity": "sha512-YMaJaeBGbArGAFYel+yFaFW/0rFgh0Oqki2f2mUtlonTX/xHr8EB4+mTnMJkHYMFy4gOTC3OtSEEe1NaW/cBXQ==",
+            "version": "1.0.81-11",
+            "integrity": "sha512-BpWKd/iu1tTyuPR2zuPFs1pVOlley4yt/TXkn6/gVwt52VI0rUxEO+n77RVjDcyMxWaUApbad2VNRPIH77guCA==",
             "cpu": [
                 "x64"
             ],
@@ -818,9 +769,8 @@
             }
         },
         "node_modules/@github/copilot-win32-arm64": {
-            "version": "1.0.78",
-            "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.78.tgz",
-            "integrity": "sha512-ktDkFXaaecEKD3hpM6ydM9lKOdoCfsQsXCmzLzE7DCmSpbbMCdfPfWfZ7MOclmKmpZ5/MNfr4U2l8CUqGerzYA==",
+            "version": "1.0.81-11",
+            "integrity": "sha512-GOK3cACgD96m065uJxbgcXL7MQ1qm+wq1qtvGBpprY0r9wTYJG/rVCtayjYB6B57rnaBwPll3+PQ2J1qgfO57A==",
             "cpu": [
                 "arm64"
             ],
@@ -834,9 +784,8 @@
             }
         },
         "node_modules/@github/copilot-win32-x64": {
-            "version": "1.0.78",
-            "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.78.tgz",
-            "integrity": "sha512-Gd8l2T4eqYEWlOEPd0SZznQ+YYgYrwOkE0QXodMkhCBbPdgu/uTzb7mnISWwnVAgqs7pONdF1GOpHkTo+ay8CQ==",
+            "version": "1.0.81-11",
+            "integrity": "sha512-u4K6UU2iGQJqQwsdHNilJBwiaC48PfMsWVFnTSlJD5lCYp9zCk1odrvrcmB3ARYinE/IcXLUosiHaM/ChR/pdA==",
             "cpu": [
                 "x64"
             ],
@@ -851,14 +800,12 @@
         },
         "node_modules/@glideapps/ts-necessities": {
             "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/@glideapps/ts-necessities/-/ts-necessities-2.2.3.tgz",
             "integrity": "sha512-gXi0awOZLHk3TbW55GZLCPP6O+y/b5X1pBXKBVckFONSwF1z1E5ND2BGJsghQFah+pW7pkkyFb2VhUQI2qhL5w==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@humanfs/core": {
             "version": "0.19.1",
-            "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
             "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
             "dev": true,
             "license": "Apache-2.0",
@@ -868,7 +815,6 @@
         },
         "node_modules/@humanfs/node": {
             "version": "0.16.7",
-            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
             "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
             "dev": true,
             "license": "Apache-2.0",
@@ -882,7 +828,6 @@
         },
         "node_modules/@humanwhocodes/module-importer": {
             "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
             "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
             "dev": true,
             "license": "Apache-2.0",
@@ -896,7 +841,6 @@
         },
         "node_modules/@humanwhocodes/retry": {
             "version": "0.4.3",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
             "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
             "dev": true,
             "license": "Apache-2.0",
@@ -910,21 +854,18 @@
         },
         "node_modules/@jridgewell/sourcemap-codec": {
             "version": "1.5.5",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
             "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@jsdevtools/ono": {
             "version": "7.1.3",
-            "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
             "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@koromix/koffi-darwin-arm64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-darwin-arm64/-/koffi-darwin-arm64-3.1.0.tgz",
             "integrity": "sha512-VEt5r3fXTfbejr83PnuOP0H7s9Zmazcs+lofu96DOcRkistlMsn59wYyWiKpyAjs9PCgm0Ykh62ChZ3CGMmIOg==",
             "cpu": [
                 "arm64"
@@ -940,7 +881,6 @@
         },
         "node_modules/@koromix/koffi-darwin-x64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-darwin-x64/-/koffi-darwin-x64-3.1.0.tgz",
             "integrity": "sha512-n/tVRB9xIzdXT5H3zZt8ueThgWTSDL+yU7PWnU8wbZPBSawP/otx3swQyd6nMOqj1bmHgSHopiKSBXRS9pllmg==",
             "cpu": [
                 "x64"
@@ -956,7 +896,6 @@
         },
         "node_modules/@koromix/koffi-freebsd-arm64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-freebsd-arm64/-/koffi-freebsd-arm64-3.1.0.tgz",
             "integrity": "sha512-vazoPYIhOAlXZksVIqDRMIID4VeUZKx8F3dR90hOobT2ATyOkqNS5dv5UCV7Q7DSq22lQTrdbvENBAhROzCp0w==",
             "cpu": [
                 "arm64"
@@ -972,7 +911,6 @@
         },
         "node_modules/@koromix/koffi-freebsd-ia32": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-freebsd-ia32/-/koffi-freebsd-ia32-3.1.0.tgz",
             "integrity": "sha512-Vm7Uc97ru6RTSVmae2zCZZQeaizqVZ8WoU4+gG4H03Qe+WOj7kbKt/MxT7VBzdbPYIU5ZJeG/ZED1YlZyab6eQ==",
             "cpu": [
                 "ia32"
@@ -988,7 +926,6 @@
         },
         "node_modules/@koromix/koffi-freebsd-x64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-freebsd-x64/-/koffi-freebsd-x64-3.1.0.tgz",
             "integrity": "sha512-N+VuVWjoiYPy1Go5mRadZ3B6RM5Qz+eCLhj2LXrMlefbUJ+O4gg7teCUGvPGfBEHDgmSN4yYUrfQmdJC10vOYw==",
             "cpu": [
                 "x64"
@@ -1004,7 +941,6 @@
         },
         "node_modules/@koromix/koffi-linux-arm64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-linux-arm64/-/koffi-linux-arm64-3.1.0.tgz",
             "integrity": "sha512-Wx5iOkeALe2ympLdiYwRpIg5qUkyQIv8N2foZ9rRker0uE7ZtXew2RRkbEgMir4b0yDYR1zyXd6B62GUzLtZ/g==",
             "cpu": [
                 "arm64"
@@ -1020,7 +956,6 @@
         },
         "node_modules/@koromix/koffi-linux-ia32": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-linux-ia32/-/koffi-linux-ia32-3.1.0.tgz",
             "integrity": "sha512-1DjYm1QehXU0dgn0uE+FGYOb3Of7GiTMqLS+ZI2gbl1b+h76sz4LRBvDVrQyAmSMVVU8/7696S21YgE/iBhBVg==",
             "cpu": [
                 "ia32"
@@ -1036,7 +971,6 @@
         },
         "node_modules/@koromix/koffi-linux-loong64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-linux-loong64/-/koffi-linux-loong64-3.1.0.tgz",
             "integrity": "sha512-NOa0LdyltdESz3oeTqUH6MErHVoJOHoeXIsEp6xIMTUh4eKXEtlDQeoK6EYqo0DnBt83Xud95qLvi4Aw12pG4Q==",
             "cpu": [
                 "loong64"
@@ -1052,7 +986,6 @@
         },
         "node_modules/@koromix/koffi-linux-riscv64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-linux-riscv64/-/koffi-linux-riscv64-3.1.0.tgz",
             "integrity": "sha512-Ye6kiXZCGxGtAIXSly6XuOP5tJZNYOZ2eVg33k1MilKrzimAy9Mpw4d6e9+Sfsc1jesgeNYs1sb5iaI8HS3ncA==",
             "cpu": [
                 "riscv64"
@@ -1068,7 +1001,6 @@
         },
         "node_modules/@koromix/koffi-linux-x64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-linux-x64/-/koffi-linux-x64-3.1.0.tgz",
             "integrity": "sha512-3yQTOkQrMna4VX+yeyfYImBjLlGrItMpsWyfaW1uSiz/A6GRydqdwYH7DWnp4Z+RSGYZpsewkf7byMc8pOOQKA==",
             "cpu": [
                 "x64"
@@ -1084,7 +1016,6 @@
         },
         "node_modules/@koromix/koffi-openbsd-ia32": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-openbsd-ia32/-/koffi-openbsd-ia32-3.1.0.tgz",
             "integrity": "sha512-/cDoFHb9yx4+yoT3GUpnKnfi3W2drG+/Ewo0TTZaQHb4PsxnYYyT6V8+t4cL5XXbQcTTcOsZxpmBRrn0NBa3dA==",
             "cpu": [
                 "ia32"
@@ -1100,7 +1031,6 @@
         },
         "node_modules/@koromix/koffi-openbsd-x64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-openbsd-x64/-/koffi-openbsd-x64-3.1.0.tgz",
             "integrity": "sha512-CoQdqgnKvWgTXXZlUst8cBRQEov7QsxlTN2WAsu9wez01Xe6gEcH/zYePANualzzCbnaELfe5P0rA80QkoDuPA==",
             "cpu": [
                 "x64"
@@ -1116,7 +1046,6 @@
         },
         "node_modules/@koromix/koffi-win32-ia32": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-win32-ia32/-/koffi-win32-ia32-3.1.0.tgz",
             "integrity": "sha512-WjrA+DEkpy0xEHu48+NSOboHhTnzkIfsFuq3d/WrSs+T9WflWRng3jC7mdJxmR4eHb6i6BqjW3k/U0mNUTjFPA==",
             "cpu": [
                 "ia32"
@@ -1132,7 +1061,6 @@
         },
         "node_modules/@koromix/koffi-win32-x64": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@koromix/koffi-win32-x64/-/koffi-win32-x64-3.1.0.tgz",
             "integrity": "sha512-tnK5+IkzQBauQAQSzuyjso8OOIQRlaTZS39xIWpfqVYDLVDIuLDQk/WwHcOrR5yxlDrZq9ygiebBTOfcJFia7w==",
             "cpu": [
                 "x64"
@@ -1148,7 +1076,6 @@
         },
         "node_modules/@napi-rs/wasm-runtime": {
             "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
             "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==",
             "dev": true,
             "license": "MIT",
@@ -1167,7 +1094,6 @@
         },
         "node_modules/@oxc-project/types": {
             "version": "0.133.0",
-            "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.133.0.tgz",
             "integrity": "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==",
             "dev": true,
             "license": "MIT",
@@ -1177,7 +1103,6 @@
         },
         "node_modules/@platformatic/vfs": {
             "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/@platformatic/vfs/-/vfs-0.3.0.tgz",
             "integrity": "sha512-BGXVOAz59HYPZCgI9v/MtiTF/ng8YAWtkooxVwOPR3TatNgGy0WZ/t15ScqytiZi5NdSRqWNRfuAbXKeAlKDdQ==",
             "dev": true,
             "license": "MIT",
@@ -1187,7 +1112,6 @@
         },
         "node_modules/@rolldown/binding-android-arm64": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.3.tgz",
             "integrity": "sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw==",
             "cpu": [
                 "arm64"
@@ -1204,7 +1128,6 @@
         },
         "node_modules/@rolldown/binding-darwin-arm64": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.3.tgz",
             "integrity": "sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA==",
             "cpu": [
                 "arm64"
@@ -1221,7 +1144,6 @@
         },
         "node_modules/@rolldown/binding-darwin-x64": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.3.tgz",
             "integrity": "sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg==",
             "cpu": [
                 "x64"
@@ -1238,7 +1160,6 @@
         },
         "node_modules/@rolldown/binding-freebsd-x64": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.3.tgz",
             "integrity": "sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g==",
             "cpu": [
                 "x64"
@@ -1255,7 +1176,6 @@
         },
         "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.3.tgz",
             "integrity": "sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw==",
             "cpu": [
                 "arm"
@@ -1272,7 +1192,6 @@
         },
         "node_modules/@rolldown/binding-linux-arm64-gnu": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.3.tgz",
             "integrity": "sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw==",
             "cpu": [
                 "arm64"
@@ -1289,7 +1208,6 @@
         },
         "node_modules/@rolldown/binding-linux-arm64-musl": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.3.tgz",
             "integrity": "sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==",
             "cpu": [
                 "arm64"
@@ -1306,7 +1224,6 @@
         },
         "node_modules/@rolldown/binding-linux-ppc64-gnu": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.3.tgz",
             "integrity": "sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==",
             "cpu": [
                 "ppc64"
@@ -1323,7 +1240,6 @@
         },
         "node_modules/@rolldown/binding-linux-s390x-gnu": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.3.tgz",
             "integrity": "sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==",
             "cpu": [
                 "s390x"
@@ -1340,7 +1256,6 @@
         },
         "node_modules/@rolldown/binding-linux-x64-gnu": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.3.tgz",
             "integrity": "sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==",
             "cpu": [
                 "x64"
@@ -1357,7 +1272,6 @@
         },
         "node_modules/@rolldown/binding-linux-x64-musl": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.3.tgz",
             "integrity": "sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==",
             "cpu": [
                 "x64"
@@ -1374,7 +1288,6 @@
         },
         "node_modules/@rolldown/binding-openharmony-arm64": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.3.tgz",
             "integrity": "sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==",
             "cpu": [
                 "arm64"
@@ -1391,7 +1304,6 @@
         },
         "node_modules/@rolldown/binding-wasm32-wasi": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.3.tgz",
             "integrity": "sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg==",
             "cpu": [
                 "wasm32"
@@ -1410,7 +1322,6 @@
         },
         "node_modules/@rolldown/binding-win32-arm64-msvc": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.3.tgz",
             "integrity": "sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g==",
             "cpu": [
                 "arm64"
@@ -1427,7 +1338,6 @@
         },
         "node_modules/@rolldown/binding-win32-x64-msvc": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.3.tgz",
             "integrity": "sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA==",
             "cpu": [
                 "x64"
@@ -1444,21 +1354,18 @@
         },
         "node_modules/@rolldown/pluginutils": {
             "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
             "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@standard-schema/spec": {
             "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
             "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@tybys/wasm-util": {
             "version": "0.10.2",
-            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
             "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
             "dev": true,
             "license": "MIT",
@@ -1469,7 +1376,6 @@
         },
         "node_modules/@types/chai": {
             "version": "5.2.3",
-            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
             "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
             "dev": true,
             "license": "MIT",
@@ -1480,35 +1386,30 @@
         },
         "node_modules/@types/deep-eql": {
             "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
             "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@types/estree": {
             "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
             "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@types/json-schema": {
             "version": "7.0.15",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
             "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@types/lodash": {
             "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.21.tgz",
             "integrity": "sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@types/node": {
             "version": "25.3.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz",
             "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==",
             "dev": true,
             "license": "MIT",
@@ -1518,7 +1419,6 @@
         },
         "node_modules/@types/ws": {
             "version": "8.18.1",
-            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
             "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
             "dev": true,
             "license": "MIT",
@@ -1528,7 +1428,6 @@
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
             "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==",
             "dev": true,
             "license": "MIT",
@@ -1557,7 +1456,6 @@
         },
         "node_modules/@typescript-eslint/parser": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.1.tgz",
             "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
             "dev": true,
             "license": "MIT",
@@ -1582,7 +1480,6 @@
         },
         "node_modules/@typescript-eslint/project-service": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.1.tgz",
             "integrity": "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==",
             "dev": true,
             "license": "MIT",
@@ -1604,7 +1501,6 @@
         },
         "node_modules/@typescript-eslint/scope-manager": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz",
             "integrity": "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==",
             "dev": true,
             "license": "MIT",
@@ -1622,7 +1518,6 @@
         },
         "node_modules/@typescript-eslint/tsconfig-utils": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz",
             "integrity": "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==",
             "dev": true,
             "license": "MIT",
@@ -1639,7 +1534,6 @@
         },
         "node_modules/@typescript-eslint/type-utils": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz",
             "integrity": "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==",
             "dev": true,
             "license": "MIT",
@@ -1664,7 +1558,6 @@
         },
         "node_modules/@typescript-eslint/types": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.1.tgz",
             "integrity": "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==",
             "dev": true,
             "license": "MIT",
@@ -1678,7 +1571,6 @@
         },
         "node_modules/@typescript-eslint/typescript-estree": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz",
             "integrity": "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==",
             "dev": true,
             "license": "MIT",
@@ -1706,7 +1598,6 @@
         },
         "node_modules/@typescript-eslint/utils": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.1.tgz",
             "integrity": "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==",
             "dev": true,
             "license": "MIT",
@@ -1730,7 +1621,6 @@
         },
         "node_modules/@typescript-eslint/visitor-keys": {
             "version": "8.56.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz",
             "integrity": "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==",
             "dev": true,
             "license": "MIT",
@@ -1748,7 +1638,6 @@
         },
         "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
             "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
             "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
             "dev": true,
             "license": "Apache-2.0",
@@ -1761,7 +1650,6 @@
         },
         "node_modules/@vitest/expect": {
             "version": "4.1.8",
-            "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.8.tgz",
             "integrity": "sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ==",
             "dev": true,
             "license": "MIT",
@@ -1779,7 +1667,6 @@
         },
         "node_modules/@vitest/mocker": {
             "version": "4.1.8",
-            "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.8.tgz",
             "integrity": "sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw==",
             "dev": true,
             "license": "MIT",
@@ -1806,7 +1693,6 @@
         },
         "node_modules/@vitest/pretty-format": {
             "version": "4.1.8",
-            "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.8.tgz",
             "integrity": "sha512-9GasEBxpZ1VYIpqHf/0+YGg121uSNwCKOJqIrTwWP/TB7DmFCiaBpNl3aPZzoLWfWkuqhbH8vJIVobZkvdo2cA==",
             "dev": true,
             "license": "MIT",
@@ -1819,7 +1705,6 @@
         },
         "node_modules/@vitest/runner": {
             "version": "4.1.8",
-            "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.8.tgz",
             "integrity": "sha512-EmVxeBAfMJvycdjd6Hm+RbFBbA9fKvo0Kx37hNpBYoYeavH3RNsBXWDooR1mgD52dCrxIIuP7UotpfiwOikvcg==",
             "dev": true,
             "license": "MIT",
@@ -1833,7 +1718,6 @@
         },
         "node_modules/@vitest/snapshot": {
             "version": "4.1.8",
-            "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.8.tgz",
             "integrity": "sha512-acfZboRmAIf05DEKcBQy33VXojFJjtUdLyo7oOmV9kebb2xdU01UknNiPuPZoJZQyO7DF0gZdTGTpeAzET9QPQ==",
             "dev": true,
             "license": "MIT",
@@ -1849,7 +1733,6 @@
         },
         "node_modules/@vitest/spy": {
             "version": "4.1.8",
-            "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.8.tgz",
             "integrity": "sha512-6EevtBp6OZOPF7bmz36HrGMeP3txgVSrgebWxHOafDXGkhIzfXK14f8KF6MuFfgXXUeHxmpD3BQxkV00/3s5mA==",
             "dev": true,
             "license": "MIT",
@@ -1859,7 +1742,6 @@
         },
         "node_modules/@vitest/utils": {
             "version": "4.1.8",
-            "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.8.tgz",
             "integrity": "sha512-uOJamYALNhfJ6iolExyQM40yIQwDqYnkKtQ5VCiSe17E33H0aQ/u+1GlRuz4LZBk6Mm3sg90G9hEbmEt37C1Zg==",
             "dev": true,
             "license": "MIT",
@@ -1874,7 +1756,6 @@
         },
         "node_modules/abort-controller": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
             "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
             "dev": true,
             "license": "MIT",
@@ -1887,7 +1768,6 @@
         },
         "node_modules/acorn": {
             "version": "8.15.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
             "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
             "dev": true,
             "license": "MIT",
@@ -1900,7 +1780,6 @@
         },
         "node_modules/acorn-jsx": {
             "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
             "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
             "dev": true,
             "license": "MIT",
@@ -1910,7 +1789,6 @@
         },
         "node_modules/ajv": {
             "version": "6.15.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
             "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==",
             "dev": true,
             "license": "MIT",
@@ -1927,14 +1805,12 @@
         },
         "node_modules/argparse": {
             "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
             "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
             "dev": true,
             "license": "Python-2.0"
         },
         "node_modules/assertion-error": {
             "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
             "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
             "dev": true,
             "license": "MIT",
@@ -1944,14 +1820,12 @@
         },
         "node_modules/balanced-match": {
             "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/base64-js": {
             "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
             "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
             "dev": true,
             "funding": [
@@ -1972,7 +1846,6 @@
         },
         "node_modules/brace-expansion": {
             "version": "1.1.16",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz",
             "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==",
             "dev": true,
             "license": "MIT",
@@ -1983,14 +1856,12 @@
         },
         "node_modules/browser-or-node": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-3.0.0.tgz",
             "integrity": "sha512-iczIdVJzGEYhP5DqQxYM9Hh7Ztpqqi+CXZpSmX8ALFs9ecXkQIeqRyM6TfxEfMVpwhl3dSuDvxdzzo9sUOIVBQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/buffer": {
             "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
             "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
             "dev": true,
             "funding": [
@@ -2015,7 +1886,6 @@
         },
         "node_modules/callsites": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
             "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
             "dev": true,
             "license": "MIT",
@@ -2025,7 +1895,6 @@
         },
         "node_modules/chai": {
             "version": "6.2.2",
-            "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
             "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
             "dev": true,
             "license": "MIT",
@@ -2035,7 +1904,6 @@
         },
         "node_modules/chalk": {
             "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
             "license": "MIT",
@@ -2052,7 +1920,6 @@
         },
         "node_modules/chalk/node_modules/ansi-styles": {
             "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
             "license": "MIT",
@@ -2068,14 +1935,12 @@
         },
         "node_modules/collection-utils": {
             "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/collection-utils/-/collection-utils-1.0.1.tgz",
             "integrity": "sha512-LA2YTIlR7biSpXkKYwwuzGjwL5rjWEZVOSnvdUc7gObvWe4WkjxOpfrdhoP7Hs09YWDVfg0Mal9BpAqLfVEzQg==",
             "dev": true,
             "license": "Apache-2.0"
         },
         "node_modules/color-convert": {
             "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
             "dev": true,
             "license": "MIT",
@@ -2088,28 +1953,24 @@
         },
         "node_modules/color-name": {
             "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/concat-map": {
             "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
             "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/convert-source-map": {
             "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
             "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/cross-fetch": {
             "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.1.0.tgz",
             "integrity": "sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==",
             "dev": true,
             "license": "MIT",
@@ -2119,7 +1980,6 @@
         },
         "node_modules/cross-spawn": {
             "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
             "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
             "dev": true,
             "license": "MIT",
@@ -2134,7 +1994,6 @@
         },
         "node_modules/debug": {
             "version": "4.4.3",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
             "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "dev": true,
             "license": "MIT",
@@ -2152,14 +2011,12 @@
         },
         "node_modules/deep-is": {
             "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
             "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/detect-libc": {
             "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
             "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
             "license": "Apache-2.0",
             "engines": {
@@ -2168,14 +2025,12 @@
         },
         "node_modules/es-module-lexer": {
             "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz",
             "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/esbuild": {
             "version": "0.28.1",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
             "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
             "dev": true,
             "hasInstallScript": true,
@@ -2217,7 +2072,6 @@
         },
         "node_modules/escape-string-regexp": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
             "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
             "dev": true,
             "license": "MIT",
@@ -2230,7 +2084,6 @@
         },
         "node_modules/eslint": {
             "version": "9.39.2",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
             "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
             "dev": true,
             "license": "MIT",
@@ -2290,7 +2143,6 @@
         },
         "node_modules/eslint-scope": {
             "version": "8.4.0",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
             "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
             "dev": true,
             "license": "BSD-2-Clause",
@@ -2307,7 +2159,6 @@
         },
         "node_modules/eslint-visitor-keys": {
             "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
             "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
             "dev": true,
             "license": "Apache-2.0",
@@ -2320,7 +2171,6 @@
         },
         "node_modules/eslint/node_modules/eslint-visitor-keys": {
             "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
             "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
             "dev": true,
             "license": "Apache-2.0",
@@ -2333,7 +2183,6 @@
         },
         "node_modules/eslint/node_modules/ignore": {
             "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
             "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
             "dev": true,
             "license": "MIT",
@@ -2343,7 +2192,6 @@
         },
         "node_modules/eslint/node_modules/minimatch": {
             "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
             "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
@@ -2356,7 +2204,6 @@
         },
         "node_modules/espree": {
             "version": "10.4.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
             "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
             "dev": true,
             "license": "BSD-2-Clause",
@@ -2374,7 +2221,6 @@
         },
         "node_modules/espree/node_modules/eslint-visitor-keys": {
             "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
             "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
             "dev": true,
             "license": "Apache-2.0",
@@ -2387,7 +2233,6 @@
         },
         "node_modules/esquery": {
             "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
             "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
             "dev": true,
             "license": "BSD-3-Clause",
@@ -2400,7 +2245,6 @@
         },
         "node_modules/esrecurse": {
             "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
             "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
             "dev": true,
             "license": "BSD-2-Clause",
@@ -2413,7 +2257,6 @@
         },
         "node_modules/estraverse": {
             "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
             "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
             "dev": true,
             "license": "BSD-2-Clause",
@@ -2423,7 +2266,6 @@
         },
         "node_modules/estree-walker": {
             "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
             "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
             "dev": true,
             "license": "MIT",
@@ -2433,7 +2275,6 @@
         },
         "node_modules/esutils": {
             "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
             "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
             "dev": true,
             "license": "BSD-2-Clause",
@@ -2443,7 +2284,6 @@
         },
         "node_modules/event-target-shim": {
             "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
             "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
             "dev": true,
             "license": "MIT",
@@ -2453,7 +2293,6 @@
         },
         "node_modules/events": {
             "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
             "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
             "dev": true,
             "license": "MIT",
@@ -2463,7 +2302,6 @@
         },
         "node_modules/expect-type": {
             "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
             "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
             "dev": true,
             "license": "Apache-2.0",
@@ -2473,28 +2311,24 @@
         },
         "node_modules/fast-deep-equal": {
             "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/fast-json-stable-stringify": {
             "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
             "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/fast-levenshtein": {
             "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
             "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/fdir": {
             "version": "6.5.0",
-            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
             "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
             "dev": true,
             "license": "MIT",
@@ -2512,7 +2346,6 @@
         },
         "node_modules/file-entry-cache": {
             "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
             "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
             "dev": true,
             "license": "MIT",
@@ -2525,7 +2358,6 @@
         },
         "node_modules/find-up": {
             "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
             "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
             "dev": true,
             "license": "MIT",
@@ -2542,7 +2374,6 @@
         },
         "node_modules/flat-cache": {
             "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
             "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
             "dev": true,
             "license": "MIT",
@@ -2556,14 +2387,12 @@
         },
         "node_modules/flatted": {
             "version": "3.4.2",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
             "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
             "dev": true,
             "license": "ISC"
         },
         "node_modules/fsevents": {
             "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
             "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
             "dev": true,
             "hasInstallScript": true,
@@ -2578,7 +2407,6 @@
         },
         "node_modules/glob": {
             "version": "13.0.6",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
             "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
             "dev": true,
             "license": "BlueOak-1.0.0",
@@ -2596,7 +2424,6 @@
         },
         "node_modules/glob-parent": {
             "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
             "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
             "dev": true,
             "license": "ISC",
@@ -2609,7 +2436,6 @@
         },
         "node_modules/globals": {
             "version": "14.0.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
             "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
             "dev": true,
             "license": "MIT",
@@ -2622,7 +2448,6 @@
         },
         "node_modules/has-flag": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
             "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
             "dev": true,
             "license": "MIT",
@@ -2632,7 +2457,6 @@
         },
         "node_modules/ieee754": {
             "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
             "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
             "dev": true,
             "funding": [
@@ -2653,7 +2477,6 @@
         },
         "node_modules/ignore": {
             "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
             "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
             "dev": true,
             "license": "MIT",
@@ -2663,7 +2486,6 @@
         },
         "node_modules/import-fresh": {
             "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
             "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
             "dev": true,
             "license": "MIT",
@@ -2680,7 +2502,6 @@
         },
         "node_modules/imurmurhash": {
             "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
             "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
             "dev": true,
             "license": "MIT",
@@ -2690,7 +2511,6 @@
         },
         "node_modules/is-extglob": {
             "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
             "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
             "dev": true,
             "license": "MIT",
@@ -2700,7 +2520,6 @@
         },
         "node_modules/is-glob": {
             "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
             "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
             "dev": true,
             "license": "MIT",
@@ -2713,28 +2532,24 @@
         },
         "node_modules/is-url": {
             "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
             "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/isexe": {
             "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
             "dev": true,
             "license": "ISC"
         },
         "node_modules/js-base64": {
             "version": "3.7.8",
-            "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.8.tgz",
             "integrity": "sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==",
             "dev": true,
             "license": "BSD-3-Clause"
         },
         "node_modules/js-yaml": {
             "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz",
             "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
             "dev": true,
             "funding": [
@@ -2757,21 +2572,18 @@
         },
         "node_modules/json-buffer": {
             "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
             "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/json-schema": {
             "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
             "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
             "dev": true,
             "license": "(AFL-2.1 OR BSD-3-Clause)"
         },
         "node_modules/json-schema-to-typescript": {
             "version": "15.0.4",
-            "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-15.0.4.tgz",
             "integrity": "sha512-Su9oK8DR4xCmDsLlyvadkXzX6+GGXJpbhwoLtOGArAG61dvbW4YQmSEno2y66ahpIdmLMg6YUf/QHLgiwvkrHQ==",
             "dev": true,
             "license": "MIT",
@@ -2795,21 +2607,18 @@
         },
         "node_modules/json-schema-traverse": {
             "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
             "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/json-stable-stringify-without-jsonify": {
             "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
             "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/keyv": {
             "version": "4.5.4",
-            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
             "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
             "dev": true,
             "license": "MIT",
@@ -2819,7 +2628,6 @@
         },
         "node_modules/koffi": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/koffi/-/koffi-3.1.0.tgz",
             "integrity": "sha512-0mCvdjTJBXioiaKNz0vajAEdWtfM5qyhVXSq+wQrrU3odzNvl/J7Cqna79QpNo9mfoKpQgGsyFFDRtDACCwGrQ==",
             "hasInstallScript": true,
             "license": "MIT",
@@ -2845,7 +2653,6 @@
         },
         "node_modules/levn": {
             "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
             "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
             "dev": true,
             "license": "MIT",
@@ -2859,7 +2666,6 @@
         },
         "node_modules/lightningcss": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
             "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
             "dev": true,
             "license": "MPL-2.0",
@@ -2889,7 +2695,6 @@
         },
         "node_modules/lightningcss-android-arm64": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
             "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
             "cpu": [
                 "arm64"
@@ -2910,7 +2715,6 @@
         },
         "node_modules/lightningcss-darwin-arm64": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
             "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
             "cpu": [
                 "arm64"
@@ -2931,7 +2735,6 @@
         },
         "node_modules/lightningcss-darwin-x64": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
             "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
             "cpu": [
                 "x64"
@@ -2952,7 +2755,6 @@
         },
         "node_modules/lightningcss-freebsd-x64": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
             "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
             "cpu": [
                 "x64"
@@ -2973,7 +2775,6 @@
         },
         "node_modules/lightningcss-linux-arm-gnueabihf": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
             "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
             "cpu": [
                 "arm"
@@ -2994,7 +2795,6 @@
         },
         "node_modules/lightningcss-linux-arm64-gnu": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
             "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
             "cpu": [
                 "arm64"
@@ -3015,7 +2815,6 @@
         },
         "node_modules/lightningcss-linux-arm64-musl": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
             "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
             "cpu": [
                 "arm64"
@@ -3036,7 +2835,6 @@
         },
         "node_modules/lightningcss-linux-x64-gnu": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
             "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
             "cpu": [
                 "x64"
@@ -3057,7 +2855,6 @@
         },
         "node_modules/lightningcss-linux-x64-musl": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
             "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
             "cpu": [
                 "x64"
@@ -3078,7 +2875,6 @@
         },
         "node_modules/lightningcss-win32-arm64-msvc": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
             "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
             "cpu": [
                 "arm64"
@@ -3099,7 +2895,6 @@
         },
         "node_modules/lightningcss-win32-x64-msvc": {
             "version": "1.32.0",
-            "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
             "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
             "cpu": [
                 "x64"
@@ -3120,7 +2915,6 @@
         },
         "node_modules/locate-path": {
             "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
             "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
             "dev": true,
             "license": "MIT",
@@ -3136,21 +2930,18 @@
         },
         "node_modules/lodash": {
             "version": "4.18.1",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
             "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/lodash.merge": {
             "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/lru-cache": {
             "version": "11.2.6",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
             "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
             "dev": true,
             "license": "BlueOak-1.0.0",
@@ -3160,7 +2951,6 @@
         },
         "node_modules/magic-string": {
             "version": "0.30.21",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
             "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
             "dev": true,
             "license": "MIT",
@@ -3170,7 +2960,6 @@
         },
         "node_modules/minimatch": {
             "version": "10.2.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
             "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
             "dev": true,
             "license": "BlueOak-1.0.0",
@@ -3186,7 +2975,6 @@
         },
         "node_modules/minimatch/node_modules/balanced-match": {
             "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
             "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
             "dev": true,
             "license": "MIT",
@@ -3196,7 +2984,6 @@
         },
         "node_modules/minimatch/node_modules/brace-expansion": {
             "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz",
             "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==",
             "dev": true,
             "license": "MIT",
@@ -3209,7 +2996,6 @@
         },
         "node_modules/minimist": {
             "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
             "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
             "dev": true,
             "license": "MIT",
@@ -3219,7 +3005,6 @@
         },
         "node_modules/minipass": {
             "version": "7.1.3",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
             "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
             "dev": true,
             "license": "BlueOak-1.0.0",
@@ -3229,14 +3014,12 @@
         },
         "node_modules/ms": {
             "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
             "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/nanoid": {
             "version": "3.3.17",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.17.tgz",
             "integrity": "sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==",
             "dev": true,
             "funding": [
@@ -3255,14 +3038,12 @@
         },
         "node_modules/natural-compare": {
             "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
             "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/node-fetch": {
             "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
             "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
             "dev": true,
             "license": "MIT",
@@ -3283,7 +3064,6 @@
         },
         "node_modules/obug": {
             "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz",
             "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==",
             "dev": true,
             "funding": [
@@ -3294,7 +3074,6 @@
         },
         "node_modules/optionator": {
             "version": "0.9.4",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
             "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
             "dev": true,
             "license": "MIT",
@@ -3312,7 +3091,6 @@
         },
         "node_modules/p-limit": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
             "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
             "dev": true,
             "license": "MIT",
@@ -3328,7 +3106,6 @@
         },
         "node_modules/p-locate": {
             "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
             "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
             "dev": true,
             "license": "MIT",
@@ -3344,21 +3121,18 @@
         },
         "node_modules/package-json-from-dist": {
             "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
             "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
             "dev": true,
             "license": "BlueOak-1.0.0"
         },
         "node_modules/pako": {
             "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
             "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
             "dev": true,
             "license": "(MIT AND Zlib)"
         },
         "node_modules/parent-module": {
             "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
             "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
             "dev": true,
             "license": "MIT",
@@ -3371,7 +3145,6 @@
         },
         "node_modules/path-exists": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
             "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
             "dev": true,
             "license": "MIT",
@@ -3381,7 +3154,6 @@
         },
         "node_modules/path-key": {
             "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
             "dev": true,
             "license": "MIT",
@@ -3391,7 +3163,6 @@
         },
         "node_modules/path-scurry": {
             "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
             "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
             "dev": true,
             "license": "BlueOak-1.0.0",
@@ -3408,21 +3179,18 @@
         },
         "node_modules/pathe": {
             "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
             "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/picocolors": {
             "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
             "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
             "dev": true,
             "license": "ISC"
         },
         "node_modules/picomatch": {
             "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
             "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
             "dev": true,
             "license": "MIT",
@@ -3435,7 +3203,6 @@
         },
         "node_modules/pluralize": {
             "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
             "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
             "dev": true,
             "license": "MIT",
@@ -3445,7 +3212,6 @@
         },
         "node_modules/postcss": {
             "version": "8.5.25",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.25.tgz",
             "integrity": "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==",
             "dev": true,
             "funding": [
@@ -3474,7 +3240,6 @@
         },
         "node_modules/prelude-ls": {
             "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
             "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
             "dev": true,
             "license": "MIT",
@@ -3484,7 +3249,6 @@
         },
         "node_modules/prettier": {
             "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
             "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
             "dev": true,
             "license": "MIT",
@@ -3500,7 +3264,6 @@
         },
         "node_modules/process": {
             "version": "0.11.10",
-            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
             "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
             "dev": true,
             "license": "MIT",
@@ -3510,7 +3273,6 @@
         },
         "node_modules/punycode": {
             "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
             "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
             "dev": true,
             "license": "MIT",
@@ -3520,7 +3282,6 @@
         },
         "node_modules/quicktype-core": {
             "version": "23.2.6",
-            "resolved": "https://registry.npmjs.org/quicktype-core/-/quicktype-core-23.2.6.tgz",
             "integrity": "sha512-asfeSv7BKBNVb9WiYhFRBvBZHcRutPRBwJMxW0pefluK4kkKu4lv0IvZBwFKvw2XygLcL1Rl90zxWDHYgkwCmA==",
             "dev": true,
             "license": "Apache-2.0",
@@ -3543,7 +3304,6 @@
         },
         "node_modules/readable-stream": {
             "version": "4.5.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
             "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
             "dev": true,
             "license": "MIT",
@@ -3560,7 +3320,6 @@
         },
         "node_modules/resolve-from": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
             "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
             "dev": true,
             "license": "MIT",
@@ -3570,7 +3329,6 @@
         },
         "node_modules/rimraf": {
             "version": "6.1.3",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.3.tgz",
             "integrity": "sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==",
             "dev": true,
             "license": "BlueOak-1.0.0",
@@ -3590,7 +3348,6 @@
         },
         "node_modules/rolldown": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.3.tgz",
             "integrity": "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==",
             "dev": true,
             "license": "MIT",
@@ -3624,7 +3381,6 @@
         },
         "node_modules/safe-buffer": {
             "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
             "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
             "dev": true,
             "funding": [
@@ -3645,7 +3401,6 @@
         },
         "node_modules/semver": {
             "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
             "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
             "dev": true,
             "license": "ISC",
@@ -3658,7 +3413,6 @@
         },
         "node_modules/shebang-command": {
             "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
             "dev": true,
             "license": "MIT",
@@ -3671,7 +3425,6 @@
         },
         "node_modules/shebang-regex": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
             "dev": true,
             "license": "MIT",
@@ -3681,14 +3434,12 @@
         },
         "node_modules/siginfo": {
             "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
             "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
             "dev": true,
             "license": "ISC"
         },
         "node_modules/source-map-js": {
             "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
             "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
             "dev": true,
             "license": "BSD-3-Clause",
@@ -3698,21 +3449,18 @@
         },
         "node_modules/stackback": {
             "version": "0.0.2",
-            "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
             "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/std-env": {
             "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz",
             "integrity": "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/string_decoder": {
             "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
             "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
             "dev": true,
             "license": "MIT",
@@ -3722,7 +3470,6 @@
         },
         "node_modules/strip-json-comments": {
             "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
             "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
             "dev": true,
             "license": "MIT",
@@ -3735,7 +3482,6 @@
         },
         "node_modules/supports-color": {
             "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
             "license": "MIT",
@@ -3748,21 +3494,18 @@
         },
         "node_modules/tiny-inflate": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
             "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/tinybench": {
             "version": "2.9.0",
-            "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
             "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/tinyexec": {
             "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz",
             "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==",
             "dev": true,
             "license": "MIT",
@@ -3772,7 +3515,6 @@
         },
         "node_modules/tinyglobby": {
             "version": "0.2.17",
-            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
             "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
             "dev": true,
             "license": "MIT",
@@ -3789,7 +3531,6 @@
         },
         "node_modules/tinyrainbow": {
             "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
             "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
             "dev": true,
             "license": "MIT",
@@ -3799,14 +3540,12 @@
         },
         "node_modules/tr46": {
             "version": "0.0.3",
-            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
             "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/ts-api-utils": {
             "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
             "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
             "dev": true,
             "license": "MIT",
@@ -3819,7 +3558,6 @@
         },
         "node_modules/tslib": {
             "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
             "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
             "dev": true,
             "license": "0BSD",
@@ -3827,7 +3565,6 @@
         },
         "node_modules/tsx": {
             "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.22.4.tgz",
             "integrity": "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==",
             "dev": true,
             "license": "MIT",
@@ -3846,7 +3583,6 @@
         },
         "node_modules/type-check": {
             "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
             "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
             "dev": true,
             "license": "MIT",
@@ -3859,7 +3595,6 @@
         },
         "node_modules/typescript": {
             "version": "5.9.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
             "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
             "dev": true,
             "license": "Apache-2.0",
@@ -3873,14 +3608,12 @@
         },
         "node_modules/undici-types": {
             "version": "7.18.2",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
             "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/unicode-properties": {
             "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz",
             "integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
             "dev": true,
             "license": "MIT",
@@ -3891,7 +3624,6 @@
         },
         "node_modules/unicode-trie": {
             "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
             "integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
             "dev": true,
             "license": "MIT",
@@ -3902,14 +3634,12 @@
         },
         "node_modules/unicode-trie/node_modules/pako": {
             "version": "0.2.9",
-            "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
             "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/uri-js": {
             "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
             "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
             "dev": true,
             "license": "BSD-2-Clause",
@@ -3919,14 +3649,12 @@
         },
         "node_modules/urijs": {
             "version": "1.19.11",
-            "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz",
             "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/vite": {
             "version": "8.0.16",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.16.tgz",
             "integrity": "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==",
             "dev": true,
             "license": "MIT",
@@ -4004,7 +3732,6 @@
         },
         "node_modules/vitest": {
             "version": "4.1.8",
-            "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.8.tgz",
             "integrity": "sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig==",
             "dev": true,
             "license": "MIT",
@@ -4094,7 +3821,6 @@
         },
         "node_modules/vscode-jsonrpc": {
             "version": "8.2.1",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.1.tgz",
             "integrity": "sha512-kdjOSJ2lLIn7r1rtrMbbNCHjyMPfRnowdKjBQ+mGq6NAW5QY2bEZC/khaC5OR8svbbjvLEaIXkOq45e2X9BIbQ==",
             "license": "MIT",
             "engines": {
@@ -4103,14 +3829,12 @@
         },
         "node_modules/webidl-conversions": {
             "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
             "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
             "dev": true,
             "license": "BSD-2-Clause"
         },
         "node_modules/whatwg-url": {
             "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
             "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
             "dev": true,
             "license": "MIT",
@@ -4121,7 +3845,6 @@
         },
         "node_modules/which": {
             "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
             "dev": true,
             "license": "ISC",
@@ -4137,7 +3860,6 @@
         },
         "node_modules/why-is-node-running": {
             "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
             "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
             "dev": true,
             "license": "MIT",
@@ -4154,7 +3876,6 @@
         },
         "node_modules/word-wrap": {
             "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
             "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
             "dev": true,
             "license": "MIT",
@@ -4164,14 +3885,12 @@
         },
         "node_modules/wordwrap": {
             "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
             "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/ws": {
             "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz",
             "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==",
             "dev": true,
             "license": "MIT",
@@ -4193,7 +3912,6 @@
         },
         "node_modules/yaml": {
             "version": "2.9.0",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz",
             "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==",
             "dev": true,
             "license": "ISC",
@@ -4209,7 +3927,6 @@
         },
         "node_modules/yocto-queue": {
             "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
             "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
             "dev": true,
             "license": "MIT",
@@ -4222,7 +3939,6 @@
         },
         "node_modules/zod": {
             "version": "4.3.6",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
             "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
             "license": "MIT",
             "funding": {
diff --git a/nodejs/package.json b/nodejs/package.json
index ca259556ba..9f464788ee 100644
--- a/nodejs/package.json
+++ b/nodejs/package.json
@@ -56,7 +56,7 @@
     "author": "GitHub",
     "license": "MIT",
     "dependencies": {
-        "@github/copilot": "^1.0.78",
+        "@github/copilot": "^1.0.81-11",
         "koffi": "^3.1.0",
         "vscode-jsonrpc": "^8.2.1",
         "zod": "^4.3.6"
diff --git a/nodejs/samples/package-lock.json b/nodejs/samples/package-lock.json
index aed2d4465e..7c2a1052d8 100644
--- a/nodejs/samples/package-lock.json
+++ b/nodejs/samples/package-lock.json
@@ -18,7 +18,7 @@
             "version": "0.0.0-dev",
             "license": "MIT",
             "dependencies": {
-                "@github/copilot": "^1.0.78",
+                "@github/copilot": "^1.0.81-11",
                 "koffi": "^3.1.0",
                 "vscode-jsonrpc": "^8.2.1",
                 "zod": "^4.3.6"
diff --git a/nodejs/src/client.ts b/nodejs/src/client.ts
index 3e100edddd..9b853aa597 100644
--- a/nodejs/src/client.ts
+++ b/nodejs/src/client.ts
@@ -16,7 +16,7 @@ import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
 import { Socket } from "node:net";
-import { dirname, join } from "node:path";
+import { dirname, isAbsolute, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import {
     createMessageConnection,
@@ -35,6 +35,8 @@ import {
 } from "./generated/rpc.js";
 import type {
     GitHubTelemetryNotification,
+    GitHubTokenAcquireRequest,
+    GitHubTokenAcquireResult,
     OpenCanvasInstance,
     SessionUpdateOptionsParams,
 } from "./generated/rpc.js";
@@ -54,9 +56,11 @@ import type {
     CustomAgentConfig,
     ExitPlanModeRequest,
     ExitPlanModeResult,
+    ExtensionJoinOptions,
     ForegroundSessionInfo,
     GetAuthStatusResponse,
     BearerTokenProvider,
+    GitHubTokenProvider,
     GetStatusResponse,
     InternalRuntimeConnection,
     RuntimeConnection,
@@ -377,11 +381,9 @@ function getBundledCliPath(): string {
         // ESM: resolve via import.meta.resolve
         for (const packageName of packageNames) {
             try {
-                const sdkUrl = import.meta.resolve(`${packageName}/sdk`);
-                const sdkPath = fileURLToPath(sdkUrl);
-                // sdkPath is like .../node_modules/@github/copilot-<platform>/sdk/index.js
-                // Go up two levels to get the package root, then append index.js
-                return join(dirname(dirname(sdkPath)), "index.js");
+                const packageEntryUrl = import.meta.resolve(packageName);
+                const packageEntryPath = fileURLToPath(packageEntryUrl);
+                return join(dirname(packageEntryPath), "index.js");
             } catch {
                 // Try the next candidate platform package.
             }
@@ -522,8 +524,13 @@ export class CopilotClient {
     /** Connection-level session filesystem config, set via constructor option. */
     private sessionFsConfig: SessionFsConfig | null = null;
     private requestHandler: CopilotRequestHandler | null = null;
+    private builtinPluginDirectories: string[] = [];
     private onGitHubTelemetry?: (notification: GitHubTelemetryNotification) => void | Promise<void>;
     private clientGlobalHandlers: import("./generated/rpc.js").ClientGlobalApiHandlers = {};
+    private githubTokenProviders = new Map<
+        string,
+        { provider: GitHubTokenProvider; sessionId?: string; committed: boolean }
+    >();
 
     /**
      * Typed server-scoped RPC methods.
@@ -682,6 +689,16 @@ export class CopilotClient {
         if (options.sessionFs) {
             this.validateSessionFsConfig(options.sessionFs);
         }
+        if (options.builtinPluginDirectories) {
+            for (const path of options.builtinPluginDirectories) {
+                if (!isAbsolute(path)) {
+                    throw new Error(
+                        `builtinPluginDirectories must contain only absolute paths: ${path}`
+                    );
+                }
+            }
+            this.builtinPluginDirectories = [...options.builtinPluginDirectories];
+        }
 
         // Pre-parse the URI host/port and mark as external if applicable.
         if (conn.kind === "uri") {
@@ -852,9 +869,65 @@ export class CopilotClient {
                 },
             };
         }
+        handlers.gitHubToken = {
+            getToken: (params) => this.acquireGitHubToken(params),
+        };
         this.clientGlobalHandlers = handlers;
     }
 
+    private async acquireGitHubToken(
+        params: GitHubTokenAcquireRequest
+    ): Promise<GitHubTokenAcquireResult> {
+        const registration = this.githubTokenProviders.get(params.registrationId);
+        if (!registration) {
+            throw new Error(
+                `No GitHub token provider registered for registration ID "${params.registrationId}"`
+            );
+        }
+        return await registration.provider({
+            host: params.host,
+            sessionId: params.sessionId ?? registration.sessionId,
+            reason: params.reason,
+        });
+    }
+
+    private registerGitHubTokenProvider(
+        provider: GitHubTokenProvider | undefined,
+        sessionId?: string
+    ): string | undefined {
+        if (!provider) {
+            return undefined;
+        }
+        const registrationId = randomUUID();
+        this.githubTokenProviders.set(registrationId, { provider, sessionId, committed: false });
+        return registrationId;
+    }
+
+    private assignGitHubTokenProvider(registrationId: string | undefined, sessionId: string): void {
+        if (!registrationId) {
+            return;
+        }
+        const registration = this.githubTokenProviders.get(registrationId);
+        if (registration) {
+            registration.sessionId = sessionId;
+        }
+    }
+
+    private commitGitHubTokenProvider(sessionId: string, registrationId?: string): void {
+        for (const [candidateId, registration] of this.githubTokenProviders) {
+            if (registration.sessionId === sessionId && registration.committed) {
+                this.githubTokenProviders.delete(candidateId);
+            }
+        }
+        const registration = registrationId
+            ? this.githubTokenProviders.get(registrationId)
+            : undefined;
+        if (registration) {
+            registration.sessionId = sessionId;
+            registration.committed = true;
+        }
+    }
+
     /**
      * Starts the CLI server and establishes a connection.
      *
@@ -894,6 +967,17 @@ export class CopilotClient {
             // Verify protocol version compatibility
             await this.verifyProtocolVersion();
 
+            if (this.builtinPluginDirectories.length > 0) {
+                try {
+                    await this.connection!.sendRequest("plugins.builtin.set", {
+                        paths: this.builtinPluginDirectories,
+                    });
+                } catch (error) {
+                    await this.forceStop();
+                    throw error;
+                }
+            }
+
             // If a session filesystem provider was configured, register it
             if (this.sessionFsConfig) {
                 await this.connection!.sendRequest("sessionFs.setProvider", {
@@ -994,6 +1078,7 @@ export class CopilotClient {
             session._markDisconnected();
         }
         this.sessions.clear();
+        this.githubTokenProviders.clear();
 
         // Ask SDK-owned runtimes to flush and clean up before we tear down
         // their transport/process. External runtimes may be shared, so only
@@ -1176,6 +1261,7 @@ export class CopilotClient {
             session._markDisconnected();
         }
         this.sessions.clear();
+        this.githubTokenProviders.clear();
 
         // Force close connection. Suppress writer failures first so teardown
         // write rejections don't surface as unhandled rejections.
@@ -1380,7 +1466,8 @@ export class CopilotClient {
      *
      * In empty mode, defaults the four overridable feature flags to safe values
      * (caller values from `config` win). `installedPlugins=[]` is unconditional
-     * in empty mode — apps that need custom plugins should switch modes.
+     * in empty mode. `includedBuiltinSkills` defaults to `[]`, but callers can
+     * explicitly allow selected runtime-bundled skills.
      */
     private async updateSessionOptionsForMode(
         session: CopilotSession,
@@ -1393,6 +1480,7 @@ export class CopilotClient {
             patch.coauthorEnabled = config.coauthorEnabled ?? false;
             patch.manageScheduleEnabled = config.manageScheduleEnabled ?? false;
             patch.installedPlugins = [];
+            patch.includedBuiltinSkills = config.includedBuiltinSkills ?? [];
         } else {
             if (config.skipCustomInstructions !== undefined)
                 patch.skipCustomInstructions = config.skipCustomInstructions;
@@ -1402,6 +1490,8 @@ export class CopilotClient {
                 patch.coauthorEnabled = config.coauthorEnabled;
             if (config.manageScheduleEnabled !== undefined)
                 patch.manageScheduleEnabled = config.manageScheduleEnabled;
+            if (config.includedBuiltinSkills !== undefined)
+                patch.includedBuiltinSkills = config.includedBuiltinSkills;
         }
         if (Object.keys(patch).length === 0) {
             return;
@@ -1423,6 +1513,9 @@ export class CopilotClient {
     }
 
     async createSession(config: SessionConfig): Promise<CopilotSession> {
+        if (config.gitHubToken !== undefined && config.gitHubTokenProvider !== undefined) {
+            throw new Error("gitHubToken and gitHubTokenProvider are mutually exclusive");
+        }
         if (!this.connection) {
             await this.start();
         }
@@ -1442,6 +1535,11 @@ export class CopilotClient {
         const callerSessionId = config.sessionId;
         const useServerGeneratedId = config.cloud != null && callerSessionId == null;
         const localSessionId = useServerGeneratedId ? undefined : (callerSessionId ?? randomUUID());
+        const toolFilterOptions = this.resolveToolFilterOptions(config);
+        const gitHubTokenProviderRegistrationId = this.registerGitHubTokenProvider(
+            config.gitHubTokenProvider,
+            localSessionId
+        );
 
         // Strip non-serializable bearerTokenProvider callbacks from provider configs,
         // replacing them with a wire flag; keep the callbacks for session-side
@@ -1467,7 +1565,16 @@ export class CopilotClient {
                 this.onGetTraceContext,
                 {
                     mcpAuthHandler: config.onMcpAuthRequest,
-                    managedSettingsEnabled: config.enableManagedSettings,
+                    managedSettingsEnabled:
+                        config.enableManagedSettings === true ||
+                        config.managedSettings !== undefined,
+                    onDisconnected:
+                        gitHubTokenProviderRegistrationId === undefined
+                            ? undefined
+                            : () =>
+                                  this.githubTokenProviders.delete(
+                                      gitHubTokenProviderRegistrationId
+                                  ),
                 }
             );
             s.registerTools(config.tools);
@@ -1511,12 +1618,17 @@ export class CopilotClient {
         // processing (e.g. sessionFs.writeFile for workspace metadata) can be
         // routed to the correct handlers.
         if (localSessionId !== undefined) {
-            session = initializeSession(localSessionId);
-            registeredId = localSessionId;
+            try {
+                session = initializeSession(localSessionId);
+                registeredId = localSessionId;
+            } catch (error) {
+                if (gitHubTokenProviderRegistrationId !== undefined) {
+                    this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId);
+                }
+                throw error;
+            }
         }
 
-        const toolFilterOptions = this.resolveToolFilterOptions(config);
-
         try {
             const response = await this.connection!.sendRequest("session.create", {
                 ...(await getTraceContext(this.onGetTraceContext)),
@@ -1535,6 +1647,7 @@ export class CopilotClient {
                     skipPermission: tool.skipPermission,
                     defer: tool.defer,
                     metadata: tool.metadata,
+                    isTerminal: tool.isTerminal,
                 })),
                 toolSearch: config.toolSearch,
                 canvases: config.canvases?.map((canvas) => canvas.declaration),
@@ -1545,7 +1658,7 @@ export class CopilotClient {
                 canvasProvider: config.canvasProvider,
                 commands: config.commands?.map((cmd) => ({
                     name: cmd.name,
-                    description: cmd.description,
+                    description: cmd.description ?? "",
                 })),
                 systemMessage: wireSystemMessage,
                 availableTools: toolFilterOptions.availableTools,
@@ -1558,6 +1671,7 @@ export class CopilotClient {
                 models: config.models,
                 enableSessionTelemetry: config.enableSessionTelemetry,
                 enableCitations: config.enableCitations,
+                enableFileChangeTracking: config.enableFileChangeTracking,
                 sessionLimits: config.sessionLimits,
                 modelCapabilities: config.modelCapabilities,
                 largeOutput: toWireLargeOutput(config.largeOutput),
@@ -1599,13 +1713,16 @@ export class CopilotClient {
                 pluginDirectories: config.pluginDirectories,
                 instructionDirectories: config.instructionDirectories,
                 disabledSkills: config.disabledSkills,
+                disabledMcpServers: config.disabledMcpServers,
                 infiniteSessions: config.infiniteSessions,
                 memory: config.memory,
                 gitHubToken: config.gitHubToken,
+                gitHubTokenProviderRegistrationId,
                 remoteSession: config.remoteSession,
                 cloud: config.cloud,
                 expAssignments: config.expAssignments,
                 enableManagedSettings: config.enableManagedSettings,
+                managedSettings: config.managedSettings,
             });
 
             const {
@@ -1631,6 +1748,7 @@ export class CopilotClient {
                 session = initializeSession(returnedSessionId);
                 registeredId = returnedSessionId;
             }
+            this.assignGitHubTokenProvider(gitHubTokenProviderRegistrationId, returnedSessionId);
             if (config.onMcpAuthRequest) {
                 await this.connection!.sendRequest("session.eventLog.registerInterest", {
                     sessionId: returnedSessionId,
@@ -1641,10 +1759,14 @@ export class CopilotClient {
             session.setCapabilities(capabilities);
 
             await this.updateSessionOptionsForMode(session, config);
+            this.commitGitHubTokenProvider(returnedSessionId, gitHubTokenProviderRegistrationId);
         } catch (e) {
             if (registeredId !== undefined) {
                 this.sessions.delete(registeredId);
             }
+            if (gitHubTokenProviderRegistrationId !== undefined) {
+                this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId);
+            }
             throw e;
         }
 
@@ -1683,16 +1805,21 @@ export class CopilotClient {
     async resumeSessionForExtension(
         sessionId: string,
         config: ResumeSessionConfig,
-        factories?: FactoryHandle[]
+        factories?: FactoryHandle[],
+        extensionOptions?: ExtensionJoinOptions
     ): Promise<CopilotSession> {
-        return this.resumeSessionInternal(sessionId, config, factories);
+        return this.resumeSessionInternal(sessionId, config, factories, extensionOptions);
     }
 
     private async resumeSessionInternal(
         sessionId: string,
         config: ResumeSessionConfig,
-        factories?: FactoryHandle[]
+        factories?: FactoryHandle[],
+        extensionOptions?: ExtensionJoinOptions
     ): Promise<CopilotSession> {
+        if (config.gitHubToken !== undefined && config.gitHubTokenProvider !== undefined) {
+            throw new Error("gitHubToken and gitHubTokenProvider are mutually exclusive");
+        }
         if (!this.connection) {
             await this.start();
         }
@@ -1706,7 +1833,8 @@ export class CopilotClient {
             this.onGetTraceContext,
             {
                 mcpAuthHandler: config.onMcpAuthRequest,
-                managedSettingsEnabled: config.enableManagedSettings,
+                managedSettingsEnabled:
+                    config.enableManagedSettings === true || config.managedSettings !== undefined,
             }
         );
         session.registerTools(config.tools);
@@ -1757,6 +1885,15 @@ export class CopilotClient {
         this.setupSessionFs(session, config);
 
         const toolFilterOptions = this.resolveToolFilterOptions(config);
+        const gitHubTokenProviderRegistrationId = this.registerGitHubTokenProvider(
+            config.gitHubTokenProvider,
+            sessionId
+        );
+        if (gitHubTokenProviderRegistrationId !== undefined) {
+            session._setOnDisconnected(() =>
+                this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId)
+            );
+        }
 
         try {
             const response = await this.connection!.sendRequest("session.resume", {
@@ -1775,6 +1912,7 @@ export class CopilotClient {
                 enableSessionTelemetry: config.enableSessionTelemetry,
                 excludedBuiltinAgents: config.excludedBuiltinAgents,
                 enableCitations: config.enableCitations,
+                enableFileChangeTracking: config.enableFileChangeTracking,
                 sessionLimits: config.sessionLimits,
                 tools: config.tools?.map((tool) => ({
                     name: tool.name,
@@ -1784,6 +1922,7 @@ export class CopilotClient {
                     skipPermission: tool.skipPermission,
                     defer: tool.defer,
                     metadata: tool.metadata,
+                    isTerminal: tool.isTerminal,
                 })),
                 toolSearch: config.toolSearch,
                 canvases: config.canvases?.map((canvas) => canvas.declaration),
@@ -1795,7 +1934,7 @@ export class CopilotClient {
                 canvasProvider: config.canvasProvider,
                 commands: config.commands?.map((cmd) => ({
                     name: cmd.name,
-                    description: cmd.description,
+                    description: cmd.description ?? "",
                 })),
                 provider: bearerWireProvider,
                 capi: config.capi,
@@ -1842,17 +1981,43 @@ export class CopilotClient {
                 pluginDirectories: config.pluginDirectories,
                 instructionDirectories: config.instructionDirectories,
                 disabledSkills: config.disabledSkills,
+                disabledMcpServers: config.disabledMcpServers,
                 infiniteSessions: config.infiniteSessions,
                 memory: config.memory,
                 disableResume: config.suppressResumeEvent,
                 continuePendingWork: config.continuePendingWork,
                 gitHubToken: config.gitHubToken,
+                gitHubTokenProviderRegistrationId,
                 remoteSession: config.remoteSession,
                 openCanvases: config.openCanvases,
                 expAssignments: config.expAssignments,
                 enableManagedSettings: config.enableManagedSettings,
+                managedSettings: config.managedSettings,
+                ...(extensionOptions?.requestedEnvironmentVariables
+                    ? {
+                          requestedEnvironmentVariables:
+                              extensionOptions.requestedEnvironmentVariables,
+                      }
+                    : {}),
             });
 
+            // The host answers an approved environment request with the resolved
+            // values, and this method consumes the response, so the grant has to be
+            // applied here — no caller ever sees it. Only the names the user
+            // approved may reach the extension, so a host that answers with
+            // anything extra cannot widen the grant.
+            if (extensionOptions?.requestedEnvironmentVariables) {
+                const requested = new Set(extensionOptions.requestedEnvironmentVariables);
+                const { grantedEnvironmentVariables } = response as {
+                    grantedEnvironmentVariables?: Record<string, string>;
+                };
+                for (const [name, value] of Object.entries(grantedEnvironmentVariables ?? {})) {
+                    if (requested.has(name)) {
+                        process.env[name] = value;
+                    }
+                }
+            }
+
             const { workspacePath, capabilities, openCanvases } = response as {
                 sessionId: string;
                 workspacePath?: string;
@@ -1870,8 +2035,12 @@ export class CopilotClient {
             }
 
             await this.updateSessionOptionsForMode(session, config);
+            this.commitGitHubTokenProvider(sessionId, gitHubTokenProviderRegistrationId);
         } catch (e) {
             this.sessions.delete(sessionId);
+            if (gitHubTokenProviderRegistrationId !== undefined) {
+                this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId);
+            }
             throw e;
         }
 
@@ -2115,8 +2284,9 @@ export class CopilotClient {
             throw new Error(`Failed to delete session ${sessionId}: ${error || "Unknown error"}`);
         }
 
-        // Remove from local sessions map if present
+        const session = this.sessions.get(sessionId);
         this.sessions.delete(sessionId);
+        session?._runOnDisconnected();
     }
 
     /**
@@ -2879,6 +3049,7 @@ export class CopilotClient {
 
         this.connection.onClose(() => {
             this.state = "disconnected";
+            this.githubTokenProviders.clear();
         });
 
         this.connection.onError((_error) => {
diff --git a/nodejs/src/extension.ts b/nodejs/src/extension.ts
index c3ae0fd874..d756308734 100644
--- a/nodejs/src/extension.ts
+++ b/nodejs/src/extension.ts
@@ -27,6 +27,35 @@ export type JoinSessionConfig = Omit<
     "onPermissionRequest" | "extensionSdkPath"
 > & {
     onPermissionRequest?: PermissionHandler;
+    /**
+     * Names of sensitive environment variables this extension needs, such as
+     * `"GITHUB_TOKEN"`.
+     *
+     * The Copilot CLI strips sensitive variables from every extension process
+     * before it starts, so an extension that needs one must ask for it by name.
+     * The CLI prompts the user with the extension's name and the exact list of
+     * variables requested. On approval the granted values are written into this
+     * process's `process.env` before {@link joinSession} resolves, so they are
+     * readable afterwards. On denial the join rejects and the extension does not
+     * load, so its tools never reach the model.
+     *
+     * An approval is remembered against the exact set of names the user saw, so
+     * asking for an additional variable later prompts again. Names that are unset
+     * or that the CLI does not filter from extensions are not prompted for. An
+     * empty list means the same as omitting the option: nothing is requested.
+     *
+     * Requires a Copilot CLI that supports extension environment access; older
+     * CLIs ignore the request and grant nothing.
+     *
+     * @example
+     * ```typescript
+     * const session = await joinSession({
+     *     requestedEnvironmentVariables: ["GITHUB_TOKEN"],
+     * });
+     * const token = process.env.GITHUB_TOKEN;
+     * ```
+     */
+    requestedEnvironmentVariables?: string[];
     /**
      * Factory handles to register when the extension joins the session.
      *
@@ -94,6 +123,7 @@ export async function joinSession(config: JoinSessionConfig = {}): Promise<Copil
     const {
         extensionSdkPath: _stripped,
         factories,
+        requestedEnvironmentVariables,
         ...rest
     } = config as JoinSessionConfig & {
         extensionSdkPath?: string;
@@ -107,6 +137,7 @@ export async function joinSession(config: JoinSessionConfig = {}): Promise<Copil
             onPermissionRequest: config.onPermissionRequest ?? defaultJoinSessionPermissionHandler,
             suppressResumeEvent: config.suppressResumeEvent ?? true,
         },
-        factories
+        factories,
+        requestedEnvironmentVariables?.length ? { requestedEnvironmentVariables } : undefined
     );
 }
diff --git a/nodejs/src/factory.ts b/nodejs/src/factory.ts
index 53c0aeca82..8a6c787471 100644
--- a/nodejs/src/factory.ts
+++ b/nodejs/src/factory.ts
@@ -6,38 +6,15 @@ import type {
     FactoryGetRunProgressRequest,
     FactoryProgressPage,
     FactoryRunDetail,
-    FactoryRunResult as WireFactoryRunResult,
+    FactoryRunResult,
     FactoryRunStatus,
     FactoryRunSummary,
 } from "./generated/rpc.js";
+import type { ContextTier } from "./generated/session-events.js";
 import type { CopilotSession } from "./session.js";
 import type { FactoryLimits, FactoryMeta } from "./types.js";
 
-/**
- * The envelope describing a factory run: its identity, status, and — once it
- * has completed — its result. `getRun` returns this for an in-flight run too,
- * so `status` may be `pending` or `running` and the outcome fields absent.
- *
- * `result` is re-typed here rather than taken from the generated wire type. The
- * runtime returns any JSON value — including `null`, a string, a number, or an
- * array — but the schema models the field as an opaque node, which the
- * generator renders as an object. Narrowing the correction to this surface
- * keeps the `x-opaque-json` handling unchanged for every other consumer.
- *
- * This override is temporary. Once the schema distinguishes an opaque JSON
- * value from an opaque in-process value and that ships in a CLI release,
- * regenerating produces the right type directly, and this declaration, the
- * `toPublicFactoryRunResult` boundary helper, and the casts around it should
- * all be deleted. Tracked by github/copilot-agent-runtime#14122.
- *
- * @experimental Part of the experimental Agent Factories surface and may
- * change or be removed in future SDK or CLI releases.
- */
-export type FactoryRunResult = Omit<WireFactoryRunResult, "result"> & {
-    /** Completed factory result. */
-    result?: JsonValue;
-};
-
+export type { FactoryRunResult };
 export type {
     FactoryAgentSummary,
     FactoryPhaseStatus,
@@ -85,12 +62,16 @@ export type JsonValue =
     | { [key: string]: JsonValue };
 
 /**
- * Conservative JSON shape language accepted for structured factory agent output.
+ * Conservative JSON shape language accepted by the Agent Factories surface, for
+ * both structured factory agent output and a factory's declared `argsSchema`.
  *
- * This is a best-effort structural guard used to decide whether a subagent's
- * structured output should be accepted or retried — **not** a full JSON Schema
+ * This is a best-effort structural guard — used to decide whether a subagent's
+ * structured output should be accepted or retried, and whether a caller's
+ * factory `args` match the declared shape — **not** a full JSON Schema
  * validator. Only these keywords are honored: `type`, `required`, `enum`,
- * `const`, recursive `properties`/`items`, and `anyOf`/`oneOf`/`allOf`.
+ * `const`, recursive `properties`/`items`, and `anyOf`/`oneOf`/`allOf`. A `type`
+ * is one of `null`, `boolean`, `integer`, `number`, `string`, `array`, or
+ * `object`, or a non-empty array of those (for example `["object", "null"]`).
  *
  * Everything else is **ignored, not enforced**. In particular, string
  * constraints (`pattern`, `minLength`, `maxLength`, `format`), numeric ranges
@@ -115,8 +96,20 @@ export interface FactoryAgentOptions {
     label?: string;
     schema?: FactoryJsonSchema;
     model?: string;
+    reasoningEffort?: string;
+    contextTier?: ContextTier;
+    agent?: string;
 }
 
+export const FACTORY_AGENT_OPTION_KEYS = [
+    "label",
+    "schema",
+    "model",
+    "reasoningEffort",
+    "contextTier",
+    "agent",
+] as const;
+
 /**
  * Options for a durable factory step.
  *
@@ -185,7 +178,10 @@ export interface FactoryContext<TArgs extends JsonValue = JsonValue> {
     factory(name: string, args?: JsonValue): Promise<JsonValue | void>;
     /** Caller-supplied input, forwarded verbatim. */
     args: TArgs;
-    /** The same full session instance returned by `joinSession`. */
+    /**
+     * The session instance returned by `joinSession`. It refuses calls that
+     * start or resume a factory run.
+     */
     session: CopilotSession;
     /** Cooperative cancellation signal for the current factory run. */
     signal: AbortSignal;
@@ -275,8 +271,11 @@ export type FactoryResumeErrorCode =
     | "not_found"
     | "non_resumable"
     | "already_active"
-    | "reapproval_declined"
-    | "no_approval_provider";
+    | "factory_already_running"
+    | "factory_limits_invalid"
+    | "factory_session_disposed"
+    | "factory_storage_unavailable"
+    | "factory_storage_corrupt";
 
 /**
  * Friendly factory API exposed on a session.
@@ -290,9 +289,12 @@ export interface SessionFactoryApi {
      *
      * The envelope is returned for every outcome, including `error`, `halted`,
      * and `cancelled` — inspect `status` and read `result` only when the run
-     * completed. A declined fresh run resolves with a terminal `cancelled`
-     * envelope. Failures that occur before a run exists (such as an unknown
-     * factory or an already-active session) still reject.
+     * completed. SDK-initiated runs do not request permission, so they have no
+     * declined outcome. The model's `run_factory` tool requests permission
+     * before a durable row exists; declining it creates no run row. Failures
+     * that occur before a run exists (such as an unknown factory or attempting
+     * to start a run while the session is at its active top-level run limit)
+     * still reject.
      */
     run(name: string, options?: RunOptions): Promise<FactoryRunResult>;
     run<TArgs extends JsonValue>(
@@ -302,9 +304,9 @@ export interface SessionFactoryApi {
     /**
      * Resume a run from its persisted factory name, arguments, journal, and accounting.
      *
-     * Resolves with the run envelope like {@link SessionFactoryApi.run}. A
-     * pre-execution failure, including declined reapproval, rejects with
-     * {@link FactoryResumeError}.
+     * Resolves with the run envelope like {@link SessionFactoryApi.run}.
+     * SDK-initiated resumes do not request permission. A pre-execution failure
+     * with a documented resume code rejects with {@link FactoryResumeError}.
      */
     resume(runId: string, options?: ResumeOptions): Promise<FactoryRunResult>;
     /** Read the latest durable envelope for a factory run. */
@@ -324,7 +326,9 @@ export interface SessionFactoryApi {
      * {@link SessionFactoryApi.cancel} to actually stop it.
      */
     waitForRun(runId: string, options?: { signal?: AbortSignal }): Promise<FactoryRunResult>;
-    /** List this session's durable factory runs in creation order. */
+    /**
+     * List the newest default page of this session's durable factory runs.
+     */
     listRuns(): Promise<FactoryRunSummary[]>;
     /** Read durable phases, direct agents, and the latest progress tail for a run. */
     getRunDetail(runId: string): Promise<FactoryRunDetail>;
diff --git a/nodejs/src/generated/rpc.ts b/nodejs/src/generated/rpc.ts
index cdd3b29eba..9e7304bde2 100644
--- a/nodejs/src/generated/rpc.ts
+++ b/nodejs/src/generated/rpc.ts
@@ -5,10 +5,20 @@
 
 import type { MessageConnection } from "vscode-jsonrpc/node.js";
 
-import type { AbortReason, Attachment, ContextTier, EmbeddedBlobResourceContents, EmbeddedTextResourceContents, McpServerSource, McpServerStatus, PermissionPromptRequest, PermissionRule, ReasoningSummary, SessionEvent, SessionLimitsConfig, SessionMode, ShutdownType, SkillSource, UserToolSessionApproval, Verbosity } from "./session-events.js";
+import type { AbortReason, Attachment, ContextTier, EmbeddedBlobResourceContents, EmbeddedTextResourceContents, McpOauthHttpResponse, McpOauthWWWAuthenticateParams, McpServerSource, McpServerStatus, ModelChangeSource, PermissionMode, PermissionPromptRequest, PermissionRule, ReasoningSummary, SessionEvent, SessionLimitsConfig, SessionMode, ShutdownType, SkillSource, TaskCompleteData, TaskCompletionOutcome, UserToolSessionApproval, Verbosity } from "./session-events.js";
+
+/** A value that can be represented losslessly on the SDK JSON wire. */
+export type JsonValue = null | boolean | number | string | JsonValue[] | { [key: string]: JsonValue };
+
+/**
+ * A value that lives only in this process and never crosses the JSON-RPC
+ * boundary, such as a callback or a host object handle.
+ * @internal
+ */
+export type OpaqueInProcessValue = unknown;
 
 /**
- * Initial authentication info for the session.
+ * Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "AuthInfo".
@@ -18,10 +28,21 @@ export type AuthInfo =
   | HMACAuthInfo
   | EnvAuthInfo
   | TokenAuthInfo
+  | TokenProviderAuthInfo
   | CopilotApiTokenAuthInfo
   | UserAuthInfo
   | GhCliAuthInfo
   | ApiKeyAuthInfo;
+/**
+ * User to log out
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountLogoutRequest".
+ */
+/** @experimental */
+export type AccountLogoutRequest = {
+  [k: string]: unknown | undefined;
+};
 /**
  * Resolved Anthropic adaptive-thinking capability for a model.
  *
@@ -223,20 +244,6 @@ export type AgentRegistrySpawnValidationErrorField =
   | "model"
   /** The permissionMode parameter */
   | "permissionMode";
-/**
- * Current or requested allow-all mode.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "PermissionsAllowAllMode".
- */
-/** @experimental */
-export type PermissionsAllowAllMode =
-  /** Permission requests follow the normal approval flow. */
-  | "off"
-  /** Tool, path, and URL permission requests are automatically approved. */
-  | "on"
-  /** Permission requests follow the normal approval flow with an LLM advisory recommendation attached; clients may choose to auto-approve requests the judge evaluated as acceptable. */
-  | "auto";
 /**
  * Authentication type
  *
@@ -257,8 +264,399 @@ export type AuthInfoType =
   | "api-key"
   /** Authentication from a GitHub token. */
   | "token"
+  /** Authentication from an SDK GitHub token callback. */
+  | "token-provider"
   /** Authentication from a Copilot API token. */
   | "copilot-api-token";
+/**
+ * Validation errors from the most recent authentication attempt.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AuthValidationErrors".
+ */
+/** @experimental */
+export type AuthValidationErrors = AuthValidationError[];
+/**
+ * Root JSON Schema type for a built-in tool input.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "BuiltinToolInputSchemaType".
+ */
+/** @experimental */
+export type BuiltinToolInputSchemaType = /** The tool accepts a JSON object. */ "object";
+/**
+ * Custom input-format kind.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "BuiltinToolFormatType".
+ */
+/** @experimental */
+export type BuiltinToolFormatType = /** The tool input is parsed with the supplied grammar. */ "grammar";
+/**
+ * Telemetry-safety policy for a built-in tool.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "BuiltinToolSafeForTelemetry".
+ */
+/** @experimental */
+export type BuiltinToolSafeForTelemetry = boolean | BuiltinToolSafeTelemetryFields;
+/**
+ * JSON Schema for canvas open input
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasJsonSchema".
+ */
+/** @experimental */
+export type CanvasJsonSchema = JsonValue;
+/**
+ * Provider-supplied action result.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasActionInvokeResult".
+ */
+/** @experimental */
+export type CanvasActionInvokeResult = JsonValue;
+/**
+ * Canonical digest algorithm for a validated MCP card
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CardDigestAlgorithm".
+ */
+/** @experimental */
+export type CardDigestAlgorithm = /** SHA-256 over RFC 8785 canonical JSON encoded as UTF-8. */ "sha256-rfc8785";
+/**
+ * SHA-256 digest encoded as exactly 64 lowercase hexadecimal characters.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CardDigestValue".
+ */
+/** @experimental */
+export type CardDigestValue = string;
+/**
+ * Where a candidate's card came from. Exactly one of a URL or embedded data: the union has no variant carrying both, and no variant carrying neither, so the rule holds structurally rather than by validation.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogCandidateSource".
+ */
+/** @experimental */
+export type CatalogCandidateSource = CatalogCandidateSourceUrl | CatalogCandidateSourceEmbedded;
+/**
+ * Why the catalog authority did not accept the caller's identity
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogAuthenticationRequiredReason".
+ */
+/** @experimental */
+export type CatalogAuthenticationRequiredReason =
+  /** No credential was presented, so there is nothing to refresh and the caller must sign in. */
+  | "no-credential"
+  /** A credential was presented and its lifetime has elapsed. A silent refresh is worth attempting before prompting anyone. */
+  | "credential-expired"
+  /** A credential was presented and the authority refused it, for example because it was revoked, malformed, or issued for another audience. Refreshing the same rejected credential is not useful; the caller must sign in again. */
+  | "credential-rejected";
+/**
+ * One inert catalog result, represented as an MCP server or discovery-only AI skill variant so kind, media type, provenance, and installability cannot contradict each other.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogCandidate".
+ */
+/** @experimental */
+export type CatalogCandidate = CatalogMcpServerCandidate | CatalogAiSkillCandidate;
+/**
+ * JSON MCP card media type accepted for install planning
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerCardMediaType".
+ */
+/** @experimental */
+export type McpServerCardMediaType =
+  /** The current MCP server card media type. */
+  | "application/mcp-server-card+json"
+  /** The legacy MCP server card media type, accepted for compatibility. */
+  | "application/mcp-server+json";
+/**
+ * Whether an MCP server candidate can be planned for installation
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogMcpServerInstallability".
+ */
+/** @experimental */
+export type CatalogMcpServerInstallability =
+  /** An install plan can be computed for this MCP server candidate. */
+  | "installable"
+  /** Policy forbids installing this MCP server candidate. */
+  | "not-installable-policy";
+/**
+ * What kind of resource a catalog candidate describes
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogCandidateKind".
+ */
+/** @experimental */
+export type CatalogCandidateKind =
+  /** An MCP server, which can be planned for installation. */
+  | "mcp-server"
+  /** An AI skill, which is discoverable but not installable through this surface. */
+  | "ai-skill";
+/**
+ * A wire feature a caller can require of the catalog surface, negotiated per request. A grant means the runtime understands the feature's contract, not that the deployment has enabled the operation; typed unavailable results report availability separately.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogCapability".
+ */
+/** @experimental */
+export type CatalogCapability =
+  /** Understands the current `application/mcp-server-card+json` media type. */
+  | "mcp-server-card"
+  /** Understands the legacy `application/mcp-server+json` media type. */
+  | "legacy-mcp-server-card"
+  /** Understands `application/ai-skill` candidates as discovery-only and typed non-installable. */
+  | "ai-skill-discovery"
+  /** Understands side-effect-free MCP install-plan requests, results, and plan handles; `planning-unavailable` separately reports that planning is not enabled. */
+  | "mcp-install-planning"
+  /** Understands plans that enumerate every eligible transport rather than a single preferred one. */
+  | "multiple-transport-choice";
+/**
+ * Bounded extensible wire-feature identifier. Known values are described by `CatalogCapability`; newer callers may send future identifiers so an older runtime can return a typed negotiation refusal instead of failing schema validation. Capability negotiation establishes contract understanding, while each operation's result separately reports runtime availability.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogCapabilityId".
+ */
+/** @experimental */
+export type CatalogCapabilityId = string;
+/**
+ * Which wire-contract rule an upstream response broke
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogContractViolationReason".
+ */
+/** @experimental */
+export type CatalogContractViolationReason =
+  /** A result carried both a URL and embedded data, when exactly one is permitted. */
+  | "both-url-and-data"
+  /** A result carried neither a URL nor embedded data, when exactly one is required. */
+  | "neither-url-nor-data"
+  /** Two results claimed the same normalised identity. */
+  | "duplicate-identity"
+  /** A result declared no media type, or one this contract does not model. */
+  | "unknown-media-type";
+/**
+ * Which kind of opaque handle was presented
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogHandleType".
+ */
+/** @experimental */
+export type CatalogHandleType =
+  /** A search candidate handle. */
+  | "candidate"
+  /** An install plan handle. */
+  | "plan";
+/**
+ * Why a presented handle was rejected
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogHandleRejectionReason".
+ */
+/** @experimental */
+export type CatalogHandleRejectionReason =
+  /** The handle is unparseable, unknown, or was issued for a different operation. */
+  | "invalid"
+  /** The handle's time to live has elapsed. */
+  | "stale"
+  /** The handle has already been used, and handles are single-use. */
+  | "replayed"
+  /** The handle was issued by a different runtime instance. */
+  | "foreign";
+/**
+ * Which request field was rejected before any work was done
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogInvalidRequestField".
+ */
+/** @experimental */
+export type CatalogInvalidRequestField =
+  /** The search query was empty or longer than permitted. */
+  | "query"
+  /** The requested result count fell outside its permitted range. */
+  | "limit"
+  /** The requested candidate kinds were empty or contained a duplicate. */
+  | "kinds"
+  /** The negotiation block was missing or malformed. */
+  | "contract"
+  /** The plan source was missing or malformed. */
+  | "source"
+  /** The supplied card was missing its media type, URL, or data. */
+  | "card"
+  /** The requested configuration scope is not one this runtime writes. */
+  | "scope";
+/**
+ * How a card failed validation
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogMalformedCardReason".
+ */
+/** @experimental */
+export type CatalogMalformedCardReason =
+  /** The document is not well-formed JSON. */
+  | "invalid-json"
+  /** The document does not satisfy its media type's schema. */
+  | "schema-violation"
+  /** The declared media type is not one this runtime understands. */
+  | "unsupported-media-type"
+  /** A field the media type requires is absent. */
+  | "missing-required-field"
+  /** The document exceeded the permitted size. */
+  | "size-limit-exceeded";
+/**
+ * Media type a catalog card is interpreted as
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogMediaType".
+ */
+/** @experimental */
+export type CatalogMediaType =
+  /** The current MCP server card media type. */
+  | "application/mcp-server-card+json"
+  /** The legacy MCP server card media type, accepted for compatibility. */
+  | "application/mcp-server+json"
+  /** An AI skill card. Representable and searchable, but typed non-installable. */
+  | "application/ai-skill";
+/**
+ * Why capability and protocol-version negotiation refused a caller
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogNegotiationRefusedReason".
+ */
+/** @experimental */
+export type CatalogNegotiationRefusedReason =
+  /** The caller's protocol version is below the lowest this runtime serves. */
+  | "unsupported-protocol-version"
+  /** The caller requires at least one capability this runtime cannot honour. */
+  | "unsupported-capability";
+/**
+ * Categorised network failure, low cardinality so it can be aggregated without carrying a URL
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogNetworkFailureReason".
+ */
+/** @experimental */
+export type CatalogNetworkFailureReason =
+  /** No network is available, so nothing was attempted. */
+  | "offline"
+  /** The authority's name could not be resolved. */
+  | "dns"
+  /** The request exceeded its time budget. */
+  | "timeout"
+  /** The TLS handshake or certificate validation failed. */
+  | "tls"
+  /** The connection was refused or reset. */
+  | "connection-refused"
+  /** The authority returned a status the runtime treats as a failure. */
+  | "http-status"
+  /** The response exceeded the permitted size. */
+  | "response-too-large"
+  /** A redirect was refused by the runtime's redirect policy. */
+  | "redirect-rejected";
+/**
+ * Why a discoverable candidate cannot be installed
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogNotInstallableReason".
+ */
+/** @experimental */
+export type CatalogNotInstallableReason =
+  /** This kind of resource is not installable through this surface. */
+  | "kind-not-installable"
+  /** AI skills are discoverable but have no typed importer in this phase. */
+  | "ai-skill-not-installable"
+  /** Policy forbids installing this candidate. */
+  | "policy-forbids";
+/**
+ * Which authority produced a policy decision
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanPolicySource".
+ */
+/** @experimental */
+export type McpPlanPolicySource =
+  /** No policy applied, so the server is permitted by default. */
+  | "none"
+  /** An enterprise allowlist evaluated the server. */
+  | "enterprise-allowlist"
+  /** The registry the card came from evaluated the server. */
+  | "registry-policy"
+  /** Local trust settings evaluated the server. */
+  | "local-trust";
+/**
+ * Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogSearchResult".
+ */
+/** @experimental */
+export type CatalogSearchResult =
+  | CatalogSearchSucceeded
+  | CatalogNegotiationRefusedError
+  | CatalogUnsupportedKindError
+  | CatalogInvalidRequestError
+  | CatalogAuthenticationRequiredError
+  | CatalogPolicyRejectedError
+  | CatalogNetworkFailureError
+  | CatalogUnsafeRetrievalError
+  | CatalogMalformedCardError
+  | CatalogContractViolationError
+  | CatalogUnavailableError;
+/**
+ * Which hardened-fetch control refused a retrieval
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogUnsafeRetrievalReason".
+ */
+/** @experimental */
+export type CatalogUnsafeRetrievalReason =
+  /** The URL used a scheme the runtime refuses to fetch. */
+  | "blocked-scheme"
+  /** The URL embedded credentials. */
+  | "credentials-in-url"
+  /** The URL resolved to a loopback, private, link-local, or cloud metadata address. */
+  | "blocked-address"
+  /** A redirect target resolved to a blocked address. */
+  | "redirect-to-blocked-address"
+  /** The configured proxy policy refused the request. */
+  | "proxy-rejected"
+  /** The authority is not permitted for card retrieval. */
+  | "host-not-permitted";
+/**
+ * Why a catalog operation is not available on this runtime
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogUnavailableReason".
+ */
+/** @experimental */
+export type CatalogUnavailableReason =
+  /** Bounded search is not wired up on this runtime build. */
+  | "search-unavailable"
+  /** Install planning is not wired up on this runtime build. */
+  | "planning-unavailable"
+  /** No catalog authority is configured for this runtime. */
+  | "authority-not-configured"
+  /** The surface is disabled by policy on this runtime. */
+  | "disabled-by-policy";
+/**
+ * Why no usable transport could be offered
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogUnavailableTransportReason".
+ */
+/** @experimental */
+export type CatalogUnavailableTransportReason =
+  /** The card advertises no transport this runtime can use. */
+  | "no-eligible-transport"
+  /** Every advertised transport is of a kind this runtime does not implement. */
+  | "transport-not-supported"
+  /** Eligible remotes could not be enumerated, so no explicit choice can be offered. */
+  | "remote-enumeration-unavailable";
 /**
  * Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command
  *
@@ -281,6 +679,21 @@ export type SlashCommandKind =
  */
 /** @experimental */
 export type SlashCommandInputCompletion = /** Input should complete filesystem directories. */ "directory";
+/**
+ * Whether a pending slash-command invocation effect was applied or cancelled by the host.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CommandsInvocationEffectOutcome".
+ */
+/** @experimental */
+export type CommandsInvocationEffectOutcome =
+  /** The host applied the pending invocation effect. */
+  | "applied"
+  /** The host cancelled the pending invocation effect, so any provisional state must be reverted. */
+  | "cancelled";
+
+/** @experimental */
+export type CommandsInvocationOrigin = "settings";
 /**
  * Optional filters controlling which command sources to include in the listing.
  *
@@ -373,6 +786,9 @@ export type DebugCollectLogsDestination =
        * When true, create the archive atomically without overwriting an existing file by appending ` (N)` before the extension as needed. Defaults to false.
        */
       noOverwrite?: boolean;
+      /**
+       * Destination variant discriminator.
+       */
       kind: "archive";
     }
   | {
@@ -380,6 +796,9 @@ export type DebugCollectLogsDestination =
        * Directory where redacted files should be staged. The directory is created if needed.
        */
       outputDirectory: string;
+      /**
+       * Destination variant discriminator.
+       */
       kind: "directory";
     };
 /**
@@ -620,7 +1039,9 @@ export type FactoryDurableOperation =
   /** Reading a journal entry without treating storage failure as a cache miss. */
   | "journalGet"
   /** Persisting a journal entry before reporting success. */
-  | "journalPut";
+  | "journalPut"
+  /** Renewing the durable owner lease that proves this process still owns the run. */
+  | "refreshLease";
 /**
  * Current or terminal state of a factory run.
  *
@@ -659,6 +1080,9 @@ export type FactoryRunFailure =
        * Factory run identifier.
        */
       runId: string;
+      /**
+       * Factory failure variant discriminator.
+       */
       type: "factory_limit_reached";
     }
   | {
@@ -670,6 +1094,9 @@ export type FactoryRunFailure =
        * Human-readable reason the resume did not proceed.
        */
       reason: string;
+      /**
+       * Factory failure variant discriminator.
+       */
       type: "factory_resume_declined";
     }
   | {
@@ -682,7 +1109,24 @@ export type FactoryRunFailure =
        * Factory run identifier.
        */
       runId: string;
+      /**
+       * Factory failure variant discriminator.
+       */
       type: "factory_durable_failure";
+    }
+  | {
+      /**
+       * Factory run identifier.
+       */
+      runId: string;
+      /**
+       * Confirmed usage in nano-AIU, representing the floor of what the run spent.
+       */
+      drainedNanoAiu: number;
+      /**
+       * Factory failure variant discriminator.
+       */
+      type: "factory_accounting_incomplete";
     };
 /**
  * Cumulative resource ceiling that stopped a factory run.
@@ -738,6 +1182,50 @@ export type FilterMapping =
       [k: string]: ContentFilterMode;
     }
   | ContentFilterMode;
+/**
+ * Why the runtime is requesting a GitHub credential.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubTokenAcquireReason".
+ */
+/** @experimental */
+export type GitHubTokenAcquireReason =
+  /** The runtime is acquiring the registration's first credential. */
+  | "initial"
+  /** The runtime is replacing a credential that is approaching expiry. */
+  | "refresh";
+/**
+ * SDK host response to a GitHub credential request.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubTokenAcquireResult".
+ */
+/** @experimental */
+export type GitHubTokenAcquireResult =
+  | {
+      /**
+       * GitHub access token acquired by the SDK host.
+       */
+      accessToken: string;
+      /**
+       * OAuth token type. Defaults to bearer when omitted.
+       */
+      tokenType?: string;
+      /**
+       * Remaining token lifetime in seconds when callback execution completes. It must exceed the one-hour preflight refresh threshold.
+       */
+      expiresIn: number;
+      /**
+       * GitHub credential response variant discriminator.
+       */
+      kind: "token";
+    }
+  | {
+      /**
+       * GitHub credential response variant discriminator.
+       */
+      kind: "cancelled";
+    };
 /**
  * Optional compaction parameters.
  *
@@ -1112,13 +1600,21 @@ export type McpAppsSetHostContextDetailsPlatform =
   /** Host runs on a mobile device */
   | "mobile";
 /**
- * MCP server configuration (stdio process or remote HTTP/SSE)
+ * Serializable MCP server configuration (stdio process or remote HTTP/SSE)
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "McpServerConfig".
+ * via the `definition` "McpSerializableServerConfig".
  */
 /** @experimental */
-export type McpServerConfig = McpServerConfigStdio | McpServerConfigHttp;
+export type McpSerializableServerConfig = McpServerConfigStdio | McpServerConfigHttp;
+/**
+ * Telemetry-obfuscation policy for an MCP server's tools.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpSafeForTelemetry".
+ */
+/** @experimental */
+export type McpSafeForTelemetry = boolean | McpSafeForTelemetryFields;
 /**
  * Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
  *
@@ -1139,6 +1635,18 @@ export type McpServerConfigDeferTools =
   | "auto"
   /** Tools are always included in the initial tool list, even when tool search is enabled. */
   | "never";
+/**
+ * Local MCP transport type.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerConfigStdioType".
+ */
+/** @experimental */
+export type McpServerConfigStdioType =
+  /** Legacy alias for the local stdio transport. */
+  | "local"
+  /** Server communicates over stdio with a local child process. */
+  | "stdio";
 /**
  * Remote transport type. Defaults to "http" when omitted.
  *
@@ -1163,6 +1671,14 @@ export type McpServerConfigHttpOauthGrantType =
   | "authorization_code"
   /** Headless client credentials flow using the configured OAuth client. */
   | "client_credentials";
+/**
+ * Structured MCP elicitation mode.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpElicitationFormMode".
+ */
+/** @experimental */
+export type McpElicitationFormMode = "form";
 /**
  * Host response: supply dynamic headers or decline this refresh.
  *
@@ -1178,19 +1694,181 @@ export type McpHeadersHandlePendingHeadersRefreshRequest =
       headers: {
         [k: string]: string | undefined;
       };
+      /**
+       * Headers-refresh response variant discriminator.
+       */
       kind: "headers";
     }
   | {
+      /**
+       * Headers-refresh response variant discriminator.
+       */
       kind: "none";
     };
 /**
- * Consumer allowed to call an MCP tool.
+ * One eligible way to run the server, represented as a tagged package or remote variant so package identity and endpoint states cannot contradict the install method.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "McpToolUiVisibility".
+ * via the `definition` "McpPlanTransportChoice".
  */
 /** @experimental */
-export type McpToolUiVisibility =
+export type McpPlanTransportChoice = McpPlanTransportChoicePackage | McpPlanTransportChoiceRemote;
+/**
+ * Transport exposed by a locally launched package
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanPackageTransport".
+ */
+/** @experimental */
+export type McpPlanPackageTransport =
+  /** A locally launched process spoken to over standard input and output. */
+  "stdio";
+/**
+ * Discriminator for a package-backed transport choice
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanPackageInstallMethod".
+ */
+/** @experimental */
+export type McpPlanPackageInstallMethod = /** Install and run a local package. */ "package";
+/**
+ * One non-secret value a transport choice needs, represented as a scalar or enumerated variant so enum values cannot be missing or attached to another type.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanRequiredValue".
+ */
+/** @experimental */
+export type McpPlanRequiredValue = McpPlanRequiredValueScalar | McpPlanRequiredValueEnum;
+/**
+ * Discriminator for a scalar required value
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanRequiredValueScalarKind".
+ */
+/** @experimental */
+export type McpPlanRequiredValueScalarKind = /** The value uses one scalar type. */ "scalar";
+/**
+ * Where a required value is applied when the planned server is launched
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanValueCategory".
+ */
+/** @experimental */
+export type McpPlanValueCategory =
+  /** Set as an environment variable on the launched process. */
+  | "environment-variable"
+  /** Passed to the runtime that launches the package. */
+  | "runtime-argument"
+  /** Passed to the packaged server itself. */
+  | "package-argument"
+  /** Sent as a request header to a remote endpoint. */
+  | "header"
+  /** Substituted into the remote endpoint URL. */
+  | "url-variable";
+/**
+ * Scalar type a required value must conform to
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanScalarValueType".
+ */
+/** @experimental */
+export type McpPlanScalarValueType =
+  /** Free text. */
+  | "string"
+  /** A number. */
+  | "number"
+  /** A boolean. */
+  | "boolean"
+  /** A filesystem path. */
+  | "path";
+/**
+ * Discriminator for an enumerated required value
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanRequiredValueEnumKind".
+ */
+/** @experimental */
+export type McpPlanRequiredValueEnumKind = /** The value uses a fixed non-empty enumeration. */ "enum";
+/**
+ * Discriminator for an enumerated required value
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanEnumValueType".
+ */
+/** @experimental */
+export type McpPlanEnumValueType = /** One of a fixed, non-empty set of permitted values. */ "enum";
+/**
+ * A runtime-assigned secret placeholder. The identifier is carried once, inside the placeholder, so it cannot contradict a separate secret-id field.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanSecretReference".
+ */
+/** @experimental */
+export type McpPlanSecretReference = string;
+/**
+ * Transport exposed by a remote endpoint
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanRemoteTransport".
+ */
+/** @experimental */
+export type McpPlanRemoteTransport =
+  /** An HTTP endpoint. */
+  | "http"
+  /** A streamable HTTP endpoint. */
+  | "streamable-http"
+  /** A server-sent events endpoint. */
+  | "sse";
+/**
+ * Discriminator for a remote-endpoint transport choice
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanRemoteInstallMethod".
+ */
+/** @experimental */
+export type McpPlanRemoteInstallMethod = /** Connect to a remote endpoint. */ "remote";
+/**
+ * Configuration scope an MCP install plan targets
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanScope".
+ */
+/** @experimental */
+export type McpPlanScope = /** The user's own MCP configuration. */ "user";
+/**
+ * What policy decided for a planned server
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanPolicyDecision".
+ */
+/** @experimental */
+export type McpPlanPolicyDecision =
+  /** Policy permits the server. */
+  | "allowed"
+  /** Policy forbids the server, so the plan cannot be applied. */
+  | "blocked"
+  /** Policy permits the server only after an explicit approval. */
+  | "requires-approval";
+/**
+ * Whether a planned configuration change would create or modify an entry
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanConfigurationOperation".
+ */
+/** @experimental */
+export type McpPlanConfigurationOperation =
+  /** Creates a configuration entry that does not exist yet. */
+  | "add"
+  /** Modifies a configuration entry that already exists. */
+  | "update";
+/**
+ * Consumer allowed to call an MCP tool.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpToolUiVisibility".
+ */
+/** @experimental */
+export type McpToolUiVisibility =
   /** The model may call the tool. */
   | "model"
   /** An MCP App view may call the tool. */
@@ -1209,16 +1887,22 @@ export type McpOauthPendingRequestResponse =
        */
       accessToken: string;
       /**
-       * OAuth token type. Defaults to Bearer when omitted.
+       * OAuth token type. Defaults to bearer when omitted.
        */
       tokenType?: string;
       /**
        * Token lifetime in seconds, if known.
        */
       expiresIn?: number;
+      /**
+       * OAuth response variant discriminator.
+       */
       kind: "token";
     }
   | {
+      /**
+       * OAuth response variant discriminator.
+       */
       kind: "cancelled";
     };
 /**
@@ -1233,6 +1917,139 @@ export type McpOauthLoginGrantType =
   | "authorization_code"
   /** Headless OAuth flow where a confidential client authenticates directly with a client secret. */
   | "client_credentials";
+/**
+ * Why a passive MCP OAuth probe determined authentication is needed.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpOauthProbeNeedsAuthReason".
+ */
+/** @experimental */
+export type McpOauthProbeNeedsAuthReason =
+  /** No token was sent and the server requires authentication. */
+  | "initial"
+  /** A cached token was sent and rejected. */
+  | "refresh"
+  /** The server returned a 403 insufficient_scope challenge, indicating additional scopes or audience are needed. */
+  | "upscope";
+/**
+ * Passive MCP OAuth probe result. `authenticated` means the server accepted the probe request while an OAuth-origin access token was attached; it does not prove the server required or independently validated that token. The probe does not make a second unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are reserved for API-call failures.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpOauthProbeResult".
+ */
+/** @experimental */
+export type McpOauthProbeResult =
+  | {
+      httpResponse: McpOauthHttpResponse;
+      /**
+       * Probe outcome variant discriminator.
+       */
+      status: "no-auth-required";
+    }
+  | {
+      httpResponse: McpOauthHttpResponse;
+      /**
+       * Probe outcome variant discriminator.
+       */
+      status: "authenticated";
+    }
+  | {
+      httpResponse: McpOauthHttpResponse;
+      reason: McpOauthProbeNeedsAuthReason;
+      wwwAuthenticateParams?: McpOauthWWWAuthenticateParams;
+      /**
+       * Probe outcome variant discriminator.
+       */
+      status: "needs-auth";
+    }
+  | {
+      /**
+       * Human-readable probe failure detail.
+       */
+      error: string;
+      httpResponse?: McpOauthHttpResponse;
+      /**
+       * Probe outcome variant discriminator.
+       */
+      status: "failed";
+    };
+/**
+ * What an install plan is computed from: a candidate handle from a previous search, or a card supplied directly.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanInstallSource".
+ */
+/** @experimental */
+export type McpPlanInstallSource = McpPlanInstallSourceCandidate | McpPlanInstallSourceCard;
+/**
+ * Discriminator for a candidate-backed install-plan source
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanInstallSourceCandidateKind".
+ */
+/** @experimental */
+export type McpPlanInstallSourceCandidateKind = /** Plan from a candidate returned by catalog search. */ "candidate";
+/**
+ * Discriminator for a caller-supplied-card install-plan source
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanInstallSourceCardKind".
+ */
+/** @experimental */
+export type McpPlanInstallSourceCardKind = /** Plan directly from a caller-supplied card. */ "card";
+/**
+ * A card supplied directly by the caller. Exactly one of a URL or embedded data, encoded structurally so neither both nor neither can be expressed.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerCardReference".
+ */
+/** @experimental */
+export type McpServerCardReference = McpServerCardUrl | McpServerCardEmbedded;
+/**
+ * Discriminator for a URL-backed MCP server card
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerCardUrlKind".
+ */
+/** @experimental */
+export type McpServerCardUrlKind = /** Retrieve the card from its URL. */ "url";
+/**
+ * Discriminator for an embedded MCP server card
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerCardEmbeddedKind".
+ */
+/** @experimental */
+export type McpServerCardEmbeddedKind = /** Use the embedded card document. */ "embedded";
+/**
+ * Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanInstallResult".
+ */
+/** @experimental */
+export type McpPlanInstallResult =
+  | McpPlanInstallPlanned
+  | CatalogNegotiationRefusedError
+  | CatalogHandleRejectedError
+  | CatalogInvalidRequestError
+  | CatalogAuthenticationRequiredError
+  | CatalogPolicyRejectedError
+  | CatalogNetworkFailureError
+  | CatalogUnsafeRetrievalError
+  | CatalogMalformedCardError
+  | CatalogContractViolationError
+  | CatalogUnavailableTransportError
+  | CatalogNotInstallableError
+  | CatalogUnavailableError;
+/**
+ * MCP server configuration (stdio, remote HTTP/SSE, or in-process)
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerConfig".
+ */
+/** @experimental */
+export type McpServerConfig = (McpServerConfigStdio | McpServerConfigHttp) | undefined;
 /**
  * Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.
  *
@@ -1247,6 +2064,15 @@ export type McpSamplingExecutionAction =
   | "failure"
   /** The sampling inference was cancelled before completion. */
   | "cancelled";
+/**
+ * In-process MCP transport type.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerConfigMemoryType".
+ */
+/** @experimental */
+/** @internal */
+export type McpServerConfigMemoryType = "memory";
 /**
  * How environment-variable values supplied to MCP servers are resolved. "direct" passes literal string values; "indirect" treats values as references (e.g. names of environment variables on the host) that the runtime resolves before launch. Defaults to the runtime's startup mode; clients that intentionally launch MCP servers with literal values (e.g. CLI prompt mode and ACP) set this to "direct".
  *
@@ -1271,6 +2097,63 @@ export type SessionContextAttribution = {
    * Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share.
    */
   totalTokens: number;
+  /**
+   * The concrete model id the entire breakdown was tokenized against (feeds the per-model token multiplier). Under `Auto` (Free/Student) this is the resolved model, not the literal `auto` sentinel, so totals are not undercounted. A single-model approximation of a potentially multi-model Auto session.
+   */
+  modelId: string;
+  /**
+   * How `modelId` was chosen. Not a closed set — tolerate unknown values. Known values today: `autoResolved` (the model Auto resolved to), `selected` (the user's explicitly selected model), `default` (a fallback before any model is known).
+   */
+  modelSource: string;
+  /**
+   * Maximum prompt tokens the resolved model accepts — the denominator for a `##k/###k` context-usage display. Mirrors `SessionContextInfo.promptTokenLimit`.
+   */
+  promptTokenLimit: number;
+  /**
+   * Prompt limit plus the model's output reserve: the full context window `categories.freeSpace` and `categories.buffer` are measured against. Mirrors `SessionContextInfo.limit`.
+   */
+  limit: number;
+  /**
+   * Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`.
+   */
+  bufferTokens: number;
+  /**
+   * Token count at which background compaction starts. Mirrors `SessionContextInfo.compactionThreshold`.
+   */
+  compactionThreshold: number;
+  /**
+   * The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`.
+   */
+  categories: {
+    /**
+     * System prompt tokens, excluding custom instructions.
+     */
+    systemPrompt: number;
+    /**
+     * Custom-instructions tokens (0 when none are configured).
+     */
+    customInstructions: number;
+    /**
+     * Non-MCP tool-definition tokens.
+     */
+    systemTools: number;
+    /**
+     * MCP tool-definition tokens.
+     */
+    mcpTools: number;
+    /**
+     * Conversation (user/assistant/tool) message tokens.
+     */
+    messages: number;
+    /**
+     * Remaining unused window capacity (clamped at 0).
+     */
+    freeSpace: number;
+    /**
+     * Output reserve plus post-blocking-threshold buffer.
+     */
+    buffer: number;
+  };
   /**
    * Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`.
    */
@@ -1600,7 +2483,8 @@ export type PermissionDecisionApproveForSessionApproval =
   | PermissionDecisionApproveForSessionApprovalCustomTool
   | PermissionDecisionApproveForSessionApprovalExtensionManagement
   | PermissionDecisionApproveForSessionApprovalFactory
-  | PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess;
+  | PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess
+  | PermissionDecisionApproveForSessionApprovalExtensionEnvAccess;
 /**
  * Approval to persist for this location
  *
@@ -1618,7 +2502,70 @@ export type PermissionDecisionApproveForLocationApproval =
   | PermissionDecisionApproveForLocationApprovalCustomTool
   | PermissionDecisionApproveForLocationApprovalExtensionManagement
   | PermissionDecisionApproveForLocationApprovalFactory
-  | PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess;
+  | PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess
+  | PermissionDecisionApproveForLocationApprovalExtensionEnvAccess;
+/**
+ * Disposition of a permission request as observed by the responding client.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionDecisionOutcome".
+ */
+/** @experimental */
+export type PermissionDecisionOutcome =
+  /** The request was approved automatically without a new human decision. */
+  | "auto_approved"
+  /** The request was denied without an interactive user decision; source records why. */
+  | "autopilot_denied"
+  /** The response came from an interactive user prompt. */
+  | "prompted_user";
+/**
+ * Controlled reason or actor responsible for a permission response.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionDecisionSource".
+ */
+/** @experimental */
+export type PermissionDecisionSource =
+  /** The response followed the assisted-approval judge recommendation. */
+  | "assisted_approval"
+  /** A human supplied the response through an interactive prompt. */
+  | "human_response"
+  /** The host applied a standing policy or override rather than a judge recommendation or human decision. */
+  | "host_policy"
+  /** The host denied the request because no interactive user response was available. */
+  | "unattended_fallback";
+/**
+ * Client surface that submitted a permission response.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionDecisionSurface".
+ */
+/** @experimental */
+export type PermissionDecisionSurface =
+  /** The interactive Copilot CLI terminal UI. */
+  | "tui"
+  /** The non-interactive Copilot CLI prompt mode. */
+  | "prompt_mode"
+  /** The Copilot App client. */
+  | "copilot_app"
+  /** An Agent Client Protocol host. */
+  | "acp"
+  /** A generic Copilot SDK client. */
+  | "sdk";
+/**
+ * Response capability available to the client when it settled a permission request.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionResponseCapability".
+ */
+/** @experimental */
+export type PermissionResponseCapability =
+  /** The client could ask a user for this decision. */
+  | "interactive"
+  /** The client could return an automated response but could not ask a user. */
+  | "headless"
+  /** The client had no response path available. */
+  | "none";
 /**
  * Tool approval to persist and apply
  *
@@ -1636,7 +2583,8 @@ export type PermissionsLocationsAddToolApprovalDetails =
   | PermissionsLocationsAddToolApprovalDetailsCustomTool
   | PermissionsLocationsAddToolApprovalDetailsExtensionManagement
   | PermissionsLocationsAddToolApprovalDetailsFactory
-  | PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess;
+  | PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess
+  | PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess;
 /**
  * Whether the location is a git repo or directory
  *
@@ -1649,6 +2597,24 @@ export type PermissionLocationType =
   | "repo"
   /** The permission location is persisted at the working directory. */
   | "dir";
+/**
+ * Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK callers.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionModeSource".
+ */
+/** @experimental */
+export type PermissionModeSource =
+  /** The mode was set from a CLI command-line flag. */
+  | "cli_flag"
+  /** The mode was set by a slash command. */
+  | "slash_command"
+  /** The mode was set by confirming autopilot behavior. */
+  | "autopilot_confirmation"
+  /** The mode was set at startup by the `defaultPermissionMode` user setting. */
+  | "user_setting"
+  /** The mode was set through an RPC caller. */
+  | "rpc";
 /**
  * Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope` enumeration.
  *
@@ -1673,22 +2639,6 @@ export type PermissionsModifyRulesScope =
   | "session"
   /** Persist the rule change for this project location. */
   | "location";
-/**
- * Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "PermissionsSetAllowAllSource".
- */
-/** @experimental */
-export type PermissionsSetAllowAllSource =
-  /** Allow-all was enabled from a CLI command-line flag. */
-  | "cli_flag"
-  /** Allow-all was enabled by a slash command. */
-  | "slash_command"
-  /** Allow-all was enabled by confirming autopilot behavior. */
-  | "autopilot_confirmation"
-  /** Allow-all was enabled through an RPC caller. */
-  | "rpc";
 /**
  * Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
  *
@@ -1703,6 +2653,8 @@ export type PermissionsSetApproveAllSource =
   | "slash_command"
   /** Allow-all was enabled by confirming autopilot behavior. */
   | "autopilot_confirmation"
+  /** Allow-all was enabled at startup by the `defaultPermissionMode` user setting. */
+  | "user_setting"
   /** Allow-all was enabled through an RPC caller. */
   | "rpc";
 /**
@@ -1738,6 +2690,18 @@ export type PluginsReloadRequest =
        */
       deferRepoHooks?: boolean;
     };
+/**
+ * Controls whether the runtime may defer loading an external tool definition.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ProtocolExternalToolDefer".
+ */
+/** @experimental */
+export type ProtocolExternalToolDefer =
+  /** The runtime may defer the tool according to its tool-loading policy. */
+  | "auto"
+  /** The runtime must include the tool without deferring it. */
+  | "never";
 /**
  * Provider family. Matches the `type` field of a BYOK provider config.
  *
@@ -1896,6 +2860,22 @@ export type RemoteSessionMode =
   | "export"
   /** Enable both remote session export and remote steering. */
   | "on";
+/**
+ * What a remote host says one of its sessions is doing right now. Deliberately coarse: this is what a host can report for EVERY session in a catalogue listing, without a client subscribing to each one. AHP's `SessionSummary.status` is the source today; `input-needed` covers both a permission prompt and an `ask_user` question, since the summary does not say which.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "RemoteSessionHostStatus".
+ */
+/** @experimental */
+export type RemoteSessionHostStatus =
+  /** No turn is running. */
+  | "idle"
+  /** A turn is running. */
+  | "working"
+  /** The session is blocked on the user: a permission prompt or an `ask_user` question. */
+  | "input-needed"
+  /** The session ended its last turn in an error. */
+  | "error";
 /**
  * Whether the remote task originated from CCA or CLI `--remote`.
  *
@@ -1909,10 +2889,41 @@ export type RemoteSessionMetadataTaskType =
   /** CLI remote task. */
   | "cli";
 /**
- * Session capability enabled for this session
+ * Origin of the sandbox choice supplied by an internal client.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "SessionCapability".
+ * via the `definition` "SandboxConfigSource".
+ */
+/** @experimental */
+/** @internal */
+export type SandboxConfigSource =
+  /** The client applied the default because no sandbox preference was configured. */
+  | "never_configured"
+  /** The user's persisted settings enabled the sandbox. */
+  | "user_enabled"
+  /** The user's persisted settings disabled the sandbox. */
+  | "user_disabled"
+  /** A command-line flag selected the sandbox state for this session. */
+  | "session_flag"
+  /** The user disabled the sandbox for the current session. */
+  | "session_disabled"
+  /** The client disabled the sandbox because the host cannot enforce it. */
+  | "unsupported_host"
+  /** A repository policy selected the sandbox state. */
+  | "repository_policy";
+/**
+ * Current authentication information, or null when no authentication is active.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionAuthInfoResult".
+ */
+/** @experimental */
+export type SessionAuthInfoResult = AuthIdentity | null;
+/**
+ * Session capability enabled for this session
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionCapability".
  */
 /** @experimental */
 export type SessionCapability =
@@ -2084,10 +3095,16 @@ export type SessionLimitPredictionRequest =
 export type SessionLimitPredictionResult =
   | {
       prediction: SessionLimitPredictionDetails;
+      /**
+       * Prediction result variant discriminator.
+       */
       kind: "available";
     }
   | {
       reason: SessionLimitPredictionUnavailableReason;
+      /**
+       * Prediction result variant discriminator.
+       */
       kind: "unavailable";
     };
 /**
@@ -2307,6 +3324,21 @@ export type SessionsOpenProgressStatus =
   | "in-progress"
   /** The step has completed successfully. */
   | "complete";
+/**
+ * Authentication credentials accepted by session.gitHubAuth.setCredentials. Session-owned token-provider identities cannot be installed through this method.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SettableAuthInfo".
+ */
+/** @experimental */
+export type SettableAuthInfo =
+  | HMACAuthInfo
+  | EnvAuthInfo
+  | SettableTokenAuthInfo
+  | CopilotApiTokenAuthInfo
+  | UserAuthInfo
+  | GhCliAuthInfo
+  | ApiKeyAuthInfo;
 /**
  * Rust-owned settings predicates exposed across the SDK boundary. Raw feature-flag names are intentionally not part of the contract.
  *
@@ -2420,7 +3452,11 @@ export type SlashCommandInvocationResult =
   | SlashCommandTextResult
   | SlashCommandAgentPromptResult
   | SlashCommandCompletedResult
-  | SlashCommandSelectSubcommandResult;
+  | SlashCommandSelectSubcommandResult
+  | SlashCommandAddTimelineEntryResult
+  | SlashCommandShowDialogResult
+  | SlashCommandSetModelResult
+  | SlashCommandSetPlanModelResult;
 /**
  * Subagent settings to apply, or null to clear the live session override
  *
@@ -2520,6 +3556,32 @@ export type TaskShellInfoAttachmentMode =
  */
 /** @experimental */
 export type TaskProgress = (TaskAgentProgress | TaskShellProgress) | null;
+/**
+ * Canonical result returned by a session tool.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolResult".
+ */
+/** @experimental */
+export type ToolResult = string | ToolResultExpanded;
+/**
+ * Execution outcome classification.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolResultType".
+ */
+/** @experimental */
+export type ToolResultType =
+  /** The tool completed successfully. */
+  | "success"
+  /** The tool failed. */
+  | "failure"
+  /** The tool exceeded its execution timeout. */
+  | "timeout"
+  /** The tool request was rejected before execution. */
+  | "rejected"
+  /** Permission policy denied the tool request. */
+  | "denied";
 /**
  * User's choice for auto-mode switching: yes (allow this turn), yes_always (allow + persist as setting), or no (decline).
  *
@@ -2692,6 +3754,30 @@ export type AccountGetAllUsersResult = AccountAllUsers[];
  */
 /** @experimental */
 export type SessionCancelAllBackgroundAgentsResult = number;
+/**
+ * Authentication accounts available to the internal session host.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionGitHubAuthGetAllAuthAvailableResult".
+ */
+/** @experimental */
+export type SessionGitHubAuthGetAllAuthAvailableResult = SessionAuthStatus[];
+/**
+ * Whether the current authentication was logged out.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionGitHubAuthLogoutResult".
+ */
+/** @experimental */
+export type SessionGitHubAuthLogoutResult = boolean;
+/**
+ * Whether the requested authentication was logged out.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionGitHubAuthLogoutUserResult".
+ */
+/** @experimental */
+export type SessionGitHubAuthLogoutUserResult = boolean;
 
 /**
  * Parameters for aborting the current turn
@@ -2721,7 +3807,7 @@ export interface AbortResult {
   error?: string;
 }
 /**
- * Authenticated account entry returned by `account.getAllUsers`, with auth info and an optional associated token.
+ * Authenticated account entry returned by `account.getAllUsers`.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "AccountAllUsers".
@@ -2729,13 +3815,17 @@ export interface AbortResult {
 /** @experimental */
 export interface AccountAllUsers {
   authInfo: AuthInfo;
+  /**
+   * Opaque identifier accepted by account and model selection APIs
+   */
+  selectionId?: string;
   /**
    * Associated token, if available
    */
   token?: string;
 }
 /**
- * Authentication-info variant for GitHub-internal HMAC auth, carrying the public GitHub host and HMAC secret.
+ * Authentication-info input variant for GitHub-internal HMAC auth, carrying the public GitHub host and HMAC secret.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "HMACAuthInfo".
@@ -2817,6 +3907,9 @@ export interface CopilotUserResponse {
             [k: string]: unknown | undefined;
           }
         | ({
+            /**
+             * GitHub login of the organization.
+             */
             login?:
               | (
                   | {
@@ -2825,6 +3918,9 @@ export interface CopilotUserResponse {
                   | string
                 )
               | null;
+            /**
+             * Display name of the organization.
+             */
             name?:
               | (
                   | {
@@ -2913,10 +4009,25 @@ export interface CopilotUserResponse {
  */
 /** @experimental */
 export interface CopilotUserResponseEndpoints {
+  /**
+   * Copilot API endpoint URL.
+   */
   api?: string;
+  /**
+   * Origin-tracker endpoint URL.
+   */
   "origin-tracker"?: string;
+  /**
+   * Copilot proxy endpoint URL.
+   */
   proxy?: string;
+  /**
+   * Copilot telemetry endpoint URL.
+   */
   telemetry?: string;
+  /**
+   * Experimental-service endpoint URL.
+   */
   exp?: string;
 }
 /**
@@ -3119,7 +4230,7 @@ export interface CopilotUserResponseQuotaSnapshotsPremiumInteractions {
   token_based_billing?: boolean;
 }
 /**
- * Authentication-info variant for a token sourced from an environment variable, with host, optional login, token, and env var name.
+ * Authentication-info input variant for a token sourced from an environment variable, with host, optional login, token, and env var name.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "EnvAuthInfo".
@@ -3149,7 +4260,7 @@ export interface EnvAuthInfo {
   copilotUser?: CopilotUserResponse;
 }
 /**
- * Authentication-info variant for SDK-configured token authentication, carrying host and the secret token value.
+ * Authentication-info input variant for SDK-configured token authentication, carrying host and the secret token value.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "TokenAuthInfo".
@@ -3168,6 +4279,32 @@ export interface TokenAuthInfo {
    * The token value itself. Treat as a secret.
    */
   token: string;
+  /**
+   * Opaque native GitHub credential registration backing this token identity, when applicable.
+   */
+  registrationId?: string;
+  copilotUser?: CopilotUserResponse;
+}
+/**
+ * Authentication-info variant backed by an SDK GitHub token callback. It carries routing metadata but never a plaintext token.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "TokenProviderAuthInfo".
+ */
+/** @experimental */
+export interface TokenProviderAuthInfo {
+  /**
+   * SDK callback-backed GitHub token authentication.
+   */
+  type: "token-provider";
+  /**
+   * Authentication host.
+   */
+  host: string;
+  /**
+   * Opaque SDK callback registration identifier.
+   */
+  registrationId: string;
   copilotUser?: CopilotUserResponse;
 }
 /**
@@ -3211,7 +4348,7 @@ export interface UserAuthInfo {
   copilotUser?: CopilotUserResponse;
 }
 /**
- * Authentication-info variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.
+ * Authentication-info input variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "GhCliAuthInfo".
@@ -3237,7 +4374,7 @@ export interface GhCliAuthInfo {
   copilotUser?: CopilotUserResponse;
 }
 /**
- * Authentication-info variant for API-key authentication to a non-GitHub LLM provider, carrying the secret `apiKey` and host.
+ * Authentication-info input variant for API-key authentication to a non-GitHub LLM provider, carrying the secret `apiKey` and host.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "ApiKeyAuthInfo".
@@ -3276,7 +4413,11 @@ export interface AccountGetCurrentAuthResult {
 /** @experimental */
 export interface AccountGetQuotaRequest {
   /**
-   * GitHub token for per-user quota lookup. When provided, resolves this token to determine the user's quota instead of using the global auth.
+   * Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used.
+   */
+  selectionId?: string;
+  /**
+   * GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account.
    */
   gitHubToken?: string;
 }
@@ -3337,7 +4478,7 @@ export interface AccountQuotaSnapshot {
   resetDate?: string;
 }
 /**
- * Credentials to store after successful authentication
+ * Credentials to validate and store. Omit login to resolve the authenticated user from the token.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "AccountLoginRequest".
@@ -3349,9 +4490,9 @@ export interface AccountLoginRequest {
    */
   host: string;
   /**
-   * User login/username
+   * User login/username. When omitted, the runtime validates the token and resolves the login from GitHub.
    */
-  login: string;
+  login?: string;
   /**
    * GitHub authentication token
    */
@@ -3370,16 +4511,6 @@ export interface AccountLoginResult {
    */
   storedInVault: boolean;
 }
-/**
- * User to log out
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AccountLogoutRequest".
- */
-/** @experimental */
-export interface AccountLogoutRequest {
-  authInfo: AuthInfo;
-}
 /**
  * Logout result indicating if more users remain
  *
@@ -3488,7 +4619,7 @@ export interface AgentInfo {
    * @experimental
    */
   mcpServers?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * Skill names preloaded into this agent's context. Omitted means none.
@@ -3537,12 +4668,6 @@ export interface AgentRegistryLiveTargetEntry {
    * TCP port the entry's JSON-RPC server is listening on
    */
   port: number;
-  /**
-   * Connection token (null when the target is unauthenticated)
-   *
-   * @internal
-   */
-  token?: string | null;
   /**
    * Session ID of the foreground session for this entry
    */
@@ -3582,6 +4707,12 @@ export interface AgentRegistryLiveTargetEntry {
    * Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness)
    */
   lastSeenMs: number;
+  /**
+   * Connection token (null when the target is unauthenticated)
+   *
+   * @internal
+   */
+  token?: string | null;
 }
 /**
  * Per-spawn log-capture outcome; populated from spawnLiveTarget.
@@ -3804,36 +4935,48 @@ export interface AgentsGetDiscoveryPathsRequest {
   excludeHostAgents?: boolean;
 }
 /**
- * Indicates whether the operation succeeded and reports the post-mutation state.
+ * Credential-free authentication identity safe to expose to hosts and user interfaces.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AllowAllPermissionSetResult".
+ * via the `definition` "AuthIdentity".
  */
 /** @experimental */
-export interface AllowAllPermissionSetResult {
+export interface AuthIdentity {
+  type: AuthInfoType;
   /**
-   * Whether the operation succeeded
+   * Authentication host
    */
-  success: boolean;
+  host: string;
   /**
-   * Authoritative full allow-all state after the mutation
+   * Authenticated login, when available
    */
-  enabled: boolean;
-  mode?: PermissionsAllowAllMode;
+  login?: string;
+  /**
+   * Name of the environment variable that supplied the credential, when applicable
+   */
+  envVar?: string;
+  /**
+   * Opaque SDK GitHub credential registration backing this identity. Routing metadata only; never a credential.
+   */
+  registrationId?: string;
+  copilotUser?: CopilotUserResponse;
 }
 /**
- * Current allow-all permission mode.
+ * Validation error from an authentication attempt.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AllowAllPermissionState".
+ * via the `definition` "AuthValidationError".
  */
 /** @experimental */
-export interface AllowAllPermissionState {
+export interface AuthValidationError {
   /**
-   * Whether full allow-all permissions are currently active
+   * Authentication validation error message
    */
-  enabled: boolean;
-  mode?: PermissionsAllowAllMode;
+  message: string;
+  /**
+   * Optional message returned by GitHub
+   */
+  githubMessage?: string;
 }
 /**
  * The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
@@ -3857,10 +5000,102 @@ export interface BuiltInModelCatalog {
 /** @experimental */
 export interface BuiltInModelCatalogEntry {
   /**
-   * Well-known runtime model ID suitable for `ProviderConfig.modelId` or `ProviderModelConfig.modelId`. This is not necessarily the provider-facing deployment or model name and does not indicate CAPI entitlement or provider availability.
+   * Well-known runtime model ID suitable for provider or provider-model metadata. This is not necessarily the provider-facing deployment or model name and does not indicate CAPI entitlement or provider availability.
    */
   id: string;
 }
+/**
+ * Rust-owned metadata and input schema for a built-in tool.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "BuiltinToolDescriptor".
+ */
+/** @experimental */
+export interface BuiltinToolDescriptor {
+  /**
+   * Stable name used to invoke the built-in tool.
+   */
+  name: string;
+  /**
+   * Optional human-readable title for the tool.
+   */
+  title: string | null;
+  /**
+   * Model-facing description of the tool's behavior.
+   */
+  description: string;
+  /**
+   * JSON Schema for the tool input, or null when the tool uses a custom format.
+   */
+  inputSchema: BuiltinToolInputSchema | null;
+  /**
+   * Optional supplemental usage instructions for the tool.
+   */
+  instructions: string | null;
+  /**
+   * Optional tool category discriminator.
+   */
+  type: string | null;
+  /**
+   * Optional custom input format used instead of a JSON Schema.
+   */
+  format: BuiltinToolFormat | null;
+  safeForTelemetry: BuiltinToolSafeForTelemetry;
+  /**
+   * Whether the tool executes commands in a terminal.
+   */
+  isTerminal: boolean;
+  /**
+   * Whether the tool provides a specialized intention summary.
+   */
+  hasSummariseIntention: boolean;
+}
+/**
+ * JSON Schema object accepted by a built-in tool.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "BuiltinToolInputSchema".
+ */
+/** @experimental */
+export interface BuiltinToolInputSchema {
+  type: BuiltinToolInputSchemaType;
+  [k: string]: JsonValue | undefined;
+}
+/**
+ * Custom grammar input format accepted by a built-in tool.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "BuiltinToolFormat".
+ */
+/** @experimental */
+export interface BuiltinToolFormat {
+  type: BuiltinToolFormatType;
+  /**
+   * Grammar syntax used by the format definition.
+   */
+  syntax: string;
+  /**
+   * Grammar definition accepted by the tool.
+   */
+  definition: string;
+}
+/**
+ * Per-field telemetry-safety policy for a built-in tool.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "BuiltinToolSafeTelemetryFields".
+ */
+/** @experimental */
+export interface BuiltinToolSafeTelemetryFields {
+  /**
+   * Whether the tool name may be included in telemetry without obfuscation.
+   */
+  name?: boolean;
+  /**
+   * Whether tool input names may be included in telemetry without obfuscation.
+   */
+  inputsNames?: boolean;
+}
 /**
  * Cancellation result for a user-requested shell command.
  *
@@ -3892,16 +5127,6 @@ export interface CanvasAction {
   description?: string;
   inputSchema?: CanvasJsonSchema;
 }
-/**
- * JSON Schema for canvas open input
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CanvasJsonSchema".
- */
-/** @experimental */
-export interface CanvasJsonSchema {
-  [k: string]: unknown | undefined;
-}
 /**
  * Canvas action invocation parameters.
  *
@@ -3921,19 +5146,7 @@ export interface CanvasActionInvokeRequest {
   /**
    * Action input
    */
-  input?: {
-    [k: string]: unknown | undefined;
-  };
-}
-/**
- * Provider-supplied action result.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CanvasActionInvokeResult".
- */
-/** @experimental */
-export interface CanvasActionInvokeResult {
-  [k: string]: unknown | undefined;
+  input?: JsonValue;
 }
 /**
  * Canvas close parameters.
@@ -4006,252 +5219,792 @@ export interface DiscoveredCanvas {
   icon?: string;
   inputSchema?: CanvasJsonSchema;
   /**
-   * Actions the agent or host may invoke on an open instance
+   * Actions the agent or host may invoke on an open instance
+   */
+  actions?: CanvasAction[];
+  /**
+   * Owning provider identifier
+   */
+  extensionId: string;
+  /**
+   * Owning extension display name, when available
+   */
+  extensionName?: string;
+  /**
+   * Provider-local canvas identifier
+   */
+  canvasId: string;
+}
+/**
+ * Live open-canvas snapshot.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasListOpenResult".
+ */
+/** @experimental */
+export interface CanvasListOpenResult {
+  /**
+   * Currently open canvas instances
+   */
+  openCanvases: OpenCanvasInstance[];
+}
+/**
+ * Open canvas instance snapshot.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "OpenCanvasInstance".
+ */
+/** @experimental */
+export interface OpenCanvasInstance {
+  /**
+   * Stable caller-supplied canvas instance identifier
+   */
+  instanceId: string;
+  /**
+   * Owning provider identifier
+   */
+  extensionId: string;
+  /**
+   * Owning extension display name, when available
+   */
+  extensionName?: string;
+  /**
+   * Provider-local canvas identifier
+   */
+  canvasId: string;
+  /**
+   * Host-local PNG path for the canvas icon, when supplied
+   */
+  icon?: string;
+  /**
+   * Rendered title
+   */
+  title?: string;
+  /**
+   * Provider-supplied status text
+   */
+  status?: string;
+  /**
+   * URL for web-rendered canvases
+   */
+  url?: string;
+  /**
+   * Input supplied when the instance was opened
+   */
+  input?: JsonValue;
+}
+/**
+ * Canvas open parameters.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasOpenRequest".
+ */
+/** @experimental */
+export interface CanvasOpenRequest {
+  /**
+   * Owning provider identifier. Optional when the canvasId is unique across providers; required to disambiguate when multiple providers register the same canvasId.
+   */
+  extensionId?: string;
+  /**
+   * Provider-local canvas identifier
+   */
+  canvasId: string;
+  /**
+   * Caller-supplied stable instance identifier
+   */
+  instanceId: string;
+  /**
+   * Canvas open input
+   */
+  input?: JsonValue;
+}
+/**
+ * Canvas close parameters sent to the provider.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasProviderCloseRequest".
+ */
+/** @experimental */
+export interface CanvasProviderCloseRequest {
+  /**
+   * Target session identifier
+   */
+  sessionId: string;
+  /**
+   * Owning provider identifier
+   */
+  extensionId: string;
+  /**
+   * Provider-local canvas identifier
+   */
+  canvasId: string;
+  /**
+   * Canvas instance identifier
+   */
+  instanceId: string;
+  host?: CanvasHostContext;
+  session?: CanvasSessionContext;
+}
+/**
+ * Session context supplied by the runtime.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasSessionContext".
+ */
+/** @experimental */
+export interface CanvasSessionContext {
+  /**
+   * Active session working directory, when known.
+   */
+  workingDirectory?: string;
+}
+/**
+ * Canvas action invocation parameters sent to the provider.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasProviderInvokeActionRequest".
+ */
+/** @experimental */
+export interface CanvasProviderInvokeActionRequest {
+  /**
+   * Target session identifier
+   */
+  sessionId: string;
+  /**
+   * Owning provider identifier
+   */
+  extensionId: string;
+  /**
+   * Provider-local canvas identifier
+   */
+  canvasId: string;
+  /**
+   * Canvas instance identifier
+   */
+  instanceId: string;
+  /**
+   * Action name to invoke
+   */
+  actionName: string;
+  /**
+   * Action input
+   */
+  input?: JsonValue;
+  host?: CanvasHostContext;
+  session?: CanvasSessionContext;
+}
+/**
+ * Canvas open parameters sent to the provider.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasProviderOpenRequest".
+ */
+/** @experimental */
+export interface CanvasProviderOpenRequest {
+  /**
+   * Target session identifier
+   */
+  sessionId: string;
+  /**
+   * Owning provider identifier
+   */
+  extensionId: string;
+  /**
+   * Provider-local canvas identifier
+   */
+  canvasId: string;
+  /**
+   * Stable caller-supplied canvas instance identifier
+   */
+  instanceId: string;
+  /**
+   * Canvas open input
+   */
+  input?: JsonValue;
+  host?: CanvasHostContext;
+  session?: CanvasSessionContext;
+}
+/**
+ * Canvas open result returned by the provider.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasProviderOpenResult".
+ */
+/** @experimental */
+export interface CanvasProviderOpenResult {
+  /**
+   * URL for web-rendered canvases
+   */
+  url?: string;
+  /**
+   * Provider-supplied title
+   */
+  title?: string;
+  /**
+   * Provider-supplied status text
+   */
+  status?: string;
+}
+/**
+ * Internal canvas provider registration parameters.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasProviderRegisterRequest".
+ */
+/** @experimental */
+export interface CanvasProviderRegisterRequest {
+  /**
+   * Connection identifier for callback routing
+   */
+  connectionId: string;
+  /**
+   * Provider metadata supplied by the host
+   */
+  info: JsonValue;
+  /**
+   * Canvas contributions supplied by the provider
+   */
+  canvases: JsonValue[];
+}
+/**
+ * Internal canvas provider unregistration parameters.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CanvasProviderUnregisterRequest".
+ */
+/** @experimental */
+export interface CanvasProviderUnregisterRequest {
+  /**
+   * Connection identifier to unregister
+   */
+  connectionId: string;
+}
+/**
+ * Options scoped to the built-in CAPI (Copilot API) provider.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CapiSessionOptions".
+ */
+/** @experimental */
+export interface CapiSessionOptions {
+  /**
+   * Whether to use WebSocket transport for the CAPI Responses API. Enabled by default when the model advertises `ws:/responses` support; set to `false` to force the HTTP Responses transport in environments where WebSockets are blocked (e.g. behind a proxy). Setting this to `false` is equivalent to the `COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES` environment variable.
+   */
+  enableWebSocketResponses?: boolean;
+}
+/**
+ * Semantic digest of a strictly parsed and schema-validated JSON MCP card. Both URL-backed and embedded cards are canonicalised with RFC 8785 JSON Canonicalization Scheme, encoded as UTF-8, and hashed with SHA-256.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CardDigest".
+ */
+/** @experimental */
+export interface CardDigest {
+  algorithm: CardDigestAlgorithm;
+  value: CardDigestValue;
+}
+/**
+ * An inert AI skill catalog result. AI skills are discovery-only and cannot be represented as installable through this surface.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogAiSkillCandidate".
+ */
+/** @experimental */
+export interface CatalogAiSkillCandidate {
+  /**
+   * Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries no readable information and is rejected when stale, replayed, or presented to a different runtime instance. Never logged.
+   */
+  handle: string;
+  /**
+   * ISO 8601 timestamp after which the handle is stale and will be rejected.
+   */
+  handleExpiresAt: string;
+  /**
+   * Discriminator: this candidate describes an AI skill
+   */
+  kind: "ai-skill";
+  /**
+   * Media type of the underlying AI skill card
+   */
+  mediaType: "application/ai-skill";
+  /**
+   * AI skills are discovery-only and cannot be installed through this surface
+   */
+  installability: "not-installable-kind";
+  /**
+   * Display name taken verbatim from the card. Inert untrusted text.
+   */
+  displayName: string;
+  /**
+   * Description taken verbatim from the card. Inert untrusted text.
+   */
+  description?: string;
+  /**
+   * Publisher taken verbatim from the card. Inert untrusted text.
+   */
+  publisher?: string;
+  source: CatalogCandidateSource;
+  provenance: CatalogAiSkillCandidateProvenance;
+}
+/**
+ * Candidate whose card is retrieved from a URL through the runtime's hardened fetch boundary.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogCandidateSourceUrl".
+ */
+/** @experimental */
+export interface CatalogCandidateSourceUrl {
+  /**
+   * Discriminator: the card is URL-backed, and carries no embedded data
+   */
+  kind: "url";
+  /**
+   * Card URL as advertised. Inert untrusted data: the runtime retrieves it only through its own hardened boundary, and it is never logged.
+   */
+  url: string;
+}
+/**
+ * Candidate whose card reference arrived inline. The document and its content-derived properties stay behind the runtime boundary.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogCandidateSourceEmbedded".
+ */
+/** @experimental */
+export interface CatalogCandidateSourceEmbedded {
+  /**
+   * Discriminator: the card is embedded, and carries no URL
+   */
+  kind: "embedded";
+}
+/**
+ * Where and when an AI skill catalog reference was observed. Discovery provenance deliberately carries no content digest because search does not establish the exact validated content a later plan will bind.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogAiSkillCandidateProvenance".
+ */
+/** @experimental */
+export interface CatalogAiSkillCandidateProvenance {
+  /**
+   * Host of the catalog authority that advertised the reference, without path, query, or credentials. Inert untrusted data.
+   */
+  authority: string;
+  /**
+   * ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a retrieval or validation timestamp.
+   */
+  observedAt: string;
+  /**
+   * Media type advertised for the referenced AI skill card
+   */
+  mediaType: "application/ai-skill";
+}
+/**
+ * An optional catalog authentication exchange did not establish the caller's identity. Anonymous search remains supported; this refusal is reserved for an operation that cannot continue after the attempted exchange. It is distinct from `policy-rejected` and from a network failure, and the reason identifies the recovery action.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogAuthenticationRequiredError".
+ */
+/** @experimental */
+export interface CatalogAuthenticationRequiredError {
+  /**
+   * Discriminator: the caller is not authenticated
+   */
+  kind: "authentication-required";
+  reason: CatalogAuthenticationRequiredReason;
+  /**
+   * Human-readable explanation, safe to surface. Never contains a credential or token, nor a query, URL, handle, or secret.
+   */
+  message: string;
+}
+/**
+ * An inert MCP server catalog result. Every free-text field is untrusted external data and must never be treated as an instruction, and the handle is the only way to refer to the candidate in a later operation.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogMcpServerCandidate".
+ */
+/** @experimental */
+export interface CatalogMcpServerCandidate {
+  /**
+   * Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries no readable information and is rejected when stale, replayed, or presented to a different runtime instance. Never logged.
+   */
+  handle: string;
+  /**
+   * ISO 8601 timestamp after which the handle is stale and will be rejected.
+   */
+  handleExpiresAt: string;
+  /**
+   * Discriminator: this candidate describes an MCP server
+   */
+  kind: "mcp-server";
+  mediaType: McpServerCardMediaType;
+  installability: CatalogMcpServerInstallability;
+  /**
+   * Display name taken verbatim from the card. Inert untrusted text.
+   */
+  displayName: string;
+  /**
+   * Description taken verbatim from the card. Inert untrusted text.
+   */
+  description?: string;
+  /**
+   * Publisher taken verbatim from the card. Inert untrusted text.
+   */
+  publisher?: string;
+  source: CatalogCandidateSource;
+  provenance: CatalogMcpServerCandidateProvenance;
+}
+/**
+ * Where and when an MCP server catalog reference was observed. Discovery provenance deliberately carries no content digest because search does not establish the exact validated content a later plan will bind.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogMcpServerCandidateProvenance".
+ */
+/** @experimental */
+export interface CatalogMcpServerCandidateProvenance {
+  /**
+   * Host of the catalog authority that advertised the reference, without path, query, or credentials. Inert untrusted data.
+   */
+  authority: string;
+  /**
+   * ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a retrieval or validation timestamp.
+   */
+  observedAt: string;
+  mediaType: McpServerCardMediaType;
+}
+/**
+ * The protocol version and capability set a caller requires, supplied on every catalog request so negotiation cannot be skipped by omission.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogClientContract".
+ */
+/** @experimental */
+export interface CatalogClientContract {
+  /**
+   * SDK protocol version the caller was generated against. A caller below the runtime's minimum supported version is refused rather than served a partial result.
+   */
+  protocolVersion: number;
+  /**
+   * Wire features the caller requires the runtime to understand. Identifiers are bounded but extensible so a newer caller can negotiate with an older runtime. Requiring an unknown feature yields a typed refusal listing what is understood, never a partial grant. A grant does not promise that a deployment has enabled the operation; typed unavailable results report that separately.
+   *
+   * @maxItems 32
+   */
+  requiredCapabilities: CatalogCapabilityId[];
+}
+/**
+ * An upstream catalog response broke the wire contract. Most importantly, every result must carry exactly one of a URL or embedded data: a result carrying both, or neither, is refused here rather than being guessed at.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogContractViolationError".
+ */
+/** @experimental */
+export interface CatalogContractViolationError {
+  /**
+   * Discriminator: the upstream response broke the contract
+   */
+  kind: "contract-violation";
+  reason: CatalogContractViolationReason;
+  /**
+   * Human-readable explanation, safe to surface. Never echoes response content, nor a query, URL, handle, or secret.
+   */
+  message: string;
+}
+/**
+ * A presented handle was not accepted. Handles are runtime-instance scoped, TTL-bound, and single-use, so each way of failing is reported distinctly.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogHandleRejectedError".
+ */
+/** @experimental */
+export interface CatalogHandleRejectedError {
+  /**
+   * Discriminator: a handle was rejected
    */
-  actions?: CanvasAction[];
+  kind: "handle-rejected";
+  handleType: CatalogHandleType;
+  reason: CatalogHandleRejectionReason;
   /**
-   * Owning provider identifier
+   * Human-readable explanation, safe to surface. Never contains the handle itself, nor a query, URL, or secret.
    */
-  extensionId: string;
+  message: string;
+}
+/**
+ * The request was rejected before any work was done, because a bounded field fell outside its permitted range or a required field was unusable.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogInvalidRequestError".
+ */
+/** @experimental */
+export interface CatalogInvalidRequestError {
   /**
-   * Owning extension display name, when available
+   * Discriminator: the request itself was invalid
    */
-  extensionName?: string;
+  kind: "invalid-request";
+  field: CatalogInvalidRequestField;
   /**
-   * Provider-local canvas identifier
+   * Human-readable explanation, safe to surface. Never echoes the offending value, nor a query, URL, handle, or secret.
    */
-  canvasId: string;
+  message: string;
 }
 /**
- * Live open-canvas snapshot.
+ * A card could not be parsed or did not satisfy its declared media type's schema.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CanvasListOpenResult".
+ * via the `definition` "CatalogMalformedCardError".
  */
 /** @experimental */
-export interface CanvasListOpenResult {
+export interface CatalogMalformedCardError {
   /**
-   * Currently open canvas instances
+   * Discriminator: the card was malformed
    */
-  openCanvases: OpenCanvasInstance[];
+  kind: "malformed-card";
+  reason: CatalogMalformedCardReason;
+  mediaType?: CatalogMediaType;
+  /**
+   * Human-readable explanation, safe to surface. Never echoes card content, nor a query, URL, handle, or secret.
+   */
+  message: string;
 }
 /**
- * Open canvas instance snapshot.
+ * The protocol version and capability set the runtime actually honoured for a successful catalog operation.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "OpenCanvasInstance".
+ * via the `definition` "CatalogNegotiatedContract".
  */
 /** @experimental */
-export interface OpenCanvasInstance {
-  /**
-   * Stable caller-supplied canvas instance identifier
-   */
-  instanceId: string;
+export interface CatalogNegotiatedContract {
   /**
-   * Owning provider identifier
+   * Protocol version of the runtime that served the request.
    */
-  extensionId: string;
+  runtimeProtocolVersion: number;
   /**
-   * Owning extension display name, when available
+   * Wire features the runtime understood for this operation. Always a superset of the caller's required features, because any shortfall is a refusal instead. Operation availability remains a separate typed result.
    */
-  extensionName?: string;
+  grantedCapabilities: CatalogCapability[];
+}
+/**
+ * The caller's protocol version or required capabilities cannot be honoured. Returned instead of a partial or ambiguous success.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogNegotiationRefusedError".
+ */
+/** @experimental */
+export interface CatalogNegotiationRefusedError {
   /**
-   * Provider-local canvas identifier
+   * Discriminator: capability or protocol-version negotiation failed
    */
-  canvasId: string;
+  kind: "negotiation-refused";
+  reason: CatalogNegotiationRefusedReason;
   /**
-   * Host-local PNG path for the canvas icon, when supplied
+   * Protocol version of the runtime that refused the request.
    */
-  icon?: string;
+  runtimeProtocolVersion: number;
   /**
-   * Rendered title
+   * Lowest caller protocol version this runtime will serve.
    */
-  title?: string;
+  minimumSupportedProtocolVersion: number;
   /**
-   * Provider-supplied status text
+   * Every wire feature this runtime understands, so the caller can retry within that contract. This list does not imply that every deployment has enabled every operation.
    */
-  status?: string;
+  supportedCapabilities: CatalogCapability[];
   /**
-   * URL for web-rendered canvases
+   * The subset of the caller's bounded extensible capability identifiers this runtime cannot honour.
+   *
+   * @maxItems 32
    */
-  url?: string;
+  unsupportedCapabilities: CatalogCapabilityId[];
   /**
-   * Input supplied when the instance was opened
+   * Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
    */
-  input?: {
-    [k: string]: unknown | undefined;
-  };
+  message: string;
 }
 /**
- * Canvas open parameters.
+ * The runtime could not reach the catalog authority or retrieve a card. Covers being offline as well as transport-level failure.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CanvasOpenRequest".
+ * via the `definition` "CatalogNetworkFailureError".
  */
 /** @experimental */
-export interface CanvasOpenRequest {
-  /**
-   * Owning provider identifier. Optional when the canvasId is unique across providers; required to disambiguate when multiple providers register the same canvasId.
-   */
-  extensionId?: string;
+export interface CatalogNetworkFailureError {
   /**
-   * Provider-local canvas identifier
+   * Discriminator: the network operation failed
    */
-  canvasId: string;
+  kind: "network-failure";
+  reason: CatalogNetworkFailureReason;
   /**
-   * Caller-supplied stable instance identifier
+   * HTTP status code, when the failure was a rejected response.
    */
-  instanceId: string;
+  statusCode?: number;
   /**
-   * Canvas open input
+   * Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
    */
-  input?: {
-    [k: string]: unknown | undefined;
-  };
+  message: string;
 }
 /**
- * Canvas close parameters sent to the provider.
+ * The candidate is discoverable but cannot be installed. `application/ai-skill` resolves here, because it stays searchable while remaining typed non-installable.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CanvasProviderCloseRequest".
+ * via the `definition` "CatalogNotInstallableError".
  */
 /** @experimental */
-export interface CanvasProviderCloseRequest {
-  /**
-   * Target session identifier
-   */
-  sessionId: string;
-  /**
-   * Owning provider identifier
-   */
-  extensionId: string;
+export interface CatalogNotInstallableError {
   /**
-   * Provider-local canvas identifier
+   * Discriminator: the candidate cannot be installed
    */
-  canvasId: string;
+  kind: "not-installable";
+  reason: CatalogNotInstallableReason;
   /**
-   * Canvas instance identifier
+   * Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
    */
-  instanceId: string;
-  host?: CanvasHostContext;
-  session?: CanvasSessionContext;
+  message: string;
 }
 /**
- * Session context supplied by the runtime.
+ * Registry or enterprise policy refused the operation.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CanvasSessionContext".
+ * via the `definition` "CatalogPolicyRejectedError".
  */
 /** @experimental */
-export interface CanvasSessionContext {
+export interface CatalogPolicyRejectedError {
   /**
-   * Active session working directory, when known.
+   * Discriminator: policy refused the operation
    */
-  workingDirectory?: string;
+  kind: "policy-rejected";
+  source: McpPlanPolicySource;
+  /**
+   * Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+   */
+  message: string;
 }
 /**
- * Canvas action invocation parameters sent to the provider.
+ * A bounded catalog search. Both the query length and the result count are capped by the schema so a caller cannot request an unbounded scan.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CanvasProviderInvokeActionRequest".
+ * via the `definition` "CatalogSearchRequest".
  */
 /** @experimental */
-export interface CanvasProviderInvokeActionRequest {
+export interface CatalogSearchRequest {
+  contract: CatalogClientContract;
   /**
-   * Target session identifier
+   * Free-text search query. Never written to logs or telemetry.
    */
-  sessionId: string;
+  query: string;
   /**
-   * Owning provider identifier
+   * Maximum number of candidates to return. Defaults to 10 when omitted.
    */
-  extensionId: string;
+  limit?: number;
   /**
-   * Provider-local canvas identifier
+   * Restrict results to these candidate kinds. When omitted, every kind the runtime supports is searched.
+   *
+   * @minItems 1
+   * @maxItems 2
    */
-  canvasId: string;
+  kinds?: [CatalogCandidateKind] | [CatalogCandidateKind, CatalogCandidateKind];
+}
+/**
+ * A completed catalog search: inert candidate summaries, each carrying a single-use handle.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogSearchSucceeded".
+ */
+/** @experimental */
+export interface CatalogSearchSucceeded {
   /**
-   * Canvas instance identifier
+   * Discriminator: the search completed
    */
-  instanceId: string;
+  kind: "succeeded";
   /**
-   * Action name to invoke
+   * Pseudonymous identifier for this search, issued by the runtime or by the catalog authority it queried and never by the caller, so it cannot be forged or replayed to attribute an install to a search that never happened. Always present on a success, so a result set can be tied to the installs it leads to. It identifies a search rather than a person: it is derived from no user, account, device, or query data, and must never be joined with user identity to re-identify anyone.
    */
-  actionName: string;
+  searchId: string;
   /**
-   * Action input
+   * Matching candidates, never more than the requested limit. All text is inert untrusted data.
+   *
+   * @maxItems 50
    */
-  input?: {
-    [k: string]: unknown | undefined;
-  };
-  host?: CanvasHostContext;
-  session?: CanvasSessionContext;
+  candidates: CatalogCandidate[];
+  /**
+   * Whether further matches existed beyond the requested limit.
+   */
+  truncated: boolean;
+  negotiated: CatalogNegotiatedContract;
 }
 /**
- * Canvas open parameters sent to the provider.
+ * The request asked for a candidate kind this runtime does not serve.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CanvasProviderOpenRequest".
+ * via the `definition` "CatalogUnsupportedKindError".
  */
 /** @experimental */
-export interface CanvasProviderOpenRequest {
-  /**
-   * Target session identifier
-   */
-  sessionId: string;
+export interface CatalogUnsupportedKindError {
   /**
-   * Owning provider identifier
+   * Discriminator: an unsupported candidate kind was requested
    */
-  extensionId: string;
+  kind: "unsupported-kind";
   /**
-   * Provider-local canvas identifier
+   * The kinds from the request that are not supported.
    */
-  canvasId: string;
+  requestedKinds: CatalogCandidateKind[];
   /**
-   * Stable caller-supplied canvas instance identifier
+   * Every candidate kind this runtime can serve.
    */
-  instanceId: string;
+  supportedKinds: CatalogCandidateKind[];
   /**
-   * Canvas open input
+   * Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
    */
-  input?: {
-    [k: string]: unknown | undefined;
-  };
-  host?: CanvasHostContext;
-  session?: CanvasSessionContext;
+  message: string;
 }
 /**
- * Canvas open result returned by the provider.
+ * Retrieval was refused by the runtime's hardened fetch boundary before any request left the process, or before a redirect was followed.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CanvasProviderOpenResult".
+ * via the `definition` "CatalogUnsafeRetrievalError".
  */
 /** @experimental */
-export interface CanvasProviderOpenResult {
+export interface CatalogUnsafeRetrievalError {
   /**
-   * URL for web-rendered canvases
+   * Discriminator: retrieval was refused as unsafe
    */
-  url?: string;
+  kind: "unsafe-retrieval";
+  reason: CatalogUnsafeRetrievalReason;
   /**
-   * Provider-supplied title
+   * Human-readable explanation, safe to surface. Never contains the refused URL, nor a query, handle, or secret.
    */
-  title?: string;
+  message: string;
+}
+/**
+ * The operation is not available on this runtime. Distinct from a network failure: nothing was attempted.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CatalogUnavailableError".
+ */
+/** @experimental */
+export interface CatalogUnavailableError {
   /**
-   * Provider-supplied status text
+   * Discriminator: the operation is not available
    */
-  status?: string;
+  kind: "unavailable";
+  reason: CatalogUnavailableReason;
+  /**
+   * Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+   */
+  message: string;
 }
 /**
- * Options scoped to the built-in CAPI (Copilot API) provider.
+ * No transport this runtime can use is available for the requested server.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CapiSessionOptions".
+ * via the `definition` "CatalogUnavailableTransportError".
  */
 /** @experimental */
-export interface CapiSessionOptions {
+export interface CatalogUnavailableTransportError {
   /**
-   * Whether to use WebSocket transport for the CAPI Responses API. Enabled by default when the model advertises `ws:/responses` support; set to `false` to force the HTTP Responses transport in environments where WebSockets are blocked (e.g. behind a proxy). Setting this to `false` is equivalent to the `COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES` environment variable.
+   * Discriminator: no usable transport is available
    */
-  enableWebSocketResponses?: boolean;
+  kind: "unavailable-transport";
+  reason: CatalogUnavailableTransportReason;
+  /**
+   * Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+   */
+  message: string;
 }
 /**
  * Slash commands available in the session, after applying any include/exclude filters.
@@ -4344,6 +6097,37 @@ export interface SlashCommandInputChoice {
    */
   description: string;
 }
+/**
+ * The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CommandsFinalizeInvocationEffectRequest".
+ */
+/** @experimental */
+export interface CommandsFinalizeInvocationEffectRequest {
+  /**
+   * The slash-command result object that produced the pending effect, echoed back unchanged.
+   */
+  effect: {};
+  outcome: CommandsInvocationEffectOutcome;
+}
+/**
+ * Whether finalizing the invocation effect succeeded, and the failure reason when it did not.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CommandsFinalizeInvocationEffectResult".
+ */
+/** @experimental */
+export interface CommandsFinalizeInvocationEffectResult {
+  /**
+   * Whether the pending invocation effect was finalized successfully.
+   */
+  success: boolean;
+  /**
+   * Failure reason when the invocation effect could not be finalized.
+   */
+  error?: string;
+}
 /**
  * Pending command request ID and an optional error if the client handler failed.
  *
@@ -4390,6 +6174,7 @@ export interface CommandsInvokeRequest {
    * Raw input after the command name
    */
   input?: string;
+  origin?: CommandsInvocationOrigin;
 }
 /**
  * Queued-command request ID and the result indicating whether the host executed it (and whether to stop processing further queued commands).
@@ -4540,9 +6325,33 @@ export interface ConfigureSessionExtensionsParams {
    *
    * @internal
    */
-  controller?: {
-    [k: string]: unknown | undefined;
-  };
+  controller?: OpaqueInProcessValue;
+}
+/**
+ * Identity of the integrating host, declared once on the `server.connect` handshake so telemetry from this connection is attributed to a single, consistent surface. All fields are optional; omit them to keep the default attribution.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ConnectClientInfo".
+ */
+/** @experimental */
+/** @internal */
+export interface ConnectClientInfo {
+  /**
+   * Name of the host editor, e.g. `"vscode"`.
+   */
+  editorName?: string;
+  /**
+   * Version of the host editor, e.g. `"1.124.2"`. Ignored unless it looks like a version string.
+   */
+  editorVersion?: string;
+  /**
+   * Name of the Copilot extension within the host, e.g. `"copilot-chat"`.
+   */
+  extensionName?: string;
+  /**
+   * Version of the Copilot extension within the host, e.g. `"0.54.0"`. Ignored unless it looks like a version string.
+   */
+  extensionVersion?: string;
 }
 /**
  * Metadata for a connected remote session.
@@ -4626,7 +6435,7 @@ export interface ConnectRemoteSessionParams {
   sessionId: string;
 }
 /**
- * Parameters for the `server.connect` handshake: an optional connection token and optional connection-level opt-ins (e.g. GitHub telemetry forwarding).
+ * Connection-level opt-ins for the `server.connect` handshake. Transport authentication is consumed by the native protocol boundary before dispatch.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "ConnectRequest".
@@ -4634,14 +6443,15 @@ export interface ConnectRemoteSessionParams {
 /** @experimental */
 /** @internal */
 export interface ConnectRequest {
-  /**
-   * Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN
-   */
-  token?: string;
   /**
    * Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the runtime forwards every internal telemetry event it emits — across all sessions, plus sessionless events — to this connection over the `gitHubTelemetry.event` notification. Regular events are also written to the runtime's normal GitHub/CTS path (dual-write); host-only compatibility events are forward-only and intentionally skip that path. Intended for first-party hosts that re-emit the events into their own telemetry stores. Both unrestricted and restricted events are forwarded, each tagged with a `restricted` discriminator; a backstop drops restricted events when restricted telemetry is disabled — using the process-global gate for ordinary events and an explicit session-scoped decision for host-only events.
    */
   enableGitHubTelemetryForwarding?: boolean;
+  clientInfo?: ConnectClientInfo;
+  /**
+   * Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN
+   */
+  token?: string;
 }
 /**
  * Handshake result reporting the server's protocol version and package version on success.
@@ -4787,7 +6597,7 @@ export interface CurrentToolMetadata {
    * JSON Schema for tool input
    */
   input_schema?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * Whether the tool is loaded on demand via tool search
@@ -5217,10 +7027,63 @@ export interface ExtensionContextPushInput {
   /**
    * Caller-supplied JSON payload (required, may be null but not undefined)
    */
-  payload: {
-    [k: string]: unknown | undefined;
+  payload: JsonValue;
+}
+/**
+ * Opaque integrator-owned process launch profile for one extension entrypoint.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ExtensionLaunchProfile".
+ */
+/** @experimental */
+export interface ExtensionLaunchProfile {
+  /**
+   * Executable used to launch the extension entrypoint.
+   */
+  executable: string;
+  /**
+   * Opaque integrator-defined arguments passed to the executable. The runtime does not append the extension entrypoint.
+   */
+  args: string[];
+  /**
+   * Opaque integrator-defined environment variables. Runtime-owned COPILOT_SDK_PATH, SESSION_ID, and COPILOT_EXTENSION_PARENT_PID values take precedence.
+   */
+  env: {
+    [k: string]: string | undefined;
   };
 }
+/**
+ * A discovered extension entrypoint that the registered integrator may classify and resolve to an opaque launch profile.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ExtensionLaunchProviderResolveRequest".
+ */
+/** @experimental */
+export interface ExtensionLaunchProviderResolveRequest {
+  /**
+   * Source-qualified extension identifier.
+   */
+  id: string;
+  /**
+   * Human-readable extension name.
+   */
+  name: string;
+  /**
+   * Absolute path to the discovered extension entrypoint.
+   */
+  modulePath: string;
+  source: ExtensionSource;
+}
+/**
+ * The launch profile for a supported entrypoint. Omit launch when the provider does not support the entrypoint.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ExtensionLaunchProviderResolveResult".
+ */
+/** @experimental */
+export interface ExtensionLaunchProviderResolveResult {
+  launch?: ExtensionLaunchProfile;
+}
 /**
  * Extensions discovered for the session, with their current status.
  *
@@ -5288,7 +7151,7 @@ export interface ExternalToolTextResultForLlm {
    * Optional tool-specific telemetry
    */
   toolTelemetry?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * Base64-encoded binary results returned to the model
@@ -5328,7 +7191,7 @@ export interface ExternalToolTextResultForLlmBinaryResultsForLlm {
    * Optional metadata from the producing tool.
    */
   metadata?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -5565,13 +7428,20 @@ export interface FactoryAgentOptions {
   /**
    * Optional JSON Schema for structured agent output.
    */
-  schema?: {
-    [k: string]: unknown | undefined;
-  };
+  schema?: JsonValue;
   /**
    * Optional model identifier for the subagent.
    */
   model?: string;
+  /**
+   * Optional reasoning effort for the subagent. This field is accepted but not yet honored.
+   */
+  reasoningEffort?: string;
+  contextTier?: ContextTier;
+  /**
+   * Optional custom agent name for the subagent. This field is accepted but not yet honored.
+   */
+  agent?: string;
 }
 /**
  * Parameters for one factory-scoped subagent call.
@@ -5606,9 +7476,7 @@ export interface FactoryAgentResult {
   /**
    * Agent result, omitted when the agent produced no result.
    */
-  result?: {
-    [k: string]: unknown | undefined;
-  };
+  result?: JsonValue;
 }
 /**
  * Prompt-safe durable identity and live status for a direct factory agent.
@@ -5618,18 +7486,61 @@ export interface FactoryAgentResult {
  */
 /** @experimental */
 export interface FactoryAgentSummary {
+  /**
+   * Stable direct-agent identifier.
+   */
   agentId: string;
+  /**
+   * Tool-call identifier that launched the agent.
+   */
   toolCallId: string;
+  /**
+   * Owning factory run identifier.
+   */
   runId: string;
+  /**
+   * Phase identifier active when the agent was launched, or null.
+   */
   phaseId: string | null;
+  /**
+   * Friendly, non-unique name intended for display
+   */
   label: string;
+  /**
+   * Friendly, non-unique name intended for display
+   */
+  displayName?: string;
+  /**
+   * Registered agent type.
+   */
   agentType: string;
+  /**
+   * Current durable or live agent status.
+   */
   status: string;
+  /**
+   * Model requested when the agent was launched.
+   */
   requestedModel?: string;
+  /**
+   * Concrete model resolved for the agent.
+   */
   resolvedModel?: string;
+  /**
+   * Epoch milliseconds when the agent started.
+   */
   startedAt?: number;
+  /**
+   * Epoch milliseconds when the agent completed.
+   */
   completedAt?: number;
+  /**
+   * Accumulated active agent time in milliseconds.
+   */
   activeMs: number;
+  /**
+   * Prompt-safe live activity text.
+   */
   activity?: string;
 }
 /**
@@ -5653,7 +7564,13 @@ export interface FactoryCancelRequest {
  */
 /** @experimental */
 export interface FactoryCurrentPhase {
+  /**
+   * Current phase identifier.
+   */
   id: string;
+  /**
+   * Zero-based declared phase ordinal, or null for an undeclared phase.
+   */
   ordinal: number | null;
 }
 /**
@@ -5664,9 +7581,21 @@ export interface FactoryCurrentPhase {
  */
 /** @experimental */
 export interface FactoryDeclaredLimits {
+  /**
+   * Maximum concurrently active subagents.
+   */
   maxConcurrentSubagents?: number;
+  /**
+   * Maximum total subagents spawned by the run.
+   */
   maxTotalSubagents?: number;
+  /**
+   * Maximum accumulated active execution time in seconds.
+   */
   timeoutSeconds?: number;
+  /**
+   * Maximum AI credits consumed by subagents and descendants.
+   */
   maxAiCredits?: number;
 }
 /**
@@ -5696,9 +7625,7 @@ export interface FactoryExecuteRequest {
   /**
    * Factory input value.
    */
-  args: {
-    [k: string]: unknown | undefined;
-  };
+  args: JsonValue;
 }
 /**
  * Result returned by an extension factory closure.
@@ -5711,9 +7638,7 @@ export interface FactoryExecuteResult {
   /**
    * Factory result value.
    */
-  result?: {
-    [k: string]: unknown | undefined;
-  };
+  result?: JsonValue;
 }
 /**
  * Parameters for paging factory progress.
@@ -5793,9 +7718,7 @@ export interface FactoryJournalGetResult {
   /**
    * Cached JSON result. The hit field distinguishes a cached JSON null from a miss.
    */
-  resultJson?: {
-    [k: string]: unknown | undefined;
-  };
+  resultJson?: JsonValue;
 }
 /**
  * Parameters for storing a factory journal entry.
@@ -5820,27 +7743,57 @@ export interface FactoryJournalPutRequest {
   /**
    * JSON result to memoize.
    */
-  resultJson: {
-    [k: string]: unknown | undefined;
-  };
+  resultJson: JsonValue;
 }
 /**
- * Empty parameters for listing factory runs.
+ * Parameters for paging factory runs.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "FactoryListRunsRequest".
  */
 /** @experimental */
-export interface FactoryListRunsRequest {}
+export interface FactoryListRunsRequest {
+  /**
+   * Exclusive forward cursor.
+   */
+  afterSeq?: number;
+  /**
+   * Exclusive backward cursor.
+   */
+  beforeSeq?: number;
+  /**
+   * Maximum terminal runs to return. Defaults to 200 and is capped at 500.
+   */
+  limit?: number;
+}
 /**
- * Factory runs in durable creation order.
+ * A page of factory runs in durable creation order.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "FactoryListRunsResult".
  */
 /** @experimental */
 export interface FactoryListRunsResult {
+  /**
+   * Factory run summaries in durable creation order.
+   */
   runs: FactoryRunSummary[];
+  /**
+   * Oldest terminal-run cursor in this page, or null when the terminal window is empty.
+   */
+  oldestSeq?: number | null;
+  /**
+   * Newest terminal-run cursor in this page, or null when the terminal window is empty.
+   */
+  newestSeq?: number | null;
+  /**
+   * Whether terminal runs newer than this page exist.
+   */
+  hasMoreNewer?: boolean;
+  /**
+   * Number of terminal runs older than this page.
+   */
+  omittedOlder?: number;
 }
 /**
  * Durable factory run summary with read-time live overlays.
@@ -5850,24 +7803,72 @@ export interface FactoryListRunsResult {
  */
 /** @experimental */
 export interface FactoryRunSummary {
+  /**
+   * Factory run identifier.
+   */
   runId: string;
+  /**
+   * Registered factory name.
+   */
   factoryName: string;
+  /**
+   * Human-readable factory description.
+   */
   description: string;
   status: FactoryRunStatus;
+  /**
+   * Monotonic durable run revision.
+   */
   revision: number;
+  /**
+   * Epoch milliseconds when the run was created.
+   */
   createdAt: number;
+  /**
+   * Epoch milliseconds when execution first started, or null before start.
+   */
   startedAt: number | null;
+  /**
+   * Epoch milliseconds when the durable run was last updated.
+   */
   updatedAt: number;
+  /**
+   * Epoch milliseconds when the run completed, or null while nonterminal.
+   */
   completedAt: number | null;
+  /**
+   * Current phase identity, or null before any phase is entered.
+   */
   currentPhase: FactoryCurrentPhase | null;
+  /**
+   * Number of phases declared by the factory.
+   */
   declaredPhaseCount: number;
+  /**
+   * Number of direct factory agents currently live.
+   */
   liveAgentCount: number;
+  /**
+   * Total direct factory agents spawned across all attempts.
+   */
   totalSpawnedAgentCount: number;
   consumed: FactoryRunConsumed;
   declaredLimits: FactoryDeclaredLimits;
+  /**
+   * Approved effective resource ceilings, or null until approved.
+   */
   approved: FactoryDeclaredLimits | null;
+  /**
+   * Epoch milliseconds when this live-overlay snapshot was observed.
+   */
   observedAt: number;
+  /**
+   * Epoch milliseconds when the current active segment started, or null while inactive.
+   */
   activeSegmentStartedAt: number | null;
+  /**
+   * Terminal run outcome, or null while nonterminal.
+   */
   terminal: FactoryRunTerminal | null;
 }
 /**
@@ -5878,8 +7879,17 @@ export interface FactoryRunSummary {
  */
 /** @experimental */
 export interface FactoryRunConsumed {
+  /**
+   * Accumulated active execution time in milliseconds.
+   */
   activeMs: number;
+  /**
+   * Total subagents spawned by the run.
+   */
   subagents: number;
+  /**
+   * AI usage consumed by the run in nano-AIU.
+   */
   nanoAiu: number;
 }
 /**
@@ -5890,9 +7900,18 @@ export interface FactoryRunConsumed {
  */
 /** @experimental */
 export interface FactoryRunTerminal {
+  /**
+   * Human-readable terminal reason.
+   */
   reason?: string;
   failure?: FactoryRunFailure;
+  /**
+   * Human-readable terminal error.
+   */
   error?: string;
+  /**
+   * Prompt-safe preview of the completed result.
+   */
   resultPreview?: string;
 }
 /**
@@ -5942,18 +7961,54 @@ export interface FactoryLogRequest {
  */
 /** @experimental */
 export interface FactoryPhaseObservation {
+  /**
+   * Phase identifier.
+   */
   id: string;
+  /**
+   * Zero-based declared phase ordinal, or null for an undeclared phase.
+   */
   ordinal: number | null;
+  /**
+   * Human-readable phase title.
+   */
   title: string;
+  /**
+   * Optional human-readable phase detail.
+   */
   detail?: string;
   status: FactoryPhaseStatus;
+  /**
+   * Most recent run attempt that entered this phase, or `0` if the phase has never been entered.
+   */
   lastEnteredRunAttempt: number;
+  /**
+   * Number of times execution entered this phase.
+   */
   entryCount: number;
+  /**
+   * Epoch milliseconds when this phase first started; for a skipped phase, the synthetic skip timestamp (equal to `completedAt`).
+   */
   startedAt?: number;
+  /**
+   * Epoch milliseconds when this phase completed; for a skipped phase, the synthetic skip timestamp (equal to `startedAt`).
+   */
   completedAt?: number;
+  /**
+   * Completed active time accumulated by this phase in milliseconds.
+   */
   accumulatedActiveMs: number;
+  /**
+   * Current live active time for this phase in milliseconds.
+   */
   currentActiveMs: number;
+  /**
+   * Total direct agents associated with this phase.
+   */
   totalAgentCount: number;
+  /**
+   * Direct agents in this phase that are currently live.
+   */
   liveAgentCount: number;
 }
 /**
@@ -5994,10 +8049,25 @@ export interface FactoryProgressLine {
  */
 /** @experimental */
 export interface FactoryProgressPage {
+  /**
+   * Progress records in sequence order.
+   */
   records: FactoryProgressLine[];
+  /**
+   * Oldest sequence number in this page, or null when empty.
+   */
   oldestSeq: number | null;
+  /**
+   * Newest sequence number in this page, or null when empty.
+   */
   newestSeq: number | null;
+  /**
+   * Whether progress records older than this page exist.
+   */
   hasMoreOlder: boolean;
+  /**
+   * Whether progress records newer than this page exist.
+   */
   hasMoreNewer: boolean;
   /**
    * Run revision reflected by this page.
@@ -6073,9 +8143,7 @@ export interface FactoryRunResult {
   /**
    * Completed factory result.
    */
-  result?: {
-    [k: string]: unknown | undefined;
-  };
+  result?: JsonValue;
   /**
    * Error message for an errored run.
    */
@@ -6088,9 +8156,7 @@ export interface FactoryRunResult {
   /**
    * Partial journal and progress snapshot for a halted, cancelled, or errored run.
    */
-  snapshot?: {
-    [k: string]: unknown | undefined;
-  };
+  snapshot?: JsonValue;
 }
 /**
  * Full factory run observability detail.
@@ -6100,26 +8166,80 @@ export interface FactoryRunResult {
  */
 /** @experimental */
 export interface FactoryRunDetail {
+  /**
+   * Factory run identifier.
+   */
   runId: string;
+  /**
+   * Registered factory name.
+   */
   factoryName: string;
+  /**
+   * Human-readable factory description.
+   */
   description: string;
   status: FactoryRunStatus;
+  /**
+   * Monotonic durable run revision.
+   */
   revision: number;
+  /**
+   * Epoch milliseconds when the run was created.
+   */
   createdAt: number;
+  /**
+   * Epoch milliseconds when execution first started, or null before start.
+   */
   startedAt: number | null;
+  /**
+   * Epoch milliseconds when the durable run was last updated.
+   */
   updatedAt: number;
+  /**
+   * Epoch milliseconds when the run completed, or null while nonterminal.
+   */
   completedAt: number | null;
+  /**
+   * Current phase identity, or null before any phase is entered.
+   */
   currentPhase: FactoryCurrentPhase | null;
+  /**
+   * Number of phases declared by the factory.
+   */
   declaredPhaseCount: number;
+  /**
+   * Number of direct factory agents currently live.
+   */
   liveAgentCount: number;
+  /**
+   * Total direct factory agents spawned across all attempts.
+   */
   totalSpawnedAgentCount: number;
   consumed: FactoryRunConsumed;
   declaredLimits: FactoryDeclaredLimits;
+  /**
+   * Approved effective resource ceilings, or null until approved.
+   */
   approved: FactoryDeclaredLimits | null;
+  /**
+   * Epoch milliseconds when this live-overlay snapshot was observed.
+   */
   observedAt: number;
+  /**
+   * Epoch milliseconds when the current active segment started, or null while inactive.
+   */
   activeSegmentStartedAt: number | null;
+  /**
+   * Terminal run outcome, or null while nonterminal.
+   */
   terminal: FactoryRunTerminal | null;
+  /**
+   * Lifecycle and timing observations for each factory phase.
+   */
   phases: FactoryPhaseObservation[];
+  /**
+   * Durable identities and live statuses for direct factory agents.
+   */
   agents: FactoryAgentSummary[];
   progress: FactoryProgressPage;
 }
@@ -6138,9 +8258,7 @@ export interface FactoryRunRequest {
   /**
    * Factory input value.
    */
-  args: {
-    [k: string]: unknown | undefined;
-  };
+  args: JsonValue;
   options?: RunOptions;
 }
 /**
@@ -6270,6 +8388,14 @@ export interface GitHubTelemetryClientInfo {
    * Stable machine identifier for the device.
    */
   dev_device_id?: string;
+  /**
+   * Distinct CPU model names for the host, comma-separated.
+   */
+  cpu_model?: string;
+  /**
+   * Number of logical CPU cores on the host.
+   */
+  cpu_count?: number;
 }
 /**
  * A single telemetry event in the runtime's native GitHub-shaped telemetry format, forwarded verbatim to opted-in hosts. The `restricted` flag on the enclosing GitHubTelemetryNotification distinguishes standard from restricted events; the payload shape is identical for both.
@@ -6341,6 +8467,28 @@ export interface GitHubTelemetryNotification {
   restricted: boolean;
   event: GitHubTelemetryEvent;
 }
+/**
+ * Asks the SDK client to acquire a GitHub access token from an opaque callback registration.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubTokenAcquireRequest".
+ */
+/** @experimental */
+export interface GitHubTokenAcquireRequest {
+  /**
+   * Opaque identifier generated by the SDK for this callback registration.
+   */
+  registrationId: string;
+  /**
+   * Effective GitHub host for which the callback must return a token.
+   */
+  host: string;
+  /**
+   * Session receiving the token. Absent only before a cloud session has been assigned its id.
+   */
+  sessionId?: string;
+  reason: GitHubTokenAcquireReason;
+}
 /**
  * Pending external tool call request ID, with the tool result or an error describing why it failed.
  *
@@ -6715,7 +8863,7 @@ export interface HistoryTruncateResult {
 export interface HookInvokeRequest {
   sessionId: string;
   hookType: HookType;
-  input: unknown;
+  input: JsonValue;
 }
 /**
  * Optional output returned by an SDK callback hook.
@@ -6726,7 +8874,7 @@ export interface HookInvokeRequest {
 /** @experimental */
 /** @internal */
 export interface HookInvokeResponse {
-  output?: unknown;
+  output?: JsonValue;
 }
 /**
  * Installed plugin record from global state, with marketplace, version, install time, enabled state, cache path, and source.
@@ -6765,6 +8913,10 @@ export interface InstalledPlugin {
    * Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.
    */
   source_sha?: string;
+  /**
+   * Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — those synthesized at session start for a directory/local marketplace, whose cache_path points at the real plugin directory on disk rather than a copy under the installed-plugins cache. Its presence is what marks a record as live, and no record carrying it is ever written to the persisted installedPlugins key.
+   */
+  installed_from?: string;
 }
 /**
  * Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or full commit SHA, and optional subpath.
@@ -6778,12 +8930,21 @@ export interface InstalledPluginSourceGitHub {
    * Constant value. Always "github".
    */
   source: "github";
+  /**
+   * GitHub repository in `owner/repo` form.
+   */
   repo: string;
+  /**
+   * Optional Git ref to resolve.
+   */
   ref?: string;
   /**
    * Optional full 40-character hexadecimal commit SHA.
    */
   sha?: string;
+  /**
+   * Optional repository-relative path to the plugin.
+   */
   path?: string;
 }
 /**
@@ -6798,12 +8959,21 @@ export interface InstalledPluginSourceUrl {
    * Constant value. Always "url".
    */
   source: "url";
+  /**
+   * URL of the plugin source.
+   */
   url: string;
+  /**
+   * Optional Git ref to resolve.
+   */
   ref?: string;
   /**
    * Optional full 40-character hexadecimal commit SHA.
    */
   sha?: string;
+  /**
+   * Optional source-relative path to the plugin.
+   */
   path?: string;
 }
 /**
@@ -6818,6 +8988,9 @@ export interface InstalledPluginSourceLocal {
    * Constant value. Always "local".
    */
   source: "local";
+  /**
+   * Local filesystem path to the plugin.
+   */
   path: string;
 }
 /**
@@ -6848,6 +9021,10 @@ export interface InstalledPluginInfo {
    * Whether the plugin is currently enabled for new sessions
    */
   enabled: boolean;
+  /**
+   * Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — a plugin belonging to a directory/local marketplace, which is loaded from its real directory on every pass instead of a copy under the installed-plugins cache. Its presence is what marks a listed plugin as live: such a plugin is always present on disk, so `enabled` is its only meaningful state and it is never "not installed".
+   */
+  installedFrom?: string;
 }
 /**
  * Canonical file or directory where custom instructions can be discovered or created, with location, kind, preference, and project path.
@@ -7343,9 +9520,26 @@ export interface LspInitializeRequest {
    */
   gitRoot?: string;
   /**
-   * Force re-initialization even when LSP configs were already loaded for the working directory.
+   * Force re-initialization even when LSP configs were already loaded for the working directory.
+   */
+  force?: boolean;
+}
+/**
+ * Validated device-managed settings discovered before a session exists.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsReadResult".
+ */
+/** @experimental */
+export interface ManagedSettingsReadResult {
+  /**
+   * Validated, canonical managed-settings JSON. Omitted when no managed settings were discovered or when discovered settings failed validation.
+   */
+  settingsJson?: JsonValue;
+  /**
+   * Discovery or validation error text when managed settings could not be read safely.
    */
-  force?: boolean;
+  errorMessage?: string;
 }
 /**
  * Result of registering a new marketplace.
@@ -7512,7 +9706,7 @@ export interface McpAppsCallToolRequest {
    * Tool arguments
    */
   arguments?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * **Required.** Server whose ui:// view issued the request. Per SEP-1865 ('callable by the app from this server only'), the call is rejected when this differs from `serverName`, and rejected outright when missing.
@@ -7657,7 +9851,7 @@ export interface McpAppsListToolsResult {
    * App-callable tools from the server
    */
   tools: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   }[];
 }
 /**
@@ -7718,7 +9912,7 @@ export interface McpAppsResourceContent {
    * Resource-level metadata (CSP, permissions, etc.)
    */
   _meta?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -7798,7 +9992,7 @@ export interface McpConfigAddRequest {
    * Unique name for the MCP server
    */
   name: string;
-  config: McpServerConfig;
+  config: McpSerializableServerConfig;
 }
 /**
  * Stdio MCP server configuration launched as a child process.
@@ -7808,6 +10002,11 @@ export interface McpConfigAddRequest {
  */
 /** @experimental */
 export interface McpServerConfigStdio {
+  /**
+   * Optional human-readable server name.
+   */
+  displayName?: string;
+  safeForTelemetry?: McpSafeForTelemetry;
   /**
    * Tools to include. Defaults to all tools if not specified.
    */
@@ -7818,7 +10017,7 @@ export interface McpServerConfigStdio {
   isDefaultServer?: boolean;
   filterMapping?: FilterMapping;
   /**
-   * Timeout in milliseconds for tool calls to this server.
+   * Timeout in milliseconds for tool discovery and tool calls.
    */
   timeout?: number;
   oidc?: McpServerAuthConfig;
@@ -7828,6 +10027,43 @@ export interface McpServerConfigStdio {
    * Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery is unaffected.
    */
   disableToolCache?: boolean;
+  /**
+   * Whether secret masking is disabled for calls to this server.
+   */
+  disableSecretMasking?: boolean;
+  /**
+   * Tool names excluded after the include filter is applied.
+   */
+  excludeTools?: string[];
+  /**
+   * Event types this server receives as Copilot notifications.
+   */
+  events?: string[];
+  /**
+   * Copilot notification types this server may send to the host.
+   */
+  notifications?: string[];
+  source?: McpServerSource;
+  /**
+   * Plugin that provided this server.
+   */
+  sourcePlugin?: string;
+  /**
+   * Version of the plugin that provided this server.
+   */
+  sourcePluginVersion?: string;
+  /**
+   * Whether the providing plugin uses the Open Plugin Spec.
+   */
+  sourcePluginSpec?: boolean;
+  /**
+   * Source file path recorded while loading the config.
+   */
+  sourcePath?: string;
+  /**
+   * Configuration warnings recorded while loading the server.
+   */
+  configWarnings?: string[];
   /**
    * Executable command used to start the Stdio MCP server process.
    */
@@ -7846,6 +10082,24 @@ export interface McpServerConfigStdio {
   env?: {
     [k: string]: string | undefined;
   };
+  type?: McpServerConfigStdioType;
+}
+/**
+ * Per-field MCP telemetry-obfuscation policy.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpSafeForTelemetryFields".
+ */
+/** @experimental */
+export interface McpSafeForTelemetryFields {
+  /**
+   * Whether the MCP tool name may be included in telemetry without obfuscation.
+   */
+  name: boolean;
+  /**
+   * Whether MCP tool input names may be included in telemetry without obfuscation.
+   */
+  inputsNames: boolean;
 }
 /**
  * Authentication settings with optional redirect port configuration.
@@ -7868,6 +10122,11 @@ export interface McpServerAuthConfigRedirectPort {
  */
 /** @experimental */
 export interface McpServerConfigHttp {
+  /**
+   * Optional human-readable server name.
+   */
+  displayName?: string;
+  safeForTelemetry?: McpSafeForTelemetry;
   /**
    * Tools to include. Defaults to all tools if not specified.
    */
@@ -7879,7 +10138,7 @@ export interface McpServerConfigHttp {
   isDefaultServer?: boolean;
   filterMapping?: FilterMapping;
   /**
-   * Timeout in milliseconds for tool calls to this server.
+   * Timeout in milliseconds for tool discovery and tool calls.
    */
   timeout?: number;
   oidc?: McpServerAuthConfig;
@@ -7889,6 +10148,43 @@ export interface McpServerConfigHttp {
    * Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery is unaffected.
    */
   disableToolCache?: boolean;
+  /**
+   * Whether secret masking is disabled for calls to this server.
+   */
+  disableSecretMasking?: boolean;
+  /**
+   * Tool names excluded after the include filter is applied.
+   */
+  excludeTools?: string[];
+  /**
+   * Event types this server receives as Copilot notifications.
+   */
+  events?: string[];
+  /**
+   * Copilot notification types this server may send to the host.
+   */
+  notifications?: string[];
+  source?: McpServerSource;
+  /**
+   * Plugin that provided this server.
+   */
+  sourcePlugin?: string;
+  /**
+   * Version of the plugin that provided this server.
+   */
+  sourcePluginVersion?: string;
+  /**
+   * Whether the providing plugin uses the Open Plugin Spec.
+   */
+  sourcePluginSpec?: boolean;
+  /**
+   * Source file path recorded while loading the config.
+   */
+  sourcePath?: string;
+  /**
+   * Configuration warnings recorded while loading the server.
+   */
+  configWarnings?: string[];
   /**
    * URL of the remote MCP server endpoint.
    */
@@ -7899,6 +10195,10 @@ export interface McpServerConfigHttp {
   headers?: {
     [k: string]: string | undefined;
   };
+  /**
+   * Dynamic-header refresh cache lifetime in milliseconds.
+   */
+  headersRefreshTtlMs?: number;
   /**
    * OAuth client ID for a pre-registered remote MCP OAuth client.
    */
@@ -7947,7 +10247,7 @@ export interface McpConfigList {
    * All MCP servers from user config, keyed by name
    */
   servers: {
-    [k: string]: McpServerConfig;
+    [k: string]: McpSerializableServerConfig;
   };
 }
 /**
@@ -7975,10 +10275,10 @@ export interface McpConfigUpdateRequest {
    * Name of the MCP server to update
    */
   name: string;
-  config: McpServerConfig;
+  config: McpSerializableServerConfig;
 }
 /**
- * Opaque auth info used to configure GitHub MCP.
+ * Credential-free authentication identity used to configure GitHub MCP.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "McpConfigureGitHubRequest".
@@ -7991,9 +10291,7 @@ export interface McpConfigureGitHubRequest {
    *
    * @internal
    */
-  authInfo: {
-    [k: string]: unknown | undefined;
-  };
+  authInfo: OpaqueInProcessValue;
 }
 /**
  * Result of configuring GitHub MCP.
@@ -8079,9 +10377,7 @@ export interface McpExecuteSamplingParams {
   /**
    * The original MCP JSON-RPC request ID (string or number). Used by the runtime to correlate the inference with the originating MCP request for telemetry; this is distinct from `requestId` (which is the schema-level cancellation handle).
    */
-  mcpRequestId: {
-    [k: string]: unknown | undefined;
-  };
+  mcpRequestId: JsonValue;
   request: McpExecuteSamplingRequest;
 }
 /**
@@ -8104,6 +10400,23 @@ export interface McpExecuteSamplingRequest {
 export interface McpExecuteSamplingResult {
   [k: string]: unknown | undefined;
 }
+/**
+ * MCP server whose connection attempt failed.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpFailedServer".
+ */
+/** @experimental */
+export interface McpFailedServer {
+  /**
+   * The config key of the server that failed to connect.
+   */
+  name: string;
+  /**
+   * The captured connection failure detail.
+   */
+  error?: string;
+}
 /**
  * MCP server filtered by policy, with name, reason, and optional redacted reason.
  *
@@ -8178,55 +10491,349 @@ export interface McpHostState {
    */
   filteredServers: string[];
   /**
-   * Names of currently-connected MCP clients.
+   * Names of currently-connected MCP clients.
+   */
+  clients: string[];
+  /**
+   * Names of servers with in-flight connection attempts.
+   */
+  pendingConnections: string[];
+  /**
+   * Map of server name to recorded connection failure.
+   */
+  failedServers: {
+    [k: string]: McpServerFailureInfo | undefined;
+  };
+  /**
+   * Map of server name to recorded pending-auth state.
+   */
+  needsAuthServers: {
+    [k: string]: McpServerNeedsAuthInfo | undefined;
+  };
+}
+/**
+ * Recorded MCP server connection failure.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerFailureInfo".
+ */
+/** @experimental */
+export interface McpServerFailureInfo {
+  /**
+   * Failure message produced when the MCP server connection failed.
+   */
+  message: string;
+  /**
+   * epoch-ms timestamp at which the failure was recorded.
+   */
+  timestamp: number;
+}
+/**
+ * Recorded MCP server pending-auth state.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerNeedsAuthInfo".
+ */
+/** @experimental */
+export interface McpServerNeedsAuthInfo {
+  /**
+   * epoch-ms timestamp at which the server signalled it needs authentication.
+   */
+  timestamp: number;
+}
+/**
+ * A normalised, inert description of what installing an MCP server would involve. Carries no raw card, no install specification, and no secret value.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpInstallPlan".
+ */
+/** @experimental */
+export interface McpInstallPlan {
+  /**
+   * Opaque, runtime-instance scoped, TTL-bound, single-use handle for this plan. Rejected when stale, replayed, or presented to a different runtime instance. Never logged.
+   */
+  planHandle: string;
+  /**
+   * ISO 8601 timestamp after which the plan handle is stale and will be rejected. Abandoning a plan needs no call: an unused handle simply expires, so cancellation before commit is side-effect free.
+   */
+  planHandleExpiresAt: string;
+  identity: McpPlanResourceIdentity;
+  provenance: McpPlanProvenance;
+  /**
+   * Every eligible transport, so a host can present an explicit choice. A completed plan always has at least one; when none is eligible, planning returns `CatalogUnavailableTransportError` instead.
+   *
+   * @minItems 1
+   * @maxItems 50
+   */
+  transportChoices: [McpPlanTransportChoice, ...McpPlanTransportChoice[]];
+  /**
+   * Identifier of the choice the runtime would pick by default. Omitted when there is no eligible transport, or when the runtime expresses no preference.
+   */
+  recommendedTransportChoiceId?: string;
+  target: McpPlanTarget;
+  policy: McpPlanPolicyResult;
+  /**
+   * The configuration changes installing would make, described rather than serialised, so the mutable configuration payload stays behind the runtime boundary.
+   */
+  configurationChanges: McpPlanConfigurationChange[];
+  /**
+   * Whether applying this plan would require an MCP reload to take effect. Planning itself never reloads.
+   */
+  reloadRequired: boolean;
+  /**
+   * Whether the plan cannot be applied without further input, because a required value has no default or a secret must be supplied.
+   */
+  requiresInteractiveConfiguration: boolean;
+}
+/**
+ * Normalised identity of the MCP server a plan targets, independent of how the card spelled it.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanResourceIdentity".
+ */
+/** @experimental */
+export interface McpPlanResourceIdentity {
+  /**
+   * Canonical, normalised name of the server, for example `io.github.owner/server`.
+   */
+  canonicalName: string;
+  /**
+   * Local configuration key the server would be recorded under.
+   */
+  serverName: string;
+  /**
+   * Version advertised by the card, when it declares one.
+   */
+  version?: string;
+  /**
+   * Registry identifier of the server, when it came from a registry.
+   */
+  registryId?: string;
+}
+/**
+ * Provenance of the exact validated JSON MCP card content bound privately to a completed plan and its opaque handle.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanProvenance".
+ */
+/** @experimental */
+export interface McpPlanProvenance {
+  /**
+   * Authority associated with the validated card, without path, query, or credentials. Inert untrusted data.
+   */
+  authority: string;
+  /**
+   * ISO 8601 timestamp at which the runtime completed strict parsing and schema validation of the card content.
+   */
+  validatedAt: string;
+  cardDigest: CardDigest;
+  mediaType: McpServerCardMediaType;
+}
+/**
+ * An eligible local-package transport choice. Package identity is required and a remote endpoint cannot be represented.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanTransportChoicePackage".
+ */
+/** @experimental */
+export interface McpPlanTransportChoicePackage {
+  /**
+   * Stable identifier for this choice within the plan, used to select it when the plan is applied.
+   */
+  choiceId: string;
+  transport: McpPlanPackageTransport;
+  installMethod: McpPlanPackageInstallMethod;
+  /**
+   * Packaging ecosystem, for example `oci` or `npm`.
+   */
+  packageType: string;
+  /**
+   * Package identifier. Inert untrusted data.
+   */
+  packageIdentifier: string;
+  /**
+   * Typed values this choice requires, excluding secrets.
+   */
+  requiredValues: McpPlanRequiredValue[];
+  /**
+   * Secrets this choice requires, referenced by placeholder only.
+   */
+  secretPlaceholders: McpPlanSecretPlaceholder[];
+}
+/**
+ * One non-secret scalar value a transport choice needs before it can be applied.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanRequiredValueScalar".
+ */
+/** @experimental */
+export interface McpPlanRequiredValueScalar {
+  kind: McpPlanRequiredValueScalarKind;
+  /**
+   * Key the value is supplied under. Inert untrusted data.
+   */
+  key: string;
+  category: McpPlanValueCategory;
+  valueType: McpPlanScalarValueType;
+  /**
+   * Whether the value must be present for the plan to be applicable.
+   */
+  required: boolean;
+  /**
+   * Default supplied by the card, when the value can be resolved without input. Presence is the authoritative indication that a default exists. Inert untrusted data.
+   */
+  defaultValue?: string;
+  /**
+   * Human-readable label from the card. Inert untrusted text.
+   */
+  title?: string;
+  /**
+   * Human-readable explanation from the card. Inert untrusted text.
+   */
+  description?: string;
+  /**
+   * Whether the value may be supplied more than once.
+   */
+  isRepeated: boolean;
+}
+/**
+ * One enumerated non-secret value a transport choice needs before it can be applied. The permitted values are structurally required.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanRequiredValueEnum".
+ */
+/** @experimental */
+export interface McpPlanRequiredValueEnum {
+  kind: McpPlanRequiredValueEnumKind;
+  /**
+   * Key the value is supplied under. Inert untrusted data.
+   */
+  key: string;
+  category: McpPlanValueCategory;
+  valueType: McpPlanEnumValueType;
+  /**
+   * Whether the value must be present for the plan to be applicable.
+   */
+  required: boolean;
+  /**
+   * Default supplied by the card, when the value can be resolved without input. Presence is the authoritative indication that a default exists. Inert untrusted data.
+   */
+  defaultValue?: string;
+  /**
+   * Human-readable label from the card. Inert untrusted text.
+   */
+  title?: string;
+  /**
+   * Human-readable explanation from the card. Inert untrusted text.
+   */
+  description?: string;
+  /**
+   * Non-empty permitted value set. Inert untrusted data.
+   *
+   * @minItems 1
+   */
+  enumValues: [string, ...string[]];
+  /**
+   * Whether the value may be supplied more than once.
+   */
+  isRepeated: boolean;
+}
+/**
+ * A secret a transport choice needs, referenced by placeholder. No secret value ever appears in a plan, and the placeholder resolves against the keychain only when a plan is applied.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanSecretPlaceholder".
+ */
+/** @experimental */
+export interface McpPlanSecretPlaceholder {
+  /**
+   * Key the secret is supplied under. Inert untrusted data.
+   */
+  key: string;
+  placeholder: McpPlanSecretReference;
+  /**
+   * Human-readable label from the card. Inert untrusted text.
+   */
+  title?: string;
+}
+/**
+ * An eligible remote-endpoint transport choice. The endpoint is required and package identity cannot be represented.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanTransportChoiceRemote".
+ */
+/** @experimental */
+export interface McpPlanTransportChoiceRemote {
+  /**
+   * Stable identifier for this choice within the plan, used to select it when the plan is applied.
    */
-  clients: string[];
+  choiceId: string;
+  transport: McpPlanRemoteTransport;
+  installMethod: McpPlanRemoteInstallMethod;
   /**
-   * Names of servers with in-flight connection attempts.
+   * Endpoint URL. Inert untrusted data.
    */
-  pendingConnections: string[];
+  endpoint: string;
   /**
-   * Map of server name to recorded connection failure.
+   * Typed values this choice requires, excluding secrets.
    */
-  failedServers: {
-    [k: string]: McpServerFailureInfo | undefined;
-  };
+  requiredValues: McpPlanRequiredValue[];
   /**
-   * Map of server name to recorded pending-auth state.
+   * Secrets this choice requires, referenced by placeholder only.
    */
-  needsAuthServers: {
-    [k: string]: McpServerNeedsAuthInfo | undefined;
-  };
+  secretPlaceholders: McpPlanSecretPlaceholder[];
 }
 /**
- * Recorded MCP server connection failure.
+ * Where a plan would be written.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "McpServerFailureInfo".
+ * via the `definition` "McpPlanTarget".
  */
 /** @experimental */
-export interface McpServerFailureInfo {
+export interface McpPlanTarget {
+  scope: McpPlanScope;
   /**
-   * Failure message produced when the MCP server connection failed.
+   * Configuration key the server would be recorded under within that scope.
    */
-  message: string;
+  configKey: string;
+}
+/**
+ * Outcome of evaluating the planned server against registry and enterprise policy. Evaluation is read-only.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanPolicyResult".
+ */
+/** @experimental */
+export interface McpPlanPolicyResult {
+  decision: McpPlanPolicyDecision;
+  source: McpPlanPolicySource;
   /**
-   * epoch-ms timestamp at which the failure was recorded.
+   * Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
    */
-  timestamp: number;
+  reason?: string;
 }
 /**
- * Recorded MCP server pending-auth state.
+ * One change applying the plan would make, described rather than serialised so the configuration payload stays behind the runtime boundary.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "McpServerNeedsAuthInfo".
+ * via the `definition` "McpPlanConfigurationChange".
  */
 /** @experimental */
-export interface McpServerNeedsAuthInfo {
+export interface McpPlanConfigurationChange {
+  operation: McpPlanConfigurationOperation;
+  scope: McpPlanScope;
   /**
-   * epoch-ms timestamp at which the server signalled it needs authentication.
+   * Configuration key the change applies to.
    */
-  timestamp: number;
+  configKey: string;
+  /**
+   * Names of the configuration fields the change would set, without their values.
+   */
+  changedFields: string[];
+  /**
+   * Secret placeholders the written configuration would reference. The constrained placeholder type cannot carry a literal secret value.
+   */
+  secretReferences: McpPlanSecretReference[];
 }
 /**
  * Server name to check running status for.
@@ -8410,6 +11017,19 @@ export interface McpOauthLoginResult {
    */
   authorizationUrl?: string;
 }
+/**
+ * Remote MCP server name for a passive OAuth status probe.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpOauthProbeRequest".
+ */
+/** @experimental */
+export interface McpOauthProbeRequest {
+  /**
+   * Name of the configured remote MCP server to probe.
+   */
+  serverName: string;
+}
 /**
  * Pending MCP OAuth request id to respond to.
  *
@@ -8436,6 +11056,92 @@ export interface McpOauthRespondResult {
    */
   success: boolean;
 }
+/**
+ * A computed MCP install plan. Nothing has been applied: the plan describes what installing would change, and the plan handle is what a later apply operation would consume.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanInstallPlanned".
+ */
+/** @experimental */
+export interface McpPlanInstallPlanned {
+  /**
+   * Discriminator: a plan was computed and nothing was changed
+   */
+  kind: "planned";
+  plan: McpInstallPlan;
+  negotiated: CatalogNegotiatedContract;
+}
+/**
+ * A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanInstallRequest".
+ */
+/** @experimental */
+export interface McpPlanInstallRequest {
+  contract: CatalogClientContract;
+  source: McpPlanInstallSource;
+  scope?: McpPlanScope;
+}
+/**
+ * Plan from a candidate returned by a previous catalog search.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanInstallSourceCandidate".
+ */
+/** @experimental */
+export interface McpPlanInstallSourceCandidate {
+  kind: McpPlanInstallSourceCandidateKind;
+  /**
+   * Single-use candidate handle. Consumed by this call, so a replay of the same handle is rejected.
+   */
+  candidateHandle: string;
+  /**
+   * The runtime- or authority-minted `searchId` returned with the search that produced this candidate. A search implementation binds it to private candidate-handle context; a planning implementation must verify that context before returning a plan. The unavailable planning implementation in this contract layer validates presence but does not claim the verification has occurred. It identifies a search rather than a person and must never be joined with user identity to re-identify anyone.
+   */
+  searchId: string;
+}
+/**
+ * Plan from a card supplied directly by the caller, without a preceding search.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpPlanInstallSourceCard".
+ */
+/** @experimental */
+export interface McpPlanInstallSourceCard {
+  kind: McpPlanInstallSourceCardKind;
+  card: McpServerCardReference;
+}
+/**
+ * An MCP server card to be retrieved from a URL through the runtime's hardened fetch boundary.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerCardUrl".
+ */
+/** @experimental */
+export interface McpServerCardUrl {
+  kind: McpServerCardUrlKind;
+  mediaType: McpServerCardMediaType;
+  /**
+   * Card URL. Retrieved only through the runtime's hardened boundary, with scheme, credential, address-range, redirect, timeout, and response-size controls applied. Never logged.
+   */
+  url: string;
+}
+/**
+ * An MCP server card supplied inline as an inert document.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerCardEmbedded".
+ */
+/** @experimental */
+export interface McpServerCardEmbedded {
+  kind: McpServerCardEmbeddedKind;
+  mediaType: McpServerCardMediaType;
+  /**
+   * The card document verbatim, treated as inert untrusted bytes. The runtime parses and validates it; the host is not expected to interpret it. Never logged.
+   */
+  data: string;
+}
 /**
  * Registration parameters for an external MCP client.
  *
@@ -8454,25 +11160,47 @@ export interface McpRegisterExternalClientRequest {
    *
    * @internal
    */
-  client: {
-    [k: string]: unknown | undefined;
-  };
+  client: OpaqueInProcessValue;
   /**
    * In-process MCP Transport instance. Marked internal: cannot be serialized across the JSON-RPC boundary.
    *
    * @internal
    */
-  transport: {
-    [k: string]: unknown | undefined;
-  };
+  transport: OpaqueInProcessValue;
   /**
    * In-process server config (MCPServerConfig) paired with the in-process client/transport. Marked internal alongside its companions.
    *
    * @internal
    */
-  config: {
-    [k: string]: unknown | undefined;
+  config: OpaqueInProcessValue;
+}
+/**
+ * In-process MCP reload configuration.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpReloadConfig".
+ */
+/** @experimental */
+/** @internal */
+export interface McpReloadConfig {
+  mcpServers: {
+    [k: string]: McpServerConfig | undefined;
   };
+  disabledServers?: string[];
+  enabledServers?: string[];
+  /**
+   * Server names the CLI enabled for this session via `--enable-mcp-server`.
+   */
+  cliEnabledServers?: string[];
+  mcp3pEnabled?: boolean;
+  includeWorkspaceSources?: boolean;
+  configFilter?: OpaqueInProcessValue;
+  githubMcpToolOptions?: OpaqueInProcessValue;
+  githubMcpUserOverride?: boolean;
+  secretStore?: OpaqueInProcessValue;
+  activeGitHubToken?: string;
+  useCachedToolSnapshots?: boolean;
+  forceRestart?: boolean;
 }
 /**
  * Opaque MCP reload configuration.
@@ -8483,14 +11211,7 @@ export interface McpRegisterExternalClientRequest {
 /** @experimental */
 /** @internal */
 export interface McpReloadWithConfigRequest {
-  /**
-   * Opaque runtime MCP reload configuration. Marked internal: an in-process runtime shape (reloadMcpServers throws over the wire).
-   *
-   * @internal
-   */
-  config: {
-    [k: string]: unknown | undefined;
-  };
+  config: unknown;
 }
 /**
  * Indicates whether the auto-managed `github` MCP server was removed (false when nothing to remove).
@@ -8546,13 +11267,13 @@ export interface McpResource {
    * Resource-level metadata
    */
   _meta?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * Server-provided non-standard descriptor fields preserved from the MCP response
    */
   additionalProperties?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -8583,7 +11304,7 @@ export interface McpResourceIcon {
    * Server-provided non-standard icon fields preserved from the MCP response
    */
   additionalProperties?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -8610,7 +11331,7 @@ export interface McpResourceAnnotations {
    * Server-provided non-standard annotation fields preserved from the MCP response
    */
   additionalProperties?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -8641,7 +11362,7 @@ export interface McpResourceContent {
    * Resource-level metadata (CSP, permissions, etc.)
    */
   _meta?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -8749,13 +11470,13 @@ export interface McpResourceTemplate {
    * Resource-template-level metadata
    */
   _meta?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * Server-provided non-standard descriptor fields preserved from the MCP response
    */
   additionalProperties?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -8800,7 +11521,7 @@ export interface McpRestartServerRequest {
    * Name of the MCP server to restart
    */
   serverName: string;
-  config?: McpServerConfig;
+  config?: McpSerializableServerConfig;
 }
 /**
  * Outcome of an MCP sampling execution: success result, failure error, or cancellation.
@@ -8844,6 +11565,84 @@ export interface McpServer {
    */
   error?: string;
 }
+/**
+ * In-process MCP server configuration used by embedded SDK clients.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpServerConfigMemory".
+ */
+/** @experimental */
+/** @internal */
+export interface McpServerConfigMemory {
+  type: McpServerConfigMemoryType;
+  /**
+   * In-process MCP server instance. This value cannot cross a JSON-RPC boundary.
+   *
+   * @internal
+   */
+  serverInstance: OpaqueInProcessValue;
+  /**
+   * Tools to include. Defaults to all tools if not specified.
+   */
+  tools?: string[];
+  /**
+   * Optional human-readable server name.
+   */
+  displayName?: string;
+  /**
+   * Whether this server is a built-in fallback.
+   */
+  isDefaultServer?: boolean;
+  filterMapping?: FilterMapping;
+  safeForTelemetry?: McpSafeForTelemetry;
+  /**
+   * Timeout in milliseconds for tool discovery and tool calls.
+   */
+  timeout?: number;
+  oidc?: McpServerAuthConfig;
+  deferTools?: McpServerConfigDeferTools;
+  /**
+   * Whether persisted tool snapshots are disabled.
+   */
+  disableToolCache?: boolean;
+  /**
+   * Whether secret masking is disabled for calls to this server.
+   */
+  disableSecretMasking?: boolean;
+  /**
+   * Tool names excluded after the include filter is applied.
+   */
+  excludeTools?: string[];
+  /**
+   * Event types this server receives as Copilot notifications.
+   */
+  events?: string[];
+  /**
+   * Copilot notification types this server may send to the host.
+   */
+  notifications?: string[];
+  source?: McpServerSource;
+  /**
+   * Plugin that provided this server.
+   */
+  sourcePlugin?: string;
+  /**
+   * Version of the plugin that provided this server.
+   */
+  sourcePluginVersion?: string;
+  /**
+   * Whether the providing plugin uses the Open Plugin Spec.
+   */
+  sourcePluginSpec?: boolean;
+  /**
+   * Source file path recorded while loading the config.
+   */
+  sourcePath?: string;
+  /**
+   * Configuration warnings recorded while loading the server.
+   */
+  configWarnings?: string[];
+}
 /**
  * MCP servers configured for the session, with their connection status and host-level state.
  *
@@ -8890,7 +11689,7 @@ export interface McpStartServerRequest {
    * Name of the MCP server to start
    */
   serverName: string;
-  config?: McpServerConfig;
+  config?: McpSerializableServerConfig;
 }
 /**
  * MCP server startup filtering result.
@@ -8908,6 +11707,10 @@ export interface McpStartServersResult {
    * Non-default servers allowed by policy
    */
   allowedServers?: McpAllowedServer[];
+  /**
+   * Servers whose connection attempt failed.
+   */
+  failedServers?: McpFailedServer[];
 }
 /**
  * Server name for an individual MCP server stop.
@@ -8922,6 +11725,19 @@ export interface McpStopServerRequest {
    */
   serverName: string;
 }
+/**
+ * Metadata controlling an MCP task's lifetime.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpTaskMetadata".
+ */
+/** @experimental */
+export interface McpTaskMetadata {
+  /**
+   * Task time-to-live.
+   */
+  ttl?: number;
+}
 /**
  * Server name identifying the external client to remove.
  *
@@ -9218,8 +12034,25 @@ export interface Model {
    * Supported reasoning effort levels (only present if model supports reasoning effort)
    */
   supportedReasoningEfforts?: string[];
+  /**
+   * Default reasoning effort level (only present if model supports reasoning effort)
+   */
+  defaultReasoningEffort?: string;
+  /**
+   * Context-window tiers this model offers, when the provider advertises them independently of tiered token pricing. Copilot models carry their tiers in `billing.tokenPrices`; a provider that has no pricing to publish (an agent host reached over AHP, for example) declares them here instead, so the model picker can still offer the tier toggle.
+   */
+  supportedContextTiers?: string[];
   modelPickerCategory?: ModelPickerCategory;
   modelPickerPriceCategory?: ModelPickerPriceCategory;
+  warningText?: ModelWarningText;
+  /**
+   * Informational notices the service published for this model, such as an upcoming change or a recommended alternative. Present only when the service published at least one notice. Hosts should surface these without implying anything is wrong with the model.
+   */
+  infoMessages?: ModelMessage[];
+  /**
+   * Warnings the service published for this model, such as a deprecated client version. Present only when the service published at least one warning. The model remains usable; hosts should surface these as advisory rather than blocking.
+   */
+  warningMessages?: ModelMessage[];
 }
 /**
  * Model capabilities and limits
@@ -9355,6 +12188,10 @@ export interface ModelBillingTokenPrices {
    * AI Credits cost per billing batch of cache-write (cache creation) tokens.
    */
   cacheWritePrice?: number;
+  /**
+   * AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.
+   */
+  cacheWrite1hPrice?: number;
   /**
    * Number of tokens per standard billing batch
    */
@@ -9399,6 +12236,10 @@ export interface ModelBillingTokenPricesLongContext {
    * AI Credits cost per billing batch of cache-write (cache creation) tokens.
    */
   cacheWritePrice?: number;
+  /**
+   * AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.
+   */
+  cacheWrite1hPrice?: number;
   /**
    * @deprecated
    * Use maxPromptTokens instead. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.
@@ -9434,6 +12275,73 @@ export interface ModelBillingPromo {
    */
   message?: string;
 }
+/**
+ * Service-published warning text that hosts should display when presenting a model.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ModelWarningText".
+ */
+/** @experimental */
+export interface ModelWarningText {
+  /**
+   * Data-retention warning for the model. The text may contain Markdown links and should be rendered as Markdown when supported.
+   */
+  dataRetention?: string;
+}
+/**
+ * A service-published message about a model, carrying a stable machine-readable code alongside human-readable text.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ModelMessage".
+ */
+/** @experimental */
+export interface ModelMessage {
+  /**
+   * Stable machine-readable identifier for the message, such as `client_version_deprecated`. Hosts can key custom presentation off this; unrecognized codes should fall back to displaying `message`.
+   */
+  code: string;
+  /**
+   * Human-readable message text intended for display to the user.
+   */
+  message: string;
+}
+/**
+ * Managed, repository, and CLI model overrides to overlay onto the session at startup.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ModelApplyStartupOverlayRequest".
+ */
+/** @experimental */
+export interface ModelApplyStartupOverlayRequest {
+  /**
+   * Model required by device-managed policy, when configured.
+   */
+  deviceManagedModel?: string;
+  /**
+   * Model required by server-managed policy, when configured.
+   */
+  serverManagedModel?: string;
+  /**
+   * Model selected by repository settings, when configured.
+   */
+  repoModel?: string;
+  /**
+   * Reasoning effort selected by repository settings, when configured.
+   */
+  repoReasoningEffort?: string;
+  /**
+   * Context tier selected by repository settings, when configured.
+   */
+  repoContextTier?: string;
+  /**
+   * Model explicitly selected by the CLI, when provided.
+   */
+  cliModel?: string;
+  /**
+   * Whether the overlay is being applied while resuming a deferred session.
+   */
+  deferredResume?: boolean;
+}
 /**
  * Optional capability overrides (vision, tool_calls, reasoning, etc.).
  *
@@ -9515,9 +12423,43 @@ export interface ModelCapabilitiesOverrideLimitsVision {
 /** @experimental */
 export interface ModelList {
   /**
-   * List of available models with full metadata
+   * List of available models with full metadata
+   */
+  models: Model[];
+}
+
+/** @experimental */
+export interface ModelPickerPersistenceRequest {
+  settingsContext: ModelPickerSettingsContext;
+  /**
+   * Whether reasoning effort was explicitly selected and should be persisted.
+   */
+  reasoningEffortExplicit?: boolean;
+  /**
+   * Whether context tier was explicitly selected and should be persisted.
+   */
+  contextTierExplicit?: boolean;
+}
+/**
+ * Filesystem and environment context used to resolve model-picker settings.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ModelPickerSettingsContext".
+ */
+/** @experimental */
+export interface ModelPickerSettingsContext {
+  /**
+   * Optional Copilot configuration directory containing persisted settings.
+   */
+  configDir?: string;
+  /**
+   * User home directory used when resolving persisted settings.
    */
-  models: Model[];
+  homeDirectory: string;
+  /**
+   * Environment variables consulted while resolving model-picker settings.
+   */
+  environment: {};
 }
 /**
  * Reasoning effort level to apply to the currently selected model.
@@ -9549,10 +12491,30 @@ export interface ModelSetReasoningEffortResult {
 /** @experimental */
 export interface ModelsListRequest {
   /**
-   * GitHub token for per-user model listing. When provided, resolves this token to determine the user's Copilot plan and available models instead of using the global auth.
+   * Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used.
+   */
+  selectionId?: string;
+  /**
+   * GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account.
    */
   gitHubToken?: string;
 }
+
+/** @experimental */
+export interface ModelSwitchConfirmation {
+  /**
+   * Display name of the model that requires compaction confirmation.
+   */
+  targetModelDisplayName: string;
+  /**
+   * Current conversation token count before switching models.
+   */
+  currentTokens: number;
+  /**
+   * Target model token limit used by the compaction preflight.
+   */
+  targetLimit: number;
+}
 /**
  * Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.
  *
@@ -9573,10 +12535,32 @@ export interface ModelSwitchToRequest {
   verbosity?: Verbosity;
   modelCapabilities?: ModelCapabilitiesOverride;
   contextTier?: ContextTier;
+  source?: ModelChangeSource;
   /**
    * When true, defer this switch (enqueue it) if another model change is already queued, even when no turn is active — so it drains last (FIFO) and wins over the already-queued change. Intended for genuine user-initiated model selections; internal restore/reapply switches omit it and apply immediately when no turn is active. When no other model change is queued this has no effect (a switch still applies immediately unless a turn is active).
    */
   deferIfModelChangeQueued?: boolean;
+  /**
+   * Explicit response to a model-switch compaction preflight. Omit to request a confirmation projection when compaction is necessary.
+   */
+  compactionDecision?: string;
+  /**
+   * When true, evaluate context-window compaction policy before applying the switch.
+   */
+  runCompactionPreflight?: boolean;
+  /**
+   * Optional repository settings scope to persist after the switch commits.
+   */
+  repoScope?: string;
+  /**
+   * Settings scope used when persisting the selected model.
+   */
+  modelChangeScope?: string;
+  /**
+   * Require the target to be currently available and enabled before applying the switch.
+   */
+  requireAvailable?: boolean;
+  pickerPersistence?: ModelPickerPersistenceRequest;
 }
 /**
  * The model identifier active on the session after the switch.
@@ -9594,6 +12578,27 @@ export interface ModelSwitchToResult {
    * True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains.
    */
   deferred?: boolean;
+  /**
+   * Lifecycle result for the requested switch
+   */
+  status?: string;
+  confirmation?: ModelSwitchConfirmation;
+  /**
+   * Persistence failure encountered after applying the model switch.
+   */
+  persistenceError?: string;
+  /**
+   * User-facing outcome message for the model switch.
+   */
+  message?: string;
+  /**
+   * User-facing warning produced while applying the model switch.
+   */
+  warning?: string;
+  /**
+   * Deprecation warnings associated with the selected model or options.
+   */
+  deprecationWarnings?: string[];
 }
 /**
  * Agent interaction mode to apply to the session.
@@ -9604,9 +12609,97 @@ export interface ModelSwitchToResult {
 /** @experimental */
 export interface ModeSetRequest {
   mode: SessionMode;
+  /**
+   * Session whose plan-mode base state should be inherited.
+   */
+  inheritPlanBaseFromSessionId?: string;
+  /**
+   * Whether a dedicated plan model is configured.
+   */
+  planModelConfigured?: boolean;
+  /**
+   * Dedicated model to use in plan mode, when configured.
+   */
+  planModel?: string;
+  /**
+   * Reasoning effort to use with the dedicated plan model.
+   */
+  planReasoningEffort?: string;
+  /**
+   * Context tier to use with the dedicated plan model.
+   */
+  planContextTier?: string;
+  /**
+   * Explicit response to a model-switch compaction preflight.
+   */
+  compactionDecision?: string;
+  /**
+   * Whether leaving plan mode should restore the session's previous model.
+   */
+  restorePlanModel?: boolean;
+  /**
+   * Whether the selected plan model should be persisted.
+   */
+  persistPlanSelection?: boolean;
+  pickerSettingsContext?: ModelPickerSettingsContext;
+  /**
+   * Action to perform when leaving plan mode.
+   */
+  planExitAction?: string;
+}
+/**
+ * Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ModeSetResult".
+ */
+/** @experimental */
+export interface ModeSetResult {
+  /**
+   * Lifecycle status of the requested mode change.
+   */
+  status: string;
+  /**
+   * Whether applying the mode changed the active model.
+   */
+  modelChanged: boolean;
+  confirmation?: ModelSwitchConfirmation;
+  /**
+   * User-facing warning produced while applying the mode change.
+   */
+  warning?: string;
+  /**
+   * User-facing outcome message for the model switch triggered by the mode change.
+   */
+  message?: string;
+  /**
+   * Deprecation warnings associated with the model selected by the mode change.
+   */
+  deprecationWarnings?: string[];
+  /**
+   * Whether the host must defer implementing the requested mode change.
+   */
+  deferImplementation?: boolean;
+  /**
+   * Whether the host should arm an interactive continuation after the mode change.
+   */
+  armInteractiveContinuation?: boolean;
 }
 /**
- * A named BYOK provider connection (transport + credentials).
+ * Result of moving in-flight MCP loading to the background.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "MoveMcpLoadingToBackgroundResult".
+ */
+/** @experimental */
+export interface MoveMcpLoadingToBackgroundResult {
+  /**
+   * Whether an in-flight MCP load was moved to the background, releasing turns that were waiting on it. False when no MCP load was in flight or the waiting turns had already been released.
+   */
+  movedToBackground: boolean;
+}
+/**
+ * External SDK input for a named custom model provider. Ingested by the native protocol boundary before host dispatch.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "NamedProviderConfig".
@@ -9614,33 +12707,33 @@ export interface ModeSetRequest {
 /** @experimental */
 export interface NamedProviderConfig {
   /**
-   * Stable identifier referenced by BYOK model definitions. Must not contain '/'.
+   * Unique provider name used to qualify model selection IDs.
    */
   name: string;
   type?: ProviderConfigType;
   wireApi?: ProviderConfigWireApi;
   transport?: ProviderConfigTransport;
   /**
-   * API endpoint URL.
+   * Base URL for provider API requests.
    */
   baseUrl: string;
   /**
-   * API key. Optional for local providers like Ollama.
+   * Static API key used to authenticate provider requests.
    */
   apiKey?: string;
   /**
-   * Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set.
+   * Static bearer token used to authenticate provider requests.
    */
   bearerToken?: string;
   azure?: ProviderConfigAzure;
   /**
-   * Custom HTTP headers to include in all outbound requests to the provider.
+   * Additional HTTP headers included with provider requests.
    */
   headers?: {
     [k: string]: string | undefined;
   };
   /**
-   * When true, the SDK client supplies bearer tokens on demand: the runtime calls the client-session `providerToken.getToken` callback before each request and applies the returned token as an `Authorization: Bearer <token>` header. This is the bearer/OAuth scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens (including Anthropic's), not a provider-specific API-key header such as Anthropic's `x-api-key`. The token-acquiring function itself stays on the SDK side and is never serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`, the callback takes precedence: the runtime applies the token returned by `providerToken.getToken` as the `Authorization: Bearer` header for each request and does not send the static credential.
+   * Whether the host supplies bearer tokens dynamically.
    */
   hasBearerTokenProvider?: boolean;
 }
@@ -9717,8 +12810,14 @@ export interface NameSetRequest {
  */
 /** @experimental */
 export interface OptionsUpdateAdditionalContentExclusionPolicy {
+  /**
+   * Content-exclusion rules to apply.
+   */
   rules: OptionsUpdateAdditionalContentExclusionPolicyRule[];
-  last_updated_at: unknown;
+  /**
+   * Opaque policy update timestamp supplied by the host.
+   */
+  last_updated_at: JsonValue;
   scope: OptionsUpdateAdditionalContentExclusionPolicyScope;
 }
 /**
@@ -9729,8 +12828,17 @@ export interface OptionsUpdateAdditionalContentExclusionPolicy {
  */
 /** @experimental */
 export interface OptionsUpdateAdditionalContentExclusionPolicyRule {
+  /**
+   * Path patterns covered by this rule.
+   */
   paths: string[];
+  /**
+   * Conditions of which at least one must match.
+   */
   ifAnyMatch?: string[];
+  /**
+   * Conditions none of which may match.
+   */
   ifNoneMatch?: string[];
   source: OptionsUpdateAdditionalContentExclusionPolicyRuleSource;
 }
@@ -9742,7 +12850,13 @@ export interface OptionsUpdateAdditionalContentExclusionPolicyRule {
  */
 /** @experimental */
 export interface OptionsUpdateAdditionalContentExclusionPolicyRuleSource {
+  /**
+   * Name of the policy source.
+   */
   name: string;
+  /**
+   * Type of the policy source.
+   */
   type: string;
 }
 /**
@@ -9969,6 +13083,29 @@ export interface PermissionDecisionApproveForSessionApprovalExtensionPermissionA
    */
   extensionName: string;
 }
+/**
+ * Session-scoped approval details for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionDecisionApproveForSessionApprovalExtensionEnvAccess".
+ */
+/** @experimental */
+export interface PermissionDecisionApproveForSessionApprovalExtensionEnvAccess {
+  /**
+   * Approval covering an extension's request to read sensitive environment variables.
+   */
+  kind: "extension-env-access";
+  /**
+   * Extension name.
+   */
+  extensionName: string;
+  /**
+   * Names of the sensitive environment variables this approval covers. Values are never persisted.
+   *
+   * @minItems 1
+   */
+  environmentVariables: [string, ...string[]];
+}
 /**
  * Permission-decision request variant to approve and persist a permission for a project location, with approval details and location key.
  *
@@ -10149,6 +13286,29 @@ export interface PermissionDecisionApproveForLocationApprovalExtensionPermission
    */
   extensionName: string;
 }
+/**
+ * Location-scoped approval details for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionDecisionApproveForLocationApprovalExtensionEnvAccess".
+ */
+/** @experimental */
+export interface PermissionDecisionApproveForLocationApprovalExtensionEnvAccess {
+  /**
+   * Approval covering an extension's request to read sensitive environment variables.
+   */
+  kind: "extension-env-access";
+  /**
+   * Extension name.
+   */
+  extensionName: string;
+  /**
+   * Names of the sensitive environment variables this approval covers. Values are never persisted.
+   *
+   * @minItems 1
+   */
+  environmentVariables: [string, ...string[]];
+}
 /**
  * Permission-decision request variant to permanently approve a URL domain across sessions.
  *
@@ -10351,6 +13511,19 @@ export interface PermissionDecisionDeniedByPermissionRequestHook {
    */
   interrupt?: boolean;
 }
+/**
+ * Optional informational context describing how and where the permission decision was made. This does not affect permission behavior.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionDecisionContext".
+ */
+/** @experimental */
+export interface PermissionDecisionContext {
+  outcome: PermissionDecisionOutcome;
+  source: PermissionDecisionSource;
+  surface: PermissionDecisionSurface;
+  responseCapability?: PermissionResponseCapability;
+}
 /**
  * Pending permission request ID and the decision to apply (approve/reject and scope).
  *
@@ -10364,6 +13537,7 @@ export interface PermissionDecisionRequest {
    */
   requestId: string;
   result: PermissionDecision;
+  decisionContext?: PermissionDecisionContext;
 }
 /**
  * Location-scoped tool approval to persist.
@@ -10541,6 +13715,29 @@ export interface PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAc
    */
   extensionName: string;
 }
+/**
+ * Location-persisted tool approval details for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess".
+ */
+/** @experimental */
+export interface PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess {
+  /**
+   * Approval covering an extension's request to read sensitive environment variables.
+   */
+  kind: "extension-env-access";
+  /**
+   * Extension name.
+   */
+  extensionName: string;
+  /**
+   * Names of the sensitive environment variables this approval covers. Values are never persisted.
+   *
+   * @minItems 1
+   */
+  environmentVariables: [string, ...string[]];
+}
 /**
  * Working directory to load persisted location permissions for.
  *
@@ -10620,7 +13817,7 @@ export interface PermissionLocationResolveResult {
 /** @experimental */
 export interface PermissionPathsAddParams {
   /**
-   * Directory to add to the allow-list. The runtime resolves and validates the path before adding.
+   * Directory to add to the allow-list. The runtime resolves and validates the path before adding, then loads conventional `.github/skills/` and `.github/agents/` definitions under it when their subsystem gates are enabled. Adding the directory is therefore also a trust decision for configuration stored there.
    */
   path: string;
 }
@@ -10663,7 +13860,7 @@ export interface PermissionPathsConfig {
    */
   unrestricted?: boolean;
   /**
-   * Additional directories to allow tool access to (in addition to the session's working directory). When `unrestricted` is true, these are still pre-populated on the UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention completion).
+   * Additional directories to allow tool access to (in addition to the session's working directory). Conventional `.github/skills/` and `.github/agents/` definitions under them also join the session catalogs when their subsystem gates are enabled, so supplying a directory is a trust decision for configuration stored there. When `unrestricted` is true, these are still pre-populated on the UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention completion).
    */
   additionalDirectories?: string[];
   /**
@@ -10782,8 +13979,14 @@ export interface PermissionRulesSet {
  */
 /** @experimental */
 export interface PermissionsConfigureAdditionalContentExclusionPolicy {
+  /**
+   * Content-exclusion rules to apply.
+   */
   rules: PermissionsConfigureAdditionalContentExclusionPolicyRule[];
-  last_updated_at: unknown;
+  /**
+   * Opaque policy update timestamp supplied by the host.
+   */
+  last_updated_at: JsonValue;
   scope: PermissionsConfigureAdditionalContentExclusionPolicyScope;
 }
 /**
@@ -10794,8 +13997,17 @@ export interface PermissionsConfigureAdditionalContentExclusionPolicy {
  */
 /** @experimental */
 export interface PermissionsConfigureAdditionalContentExclusionPolicyRule {
+  /**
+   * Path patterns covered by this rule.
+   */
   paths: string[];
+  /**
+   * Conditions of which at least one must match.
+   */
   ifAnyMatch?: string[];
+  /**
+   * Conditions none of which may match.
+   */
   ifNoneMatch?: string[];
   source: PermissionsConfigureAdditionalContentExclusionPolicyRuleSource;
 }
@@ -10807,7 +14019,13 @@ export interface PermissionsConfigureAdditionalContentExclusionPolicyRule {
  */
 /** @experimental */
 export interface PermissionsConfigureAdditionalContentExclusionPolicyRuleSource {
+  /**
+   * Name of the policy source.
+   */
   name: string;
+  /**
+   * Type of the policy source.
+   */
   type: string;
 }
 /**
@@ -10881,10 +14099,20 @@ export interface PermissionsFolderTrustAddTrustedResult {
  * No parameters.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "PermissionsGetAllowAllRequest".
+ * via the `definition` "PermissionsGetModeRequest".
+ */
+/** @experimental */
+export interface PermissionsGetModeRequest {}
+/**
+ * Current permission mode.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionsGetModeResult".
  */
 /** @experimental */
-export interface PermissionsGetAllowAllRequest {}
+export interface PermissionsGetModeResult {
+  mode: PermissionMode;
+}
 /**
  * Indicates whether the operation succeeded.
  *
@@ -11015,50 +14243,60 @@ export interface PermissionsResetSessionApprovalsResult {
   success: boolean;
 }
 /**
- * Allow-all mode to apply for the session.
+ * Allow-all toggle for tool permission requests, with an optional telemetry source.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "PermissionsSetAllowAllRequest".
+ * via the `definition` "PermissionsSetApproveAllRequest".
  */
 /** @experimental */
-export interface PermissionsSetAllowAllRequest {
-  mode?: PermissionsAllowAllMode;
+export interface PermissionsSetApproveAllRequest {
   /**
-   * Legacy full allow-all toggle. Prefer `mode`; when `mode` is omitted, `enabled: true` is treated as `mode: "on"` and any other value is treated as `mode: "off"`.
+   * Whether to auto-approve all tool permission requests
    */
-  enabled?: boolean;
+  enabled: boolean;
+  source?: PermissionsSetApproveAllSource;
+}
+/**
+ * Indicates whether the operation succeeded.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionsSetApproveAllResult".
+ */
+/** @experimental */
+export interface PermissionsSetApproveAllResult {
   /**
-   * Optional model id for the `auto` mode auto-approval LLM judging. Only meaningful when `mode` is `auto`; ignored otherwise. When omitted, the session resolves a default judge model: `gpt-5.5` for CAPI sessions and the session's active model for BYOK sessions.
+   * Whether the operation succeeded
    */
-  model?: string;
-  source?: PermissionsSetAllowAllSource;
+  success: boolean;
 }
 /**
- * Allow-all toggle for tool permission requests, with an optional telemetry source.
+ * Permission mode to apply for the session.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "PermissionsSetApproveAllRequest".
+ * via the `definition` "PermissionsSetModeRequest".
  */
 /** @experimental */
-export interface PermissionsSetApproveAllRequest {
+export interface PermissionsSetModeRequest {
+  mode: PermissionMode;
   /**
-   * Whether to auto-approve all tool permission requests
+   * Optional judge model id for assisted mode. When omitted, the session resolves the provider default: `gpt-5.5` for CAPI sessions and the active session model for BYOK sessions.
    */
-  enabled: boolean;
-  source?: PermissionsSetApproveAllSource;
+  assistedApprovalModel?: string;
+  source?: PermissionModeSource;
 }
 /**
- * Indicates whether the operation succeeded.
+ * Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "PermissionsSetApproveAllResult".
+ * via the `definition` "PermissionsSetModeResult".
  */
 /** @experimental */
-export interface PermissionsSetApproveAllResult {
+export interface PermissionsSetModeResult {
   /**
    * Whether the operation succeeded
    */
   success: boolean;
+  mode: PermissionMode;
 }
 /**
  * Toggles whether permission prompts should be bridged into session events for this client.
@@ -11176,7 +14414,7 @@ export interface PlanReadResult {
 /** @experimental */
 export interface PlanReadSqlTodosResult {
   /**
-   * Rows from the session SQL todos table, ordered by creation time and id.
+   * Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables.
    */
   rows: PlanSqlTodosRow[];
 }
@@ -11204,6 +14442,10 @@ export interface PlanSqlTodosRow {
    * Todo status.
    */
   status?: string;
+  /**
+   * Todo creation time, as stored by the session SQL schema's `datetime('now')` default: `YYYY-MM-DD HH:MM:SS` in UTC. Lets clients attribute todos to the work item that created them (e.g. scoping a goal's progress to the todos it produced) rather than to the whole session.
+   */
+  createdAt?: string;
 }
 /**
  * Todo rows + dependency edges read from the session SQL database.
@@ -11214,7 +14456,7 @@ export interface PlanSqlTodosRow {
 /** @experimental */
 export interface PlanReadSqlTodosWithDependenciesResult {
   /**
-   * Rows from the session SQL todos table, ordered by creation time and id. Empty when no database, no todos table, or the SELECT failed.
+   * Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables. Empty when no database, no todos table, or the SELECT failed.
    */
   rows: PlanSqlTodosRow[];
   /**
@@ -11325,6 +14567,21 @@ export interface PluginListResult {
    */
   plugins: InstalledPluginInfo[];
 }
+/**
+ * Trusted built-in plugin directories to use for this runtime process.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PluginsBuiltinSetRequest".
+ */
+/** @experimental */
+export interface PluginsBuiltinSetRequest {
+  /**
+   * Complete replacement set of trusted built-in plugin directories. Every entry must be an absolute local filesystem path no longer than 4096 characters.
+   *
+   * @maxItems 64
+   */
+  paths: string[];
+}
 /**
  * Plugin names (or specs) to disable.
  *
@@ -11524,6 +14781,52 @@ export interface PluginUpdateResult {
    */
   skillsInstalled: number;
 }
+/**
+ * Serializable definition of a caller-implemented tool whose execution is handled over the SDK connection.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ProtocolExternalToolDefinition".
+ */
+/** @experimental */
+export interface ProtocolExternalToolDefinition {
+  /**
+   * Unique model-visible tool name.
+   */
+  name: string;
+  /**
+   * Model-visible explanation of what the tool does.
+   */
+  description: string;
+  /**
+   * Optional human-readable display title.
+   */
+  title?: string;
+  /**
+   * JSON Schema describing the tool's input arguments.
+   */
+  parameters?: {
+    [k: string]: JsonValue | undefined;
+  };
+  /**
+   * Whether this definition replaces a built-in tool with the same name.
+   */
+  overridesBuiltInTool?: boolean;
+  /**
+   * Whether execution bypasses the normal tool permission prompt.
+   */
+  skipPermission?: boolean;
+  defer?: ProtocolExternalToolDefer;
+  /**
+   * Whether the tool executes commands in a terminal.
+   */
+  isTerminal?: boolean;
+  /**
+   * Optional caller-defined metadata associated with the tool.
+   */
+  metadata?: {
+    [k: string]: JsonValue | undefined;
+  };
+}
 /**
  * BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
  *
@@ -11554,7 +14857,7 @@ export interface ProviderModelConfig {
    */
   id: string;
   /**
-   * Name of the NamedProviderConfig that serves this model.
+   * Name of the configured provider that serves this model.
    */
   provider: string;
   /**
@@ -11594,7 +14897,7 @@ export interface ProviderAddResult {
   /**
    * Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.
    */
-  models: unknown[];
+  models: JsonValue[];
 }
 /**
  * Custom model-provider configuration (BYOK).
@@ -11624,6 +14927,11 @@ export interface ProviderConfig {
    * Well-known model ID used for capability lookup. When set, agent behavior config and token limits are inferred from this model.
    */
   modelId?: string;
+  modelCapabilities?: ModelCapabilitiesOverride;
+  /**
+   * Provider name used for model and telemetry attribution.
+   */
+  providerName?: string;
   /**
    * The model identifier sent to the provider API for inference (the "wire" model), as opposed to modelId which is the well-known base.
    */
@@ -11716,7 +15024,7 @@ export interface ProviderTokenAcquireRequest {
    */
   sessionId: string;
   /**
-   * Name of the BYOK provider needing a token. For the legacy whole-session `provider` this is the implicit provider name; for named providers it is `NamedProviderConfig.name`.
+   * Name of the BYOK provider needing a token. For the legacy whole-session provider this is the implicit provider name; for named providers it is the configured provider name.
    */
   providerName: string;
 }
@@ -12229,9 +15537,7 @@ export interface QueueConsumeSystemNotificationsRequest {
   /**
    * Opaque runtime-owned filter object.
    */
-  filter: {
-    [k: string]: unknown | undefined;
-  };
+  filter: JsonValue;
 }
 /**
  * Inputs for marking session.idle deferred in native state.
@@ -12254,6 +15560,9 @@ export interface QueueDeferSessionIdleRequest {
  */
 /** @experimental */
 export interface QueueDuplicateAtRequest {
+  /**
+   * Stable opaque ID of the queued item to duplicate.
+   */
   id: string;
 }
 /**
@@ -12474,6 +15783,10 @@ export interface QueuePendingItemsResult {
    * Display text for messages currently in the immediate steering queue (interjections sent during a running turn).
    */
   steeringMessages: string[];
+  /**
+   * How many leading entries of `steeringMessages` have already been folded into the running turn (and so have an emitted `user.message`), as opposed to still waiting for one. Absent for hosts that do not distinguish the two.
+   */
+  inFlightSteeringCount?: number;
 }
 /**
  * Parameters for removing a queued item by stable id.
@@ -12483,6 +15796,9 @@ export interface QueuePendingItemsResult {
  */
 /** @experimental */
 export interface QueueRemoveAtRequest {
+  /**
+   * Stable opaque ID of the queued item to remove.
+   */
   id: string;
 }
 /**
@@ -12519,6 +15835,9 @@ export interface QueueRemoveMostRecentResult {
  */
 /** @experimental */
 export interface QueueSendNowRequest {
+  /**
+   * Stable opaque ID of the queued item to steer into the live turn.
+   */
   id: string;
 }
 /**
@@ -12542,6 +15861,9 @@ export interface QueueSendNowResult {
  */
 /** @experimental */
 export interface QueueSetDrainPausedRequest {
+  /**
+   * Whether queued-lane draining should be paused.
+   */
   paused: boolean;
 }
 /**
@@ -12577,8 +15899,17 @@ export interface QueueSnapshotResult {
  */
 /** @experimental */
 export interface QueueUpdateTextRequest {
+  /**
+   * Stable opaque ID of the queued item to edit.
+   */
   id: string;
+  /**
+   * Replacement prompt sent to the model.
+   */
   prompt: string;
+  /**
+   * Optional replacement prompt displayed to the user.
+   */
   displayPrompt?: string;
 }
 /**
@@ -12640,9 +15971,7 @@ export interface RegisterExtensionToolsParams {
    *
    * @internal
    */
-  loader: {
-    [k: string]: unknown | undefined;
-  };
+  loader: OpaqueInProcessValue;
   options?: SessionsRegisterExtensionToolsOnSessionOptions;
 }
 /**
@@ -12658,9 +15987,7 @@ export interface SessionsRegisterExtensionToolsOnSessionOptions {
    *
    * @internal
    */
-  enabled?: {
-    [k: string]: unknown | undefined;
-  };
+  enabled?: OpaqueInProcessValue;
 }
 /**
  * Handle for releasing the extension tool registration.
@@ -12678,9 +16005,7 @@ export interface RegisterExtensionToolsResult {
    *
    * @internal
    */
-  unsubscribe: {
-    [k: string]: unknown | undefined;
-  };
+  unsubscribe: OpaqueInProcessValue;
 }
 /**
  * Opaque handle previously returned by `registerInterest` to release.
@@ -12797,13 +16122,11 @@ export interface RemoteControlStatusActive {
    */
   isSteerable: boolean;
   /**
-   * In-process prompt-manager handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, the same bidirectional prompt-routing handshake is expressed via dedicated remote-control RPCs (register/resolve) rather than a shared in-process object.
+   * In-process prompt-manager handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. Retained as an optional compatibility field; native remote control does not populate or consume it.
    *
    * @internal
    */
-  promptManager?: {
-    [k: string]: unknown | undefined;
-  };
+  promptManager?: OpaqueInProcessValue;
   /**
    * True while a read-only/session-sync export is deferred, awaiting the first `user.message` before its MC session exists. Marked internal: this field is excluded from the public SDK surface and is populated only on the CLI in-process path.
    *
@@ -13008,6 +16331,11 @@ export interface RemoteSessionMetadataValue {
    * Server-side task state returned by GitHub.
    */
   state?: string;
+  hostStatus?: RemoteSessionHostStatus;
+  /**
+   * Host-supplied human description of what the session is doing right now ("running tests", "waiting for approval"). Optional in the protocol and absent on hosts that do not publish it, so never rely on it -- it enriches `hostStatus`, it does not replace it.
+   */
+  hostActivity?: string;
 }
 /**
  * Repository context for the remote session.
@@ -13047,18 +16375,11 @@ export interface SandboxConfig {
    * Whether to auto-add the current working directory to readwritePaths. Default: true.
    */
   addCurrentWorkingDirectory?: boolean;
+  auth?: SandboxConfigAuth;
   /**
-   * Whether to inject the Copilot GitHub token as an `http.<host>.extraheader` so authenticated HTTPS git works inside the sandbox without the shell-based credential helper the sandbox blocks. Default: false (opt-in).
+   * Whether to auto-grant read access to the tool directories discovered on PATH and in toolchain environment variables (GOROOT, CARGO_HOME, JAVA_HOME, VIRTUAL_ENV, and similar), and to common developer-tool caches, registries, and toolchains in their default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and up-front creation of) the scratch caches builds write on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so builds work without extra configuration; a relocated CARGO_HOME additionally gets its Cargo lock files granted read-write. Set to false to disable every grant listed above: user-installed toolchains (rustup, nvm, pyenv, conda, pipx) then need explicit userPolicy.filesystem entries — readonlyPaths to read them, plus readwriteFiles for a relocated CARGO_HOME's .package-cache and .global-cache, which Cargo locks on every build. Only these developer-tool grants are affected: the working directory (see addCurrentWorkingDirectory), temporary storage, session log paths, and system locations follow their own rules and stay granted, so commands still run. Default: true (enabled by default; set to false to opt out).
    */
-  gitAuth?: boolean;
-  /**
-   * Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the OS keyring the sandbox blocks. Default: false (opt-in).
-   */
-  ghAuth?: boolean;
-  /**
-   * Whether to auto-grant read access to common developer-tool caches, registries, and toolchains in their default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and, on Unix, up-front creation of) the scratch caches builds write on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so builds work without exporting CARGO_HOME/GOPATH/etc. Default: true (enabled by default; set to false to opt out).
-   */
-  allowDevToolCaches?: boolean;
+  allowDevToolAccess?: boolean;
 }
 /**
  * User-managed sandbox policy fragment merged into the auto-discovered base policy.
@@ -13173,6 +16494,23 @@ export interface SandboxConfigUserPolicyExperimentalSeatbelt {
    */
   keychainAccess?: boolean;
 }
+/**
+ * Credential-injection capability flags applied while the sandbox is enabled. For the same capability independent of sandboxing, and matched to the credential's GitHub host, see `shell.credentials`; the two are additive.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxConfigAuth".
+ */
+/** @experimental */
+export interface SandboxConfigAuth {
+  /**
+   * Whether to inject git credentials as an `http.<url>.extraheader` so authenticated HTTPS git works inside the sandbox without the shell-based credential helper the sandbox blocks. github.com is served by the Copilot token; every other forge (Azure DevOps, GitHub Enterprise Server, GitLab, ...) by a credential the host resolves from the user's own helper before the sandbox is applied. Default: false (opt-in).
+   */
+  git?: boolean;
+  /**
+   * Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the OS keyring the sandbox blocks. Default: false (opt-in).
+   */
+  gh?: boolean;
+}
 /**
  * Register an absolute-time scheduled prompt.
  *
@@ -13615,15 +16953,11 @@ export interface SendSystemNotificationRequest {
   /**
    * Optional structured notification kind.
    */
-  kind?: {
-    [k: string]: unknown | undefined;
-  };
+  kind?: JsonValue;
   /**
    * Internal delivery options, including passive policy.
    */
-  options?: {
-    [k: string]: unknown | undefined;
-  };
+  options?: JsonValue;
 }
 /**
  * Agents discovered across user, project, plugin, and remote sources.
@@ -13663,6 +16997,10 @@ export interface ServerSkill {
    * Unique identifier for the skill
    */
   name: string;
+  /**
+   * Canonical slash command name used to invoke the skill, without the leading '/'
+   */
+  commandName?: string;
   /**
    * Description of what the skill does
    */
@@ -13723,6 +17061,41 @@ export interface SessionActivity {
    */
   hasActiveWork: boolean;
 }
+/**
+ * Internal GitHub login parameters.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionAuthLoginRequest".
+ */
+/** @experimental */
+export interface SessionAuthLoginRequest {
+  /**
+   * GitHub host URL
+   */
+  host: string;
+  /**
+   * GitHub login
+   */
+  login: string;
+  /**
+   * GitHub authentication token
+   */
+  token: string;
+  /**
+   * Whether to persist the token after login
+   */
+  persist?: boolean;
+}
+/**
+ * Parameters identifying a GitHub authentication to log out.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionAuthLogoutUserRequest".
+ */
+/** @experimental */
+export interface SessionAuthLogoutUserRequest {
+  authInfo: AuthInfo;
+}
 /**
  * Authentication status and account metadata for the session.
  *
@@ -13753,6 +17126,20 @@ export interface SessionAuthStatus {
    */
   copilotPlan?: string;
 }
+/**
+ * Parameters for switching the session's active authentication.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionAuthSwitchRequest".
+ */
+/** @experimental */
+export interface SessionAuthSwitchRequest {
+  authInfo: AuthInfo;
+  /**
+   * Optional token paired with the authentication information
+   */
+  token?: string;
+}
 /**
  * Map of sessionId -> bytes freed by removing the session's workspace directory.
  *
@@ -14107,7 +17494,7 @@ export interface SessionFsSqliteQueryRequest {
    * Optional named bind parameters
    */
   params?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -14122,7 +17509,7 @@ export interface SessionFsSqliteQueryResult {
    * For SELECT: array of row objects. For others: empty array.
    */
   rows: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   }[];
   /**
    * Column names from the result set
@@ -14147,6 +17534,9 @@ export interface SessionFsSqliteQueryResult {
 /** @experimental */
 export interface SessionFsSqliteTransactionError {
   errorClass: SessionFsSqliteTransactionErrorClass;
+  /**
+   * Human-readable transaction failure message.
+   */
   message: string;
 }
 /**
@@ -14161,6 +17551,9 @@ export interface SessionFsSqliteTransactionRequest {
    * Target session identifier
    */
   sessionId: string;
+  /**
+   * Ordered SQL statements to execute in one transaction.
+   */
   statements: SessionFsSqliteTransactionStatement[];
 }
 /**
@@ -14180,7 +17573,7 @@ export interface SessionFsSqliteTransactionStatement {
    * Optional named bind parameters.
    */
   params?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -14191,6 +17584,9 @@ export interface SessionFsSqliteTransactionStatement {
  */
 /** @experimental */
 export interface SessionFsSqliteTransactionResult {
+  /**
+   * Per-statement query results in input order.
+   */
   results: SessionFsSqliteQueryResult[];
   error?: SessionFsSqliteTransactionError;
 }
@@ -14303,6 +17699,10 @@ export interface SessionInstalledPlugin {
    * Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.
    */
   source_sha?: string;
+  /**
+   * Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — those synthesized at session start for a directory/local marketplace, whose cache_path points at the real plugin directory on disk rather than a copy under the installed-plugins cache. Its presence is what marks a record as live, and no record carrying it is ever written to the persisted installedPlugins key.
+   */
+  installed_from?: string;
 }
 /**
  * Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or full commit SHA, and optional subpath.
@@ -14316,12 +17716,21 @@ export interface SessionInstalledPluginSourceGitHub {
    * Constant value. Always "github".
    */
   source: "github";
+  /**
+   * GitHub repository in `owner/repo` form.
+   */
   repo: string;
+  /**
+   * Optional Git ref to resolve.
+   */
   ref?: string;
   /**
    * Optional full 40-character hexadecimal commit SHA.
    */
   sha?: string;
+  /**
+   * Optional repository-relative path to the plugin.
+   */
   path?: string;
 }
 /**
@@ -14336,12 +17745,21 @@ export interface SessionInstalledPluginSourceUrl {
    * Constant value. Always "url".
    */
   source: "url";
+  /**
+   * URL of the plugin source.
+   */
   url: string;
+  /**
+   * Optional Git ref to resolve.
+   */
   ref?: string;
   /**
    * Optional full 40-character hexadecimal commit SHA.
    */
   sha?: string;
+  /**
+   * Optional source-relative path to the plugin.
+   */
   path?: string;
 }
 /**
@@ -14356,6 +17774,9 @@ export interface SessionInstalledPluginSourceLocal {
    * Constant value. Always "local".
    */
   source: "local";
+  /**
+   * Local filesystem path to the plugin.
+   */
   path: string;
 }
 /**
@@ -14477,6 +17898,41 @@ export interface SessionLoadDeferredRepoHooksResult {
    */
   hookCount: number;
 }
+/**
+ * Enterprise permission policy expressed with the runtime's managed permission-rule syntax.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionManagedPermissions".
+ */
+/** @experimental */
+export interface SessionManagedPermissions {
+  /**
+   * When set to `disable`, prevents bypass/allow-all permission modes. `allow-auto-only` blocks full allow-all but permits advisory auto-approval. Any other value is accepted rather than failing the session, but is enforced as `disable`: the key is only present to restrict something, so a mode this runtime cannot interpret fails closed to the most restrictive one it knows. Omit the key entirely to impose no restriction.
+   */
+  disableBypassPermissionsMode?: string;
+  /**
+   * Permission rules that block matching operations. Deny has highest precedence.
+   */
+  deny?: string[];
+  /**
+   * Permission rules that require explicit human approval.
+   */
+  ask?: string[];
+  /**
+   * Permission rules that allow matching operations unless another managed source, deny, or ask rule restricts them.
+   */
+  allow?: string[];
+}
+/**
+ * Managed settings an SDK host may inject at session startup. Only permissions are accepted in this initial contract.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionManagedSettings".
+ */
+/** @experimental */
+export interface SessionManagedSettings {
+  permissions?: SessionManagedPermissions;
+}
 /**
  * Point-in-time snapshot of slow-changing session identifier and state fields
  *
@@ -14551,7 +18007,7 @@ export interface SessionModelList {
   /**
    * Available models, ordered with the most preferred default first. Includes both Copilot (CAPI) models and any registry BYOK models; a BYOK model appears under its provider-qualified selection id (`provider/id`).
    */
-  list: unknown[];
+  list: JsonValue[];
   /**
    * Cost categories for the full CAPI catalog, including picker-disabled models that Auto may select. Metadata only; entries absent from `list` are not manually selectable.
    */
@@ -14560,7 +18016,7 @@ export interface SessionModelList {
    * Per-quota snapshots returned alongside the model list, keyed by quota type.
    */
   quotaSnapshots?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -14571,6 +18027,9 @@ export interface SessionModelList {
  */
 /** @experimental */
 export interface SessionModelPriceCategory {
+  /**
+   * CAPI model identifier.
+   */
   id: string;
   priceCategory: ModelPickerPriceCategory;
 }
@@ -14621,13 +18080,12 @@ export interface SessionOpenOptions {
    *
    * @internal
    */
-  expAssignments?: {
-    [k: string]: unknown | undefined;
-  };
+  expAssignments?: JsonValue;
   /**
    * Opt-in: self-fetch and enforce enterprise managed settings at session bootstrap.
    */
   enableManagedSettings?: boolean;
+  managedSettings?: SessionManagedSettings;
   /**
    * Opt in to capturing file changes for session rewind and session diff. Capture cannot reconstruct changes made before it was enabled. On create it starts capture from the first turn. It is also honored on resume: for a session that already has tracked prior turns, tracking continues automatically even if this is omitted; passing it on resume additionally enables tracking for an eligible session that has no prior root turn yet. Resuming a session whose prior root turns were never tracked has no restorable baseline, so tracking stays disabled for it and rewind reports file change tracking as unavailable; the resume itself still succeeds, so sessions that predate tracking remain loadable. The opt-in is only rejected when the session can never track (a subagent session, or one without local session storage). It is intentionally absent from the mutable options update because enabling it after edits have occurred would create an incomplete, misleading baseline. Subagents share the parent session's capture store and are not tracked as separate rewind points: a file a subagent writes is attributed to whichever root user turn was open when the capture was staged, just before the tool body ran. A turn cannot open while a staged capture is still in flight, so a subagent tool that staged under the spawning turn stays attributed to it however late the write lands, while a capture it stages after the user's next message belongs to that later turn. Attribution decides which turn's rewind point counts and file preview include that write; it does not narrow which rewinds revert it, because a rewind restores every capture from the selected turn onward, so the earlier spawning turn reverts it as well.
    */
@@ -14662,7 +18120,7 @@ export interface SessionOpenOptions {
    */
   workingDirectory?: string;
   /**
-   * Additional directories the agent may access beyond the working directory. Each entry is granted to the session's file-access allow-list and surfaced to the model (system prompt context and `@`-mention completion). Absolute paths are recommended; a relative path is resolved against the session's working directory. Nonexistent or unresolvable entries are skipped with a warning. This is applied on both session creation and resume, and is not persisted: a resumed session that omits this option does not retain previously supplied directories (re-supply them, exactly as the CLI re-passes `--add-dir`).
+   * Additional directories the agent may access beyond the working directory. Each entry is granted to the session's file-access allow-list and surfaced to the model (system prompt context and `@`-mention completion). Conventional `.github/skills/` and `.github/agents/` definitions under each directory also join the session's project catalogs when their existing subsystem gates are enabled: added-root skills require both `enableConfigDiscovery` and effective `enableSkills`; added-root agents require `enableConfigDiscovery`. Supplying a directory therefore activates configuration from it and should be treated as a trust decision. Absolute paths are recommended; a relative path is resolved against the session's working directory. Nonexistent or unresolvable entries are skipped with a warning. This is applied during session creation and cold resume and is not persisted, so a cold resume must re-supply the directories.
    */
   additionalDirectories?: string[];
   workingDirectoryContext?: SessionContext;
@@ -14717,11 +18175,21 @@ export interface SessionOpenOptions {
    */
   shellProcessFlags?: string[];
   sandboxConfig?: SandboxConfig;
+  /**
+   * Origin of the sandbox choice. The runtime uses this only for internal telemetry provenance; managed policy is derived independently.
+   *
+   * @internal
+   */
+  sandboxConfigSource?: SandboxConfigSource;
   /**
    * Whether interactive shell sessions are logged.
    */
   logInteractiveShells?: boolean;
   envValueMode?: SessionOpenOptionsEnvValueMode;
+  /**
+   * MCP server names disabled for this session. Disabled servers are not started or authenticated on create or cold resume.
+   */
+  disabledMcpServers?: string[];
   /**
    * Whether to include instructions from every MCP server in the system prompt instead of only allowlisted servers.
    */
@@ -14730,6 +18198,10 @@ export interface SessionOpenOptions {
    * Additional directories to search for skills.
    */
   skillDirectories?: string[];
+  /**
+   * Built-in skill names to include in this session. When specified, only these runtime-bundled skills are available. Skills from other sources with the same name remain available.
+   */
+  includedBuiltinSkills?: string[];
   /**
    * Skill IDs disabled for this session.
    */
@@ -14763,7 +18235,7 @@ export interface SessionOpenOptions {
    */
   enableStreaming?: boolean;
   /**
-   * Experimental: enable native model citations (Anthropic models today), normalized onto the `assistant.message` event. Off by default; may change or be removed while the citations surface is experimental.
+   * Experimental: enable native model citations for supported Anthropic and OpenAI models, normalized onto the `assistant.message` event. Off by default; may change or be removed while the citations surface is experimental.
    *
    * @experimental
    */
@@ -14849,6 +18321,7 @@ export interface ShellOptions {
    * and the built-in PowerShell shell uses `-NoProfile -NoLogo`.
    */
   processFlags?: string[];
+  credentials?: ShellCredentials;
 }
 /**
  * A host-provided script sourced before each built-in shell command when its shell target matches the active shell.
@@ -14864,6 +18337,51 @@ export interface ShellInitScript {
   path: string;
   shell: ShellInitScriptShell;
 }
+/**
+ * Command-scoped GitHub credential injection for the shell commands an agent runs.
+ *
+ * Each channel is opt-in and independent, and injection is scoped to the individual command
+ * spawn: the credential is resolved from the session's *current* authentication at every spawn
+ * and reaches only spawns whose script actually invokes `git` or `gh`. Because nothing is
+ * retained between spawns, replacing the session credential (`session.gitHubAuth.setCredentials`)
+ * changes what the next spawned command presents — which seeding a credential into the runtime
+ * process's own environment cannot do, since a child's environment is fixed at `exec`.
+ *
+ * The credential is matched to the host it authenticates to, so a github.com credential is never
+ * presented to a GitHub Enterprise host and vice versa. Where a channel cannot express that
+ * boundary it injects nothing rather than crossing it -- see `gh` below.
+ *
+ * This is independent of `sandboxConfig`: it is a decision about which identity the agent
+ * presents, not about what the agent may touch, and it works on every platform whether or not
+ * an OS sandboxing backend is available. `sandboxConfig.auth` remains the sandbox-scoped
+ * spelling and is additive with this one.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ShellCredentials".
+ */
+/** @experimental */
+export interface ShellCredentials {
+  /**
+   * Whether to authenticate the agent's `git` commands as the session's GitHub credential, by
+   * injecting an `http.<host>.extraheader` (plus `insteadOf` rewrites so SSH-spelled remotes for
+   * that host use the authenticated HTTPS transport). Applied only to a spawn that runs a
+   * remote-contacting `git` subcommand. Default: false (opt-in).
+   */
+  git?: boolean;
+  /**
+   * Whether to authenticate the agent's `gh` commands as the session's GitHub credential, by
+   * exporting `GH_TOKEN` to a spawn that runs `gh`. Any inherited `gh` credential is removed from
+   * spawns that do not, so the credential stays command-scoped.
+   *
+   * Applies to a github.com credential only. `gh` picks its credential variable from the host a
+   * command targets rather than the one the credential belongs to, and the command can choose that
+   * target, so `GH_ENTERPRISE_TOKEN` would offer a single-tenant enterprise credential to every
+   * other enterprise host. A session whose credential is enterprise-scoped therefore runs `gh`
+   * unauthenticated; its `git` commands are unaffected, because `http.<host>.extraheader` is scoped
+   * to one host by construction. Default: false (opt-in).
+   */
+  gh?: boolean;
+}
 /**
  * Content-exclusion policy supplied to `sessions.open` options, with rules, last-updated data, and scope.
  *
@@ -14872,8 +18390,14 @@ export interface ShellInitScript {
  */
 /** @experimental */
 export interface SessionOpenOptionsAdditionalContentExclusionPolicy {
+  /**
+   * Content-exclusion rules to apply.
+   */
   rules: SessionOpenOptionsAdditionalContentExclusionPolicyRule[];
-  last_updated_at: unknown;
+  /**
+   * Opaque policy update timestamp supplied by the host.
+   */
+  last_updated_at: JsonValue;
   scope: SessionOpenOptionsAdditionalContentExclusionPolicyScope;
 }
 /**
@@ -14884,8 +18408,17 @@ export interface SessionOpenOptionsAdditionalContentExclusionPolicy {
  */
 /** @experimental */
 export interface SessionOpenOptionsAdditionalContentExclusionPolicyRule {
+  /**
+   * Path patterns covered by this rule.
+   */
   paths: string[];
+  /**
+   * Conditions of which at least one must match.
+   */
   ifAnyMatch?: string[];
+  /**
+   * Conditions none of which may match.
+   */
   ifNoneMatch?: string[];
   source: SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource;
 }
@@ -14897,7 +18430,13 @@ export interface SessionOpenOptionsAdditionalContentExclusionPolicyRule {
  */
 /** @experimental */
 export interface SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource {
+  /**
+   * Name of the policy source.
+   */
   name: string;
+  /**
+   * Type of the policy source.
+   */
   type: string;
 }
 /**
@@ -15022,9 +18561,7 @@ export interface SessionsOpenCloud {
    *
    * @internal
    */
-  onTaskCreated?: {
-    [k: string]: unknown | undefined;
-  };
+  onTaskCreated?: OpaqueInProcessValue;
 }
 /**
  * Parameters for fetching a remote session and handing it off to a new local session.
@@ -15046,17 +18583,13 @@ export interface SessionsOpenHandoff {
    *
    * @internal
    */
-  onProgress?: {
-    [k: string]: unknown | undefined;
-  };
+  onProgress?: OpaqueInProcessValue;
   /**
    * In-process confirmation callback `(request) => boolean | Promise<boolean>` invoked when the handoff needs the caller to confirm a non-fatal blocker (e.g. a repository mismatch between the current working directory and the remote session). Returning `true` proceeds with the handoff; returning `false` (or omitting the callback) aborts it. Marked internal because a function reference cannot cross the JSON-RPC boundary, for the same reasons as `onProgress`.
    *
    * @internal
    */
-  onConfirm?: {
-    [k: string]: unknown | undefined;
-  };
+  onConfirm?: OpaqueInProcessValue;
 }
 /**
  * Result of opening a session.
@@ -15078,9 +18611,7 @@ export interface SessionOpenResult {
    *
    * @internal
    */
-  sessionApi?: {
-    [k: string]: unknown | undefined;
-  };
+  sessionApi?: OpaqueInProcessValue;
   /**
    * Startup prompts queued by user-level hook configs at session creation. Only populated when status is `created`; resumed sessions return an empty array.
    */
@@ -15237,7 +18768,29 @@ export interface SessionsEnrichMetadataRequest {
  */
 /** @experimental */
 export interface SessionSetCredentialsParams {
-  credentials?: AuthInfo;
+  credentials?: SettableAuthInfo;
+}
+/**
+ * Token authentication accepted by session.gitHubAuth.setCredentials.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SettableTokenAuthInfo".
+ */
+/** @experimental */
+export interface SettableTokenAuthInfo {
+  /**
+   * SDK-side token authentication; the host configured the token directly via the SDK.
+   */
+  type: "token";
+  /**
+   * Authentication host.
+   */
+  host: string;
+  /**
+   * The token value itself. Treat as a secret.
+   */
+  token: string;
+  copilotUser?: CopilotUserResponse;
 }
 /**
  * Indicates whether the credential update succeeded.
@@ -15264,7 +18817,13 @@ export interface SessionSetCredentialsResult {
  */
 /** @experimental */
 export interface SessionSettingsBuiltInToolAvailabilitySnapshot {
+  /**
+   * Whether the report-progress tool is available.
+   */
   reportProgress?: boolean;
+  /**
+   * Whether the create-pull-request tool is available.
+   */
   createPullRequest?: boolean;
 }
 /**
@@ -15289,6 +18848,9 @@ export interface SessionSettingsEvaluatePredicateRequest {
  */
 /** @experimental */
 export interface SessionSettingsEvaluatePredicateResult {
+  /**
+   * Whether the named settings predicate evaluated to enabled.
+   */
   enabled: boolean;
 }
 /**
@@ -15299,7 +18861,13 @@ export interface SessionSettingsEvaluatePredicateResult {
  */
 /** @experimental */
 export interface SessionSettingsJobSnapshot {
+  /**
+   * GitHub Actions event type for the job.
+   */
   eventType?: string;
+  /**
+   * Whether this is the workflow's trigger job.
+   */
   isTriggerJob?: boolean;
   builtInToolAvailability?: SessionSettingsBuiltInToolAvailabilitySnapshot;
 }
@@ -15311,9 +18879,21 @@ export interface SessionSettingsJobSnapshot {
  */
 /** @experimental */
 export interface SessionSettingsModelSnapshot {
+  /**
+   * Selected model identifier.
+   */
   model?: string;
+  /**
+   * Default reasoning effort for the selected model.
+   */
   defaultReasoningEffort?: string;
+  /**
+   * Agent job identifier for the session.
+   */
   instanceId?: string;
+  /**
+   * Agent service callback URL for job and progress updates.
+   */
   callbackUrl?: string;
 }
 /**
@@ -15324,7 +18904,13 @@ export interface SessionSettingsModelSnapshot {
  */
 /** @experimental */
 export interface SessionSettingsOnlineEvaluationSnapshot {
+  /**
+   * Whether online evaluation is disabled.
+   */
   disableOnlineEvaluation?: boolean;
+  /**
+   * Whether online-evaluation output-file generation is enabled.
+   */
   enableOnlineEvaluationOutputFile?: boolean;
 }
 /**
@@ -15335,17 +18921,53 @@ export interface SessionSettingsOnlineEvaluationSnapshot {
  */
 /** @experimental */
 export interface SessionSettingsRepoSnapshot {
+  /**
+   * Repository name.
+   */
   name?: string;
+  /**
+   * GitHub repository database ID.
+   */
   id?: number;
+  /**
+   * Checked-out repository branch.
+   */
   branch?: string;
+  /**
+   * Checked-out commit SHA.
+   */
   commit?: string;
+  /**
+   * Whether the repository is writable.
+   */
   readWrite?: boolean;
+  /**
+   * Repository owner login.
+   */
   ownerName?: string;
+  /**
+   * GitHub repository owner database ID.
+   */
   ownerId?: number;
+  /**
+   * GitHub server base URL.
+   */
   serverUrl?: string;
+  /**
+   * GitHub server host name.
+   */
   host?: string;
+  /**
+   * Protocol used to access the GitHub host.
+   */
   hostProtocol?: string;
+  /**
+   * GitHub secret-scanning service URL.
+   */
   secretScanningUrl?: string;
+  /**
+   * Number of commits in the pull request.
+   */
   prCommitCount?: number;
 }
 /**
@@ -15356,9 +18978,21 @@ export interface SessionSettingsRepoSnapshot {
  */
 /** @experimental */
 export interface SessionSettingsSnapshot {
+  /**
+   * Agent runtime version selector copied from the session settings, such as `latest` or a runtime release identifier.
+   */
   version?: string;
+  /**
+   * Name of the SDK client that created the session.
+   */
   clientName?: string;
+  /**
+   * Session timeout in milliseconds.
+   */
   timeoutMs?: number;
+  /**
+   * Session start time as Unix epoch milliseconds.
+   */
   startTimeMs?: number;
   repo: SessionSettingsRepoSnapshot;
   model: SessionSettingsModelSnapshot;
@@ -15374,14 +19008,41 @@ export interface SessionSettingsSnapshot {
  */
 /** @experimental */
 export interface SessionSettingsValidationSnapshot {
+  /**
+   * General validation timeout budget in seconds.
+   */
   timeout?: number;
+  /**
+   * Dependabot validation timeout budget in seconds.
+   */
   dependabotTimeout?: number;
+  /**
+   * Whether CodeQL validation is enabled.
+   */
   codeqlEnabled?: boolean;
+  /**
+   * Whether code-review validation is enabled.
+   */
   codeReviewEnabled?: boolean;
+  /**
+   * Model used for code-review validation.
+   */
   codeReviewModel?: string;
+  /**
+   * Whether advisory validation is enabled.
+   */
   advisoryEnabled?: boolean;
+  /**
+   * Whether secret-scanning validation is enabled.
+   */
   secretScanningEnabled?: boolean;
+  /**
+   * Whether the memory-store tool is enabled.
+   */
   memoryStoreEnabled?: boolean;
+  /**
+   * Whether the memory-vote tool is enabled.
+   */
   memoryVoteEnabled?: boolean;
 }
 /**
@@ -15936,6 +19597,12 @@ export interface SessionUpdateOptionsParams {
    */
   shellProcessFlags?: string[];
   sandboxConfig?: SandboxConfig;
+  /**
+   * Origin of the sandbox choice. The runtime uses this only for internal telemetry provenance; managed policy is derived independently.
+   *
+   * @internal
+   */
+  sandboxConfigSource?: SandboxConfigSource;
   /**
    * Whether interactive shell sessions are logged.
    */
@@ -15949,6 +19616,10 @@ export interface SessionUpdateOptionsParams {
    * Additional directories to search for skills.
    */
   skillDirectories?: string[];
+  /**
+   * Built-in skill names to include in this session. When specified, only these runtime-bundled skills are available. Skills from other sources with the same name remain available. Set to null to remove the allowlist restriction.
+   */
+  includedBuiltinSkills?: string[] | null;
   /**
    * Skill IDs that should be excluded from this session.
    */
@@ -16203,6 +19874,10 @@ export interface Skill {
    * Unique identifier for the skill
    */
   name: string;
+  /**
+   * Canonical slash command name used to invoke the skill, without the leading '/'
+   */
+  commandName?: string;
   /**
    * Description of what the skill does
    */
@@ -16290,6 +19965,23 @@ export interface SkillsConfigSetDisabledSkillsRequest {
    */
   disabledSkills: string[];
 }
+/**
+ * Adds or removes a single skill from the global disabled list, leaving every other entry untouched.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SkillsConfigSetSkillDisabledRequest".
+ */
+/** @experimental */
+export interface SkillsConfigSetSkillDisabledRequest {
+  /**
+   * Name of the skill to add to or remove from the disabled list
+   */
+  name: string;
+  /**
+   * True to disable the skill, false to enable it
+   */
+  disabled: boolean;
+}
 /**
  * Name of the skill to disable for the session.
  *
@@ -16413,6 +20105,39 @@ export interface SkillsLoadDiagnostics {
    */
   errors: string[];
 }
+
+/** @experimental */
+export interface SlashCommandAddTimelineEntryResult {
+  /**
+   * Discriminator for an add-timeline-entry result.
+   */
+  kind: "add-timeline-entry";
+  entry: SlashCommandTimelineEntry;
+  /**
+   * Optional text the host should prefill into the input editor.
+   */
+  prefillInput?: string;
+  /**
+   * Whether command execution changed persisted runtime settings.
+   */
+  runtimeSettingsChanged?: boolean;
+}
+
+/** @experimental */
+export interface SlashCommandTimelineEntry {
+  /**
+   * Timeline entry presentation type.
+   */
+  type: string;
+  /**
+   * Text displayed for the timeline entry.
+   */
+  text: string;
+  /**
+   * Optional URL associated with the timeline entry.
+   */
+  url?: string;
+}
 /**
  * Slash-command invocation result that submits an agent prompt, with display prompt, optional mode, optional user-facing notice, and settings-change flag.
  *
@@ -16543,6 +20268,95 @@ export interface SlashCommandSelectSubcommandOption {
    */
   group?: string;
 }
+
+/** @experimental */
+export interface SlashCommandShowDialogResult {
+  /**
+   * Discriminator for a show-dialog result.
+   */
+  kind: "show-dialog";
+  dialog: SlashCommandModelPickerDialog;
+  /**
+   * Whether command execution changed persisted runtime settings.
+   */
+  runtimeSettingsChanged?: boolean;
+}
+
+/** @experimental */
+export interface SlashCommandModelPickerDialog {
+  /**
+   * Discriminator for a model-picker dialog.
+   */
+  kind: "model-picker";
+  /**
+   * Model that should be enabled before it can be selected.
+   */
+  modelToEnable?: string;
+  /**
+   * Settings scope the picker should modify.
+   */
+  scope?: string;
+  /**
+   * Model-selection target represented by the picker.
+   */
+  target?: string;
+}
+
+/** @experimental */
+export interface SlashCommandSetModelResult {
+  /**
+   * Discriminator for a set-model result.
+   */
+  kind: "set-model";
+  /**
+   * Model selected by the command.
+   */
+  model: string;
+  /**
+   * Settings scope modified by the command.
+   */
+  scope?: string;
+  /**
+   * User-facing warning produced while selecting the model.
+   */
+  warning?: string;
+  /**
+   * Reasoning effort selected for the model.
+   */
+  reasoningEffort?: string;
+  /**
+   * User-settings snapshot to restore if the host cancels the model switch.
+   */
+  revertOnCancel?: {};
+  /**
+   * Repository settings scope modified by the command.
+   */
+  repoScope?: string;
+  /**
+   * Whether command execution changed persisted runtime settings.
+   */
+  runtimeSettingsChanged?: boolean;
+}
+
+/** @experimental */
+export interface SlashCommandSetPlanModelResult {
+  /**
+   * Discriminator for a set-plan-model result.
+   */
+  kind: "set-plan-model";
+  /**
+   * Dedicated model selected for plan mode.
+   */
+  planModel?: string;
+  /**
+   * User-facing confirmation message for the plan-model selection.
+   */
+  message: string;
+  /**
+   * Whether command execution changed persisted runtime settings.
+   */
+  runtimeSettingsChanged?: boolean;
+}
 /**
  * Subagent model, reasoning effort, and context tier settings
  *
@@ -16581,6 +20395,10 @@ export interface TaskAgentInfo {
    * Tool call ID associated with this agent task
    */
   toolCallId: string;
+  /**
+   * Friendly, non-unique name intended for display
+   */
+  displayName?: string;
   /**
    * Short description of the task
    */
@@ -16678,6 +20496,35 @@ export interface TaskProgressLine {
    */
   timestamp: string;
 }
+
+/** @experimental */
+export interface TaskCompletionDecision {
+  outcome: TaskCompletionOutcome;
+  /**
+   * Rationale for the completion decision, when one is available.
+   */
+  reason?: string;
+  /**
+   * Whether the rationale was derived from completion-reviewer output.
+   */
+  reviewerDerived?: boolean;
+  /**
+   * Information-flow metadata captured from the completion reviewer.
+   */
+  reviewerResultMeta?: JsonValue;
+  /**
+   * Active autopilot objective evaluated by the completion reviewer.
+   */
+  objectiveId?: number;
+  /**
+   * Whether completion was accepted after the reviewer-rejection budget was exhausted.
+   */
+  completionRejectionBudgetExhausted?: boolean;
+  /**
+   * Objective eligibility token captured when the decision was evaluated.
+   */
+  completionEligibilityToken?: number;
+}
 /**
  * Tracked shell task metadata, including ID, command, status, timing, attachment/execution mode, log path, and PID.
  *
@@ -16947,7 +20794,7 @@ export interface TasksStartAgentRequest {
    */
   prompt: string;
   /**
-   * Short name for the agent, used to generate a human-readable ID
+   * Friendly, non-unique name used when displaying the agent
    */
   name: string;
   /**
@@ -17002,42 +20849,245 @@ export interface TelemetrySetFeatureOverridesRequest {
  * via the `definition` "Tool".
  */
 /** @experimental */
-export interface Tool {
+export interface Tool {
+  /**
+   * Tool identifier (e.g., "bash", "grep", "str_replace_editor")
+   */
+  name: string;
+  /**
+   * Optional namespaced name for declarative filtering (e.g., "playwright/navigate" for MCP tools)
+   */
+  namespacedName?: string;
+  /**
+   * Description of what the tool does
+   */
+  description: string;
+  /**
+   * JSON Schema for the tool's input parameters
+   */
+  parameters?: {
+    [k: string]: JsonValue | undefined;
+  };
+  /**
+   * Optional instructions for how to use this tool effectively
+   */
+  instructions?: string;
+}
+/**
+ * Built-in tools available for the requested model, with their parameters and instructions.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolList".
+ */
+/** @experimental */
+export interface ToolList {
+  /**
+   * List of available built-in tools with metadata
+   */
+  tools: Tool[];
+}
+/**
+ * Expanded canonical result returned by a session tool.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolResultExpanded".
+ */
+/** @experimental */
+export interface ToolResultExpanded {
+  /**
+   * Text result returned to the model.
+   */
+  textResultForLlm: string;
+  resultType: ToolResultType;
+  /**
+   * Base64-encoded binary results returned to the model.
+   */
+  binaryResultsForLlm?: ExternalToolTextResultForLlmBinaryResultsForLlm[];
+  /**
+   * Detailed log content available for session display.
+   */
+  sessionLog?: string;
+  /**
+   * Error message for an unsuccessful execution.
+   */
+  error?: string;
+  /**
+   * Tool-specific telemetry payload.
+   */
+  toolTelemetry?: JsonValue;
+  /**
+   * Whether large-output post-processing should be skipped.
+   */
+  skipLargeOutputProcessing?: boolean;
+  /**
+   * Messages to inject after the tool result.
+   */
+  newMessages?: ToolResultNewMessage[];
+  /**
+   * Structured content blocks returned to the model.
+   */
+  contents?: ExternalToolTextResultForLlmContent[];
+  /**
+   * Deferred tool names made available by this result.
+   */
+  toolReferences?: string[];
+  /**
+   * Sources returned by the tool that the model may cite.
+   */
+  citableSources?: JsonValue[];
+  /**
+   * Skill invocation metadata produced by the tool.
+   */
+  skillInvocation?: JsonValue;
+  /**
+   * Whether post-tool-use failure hooks have already processed this result.
+   */
+  postToolUseFailureHooksProcessed?: boolean;
+  /**
+   * Optional UI resource produced by the tool.
+   */
+  uiResource?: JsonValue;
+  /**
+   * Metadata propagated with the tool result, including information-flow labels.
+   */
+  mcpMeta?: {
+    [k: string]: JsonValue | undefined;
+  };
+  /**
+   * Structured result content in addition to the model-facing text.
+   */
+  structuredContent?: JsonValue;
+  taskCompletionDecision?: TaskCompletionDecision;
+}
+/**
+ * A message injected by a tool result.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolResultNewMessage".
+ */
+/** @experimental */
+export interface ToolResultNewMessage {
+  /**
+   * Message content to inject after the tool result.
+   */
+  content: string;
+  /**
+   * Source attributed to the injected message.
+   */
+  source: string;
+}
+/**
+ * A tool name and arguments to execute through the session's native invocation pipeline.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolsExecuteRequest".
+ */
+/** @experimental */
+export interface ToolsExecuteRequest {
+  /**
+   * Name of the currently offered tool to execute.
+   */
+  name: string;
+  /**
+   * Arguments supplied to the tool.
+   */
+  arguments: JsonValue;
+  /**
+   * Optional identifier used to correlate this invocation with its tool call.
+   */
+  toolCallId?: string;
+}
+/**
+ * Options controlling how Rust-owned built-in tool descriptors are materialized.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolsGetBuiltinDescriptorsRequest".
+ */
+/** @experimental */
+export interface ToolsGetBuiltinDescriptorsRequest {
+  /**
+   * Whether line numbers should be omitted from the view tool descriptor.
+   */
+  noViewLineNumbers?: boolean;
+  /**
+   * Whether descriptors should favor fewer user-intervention prompts.
+   */
+  reduceUserIntervention?: boolean;
+  /**
+   * Whether tool descriptors should include authoring metadata.
+   */
+  includeAuthor?: boolean;
+  /**
+   * Whether semantic skill lookup is available.
+   */
+  skillEmbeddingEnabled?: boolean;
+  shellConfig?: ToolsShellDescriptorConfig;
+  /**
+   * Whether shell commands may only run asynchronously.
+   */
+  shellAsyncOnlyEnabled?: boolean;
+  /**
+   * Whether the configured shell supports PowerShell 7 syntax.
+   */
+  shellSupportsPowerShell7Syntax?: boolean;
+  /**
+   * Default shell timeout in milliseconds.
+   */
+  shellTimeoutMs?: number;
+  /**
+   * Whether background task completion notifications are enabled.
+   */
+  backgroundTaskNotificationsEnabled?: boolean;
+}
+/**
+ * Shell-specific names and description lines used to materialize built-in shell tool descriptors.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolsShellDescriptorConfig".
+ */
+/** @experimental */
+export interface ToolsShellDescriptorConfig {
   /**
-   * Tool identifier (e.g., "bash", "grep", "str_replace_editor")
+   * Stable shell type identifier.
    */
-  name: string;
+  shellType: string;
   /**
-   * Optional namespaced name for declarative filtering (e.g., "playwright/navigate" for MCP tools)
+   * Human-readable shell name.
    */
-  namespacedName?: string;
+  displayName: string;
   /**
-   * Description of what the tool does
+   * Tool name used to start shell commands.
    */
-  description: string;
+  shellToolName: string;
   /**
-   * JSON Schema for the tool's input parameters
+   * Tool name used to read shell output.
    */
-  parameters?: {
-    [k: string]: unknown | undefined;
-  };
+  readShellToolName: string;
   /**
-   * Optional instructions for how to use this tool effectively
+   * Tool name used to stop shell commands.
    */
-  instructions?: string;
+  stopShellToolName: string;
+  /**
+   * Tool name used to list active shells.
+   */
+  listShellsToolName: string;
+  /**
+   * Additional model-facing shell description lines.
+   */
+  descriptionLines: string[];
 }
 /**
- * Built-in tools available for the requested model, with their parameters and instructions.
+ * Rust-owned built-in tool descriptors for the session.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "ToolList".
+ * via the `definition` "ToolsGetBuiltinDescriptorsResult".
  */
 /** @experimental */
-export interface ToolList {
+export interface ToolsGetBuiltinDescriptorsResult {
   /**
-   * List of available built-in tools with metadata
+   * Built-in tool descriptors materialized for the session.
    */
-  tools: Tool[];
+  tools: BuiltinToolDescriptor[];
 }
 /**
  * Current lightweight tool metadata snapshot for the session.
@@ -17073,6 +21123,41 @@ export interface ToolsListRequest {
    */
   model?: string;
 }
+/**
+ * Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolsSetRequest".
+ */
+/** @experimental */
+export interface ToolsSetRequest {
+  /**
+   * Complete replacement list for the calling connection.
+   */
+  tools: ProtocolExternalToolDefinition[];
+}
+/**
+ * Empty result after replacing the calling connection's externally implemented tools.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolsSetResult".
+ */
+/** @experimental */
+export interface ToolsSetResult {}
+/**
+ * Task-completion tool arguments and final result used to build a label-safe session event payload.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolsTaskCompleteEventDataRequest".
+ */
+/** @experimental */
+export interface ToolsTaskCompleteEventDataRequest {
+  /**
+   * Arguments supplied to the completed task_complete tool call.
+   */
+  toolArgs: JsonValue;
+  finalResult: ToolResultExpanded;
+}
 /**
  * Empty result after applying subagent settings
  *
@@ -17204,11 +21289,20 @@ export interface UIElicitationArrayEnumFieldItems {
  */
 /** @experimental */
 export interface UIElicitationRequest {
+  mode?: McpElicitationFormMode;
   /**
    * Message describing what information is needed from the user
    */
   message: string;
   requestedSchema: UIElicitationSchema;
+  /**
+   * MCP request metadata.
+   */
+  _meta?: {
+    [k: string]: unknown | undefined;
+  };
+  task?: McpTaskMetadata;
+  [k: string]: unknown | undefined;
 }
 /**
  * JSON Schema describing the form fields to present to the user
@@ -17411,6 +21505,13 @@ export interface UIElicitationSchemaPropertyNumber {
 export interface UIElicitationResponse {
   action: UIElicitationResponseAction;
   content?: UIElicitationResponseContent;
+  /**
+   * MCP response metadata.
+   */
+  _meta?: {
+    [k: string]: unknown | undefined;
+  };
+  [k: string]: unknown | undefined;
 }
 /**
  * The form values submitted by the user (present when action is 'accept')
@@ -17452,20 +21553,16 @@ export interface UIEphemeralQueryRequest {
    *
    * @internal
    */
-  onChunk?: {
-    [k: string]: unknown | undefined;
-  };
+  onChunk?: OpaqueInProcessValue;
   /**
    * In-process `AbortSignal` forwarded to the model client to cancel an in-flight request. Marked internal: excluded from the public SDK surface. Replaced by an explicit cancellation token + cancel RPC in the SDK migration.
    *
    * @internal
    */
-  abortSignal?: {
-    [k: string]: unknown | undefined;
-  };
+  abortSignal?: OpaqueInProcessValue;
 }
 /**
- * Transient answer generated from current conversation context.
+ * Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "UIEphemeralQueryResult".
@@ -17473,7 +21570,7 @@ export interface UIEphemeralQueryRequest {
 /** @experimental */
 export interface UIEphemeralQueryResult {
   /**
-   * Full assistant response text.
+   * Answer returned by the model
    */
   answer: string;
 }
@@ -17738,6 +21835,12 @@ export interface UsageGetMetricsResult {
   modelMetrics: {
     [k: string]: UsageMetricsModelMetric | undefined;
   };
+  /**
+   * Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`.
+   */
+  agentMetrics?: {
+    [k: string]: UsageMetricsAgentMetric | undefined;
+  };
   /**
    * Currently active model identifier
    */
@@ -17873,6 +21976,37 @@ export interface UsageMetricsModelMetricTokenDetail {
    */
   tokenCount: number;
 }
+/**
+ * Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UsageMetricsAgentMetric".
+ */
+/** @experimental */
+export interface UsageMetricsAgentMetric {
+  /**
+   * Configured agent name, when this is a subagent
+   */
+  agentName?: string;
+  /**
+   * Human-readable label for this subagent invocation, copied from the originating `subagent.started` event. For task-tool subagents this is the invocation's task description rather than the agent's configured display name, so group by `agentName` for stable per-agent labels.
+   */
+  agentDisplayName?: string;
+  /**
+   * Time spent in model API calls by this agent, in milliseconds
+   */
+  totalApiDurationMs: number;
+  /**
+   * Accumulated nano-AI units cost for this agent
+   */
+  totalNanoAiu: number;
+  /**
+   * Per-model usage for this agent, keyed by model identifier
+   */
+  modelMetrics: {
+    [k: string]: UsageMetricsModelMetric | undefined;
+  };
+}
 /**
  * Result of a user-requested shell command.
  *
@@ -17913,15 +22047,11 @@ export interface UserSettingMetadata {
   /**
    * The effective value: the user's value if set, otherwise the default.
    */
-  value: {
-    [k: string]: unknown | undefined;
-  };
+  value: JsonValue;
   /**
    * The centrally-known default for this setting (null when no default is registered).
    */
-  default: {
-    [k: string]: unknown | undefined;
-  };
+  default: JsonValue;
   /**
    * True when the user has not set an explicit value for this setting (i.e. it is left at its default). Reflects whether the user has overridden the key, not whether the effective value happens to equal the default — a key explicitly set to a value identical to the default still reports false.
    */
@@ -17953,9 +22083,7 @@ export interface UserSettingsSetRequest {
   /**
    * Partial user settings to write, as a free-form object keyed by setting name
    */
-  settings: {
-    [k: string]: unknown | undefined;
-  };
+  settings: JsonValue;
 }
 /**
  * Outcome of writing user settings.
@@ -18091,7 +22219,13 @@ export interface WorkspacesAddSummaryRequest {
  */
 /** @experimental */
 export interface WorkspacesAddSummaryResult {
+  /**
+   * Metadata for the persisted summary.
+   */
   summary?: {};
+  /**
+   * Refreshed metadata for the containing workspace.
+   */
   workspace?: {};
   [k: string]: unknown | undefined;
 }
@@ -18184,9 +22318,7 @@ export interface WorkspacesEnsureRequest {
   /**
    * Opaque workspace context supplied by the session host.
    */
-  context?: {
-    [k: string]: unknown | undefined;
-  };
+  context?: JsonValue;
 }
 /**
  * Current workspace metadata for the session, including its absolute filesystem path when available.
@@ -18200,22 +22332,70 @@ export interface WorkspacesGetWorkspaceResult {
    * Current workspace metadata, or null if not available
    */
   workspace: {
+    /**
+     * Stable workspace identifier.
+     */
     id: string;
+    /**
+     * Current working directory associated with the workspace.
+     */
     cwd?: string;
+    /**
+     * Git repository root associated with the workspace.
+     */
     git_root?: string;
+    /**
+     * Repository identifier associated with the workspace.
+     */
     repository?: string;
     host_type?: WorkspacesWorkspaceDetailsHostType;
+    /**
+     * Current Git branch.
+     */
     branch?: string;
+    /**
+     * Workspace display name.
+     */
     name?: string;
+    /**
+     * Name of the client that created the workspace.
+     */
     client_name?: string;
+    /**
+     * Whether the workspace name was explicitly chosen by the user.
+     */
     user_named?: boolean;
+    /**
+     * Number of persisted summaries in the workspace.
+     */
     summary_count?: number;
+    /**
+     * Timestamp when the workspace was created.
+     */
     created_at?: string;
+    /**
+     * Timestamp when the workspace was last updated.
+     */
     updated_at?: string;
+    /**
+     * Whether the workspace session can be steered remotely.
+     */
     remote_steerable?: boolean;
+    /**
+     * Mission Control task identifier associated with the workspace.
+     */
     mc_task_id?: string;
+    /**
+     * Mission Control session identifier associated with the workspace.
+     */
     mc_session_id?: string;
+    /**
+     * Most recent Mission Control event identifier observed for the workspace.
+     */
     mc_last_event_id?: string;
+    /**
+     * Whether the per-session Chronicle upgrade prompt was dismissed for the workspace.
+     */
     chronicle_sync_dismissed?: boolean;
   } | null;
   /**
@@ -18377,9 +22557,7 @@ export interface WorkspacesUpdateMetadataRequest {
   /**
    * Opaque workspace context supplied by the session host.
    */
-  context?: {
-    [k: string]: unknown | undefined;
-  };
+  context?: JsonValue;
   /**
    * Optional workspace display name override.
    */
@@ -18439,7 +22617,7 @@ export interface SessionAgentListRequest {
  */
 /** @experimental */
 export interface SessionMcpAppsCallToolResult {
-  [k: string]: unknown | undefined;
+  [k: string]: JsonValue | undefined;
 }
 
 /** @experimental */
@@ -18550,7 +22728,7 @@ export function createServerRpc(connection: MessageConnection) {
             /**
              * Lists Copilot models available to the authenticated user.
              *
-             * @param params Optional GitHub token used to list models for a specific user instead of the global auth context.
+             * @param params Optional opaque account selection or compatibility GitHub token used to list models.
              *
              * @returns List of Copilot models available to the resolved user, including capabilities and billing metadata.
              */
@@ -18579,9 +22757,9 @@ export function createServerRpc(connection: MessageConnection) {
         /** @experimental */
         account: {
             /**
-             * Gets Copilot quota usage for the authenticated user or supplied GitHub token.
+             * Gets Copilot quota usage for the current or opaquely selected authenticated user.
              *
-             * @param params Optional GitHub token used to look up quota for a specific user instead of the global auth context.
+             * @param params Optional opaque account selection or compatibility GitHub token used to look up quota.
              *
              * @returns Quota usage snapshots for the resolved user, keyed by quota type.
              */
@@ -18602,9 +22780,9 @@ export function createServerRpc(connection: MessageConnection) {
             getAllUsers: async (): Promise<AccountGetAllUsersResult> =>
                 connection.sendRequest("account.getAllUsers", {}),
             /**
-             * Stores authentication credentials after successful login (e.g., device code flow).
+             * Validates and stores authentication credentials. When login is omitted, resolves the authenticated user from the token before persistence.
              *
-             * @param params Credentials to store after successful authentication
+             * @param params Credentials to validate and store. Omit login to resolve the authenticated user from the token.
              *
              * @returns Result of a successful login; throws on failure
              */
@@ -18693,6 +22871,15 @@ export function createServerRpc(connection: MessageConnection) {
              */
             discover: async (params: McpDiscoverRequest): Promise<McpDiscoverResult> =>
                 connection.sendRequest("mcp.discover", params),
+            /**
+             * Requests a side-effect-free MCP install plan from a catalog candidate handle or a caller-supplied card. This host-implemented server method is available through SDK/TUI hosts; standalone and C-ABI runtimes whose host does not implement server-method dispatch return JSON-RPC MethodNotFound. A runtime with planning available returns a normalised plan and opaque single-use plan handle; a runtime without it returns the typed planning-unavailable result. A completed plan reports resource identity, provenance, eligible transport choices, the user-scope target, required typed values and secret placeholders, the policy result, the configuration changes installing would make, and whether a reload would be needed. Planning never writes configuration, stores a secret, or reloads MCP servers, so abandoning a plan needs no call and leaves nothing behind.
+             *
+             * @param params A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.
+             *
+             * @returns Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.
+             */
+            planInstall: async (params: McpPlanInstallRequest): Promise<McpPlanInstallResult> =>
+                connection.sendRequest("mcp.planInstall", params),
         },
         /** @experimental */
         extensions: {
@@ -18718,6 +22905,25 @@ export function createServerRpc(connection: MessageConnection) {
             disable: async (params: DiscoveredExtensionsDisableRequest): Promise<void> =>
                 connection.sendRequest("extensions.disable", params),
         },
+        /**
+         * Registers the calling SDK client as the per-entrypoint extension launch provider. Call before creating any sessions. When omitted, the runtime temporarily falls back to its built-in Node launcher for backward compatibility.
+         *
+         * @experimental
+         */
+        registerExtensionLaunchProvider: async (): Promise<void> =>
+            connection.sendRequest("registerExtensionLaunchProvider", {}),
+        /** @experimental */
+        catalog: {
+            /**
+             * Requests a bounded catalog search. This host-implemented server method is available through SDK/TUI hosts; standalone and C-ABI runtimes whose host does not implement server-method dispatch return JSON-RPC MethodNotFound. A runtime with search available returns inert candidate summaries, each with an opaque single-use handle scoped to this runtime instance; a runtime without it returns the typed search-unavailable result. Public authorities may be searched anonymously, while an authority that requires credentials yields the typed authentication-required result. All returned text, URLs, and package metadata are untrusted external data and can never trigger instructions, tools, or installation. Read-only: nothing is installed, configured, or persisted.
+             *
+             * @param params A bounded catalog search. Both the query length and the result count are capped by the schema so a caller cannot request an unbounded scan.
+             *
+             * @returns Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
+             */
+            search: async (params: CatalogSearchRequest): Promise<CatalogSearchResult> =>
+                connection.sendRequest("catalog.search", params),
+        },
         /** @experimental */
         plugins: {
             /**
@@ -18774,6 +22980,16 @@ export function createServerRpc(connection: MessageConnection) {
             disable: async (params: PluginsDisableRequest): Promise<void> =>
                 connection.sendRequest("plugins.disable", params),
             /** @experimental */
+            builtin: {
+                /**
+                 * Replaces this server's trusted built-in plugin directories while no sessions are active.
+                 *
+                 * @param params Trusted built-in plugin directories to use for this runtime process.
+                 */
+                set: async (params: PluginsBuiltinSetRequest): Promise<void> =>
+                    connection.sendRequest("plugins.builtin.set", params),
+            },
+            /** @experimental */
             marketplaces: {
                 /**
                  * Lists all registered marketplaces (defaults + user-added).
@@ -18831,6 +23047,13 @@ export function createServerRpc(connection: MessageConnection) {
                  */
                 setDisabledSkills: async (params: SkillsConfigSetDisabledSkillsRequest): Promise<void> =>
                     connection.sendRequest("skills.config.setDisabledSkills", params),
+                /**
+                 * Atomically adds or removes one skill from the disabled list.
+                 *
+                 * @param params Adds or removes a single skill from the global disabled list, leaving every other entry untouched.
+                 */
+                setSkillDisabled: async (params: SkillsConfigSetSkillDisabledRequest): Promise<void> =>
+                    connection.sendRequest("skills.config.setSkillDisabled", params),
             },
             /**
              * Discovers skills across global and project sources.
@@ -18931,6 +23154,16 @@ export function createServerRpc(connection: MessageConnection) {
             },
         },
         /** @experimental */
+        managedSettings: {
+            /**
+             * Discovers device-managed settings from production MDM and managed-file sources, validates them against the runtime-owned managed-settings schema, and returns the canonical JSON without requiring a session.
+             *
+             * @returns Validated device-managed settings discovered before a session exists.
+             */
+            read: async (): Promise<ManagedSettingsReadResult> =>
+                connection.sendRequest("managedSettings.read", {}),
+        },
+        /** @experimental */
         runtime: {
             /**
              * Gracefully shuts down an SDK-owned runtime. The response is sent only after cleanup completes; callers may then terminate the owned runtime process.
@@ -19209,7 +23442,7 @@ export function createInternalServerRpc(connection: MessageConnection) {
         /**
          * Performs the SDK server connection handshake and validates the optional connection token. Marked internal because this is JSON-RPC transport plumbing invoked automatically by an SDK client's own `connect()` wrapper, not a user-facing method. Stays internal as long as the SDK client owns the handshake; would only become public if the SDK ever exposed the raw schema surface to consumers without a connection wrapper.
          *
-         * @param params Parameters for the `server.connect` handshake: an optional connection token and optional connection-level opt-ins (e.g. GitHub telemetry forwarding).
+         * @param params Connection-level opt-ins for the `server.connect` handshake. Transport authentication is consumed by the native protocol boundary before dispatch.
          *
          * @returns Handshake result reporting the server's protocol version and package version on success.
          *
@@ -19471,10 +23704,12 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
             /**
              * Lists durable factory runs for this session in creation order.
              *
-             * @returns Factory runs in durable creation order.
+             * @param params Parameters for paging factory runs.
+             *
+             * @returns A page of factory runs in durable creation order.
              */
-            listRuns: async (): Promise<FactoryListRunsResult> =>
-                connection.sendRequest("session.factory.listRuns", { sessionId }),
+            listRuns: async (params: FactoryListRunsRequest): Promise<FactoryListRunsResult> =>
+                connection.sendRequest("session.factory.listRuns", { sessionId, ...params }),
             /**
              * Gets durable and live observability detail for one factory run.
              *
@@ -19592,8 +23827,10 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              * Sets the current agent interaction mode.
              *
              * @param params Agent interaction mode to apply to the session.
+             *
+             * @returns Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.
              */
-            set: async (params: ModeSetRequest): Promise<void> =>
+            set: async (params: ModeSetRequest): Promise<ModeSetResult> =>
                 connection.sendRequest("session.mode.set", { sessionId, ...params }),
         },
         /** @experimental */
@@ -20051,6 +24288,13 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              */
             reload: async (): Promise<void> =>
                 connection.sendRequest("session.mcp.reload", { sessionId }),
+            /**
+             * Releases any turns waiting on an in-flight MCP load without cancelling the load, letting the agent proceed while MCP servers finish connecting in the background. No-op when no MCP load is in flight or waiting turns were already released.
+             *
+             * @returns Result of moving in-flight MCP loading to the background.
+             */
+            moveLoadingToBackground: async (): Promise<MoveMcpLoadingToBackgroundResult> =>
+                connection.sendRequest("session.mcp.moveLoadingToBackground", { sessionId }),
             /**
              * Runs an MCP sampling inference on behalf of an MCP server.
              *
@@ -20142,6 +24386,15 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
                  */
                 login: async (params: McpOauthLoginRequest): Promise<McpOauthLoginResult> =>
                     connection.sendRequest("session.mcp.oauth.login", { sessionId, ...params }),
+                /**
+                 * Passively probes a configured remote MCP server to classify whether OAuth is required or a cached/override token is accepted. Does not start OAuth, emit pending OAuth requests, or mutate MCP connection state.
+                 *
+                 * @param params Remote MCP server name for a passive OAuth status probe.
+                 *
+                 * @returns Passive MCP OAuth probe result. `authenticated` means the server accepted the probe request while an OAuth-origin access token was attached; it does not prove the server required or independently validated that token. The probe does not make a second unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are reserved for API-call failures.
+                 */
+                probe: async (params: McpOauthProbeRequest): Promise<McpOauthProbeResult> =>
+                    connection.sendRequest("session.mcp.oauth.probe", { sessionId, ...params }),
                 /**
                  * Responds to a pending MCP OAuth authorization request by its request id.
                  *
@@ -20346,6 +24599,33 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
         },
         /** @experimental */
         tools: {
+            /**
+             * Executes one tool from the session's currently offered tool set through the native invocation pipeline.
+             *
+             * @param params A tool name and arguments to execute through the session's native invocation pipeline.
+             *
+             * @returns Canonical result returned by a session tool.
+             */
+            execute: async (params: ToolsExecuteRequest): Promise<ToolResult> =>
+                connection.sendRequest("session.tools.execute", { sessionId, ...params }),
+            /**
+             * Returns the Rust-owned built-in tool descriptors used to construct the session's offered tool set.
+             *
+             * @param params Options controlling how Rust-owned built-in tool descriptors are materialized.
+             *
+             * @returns Rust-owned built-in tool descriptors for the session.
+             */
+            getBuiltinDescriptors: async (params: ToolsGetBuiltinDescriptorsRequest): Promise<ToolsGetBuiltinDescriptorsResult> =>
+                connection.sendRequest("session.tools.getBuiltinDescriptors", { sessionId, ...params }),
+            /**
+             * Projects a completed task_complete tool call into its label-safe session event payload.
+             *
+             * @param params Task-completion tool arguments and final result used to build a label-safe session event payload.
+             *
+             * @returns Task completion notification with summary from the agent
+             */
+            taskCompleteEventData: async (params: ToolsTaskCompleteEventDataRequest): Promise<TaskCompleteData> =>
+                connection.sendRequest("session.tools.taskCompleteEventData", { sessionId, ...params }),
             /**
              * Provides the result for a pending external tool call.
              *
@@ -20369,6 +24649,15 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              */
             getCurrentMetadata: async (): Promise<ToolsGetCurrentMetadataResult> =>
                 connection.sendRequest("session.tools.getCurrentMetadata", { sessionId }),
+            /**
+             * Atomically replaces the complete externally implemented tool list supplied by the calling connection. Built-in, MCP/plugin, extension-discovered, subagent, and tools supplied by other connections remain unchanged.
+             *
+             * @param params Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.
+             *
+             * @returns Empty result after replacing the calling connection's externally implemented tools.
+             */
+            set: async (params: ToolsSetRequest): Promise<ToolsSetResult> =>
+                connection.sendRequest("session.tools.set", { sessionId, ...params }),
             /**
              * Updates the current session's live subagent settings after user settings change. The persisted user settings remain the source of truth for future sessions.
              *
@@ -20460,7 +24749,7 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              *
              * @param params Transient question to answer without adding it to conversation history.
              *
-             * @returns Transient answer generated from current conversation context.
+             * @returns Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs.
              */
             ephemeralQuery: async (params: UIEphemeralQueryRequest): Promise<UIEphemeralQueryResult> =>
                 connection.sendRequest("session.ui.ephemeralQuery", { sessionId, ...params }),
@@ -20581,21 +24870,21 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
             setApproveAll: async (params: PermissionsSetApproveAllRequest): Promise<PermissionsSetApproveAllResult> =>
                 connection.sendRequest("session.permissions.setApproveAll", { sessionId, ...params }),
             /**
-             * Sets the allow-all permission mode for the session. Used by attach-mode clients (e.g. LocalRpcSession's `/allow-all` forwarder) to flip the target session's permission state. The `on` mode swaps in unrestricted path and URL managers and emits `session.permissions_changed` on transition; the `auto` mode keeps normal prompt paths active while attaching LLM safety recommendations. The result returns the authoritative post-mutation state so callers can update their local mirrors without racing the `session.permissions_changed` notification on the same wire.
+             * Sets the permission mode for the session. `manual` follows the normal approval flow, `assisted` attaches LLM safety recommendations, and `allow-all` automatically approves permission requests. The result returns the authoritative post-mutation mode so callers can update local state without racing the `session.permissions_changed` notification.
              *
-             * @param params Allow-all mode to apply for the session.
+             * @param params Permission mode to apply for the session.
              *
-             * @returns Indicates whether the operation succeeded and reports the post-mutation state.
+             * @returns Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode.
              */
-            setAllowAll: async (params: PermissionsSetAllowAllRequest): Promise<AllowAllPermissionSetResult> =>
-                connection.sendRequest("session.permissions.setAllowAll", { sessionId, ...params }),
+            setMode: async (params: PermissionsSetModeRequest): Promise<PermissionsSetModeResult> =>
+                connection.sendRequest("session.permissions.setMode", { sessionId, ...params }),
             /**
-             * Returns the current allow-all permission mode for the session.
+             * Returns the current permission mode for the session.
              *
-             * @returns Current allow-all permission mode.
+             * @returns Current permission mode.
              */
-            getAllowAll: async (): Promise<AllowAllPermissionState> =>
-                connection.sendRequest("session.permissions.getAllowAll", { sessionId }),
+            getMode: async (): Promise<PermissionsGetModeResult> =>
+                connection.sendRequest("session.permissions.getMode", { sessionId }),
             /**
              * Adds or removes session-scoped or location-scoped permission rules.
              *
@@ -20642,7 +24931,7 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
                 list: async (): Promise<PermissionPathsList> =>
                     connection.sendRequest("session.permissions.paths.list", { sessionId }),
                 /**
-                 * Adds a directory to the session's allow-list.
+                 * Adds a directory to the session's allow-list and activates conventional skill and agent definitions under it.
                  *
                  * @param params Directory path to add to the session's allowed directories.
                  *
@@ -21182,6 +25471,101 @@ export function createInternalSessionRpc(connection: MessageConnection, sessionI
         sendSystemNotification: async (params: SendSystemNotificationRequest): Promise<void> =>
             connection.sendRequest("session.sendSystemNotification", { sessionId, ...params }),
         /** @experimental */
+        gitHubAuth: {
+            /**
+             * Gets the current authentication information for internal session hosts.
+             *
+             * @returns Current authentication information, or null when no authentication is active.
+             */
+            getCurrentAuthInfo: async (): Promise<AuthIdentity | undefined> =>
+                connection.sendRequest("session.gitHubAuth.getCurrentAuthInfo", { sessionId }),
+            /**
+             * Gets all authentication accounts available to the internal session host.
+             *
+             * @returns Authentication accounts available to the internal session host.
+             */
+            getAllAuthAvailable: async (): Promise<SessionGitHubAuthGetAllAuthAvailableResult> =>
+                connection.sendRequest("session.gitHubAuth.getAllAuthAvailable", { sessionId }),
+            /**
+             * Refreshes Copilot account metadata for the current authentication.
+             *
+             * @returns Current authentication information, or null when no authentication is active.
+             */
+            refreshCopilotUser: async (): Promise<AuthIdentity | undefined> =>
+                connection.sendRequest("session.gitHubAuth.refreshCopilotUser", { sessionId }),
+            /**
+             * Logs in a GitHub user through the internal session host.
+             *
+             * @param params Internal GitHub login parameters.
+             *
+             * @returns Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.
+             */
+            login: async (params: SessionAuthLoginRequest): Promise<AuthInfo> =>
+                connection.sendRequest("session.gitHubAuth.login", { sessionId, ...params }),
+            /**
+             * Switches the session to another available authentication.
+             *
+             * @param params Parameters for switching the session's active authentication.
+             */
+            switchToAuth: async (params: SessionAuthSwitchRequest): Promise<void> =>
+                connection.sendRequest("session.gitHubAuth.switchToAuth", { sessionId, ...params }),
+            /**
+             * Logs out the session's current GitHub authentication.
+             *
+             * @returns Whether the current authentication was logged out.
+             */
+            logout: async (): Promise<SessionGitHubAuthLogoutResult> =>
+                connection.sendRequest("session.gitHubAuth.logout", { sessionId }),
+            /**
+             * Logs out a specific GitHub authentication.
+             *
+             * @param params Parameters identifying a GitHub authentication to log out.
+             *
+             * @returns Whether the requested authentication was logged out.
+             */
+            logoutUser: async (params: SessionAuthLogoutUserRequest): Promise<SessionGitHubAuthLogoutUserResult> =>
+                connection.sendRequest("session.gitHubAuth.logoutUser", { sessionId, ...params }),
+            /**
+             * Gets validation errors from the most recent authentication attempt.
+             *
+             * @returns Validation errors from the most recent authentication attempt.
+             */
+            lastAuthErrors: async (): Promise<AuthValidationErrors> =>
+                connection.sendRequest("session.gitHubAuth.lastAuthErrors", { sessionId }),
+        },
+        /** @experimental */
+        canvas: {
+            /** @experimental */
+            provider: {
+                /**
+                 * Registers an internal canvas provider connection and its contributions.
+                 *
+                 * @param params Internal canvas provider registration parameters.
+                 */
+                register: async (params: CanvasProviderRegisterRequest): Promise<void> =>
+                    connection.sendRequest("session.canvas.provider.register", { sessionId, ...params }),
+                /**
+                 * Unregisters an internal canvas provider connection.
+                 *
+                 * @param params Internal canvas provider unregistration parameters.
+                 */
+                unregister: async (params: CanvasProviderUnregisterRequest): Promise<void> =>
+                    connection.sendRequest("session.canvas.provider.unregister", { sessionId, ...params }),
+            },
+        },
+        /** @experimental */
+        model: {
+            /**
+             * Resolves and applies organization-managed and repository model overlays.
+             *
+             * @param params Managed, repository, and CLI model overrides to overlay onto the session at startup.
+             *
+             * @returns The model identifier active on the session after the switch.
+             */
+            applyStartupOverlay: async (params: ModelApplyStartupOverlayRequest): Promise<ModelSwitchToResult> =>
+                connection.sendRequest("session.model.applyStartupOverlay", { sessionId, ...params }),
+        },
+        /** @experimental */
         mcp: {
             /**
              * Reloads MCP server connections for the session with an explicit host-provided configuration.
@@ -21195,7 +25579,7 @@ export function createInternalSessionRpc(connection: MessageConnection, sessionI
             /**
              * Configures the built-in GitHub MCP server for the session's current auth context.
              *
-             * @param params Opaque auth info used to configure GitHub MCP.
+             * @param params Credential-free authentication identity used to configure GitHub MCP.
              *
              * @returns Result of configuring GitHub MCP.
              */
@@ -21217,6 +25601,18 @@ export function createInternalSessionRpc(connection: MessageConnection, sessionI
                 connection.sendRequest("session.mcp.unregisterExternalClient", { sessionId, ...params }),
         },
         /** @experimental */
+        commands: {
+            /**
+             * Finalizes persistence associated with a client-applied slash-command effect.
+             *
+             * @param params The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.
+             *
+             * @returns Whether finalizing the invocation effect succeeded, and the failure reason when it did not.
+             */
+            finalizeInvocationEffect: async (params: CommandsFinalizeInvocationEffectRequest): Promise<CommandsFinalizeInvocationEffectResult> =>
+                connection.sendRequest("session.commands.finalizeInvocationEffect", { sessionId, ...params }),
+        },
+        /** @experimental */
         settings: {
             /**
              * Returns a redacted snapshot of session runtime settings, with secrets and raw feature flags excluded. Internal: the runtime settings shape is a runtime-internal surface and is deliberately kept out of the public SDK, because consumers should not depend on the runtime's internal settings layout. It remains callable in-process and is expected to be reworked as the runtime internals are consolidated.
@@ -21646,6 +26042,19 @@ export function registerClientSessionApiHandlers(
     });
 }
 
+/** Handler for `extensionLaunchProvider` client global API methods. */
+/** @experimental */
+export interface ExtensionLaunchProviderHandler {
+    /**
+     * Asks the registered SDK client to resolve an opaque process launch profile for one discovered extension entrypoint immediately before launch or reload. The provider must respond within 15 seconds.
+     *
+     * @param params A discovered extension entrypoint that the registered integrator may classify and resolve to an opaque launch profile.
+     *
+     * @returns The launch profile for a supported entrypoint. Omit launch when the provider does not support the entrypoint.
+     */
+    resolve(params: ExtensionLaunchProviderResolveRequest): Promise<ExtensionLaunchProviderResolveResult>;
+}
+
 /** Handler for `llmInference` client global API methods. */
 /** @experimental */
 export interface LlmInferenceHandler {
@@ -21678,10 +26087,25 @@ export interface GitHubTelemetryHandler {
     event(params: GitHubTelemetryNotification): Promise<void>;
 }
 
+/** Handler for `gitHubToken` client global API methods. */
+/** @experimental */
+export interface GitHubTokenHandler {
+    /**
+     * Asks the SDK client to mint a GitHub access token for a session whose configuration supplied a GitHub token provider. The runtime acquires the initial token during bootstrap and refreshes it during expiry preflight when one hour or less remains.
+     *
+     * @param params Asks the SDK client to acquire a GitHub access token from an opaque callback registration.
+     *
+     * @returns SDK host response to a GitHub credential request.
+     */
+    getToken(params: GitHubTokenAcquireRequest): Promise<GitHubTokenAcquireResult>;
+}
+
 /** All client global API handler groups. */
 export interface ClientGlobalApiHandlers {
+    extensionLaunchProvider?: ExtensionLaunchProviderHandler;
     llmInference?: LlmInferenceHandler;
     gitHubTelemetry?: GitHubTelemetryHandler;
+    gitHubToken?: GitHubTokenHandler;
 }
 
 /**
@@ -21695,6 +26119,11 @@ export function registerClientGlobalApiHandlers(
     connection: MessageConnection,
     handlers: ClientGlobalApiHandlers,
 ): void {
+    connection.onRequest("extensionLaunchProvider.resolve", async (params: ExtensionLaunchProviderResolveRequest) => {
+        const handler = handlers.extensionLaunchProvider;
+        if (!handler) throw new Error("No extensionLaunchProvider client-global handler registered");
+        return handler.resolve(params);
+    });
     connection.onRequest("llmInference.httpRequestStart", async (params: LlmInferenceHttpRequestStartRequest) => {
         const handler = handlers.llmInference;
         if (!handler) throw new Error("No llmInference client-global handler registered");
@@ -21710,4 +26139,9 @@ export function registerClientGlobalApiHandlers(
         if (!handler) return;
         await handler.event(params);
     });
+    connection.onRequest("gitHubToken.getToken", async (params: GitHubTokenAcquireRequest) => {
+        const handler = handlers.gitHubToken;
+        if (!handler) throw new Error("No gitHubToken client-global handler registered");
+        return handler.getToken(params);
+    });
 }
diff --git a/nodejs/src/generated/session-events.ts b/nodejs/src/generated/session-events.ts
index 1dad4ab166..473a2dbe16 100644
--- a/nodejs/src/generated/session-events.ts
+++ b/nodejs/src/generated/session-events.ts
@@ -3,6 +3,9 @@
  * Generated from: session-events.schema.json
  */
 
+/** A value that can be represented losslessly on the SDK JSON wire. */
+export type JsonValue = null | boolean | number | string | JsonValue[] | { [key: string]: JsonValue };
+
 /**
  * Union of all session event variants emitted by the Copilot CLI runtime.
  */
@@ -53,6 +56,7 @@ export type SessionEvent =
   | AssistantIdleEvent
   | AssistantUsageEvent
   | ModelCallFailureEvent
+  | ModelCallFinishedEvent
   | AbortEvent
   | ToolUserRequestedEvent
   | ToolExecutionStartEvent
@@ -85,6 +89,7 @@ export type SessionEvent =
   | McpHeadersRefreshRequiredEvent
   | McpHeadersRefreshCompletedEvent
   | CustomNotificationEvent
+  | UIEphemeralQueryEvent
   | ExternalToolRequestedEvent
   | ExternalToolCompletedEvent
   | CommandQueuedEvent
@@ -104,6 +109,8 @@ export type SessionEvent =
   | ToolsUpdatedEvent
   | BackgroundTasksChangedEvent
   | FactoryRunUpdatedEvent
+  | FactoryRunStartedEvent
+  | FactoryRunSettledEvent
   | SkillsLoadedEvent
   | CustomAgentsUpdatedEvent
   | McpServersLoadedEvent
@@ -156,6 +163,16 @@ export type Verbosity =
   | "medium"
   /** A more detailed response was requested. */
   | "high";
+/**
+ * The session mode the agent is operating in
+ */
+export type SessionMode =
+  /** The agent is responding interactively to the user. */
+  | "interactive"
+  /** The agent is preparing a plan before making changes. */
+  | "plan"
+  /** The agent is working autonomously toward task completion. */
+  | "autopilot";
 /**
  * Who created the schedule: `user` (an explicit user action such as `/every` or `/after`) or `model` (the agent via the `manage_schedule` tool). Gates whether a scheduled skill that opted out of model invocation may fire: only user-created schedules may.
  */
@@ -187,26 +204,42 @@ export type AutopilotObjectiveChangedStatus =
   /** Objective was completed by the agent. */
   | "completed";
 /**
- * The session mode the agent is operating in
- */
-export type SessionMode =
-  /** The agent is responding interactively to the user. */
-  | "interactive"
-  /** The agent is preparing a plan before making changes. */
-  | "plan"
-  /** The agent is working autonomously toward task completion. */
-  | "autopilot";
+ * Origin of an effective session model change.
+ */
+export type ModelChangeSource =
+  /** The user selected a model directly with `/model <id>`. */
+  | "model_command"
+  /** The user selected the model with `/settings`. */
+  | "settings_command"
+  /** The user selected the model with the `/config` alias. */
+  | "config_command"
+  /** The user selected the model in the model picker, including the picker opened by bare `/model`. */
+  | "model_picker"
+  /** Organization-managed settings selected the model. */
+  | "managed_settings"
+  /** Repository settings selected the model. */
+  | "repo_settings"
+  /** Startup model resolution selected the model. */
+  | "startup"
+  /** Selecting an agent selected its configured model. */
+  | "agent"
+  /** Entering, leaving, or reconfiguring plan mode selected the model. */
+  | "plan_mode"
+  /** The runtime selected the model automatically, such as rate-limit recovery or refusal fallback. */
+  | "automatic"
+  /** An SDK or RPC caller selected the model. */
+  | "sdk";
 /**
- * Allow-all mode for the session.
+ * Permission mode for the session.
  */
 /** @experimental */
-export type PermissionAllowAllMode =
+export type PermissionMode =
   /** Permission requests follow the normal approval flow. */
-  | "off"
+  | "manual"
+  /** Permission requests include an LLM safety recommendation; clients may automatically approve requests judged acceptable. */
+  | "assisted"
   /** Tool, path, and URL permission requests are automatically approved. */
-  | "on"
-  /** Permission requests follow the normal approval flow with an LLM advisory recommendation attached; clients may choose to auto-approve requests the judge evaluated as acceptable. */
-  | "auto";
+  | "allow-all";
 /**
  * The type of operation performed on the plan file
  */
@@ -360,6 +393,14 @@ export type AssistantUsageApiEndpoint =
   | "/responses"
   /** WebSocket Responses API endpoint. */
   | "ws:/responses";
+/**
+ * Transport used for a successful model call
+ */
+export type AssistantUsageTransport =
+  /** HTTP transport, including SSE streams. */
+  | "http"
+  /** WebSocket transport. */
+  | "websocket";
 /**
  * For HTTP 400 failures only: whether the response carried a structured CAPI error envelope (structured_error, a deterministic validation failure) or no error body (bodyless, the transient gateway/proxy signature). Absent for non-400 failures.
  */
@@ -394,6 +435,18 @@ export type ModelCallFailureTransport =
   | "http"
   /** WebSocket transport. */
   | "websocket";
+/**
+ * Final outcome of one logical model dispatch after response acceptance processing
+ */
+export type ModelCallFinishedOutcome =
+  /** The provider response was accepted for continued agent processing. */
+  | "success"
+  /** The dispatch ended with a provider or transport error. */
+  | "error"
+  /** The dispatch was cancelled before an accepted response was produced. */
+  | "cancelled"
+  /** The provider response was rejected during post-response acceptance processing. */
+  | "rejected";
 /**
  * Finite reason code describing why the current turn was aborted
  */
@@ -546,7 +599,15 @@ export type PermissionRequest =
   | PermissionRequestHook
   | PermissionRequestExtensionManagement
   | PermissionRequestFactory
-  | PermissionRequestExtensionPermissionAccess;
+  | PermissionRequestExtensionPermissionAccess
+  | PermissionRequestExtensionEnvAccess;
+/**
+ * Advisory recommendation the runtime attaches to a permission request whose origin it can vouch for by construction. Unlike the auto-approval judge this does not depend on auto mode and does not evaluate what the tool call does; its absence simply means the runtime has no opinion and the request follows the host's normal approval flow.
+ */
+/** @experimental */
+export type PermissionRecommendation =
+  /** The runtime vouches for the request's origin and recommends approving it without prompting. The host still owns the decision and may deny it; deny rules, managed policy, and the auto-approval safety judge all outrank this recommendation. */
+  "approve";
 /**
  * Whether this is a store or vote memory operation
  */
@@ -555,6 +616,34 @@ export type PermissionRequestMemoryAction =
   | "store"
   /** Vote on an existing memory. */
   | "vote";
+/**
+ * Why the assisted-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs.
+ */
+/** @experimental */
+export type AssistedApprovalJudgeFailureReason =
+  /** The judge model call exceeded its deadline. */
+  | "timeout"
+  /** The judge model call was cancelled before it returned. */
+  | "abort"
+  /** The judge model call completed but returned no content. */
+  | "empty_response"
+  /** The judge model call failed (for example a transport, authentication, or rate-limit error). */
+  | "model_error"
+  /** The judge model replied, but the reply carried no ALLOW/DENY verdict. */
+  | "parse_error";
+/**
+ * Outcome of the assisted-approval safety judge for a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request.
+ */
+/** @experimental */
+export type AssistedApprovalRecommendation =
+  /** The judge evaluated the request and recommends automatically approving it. */
+  | "approve"
+  /** The judge evaluated the request and does not recommend automatically approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision. */
+  | "requireApproval"
+  /** Assisted mode is enabled, but this request category is never automatically approvable (for example, sandbox-bypass requests), so the judge was not consulted. */
+  | "excluded"
+  /** The judge was consulted but did not return a usable recommendation, so the request requires explicit approval. */
+  | "error";
 /**
  * Vote direction (vote only)
  */
@@ -563,6 +652,14 @@ export type PermissionRequestMemoryDirection =
   | "upvote"
   /** Vote that the memory is incorrect or outdated. */
   | "downvote";
+/**
+ * Scope of a stored memory.
+ */
+export type PermissionRequestMemoryScope =
+  /** Store the memory for the current repository. */
+  | "repository"
+  /** Store the memory for the current user. */
+  | "user";
 /**
  * Operation gated by a factory permission request.
  */
@@ -586,35 +683,8 @@ export type PermissionPromptRequest =
   | PermissionPromptRequestHook
   | PermissionPromptRequestExtensionManagement
   | PermissionPromptRequestFactory
-  | PermissionPromptRequestExtensionPermissionAccess;
-/**
- * Why the auto-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs.
- */
-/** @experimental */
-export type AutoApprovalJudgeFailureReason =
-  /** The judge model call exceeded its deadline. */
-  | "timeout"
-  /** The judge model call was cancelled before it returned. */
-  | "abort"
-  /** The judge model call completed but returned no content. */
-  | "empty_response"
-  /** The judge model call failed (for example a transport, authentication, or rate-limit error). */
-  | "model_error"
-  /** The judge model replied, but the reply carried no ALLOW/DENY verdict. */
-  | "parse_error";
-/**
- * Outcome of the auto-approval safety judge for a permission request. Present only when auto mode is enabled; its absence means the judge did not evaluate the request (auto mode was off).
- */
-/** @experimental */
-export type AutoApprovalRecommendation =
-  /** The judge evaluated the request and recommends automatically approving it. */
-  | "approve"
-  /** The judge evaluated the request and does not recommend auto-approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision. */
-  | "requireApproval"
-  /** Auto mode is enabled, but this request category is never auto-approvable (for example, sandbox-bypass requests), so the judge was not consulted. */
-  | "excluded"
-  /** The judge was consulted but did not return a usable recommendation, so the request requires explicit approval. */
-  | "error";
+  | PermissionPromptRequestExtensionPermissionAccess
+  | PermissionPromptRequestExtensionEnvAccess;
 /**
  * Underlying permission kind that needs path approval
  */
@@ -650,7 +720,8 @@ export type UserToolSessionApproval =
   | UserToolSessionApprovalCustomTool
   | UserToolSessionApprovalExtensionManagement
   | UserToolSessionApprovalFactory
-  | UserToolSessionApprovalExtensionPermissionAccess;
+  | UserToolSessionApprovalExtensionPermissionAccess
+  | UserToolSessionApprovalExtensionEnvAccess;
 /**
  * Elicitation mode; "form" for structured input, "url" for browser-based. Defaults to "form" when absent.
  */
@@ -669,6 +740,10 @@ export type ElicitationCompletedAction =
   | "decline"
   /** The user dismissed the request. */
   | "cancel";
+/**
+ * Opaque JSON value submitted for one field in accepted `elicitation.completed` form content.
+ */
+export type ElicitationCompletedContent = JsonValue | undefined;
 /**
  * Reason the runtime is requesting host-provided MCP OAuth credentials
  */
@@ -709,6 +784,25 @@ export type McpHeadersRefreshCompletedOutcome =
   | "none"
   /** No response arrived within the bounded window. */
   | "timeout";
+/**
+ * Source-defined JSON payload for the custom notification
+ */
+export type CustomNotificationPayload = JsonValue;
+/**
+ * Lifecycle phase for a Rust-owned ephemeral query stream.
+ */
+/** @experimental */
+export type UIEphemeralQueryPhase =
+  /** The ephemeral query stream has begun. */
+  | "started"
+  /** A partial result chunk was produced by the stream. */
+  | "chunk"
+  /** The ephemeral query stream finished successfully. */
+  | "completed"
+  /** The ephemeral query stream ended with an error. */
+  | "failed"
+  /** The ephemeral query stream was cancelled before completing. */
+  | "aborted";
 /**
  * The user's auto-mode-switch choice
  */
@@ -742,14 +836,18 @@ export type AutoModeResolvedReasoningBucket =
   /** The request looks high-reasoning; a stronger model is appropriate. */
   | "high";
 /**
- * Which channel supplied the effective enterprise managed settings (highest-authority present layer wins wholesale)
+ * Summary of which managed-settings channels contributed to the effective session policy. Use the per-channel booleans for exact provenance.
  */
 export type ManagedSettingsResolvedSource =
-  /** Account/org policy self-fetched from the GitHub managed-settings endpoint (higher authority). */
+  /** Only the server/account channel contributed. */
   | "server"
-  /** Device-level MDM policy discovered from plist/registry/file (lower authority). */
+  /** Only the device MDM/plist/registry/file channel contributed. */
   | "device"
-  /** No managed policy is in force (no layer contributed). */
+  /** Only session-local SDK-host injection contributed. */
+  | "client"
+  /** More than one channel contributed. Ordinary keys resolve device over server per key, while permissions compose restrictively across all present layers. */
+  | "mixed"
+  /** No managed policy is in force (no channel contributed). */
   | "none";
 /**
  * The category of runtime action that enterprise managed settings governed (blocked or capped)
@@ -761,16 +859,18 @@ export type ManagedSettingsEnforcedAction =
  * For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused
  */
 export type ManagedSettingsEnforcedEscalation =
-  /** Full allow-all ("/allow-all on") permissions — auto-approving tools, paths, and URLs. */
+  /** Full allow-all permissions — automatically approving tools, paths, and URLs. */
   | "allow_all"
-  /** Auto-approval of all tool permission requests. */
+  /** Automatic approval of all tool permission requests. */
   | "approve_all"
-  /** Advisory auto-approval ("/allow-all auto") mode — keeps normal prompt paths and adds LLM-advised approval, distinct from full allow-all. */
-  | "auto_approval"
+  /** Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all. */
+  | "assisted_approval"
   /** Unrestricted filesystem access outside the session's allowed directories. */
   | "unrestricted_paths"
   /** Unrestricted URL fetch access. */
-  | "unrestricted_urls";
+  | "unrestricted_urls"
+  /** A server-wide MCP "Always Allow" (or `--allow-tool <server>`) blanket that would auto-approve every tool from an MCP server. Capped to per-tool approval; each tool still prompts. */
+  | "server_wide_mcp_approval";
 /**
  * Exit plan mode action
  */
@@ -783,6 +883,18 @@ export type ExitPlanModeAction =
   | "autopilot"
   /** Exit plan mode and continue with parallel autonomous workers. */
   | "autopilot_fleet";
+/**
+ * Terminal status a factory run committed. A settled run is never `pending` or `running`, so those two members of the run-status domain are deliberately absent.
+ */
+export type FactoryRunSettledStatus =
+  /** The factory body resolved and its result was committed. */
+  | "completed"
+  /** The run was stopped by a limit, an approval refusal or another policy decision. */
+  | "halted"
+  /** The run was cancelled by its caller or by session disposal. */
+  | "cancelled"
+  /** The run failed, with `failureType` carrying the class when it has one. */
+  | "error";
 /**
  * Source location type (e.g., project, personal-copilot, plugin, builtin)
  */
@@ -1250,6 +1362,7 @@ export interface IdleData {
    * True when the preceding agentic loop was cancelled via abort signal
    */
   aborted?: boolean;
+  mode?: SessionMode;
 }
 /**
  * Session event "session.title_changed". Session title change payload containing the new display title
@@ -1644,6 +1757,7 @@ export interface ModelChangeData {
    */
   reasoningEffort?: string | null;
   reasoningSummary?: ReasoningSummary;
+  source?: ModelChangeSource;
   verbosity?: Verbosity;
 }
 /**
@@ -1723,8 +1837,9 @@ export interface SessionLimitsChangedData {
   sessionLimits: SessionLimitsConfig | null;
 }
 /**
- * Session event "session.permissions_changed". Permissions change details carrying the aggregate allow-all transition.
+ * Session event "session.permissions_changed". Permission-mode transition details.
  */
+/** @experimental */
 export interface PermissionsChangedEvent {
   /**
    * Sub-agent instance identifier. Absent for events from the root/main agent and session-level events.
@@ -1753,29 +1868,28 @@ export interface PermissionsChangedEvent {
   type: "session.permissions_changed";
 }
 /**
- * Permissions change details carrying the aggregate allow-all transition.
+ * Permission-mode transition details.
  */
+/** @experimental */
 export interface PermissionsChangedData {
   /**
-   * Allow-all mode after the change
+   * Explicit LLM judge model override used by assisted mode; omitted when the provider default applies
    *
    * @experimental
    */
-  allowAllPermissionMode?: PermissionAllowAllMode;
-  /**
-   * Aggregate allow-all flag after the change
-   */
-  allowAllPermissions: boolean;
+  assistedApprovalModel?: string;
   /**
-   * Allow-all mode before the change
+   * Permission mode after the change
    *
    * @experimental
    */
-  previousAllowAllPermissionMode?: PermissionAllowAllMode;
+  mode: PermissionMode;
   /**
-   * Aggregate allow-all flag before the change
+   * Permission mode before the change
+   *
+   * @experimental
    */
-  previousAllowAllPermissions: boolean;
+  previousMode: PermissionMode;
 }
 /**
  * Session event "session.plan_changed". Plan file operation details indicating what changed
@@ -2105,6 +2219,12 @@ export interface ShutdownEvent {
  * Session termination metrics including usage statistics, code changes, and shutdown reason
  */
 export interface ShutdownData {
+  /**
+   * Per-agent usage breakdown, keyed by agent instance identifier. The main conversation uses the stable key `main`.
+   */
+  agentMetrics?: {
+    [k: string]: ShutdownAgentMetric | undefined;
+  };
   codeChanges: ShutdownCodeChanges;
   /**
    * Non-system message token count at shutdown
@@ -2169,21 +2289,31 @@ export interface ShutdownData {
   totalPremiumRequests?: number;
 }
 /**
- * Aggregate code change metrics for the session
+ * Usage attributed to one agent instance at session shutdown.
  */
-export interface ShutdownCodeChanges {
+export interface ShutdownAgentMetric {
   /**
-   * List of file paths that were modified during the session
+   * Human-readable label for this subagent invocation, copied from the originating `subagent.started` event. For task-tool subagents this is the invocation's task description rather than the agent's configured display name, so group by `agentName` for stable per-agent labels.
    */
-  filesModified: string[];
+  agentDisplayName?: string;
   /**
-   * Total number of lines added during the session
+   * Configured agent name, when this is a subagent
    */
-  linesAdded: number;
+  agentName?: string;
   /**
-   * Total number of lines removed during the session
+   * Per-model usage for this agent, keyed by model identifier
    */
-  linesRemoved: number;
+  modelMetrics: {
+    [k: string]: ShutdownModelMetric | undefined;
+  };
+  /**
+   * Time spent in model API calls by this agent, in milliseconds
+   */
+  totalApiDurationMs: number;
+  /**
+   * Accumulated nano-AI units cost for this agent
+   */
+  totalNanoAiu: number;
 }
 /**
  * Per-model shutdown metrics with request counts, token usage, nano-AI units, and token details.
@@ -2255,6 +2385,23 @@ export interface ShutdownModelMetricUsage {
    */
   reasoningTokens?: number;
 }
+/**
+ * Aggregate code change metrics for the session
+ */
+export interface ShutdownCodeChanges {
+  /**
+   * List of file paths that were modified during the session
+   */
+  filesModified: string[];
+  /**
+   * Total number of lines added during the session
+   */
+  linesAdded: number;
+  /**
+   * Total number of lines removed during the session
+   */
+  linesRemoved: number;
+}
 /**
  * A session-wide shutdown token-type entry storing the accumulated token count.
  */
@@ -2304,6 +2451,12 @@ export interface UsageCheckpointData {
    * @internal
    */
   modelCacheState?: UsageCheckpointModelCacheState[];
+  /**
+   * Internal per-conversation prompt-cache-break detector baselines restored on resume
+   *
+   * @internal
+   */
+  promptCacheBreakState?: JsonValue[];
   /**
    * Session-wide accumulated nano-AI units cost at checkpoint time
    */
@@ -2836,6 +2989,10 @@ export interface UserMessageData {
    * Transformed version of the message sent to the model, with XML wrapping, timestamps, and other augmentations for prompt caching
    */
   transformedContent?: string;
+  /**
+   * The agent-loop turn ID that consumed this message; absent when no agent-loop turn consumed it
+   */
+  turnId?: string;
 }
 /**
  * File attachment
@@ -3265,9 +3422,7 @@ export interface AttachmentExtensionContext {
   /**
    * Caller-supplied JSON payload
    */
-  payload?: {
-    [k: string]: unknown | undefined;
-  };
+  payload?: JsonValue;
   /**
    * Human-readable composer pill label
    */
@@ -3486,6 +3641,9 @@ export interface AssistantReasoningData {
    * Unique identifier for this reasoning block
    */
   reasoningId: string;
+  /**
+   * Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+   */
   rte?: boolean;
 }
 /**
@@ -3707,6 +3865,7 @@ export interface AssistantMessageData {
    * Generation phase for phased-output models (e.g., thinking vs. response phases)
    */
   phase?: string;
+  reasoningBlocks?: AssistantMessageReasoningBlocks;
   /**
    * Opaque/encrypted extended thinking data from Anthropic models. Session-bound and stripped on resume.
    */
@@ -3723,6 +3882,9 @@ export interface AssistantMessageData {
    * GitHub request tracing ID (x-github-request-id header) for correlating with server-side logs
    */
   requestId?: string;
+  /**
+   * Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+   */
   rte?: boolean;
   serverTools?: AssistantMessageServerTools;
   /**
@@ -3806,9 +3968,7 @@ export interface CitationReference {
   /**
    * Provider-native citation correlation data (e.g. Anthropic search_result_index / document_index), passed through opaquely for debugging and forward compatibility.
    */
-  providerMetadata?: {
-    [k: string]: unknown | undefined;
-  };
+  providerMetadata?: JsonValue;
   /**
    * Identifier of the CitationSource this reference points to (CitationSource.id).
    */
@@ -3868,18 +4028,47 @@ export interface CitationLocationBlock {
    */
   type: "block";
 }
+/**
+ * Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping
+ */
+/** @experimental */
+export interface AssistantMessageReasoningBlocks {
+  /**
+   * Provider-native reasoning content blocks (e.g. Anthropic `thinking` / `redacted_thinking`) preserved verbatim, in order. A single response can carry several, each signed over the content preceding it, so dropping or reordering any of them invalidates the rest.
+   */
+  blocks?: JsonValue[];
+  /**
+   * Model provider that produced these reasoning blocks.
+   */
+  provider: string;
+}
 /**
  * Neutral provider-tagged server-side tool-use payload (tool search, advisor) for verbatim round-tripping
  */
 /** @experimental */
 export interface AssistantMessageServerTools {
+  /**
+   * Advisor model identifier associated with the server-tool payload.
+   */
   advisorModel?: string;
+  /**
+   * Provider function-call namespaces keyed by function-call identifier.
+   */
   functionCallNamespaces?: {
     [k: string]: string | undefined;
   };
-  items?: unknown[];
+  /**
+   * Provider-native server-tool call and output items preserved verbatim for replay.
+   */
+  items?: JsonValue[];
+  /**
+   * Model provider that produced this server-tool payload.
+   */
   provider: string;
-  rawContentBlocks?: unknown[];
+  /**
+   * Raw provider content blocks retained for verbatim round-tripping.
+   */
+  rawContentBlocks?: JsonValue[];
 }
 /**
  * A tool invocation request from the assistant
@@ -3888,9 +4077,7 @@ export interface AssistantMessageToolRequest {
   /**
    * Arguments to pass to the tool, format depends on the tool
    */
-  arguments?: {
-    [k: string]: unknown | undefined;
-  };
+  arguments?: JsonValue;
   /**
    * Resolved intention summary describing what this specific call does
    */
@@ -4124,6 +4311,10 @@ export interface AssistantUsageEvent {
  * LLM API call usage metrics including tokens, costs, quotas, and billing information
  */
 export interface AssistantUsageData {
+  /**
+   * Number of accepted speculative prediction tokens
+   */
+  acceptedPredictionTokens?: number;
   /**
    * Completion ID from the model provider (e.g., chatcmpl-abc123)
    */
@@ -4135,6 +4326,12 @@ export interface AssistantUsageData {
    * @internal
    */
   availableToolCount?: number;
+  /**
+   * Whether the provider reported prompt-cache usage details for this call
+   *
+   * @internal
+   */
+  cacheDetailsReported?: boolean;
   /**
    * Updated prompt-cache expiration for this model call. Present only when the call establishes or refreshes known cache state.
    */
@@ -4143,6 +4340,12 @@ export interface AssistantUsageData {
    * Number of tokens read from prompt cache
    */
   cacheReadTokens?: number;
+  /**
+   * Effective prompt-cache lifetime in seconds for this call
+   *
+   * @internal
+   */
+  cacheTtlSeconds?: number;
   /**
    * Number of tokens written to prompt cache
    */
@@ -4166,6 +4369,12 @@ export interface AssistantUsageData {
    * Finish reason reported by the model for this API call (e.g. "stop", "length", "tool_calls", "content_filter"). Normalized to OpenAI vocabulary; for Anthropic models a "refusal" stop reason maps to "content_filter".
    */
   finishReason?: string;
+  /**
+   * How the prompt-cache frontier was determined for this call
+   *
+   * @internal
+   */
+  frontierSource?: string;
   /**
    * What initiated this API call (e.g., "sub-agent", "mcp-sampling"); absent for user-initiated calls
    */
@@ -4182,6 +4391,22 @@ export interface AssistantUsageData {
    * Average inter-token latency in milliseconds. Only available for streaming requests
    */
   interTokenLatencyMs?: number;
+  /**
+   * Whether Auto mode was selected for this model call
+   */
+  isAuto?: boolean;
+  /**
+   * Whether this model call used a bring-your-own-key provider
+   */
+  isByok?: boolean;
+  /**
+   * Requested maximum output tokens used for this model call
+   */
+  maxOutputTokens?: number;
+  /**
+   * Effective maximum prompt-token limit used for this model call
+   */
+  maxPromptTokens?: number;
   /**
    * Model identifier used for this API call
    */
@@ -4196,6 +4421,10 @@ export interface AssistantUsageData {
    * Number of output tokens produced
    */
   outputTokens?: number;
+  /**
+   * Time to first observable model output in milliseconds. Includes text, reasoning, and tool-call output; only available for streaming requests that produce observable output.
+   */
+  outputTtftMs?: number;
   /**
    * @deprecated
    * Parent tool call ID when this usage originates from a sub-agent
@@ -4217,10 +4446,18 @@ export interface AssistantUsageData {
    * Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max")
    */
   reasoningEffort?: string;
+  reasoningSummary?: ReasoningSummary;
   /**
    * Number of output tokens used for reasoning (e.g., chain-of-thought)
    */
   reasoningTokens?: number;
+  /**
+   * Number of rejected speculative prediction tokens
+   */
+  rejectedPredictionTokens?: number;
+  /**
+   * Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+   */
   rte?: boolean;
   /**
    * Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
@@ -4244,6 +4481,7 @@ export interface AssistantUsageData {
    * @internal
    */
   toolTokenCount?: number;
+  transport?: AssistantUsageTransport;
 }
 /**
  * Per-request cost and usage data from the CAPI copilot_usage response field
@@ -4414,6 +4652,10 @@ export interface ModelCallFailureData {
    * What initiated this API call (e.g., "sub-agent", "mcp-sampling"); absent for user-initiated calls
    */
   initiator?: string;
+  /**
+   * Authoritative interaction classification for the failed call, matching `assistant.usage.interactionType` (for example `conversation-agent`, `conversation-subagent`, or `conversation-sampling`). Absent when the producer cannot classify the interaction.
+   */
+  interactionType?: string;
   /**
    * Whether the session selected Auto mode for the failed call
    */
@@ -4451,6 +4693,9 @@ export interface ModelCallFailureData {
    */
   reasoningEffort?: string;
   requestFingerprint?: ModelCallFailureRequestFingerprint;
+  /**
+   * Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+   */
   rte?: boolean;
   /**
    * Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
@@ -4496,6 +4741,62 @@ export interface ModelCallFailureRequestFingerprint {
    */
   toolResultMessageCount: number;
 }
+/**
+ * Session event "model.call_finished". Final lifecycle outcome for one logical model dispatch. A logical dispatch may include internal reconnect or fallback work, so event count is not provider HTTP-request count.
+ */
+export interface ModelCallFinishedEvent {
+  /**
+   * Sub-agent instance identifier. Absent for events from the root/main agent and session-level events.
+   */
+  agentId?: string;
+  data: ModelCallFinishedData;
+  /**
+   * Always true for events that are transient and not persisted to the session event log on disk.
+   */
+  ephemeral: true;
+  /**
+   * Unique event identifier (UUID v4), generated when the event is emitted
+   */
+  id: string;
+  /**
+   * ID of the chronologically preceding event in the session, forming a linked chain. Null for the first event.
+   */
+  parentId: string | null;
+  /**
+   * ISO 8601 timestamp when the event was created
+   */
+  timestamp: string;
+  /**
+   * Type discriminator. Always "model.call_finished".
+   */
+  type: "model.call_finished";
+}
+/**
+ * Final lifecycle outcome for one logical model dispatch. A logical dispatch may include internal reconnect or fallback work, so event count is not provider HTTP-request count.
+ */
+export interface ModelCallFinishedData {
+  /**
+   * Whether an accepted successful response requested the exact name and command semantics of a built-in file edit tool, including an external tool explicitly replacing that built-in name. Absent when the logical dispatch did not produce an accepted response.
+   */
+  containsBuiltInFileEditRequest?: boolean;
+  /**
+   * Monotonic elapsed time spent in the logical model dispatch, including any internal transport reconnect or fallback and excluding orchestrator retry backoff, tool execution, confirmations, and post-response processing
+   */
+  dispatchDurationMs: number;
+  /**
+   * Version of the built-in file-edit semantic classifier used for this event
+   */
+  editClassifierVersion: number;
+  /**
+   * Identifier of the user interaction that owns the model dispatch, matching assistant.turn_start.interactionId when available
+   */
+  interactionId?: string;
+  outcome: ModelCallFinishedOutcome;
+  /**
+   * Agent-loop iteration within the interaction that initiated the model dispatch
+   */
+  turnId: string;
+}
 /**
  * Session event "abort". Turn abort information including the reason for termination
  */
@@ -4569,9 +4870,7 @@ export interface ToolUserRequestedData {
   /**
    * Arguments for the tool invocation
    */
-  arguments?: {
-    [k: string]: unknown | undefined;
-  };
+  arguments?: JsonValue;
   /**
    * Unique identifier for this tool call
    */
@@ -4618,9 +4917,7 @@ export interface ToolExecutionStartData {
   /**
    * Arguments passed to the tool
    */
-  arguments?: {
-    [k: string]: unknown | undefined;
-  };
+  arguments?: JsonValue;
   /**
    * When true, the tool output should be displayed expanded (verbatim) in the CLI timeline
    */
@@ -4642,6 +4939,9 @@ export interface ToolExecutionStartData {
    * Tool call ID of the parent tool invocation when this event originates from a sub-agent
    */
   parentToolCallId?: string;
+  /**
+   * Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+   */
   rte?: boolean;
   shellToolInfo?: ToolExecutionStartShellToolInfo;
   /**
@@ -4844,9 +5144,7 @@ export interface ToolExecutionCompleteData {
    *
    * @experimental
    */
-  mcpMeta?: {
-    [k: string]: unknown | undefined;
-  };
+  mcpMeta?: JsonValue;
   /**
    * Model identifier that generated this tool call
    */
@@ -4857,6 +5155,9 @@ export interface ToolExecutionCompleteData {
    */
   parentToolCallId?: string;
   result?: ToolExecutionCompleteResult;
+  /**
+   * Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
+   */
   rte?: boolean;
   /**
    * Whether this tool execution ran inside a sandbox container
@@ -4875,7 +5176,7 @@ export interface ToolExecutionCompleteData {
    * Tool-specific telemetry data (e.g., CodeQL check counts, grep match counts)
    */
   toolTelemetry?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * Identifier for the agent loop turn this tool was invoked in, matching the corresponding assistant.turn_start event
@@ -4928,15 +5229,11 @@ export interface ToolExecutionCompleteResult {
    *
    * @experimental
    */
-  mcpMeta?: {
-    [k: string]: unknown | undefined;
-  };
+  mcpMeta?: JsonValue;
   /**
    * Structured content (arbitrary JSON) returned verbatim by the MCP tool
    */
-  structuredContent?: {
-    [k: string]: unknown | undefined;
-  };
+  structuredContent?: JsonValue;
   uiResource?: ToolExecutionCompleteUIResource;
 }
 /**
@@ -4955,7 +5252,7 @@ export interface PersistedBinaryImage {
    * Optional metadata from the producing tool.
    */
   metadata?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * MIME type of the binary data
@@ -4980,7 +5277,7 @@ export interface OmittedBinaryResult {
    * Optional metadata from the producing tool.
    */
   metadata?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * MIME type of the omitted binary data
@@ -5010,7 +5307,7 @@ export interface BinaryAssetReference {
    * Optional metadata from the producing tool.
    */
   metadata?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * MIME type of the referenced binary data
@@ -5274,17 +5571,35 @@ export interface ToolExecutionCompleteUIResourceMeta {
  */
 export interface ToolExecutionCompleteUIResourceMetaUI {
   csp?: ToolExecutionCompleteUIResourceMetaUICsp;
+  /**
+   * Optional dedicated origin for the rendered MCP Apps UI resource.
+   */
   domain?: string;
   permissions?: ToolExecutionCompleteUIResourceMetaUIPermissions;
+  /**
+   * Whether the host should render a border around the MCP Apps UI resource.
+   */
   prefersBorder?: boolean;
 }
 /**
  * CSP domain allowlists for an MCP Apps UI resource, including connect, resource, frame, and base URI domains.
  */
 export interface ToolExecutionCompleteUIResourceMetaUICsp {
+  /**
+   * Domains the UI resource may use as document base URIs.
+   */
   baseUriDomains?: string[];
+  /**
+   * Domains the UI resource may connect to.
+   */
   connectDomains?: string[];
+  /**
+   * Domains the UI resource may embed as nested frames.
+   */
   frameDomains?: string[];
+  /**
+   * Domains from which the UI resource may load scripts, styles, images, and other resources.
+   */
   resourceDomains?: string[];
 }
 /**
@@ -5506,6 +5821,10 @@ export interface SubagentStartedData {
    * Internal name of the sub-agent
    */
   agentName: string;
+  /**
+   * Root id of the factory run that spawned this sub-agent, when it was spawned by one.
+   */
+  factoryRunId?: string;
   /**
    * Model the sub-agent will run with, when known at start.
    */
@@ -5557,10 +5876,34 @@ export interface SubagentCompletedData {
    * Internal name of the sub-agent
    */
   agentName: string;
+  /**
+   * Whether the sub-agent was torn down by cancellation - its own abort, or an ancestor being killed - instead of finishing its work. Cancellation is not a failure, so the run still reports completion; this distinguishes a torn-down sub-agent from one that ran to the end.
+   */
+  cancelled?: boolean;
+  /**
+   * Whether the first model actually dispatched matched the user's configured preference
+   */
+  configuredModelMatchesActual?: boolean;
+  /**
+   * Concrete model the user configured for this sub-agent via `/subagents`, when present
+   */
+  configuredModelPreference?: string;
   /**
    * Wall-clock duration of the sub-agent execution in milliseconds
    */
   durationMs?: number;
+  /**
+   * Whether the explicit task-call model matched the user's configured preference
+   */
+  explicitModelMatchesPreference?: boolean;
+  /**
+   * Explicit model supplied by the parent agent on the task call, when present
+   */
+  explicitModelOverride?: string;
+  /**
+   * First model for which the sub-agent started an inference request, when one was dispatched
+   */
+  firstDispatchedModel?: string;
   /**
    * Model used by the sub-agent
    */
@@ -5620,6 +5963,14 @@ export interface SubagentFailedData {
    * Internal name of the sub-agent
    */
   agentName: string;
+  /**
+   * Whether the first model actually dispatched matched the user's configured preference
+   */
+  configuredModelMatchesActual?: boolean;
+  /**
+   * Concrete model the user configured for this sub-agent via `/subagents`, when present
+   */
+  configuredModelPreference?: string;
   /**
    * Wall-clock duration of the sub-agent execution in milliseconds
    */
@@ -5628,6 +5979,18 @@ export interface SubagentFailedData {
    * Error message describing why the sub-agent failed
    */
   error: string;
+  /**
+   * Whether the explicit task-call model matched the user's configured preference
+   */
+  explicitModelMatchesPreference?: boolean;
+  /**
+   * Explicit model supplied by the parent agent on the task call, when present
+   */
+  explicitModelOverride?: string;
+  /**
+   * First model for which the sub-agent started an inference request, when one was dispatched
+   */
+  firstDispatchedModel?: string;
   /**
    * Model selected for the sub-agent, when known
    */
@@ -5771,9 +6134,7 @@ export interface HookStartData {
   /**
    * Input data passed to the hook
    */
-  input?: {
-    [k: string]: unknown | undefined;
-  };
+  input?: JsonValue;
 }
 /**
  * Session event "hook.end". Hook invocation completion details including output, success status, and error information
@@ -5821,9 +6182,7 @@ export interface HookEndData {
   /**
    * Output data produced by the hook
    */
-  output?: {
-    [k: string]: unknown | undefined;
-  };
+  output?: JsonValue;
   /**
    * Whether the hook completed successfully
    */
@@ -5944,7 +6303,7 @@ export interface BinaryAssetData {
    * Optional metadata from the producing tool.
    */
   metadata?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * MIME type of the binary asset
@@ -6013,7 +6372,7 @@ export interface SystemMessageMetadata {
    * Template variables used when constructing the prompt
    */
   variables?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
@@ -6061,7 +6420,7 @@ export interface SystemNotificationData {
  */
 export interface SystemNotificationAgentCompleted {
   /**
-   * Unique identifier of the background agent
+   * Unique task identifier
    */
   agentId: string;
   /**
@@ -6072,6 +6431,10 @@ export interface SystemNotificationAgentCompleted {
    * Human-readable description of the agent task
    */
   description?: string;
+  /**
+   * Friendly, non-unique name intended for display
+   */
+  displayName?: string;
   /**
    * The full prompt given to the background agent
    */
@@ -6087,7 +6450,7 @@ export interface SystemNotificationAgentCompleted {
  */
 export interface SystemNotificationAgentIdle {
   /**
-   * Unique identifier of the background agent
+   * Unique task identifier
    */
   agentId: string;
   /**
@@ -6098,6 +6461,10 @@ export interface SystemNotificationAgentIdle {
    * Human-readable description of the agent task
    */
   description?: string;
+  /**
+   * Friendly, non-unique name intended for display
+   */
+  displayName?: string;
   /**
    * Type discriminator. Always "agent_idle".
    */
@@ -6218,9 +6585,7 @@ export interface SystemNotificationFactoryCompleted {
   /**
    * Machine-readable terminal failure details, when present.
    */
-  failure?: {
-    [k: string]: unknown | undefined;
-  };
+  failure?: JsonValue;
   /**
    * Bounded prompt-safe preview of the completed result.
    */
@@ -6246,9 +6611,7 @@ export interface SystemNotificationUnclassified {
   /**
    * Opaque metadata supplied by the external host, when present.
    */
-  metadata?: {
-    [k: string]: unknown | undefined;
-  };
+  metadata?: JsonValue;
   /**
    * Type discriminator. Always "unclassified".
    */
@@ -6301,9 +6664,7 @@ export interface PermissionRequestedData {
   /**
    * Neutral risk metadata supplied by the tool host. Consumers may display this value but must not use it to bypass the permission decision.
    */
-  riskAssessment?: {
-    [k: string]: unknown | undefined;
-  };
+  riskAssessment?: JsonValue;
 }
 /**
  * Shell command permission request
@@ -6486,13 +6847,17 @@ export interface PermissionRequestMcp {
   /**
    * Arguments to pass to the MCP tool
    */
-  args?: {
-    [k: string]: unknown | undefined;
-  };
+  args?: JsonValue;
   /**
    * Permission kind discriminator
    */
   kind: "mcp";
+  /**
+   * Advisory runtime permission recommendation. The SDK host remains responsible for deciding the request and may reject it.
+   *
+   * @experimental
+   */
+  permissionRecommendation?: PermissionRecommendation;
   /**
    * Whether this MCP tool is read-only (no side effects)
    */
@@ -6556,6 +6921,12 @@ export interface PermissionRequestUrl {
  */
 export interface PermissionRequestMemory {
   action?: PermissionRequestMemoryAction;
+  /**
+   * Assisted-approval judge information for this request; present only in assisted mode.
+   *
+   * @experimental
+   */
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Source references for the stored fact (store only)
    */
@@ -6573,6 +6944,11 @@ export interface PermissionRequestMemory {
    * Reason for the vote (vote only)
    */
   reason?: string;
+  /**
+   * Repository name with owner associated with the stored memory (store only)
+   */
+  repoNwo?: string;
+  scope?: PermissionRequestMemoryScope;
   /**
    * Topic or subject of the memory (store only)
    */
@@ -6582,6 +6958,22 @@ export interface PermissionRequestMemory {
    */
   toolCallId?: string;
 }
+/**
+ * Assisted-approval judge information attached to a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request.
+ */
+/** @experimental */
+export interface PermissionAssistedApproval {
+  failureReason?: AssistedApprovalJudgeFailureReason;
+  /**
+   * Model id that produced the recommendation, when the judge was consulted and reported one. Absent for `excluded` (the judge was not consulted) and for failures that occurred before a model was selected.
+   */
+  model?: string;
+  /**
+   * Human-readable reason for the judge's recommendation, when available.
+   */
+  reason?: string;
+  recommendation: AssistedApprovalRecommendation;
+}
 /**
  * Custom tool invocation permission request
  */
@@ -6589,13 +6981,15 @@ export interface PermissionRequestCustomTool {
   /**
    * Arguments to pass to the custom tool
    */
-  args?: {
-    [k: string]: unknown | undefined;
-  };
+  args?: JsonValue;
   /**
    * Permission kind discriminator
    */
   kind: "custom-tool";
+  /**
+   * Whether the tool declared that permission may be skipped unless a deny rule matches
+   */
+  skipPermission?: boolean;
   /**
    * Tool call ID that triggered this permission request
    */
@@ -6624,9 +7018,7 @@ export interface PermissionRequestHook {
   /**
    * Arguments of the tool call being gated
    */
-  toolArgs?: {
-    [k: string]: unknown | undefined;
-  };
+  toolArgs?: JsonValue;
   /**
    * Tool call ID that triggered this permission request
    */
@@ -6669,9 +7061,21 @@ export interface PermissionRequestFactory {
    * Whether this factory is eligible for persistent approval
    */
   canPersistApproval: boolean;
+  /**
+   * Factory-declared AI-credit limit before any run/resume caller override is applied.
+   */
   declaredMaxAiCredits?: number;
+  /**
+   * Factory-declared concurrent-subagent limit before any run/resume caller override is applied.
+   */
   declaredMaxConcurrentSubagents?: number;
+  /**
+   * Factory-declared total-subagent limit before any run/resume caller override is applied.
+   */
   declaredMaxTotalSubagents?: number;
+  /**
+   * Factory-declared active-time limit in seconds before any run/resume caller override is applied.
+   */
   declaredTimeoutSeconds?: number;
   /**
    * Factory description
@@ -6745,16 +7149,39 @@ export interface PermissionRequestExtensionPermissionAccess {
    */
   toolCallId?: string;
 }
+/**
+ * Extension sensitive environment variable access request
+ */
+export interface PermissionRequestExtensionEnvAccess {
+  /**
+   * Names of the sensitive environment variables the extension is requesting. Values never appear here.
+   *
+   * @minItems 1
+   */
+  environmentVariables: [string, ...string[]];
+  /**
+   * Name of the extension requesting environment variable access
+   */
+  extensionName: string;
+  /**
+   * Permission kind discriminator
+   */
+  kind: "extension-env-access";
+  /**
+   * Tool call ID that triggered this permission request
+   */
+  toolCallId?: string;
+}
 /**
  * Shell command permission prompt
  */
 export interface PermissionPromptRequestCommands {
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Whether the UI can offer session-wide approval for this command pattern
    */
@@ -6788,32 +7215,16 @@ export interface PermissionPromptRequestCommands {
    */
   warning?: string;
 }
-/**
- * Auto-approval judge information attached to a permission request. Present (non-null) only when the session's allow-all mode is "auto"; its absence means auto mode was off and the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request.
- */
-/** @experimental */
-export interface PermissionAutoApproval {
-  failureReason?: AutoApprovalJudgeFailureReason;
-  /**
-   * Model id that produced the recommendation, when the judge was consulted and reported one. Absent for `excluded` (the judge was not consulted) and for failures that occurred before a model was selected.
-   */
-  model?: string;
-  /**
-   * Human-readable reason for the judge's recommendation, when available.
-   */
-  reason?: string;
-  recommendation: AutoApprovalRecommendation;
-}
 /**
  * File write permission prompt
  */
 export interface PermissionPromptRequestWrite {
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Whether the UI can offer session-wide approval for file write operations
    */
@@ -6852,11 +7263,11 @@ export interface PermissionPromptRequestWrite {
  */
 export interface PermissionPromptRequestRead {
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Human-readable description of why the file is being read
    */
@@ -6885,19 +7296,27 @@ export interface PermissionPromptRequestMcp {
   /**
    * Arguments to pass to the MCP tool
    */
-  args?: {
-    [k: string]: unknown | undefined;
-  };
+  args?: JsonValue;
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
+  /**
+   * Whether the host may offer a server-wide "approve all tools from this server" blanket. Absent is treated as true; the runtime sends false when managed policy disables bypass-permissions mode, which forbids the server-wide escalation while still allowing per-tool approval.
+   */
+  canOfferServerWideApproval?: boolean;
   /**
    * Prompt kind discriminator
    */
   kind: "mcp";
+  /**
+   * Advisory runtime permission recommendation. The host remains responsible for deciding the request and may reject it.
+   *
+   * @experimental
+   */
+  permissionRecommendation?: PermissionRecommendation;
   /**
    * Name of the MCP server providing the tool
    */
@@ -6920,11 +7339,11 @@ export interface PermissionPromptRequestMcp {
  */
 export interface PermissionPromptRequestUrl {
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Human-readable description of why the URL is being accessed
    */
@@ -6964,11 +7383,11 @@ export interface PermissionPromptRequestUrl {
 export interface PermissionPromptRequestMemory {
   action?: PermissionRequestMemoryAction;
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Source references for the stored fact (store only)
    */
@@ -7002,15 +7421,13 @@ export interface PermissionPromptRequestCustomTool {
   /**
    * Arguments to pass to the custom tool
    */
-  args?: {
-    [k: string]: unknown | undefined;
-  };
+  args?: JsonValue;
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Prompt kind discriminator
    */
@@ -7034,11 +7451,11 @@ export interface PermissionPromptRequestCustomTool {
 export interface PermissionPromptRequestPath {
   accessKind: PermissionPromptRequestPathAccessKind;
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Prompt kind discriminator
    */
@@ -7057,11 +7474,11 @@ export interface PermissionPromptRequestPath {
  */
 export interface PermissionPromptRequestHook {
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Optional message from the hook explaining why confirmation is needed
    */
@@ -7073,9 +7490,7 @@ export interface PermissionPromptRequestHook {
   /**
    * Arguments of the tool call being gated
    */
-  toolArgs?: {
-    [k: string]: unknown | undefined;
-  };
+  toolArgs?: JsonValue;
   /**
    * Tool call ID that triggered this permission request
    */
@@ -7090,11 +7505,11 @@ export interface PermissionPromptRequestHook {
  */
 export interface PermissionPromptRequestExtensionManagement {
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Name of the extension being managed
    */
@@ -7121,18 +7536,30 @@ export interface PermissionPromptRequestFactory {
    */
   approvalKey: string;
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Whether this factory is eligible for persistent approval
    */
   canPersistApproval: boolean;
+  /**
+   * Factory-declared AI-credit limit before any run/resume caller override is applied.
+   */
   declaredMaxAiCredits?: number;
+  /**
+   * Factory-declared concurrent-subagent limit before any run/resume caller override is applied.
+   */
   declaredMaxConcurrentSubagents?: number;
+  /**
+   * Factory-declared total-subagent limit before any run/resume caller override is applied.
+   */
   declaredMaxTotalSubagents?: number;
+  /**
+   * Factory-declared active-time limit in seconds before any run/resume caller override is applied.
+   */
   declaredTimeoutSeconds?: number;
   /**
    * Factory description
@@ -7181,11 +7608,11 @@ export interface PermissionPromptRequestFactory {
  */
 export interface PermissionPromptRequestExtensionPermissionAccess {
   /**
-   * Auto-approval judge information for this request; present only when auto mode is enabled.
+   * Assisted-approval judge information for this request; present only in assisted mode.
    *
    * @experimental
    */
-  autoApproval?: PermissionAutoApproval;
+  assistedApproval?: PermissionAssistedApproval;
   /**
    * Capabilities the extension is requesting
    */
@@ -7203,6 +7630,35 @@ export interface PermissionPromptRequestExtensionPermissionAccess {
    */
   toolCallId?: string;
 }
+/**
+ * Extension sensitive environment variable access prompt
+ */
+export interface PermissionPromptRequestExtensionEnvAccess {
+  /**
+   * Assisted-approval judge information for this request; present only in assisted mode.
+   *
+   * @experimental
+   */
+  assistedApproval?: PermissionAssistedApproval;
+  /**
+   * Names of the sensitive environment variables the extension is requesting. Values never appear here.
+   *
+   * @minItems 1
+   */
+  environmentVariables: [string, ...string[]];
+  /**
+   * Name of the extension requesting environment variable access
+   */
+  extensionName: string;
+  /**
+   * Prompt kind discriminator
+   */
+  kind: "extension-env-access";
+  /**
+   * Tool call ID that triggered this permission request
+   */
+  toolCallId?: string;
+}
 /**
  * Session event "permission.completed". Permission request completion notification signaling UI dismissal
  */
@@ -7255,6 +7711,10 @@ export interface PermissionApproved {
    * The permission request was approved
    */
   kind: "approved";
+  /**
+   * Whether a managed approval policy already handled this request
+   */
+  managedApprovalHandled?: boolean;
 }
 /**
  * Permission response variant that approves a request and remembers the provided approval for the rest of the session.
@@ -7265,6 +7725,10 @@ export interface PermissionApprovedForSession {
    * Approved and remembered for the rest of the session
    */
   kind: "approved-for-session";
+  /**
+   * Whether a managed approval policy already handled this request
+   */
+  managedApprovalHandled?: boolean;
 }
 /**
  * Session-scoped tool-approval rule for specific shell command identifiers.
@@ -7375,6 +7839,25 @@ export interface UserToolSessionApprovalExtensionPermissionAccess {
    */
   kind: "extension-permission-access";
 }
+/**
+ * Session-scoped tool-approval rule for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.
+ */
+export interface UserToolSessionApprovalExtensionEnvAccess {
+  /**
+   * Names of the sensitive environment variables this approval covers. Values are never persisted.
+   *
+   * @minItems 1
+   */
+  environmentVariables: [string, ...string[]];
+  /**
+   * Extension name
+   */
+  extensionName: string;
+  /**
+   * Extension environment access approval kind
+   */
+  kind: "extension-env-access";
+}
 /**
  * Permission response variant that approves a request and persists the provided approval to a project location key.
  */
@@ -7388,6 +7871,10 @@ export interface PermissionApprovedForLocation {
    * The location key (git root or cwd) to persist the approval to
    */
   locationKey: string;
+  /**
+   * Whether a managed approval policy already handled this request
+   */
+  managedApprovalHandled?: boolean;
 }
 /**
  * Permission response variant indicating the request was cancelled before use, with an optional reason.
@@ -7655,7 +8142,7 @@ export interface ElicitationRequestedSchema {
    * Form field definitions, keyed by field name
    */
   properties: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * List of required field names
@@ -7712,12 +8199,6 @@ export interface ElicitationCompletedData {
    */
   requestId: string;
 }
-/**
- * Opaque JSON value submitted for one field in accepted `elicitation.completed` form content.
- */
-export interface ElicitationCompletedContent {
-  [k: string]: unknown | undefined;
-}
 /**
  * Session event "sampling.requested". Sampling request from an MCP server; contains the server name and a requestId for correlation
  */
@@ -7755,9 +8236,7 @@ export interface SamplingRequestedData {
   /**
    * The JSON-RPC request ID from the MCP protocol
    */
-  mcpRequestId: {
-    [k: string]: unknown | undefined;
-  };
+  mcpRequestId: JsonValue;
   /**
    * Unique identifier for this sampling request; used to respond via session.respondToSampling()
    */
@@ -8106,18 +8585,66 @@ export interface CustomNotificationData {
    */
   version?: number;
 }
-/**
- * Source-defined JSON payload for the custom notification
- */
-export interface CustomNotificationPayload {
-  [k: string]: unknown | undefined;
-}
 /**
  * Optional source-defined string identifiers describing the payload subject
  */
 export interface CustomNotificationSubject {
   [k: string]: string | undefined;
 }
+/**
+ * Session event "ui.ephemeral_query". Ordered output and terminal state for a transient query that does not modify conversation history.
+ */
+/** @experimental */
+export interface UIEphemeralQueryEvent {
+  /**
+   * Sub-agent instance identifier. Absent for events from the root/main agent and session-level events.
+   */
+  agentId?: string;
+  data: UIEphemeralQueryData;
+  /**
+   * Always true for events that are transient and not persisted to the session event log on disk.
+   */
+  ephemeral: true;
+  /**
+   * Unique event identifier (UUID v4), generated when the event is emitted
+   */
+  id: string;
+  /**
+   * ID of the chronologically preceding event in the session, forming a linked chain. Null for the first event.
+   */
+  parentId: string | null;
+  /**
+   * ISO 8601 timestamp when the event was created
+   */
+  timestamp: string;
+  /**
+   * Type discriminator. Always "ui.ephemeral_query".
+   */
+  type: "ui.ephemeral_query";
+}
+/**
+ * Ordered output and terminal state for a transient query that does not modify conversation history.
+ */
+/** @experimental */
+export interface UIEphemeralQueryData {
+  /**
+   * Full response text, present for the `completed` phase.
+   */
+  answer?: string;
+  /**
+   * Ordered text delta, present for the `chunk` phase.
+   */
+  chunk?: string;
+  /**
+   * Model or transport failure message, present for the `failed` phase.
+   */
+  error?: string;
+  phase: UIEphemeralQueryPhase;
+  /**
+   * Runtime-minted query identifier.
+   */
+  requestId: string;
+}
 /**
  * Session event "external_tool.requested". External tool invocation request for client-side tool execution
  */
@@ -8155,9 +8682,11 @@ export interface ExternalToolRequestedData {
   /**
    * Arguments to pass to the external tool
    */
-  arguments?: {
-    [k: string]: unknown | undefined;
-  };
+  arguments?: JsonValue;
+  /**
+   * Stable provider identity captured with an extension-owned tool definition; hosts use it to route the request to the same provider that was offered to the model
+   */
+  providerId?: string | null;
   /**
    * Unique identifier for this request; used to respond via session.respondToExternalTool()
    */
@@ -8644,7 +9173,7 @@ export interface AutoModeResolvedData {
   stickyOverride?: boolean;
 }
 /**
- * Session event "session.managed_settings_resolved". Enterprise managed-settings resolution: the effective managed settings the session applied and where they came from, so SDK clients can show users what is enterprise-managed and by which authority. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted; for a session-independent pull, use the SDK `getManagedSettings()` API, which returns the identical payload. Managed settings have a single authoritative source, so the highest-authority present layer (server > device) wins wholesale; `bypassPermissionsDisabled` is deny-wins across layers. Marked experimental while the managed-settings surface stabilizes.
+ * Session event "session.managed_settings_resolved". Enterprise managed-settings resolution: the effective managed settings the session applied and which channels contributed, so SDK clients can show users what is enterprise-managed. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted. Device values take precedence over server values per ordinary key, while permissions compose restrictively across device, server, and SDK-client layers. The account-scoped `getManagedSettings()` API does not include session-local client injection. Marked experimental while the managed-settings surface stabilizes.
  */
 /** @experimental */
 export interface ManagedSettingsResolvedEvent {
@@ -8675,7 +9204,7 @@ export interface ManagedSettingsResolvedEvent {
   type: "session.managed_settings_resolved";
 }
 /**
- * Enterprise managed-settings resolution: the effective managed settings the session applied and where they came from, so SDK clients can show users what is enterprise-managed and by which authority. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted; for a session-independent pull, use the SDK `getManagedSettings()` API, which returns the identical payload. Managed settings have a single authoritative source, so the highest-authority present layer (server > device) wins wholesale; `bypassPermissionsDisabled` is deny-wins across layers. Marked experimental while the managed-settings surface stabilizes.
+ * Enterprise managed-settings resolution: the effective managed settings the session applied and which channels contributed, so SDK clients can show users what is enterprise-managed. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted. Device values take precedence over server values per ordinary key, while permissions compose restrictively across device, server, and SDK-client layers. The account-scoped `getManagedSettings()` API does not include session-local client injection. Marked experimental while the managed-settings surface stabilizes.
  */
 /** @experimental */
 export interface ManagedSettingsResolvedData {
@@ -8684,7 +9213,11 @@ export interface ManagedSettingsResolvedData {
    */
   bypassPermissionsDisabled: boolean;
   /**
-   * Whether the device (MDM/plist/registry/file) managed-settings layer was present
+   * Whether a session-local permissions layer injected by the SDK host was present
+   */
+  clientManaged?: boolean;
+  /**
+   * Whether an actual device MDM/plist/registry/file managed-settings layer was present
    */
   deviceManaged: boolean;
   /**
@@ -8696,9 +9229,13 @@ export interface ManagedSettingsResolvedData {
    */
   managedKeys: string[];
   /**
-   * Whether server and device each supplied a permission allowlist, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.
+   * Whether at least two managed sources supplied permission allowlists, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.
    */
   permissionsAllowIntersected?: boolean;
+  /**
+   * Whether the effective sandbox policy forces the sandbox on *only* because managed policy could not be determined, rather than because the policy requires it. Lets clients tell a user whose `--no-sandbox` was overridden that the sandbox stayed on as a fail-closed fallback, instead of attributing it to an administrator who set no such policy.
+   */
+  sandboxEnabledByUndeterminedPolicy?: boolean;
   /**
    * Whether the server (account/org) managed-settings layer was present
    */
@@ -8706,9 +9243,7 @@ export interface ManagedSettingsResolvedData {
   /**
    * The effective (resolved) managed settings values, so clients can render exactly what is enforced. Absent when no managed policy is in force.
    */
-  settings?: {
-    [k: string]: unknown | undefined;
-  };
+  settings?: JsonValue;
   source: ManagedSettingsResolvedSource;
 }
 /**
@@ -8905,6 +9440,10 @@ export interface ExitPlanModeRequestedData {
    * Available actions the user can take
    */
   actions: ExitPlanModeAction[];
+  /**
+   * Model the session had selected when the plan was authored, when one is known
+   */
+  model?: string;
   /**
    * Full content of the plan file
    */
@@ -9084,8 +9623,118 @@ export interface FactoryRunUpdatedData {
    * Monotonic revision now available for the run.
    */
   revision: number;
+  /**
+   * Factory run identifier.
+   */
   runId: string;
 }
+/**
+ * Session event "factory.run_started". Ephemeral signal that a factory run attempt began executing.
+ */
+/** @experimental */
+export interface FactoryRunStartedEvent {
+  /**
+   * Sub-agent instance identifier. Absent for events from the root/main agent and session-level events.
+   */
+  agentId?: string;
+  data: FactoryRunStartedData;
+  /**
+   * Always true for events that are transient and not persisted to the session event log on disk.
+   */
+  ephemeral: true;
+  /**
+   * Unique event identifier (UUID v4), generated when the event is emitted
+   */
+  id: string;
+  /**
+   * ID of the chronologically preceding event in the session, forming a linked chain. Null for the first event.
+   */
+  parentId: string | null;
+  /**
+   * ISO 8601 timestamp when the event was created
+   */
+  timestamp: string;
+  /**
+   * Type discriminator. Always "factory.run_started".
+   */
+  type: "factory.run_started";
+}
+/**
+ * Ephemeral signal that a factory run attempt began executing.
+ */
+/** @experimental */
+export interface FactoryRunStartedData {
+  /**
+   * Attempt number this start committed; a resumed run increments it.
+   */
+  attempt: number;
+  /**
+   * Name of the factory this run executes. Low cardinality by construction.
+   */
+  factoryName: string;
+  /**
+   * Identifier of the factory run that started.
+   */
+  runId: string;
+}
+/**
+ * Session event "factory.run_settled". Ephemeral signal that a factory run reached a terminal status.
+ */
+/** @experimental */
+export interface FactoryRunSettledEvent {
+  /**
+   * Sub-agent instance identifier. Absent for events from the root/main agent and session-level events.
+   */
+  agentId?: string;
+  data: FactoryRunSettledData;
+  /**
+   * Always true for events that are transient and not persisted to the session event log on disk.
+   */
+  ephemeral: true;
+  /**
+   * Unique event identifier (UUID v4), generated when the event is emitted
+   */
+  id: string;
+  /**
+   * ID of the chronologically preceding event in the session, forming a linked chain. Null for the first event.
+   */
+  parentId: string | null;
+  /**
+   * ISO 8601 timestamp when the event was created
+   */
+  timestamp: string;
+  /**
+   * Type discriminator. Always "factory.run_settled".
+   */
+  type: "factory.run_settled";
+}
+/**
+ * Ephemeral signal that a factory run reached a terminal status.
+ */
+/** @experimental */
+export interface FactoryRunSettledData {
+  /**
+   * AI credits this run consumed, in nano-AIU.
+   */
+  consumedNanoAiu: number;
+  /**
+   * Subagents this run consumed against its limits.
+   */
+  consumedSubagents: number;
+  /**
+   * Active milliseconds accumulated across every attempt of this run.
+   */
+  elapsedMs: number;
+  /**
+   * Typed failure class recorded on the run, when it failed with one (e.g. `factory_limit_reached`).
+   */
+  failureType?: string;
+  /**
+   * Identifier of the factory run that settled.
+   */
+  runId: string;
+  status: FactoryRunSettledStatus;
+}
 /**
  * Session event "session.skills_loaded". Payload of `session.skills_loaded` listing resolved skill metadata.
  */
@@ -9133,6 +9782,10 @@ export interface SkillsLoadedSkill {
    * Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
    */
   argumentHint?: string;
+  /**
+   * Canonical slash command name used to invoke the skill, without the leading '/'
+   */
+  commandName?: string;
   /**
    * Description of what the skill does
    */
@@ -9554,9 +10207,7 @@ export interface CanvasOpenedData {
   /**
    * Input supplied when the instance was opened
    */
-  input?: {
-    [k: string]: unknown | undefined;
-  };
+  input?: JsonValue;
   /**
    * Stable caller-supplied canvas instance identifier
    */
@@ -9651,9 +10302,7 @@ export interface CanvasRegistryChangedCanvas {
   /**
    * JSON Schema for canvas open input
    */
-  inputSchema?: {
-    [k: string]: unknown | undefined;
-  };
+  inputSchema?: JsonValue;
 }
 /**
  * A single action within a canvas declaration, with its name, optional description, and optional input schema.
@@ -9667,9 +10316,7 @@ export interface CanvasRegistryChangedCanvasAction {
   /**
    * JSON Schema for action input
    */
-  inputSchema?: {
-    [k: string]: unknown | undefined;
-  };
+  inputSchema?: JsonValue;
   /**
    * Action name
    */
@@ -9820,9 +10467,7 @@ export interface CanvasRecordedData {
   /**
    * Input supplied when the instance was opened
    */
-  input?: {
-    [k: string]: unknown | undefined;
-  };
+  input?: JsonValue;
   /**
    * Stable caller-supplied canvas instance identifier
    */
@@ -9958,7 +10603,7 @@ export interface McpAppToolCallCompleteData {
    * Arguments passed to the tool by the app view, if any
    */
   arguments?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * Wall-clock duration of the underlying tools/call in milliseconds
@@ -9969,7 +10614,7 @@ export interface McpAppToolCallCompleteData {
    * Standard MCP CallToolResult returned by the server. Present whether or not the call set isError.
    */
   result?: {
-    [k: string]: unknown | undefined;
+    [k: string]: JsonValue | undefined;
   };
   /**
    * Name of the MCP server hosting the tool
diff --git a/nodejs/src/index.ts b/nodejs/src/index.ts
index f915a8707e..9d55ab1d10 100644
--- a/nodejs/src/index.ts
+++ b/nodejs/src/index.ts
@@ -9,7 +9,7 @@
  */
 
 export { CopilotClient } from "./client.js";
-export { RuntimeConnection } from "./types.js";
+export { DisableBypassPermissionsModes, RuntimeConnection } from "./types.js";
 export { BuiltInTools, ToolSet } from "./toolSet.js";
 export { CopilotSession, type AssistantMessageEvent } from "./session.js";
 export { defineFactory, FactoryResumeError, isFactoryRunTerminal } from "./factory.js";
@@ -27,6 +27,7 @@ export {
 export {
     defineTool,
     approveAll,
+    createAttributedPermissionResult,
     convertMcpCallToolResult,
     createSessionFsAdapter,
     CopilotRequestHandler,
@@ -41,14 +42,15 @@ export {
 // consumers can import them directly from "@github/copilot-sdk" instead of
 // reaching into the package's internal dist layout. See issue #1156.
 //
-// Five names from this file are also explicitly exported elsewhere in this
+// Six names from this file are also explicitly exported elsewhere in this
 // module — `SessionEvent` (re-exported below from `./types.js`),
 // `PermissionRequest` (re-exported below from `./types.js`),
 // `PermissionRequestedData`/`PermissionRequestedEvent` (also re-exported below
-// from `./types.js`), and `AssistantMessageEvent` (re-exported above from
-// `./session.js`). Per the ECMAScript module spec, the explicit named re-exports
+// from `./types.js`), `AssistantMessageEvent` (re-exported above from
+// `./session.js`), and `JsonValue` (re-exported below from `./factory.js`).
+// Per the ECMAScript module spec, the explicit named re-exports
 // shadow the names arriving via `export type *`, so the hand-authored public API
-// surface for those five identifiers is preserved unchanged.
+// surface for those six identifiers is preserved unchanged.
 export type * from "./generated/session-events.js";
 export type {
     CommandContext,
@@ -95,6 +97,11 @@ export type {
     GitHubTelemetryNotification,
     GitHubTelemetryEvent,
     GitHubTelemetryClientInfo,
+    GitHubTokenAcquireReason,
+    GitHubTokenAcquireResult,
+    GitHubTokenProvider,
+    GitHubTokenProviderArgs,
+    GitHubTokenProviderResult,
     InfiniteSessionConfig,
     LargeToolOutputConfig,
     MemoryConfiguration,
@@ -107,6 +114,8 @@ export type {
     DefaultAgentConfig,
     BearerTokenProvider,
     MessageOptions,
+    ManagedSettings,
+    ManagedSettingsPermissions,
     ModelBilling,
     ModelBillingTokenPrices,
     ModelBillingTokenPricesLongContext,
@@ -121,6 +130,12 @@ export type {
     PermissionRequestedData,
     PermissionRequestedEvent,
     PermissionRequestResult,
+    AttributedPermissionResult,
+    PermissionDecisionContext,
+    PermissionDecisionOutcome,
+    PermissionDecisionSource,
+    PermissionDecisionSurface,
+    PermissionResponseCapability,
     ProviderConfig,
     ProviderModelConfig,
     ProviderTokenArgs,
diff --git a/nodejs/src/session.ts b/nodejs/src/session.ts
index ed575a5154..65ff00921c 100644
--- a/nodejs/src/session.ts
+++ b/nodejs/src/session.ts
@@ -7,6 +7,7 @@
  * @module session
  */
 
+import { AsyncLocalStorage } from "node:async_hooks";
 import type { MessageConnection } from "vscode-jsonrpc/node.js";
 import { ConnectionError, ErrorCodes, ResponseError } from "vscode-jsonrpc/node.js";
 import { createSessionRpc } from "./generated/rpc.js";
@@ -16,14 +17,12 @@ import type {
     CurrentToolMetadata,
     McpOauthPendingRequestResponse,
     FactoryLogLine,
-    FactoryRunRequest,
-    FactoryExecuteResult,
-    FactoryJournalPutRequest,
     FactoryRunResult as WireFactoryRunResult,
 } from "./generated/rpc.js";
 import { type Canvas, CanvasError } from "./canvas.js";
 import type { OpenCanvasInstance } from "./generated/rpc.js";
 import { getTraceContext } from "./telemetry.js";
+import { isAttributedPermissionResult } from "./types.js";
 import type {
     CommandHandler,
     AutoModeSwitchHandler,
@@ -43,6 +42,7 @@ import type {
     McpAuthRequest,
     PermissionHandler,
     PermissionRequest,
+    PermissionRequestResult,
     ContextTier,
     ReasoningEffort,
     ReasoningSummary,
@@ -66,11 +66,13 @@ import type {
     UserInputResponse,
 } from "./types.js";
 import {
+    FACTORY_AGENT_OPTION_KEYS,
     getFactoryDefinition,
     FactoryResumeError,
     isFactoryRunTerminal,
     type FactoryResumeErrorCode,
     type FactoryRunResult,
+    type FactoryAgentOptions,
     type RunOptions,
     type SessionFactoryApi,
     type FactoryContext,
@@ -84,11 +86,35 @@ function isFactoryResumeErrorCode(value: unknown): value is FactoryResumeErrorCo
         value === "not_found" ||
         value === "non_resumable" ||
         value === "already_active" ||
-        value === "reapproval_declined" ||
-        value === "no_approval_provider"
+        value === "factory_already_running" ||
+        value === "factory_limits_invalid" ||
+        value === "factory_session_disposed" ||
+        value === "factory_storage_unavailable" ||
+        value === "factory_storage_corrupt"
     );
 }
 
+function copyDefinedFactoryAgentOption<TKey extends keyof FactoryAgentOptions>(
+    source: FactoryAgentOptions,
+    target: FactoryAgentOptions,
+    key: TKey
+): void {
+    const value = source[key];
+    if (value !== undefined) {
+        target[key] = value;
+    }
+}
+
+const factoryExecutionStore = new AsyncLocalStorage<{ active: boolean }>();
+
+function throwIfFactoryExecutionIsActive(): void {
+    if (factoryExecutionStore.getStore()?.active) {
+        throw new Error(
+            "factory.run and factory.resume are not allowed while a factory body is running on this call path."
+        );
+    }
+}
+
 /**
  * Convert a raw hook input received over the wire into its public-facing shape.
  * This deserializes the numeric Unix-ms `timestamp` field on BaseHookInput
@@ -255,7 +281,10 @@ class FactoryProgressBuffer {
         const lines = this.pending.splice(0);
         await this.flushTail;
         if (this.flushFailed) {
-            throw this.flushError;
+            console.warn(
+                "Ignoring a background factory progress flush failure after the factory body settled",
+                this.flushError
+            );
         }
         if (lines.length > 0) {
             try {
@@ -288,24 +317,6 @@ class FactoryProgressBuffer {
     }
 }
 
-/**
- * Reconcile the generated envelope with the public one.
- *
- * The two are identical at runtime. They differ only in how `result` is typed:
- * the runtime returns any JSON value, but the schema models the field as an
- * opaque node, which the generator renders as an object. {@link FactoryRunResult}
- * corrects that for the factory surface without changing `x-opaque-json`
- * handling for any other consumer, so the boundary needs a cast rather than a
- * conversion.
- *
- * Delete this along with the {@link FactoryRunResult} override once the schema
- * distinguishes opaque JSON values from opaque in-process values —
- * github/copilot-agent-runtime#14122.
- */
-function toPublicFactoryRunResult(envelope: WireFactoryRunResult): FactoryRunResult {
-    return envelope as FactoryRunResult;
-}
-
 async function awaitFactoryOperation<TResult>(
     operation: () => Promise<TResult>,
     signal: AbortSignal
@@ -427,6 +438,7 @@ export class CopilotSession {
     private _capabilities: SessionCapabilities = {};
     private openCanvasInstances: OpenCanvasInstance[] = [];
     private disconnected = false;
+    private onDisconnected?: () => void;
 
     /** @internal Client session API handlers, populated by CopilotClient during create/resume. */
     clientSessionApis: ClientSessionApiHandlers = {};
@@ -442,6 +454,7 @@ export class CopilotSession {
             nameOrHandle: string | FactoryHandle,
             options?: RunOptions
         ): Promise<unknown> => {
+            throwIfFactoryExecutionIsActive();
             const name =
                 typeof nameOrHandle === "string"
                     ? nameOrHandle
@@ -453,9 +466,7 @@ export class CopilotSession {
             }
             const envelope = await this.rpc.factory.run({
                 name,
-                args: (options?.args === undefined
-                    ? {}
-                    : options.args) as FactoryRunRequest["args"],
+                args: options?.args === undefined ? {} : options.args,
                 options: {
                     limits: options?.limits,
                 },
@@ -464,6 +475,7 @@ export class CopilotSession {
             return this.settleFactoryRun(envelope);
         }) as SessionFactoryApi["run"],
         resume: (async (runId: string, options?: Parameters<SessionFactoryApi["resume"]>[1]) => {
+            throwIfFactoryExecutionIsActive();
             let response;
             try {
                 response = await this.rpc.factory.resume({
@@ -485,13 +497,13 @@ export class CopilotSession {
             }
             return this.settleFactoryRun(response.run);
         }) as SessionFactoryApi["resume"],
-        getRun: async (runId) => toPublicFactoryRunResult(await this.rpc.factory.getRun({ runId })),
+        getRun: async (runId) => this.rpc.factory.getRun({ runId }),
         waitForRun: (runId, options) => this.waitForFactoryRun(runId, options?.signal),
-        listRuns: async () => (await this.rpc.factory.listRuns()).runs,
+        listRuns: async () => (await this.rpc.factory.listRuns({})).runs,
         getRunDetail: (runId) => this.rpc.factory.getRunDetail({ runId }),
         getRunProgress: (runId, options = {}) =>
             this.rpc.factory.getRunProgress({ runId, ...options }),
-        cancel: async (runId) => toPublicFactoryRunResult(await this.rpc.factory.cancel({ runId })),
+        cancel: async (runId) => this.rpc.factory.cancel({ runId }),
     };
 
     /**
@@ -503,7 +515,7 @@ export class CopilotSession {
      */
     private settleFactoryRun(envelope: WireFactoryRunResult): Promise<FactoryRunResult> {
         if (isFactoryRunTerminal(envelope.status)) {
-            return Promise.resolve(toPublicFactoryRunResult(envelope));
+            return Promise.resolve(envelope);
         }
         return this.waitForFactoryRun(envelope.runId);
     }
@@ -562,7 +574,7 @@ export class CopilotSession {
                         rereadRequested = false;
                         const envelope = await this.rpc.factory.getRun({ runId });
                         if (isFactoryRunTerminal(envelope.status)) {
-                            finish(() => resolve(toPublicFactoryRunResult(envelope)));
+                            finish(() => resolve(envelope));
                             return;
                         }
                     } while (rereadRequested && !settled);
@@ -606,11 +618,16 @@ export class CopilotSession {
         private connection: MessageConnection,
         private _workspacePath?: string,
         traceContextProvider?: TraceContextProvider,
-        options?: { mcpAuthHandler?: McpAuthHandler; managedSettingsEnabled?: boolean }
+        options?: {
+            mcpAuthHandler?: McpAuthHandler;
+            managedSettingsEnabled?: boolean;
+            onDisconnected?: () => void;
+        }
     ) {
         this.traceContextProvider = traceContextProvider;
         this.mcpAuthHandler = options?.mcpAuthHandler;
         this.managedSettingsEnabled = options?.managedSettingsEnabled === true;
+        this.onDisconnected = options?.onDisconnected;
     }
 
     /**
@@ -747,7 +764,7 @@ export class CopilotSession {
         const unsubscribe = this.on((event) => {
             if (event.type === "assistant.message") {
                 lastAssistantMessage = event;
-            } else if (event.type === "session.idle") {
+            } else if (event.type === "session.idle" && event.data.mode !== "autopilot") {
                 resolveOutcome({ kind: "idle" });
             } else if (event.type === "session.error") {
                 const error = new Error(event.data.message);
@@ -787,7 +804,11 @@ export class CopilotSession {
 
     /** @internal */
     _markDisconnected(): void {
+        if (this.disconnected) {
+            return;
+        }
         this.disconnected = true;
+        this._runOnDisconnected();
         this.eventHandlers.clear();
         this.typedEventHandlers.clear();
         this.toolHandlers.clear();
@@ -808,6 +829,17 @@ export class CopilotSession {
         this.transformCallbacks?.clear();
     }
 
+    /** @internal */
+    _runOnDisconnected(): void {
+        this.onDisconnected?.();
+        this.onDisconnected = undefined;
+    }
+
+    /** @internal */
+    _setOnDisconnected(callback: () => void): void {
+        this.onDisconnected = callback;
+    }
+
     /**
      * Subscribes to events from this session.
      *
@@ -1124,17 +1156,26 @@ export class CopilotSession {
         permissionRequest: PermissionRequest
     ): Promise<void> {
         try {
-            const result = await this.permissionHandler!(permissionRequest, {
+            const handlerResult = await this.permissionHandler!(permissionRequest, {
                 sessionId: this.sessionId,
                 managedSettingsEnabled: this.managedSettingsEnabled,
             });
+            const isAttributed = isAttributedPermissionResult(handlerResult);
+            const result: PermissionRequestResult = isAttributed
+                ? handlerResult.result
+                : handlerResult;
+            const decisionContext = isAttributed ? handlerResult.decisionContext : undefined;
             if (result.kind === "no-result") {
                 return;
             }
             if (this.disconnected) {
                 return;
             }
-            await this.rpc.permissions.handlePendingPermissionRequest({ requestId, result });
+            await this.rpc.permissions.handlePendingPermissionRequest(
+                decisionContext === undefined
+                    ? { requestId, result }
+                    : { requestId, result, decisionContext }
+            );
         } catch (error) {
             if (this.disconnected) {
                 return;
@@ -1379,7 +1420,7 @@ export class CopilotSession {
                 try {
                     const context: FactoryContext = {
                         runId: params.runId,
-                        args: params.args as JsonValue,
+                        args: params.args,
                         session: self,
                         signal: controller.signal,
                         phase: (title: string) => {
@@ -1392,17 +1433,17 @@ export class CopilotSession {
                         },
                         agent: async (prompt, options = {}) => {
                             await progress.flush();
+                            const opts: FactoryAgentOptions = {};
+                            for (const key of FACTORY_AGENT_OPTION_KEYS) {
+                                copyDefinedFactoryAgentOption(options, opts, key);
+                            }
                             const response = await awaitFactoryOperation(
                                 () =>
                                     self.rpc.factory.agent({
                                         factoryRunId: params.runId,
                                         executionToken: params.executionToken,
                                         prompt,
-                                        opts: {
-                                            label: options.label,
-                                            schema: options.schema,
-                                            model: options.model,
-                                        },
+                                        opts,
                                     }),
                                 controller.signal
                             );
@@ -1452,8 +1493,7 @@ export class CopilotSession {
                                         runId: params.runId,
                                         executionToken: params.executionToken,
                                         key,
-                                        resultJson:
-                                            result as FactoryJournalPutRequest["resultJson"],
+                                        resultJson: result,
                                     }),
                                 controller.signal
                             );
@@ -1465,12 +1505,19 @@ export class CopilotSession {
                             throw new Error("nested factories are not supported");
                         },
                     };
-                    const result = await definition.run(context);
+                    const execution = { active: true };
+                    const result = await factoryExecutionStore.run(execution, async () => {
+                        try {
+                            return await definition.run(context);
+                        } finally {
+                            execution.active = false;
+                        }
+                    });
                     if (result === undefined) {
                         return {};
                     }
                     assertFactoryResult(result);
-                    return { result } as FactoryExecuteResult;
+                    return { result };
                 } finally {
                     try {
                         await progress.close();
@@ -1595,7 +1642,13 @@ export class CopilotSession {
         }
         try {
             const result = await this.elicitationHandler(context);
-            await this.rpc.ui.handlePendingElicitation({ requestId, result });
+            await this.rpc.ui.handlePendingElicitation({
+                requestId,
+                result: {
+                    action: result.action,
+                    ...(result.content ? { content: result.content } : {}),
+                },
+            });
         } catch {
             // Handler failed — attempt to cancel so the request doesn't hang
             try {
diff --git a/nodejs/src/types.ts b/nodejs/src/types.ts
index b3d572496b..616e15a467 100644
--- a/nodejs/src/types.ts
+++ b/nodejs/src/types.ts
@@ -19,7 +19,10 @@ import type {
     SessionEvent as GeneratedSessionEvent,
 } from "./generated/session-events.js";
 import type { CopilotSession } from "./session.js";
+import type { FactoryJsonSchema, JsonValue } from "./factory.js";
 import type {
+    GitHubTokenAcquireRequest,
+    GitHubTokenAcquireResult,
     GitHubTelemetryNotification,
     ModelBillingTokenPrices,
     OpenCanvasInstance,
@@ -30,10 +33,38 @@ import type { ToolSet } from "./toolSet.js";
 export type { RemoteSessionMode } from "./generated/rpc.js";
 export type { CurrentToolMetadata } from "./generated/rpc.js";
 export type {
+    GitHubTokenAcquireReason,
+    GitHubTokenAcquireResult,
     GitHubTelemetryNotification,
     GitHubTelemetryEvent,
     GitHubTelemetryClientInfo,
 } from "./generated/rpc.js";
+
+/**
+ * Arguments passed to a session's {@link GitHubTokenProvider}.
+ *
+ * The callback registration identifier is intentionally kept inside the SDK.
+ */
+export type GitHubTokenProviderArgs = Pick<
+    GitHubTokenAcquireRequest,
+    "host" | "sessionId" | "reason"
+>;
+
+/** Tagged token or cancellation returned by a {@link GitHubTokenProvider}. */
+export type GitHubTokenProviderResult = GitHubTokenAcquireResult;
+
+/**
+ * Acquires a GitHub token for one session.
+ *
+ * A token result must include `expiresIn`: the positive number of seconds of
+ * remaining lifetime when the callback completes. Production GitHub tokens
+ * typically last eight hours. Initial cancellation, callback errors, and
+ * invalid token responses reject session creation or resume instead of falling
+ * back to ambient authentication.
+ */
+export type GitHubTokenProvider = (
+    args: GitHubTokenProviderArgs
+) => GitHubTokenProviderResult | Promise<GitHubTokenProviderResult>;
 export type {
     ModelBillingTokenPrices,
     ModelBillingTokenPricesLongContext,
@@ -52,6 +83,13 @@ export type { SessionFsSqliteStatement } from "./sessionFsProvider.js";
 export type { SessionFsSqliteTransactionErrorClass } from "./sessionFsProvider.js";
 export { SessionFsSqliteTransactionFailure } from "./sessionFsProvider.js";
 export type { LlmInferenceHeaders } from "./generated/rpc.js";
+export type {
+    PermissionDecisionContext,
+    PermissionDecisionOutcome,
+    PermissionDecisionSource,
+    PermissionDecisionSurface,
+    PermissionResponseCapability,
+} from "./generated/rpc.js";
 export type { CopilotRequestContext } from "./copilotRequestHandler.js";
 export {
     CopilotRequestHandler,
@@ -303,6 +341,13 @@ export interface CopilotClientOptions {
      */
     baseDirectory?: string;
 
+    /**
+     * Absolute paths to trusted plugin directories bundled by the host.
+     * When non-empty, the complete set is registered with the runtime during
+     * startup before any sessions can be created.
+     */
+    builtinPluginDirectories?: readonly string[];
+
     /**
      * Log level for the Copilot runtime. When omitted, the runtime uses its
      * own default (currently `"info"`).
@@ -451,7 +496,7 @@ export type ToolBinaryResult = {
     description?: string;
 };
 
-export type ToolTelemetry = Record<string, Record<string, unknown> | undefined>;
+export type ToolTelemetry = Record<string, Record<string, JsonValue> | undefined>;
 
 export type ToolResultObject = {
     textResultForLlm: string;
@@ -656,6 +701,17 @@ export interface Tool<TArgs = unknown> {
      * Unknown keys are preserved and round-tripped untouched.
      */
     metadata?: Record<string, unknown>;
+    /**
+     * When true, a successful call to this tool ends the agent turn: the runtime's
+     * tool phase halts instead of feeding the tool result back to the model for
+     * another round. A failed call (for example input validation) leaves the loop
+     * running so the model can read the error and retry.
+     *
+     * Use this for tools whose whole purpose is to terminate the turn, such as a
+     * context clear that replaces the conversation the model would otherwise
+     * continue from.
+     */
+    isTerminal?: boolean;
 }
 
 /**
@@ -672,6 +728,7 @@ export function defineTool<T = unknown>(
         skipPermission?: boolean;
         defer?: "auto" | "never";
         metadata?: Record<string, unknown>;
+        isTerminal?: boolean;
     }
 ): Tool<T> {
     return { name, ...config };
@@ -1100,7 +1157,7 @@ export type SystemMessageConfig =
     | SystemMessageReplaceConfig
     | SystemMessageCustomizeConfig;
 
-import type { PermissionDecisionRequest } from "./generated/rpc.js";
+import type { PermissionDecisionRequest, PermissionDecisionContext } from "./generated/rpc.js";
 
 /**
  * Permission request types from the server. This is the generated
@@ -1136,10 +1193,51 @@ export type PermissionRequestedEvent = Omit<GeneratedPermissionRequestedEvent, "
  */
 export type PermissionRequestResult = PermissionDecisionRequest["result"] | { kind: "no-result" };
 
+/**
+ * A {@link PermissionRequestResult} annotated with the
+ * {@link PermissionDecisionContext} describing how and where the decision was
+ * reached. The context is informational only — it never changes permission
+ * behavior. Supplying it lets the runtime attribute auto-approval telemetry to
+ * the responding surface.
+ */
+export interface AttributedPermissionResult {
+    kind: "attributed";
+    result: PermissionRequestResult;
+    decisionContext: PermissionDecisionContext;
+}
+
+/**
+ * Narrows a {@link PermissionHandler} return value to an attributed result.
+ */
+export function isAttributedPermissionResult(
+    result: PermissionRequestResult | AttributedPermissionResult
+): result is AttributedPermissionResult {
+    return result.kind === "attributed";
+}
+
+/**
+ * Pair a permission decision with the context describing how and where it was
+ * made, so the runtime can attribute auto-approval telemetry.
+ *
+ * Passing an already-attributed result replaces the previous context rather
+ * than nesting it. The context is informational only and never changes
+ * permission behavior.
+ */
+export function createAttributedPermissionResult(
+    result: PermissionRequestResult | AttributedPermissionResult,
+    decisionContext: PermissionDecisionContext
+): AttributedPermissionResult {
+    const inner = isAttributedPermissionResult(result) ? result.result : result;
+    return { kind: "attributed", result: inner, decisionContext };
+}
+
 export type PermissionHandler = (
     request: PermissionRequest,
     invocation: { sessionId: string; managedSettingsEnabled?: boolean }
-) => Promise<PermissionRequestResult> | PermissionRequestResult;
+) =>
+    | Promise<PermissionRequestResult | AttributedPermissionResult>
+    | PermissionRequestResult
+    | AttributedPermissionResult;
 
 /**
  * Approves permission requests when managed settings are disabled.
@@ -1994,6 +2092,30 @@ export interface FactoryMeta {
     description: string;
     /** Display metadata for the progress phases the factory may report. */
     phases: Array<{ title: string; detail?: string }>;
+    /**
+     * Optional declared shape of the arguments this factory expects as `ctx.args`.
+     *
+     * Declaring one is strongly recommended for any factory that reads `ctx.args`.
+     * When the model invokes the factory through the `run_factory` tool, the CLI
+     * validates `args` against this declaration **before** the run starts, so a
+     * malformed call is rejected with a correction hint and retried without ever
+     * creating a run row, prompting the user for permission, or spending credits. A
+     * factory that declares nothing is never validated: a malformed call starts,
+     * takes an approval, spends credits, and then fails inside the factory body.
+     * `factories_manage` with `operation: "inspect"` reports the declared shape so an
+     * agent can read it before invoking.
+     *
+     * This covers the model's `run_factory` path only. `session.factory.run(...)` is
+     * not validated against the declaration, so a factory should still check
+     * `ctx.args` rather than assume the declared shape held.
+     *
+     * Enforcement covers structure — types, required properties, and enum/const
+     * values. Finer constraints such as `minLength`, `pattern`, and
+     * `additionalProperties` are recorded in the declaration but not enforced. See
+     * {@link FactoryJsonSchema} for the accepted subset. A declaration outside that
+     * subset is rejected at registration.
+     */
+    argsSchema?: FactoryJsonSchema;
     /** Optional resource ceilings presented to the user before execution. */
     limits?: FactoryLimits;
 }
@@ -2076,6 +2198,53 @@ export interface GitHubMcpToolConfig {
     disableFormDeferral?: boolean;
 }
 
+/** Well-known managed bypass-permissions policies. */
+export const DisableBypassPermissionsModes = {
+    /** Turn off bypass-permissions mode entirely. */
+    Disable: "disable",
+    /** Permit automatic bypass but block full allow-all. */
+    AllowAutoOnly: "allow-auto-only",
+} as const;
+
+/**
+ * Permissions-only managed policy injected by the host via
+ * {@link SessionConfigBase.managedSettings}.
+ *
+ * Rule strings use the same vocabulary the runtime accepts for fetched managed
+ * policy (e.g. `"Read(**)"`, `"Shell(git push *)"`); malformed rules are
+ * rejected at session creation.
+ */
+export interface ManagedSettingsPermissions {
+    /**
+     * Restricts bypass-permissions mode for the session. See
+     * {@link DisableBypassPermissionsModes} for well-known values. Unknown
+     * values are forwarded so newer runtime policies fail closed.
+     */
+    disableBypassPermissionsMode?: string;
+    /** Operations that must always be denied. Unioned across managed layers. */
+    deny?: string[];
+    /**
+     * Operations that must prompt for approval. Unioned across managed layers.
+     */
+    ask?: string[];
+    /**
+     * Operations permitted without prompting. Every declared `allow` list
+     * (across managed layers) must admit an operation for it to be allowed.
+     */
+    allow?: string[];
+}
+
+/**
+ * Host-injected enterprise managed settings. The first supported contract is
+ * permissions-only; unknown sibling keys are rejected by the runtime.
+ *
+ * @see {@link SessionConfigBase.managedSettings}
+ */
+export interface ManagedSettings {
+    /** Managed permission policy for the session. */
+    permissions?: ManagedSettingsPermissions;
+}
+
 /**
  * Shared configuration fields used by both {@link SessionConfig} (for
  * creating a new session) and {@link ResumeSessionConfig} (for resuming
@@ -2256,6 +2425,13 @@ export interface SessionConfigBase {
      */
     excludedBuiltinAgents?: string[];
 
+    /**
+     * Built-in skill names to include in the session. In `mode: "empty"`,
+     * omitting this option excludes all runtime-bundled skills; specifying names
+     * opts those built-ins back in. Skills from other sources remain eligible.
+     */
+    includedBuiltinSkills?: string[];
+
     /**
      * Custom provider configuration (BYOK - Bring Your Own Key).
      * When specified, uses the provided API endpoint instead of the Copilot API.
@@ -2312,6 +2488,14 @@ export interface SessionConfigBase {
      */
     enableCitations?: boolean;
 
+    /**
+     * Opt in to capturing file changes for session rewind and cumulative session
+     * diff. On create, capture starts with the first turn. On resume, this can
+     * enable tracking only when the session still has a valid baseline; it cannot
+     * reconstruct changes from earlier untracked turns.
+     */
+    enableFileChangeTracking?: boolean;
+
     /**
      * Limits applied to this session's current accounting window.
      *
@@ -2535,6 +2719,13 @@ export interface SessionConfigBase {
      */
     disabledSkills?: string[];
 
+    /**
+     * Exact MCP server names to disable for this session. Disabled servers are not
+     * started or authenticated when creating or cold-resuming a session. Supplying
+     * this on a resident resume cannot stop servers that are already running.
+     */
+    disabledMcpServers?: string[];
+
     /**
      * Infinite session configuration for persistent workspaces and automatic compaction.
      * When enabled (default), sessions automatically manage context limits and persist state.
@@ -2559,6 +2750,16 @@ export interface SessionConfigBase {
      */
     gitHubToken?: string;
 
+    /**
+     * Acquires short-lived GitHub credentials for this session on demand.
+     *
+     * Mutually exclusive with {@link SessionConfigBase.gitHubToken}. The
+     * callback receives the effective GitHub host, the session ID when known,
+     * and whether this is the initial acquisition or a refresh. Its opaque
+     * registration ID remains internal to the SDK.
+     */
+    gitHubTokenProvider?: GitHubTokenProvider;
+
     /**
      * Opt-in: when true, the runtime self-fetches enterprise managed settings
      * (bypass-permissions policy) at session bootstrap using the session's
@@ -2567,6 +2768,31 @@ export interface SessionConfigBase {
      */
     enableManagedSettings?: boolean;
 
+    /**
+     * Host-injected enterprise managed settings for this session.
+     *
+     * Unlike {@link SessionConfigBase.enableManagedSettings} — which asks the
+     * runtime to *self-fetch* account/org and device policy — this field lets
+     * the host supply the managed policy directly. The runtime validates it
+     * with the same managed-permission parser it uses for fetched policy and
+     * composes it restrictively with any self-fetched (server) and
+     * device-managed (MDM) layers: `deny`/`ask` rules are unioned, every
+     * declared `allow` list must admit an operation, and bypass-mode
+     * restrictions are composed fail-closed.
+     *
+     * This is startup-only. It is **not** persisted: it must be re-supplied on
+     * {@link CopilotClient.resumeSession | resume}, where it replaces the prior
+     * injected layer (omitting it clears the layer, so warm and cold resume
+     * behave identically). It may be combined with `enableManagedSettings`;
+     * when both are supplied the injected, server, and device restrictions all
+     * apply.
+     *
+     * Requires a Copilot runtime whose RPC schema includes `managedSettings`.
+     * Older runtimes may ignore this additive field, so hosts must not rely on
+     * injected policy until they ship a compatible runtime.
+     */
+    managedSettings?: ManagedSettings;
+
     /**
      * When true, skips embedding-based retrieval for this session.
      * Use in multitenant deployments to prevent cross-session information leakage
@@ -2709,6 +2935,20 @@ export interface ResumeSessionConfig extends SessionConfigBase {
     openCanvases?: OpenCanvasInstance[];
 }
 
+/**
+ * Options that only an extension join may supply, kept off {@link ResumeSessionConfig}
+ * because the runtime ignores them for every other kind of connection.
+ *
+ * @internal
+ */
+export interface ExtensionJoinOptions {
+    /**
+     * Names of sensitive environment variables the extension asks the host to grant.
+     * Sent on the `session.resume` wire payload as `requestedEnvironmentVariables`.
+     */
+    requestedEnvironmentVariables?: string[];
+}
+
 /**
  * Arguments passed to a {@link BearerTokenProvider} callback when the runtime needs a
  * fresh bearer token for a BYOK provider.
diff --git a/nodejs/test/client.test.ts b/nodejs/test/client.test.ts
index bbe6fbe666..3ffda2fa71 100644
--- a/nodejs/test/client.test.ts
+++ b/nodejs/test/client.test.ts
@@ -3,14 +3,17 @@ import { EventEmitter } from "node:events";
 import { PassThrough } from "stream";
 import { mkdtempSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 import { describe, expect, it, onTestFinished, vi } from "vitest";
 import {
     approveAll,
+    createAttributedPermissionResult,
     CopilotClient,
     createCanvas,
+    DisableBypassPermissionsModes,
     RuntimeConnection,
     type GitHubTelemetryNotification,
+    type ManagedSettings,
     type ModelInfo,
 } from "../src/index.js";
 import { CopilotSession } from "../src/session.js";
@@ -57,6 +60,51 @@ describe("approveAll", () => {
 });
 
 describe("CopilotClient", () => {
+    async function startWithMockConnection(
+        builtinPluginDirectories?: readonly string[]
+    ): Promise<ReturnType<typeof vi.fn>> {
+        const client = new CopilotClient({
+            connection: RuntimeConnection.forUri("localhost:1234"),
+            builtinPluginDirectories,
+        });
+        const sendRequest = vi.fn(async () => ({}));
+        vi.spyOn(client as any, "connectToServer").mockImplementation(async () => {
+            (client as any).connection = { sendRequest };
+        });
+        vi.spyOn(client as any, "verifyProtocolVersion").mockResolvedValue(undefined);
+
+        await client.start();
+        return sendRequest;
+    }
+
+    it.each([undefined, []])(
+        "does not configure built-in plugin directories when unset or empty",
+        async (builtinPluginDirectories) => {
+            const sendRequest = await startWithMockConnection(builtinPluginDirectories);
+
+            expect(sendRequest).not.toHaveBeenCalledWith("plugins.builtin.set", expect.anything());
+        }
+    );
+
+    it("configures built-in plugin directories before start completes", async () => {
+        const paths = [resolve("plugins/core"), resolve("plugins/github")];
+
+        const sendRequest = await startWithMockConnection(paths);
+
+        expect(sendRequest).toHaveBeenCalledTimes(1);
+        expect(sendRequest).toHaveBeenCalledWith("plugins.builtin.set", { paths });
+    });
+
+    it("rejects relative built-in plugin directories", () => {
+        expect(
+            () =>
+                new CopilotClient({
+                    connection: RuntimeConnection.forUri("localhost:1234"),
+                    builtinPluginDirectories: ["plugins/core"],
+                })
+        ).toThrow(/builtinPluginDirectories.*absolute paths.*plugins\/core/);
+    });
+
     it("disposes the stdio connection when child stdin emits an error", async () => {
         const client = new CopilotClient();
         onTestFinished(() => client.forceStop());
@@ -83,6 +131,91 @@ describe("CopilotClient", () => {
         expect(spy).not.toHaveBeenCalled();
     });
 
+    it("forwards decisionContext as a top-level sibling of result", async () => {
+        const session = new CopilotSession("session-1", {} as any);
+        const decisionContext = {
+            outcome: "auto_approved" as const,
+            source: "host_policy" as const,
+            surface: "sdk" as const,
+        };
+        session.registerPermissionHandler(() =>
+            createAttributedPermissionResult({ kind: "approve-once" }, decisionContext)
+        );
+        const spy = vi
+            .spyOn(session.rpc.permissions, "handlePendingPermissionRequest")
+            .mockResolvedValue({ kind: "approve-once" } as any);
+
+        await (session as any)._executePermissionAndRespond("request-1", { kind: "write" });
+
+        expect(spy).toHaveBeenCalledOnce();
+        const params = spy.mock.calls[0][0] as any;
+        expect(params).toEqual({
+            requestId: "request-1",
+            result: { kind: "approve-once" },
+            decisionContext,
+        });
+        // decisionContext is a sibling of result, never nested inside it.
+        expect(params.result.decisionContext).toBeUndefined();
+    });
+
+    it("emits exactly requestId and result with no decisionContext key when unattributed", async () => {
+        const session = new CopilotSession("session-1", {} as any);
+        session.registerPermissionHandler(() => ({ kind: "approve-once" }));
+        const spy = vi
+            .spyOn(session.rpc.permissions, "handlePendingPermissionRequest")
+            .mockResolvedValue({ kind: "approve-once" } as any);
+
+        await (session as any)._executePermissionAndRespond("request-1", { kind: "write" });
+
+        expect(spy).toHaveBeenCalledOnce();
+        const params = spy.mock.calls[0][0] as any;
+        expect(params).toEqual({ requestId: "request-1", result: { kind: "approve-once" } });
+        expect(Object.keys(params).sort()).toEqual(["requestId", "result"]);
+        expect("decisionContext" in params).toBe(false);
+    });
+
+    it("does not respond when a no-result decision is wrapped with a context", async () => {
+        const session = new CopilotSession("session-1", {} as any);
+        const decisionContext = {
+            outcome: "auto_approved" as const,
+            source: "host_policy" as const,
+            surface: "sdk" as const,
+        };
+        session.registerPermissionHandler(() =>
+            createAttributedPermissionResult({ kind: "no-result" }, decisionContext)
+        );
+        const spy = vi.spyOn(session.rpc.permissions, "handlePendingPermissionRequest");
+
+        await (session as any)._executePermissionAndRespond("request-1", { kind: "write" });
+
+        expect(spy).not.toHaveBeenCalled();
+    });
+
+    it("replaces the context when applied twice", () => {
+        const first = {
+            outcome: "auto_approved" as const,
+            source: "judge_recommendation" as const,
+            surface: "sdk" as const,
+        };
+        const second = {
+            outcome: "prompted_user" as const,
+            source: "human_response" as const,
+            surface: "tui" as const,
+        };
+
+        const once = createAttributedPermissionResult({ kind: "approve-once" }, first);
+        const twice = createAttributedPermissionResult(once, second);
+
+        expect(twice).toEqual({
+            kind: "attributed",
+            result: { kind: "approve-once" },
+            decisionContext: second,
+        });
+        // The result stays unwrapped rather than nesting an AttributedPermissionResult.
+        expect((twice.result as any).result).toBeUndefined();
+        expect((twice.result as any).decisionContext).toBeUndefined();
+    });
+
     it("responds to MCP OAuth requests with host token data", async () => {
         const sendRequest = vi.fn(async () => ({ success: true }));
         let observedRequest: any;
@@ -491,6 +624,99 @@ describe("CopilotClient", () => {
         expect(payload.openCanvasInstances).toBeUndefined();
     });
 
+    it("forwards an extension environment request and applies the grant to process.env", async () => {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => stopClient(client));
+        onTestFinished(() => {
+            delete process.env.SDK_TEST_GRANTED_TOKEN;
+        });
+
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.resume") {
+                    return {
+                        sessionId: params.sessionId,
+                        grantedEnvironmentVariables: { SDK_TEST_GRANTED_TOKEN: "granted-value" },
+                    };
+                }
+                throw new Error(`Unexpected method: ${method}`);
+            });
+
+        await client.resumeSessionForExtension(
+            "session-env",
+            { onPermissionRequest: defaultJoinSessionPermissionHandler },
+            undefined,
+            { requestedEnvironmentVariables: ["SDK_TEST_GRANTED_TOKEN"] }
+        );
+
+        const payload = spy.mock.calls.find(([method]) => method === "session.resume")![1] as any;
+        expect(payload.requestedEnvironmentVariables).toEqual(["SDK_TEST_GRANTED_TOKEN"]);
+        expect(process.env.SDK_TEST_GRANTED_TOKEN).toBe("granted-value");
+    });
+
+    it("ignores granted variables the extension never requested", async () => {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => stopClient(client));
+        onTestFinished(() => {
+            delete process.env.SDK_TEST_GRANTED_TOKEN;
+        });
+
+        vi.spyOn((client as any).connection!, "sendRequest").mockImplementation(
+            async (method: string, params: any) => {
+                if (method === "session.resume") {
+                    return {
+                        sessionId: params.sessionId,
+                        grantedEnvironmentVariables: {
+                            SDK_TEST_GRANTED_TOKEN: "granted-value",
+                            SDK_TEST_SMUGGLED: "not-approved",
+                        },
+                    };
+                }
+                throw new Error(`Unexpected method: ${method}`);
+            }
+        );
+
+        await client.resumeSessionForExtension(
+            "session-env-extra",
+            { onPermissionRequest: defaultJoinSessionPermissionHandler },
+            undefined,
+            { requestedEnvironmentVariables: ["SDK_TEST_GRANTED_TOKEN"] }
+        );
+
+        expect(process.env.SDK_TEST_GRANTED_TOKEN).toBe("granted-value");
+        // The user approved one name, so a host answering with a second one
+        // cannot widen the grant.
+        expect(process.env.SDK_TEST_SMUGGLED).toBeUndefined();
+    });
+
+    it("omits the environment request when a resume does not ask for one", async () => {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => stopClient(client));
+
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.resume") {
+                    return {
+                        sessionId: params.sessionId,
+                        grantedEnvironmentVariables: { SDK_TEST_UNREQUESTED: "leaked" },
+                    };
+                }
+                throw new Error(`Unexpected method: ${method}`);
+            });
+
+        await client.resumeSession("session-no-env", { onPermissionRequest: approveAll });
+
+        const payload = spy.mock.calls.find(([method]) => method === "session.resume")![1] as any;
+        expect(payload).not.toHaveProperty("requestedEnvironmentVariables");
+        // A grant is only honored for a request this client actually made.
+        expect(process.env.SDK_TEST_UNREQUESTED).toBeUndefined();
+    });
+
     it("forwards reasoningSummary in session.create and session.resume", async () => {
         const client = new CopilotClient();
         await client.start();
@@ -714,6 +940,68 @@ describe("CopilotClient", () => {
         expect(createPayload.tools[0].metadata).toBeUndefined();
     });
 
+    it("forwards tool isTerminal in session.create and session.resume", async () => {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => client.forceStop());
+
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.create") return { sessionId: params.sessionId };
+                if (method === "session.resume") return { sessionId: params.sessionId };
+                throw new Error(`Unexpected method: ${method}`);
+            });
+
+        const tool = {
+            name: "clear_context",
+            description: "Clears the conversation",
+            parameters: { type: "object", properties: {} },
+            isTerminal: true,
+        };
+
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            tools: [tool],
+        });
+        await client.resumeSession(session.sessionId, {
+            onPermissionRequest: approveAll,
+            tools: [tool],
+        });
+
+        const createPayload = spy.mock.calls.find(
+            ([method]) => method === "session.create"
+        )![1] as any;
+        const resumePayload = spy.mock.calls.find(
+            ([method]) => method === "session.resume"
+        )![1] as any;
+        expect(createPayload.tools[0].isTerminal).toBe(true);
+        expect(resumePayload.tools[0].isTerminal).toBe(true);
+    });
+
+    it("omits tool isTerminal from session.create when unset", async () => {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => client.forceStop());
+
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.create") return { sessionId: params.sessionId };
+                throw new Error(`Unexpected method: ${method}`);
+            });
+
+        await client.createSession({
+            onPermissionRequest: approveAll,
+            tools: [{ name: "my_tool", description: "a tool" }],
+        });
+
+        const createPayload = spy.mock.calls.find(
+            ([method]) => method === "session.create"
+        )![1] as any;
+        expect(createPayload.tools[0].isTerminal).toBeUndefined();
+    });
+
     it("forwards new session options in session.create and session.resume", async () => {
         const client = new CopilotClient();
         await client.start();
@@ -730,12 +1018,14 @@ describe("CopilotClient", () => {
         const session = await client.createSession({
             onPermissionRequest: approveAll,
             enableCitations: true,
+            enableFileChangeTracking: true,
             excludedBuiltinAgents: ["explore"],
             sessionLimits: { maxAiCredits: 30 },
         });
         await client.resumeSession(session.sessionId, {
             onPermissionRequest: approveAll,
             enableCitations: false,
+            enableFileChangeTracking: false,
             excludedBuiltinAgents: ["task"],
             sessionLimits: { maxAiCredits: 15 },
         });
@@ -747,9 +1037,11 @@ describe("CopilotClient", () => {
             ([method]) => method === "session.resume"
         )![1] as any;
         expect(createPayload.enableCitations).toBe(true);
+        expect(createPayload.enableFileChangeTracking).toBe(true);
         expect(createPayload.excludedBuiltinAgents).toEqual(["explore"]);
         expect(createPayload.sessionLimits).toEqual({ maxAiCredits: 30 });
         expect(resumePayload.enableCitations).toBe(false);
+        expect(resumePayload.enableFileChangeTracking).toBe(false);
         expect(resumePayload.excludedBuiltinAgents).toEqual(["task"]);
         expect(resumePayload.sessionLimits).toEqual({ maxAiCredits: 15 });
     });
@@ -1030,6 +1322,7 @@ describe("CopilotClient", () => {
             });
 
         const pluginDirs = ["/tmp/plugins/a", "/tmp/plugins/b"];
+        const disabledMcpServers = ["local-files", "remote-github"];
         const largeOutput = {
             enabled: true,
             maxSizeBytes: 1024,
@@ -1044,11 +1337,13 @@ describe("CopilotClient", () => {
         const session = await client.createSession({
             onPermissionRequest: approveAll,
             pluginDirectories: pluginDirs,
+            disabledMcpServers,
             largeOutput,
         });
         await client.resumeSession(session.sessionId, {
             onPermissionRequest: approveAll,
             pluginDirectories: pluginDirs,
+            disabledMcpServers,
             largeOutput,
         });
 
@@ -1059,8 +1354,10 @@ describe("CopilotClient", () => {
             ([method]) => method === "session.resume"
         )![1] as any;
         expect(createPayload.pluginDirectories).toEqual(pluginDirs);
+        expect(createPayload.disabledMcpServers).toEqual(disabledMcpServers);
         expect(createPayload.largeOutput).toEqual(expectedWireLargeOutput);
         expect(resumePayload.pluginDirectories).toEqual(pluginDirs);
+        expect(resumePayload.disabledMcpServers).toEqual(disabledMcpServers);
         expect(resumePayload.largeOutput).toEqual(expectedWireLargeOutput);
     });
 
@@ -1661,6 +1958,134 @@ describe("CopilotClient", () => {
         spy.mockRestore();
     });
 
+    it("sends includedBuiltinSkills=[] in the empty-mode post-create options patch", async () => {
+        const client = new CopilotClient({ mode: "empty", baseDirectory: "/tmp/copilot-test" });
+        await client.start();
+        onTestFinished(() => stopClient(client));
+
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.create") return { sessionId: params.sessionId ?? "s1" };
+                if (method === "session.options.update") return {};
+                throw new Error(`Unexpected method: ${method}`);
+            });
+        await client.createSession({ onPermissionRequest: approveAll, availableTools: [] });
+
+        const patch = spy.mock.calls.find((c) => c[0] === "session.options.update")![1] as any;
+        expect(patch.includedBuiltinSkills).toEqual([]);
+        expect(patch.installedPlugins).toEqual([]);
+    });
+
+    it("sends includedBuiltinSkills=[] in the empty-mode post-resume options patch", async () => {
+        const client = new CopilotClient({ mode: "empty", baseDirectory: "/tmp/copilot-test" });
+        await client.start();
+        onTestFinished(() => stopClient(client));
+
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.create") return { sessionId: params.sessionId ?? "s1" };
+                if (method === "session.resume") return { sessionId: params.sessionId };
+                if (method === "session.options.update") return {};
+                throw new Error(`Unexpected method: ${method}`);
+            });
+        await client.createSession({ onPermissionRequest: approveAll, availableTools: [] });
+        spy.mockClear();
+        await client.resumeSession("s1", { onPermissionRequest: approveAll, availableTools: [] });
+
+        const patch = spy.mock.calls.find((c) => c[0] === "session.options.update")![1] as any;
+        expect(patch.includedBuiltinSkills).toEqual([]);
+    });
+
+    it("preserves an explicit built-in skill allowlist after empty-mode resume", async () => {
+        const client = new CopilotClient({ mode: "empty", baseDirectory: "/tmp/copilot-test" });
+        await client.start();
+        onTestFinished(() => stopClient(client));
+
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string) => {
+                if (method === "session.resume") return { sessionId: "s1" };
+                if (method === "session.options.update") return { success: true };
+                throw new Error(`Unexpected method: ${method}`);
+            });
+        await client.resumeSession("s1", {
+            onPermissionRequest: approveAll,
+            availableTools: [],
+            includedBuiltinSkills: ["code-review"],
+        });
+
+        const patch = spy.mock.calls.find((c) => c[0] === "session.options.update")![1] as any;
+        expect(patch.includedBuiltinSkills).toEqual(["code-review"]);
+    });
+
+    it("keeps includedBuiltinSkills=[] even when the caller opts into custom skills in empty mode", async () => {
+        const client = new CopilotClient({ mode: "empty", baseDirectory: "/tmp/copilot-test" });
+        await client.start();
+        onTestFinished(() => stopClient(client));
+
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.create") return { sessionId: params.sessionId ?? "s1" };
+                if (method === "session.options.update") return {};
+                throw new Error(`Unexpected method: ${method}`);
+            });
+        await client.createSession({
+            onPermissionRequest: approveAll,
+            availableTools: [],
+            enableSkills: true,
+            skillDirectories: ["/tmp/custom-skills"],
+        });
+
+        const createPayload = spy.mock.calls.find((c) => c[0] === "session.create")![1] as any;
+        expect(createPayload.enableSkills).toBe(true);
+        expect(createPayload.skillDirectories).toEqual(["/tmp/custom-skills"]);
+        const patch = spy.mock.calls.find((c) => c[0] === "session.options.update")![1] as any;
+        expect(patch.includedBuiltinSkills).toEqual([]);
+    });
+
+    it("preserves an explicit built-in skill allowlist in empty mode", async () => {
+        const client = new CopilotClient({ mode: "empty", baseDirectory: "/tmp/copilot-test" });
+        await client.start();
+        onTestFinished(() => stopClient(client));
+
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.create") return { sessionId: params.sessionId };
+                if (method === "session.options.update") return { success: true };
+                throw new Error(`Unexpected method: ${method}`);
+            });
+        await client.createSession({
+            onPermissionRequest: approveAll,
+            availableTools: [],
+            includedBuiltinSkills: ["code-review"],
+        });
+
+        const patch = spy.mock.calls.find((c) => c[0] === "session.options.update")![1] as any;
+        expect(patch.includedBuiltinSkills).toEqual(["code-review"]);
+    });
+
+    it("does not send includedBuiltinSkills in copilot-cli mode", async () => {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => stopClient(client));
+
+        const spy = vi.spyOn((client as any).connection!, "sendRequest");
+        await client.createSession({ onPermissionRequest: approveAll });
+
+        const patch = spy.mock.calls.find((c) => c[0] === "session.options.update");
+        // copilot-cli mode sends no post-create options patch at all here.
+        if (patch) {
+            expect((patch[1] as any).includedBuiltinSkills).toBeUndefined();
+        }
+        const createPayload = spy.mock.calls.find((c) => c[0] === "session.create")![1] as any;
+        expect(createPayload.includedBuiltinSkills).toBeUndefined();
+        spy.mockRestore();
+    });
+
     it("forwards continuePendingWork in session.resume request", async () => {
         const client = new CopilotClient();
         await client.start();
@@ -2824,7 +3249,7 @@ describe("CopilotClient", () => {
             const payload = spy.mock.calls.find((c) => c[0] === "session.create")![1] as any;
             expect(payload.commands).toEqual([
                 { name: "deploy", description: "Deploy the app" },
-                { name: "rollback", description: undefined },
+                { name: "rollback", description: "" },
             ]);
         });
 
@@ -3592,3 +4017,128 @@ describe("CopilotClient", () => {
         });
     });
 });
+
+describe("managedSettings serialization", () => {
+    async function captureCreateParams(config: Record<string, unknown>): Promise<any> {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => stopClient(client));
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.create") return { sessionId: params.sessionId };
+                throw new Error(`Unexpected method: ${method}`);
+            });
+        await client.createSession({ onPermissionRequest: approveAll, ...config });
+        const call = spy.mock.calls.find(([method]) => method === "session.create");
+        return call![1];
+    }
+
+    it("forwards the full permissions object on session.create", async () => {
+        const managedSettings = {
+            permissions: {
+                disableBypassPermissionsMode: DisableBypassPermissionsModes.AllowAutoOnly,
+                deny: ["Shell(git push)"],
+                ask: ["Domain(publish.example)"],
+                allow: ["Read(**)"],
+            },
+        } satisfies ManagedSettings;
+        const params = await captureCreateParams({
+            managedSettings,
+        });
+        expect(params.managedSettings).toEqual({
+            permissions: {
+                disableBypassPermissionsMode: "allow-auto-only",
+                deny: ["Shell(git push)"],
+                ask: ["Domain(publish.example)"],
+                allow: ["Read(**)"],
+            },
+        });
+    });
+
+    it("forwards the disable bypass-permissions mode", async () => {
+        const managedSettings = {
+            permissions: {
+                disableBypassPermissionsMode: DisableBypassPermissionsModes.Disable,
+            },
+        } satisfies ManagedSettings;
+        const params = await captureCreateParams({ managedSettings });
+
+        expect(params.managedSettings).toEqual({
+            permissions: {
+                disableBypassPermissionsMode: "disable",
+            },
+        });
+    });
+
+    it("forwards unknown bypass-permissions modes", async () => {
+        const managedSettings = {
+            permissions: {
+                disableBypassPermissionsMode: "future-fail-closed-mode",
+            },
+        } satisfies ManagedSettings;
+        const params = await captureCreateParams({ managedSettings });
+
+        expect(params.managedSettings).toEqual(managedSettings);
+    });
+
+    it("marks directly injected sessions as managed", async () => {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => stopClient(client));
+        vi.spyOn((client as any).connection!, "sendRequest").mockImplementation(
+            async (method: string, params: any) => {
+                if (method === "session.create") return { sessionId: params.sessionId };
+                throw new Error(`Unexpected method: ${method}`);
+            }
+        );
+
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            managedSettings: { permissions: { deny: ["Edit(/secrets/**)"] } },
+        });
+
+        expect((session as any).managedSettingsEnabled).toBe(true);
+    });
+
+    it("omits managedSettings when not supplied", async () => {
+        const params = await captureCreateParams({});
+        expect(params.managedSettings).toBeUndefined();
+    });
+
+    it("coexists with enableManagedSettings", async () => {
+        const params = await captureCreateParams({
+            enableManagedSettings: true,
+            managedSettings: { permissions: { deny: ["Edit(/secrets/**)"] } },
+        });
+        expect(params.enableManagedSettings).toBe(true);
+        expect(params.managedSettings).toEqual({ permissions: { deny: ["Edit(/secrets/**)"] } });
+    });
+
+    it("preserves empty arrays in the permissions object", async () => {
+        const params = await captureCreateParams({
+            managedSettings: { permissions: { deny: [], ask: [], allow: [] } },
+        });
+        expect(params.managedSettings).toEqual({ permissions: { deny: [], ask: [], allow: [] } });
+    });
+
+    it("forwards managedSettings on session.resume", async () => {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => stopClient(client));
+        const spy = vi
+            .spyOn((client as any).connection!, "sendRequest")
+            .mockImplementation(async (method: string, params: any) => {
+                if (method === "session.resume") return { sessionId: params.sessionId };
+                throw new Error(`Unexpected method: ${method}`);
+            });
+        await client.resumeSession("session-1", {
+            onPermissionRequest: approveAll,
+            managedSettings: { permissions: { ask: ["Domain(publish.example)"] } },
+        });
+        const call = spy.mock.calls.find(([method]) => method === "session.resume");
+        expect(call![1].managedSettings).toEqual({
+            permissions: { ask: ["Domain(publish.example)"] },
+        });
+    });
+});
diff --git a/nodejs/test/e2e/client.e2e.test.ts b/nodejs/test/e2e/client.e2e.test.ts
index 89489f78e6..35e7440766 100644
--- a/nodejs/test/e2e/client.e2e.test.ts
+++ b/nodejs/test/e2e/client.e2e.test.ts
@@ -1,5 +1,5 @@
 import { ChildProcess } from "child_process";
-import { describe, expect, it, onTestFinished } from "vitest";
+import { describe, expect, it, onTestFinished, vi } from "vitest";
 import { approveAll, CopilotClient, RuntimeConnection } from "../../src/index.js";
 import { isInProcessTransport } from "./harness/sdkTestContext.js";
 
@@ -95,7 +95,12 @@ describe("Client", () => {
             const cliProcess = (client as any).cliProcess as ChildProcess;
             expect(cliProcess).toBeDefined();
             cliProcess.kill("SIGKILL");
-            await new Promise((resolve) => setTimeout(resolve, 100));
+            await vi.waitFor(
+                () => {
+                    expect((client as unknown as { state: string }).state).toBe("disconnected");
+                },
+                { timeout: 10_000 }
+            );
 
             const errors = await client.stop();
             if (errors.length > 0) {
diff --git a/nodejs/test/e2e/disabled_mcp_servers.e2e.test.ts b/nodejs/test/e2e/disabled_mcp_servers.e2e.test.ts
new file mode 100644
index 0000000000..ce1a504e8f
--- /dev/null
+++ b/nodejs/test/e2e/disabled_mcp_servers.e2e.test.ts
@@ -0,0 +1,485 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { randomUUID } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+import {
+    approveAll,
+    CopilotRequestHandler,
+    RuntimeConnection,
+    type CopilotSession,
+} from "../../src/index.js";
+import { createSdkTestContext, isInProcessTransport } from "./harness/sdkTestContext.js";
+import { waitForCondition } from "./harness/sdkTestHelper.js";
+
+const __dirname = resolve(fileURLToPath(new URL(".", import.meta.url)));
+const TEST_MCP_SERVER = resolve(__dirname, "../../../test/harness/test-mcp-server.mjs");
+const SYNTHETIC_RESPONSE = "PERSISTED_SESSION_READY";
+const MCP_TRIGGER_PROMPT = "Reply with the configured MCP test completion marker.";
+
+class PersistingRequestHandler extends CopilotRequestHandler {
+    protected override async sendRequest(request: Request): Promise<Response> {
+        const body = request.body ? await request.text() : "";
+        const wantsStream = /"stream"\s*:\s*true/.test(body);
+        const url = request.url.toLowerCase();
+
+        if (url.endsWith("/models")) {
+            return new Response(MODEL_CATALOG_JSON, {
+                status: 200,
+                headers: { "content-type": "application/json" },
+            });
+        }
+
+        if (url.includes("/responses")) {
+            return new Response(wantsStream ? RESPONSE_STREAM : RESPONSE_JSON, {
+                status: 200,
+                headers: {
+                    "content-type": wantsStream ? "text/event-stream" : "application/json",
+                },
+            });
+        }
+
+        if (url.includes("/chat/completions")) {
+            return new Response(
+                wantsStream ? CHAT_COMPLETION_STREAM : CHAT_COMPLETION_RESPONSE_JSON,
+                {
+                    status: 200,
+                    headers: {
+                        "content-type": wantsStream ? "text/event-stream" : "application/json",
+                    },
+                }
+            );
+        }
+
+        return new Response("{}", {
+            status: 200,
+            headers: { "content-type": "application/json" },
+        });
+    }
+}
+
+const RESPONSE_STREAM = [
+    {
+        event: "response.created",
+        data: {
+            type: "response.created",
+            response: {
+                id: "persisted-session",
+                object: "response",
+                status: "in_progress",
+                output: [],
+            },
+        },
+    },
+    {
+        event: "response.output_item.added",
+        data: {
+            type: "response.output_item.added",
+            output_index: 0,
+            item: { id: "message-1", type: "message", role: "assistant", content: [] },
+        },
+    },
+    {
+        event: "response.content_part.added",
+        data: {
+            type: "response.content_part.added",
+            output_index: 0,
+            content_index: 0,
+            part: { type: "output_text", text: "" },
+        },
+    },
+    {
+        event: "response.output_text.delta",
+        data: {
+            type: "response.output_text.delta",
+            output_index: 0,
+            content_index: 0,
+            delta: SYNTHETIC_RESPONSE,
+        },
+    },
+    {
+        event: "response.output_text.done",
+        data: {
+            type: "response.output_text.done",
+            output_index: 0,
+            content_index: 0,
+            text: SYNTHETIC_RESPONSE,
+        },
+    },
+    {
+        event: "response.completed",
+        data: {
+            type: "response.completed",
+            response: {
+                id: "persisted-session",
+                object: "response",
+                status: "completed",
+                output: [
+                    {
+                        id: "message-1",
+                        type: "message",
+                        role: "assistant",
+                        content: [{ type: "output_text", text: SYNTHETIC_RESPONSE }],
+                    },
+                ],
+                usage: { input_tokens: 1, output_tokens: 1, total_tokens: 2 },
+            },
+        },
+    },
+]
+    .map(({ event, data }) => `event: ${event}\ndata: ${JSON.stringify(data)}\n\n`)
+    .join("");
+
+const RESPONSE_JSON = JSON.stringify({
+    id: "persisted-session",
+    object: "response",
+    status: "completed",
+    output: [
+        {
+            id: "message-1",
+            type: "message",
+            role: "assistant",
+            content: [{ type: "output_text", text: SYNTHETIC_RESPONSE }],
+        },
+    ],
+    usage: { input_tokens: 1, output_tokens: 1, total_tokens: 2 },
+});
+
+const CHAT_COMPLETION_STREAM = [
+    {
+        id: "persisted-session",
+        object: "chat.completion.chunk",
+        created: 1,
+        model: "claude-sonnet-4.5",
+        choices: [
+            {
+                index: 0,
+                delta: { role: "assistant", content: SYNTHETIC_RESPONSE },
+                finish_reason: null,
+            },
+        ],
+    },
+    {
+        id: "persisted-session",
+        object: "chat.completion.chunk",
+        created: 1,
+        model: "claude-sonnet-4.5",
+        choices: [{ index: 0, delta: {}, finish_reason: "stop" }],
+    },
+]
+    .map((data) => `data: ${JSON.stringify(data)}\n\n`)
+    .concat("data: [DONE]\n\n")
+    .join("");
+
+const CHAT_COMPLETION_RESPONSE_JSON = JSON.stringify({
+    id: "persisted-session",
+    object: "chat.completion",
+    created: 1,
+    model: "claude-sonnet-4.5",
+    choices: [
+        {
+            index: 0,
+            message: { role: "assistant", content: SYNTHETIC_RESPONSE },
+            finish_reason: "stop",
+        },
+    ],
+    usage: { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 },
+});
+
+const MODEL_CATALOG_JSON = JSON.stringify({
+    data: [
+        {
+            id: "claude-sonnet-4.5",
+            name: "Claude Sonnet 4.5",
+            object: "model",
+            vendor: "Anthropic",
+            version: "1",
+            preview: false,
+            model_picker_enabled: true,
+            capabilities: {
+                type: "chat",
+                family: "claude-sonnet-4.5",
+                tokenizer: "o200k_base",
+                limits: { max_context_window_tokens: 200000, max_output_tokens: 8192 },
+                supports: { streaming: true, tool_calls: true, parallel_tool_calls: true },
+            },
+        },
+    ],
+});
+
+describe("disabled MCP servers", async () => {
+    const {
+        copilotClient: client,
+        createClient,
+        openAiEndpoint,
+        workDir,
+    } = await createSdkTestContext({
+        copilotClientOptions: {
+            requestHandler: new PersistingRequestHandler(),
+        },
+    });
+
+    function createPluginDirectory(prefix: string): {
+        pluginDirectory: string;
+        controlMarker: string;
+        disabledMarker: string;
+    } {
+        const pluginDirectory = join(workDir, `${prefix}-${randomUUID()}`);
+        mkdirSync(pluginDirectory, { recursive: true });
+        const controlMarker = join(pluginDirectory, "control-started.log");
+        const disabledMarker = join(pluginDirectory, "disabled-started.log");
+
+        writeFileSync(
+            join(pluginDirectory, "plugin.json"),
+            JSON.stringify({
+                name: `${prefix}-${randomUUID()}`,
+                version: "1.0.0",
+            })
+        );
+        writeFileSync(
+            join(pluginDirectory, ".mcp.json"),
+            JSON.stringify({
+                mcpServers: {
+                    control: {
+                        type: "stdio",
+                        command: process.execPath,
+                        args: [
+                            TEST_MCP_SERVER,
+                            "--startup-marker",
+                            controlMarker,
+                            "--server-name",
+                            "control",
+                        ],
+                    },
+                    disabled: {
+                        type: "stdio",
+                        command: process.execPath,
+                        args: [
+                            TEST_MCP_SERVER,
+                            "--startup-marker",
+                            disabledMarker,
+                            "--server-name",
+                            "disabled",
+                        ],
+                    },
+                },
+            })
+        );
+
+        return { pluginDirectory, controlMarker, disabledMarker };
+    }
+
+    function markerCount(markerPath: string): number {
+        if (!existsSync(markerPath)) {
+            return 0;
+        }
+        return readFileSync(markerPath, "utf8").trim().split("\n").filter(Boolean).length;
+    }
+
+    async function waitForMarkerCount(markerPath: string, expectedCount: number): Promise<void> {
+        await waitForCondition(() => markerCount(markerPath) >= expectedCount, {
+            timeoutMs: 60_000,
+            intervalMs: 100,
+            timeoutMessage: `Timed out waiting for ${markerPath} to be written ${expectedCount} time(s).`,
+        });
+    }
+
+    async function waitForMcpStatus(
+        session: CopilotSession,
+        serverName: string,
+        expectedStatus: string
+    ): Promise<void> {
+        let lastStatus = "<not listed>";
+        await waitForCondition(
+            async () => {
+                const result = await session.rpc.mcp.list();
+                const server = result.servers.find((candidate) => candidate.name === serverName);
+                lastStatus = server?.status ?? "<not listed>";
+                return lastStatus === expectedStatus;
+            },
+            {
+                timeoutMs: 60_000,
+                intervalMs: 100,
+                timeoutMessage: `${serverName} did not reach ${expectedStatus}; last status was ${lastStatus}.`,
+            }
+        );
+    }
+
+    function expectSyntheticResponse(response: Awaited<ReturnType<CopilotSession["sendAndWait"]>>) {
+        expect(response?.data.content).toBe(SYNTHETIC_RESPONSE);
+    }
+
+    async function drainPostCreateRpc(session: CopilotSession): Promise<void> {
+        // Drain a non-MCP post-create RPC without initializing MCP before the first model turn.
+        await session.rpc.metadata.snapshot();
+    }
+
+    async function mcpRequestCount(): Promise<number> {
+        const requests = await openAiEndpoint.getRequests();
+        return requests.filter((request) => request.method === "POST" && request.url === "/mcp")
+            .length;
+    }
+
+    async function waitForMcpRequestCount(expectedCount: number): Promise<void> {
+        let lastCount = 0;
+        await waitForCondition(
+            async () => {
+                lastCount = await mcpRequestCount();
+                return lastCount >= expectedCount;
+            },
+            {
+                timeoutMs: 60_000,
+                intervalMs: 100,
+                timeoutMessage: `Timed out waiting for ${expectedCount} /mcp request(s); saw ${lastCount}.`,
+            }
+        );
+    }
+
+    it(
+        "keeps disabled plugin MCP servers per-session on create",
+        { timeout: 120_000 },
+        async () => {
+            const {
+                pluginDirectory: disabledPluginDirectory,
+                controlMarker: disabledControlMarker,
+                disabledMarker,
+            } = createPluginDirectory("disabled-mcp-create");
+
+            await using disabledSession = await client.createSession({
+                onPermissionRequest: approveAll,
+                pluginDirectories: [disabledPluginDirectory],
+                disabledMcpServers: ["disabled"],
+            });
+
+            await drainPostCreateRpc(disabledSession);
+            expect(existsSync(disabledControlMarker)).toBe(false);
+            expect(existsSync(disabledMarker)).toBe(false);
+            expectSyntheticResponse(
+                await disabledSession.sendAndWait({ prompt: MCP_TRIGGER_PROMPT })
+            );
+            await waitForMarkerCount(disabledControlMarker, 1);
+            expect(existsSync(disabledMarker)).toBe(false);
+            await waitForMcpStatus(disabledSession, "control", "connected");
+            await waitForMcpStatus(disabledSession, "disabled", "disabled");
+
+            const {
+                pluginDirectory: enabledPluginDirectory,
+                controlMarker: enabledControlMarker,
+                disabledMarker: enabledDisabledMarker,
+            } = createPluginDirectory("enabled-mcp-create");
+            await using enabledSession = await client.createSession({
+                onPermissionRequest: approveAll,
+                pluginDirectories: [enabledPluginDirectory],
+            });
+            await drainPostCreateRpc(enabledSession);
+            expect(existsSync(enabledControlMarker)).toBe(false);
+            expect(existsSync(enabledDisabledMarker)).toBe(false);
+            expectSyntheticResponse(
+                await enabledSession.sendAndWait({ prompt: MCP_TRIGGER_PROMPT })
+            );
+            await waitForMarkerCount(enabledControlMarker, 1);
+            await waitForMarkerCount(enabledDisabledMarker, 1);
+            await waitForMcpStatus(enabledSession, "control", "connected");
+            await waitForMcpStatus(enabledSession, "disabled", "connected");
+        }
+    );
+
+    it(
+        "keeps the built-in GitHub MCP server disabled on the first message",
+        { timeout: 120_000 },
+        async () => {
+            const disabledSession = await client.createSession({
+                onPermissionRequest: approveAll,
+                enableConfigDiscovery: true,
+                enableMcpApps: true,
+                githubMcpToolConfig: { enableAllTools: true },
+                disabledMcpServers: ["github-mcp-server"],
+            });
+
+            let disabledRequestsBeforeFirstMessage: number;
+            try {
+                await drainPostCreateRpc(disabledSession);
+                disabledRequestsBeforeFirstMessage = await mcpRequestCount();
+                expect(disabledRequestsBeforeFirstMessage).toBe(0);
+                expectSyntheticResponse(
+                    await disabledSession.sendAndWait({ prompt: MCP_TRIGGER_PROMPT })
+                );
+                expect(await mcpRequestCount()).toBe(disabledRequestsBeforeFirstMessage);
+                await waitForMcpStatus(disabledSession, "github-mcp-server", "disabled");
+                expect(await mcpRequestCount()).toBe(disabledRequestsBeforeFirstMessage);
+            } finally {
+                await disabledSession.disconnect();
+            }
+
+            expect(await mcpRequestCount()).toBe(disabledRequestsBeforeFirstMessage);
+
+            await using enabledSession = await client.createSession({
+                onPermissionRequest: approveAll,
+                enableConfigDiscovery: true,
+                enableMcpApps: true,
+                githubMcpToolConfig: { enableAllTools: true },
+            });
+            await drainPostCreateRpc(enabledSession);
+            const requestsBeforeFirstMessage = await mcpRequestCount();
+            expect(requestsBeforeFirstMessage).toBe(0);
+            expectSyntheticResponse(
+                await enabledSession.sendAndWait({ prompt: MCP_TRIGGER_PROMPT })
+            );
+            await waitForMcpRequestCount(requestsBeforeFirstMessage + 1);
+            await waitForMcpStatus(enabledSession, "github-mcp-server", "connected");
+        }
+    );
+
+    it.skipIf(isInProcessTransport)(
+        "applies disabled plugin MCP servers on cold stdio resume",
+        async () => {
+            const { pluginDirectory, controlMarker, disabledMarker } =
+                createPluginDirectory("disabled-mcp-resume");
+            const initialClient = createClient({
+                connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+                requestHandler: new PersistingRequestHandler(),
+            });
+            const resumeClient = createClient({
+                connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+            });
+
+            try {
+                const originalSession = await initialClient.createSession({
+                    onPermissionRequest: approveAll,
+                    enableSessionStore: true,
+                });
+                const sessionId = originalSession.sessionId;
+                // A session.log entry alone does not materialize a session that a
+                // restarted runtime can resume. This self-contained model turn
+                // persists it without initializing MCP because no plugin directory
+                // is supplied until the resume request below.
+                const response = await originalSession.sendAndWait({
+                    prompt: "Return the configured persistence marker.",
+                });
+                expectSyntheticResponse(response);
+
+                expect(existsSync(controlMarker)).toBe(false);
+                expect(existsSync(disabledMarker)).toBe(false);
+                await initialClient.stop();
+
+                await using resumedSession = await resumeClient.resumeSession(sessionId, {
+                    onPermissionRequest: approveAll,
+                    enableSessionStore: true,
+                    pluginDirectories: [pluginDirectory],
+                    disabledMcpServers: ["disabled"],
+                });
+                await waitForMcpStatus(resumedSession, "control", "connected");
+                await waitForMcpStatus(resumedSession, "disabled", "disabled");
+                await waitForMarkerCount(controlMarker, 1);
+                expect(existsSync(disabledMarker)).toBe(false);
+            } finally {
+                await initialClient.stop().catch(() => {});
+                await resumeClient.stop().catch(() => {});
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/extension_env_access.e2e.test.ts b/nodejs/test/e2e/extension_env_access.e2e.test.ts
new file mode 100644
index 0000000000..f034db9051
--- /dev/null
+++ b/nodejs/test/e2e/extension_env_access.e2e.test.ts
@@ -0,0 +1,239 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { execFileSync, spawn } from "node:child_process";
+import { existsSync, mkdtempSync, readFileSync } from "node:fs";
+import { copyFile, mkdir, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { expect, it } from "vitest";
+import {
+    createMessageConnection,
+    StreamMessageReader,
+    StreamMessageWriter,
+} from "vscode-jsonrpc/node.js";
+import { approveAll } from "../../src/index.js";
+import { getSdkProtocolVersion } from "../../src/sdkProtocolVersion.js";
+import { createSdkTestContext, isInProcessTransport } from "./harness/sdkTestContext.js";
+import { retry } from "./harness/sdkTestHelper.js";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const FIXTURE = join(__dirname, "fixtures", "env-access-extension.mjs");
+const DIST_DIR = resolve(__dirname, "..", "..", "dist");
+
+interface ExtensionRun {
+    resumeParams: Record<string, unknown>;
+    /** Sample taken before the join, so an inherited value is distinguishable from a granted one. */
+    prejoin: string;
+    postjoin: string;
+    result: string;
+}
+
+/**
+ * Run the fixture extension as a real child process against a stub host that
+ * speaks the extension side of the wire.
+ *
+ * The extension connection is plain JSON-RPC over the extension process's own
+ * stdio, so a stub host observes exactly what the CLI observes. That is the only
+ * way to cover this feature end to end today: the released CLI predates the host
+ * half (github/copilot-agent-runtime#15144), so it ignores the request and grants
+ * nothing. Once the `@github/copilot` dependency carries the host half, the
+ * real-CLI case below can assert the grant instead.
+ */
+async function runExtensionAgainstStubHost(options: {
+    requested: string[];
+    /** Pass an explicit empty list rather than omitting the option. */
+    requestEmptyList?: boolean;
+    /** Names the extension samples but never asks for. */
+    observe?: string[];
+    /** Values the host resolves for an approved request, or undefined to deny it. */
+    granted?: Record<string, string>;
+}): Promise<ExtensionRun> {
+    if (!existsSync(join(DIST_DIR, "extension.js"))) {
+        throw new Error(`Built SDK not found at ${DIST_DIR}. Run \`npm run build\` first.`);
+    }
+
+    const dir = mkdtempSync(join(tmpdir(), "copilot-env-access-"));
+    const prejoinFile = join(dir, "prejoin");
+    const postjoinFile = join(dir, "postjoin");
+    const resultFile = join(dir, "result");
+
+    const child = spawn(process.execPath, [FIXTURE], {
+        stdio: ["pipe", "pipe", "pipe"],
+        env: {
+            ...process.env,
+            SESSION_ID: "stub-host-session",
+            EXTENSION_SDK_MODULE: pathToFileURL(join(DIST_DIR, "extension.js")).href,
+            EXTENSION_ENV_REQUEST: options.requested.join(","),
+            EXTENSION_ENV_REQUEST_EMPTY: options.requestEmptyList ? "1" : "",
+            EXTENSION_OBSERVE_ENV_NAMES: (options.observe ?? []).join(","),
+            EXTENSION_PREJOIN_FILE: prejoinFile,
+            EXTENSION_POSTJOIN_FILE: postjoinFile,
+            EXTENSION_RESULT_FILE: resultFile,
+        },
+    });
+
+    const stderr: string[] = [];
+    child.stderr!.on("data", (chunk) => stderr.push(String(chunk)));
+
+    let capturedResumeParams: Record<string, unknown> = {};
+    const connection = createMessageConnection(
+        new StreamMessageReader(child.stdout!),
+        new StreamMessageWriter(child.stdin!)
+    );
+    connection.onRequest("connect", () => ({ protocolVersion: getSdkProtocolVersion() }));
+    connection.onRequest("session.resume", (params: Record<string, unknown>) => {
+        capturedResumeParams = params;
+        if (!options.granted) {
+            throw new Error(
+                'Extension "env-access" was denied access to sensitive environment variables'
+            );
+        }
+        return { sessionId: params.sessionId, grantedEnvironmentVariables: options.granted };
+    });
+    // Everything else the SDK issues while joining is irrelevant here, and an
+    // unanswered request would hang the join.
+    connection.onRequest(() => ({}));
+    connection.onNotification(() => {});
+    connection.listen();
+
+    try {
+        await retry(
+            "wait for the fixture extension to report its join result",
+            async () => {
+                expect(
+                    existsSync(resultFile),
+                    `extension never reported; stderr: ${stderr.join("")}`
+                ).toBe(true);
+            },
+            300,
+            100
+        );
+
+        return {
+            resumeParams: capturedResumeParams,
+            prejoin: readFileSync(prejoinFile, "utf-8"),
+            postjoin: readFileSync(postjoinFile, "utf-8"),
+            result: readFileSync(resultFile, "utf-8"),
+        };
+    } finally {
+        connection.dispose();
+        child.kill();
+        // Windows keeps the directory locked until the child is gone.
+        await new Promise<void>((resolveExit) => {
+            if (child.exitCode !== null || child.signalCode !== null) {
+                resolveExit();
+                return;
+            }
+            child.once("exit", () => resolveExit());
+        });
+        await rm(dir, { recursive: true, force: true, maxRetries: 20, retryDelay: 100 });
+    }
+}
+
+it("puts an extension's environment request on the wire and applies the grant", async () => {
+    const run = await runExtensionAgainstStubHost({
+        requested: ["E2E_SDK_TOKEN", "E2E_SDK_OTHER"],
+        granted: { E2E_SDK_TOKEN: "granted-token", E2E_SDK_OTHER: "granted-other" },
+    });
+
+    expect(run.resumeParams.requestedEnvironmentVariables).toEqual([
+        "E2E_SDK_TOKEN",
+        "E2E_SDK_OTHER",
+    ]);
+    // The values crossed the process boundary rather than being inherited.
+    expect(run.prejoin).toBe("E2E_SDK_TOKEN=\nE2E_SDK_OTHER=");
+    expect(run.postjoin).toBe("E2E_SDK_TOKEN=granted-token\nE2E_SDK_OTHER=granted-other");
+    expect(run.result).toBe("joined");
+});
+
+it("grants nothing to an extension whose request the host denies", async () => {
+    const run = await runExtensionAgainstStubHost({ requested: ["E2E_SDK_TOKEN"] });
+
+    expect(run.resumeParams.requestedEnvironmentVariables).toEqual(["E2E_SDK_TOKEN"]);
+    expect(run.result).toContain("denied access to sensitive environment variables");
+    expect(run.postjoin).toBe("E2E_SDK_TOKEN=");
+});
+
+it("leaves the wire payload alone when an extension asks for nothing", async () => {
+    const omitted = await runExtensionAgainstStubHost({ requested: [], granted: {} });
+    const emptyList = await runExtensionAgainstStubHost({
+        requested: [],
+        requestEmptyList: true,
+        granted: {},
+    });
+
+    expect(omitted.resumeParams).not.toHaveProperty("requestedEnvironmentVariables");
+    // An empty list is the other public way to ask for nothing.
+    expect(emptyList.resumeParams).not.toHaveProperty("requestedEnvironmentVariables");
+    expect(omitted.result).toBe("joined");
+    expect(emptyList.result).toBe("joined");
+});
+
+it("ignores a granted variable the extension never requested", async () => {
+    const run = await runExtensionAgainstStubHost({
+        requested: ["E2E_SDK_TOKEN"],
+        observe: ["E2E_SDK_SMUGGLED"],
+        granted: { E2E_SDK_TOKEN: "granted-token", E2E_SDK_SMUGGLED: "not-approved" },
+    });
+
+    // The user approved one name, so a host answering with a second one cannot
+    // widen the grant.
+    expect(run.postjoin).toBe("E2E_SDK_TOKEN=granted-token\nE2E_SDK_SMUGGLED=");
+});
+
+const cliObservations = isInProcessTransport
+    ? ""
+    : mkdtempSync(join(tmpdir(), "copilot-env-access-cli-"));
+const cliResultFile = join(cliObservations, "result");
+const cliContext = isInProcessTransport
+    ? undefined
+    : await createSdkTestContext({
+          copilotClientOptions: {
+              env: {
+                  COPILOT_CLI_ENABLED_FEATURE_FLAGS: "EXTENSIONS",
+                  EXTENSION_ENV_REQUEST: "E2E_SDK_TOKEN",
+                  EXTENSION_RESULT_FILE: cliResultFile,
+                  EXTENSION_PREJOIN_FILE: join(cliObservations, "prejoin"),
+                  EXTENSION_POSTJOIN_FILE: join(cliObservations, "postjoin"),
+              },
+          },
+      });
+
+// The released CLI ignores `requestedEnvironmentVariables`, so this covers the
+// half a real CLI can prove today: asking for variables does not break the join.
+// It becomes the grant test once `@github/copilot` carries the host half.
+it.skipIf(isInProcessTransport)(
+    "joins a real CLI that does not support environment requests",
+    async () => {
+        if (!cliContext) {
+            throw new Error("Extension E2E requires an out-of-process transport");
+        }
+        const { workDir, copilotClient } = cliContext;
+        const extensionDir = join(workDir, ".github", "extensions", "env-access");
+        await rm(join(workDir, ".github"), { recursive: true, force: true });
+        await rm(cliResultFile, { force: true });
+        await mkdir(extensionDir, { recursive: true });
+        await copyFile(FIXTURE, join(extensionDir, "extension.mjs"));
+        execFileSync("git", ["init", "--quiet"], { cwd: workDir });
+
+        await using _session = await copilotClient.createSession({
+            requestExtensions: true,
+            extensionSdkPath: DIST_DIR,
+            onPermissionRequest: approveAll,
+        });
+
+        await retry(
+            "wait for the env-access extension to join the session",
+            async () => {
+                expect(existsSync(cliResultFile)).toBe(true);
+            },
+            300,
+            100
+        );
+
+        expect(readFileSync(cliResultFile, "utf-8")).toBe("joined");
+    }
+);
diff --git a/nodejs/test/e2e/factory.e2e.test.ts b/nodejs/test/e2e/factory.e2e.test.ts
index 547ecbbd5d..cddd8e47b0 100644
--- a/nodejs/test/e2e/factory.e2e.test.ts
+++ b/nodejs/test/e2e/factory.e2e.test.ts
@@ -1,10 +1,10 @@
 import { execFileSync } from "node:child_process";
-import { existsSync } from "node:fs";
-import { copyFile, mkdir } from "node:fs/promises";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { copyFile, mkdir, rm } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { expect, it } from "vitest";
-import { approveAll } from "../../src/index.js";
+import { expect, it, vi } from "vitest";
+import { approveAll, FactoryResumeError } from "../../src/index.js";
 import {
     createSdkTestContext,
     DEFAULT_GITHUB_TOKEN,
@@ -23,55 +23,289 @@ const factoryTestContext = isInProcessTransport
           },
       });
 
+async function setupFactoryExtension(workDir: string, onPermissionRequest = approveAll) {
+    if (!factoryTestContext) {
+        throw new Error("Factory E2E requires the stdio transport");
+    }
+
+    const { copilotClient, openAiEndpoint } = factoryTestContext;
+    const extensionDir = join(workDir, ".github", "extensions", "factory-smoke");
+    const readyFile = join(extensionDir, "ready");
+    await rm(join(workDir, ".github"), { recursive: true, force: true });
+    await mkdir(extensionDir, { recursive: true });
+    await copyFile(
+        join(__dirname, "fixtures", "factory-extension.mjs"),
+        join(extensionDir, "extension.mjs")
+    );
+    execFileSync("git", ["init", "--quiet"], { cwd: workDir });
+
+    await openAiEndpoint.setCopilotUserByToken(DEFAULT_GITHUB_TOKEN, {
+        login: "factory-e2e-user",
+        copilot_plan: "individual_pro",
+        token_based_billing: true,
+        is_mcp_enabled: true,
+        endpoints: {
+            api: openAiEndpoint.url,
+            telemetry: "https://localhost:1/telemetry",
+        },
+        analytics_tracking_id: "e2e-test-tracking-id",
+    });
+
+    const session = await copilotClient.createSession({
+        requestExtensions: true,
+        extensionSdkPath: resolve(__dirname, "..", "..", "dist"),
+        onPermissionRequest,
+        onElicitationRequest: async () => ({
+            action: "accept",
+            content: { action: "approve" },
+        }),
+    });
+
+    await retry(
+        "wait for the factory extension to join the session",
+        async () => {
+            expect(existsSync(readyFile)).toBe(true);
+        },
+        300,
+        100
+    );
+
+    return session;
+}
+
 it.skipIf(isInProcessTransport)(
     "runs an extension-authored factory across the SDK process boundary",
     async () => {
         if (!factoryTestContext) {
             throw new Error("Factory E2E requires the stdio transport");
         }
-        const { copilotClient, openAiEndpoint, workDir } = factoryTestContext;
+        const { workDir } = factoryTestContext;
+        await using session = await setupFactoryExtension(workDir);
+
+        const result = await session.factory.run("argument-echo", {
+            args: { source: "sdk-e2e", count: 11 },
+        });
+
+        expect(result).toMatchObject({
+            status: "completed",
+            result: { source: "sdk-e2e", count: 11 },
+        });
+    }
+);
+
+// TODO(cli-1.0.81-2): the subagent request is rejected downstream under CLI 1.0.81-2, so the
+// fixture reports didThrow: true. Re-enable once the runtime fix ships.
+//
+// The timeout is generous because the factory abandons its subagent once the runtime has
+// accepted the request, so the run settles only after the runtime drains that work.
+it.skip("forwards every declared subagent option to the runtime", async () => {
+    if (!factoryTestContext) {
+        throw new Error("Factory E2E requires the stdio transport");
+    }
+    const { workDir } = factoryTestContext;
+    await using session = await setupFactoryExtension(workDir);
+
+    const result = await session.factory.run("forwards-subagent-options");
+
+    expect(result).toMatchObject({
+        status: "completed",
+        result: { didThrow: false },
+    });
+}, 60_000);
+
+it.skipIf(isInProcessTransport)(
+    "throws FactoryResumeError with not_found for an unknown run",
+    async () => {
+        if (!factoryTestContext) {
+            throw new Error("Factory E2E requires the stdio transport");
+        }
+        const { workDir } = factoryTestContext;
+        await using session = await setupFactoryExtension(workDir);
+
+        const error = await session.factory
+            .resume("00000000-0000-0000-0000-000000000000")
+            .catch((caught: unknown) => caught);
+
+        expect(error).toBeInstanceOf(FactoryResumeError);
+        expect((error as FactoryResumeError).code).toBe("not_found");
+    }
+);
+
+it.skipIf(isInProcessTransport)(
+    "throws FactoryResumeError with non_resumable for a completed run",
+    async () => {
+        if (!factoryTestContext) {
+            throw new Error("Factory E2E requires the stdio transport");
+        }
+        const { workDir } = factoryTestContext;
+        await using session = await setupFactoryExtension(workDir);
+
+        const run = await session.factory.run("argument-echo");
+        const error = await session.factory.resume(run.runId).catch((caught: unknown) => caught);
+
+        expect(error).toBeInstanceOf(FactoryResumeError);
+        expect((error as FactoryResumeError).code).toBe("non_resumable");
+    }
+);
+
+it.skipIf(isInProcessTransport)(
+    "runs a factory when its session denies every permission request",
+    async () => {
+        if (!factoryTestContext) {
+            throw new Error("Factory E2E requires the stdio transport");
+        }
+        const { workDir } = factoryTestContext;
+        const denyPermissions = vi.fn(() => ({ kind: "reject" as const }));
+        await using session = await setupFactoryExtension(workDir, denyPermissions);
+
+        await expect(session.factory.run("argument-echo")).resolves.toMatchObject({
+            status: "completed",
+        });
+        expect(denyPermissions).not.toHaveBeenCalled();
+    }
+);
+
+it.skipIf(isInProcessTransport)(
+    "resumes a failed factory when its session denies every permission request",
+    async () => {
+        if (!factoryTestContext) {
+            throw new Error("Factory E2E requires the stdio transport");
+        }
+        const { workDir } = factoryTestContext;
+        const denyPermissions = vi.fn(() => ({ kind: "reject" as const }));
+        await using session = await setupFactoryExtension(workDir, denyPermissions);
+
+        const failedRun = await session.factory.run("fails-once");
+        expect(failedRun).toMatchObject({
+            status: "error",
+        });
+
+        await expect(session.factory.resume(failedRun.runId)).resolves.toMatchObject({
+            status: "completed",
+            result: "resumed",
+        });
+        expect(denyPermissions).not.toHaveBeenCalled();
+    }
+);
+
+it.skipIf(isInProcessTransport)(
+    "refuses a factory started through the context session from a factory body",
+    async () => {
+        if (!factoryTestContext) {
+            throw new Error("Factory E2E requires the stdio transport");
+        }
+        const { workDir } = factoryTestContext;
+        await using session = await setupFactoryExtension(workDir);
+
+        const result = await session.factory.run("starts-from-context-session");
+
+        expect(result).toMatchObject({
+            status: "completed",
+            result: expect.stringContaining("factory.run and factory.resume"),
+        });
+        expect((result as { result: string }).result).toContain("factory body");
+    }
+);
+
+it.skipIf(isInProcessTransport)(
+    "refuses a factory started through the module session from a factory body",
+    async () => {
+        if (!factoryTestContext) {
+            throw new Error("Factory E2E requires the stdio transport");
+        }
+        const { workDir } = factoryTestContext;
+        await using session = await setupFactoryExtension(workDir);
 
-        await openAiEndpoint.setCopilotUserByToken(DEFAULT_GITHUB_TOKEN, {
-            login: "factory-e2e-user",
-            copilot_plan: "individual_pro",
-            token_based_billing: true,
+        const result = await session.factory.run("starts-from-module-session");
+
+        expect(result).toMatchObject({
+            status: "completed",
+            result: expect.stringContaining("factory.run and factory.resume"),
         });
+        expect((result as { result: string }).result).toContain("factory body");
+    }
+);
 
+it.skipIf(isInProcessTransport)(
+    "allows a module-level extension watcher to start a factory while another body is parked",
+    async () => {
+        if (!factoryTestContext) {
+            throw new Error("Factory E2E requires the stdio transport");
+        }
+        const { workDir } = factoryTestContext;
         const extensionDir = join(workDir, ".github", "extensions", "factory-smoke");
-        const readyFile = join(extensionDir, "ready");
-        await mkdir(extensionDir, { recursive: true });
-        await copyFile(
-            join(__dirname, "fixtures", "factory-extension.mjs"),
-            join(extensionDir, "extension.mjs")
+        await using session = await setupFactoryExtension(workDir);
+
+        const parked = session.factory.run("parked");
+        await retry(
+            "wait for the parked factory to enter its body",
+            async () => {
+                expect(existsSync(join(extensionDir, "entered"))).toBe(true);
+            },
+            100,
+            100
         );
-        execFileSync("git", ["init", "--quiet"], { cwd: workDir });
-
-        await using session = await copilotClient.createSession({
-            requestExtensions: true,
-            extensionSdkPath: resolve(__dirname, "..", "..", "dist"),
-            onPermissionRequest: approveAll,
-            onElicitationRequest: async () => ({
-                action: "accept",
-                content: { action: "approve" },
-            }),
-        });
 
+        writeFileSync(join(extensionDir, "start-b"), "start");
+        const bResultFile = join(extensionDir, "b-result");
         await retry(
-            "wait for the factory extension to join the session",
+            "wait for the module-level watcher factory run to succeed",
             async () => {
-                expect(existsSync(readyFile)).toBe(true);
+                expect(existsSync(bResultFile)).toBe(true);
+                expect(JSON.parse(readFileSync(bResultFile, "utf8"))).toMatchObject({
+                    status: "success",
+                    result: {
+                        status: "completed",
+                        result: { source: "module-watcher" },
+                    },
+                });
             },
-            300,
+            100,
             100
         );
 
-        const result = await session.factory.run("argument-echo", {
-            args: { source: "sdk-e2e", count: 11 },
+        writeFileSync(join(extensionDir, "release"), "release");
+        await expect(parked).resolves.toMatchObject({
+            status: "completed",
+            result: "released",
         });
+    },
+    60_000
+);
+
+it.skipIf(isInProcessTransport)(
+    "returns an array result from an extension-authored factory",
+    async () => {
+        if (!factoryTestContext) {
+            throw new Error("Factory E2E requires the stdio transport");
+        }
+        const { workDir } = factoryTestContext;
+        await using session = await setupFactoryExtension(workDir);
+
+        const result = await session.factory.run("array-result");
 
         expect(result).toMatchObject({
             status: "completed",
-            result: { source: "sdk-e2e", count: 11 },
+            result: [1, "two", false],
+        });
+    }
+);
+
+it.skipIf(isInProcessTransport)(
+    "passes array factory arguments across the SDK process boundary",
+    async () => {
+        if (!factoryTestContext) {
+            throw new Error("Factory E2E requires the stdio transport");
+        }
+        const { workDir } = factoryTestContext;
+        await using session = await setupFactoryExtension(workDir);
+
+        const args = [1, "two", false];
+        const result = await session.factory.run("argument-echo", { args });
+
+        expect(result).toMatchObject({
+            status: "completed",
+            result: args,
         });
     }
 );
diff --git a/nodejs/test/e2e/fixtures/env-access-extension.mjs b/nodejs/test/e2e/fixtures/env-access-extension.mjs
new file mode 100644
index 0000000000..39cea3f1ba
--- /dev/null
+++ b/nodejs/test/e2e/fixtures/env-access-extension.mjs
@@ -0,0 +1,82 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// Extension that asks for named sensitive environment variables at join time.
+//
+// Every input is an environment variable so one fixture serves both the stub-host
+// case (spawned directly, importing the built SDK through EXTENSION_SDK_MODULE)
+// and the real-CLI case (forked by the CLI, which injects the SDK module).
+//
+// - EXTENSION_SDK_MODULE: import specifier for the SDK. Defaults to the module
+//   name the CLI resolves for a forked extension.
+// - EXTENSION_ENV_REQUEST: comma-separated names to pass to joinSession as
+//   requestedEnvironmentVariables.
+// - EXTENSION_PREJOIN_FILE: `NAME=<value>` per requested name, sampled BEFORE the
+//   join. A test compares it with the post-join sample to tell a value the
+//   process already inherited from one the host granted.
+// - EXTENSION_POSTJOIN_FILE: the same sample, written once the join settles.
+// - EXTENSION_RESULT_FILE: `joined` or `rejected:<message>`. A denied extension
+//   has no session to report through, so it reports here.
+// - EXTENSION_ENV_REQUEST_EMPTY: set to `1` to pass an explicit empty list when
+//   EXTENSION_ENV_REQUEST names nothing, instead of omitting the option.
+// - EXTENSION_OBSERVE_ENV_NAMES: comma-separated names that are sampled but
+//   deliberately NOT requested, so a test can prove a name outside the approved
+//   set never reached this process.
+
+import { writeFileSync } from "node:fs";
+
+const sdkModule = process.env.EXTENSION_SDK_MODULE ?? "@github/copilot-sdk/extension";
+const { joinSession } = await import(sdkModule);
+
+const requested = (process.env.EXTENSION_ENV_REQUEST ?? "")
+    .split(",")
+    .map((name) => name.trim())
+    .filter((name) => name.length > 0);
+const observed = (process.env.EXTENSION_OBSERVE_ENV_NAMES ?? "")
+    .split(",")
+    .map((name) => name.trim())
+    .filter((name) => name.length > 0);
+const sampledNames = [...requested, ...observed];
+const sample = () => sampledNames.map((name) => `${name}=${process.env[name] ?? ""}`).join("\n");
+
+const record = (file, contents) => {
+    if (file) {
+        writeFileSync(file, contents);
+    }
+};
+
+record(process.env.EXTENSION_PREJOIN_FILE, sample());
+
+const config = {
+    tools: [
+        {
+            name: "env_access_greeter",
+            description: "Greets someone. Always call this tool when asked to greet.",
+            parameters: { type: "object", properties: { name: { type: "string" } } },
+            handler: async (args) => `Hello from env-access, ${args.name || "World"}!`,
+        },
+    ],
+};
+// An extension that wants nothing normally omits the option entirely.
+// EXTENSION_ENV_REQUEST_EMPTY covers the other public way to ask for nothing:
+// passing an empty list, which must reach the wire the same way.
+if (requested.length > 0) {
+    config.requestedEnvironmentVariables = requested;
+} else if (process.env.EXTENSION_ENV_REQUEST_EMPTY === "1") {
+    config.requestedEnvironmentVariables = [];
+}
+
+try {
+    await joinSession(config);
+    record(process.env.EXTENSION_POSTJOIN_FILE, sample());
+    record(process.env.EXTENSION_RESULT_FILE, "joined");
+} catch (error) {
+    // Sampled after the rejection too, so a test can prove a denied extension
+    // never saw the value rather than only that the join failed.
+    record(process.env.EXTENSION_POSTJOIN_FILE, sample());
+    record(
+        process.env.EXTENSION_RESULT_FILE,
+        `rejected:${error instanceof Error ? error.message : String(error)}`
+    );
+}
diff --git a/nodejs/test/e2e/fixtures/factory-extension.mjs b/nodejs/test/e2e/fixtures/factory-extension.mjs
index fab95a90f1..45227a1bea 100644
--- a/nodejs/test/e2e/fixtures/factory-extension.mjs
+++ b/nodejs/test/e2e/fixtures/factory-extension.mjs
@@ -1,14 +1,171 @@
-import { writeFileSync } from "node:fs";
+import { existsSync, writeFileSync } from "node:fs";
 import { defineFactory, joinSession } from "@github/copilot-sdk/extension";
 
+const marker = (name) => new URL(`./${name}`, import.meta.url);
+
+async function waitForMarker(name, timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    while (!existsSync(marker(name))) {
+        if (Date.now() >= deadline) {
+            throw new Error(`Timed out waiting for ${name}`);
+        }
+        await new Promise((resolve) => setTimeout(resolve, 50));
+    }
+}
+
 const argumentEcho = defineFactory({
     meta: {
         name: "argument-echo",
         description: "Return the invocation arguments verbatim.",
         phases: [],
+        // Proves a declared shape survives the SDK boundary and registers against a
+        // real runtime. It does not exercise enforcement: `argsSchema` is checked by
+        // the model's `run_factory` tool, and these tests invoke `session.factory.run`,
+        // which does not validate. The declaration stays as wide as this factory's
+        // actual contract — it echoes any JsonValue, and is called with an array, an
+        // object, and nothing — so it cannot constrain the runs below.
+        argsSchema: {
+            type: ["object", "array", "string", "number", "integer", "boolean", "null"],
+        },
     },
     run: async ({ args }) => args,
 });
 
-await joinSession({ factories: [argumentEcho] });
-writeFileSync(new URL("./ready", import.meta.url), "ready");
+const arrayResult = defineFactory({
+    meta: {
+        name: "array-result",
+        description: "Return an array result.",
+        phases: [],
+    },
+    run: async () => [1, "two", false],
+});
+
+const forwardsSubagentOptions = defineFactory({
+    meta: {
+        name: "forwards-subagent-options",
+        description: "Send every declared subagent option to the runtime.",
+        phases: [],
+    },
+    run: async ({ agent }) => {
+        // Only the runtime's acceptance of the payload is under test. A refused
+        // request rejects quickly, because the runtime parses the options before
+        // it starts a subagent. A subagent that is merely slow to reach a model
+        // proves the payload was accepted, so waiting for it adds nothing and
+        // hangs wherever no model is reachable.
+        const call = agent("Confirm that this request is accepted.", {
+            agent: "reviewer",
+            reasoningEffort: "high",
+            contextTier: "long_context",
+        });
+        // A rejection that lands after the race still needs a handler.
+        call.catch(() => {});
+        let settleTimer;
+        const stillPending = new Promise((resolve) => {
+            settleTimer = setTimeout(() => resolve(undefined), 3000);
+            settleTimer.unref?.();
+        });
+        try {
+            await Promise.race([call, stillPending]);
+            return { didThrow: false };
+        } catch {
+            return { didThrow: true };
+        } finally {
+            clearTimeout(settleTimer);
+        }
+    },
+});
+
+const startsFromContextSession = defineFactory({
+    meta: {
+        name: "starts-from-context-session",
+        description: "Try to start a factory through the context session.",
+        phases: [],
+    },
+    run: async ({ session }) => {
+        try {
+            await session.factory.run("argument-echo");
+            return "unexpectedly started a factory";
+        } catch (error) {
+            return error instanceof Error ? error.message : String(error);
+        }
+    },
+});
+
+let session;
+
+const startsFromModuleSession = defineFactory({
+    meta: {
+        name: "starts-from-module-session",
+        description: "Try to start a factory through the module session.",
+        phases: [],
+    },
+    run: async () => {
+        try {
+            await session.factory.run("argument-echo");
+            return "unexpectedly started a factory";
+        } catch (error) {
+            return error instanceof Error ? error.message : String(error);
+        }
+    },
+});
+
+const parked = defineFactory({
+    meta: {
+        name: "parked",
+        description: "Wait for a test-controlled release marker.",
+        phases: [],
+    },
+    run: async () => {
+        writeFileSync(marker("entered"), "entered");
+        await waitForMarker("release", 30_000);
+        return "released";
+    },
+});
+
+const failsOnce = defineFactory({
+    meta: {
+        name: "fails-once",
+        description: "Fails its first attempt and succeeds when resumed.",
+        phases: [],
+    },
+    run: async () => {
+        if (!existsSync(marker("fails-once-attempted"))) {
+            writeFileSync(marker("fails-once-attempted"), "attempted");
+            throw new Error("first attempt failed");
+        }
+        return "resumed";
+    },
+});
+
+session = await joinSession({
+    factories: [
+        argumentEcho,
+        arrayResult,
+        forwardsSubagentOptions,
+        startsFromContextSession,
+        startsFromModuleSession,
+        parked,
+        failsOnce,
+    ],
+});
+
+void waitForMarker("start-b", 30_000)
+    .then(async () => {
+        const result = await session.factory.run("argument-echo", {
+            args: { source: "module-watcher" },
+        });
+        writeFileSync(marker("b-result"), JSON.stringify({ status: "success", result }));
+    })
+    .catch((error) => {
+        if (existsSync(marker("start-b"))) {
+            writeFileSync(
+                marker("b-result"),
+                JSON.stringify({
+                    status: "error",
+                    error: error instanceof Error ? error.message : String(error),
+                })
+            );
+        }
+    });
+
+writeFileSync(marker("ready"), "ready");
diff --git a/nodejs/test/e2e/mcp_and_agents.e2e.test.ts b/nodejs/test/e2e/mcp_and_agents.e2e.test.ts
index a593ff9882..414e760ea2 100644
--- a/nodejs/test/e2e/mcp_and_agents.e2e.test.ts
+++ b/nodejs/test/e2e/mcp_and_agents.e2e.test.ts
@@ -103,7 +103,6 @@ describe("MCP Servers and Custom Agents", async () => {
             // Create a session first
             const session1 = await client.createSession({ onPermissionRequest: approveAll });
             const sessionId = session1.sessionId;
-            await session1.sendAndWait({ prompt: "What is 1+1?" });
 
             // Resume with MCP servers
             const mcpServers = createTestMcpServers("test-server");
diff --git a/nodejs/test/e2e/permissions.e2e.test.ts b/nodejs/test/e2e/permissions.e2e.test.ts
index e7c26a2930..d7600ed165 100644
--- a/nodejs/test/e2e/permissions.e2e.test.ts
+++ b/nodejs/test/e2e/permissions.e2e.test.ts
@@ -5,17 +5,20 @@
 import { realpathSync } from "fs";
 import { mkdir, readFile, writeFile } from "fs/promises";
 import { join } from "path";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import { z } from "zod";
 import type {
+    PermissionDecisionContext,
     PermissionRequest,
     PermissionRequestResult,
     ToolResultObject,
 } from "../../src/index.js";
-import { approveAll, defineTool } from "../../src/index.js";
+import { approveAll, defineTool, createAttributedPermissionResult } from "../../src/index.js";
 import { createSdkTestContext, isInProcessTransport } from "./harness/sdkTestContext.js";
 import { getFinalAssistantMessage, getNextEventOfType } from "./harness/sdkTestHelper.js";
 
+const isWindows = process.platform === "win32";
+
 describe("Permission callbacks", async () => {
     const { copilotClient: client, workDir } = await createSdkTestContext();
 
@@ -90,6 +93,61 @@ describe("Permission callbacks", async () => {
         await session.disconnect();
     });
 
+    it("should honor a decision annotated with decisionContext", async () => {
+        // End-to-end proof that decisionContext survives the real permission flow.
+        // The runtime only emits its auto_approval_decision telemetry when its own
+        // auto-approval judge metadata is also present (feature-flagged and model
+        // backed), so that event is not observable here. Instead we assert the exact
+        // params handed to the CLI: decisionContext must be a top-level sibling of
+        // `result`, never nested inside it. The CLI tolerates a nested key silently,
+        // so asserting the params shape is what actually gives this test teeth.
+        const decisionContext: PermissionDecisionContext = {
+            outcome: "prompted_user",
+            source: "human_response",
+            surface: "sdk",
+        };
+
+        const session = await client.createSession({
+            onPermissionRequest: () =>
+                createAttributedPermissionResult({ kind: "reject" }, decisionContext),
+        });
+
+        // Spies preserve the original implementation, so the decision still reaches
+        // the CLI and the assertions below observe a real, honored round-trip.
+        const respondSpy = vi.spyOn(session.rpc.permissions, "handlePendingPermissionRequest");
+
+        let userRejectedToolCall = false;
+        session.on((event) => {
+            if (
+                event.type === "tool.execution_complete" &&
+                !event.data.success &&
+                event.data.error?.message.toLowerCase().includes("user rejected")
+            ) {
+                userRejectedToolCall = true;
+            }
+        });
+
+        const originalContent = "protected content";
+        const testFile = join(workDir, "protected.txt");
+        await writeFile(testFile, originalContent);
+
+        await session.sendAndWait({
+            prompt: "Edit protected.txt and replace 'protected' with 'hacked'.",
+        });
+
+        // The decision was applied by the CLI, not merely sent.
+        expect(userRejectedToolCall).toBe(true);
+        expect(await readFile(testFile, "utf-8")).toBe(originalContent);
+
+        expect(respondSpy).toHaveBeenCalled();
+        const params = respondSpy.mock.calls[0]![0];
+        expect(params.decisionContext).toEqual(decisionContext);
+        expect(params.result).toEqual({ kind: "reject" });
+        expect(Object.keys(params).sort()).toEqual(["decisionContext", "requestId", "result"]);
+
+        await session.disconnect();
+    });
+
     it("should deny tool operations when handler explicitly denies", async () => {
         let permissionDenied = false;
 
@@ -574,67 +632,76 @@ describe("Permission callbacks", async () => {
         }
     });
 
-    it("should invoke permission location and folder trust rpc apis", async () => {
-        const session = await client.createSession({ onPermissionRequest: approveAll });
-        const locationDirectory = await createUniqueWorkDirectory(workDir, "permission-location");
-        const trustedDirectory = await createUniqueWorkDirectory(workDir, "folder-trust");
-        const commandIdentifier = `node-permission-location-${Date.now()}`;
-        try {
-            const resolved = await session.rpc.permissions.locations.resolve({
-                workingDirectory: locationDirectory,
-            });
-            expect(resolved.locationType).toBe("dir");
-            expectPathEqual(resolved.locationKey, locationDirectory);
-
-            expect(
-                (
-                    await session.rpc.permissions.locations.addToolApproval({
-                        locationKey: resolved.locationKey,
-                        approval: {
-                            kind: "commands",
-                            commandIdentifiers: [commandIdentifier],
-                        },
-                    })
-                ).success
-            ).toBe(true);
-
-            const applied = await session.rpc.permissions.locations.apply({
-                workingDirectory: locationDirectory,
-            });
-            expect(applied.locationType).toBe(resolved.locationType);
-            expectPathEqual(applied.locationKey, resolved.locationKey);
-            expect(applied.appliedRuleCount).toBeGreaterThanOrEqual(1);
-            expect(
-                applied.appliedRules.some(
-                    (rule) => rule.kind === "shell" && rule.argument === commandIdentifier
-                )
-            ).toBe(true);
-
-            expect(
-                (
-                    await session.rpc.permissions.folderTrust.isTrusted({
-                        path: trustedDirectory,
-                    })
-                ).trusted
-            ).toBe(false);
-            expect(
-                (
-                    await session.rpc.permissions.folderTrust.addTrusted({
-                        path: trustedDirectory,
-                    })
-                ).success
-            ).toBe(true);
-            expect(
-                (
-                    await session.rpc.permissions.folderTrust.isTrusted({
-                        path: trustedDirectory,
-                    })
-                ).trusted
-            ).toBe(true);
-        } finally {
-            await session.disconnect();
+    // TODO(cli-1.0.81-2): CLI 1.0.81-2 no longer matches the location key returned by
+    // permissions.locations.resolve when permissions.locations.apply re-resolves it on Windows,
+    // so appliedRuleCount comes back as 0. Still covered on Linux and macOS.
+    it.skipIf(isWindows)(
+        "should invoke permission location and folder trust rpc apis",
+        async () => {
+            const session = await client.createSession({ onPermissionRequest: approveAll });
+            const locationDirectory = await createUniqueWorkDirectory(
+                workDir,
+                "permission-location"
+            );
+            const trustedDirectory = await createUniqueWorkDirectory(workDir, "folder-trust");
+            const commandIdentifier = `node-permission-location-${Date.now()}`;
+            try {
+                const resolved = await session.rpc.permissions.locations.resolve({
+                    workingDirectory: locationDirectory,
+                });
+                expect(resolved.locationType).toBe("dir");
+                expectPathEqual(resolved.locationKey, locationDirectory);
+
+                expect(
+                    (
+                        await session.rpc.permissions.locations.addToolApproval({
+                            locationKey: resolved.locationKey,
+                            approval: {
+                                kind: "commands",
+                                commandIdentifiers: [commandIdentifier],
+                            },
+                        })
+                    ).success
+                ).toBe(true);
+
+                const applied = await session.rpc.permissions.locations.apply({
+                    workingDirectory: locationDirectory,
+                });
+                expect(applied.locationType).toBe(resolved.locationType);
+                expectPathEqual(applied.locationKey, resolved.locationKey);
+                expect(applied.appliedRuleCount).toBeGreaterThanOrEqual(1);
+                expect(
+                    applied.appliedRules.some(
+                        (rule) => rule.kind === "shell" && rule.argument === commandIdentifier
+                    )
+                ).toBe(true);
+
+                expect(
+                    (
+                        await session.rpc.permissions.folderTrust.isTrusted({
+                            path: trustedDirectory,
+                        })
+                    ).trusted
+                ).toBe(false);
+                expect(
+                    (
+                        await session.rpc.permissions.folderTrust.addTrusted({
+                            path: trustedDirectory,
+                        })
+                    ).success
+                ).toBe(true);
+                expect(
+                    (
+                        await session.rpc.permissions.folderTrust.isTrusted({
+                            path: trustedDirectory,
+                        })
+                    ).trusted
+                ).toBe(true);
+            } finally {
+                await session.disconnect();
+            }
         }
-    });
+    );
 });
 
 async function createUniqueWorkDirectory(baseDir: string, prefix: string): Promise<string> {
diff --git a/nodejs/test/e2e/rewind.e2e.test.ts b/nodejs/test/e2e/rewind.e2e.test.ts
new file mode 100644
index 0000000000..2d32ef1f6c
--- /dev/null
+++ b/nodejs/test/e2e/rewind.e2e.test.ts
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { existsSync, readFileSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { describe, expect, it } from "vitest";
+import { approveAll } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+const FILE_NAME = "rewind-sdk.txt";
+const FILE_CONTENT = "SDK rewind content";
+
+function expectSamePath(actual: string, expected: string): void {
+    const actualPath = resolve(actual);
+    const expectedPath = resolve(expected);
+    if (process.platform === "win32") {
+        expect(actualPath.toLowerCase()).toBe(expectedPath.toLowerCase());
+    } else {
+        expect(actualPath).toBe(expectedPath);
+    }
+}
+
+describe("Rewind", async () => {
+    const { copilotClient: client, workDir } = await createSdkTestContext();
+
+    it("should restore tracked file and conversation", async () => {
+        const filePath = join(workDir, FILE_NAME);
+        const session = await client.createSession({
+            model: "claude-sonnet-4.5",
+            enableFileChangeTracking: true,
+            onPermissionRequest: approveAll,
+        });
+
+        try {
+            const response = await session.sendAndWait({
+                prompt: `Use the create tool to create ${FILE_NAME} containing exactly ${FILE_CONTENT}. After the tool succeeds, reply with exactly SDK_REWIND_DONE.`,
+            });
+
+            expect(response?.data.content).toBe("SDK_REWIND_DONE");
+            expect(existsSync(filePath)).toBe(true);
+            expect(readFileSync(filePath, "utf8")).toBe(FILE_CONTENT);
+
+            let rewindPoints = await session.rpc.history.listRewindPoints();
+            const deadline = Date.now() + 10_000;
+            while (
+                Date.now() < deadline &&
+                (rewindPoints.unavailableReason !== undefined ||
+                    !rewindPoints.points[0]?.canRestoreFiles)
+            ) {
+                await new Promise((resolveDelay) => setTimeout(resolveDelay, 100));
+                rewindPoints = await session.rpc.history.listRewindPoints();
+            }
+
+            expect(rewindPoints.unavailableReason).toBeUndefined();
+            expect(rewindPoints.fileChangeTrackingEnabled).toBe(true);
+            expect(rewindPoints.points).toHaveLength(1);
+            const rewindPoint = rewindPoints.points[0];
+            expect(rewindPoint.canRestoreFiles).toBe(true);
+            expect(rewindPoint.fileCount).toBe(1);
+
+            const preview = await session.rpc.history.previewRewind({
+                eventId: rewindPoint.eventId,
+            });
+            expect(preview.available).toBe(true);
+            expect(preview.files).toHaveLength(1);
+            expectSamePath(preview.files[0].path, filePath);
+
+            const rewind = await session.rpc.history.rewind({
+                eventId: rewindPoint.eventId,
+                mode: "conversation-and-files",
+            });
+            expect(rewind.outcome).toBe("success");
+            expect(rewind.eventsRemoved).toBeGreaterThan(0);
+            expect(rewind.restoredFiles).toHaveLength(1);
+            expectSamePath(rewind.restoredFiles[0], filePath);
+            expect(existsSync(filePath)).toBe(false);
+
+            const events = await session.getEvents();
+            expect(events.some((event) => event.id === rewindPoint.eventId)).toBe(false);
+        } finally {
+            await session.disconnect();
+        }
+    });
+});
diff --git a/nodejs/test/e2e/rpc_session_state_extras.e2e.test.ts b/nodejs/test/e2e/rpc_session_state_extras.e2e.test.ts
index 54f40fe12c..6111809914 100644
--- a/nodejs/test/e2e/rpc_session_state_extras.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_session_state_extras.e2e.test.ts
@@ -203,21 +203,21 @@ describe("Session-scoped state extras RPC", async () => {
     it("should get and set allowall permissions", { timeout: 120_000 }, async () => {
         const session = await createSession();
         try {
-            const initial = await session.rpc.permissions.getAllowAll();
-            expect(initial.enabled).toBe(false);
+            const initial = await session.rpc.permissions.getMode();
+            expect(initial.mode).toBe("manual");
 
-            const enable = await session.rpc.permissions.setAllowAll({ enabled: true });
+            const enable = await session.rpc.permissions.setMode({ mode: "allow-all" });
             expect(enable.success).toBe(true);
-            expect(enable.enabled).toBe(true);
-            expect((await session.rpc.permissions.getAllowAll()).enabled).toBe(true);
+            expect(enable.mode).toBe("allow-all");
+            expect((await session.rpc.permissions.getMode()).mode).toBe("allow-all");
 
-            const disable = await session.rpc.permissions.setAllowAll({ enabled: false });
+            const disable = await session.rpc.permissions.setMode({ mode: "manual" });
             expect(disable.success).toBe(true);
-            expect(disable.enabled).toBe(false);
-            expect((await session.rpc.permissions.getAllowAll()).enabled).toBe(false);
+            expect(disable.mode).toBe("manual");
+            expect((await session.rpc.permissions.getMode()).mode).toBe("manual");
         } finally {
             try {
-                await session.rpc.permissions.setAllowAll({ enabled: false });
+                await session.rpc.permissions.setMode({ mode: "manual" });
             } catch {
                 // Best-effort reset.
             }
diff --git a/nodejs/test/e2e/rpc_ui_ephemeral_query.e2e.test.ts b/nodejs/test/e2e/rpc_ui_ephemeral_query.e2e.test.ts
index 662294d70a..7fa1e90f5d 100644
--- a/nodejs/test/e2e/rpc_ui_ephemeral_query.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_ui_ephemeral_query.e2e.test.ts
@@ -4,23 +4,29 @@
 
 import { describe, expect, it } from "vitest";
 import { approveAll } from "../../src/index.js";
-import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { createSdkTestContext, isInProcessTransport } from "./harness/sdkTestContext.js";
 
 describe("UI ephemeral query RPC", async () => {
     const { copilotClient: client } = await createSdkTestContext();
 
-    it("should answer ephemeral query", { timeout: 120_000 }, async () => {
-        const session = await client.createSession({ onPermissionRequest: approveAll });
-        try {
-            const result = await session.rpc.ui.ephemeralQuery({
-                question: "In one word, what is the primary color of a clear daytime sky?",
-            });
+    // TODO(cli-1.0.81-2): CLI 1.0.81-6 still fails session.ui.ephemeralQuery against the
+    // recorded snapshot on macOS ("Failed to get response from the AI model").
+    it.skipIf(isInProcessTransport || process.platform === "darwin")(
+        "should answer ephemeral query",
+        { timeout: 120_000 },
+        async () => {
+            const session = await client.createSession({ onPermissionRequest: approveAll });
+            try {
+                const result = await session.rpc.ui.ephemeralQuery({
+                    question: "In one word, what is the primary color of a clear daytime sky?",
+                });
 
-            expect(result).toBeDefined();
-            expect(result.answer.trim()).toBeTruthy();
-            expect(result.answer.toLowerCase()).toContain("blue");
-        } finally {
-            await session.disconnect();
+                expect(result).toBeDefined();
+                expect(result.answer.trim()).toBeTruthy();
+                expect(result.answer.toLowerCase()).toContain("blue");
+            } finally {
+                await session.disconnect();
+            }
         }
-    });
+    );
 });
diff --git a/nodejs/test/e2e/session.e2e.test.ts b/nodejs/test/e2e/session.e2e.test.ts
index d99a3e392d..b89221998a 100644
--- a/nodejs/test/e2e/session.e2e.test.ts
+++ b/nodejs/test/e2e/session.e2e.test.ts
@@ -252,10 +252,13 @@ describe("Sessions", () => {
 
         // It only tells the model about the specified tools and no others
         const traffic = await waitForExchanges();
-        expect(traffic[0].request.tools).toMatchObject([
-            { function: { name: "view" } },
-            { function: { name: "edit" } },
-        ]);
+        expect(traffic[0].request.tools).toHaveLength(2);
+        expect(traffic[0].request.tools).toEqual(
+            expect.arrayContaining([
+                expect.objectContaining({ function: expect.objectContaining({ name: "view" }) }),
+                expect.objectContaining({ function: expect.objectContaining({ name: "edit" }) }),
+            ])
+        );
     });
 
     it("should create a session with excludedTools", async () => {
diff --git a/nodejs/test/e2e/session_fs.e2e.test.ts b/nodejs/test/e2e/session_fs.e2e.test.ts
index 5726d39b5f..9727de06e1 100644
--- a/nodejs/test/e2e/session_fs.e2e.test.ts
+++ b/nodejs/test/e2e/session_fs.e2e.test.ts
@@ -145,9 +145,11 @@ describe("Session Fs", async () => {
             prompt: "Call the get_big_string tool and reply with the word DONE only.",
         });
 
-        // The tool result should reference a temp file under the session state path
+        // The tool result should reference a temp file under the session state path.
+        // The CLI joins the temp path using the host separator, so normalize before
+        // matching to keep the assertion valid on Windows.
         const messages = await session.getEvents();
-        const toolResult = findToolCallResult(messages, "get_big_string");
+        const toolResult = findToolCallResult(messages, "get_big_string")?.replaceAll("\\", "/");
         expect(toolResult).toContain(`${sessionStatePath}/temp/`);
         const filename = toolResult?.match(
             new RegExp(`(${escapeRegExp(sessionStatePath)}/temp/[^\\s]+)`)
diff --git a/nodejs/test/e2e/tool_results.e2e.test.ts b/nodejs/test/e2e/tool_results.e2e.test.ts
index 6e8729c429..eb6ecf6f79 100644
--- a/nodejs/test/e2e/tool_results.e2e.test.ts
+++ b/nodejs/test/e2e/tool_results.e2e.test.ts
@@ -59,6 +59,7 @@ describe("Tool Results", async () => {
             tools: [
                 defineTool("check_status", {
                     description: "Checks the status of a service",
+                    isTerminal: true,
                     handler: (): ToolResultObject => ({
                         textResultForLlm: "Service unavailable",
                         resultType: "failure",
@@ -74,6 +75,7 @@ describe("Tool Results", async () => {
 
         const failureContent = assistantMessage?.data.content ?? "";
         expect(failureContent).toMatch(/service is down/i);
+        expect(await openAiEndpoint.getExchanges()).toHaveLength(2);
 
         await session.disconnect();
     });
diff --git a/nodejs/test/e2e/tools.e2e.test.ts b/nodejs/test/e2e/tools.e2e.test.ts
index c505f8aa86..16db1aca87 100644
--- a/nodejs/test/e2e/tools.e2e.test.ts
+++ b/nodejs/test/e2e/tools.e2e.test.ts
@@ -7,7 +7,7 @@ import { join } from "path";
 import { assert, describe, expect, it } from "vitest";
 import { z } from "zod";
 import { defineTool, approveAll, ToolSet } from "../../src/index.js";
-import type { PermissionRequest } from "../../src/index.js";
+import type { CopilotSession, PermissionRequest, SessionEvent } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext";
 
 describe("Custom tools", async () => {
@@ -45,6 +45,50 @@ describe("Custom tools", async () => {
         expect(assistantMessage?.data.content).toContain("HELLO");
     });
 
+    // TODO(cli-1.0.81-2): CLI 1.0.81-2 stops servicing nested requests on the same stdio
+    // connection while awaiting a tool handler, so calling session.history.clearContext
+    // from inside a terminal tool deadlocks. Tracked as a runtime reentrancy regression;
+    // re-enable once the fixed CLI ships.
+    it.skip("clears context from a terminal tool and starts the seeded turn", async () => {
+        const seedPrompt = "Reply with exactly FRESH_CONTEXT.";
+        const events: SessionEvent[] = [];
+        let session: CopilotSession;
+        session = await client.createSession({
+            onPermissionRequest: approveAll,
+            onEvent: (event) => events.push(event),
+            tools: [
+                defineTool("clear_context", {
+                    description: "Clears the conversation and starts a fresh context window",
+                    parameters: z.object({ prompt: z.string() }),
+                    isTerminal: true,
+                    defer: "never",
+                    handler: async () => {
+                        const result = await session.rpc.history.clearContext({
+                            prompt: seedPrompt,
+                        });
+                        return `Cleared ${result.messagesCleared} messages.`;
+                    },
+                }),
+            ],
+        });
+
+        const assistantMessage = await session.sendAndWait({
+            prompt: `Call clear_context with prompt "${seedPrompt}" now.`,
+        });
+
+        expect(assistantMessage?.data.content).toContain("FRESH_CONTEXT");
+        const contextCleared = events.find((event) => event.type === "session.context_cleared");
+        expect(contextCleared).toBeDefined();
+        if (contextCleared?.type === "session.context_cleared") {
+            expect(contextCleared.data.messagesCleared).toBeGreaterThan(0);
+            expect(contextCleared.data.initialMessage).toBe(seedPrompt);
+        }
+
+        const traffic = await openAiEndpoint.getExchanges();
+        expect(traffic).toHaveLength(2);
+        expect(JSON.stringify(traffic[1]?.request.messages)).toContain(seedPrompt);
+    });
+
     it("low_level_tool_definition", async () => {
         let currentPhase = "";
         const session = await client.createSession({
diff --git a/nodejs/test/extension.test.ts b/nodejs/test/extension.test.ts
index e94ad2204f..bebe8db7f0 100644
--- a/nodejs/test/extension.test.ts
+++ b/nodejs/test/extension.test.ts
@@ -47,6 +47,39 @@ describe("joinSession", () => {
         expect(config.suppressResumeEvent).toBe(false);
     });
 
+    it("forwards the requested environment variables and keeps them off the resume config", async () => {
+        process.env.SESSION_ID = "session-123";
+        const resumeForExtension = vi
+            .spyOn(CopilotClient.prototype, "resumeSessionForExtension")
+            .mockResolvedValue({} as any);
+
+        await joinSession({
+            requestedEnvironmentVariables: ["GITHUB_TOKEN", "MY_SECRET"],
+            tools: [],
+        });
+
+        const [, config, , extensionOptions] = resumeForExtension.mock.calls[0]!;
+        expect(extensionOptions).toEqual({
+            requestedEnvironmentVariables: ["GITHUB_TOKEN", "MY_SECRET"],
+        });
+        expect(config).not.toHaveProperty("requestedEnvironmentVariables");
+    });
+
+    it("requests no environment variables when the option is omitted or empty", async () => {
+        process.env.SESSION_ID = "session-123";
+        const resumeForExtension = vi
+            .spyOn(CopilotClient.prototype, "resumeSessionForExtension")
+            .mockResolvedValue({} as any);
+
+        await joinSession({ tools: [] });
+        await joinSession({ requestedEnvironmentVariables: [], tools: [] });
+
+        expect(resumeForExtension.mock.calls[0]![3]).toBeUndefined();
+        // An empty list means the same as omitting the option, so it must not put
+        // an environment request on the wire either.
+        expect(resumeForExtension.mock.calls[1]![3]).toBeUndefined();
+    });
+
     it("exports the canvas helper from the extension surface", () => {
         const canvas = createCanvas({
             id: "counter",
diff --git a/nodejs/test/factory.test.ts b/nodejs/test/factory.test.ts
index 0282cc4a58..dcf434616a 100644
--- a/nodejs/test/factory.test.ts
+++ b/nodejs/test/factory.test.ts
@@ -15,6 +15,7 @@ import {
     type FactoryAgentOptions,
     type FactoryContext,
     type FactoryDefinition,
+    type FactoryJsonSchema,
     type JsonValue,
 } from "../src/factory.js";
 
@@ -402,6 +403,191 @@ describe("factories", () => {
         expect(generatedRpc).toContain("timeoutSeconds?: number;");
     });
 
+    // A guessed ceiling does not make a run safer: it stops a healthy run partway
+    // with `factory_limit_reached`, after that run has already taken the user's
+    // approval and spent credits. Both documents are handed to the model verbatim
+    // by the `factories_manage` guide, so neither may read as an invitation to
+    // invent one.
+    it("documents limits as opt-in rather than inviting an invented ceiling", () => {
+        const guide = readFileSync(new URL("../docs/factories.md", import.meta.url), "utf8");
+        const patterns = readFileSync(
+            new URL("../docs/factory-patterns.md", import.meta.url),
+            "utf8"
+        );
+
+        expect(guide).toContain(
+            "Set a ceiling only from real knowledge of what the factory costs, or because the user named one"
+        );
+        expect(guide).toContain("no basis for estimating a number");
+
+        // The opening `defineFactory` sample is the shape an author copies. Filling
+        // all four ceilings in there taught the numbers as much as the syntax.
+        const openingSample = guide.slice(0, guide.indexOf("## Declaring an argument shape"));
+        expect(openingSample).not.toContain("limits: {");
+
+        // The Scaling section used to answer "there is no built-in concurrency cap"
+        // with "so declare one before fanning out widely".
+        expect(patterns).not.toContain("declare one before fanning out widely");
+        expect(patterns).toContain("bound a wide fan-out with the factory's own counters");
+    });
+
+    it("documents factory invocation and list paging behavior accurately", () => {
+        const guide = readFileSync(new URL("../docs/factories.md", import.meta.url), "utf8");
+        const publicApi = readFileSync(new URL("../src/factory.ts", import.meta.url), "utf8");
+        const listRunsPagingWording = "newest default page of this session's durable factory runs";
+        const resumeCodes = [
+            "not_found",
+            "non_resumable",
+            "already_active",
+            "factory_already_running",
+            "factory_limits_invalid",
+            "factory_session_disposed",
+            "factory_storage_unavailable",
+            "factory_storage_corrupt",
+        ];
+        const normalizeJSDoc = (document: string) =>
+            document.replace(/\r?\n\s*\* ?/g, " ").replace(/\s+/g, " ");
+        const normalizedGuide = normalizeJSDoc(guide);
+        const normalizedPublicApi = normalizeJSDoc(publicApi);
+
+        for (const document of [guide, publicApi]) {
+            expect(document).not.toContain("reapproval_declined");
+            expect(document).not.toContain("no_approval_provider");
+            expect(document).not.toMatch(/declined fresh run[\s\S]*terminal `cancelled` envelope/i);
+        }
+
+        for (const document of [normalizedGuide, normalizedPublicApi]) {
+            expect(document).toContain(listRunsPagingWording);
+        }
+
+        expect(normalizedGuide).toContain(
+            "SDK-initiated `run` and `resume` do not request permission"
+        );
+        expect(normalizedGuide).toContain(
+            "`run_factory` tool requests permission before the durable row exists"
+        );
+        expect(normalizedGuide).toContain("declining it creates no run row");
+        expect(normalizedGuide).toContain("its maximum number of active top-level runs");
+        for (const code of resumeCodes) {
+            expect(guide).toContain(`\`${code}\``);
+        }
+        expect(guide).toContain(
+            "Options are exactly `label`, `schema`, `model`, `agent`, `reasoningEffort`, and `contextTier`"
+        );
+        expect(normalizedGuide).toContain(
+            "session returned by `joinSession`. It refuses calls that start or resume a factory run"
+        );
+
+        expect(normalizedPublicApi).toContain("SDK-initiated runs do not request permission");
+        expect(normalizedPublicApi).toContain("declining it creates no run row");
+        expect(normalizedPublicApi).toContain(
+            "while the session is at its active top-level run limit"
+        );
+        expect(normalizedPublicApi).toContain("SDK-initiated resumes do not request permission");
+        expect(normalizedPublicApi).toContain("with a documented resume code rejects with");
+        expect(normalizedPublicApi).toContain(
+            "session instance returned by `joinSession`. It refuses calls that start or resume a factory run"
+        );
+    });
+
+    it("carries a declared argsSchema through defineFactory into the registration payload", async () => {
+        const client = new CopilotClient();
+        await client.start();
+        onTestFinished(() => stopClient(client));
+
+        const argsSchema = {
+            type: "object",
+            required: ["repoPath"],
+            properties: {
+                repoPath: { type: "string" },
+                depth: { type: ["integer", "null"] },
+                mode: { enum: ["fast", "thorough"] },
+            },
+        } satisfies FactoryJsonSchema;
+        const meta = {
+            name: "declares-args",
+            description: "Declares the argument shape it expects",
+            phases: [],
+            argsSchema,
+        };
+        const factory = defineFactory({ meta, run: async () => ({ ok: true }) });
+
+        // The declaration is snapshotted and deep-frozen like the rest of the
+        // metadata, so it cannot be mutated after registration.
+        expect(factory.meta.argsSchema).toEqual(argsSchema);
+        expect(factory.meta.argsSchema).not.toBe(argsSchema);
+        expect(Object.isFrozen(factory.meta.argsSchema)).toBe(true);
+        expect(() => {
+            // @ts-expect-error handle.meta.argsSchema is deeply readonly.
+            factory.meta.argsSchema!.type = "array";
+        }).toThrow(TypeError);
+
+        const omitted = defineFactory({
+            meta: { name: "omits-args", description: "Declares nothing", phases: [] },
+            run: async () => ({ ok: true }),
+        });
+        expect(omitted.meta.argsSchema).toBeUndefined();
+        expect("argsSchema" in omitted.meta).toBe(false);
+
+        const sendRequest = vi
+            .spyOn(
+                (client as never as { connection: { sendRequest: Function } }).connection,
+                "sendRequest"
+            )
+            .mockImplementation(async (method: string, params: Record<string, unknown>) => {
+                if (method === "session.resume") {
+                    return { sessionId: params.sessionId };
+                }
+                throw new Error(`Unexpected method: ${method}`);
+            });
+
+        await client.resumeSessionForExtension(
+            "session-args-schema",
+            { onPermissionRequest: () => ({ kind: "approved" }) },
+            [factory, omitted]
+        );
+
+        const payload = sendRequest.mock.calls.find(
+            ([method]) => method === "session.resume"
+        )![1] as { factories: Array<Record<string, unknown>> };
+        // The schema has to survive JSON serialization to reach the runtime, which
+        // validates `args` against it before a run row exists.
+        expect(JSON.parse(JSON.stringify(payload.factories))[0].argsSchema).toEqual(argsSchema);
+        expect(payload.factories[1]).not.toHaveProperty("argsSchema");
+    });
+
+    it("documents argsSchema consistently with the runtime's enforced subset", () => {
+        const publicTypes = readFileSync(new URL("../src/types.ts", import.meta.url), "utf8");
+        const publicApi = readFileSync(new URL("../src/factory.ts", import.meta.url), "utf8");
+        const guide = readFileSync(new URL("../docs/factories.md", import.meta.url), "utf8");
+        const normalizeJSDoc = (document: string) =>
+            document.replace(/\r?\n\s*\* ?/g, " ").replace(/\s+/g, " ");
+
+        expect(publicTypes).toContain("argsSchema?: FactoryJsonSchema;");
+
+        // The `run_factory` tool tells the model exactly this. The two surfaces
+        // have to agree about what a declaration does and does not enforce.
+        for (const document of [normalizeJSDoc(publicTypes), guide]) {
+            expect(document).toContain("types, required properties, and enum");
+            expect(document).toMatch(
+                /`minLength`, `pattern`,? (?:and|or) `additionalProperties` are recorded/
+            );
+        }
+        expect(normalizeJSDoc(publicTypes)).toContain("before** the run starts");
+        // Enforcement is tool-path only: `toolRunFactoryValidateArgs` is called from
+        // the runtime's runFactoryTool, and never from `session.factory.run`. Both
+        // surfaces must keep saying so, or authors will assume their own SDK-initiated
+        // runs are checked.
+        expect(normalizeJSDoc(publicTypes)).toContain(
+            "`session.factory.run(...)` is not validated against the declaration"
+        );
+        expect(guide).toContain("Validation covers the model's `run_factory` path only");
+        expect(normalizeJSDoc(publicApi)).toContain(
+            "`null`, `boolean`, `integer`, `number`, `string`, `array`, or `object`"
+        );
+        expect(guide).toContain("no run row, permission prompt, or credit spend happens");
+    });
+
     it("serializes only factory metadata in the extension resume payload", async () => {
         const client = new CopilotClient();
         await client.start();
@@ -469,7 +655,8 @@ describe("factories", () => {
         expect(resumeSessionForExtension).toHaveBeenCalledWith(
             "session-extension",
             expect.objectContaining({ suppressResumeEvent: true }),
-            [factory]
+            [factory],
+            undefined
         );
     });
 
@@ -569,6 +756,133 @@ describe("factories", () => {
         expect(sendRequest).not.toHaveBeenCalled();
     });
 
+    it("keeps factory reads and cancellation available inside a factory body", async () => {
+        const sendRequest = vi.fn(async (method: string) => {
+            switch (method) {
+                case "session.factory.getRun":
+                    return { runId: "other-run", status: "completed" };
+                case "session.factory.listRuns":
+                    return { runs: [] };
+                case "session.factory.cancel":
+                    return {};
+                default:
+                    throw new Error(`Unexpected method: ${method}`);
+            }
+        });
+        const session = new CopilotSession("session-factory-reads", { sendRequest } as never);
+        const factory = defineFactory({
+            meta: {
+                name: "factory-reads",
+                description: "Read factory state from a factory body",
+                phases: [],
+            },
+            run: async ({ session: contextSession }) => {
+                const [run, runs] = await Promise.all([
+                    contextSession.factory.getRun("other-run"),
+                    contextSession.factory.listRuns(),
+                    contextSession.factory.cancel("other-run"),
+                ]);
+                return { runId: run.runId, runCount: runs.length };
+            },
+        });
+        session.registerFactories([factory]);
+
+        await expect(
+            session.clientSessionApis.factory!.execute({
+                sessionId: session.sessionId,
+                name: "factory-reads",
+                runId: "run-factory-reads",
+                executionToken: "execution-token",
+                args: {},
+            })
+        ).resolves.toEqual({ result: { runId: "other-run", runCount: 0 } });
+        expect(sendRequest).toHaveBeenCalledWith("session.factory.getRun", {
+            sessionId: session.sessionId,
+            runId: "other-run",
+        });
+        expect(sendRequest).toHaveBeenCalledWith("session.factory.listRuns", {
+            sessionId: session.sessionId,
+        });
+        expect(sendRequest).toHaveBeenCalledWith("session.factory.cancel", {
+            sessionId: session.sessionId,
+            runId: "other-run",
+        });
+    });
+
+    it("allows factory.run after a factory body returns", async () => {
+        const sendRequest = vi.fn(async (method: string) => {
+            if (method === "session.factory.run") {
+                return { runId: "run-after-body", status: "completed", result: "started" };
+            }
+            throw new Error(`Unexpected method: ${method}`);
+        });
+        const session = new CopilotSession("session-after-body", { sendRequest } as never);
+        const factory = defineFactory({
+            meta: {
+                name: "returns",
+                description: "Return before a separate factory run",
+                phases: [],
+            },
+            run: async () => "finished",
+        });
+        session.registerFactories([factory]);
+
+        await expect(
+            session.clientSessionApis.factory!.execute({
+                sessionId: session.sessionId,
+                name: "returns",
+                runId: "run-returns",
+                executionToken: "execution-token",
+                args: {},
+            })
+        ).resolves.toEqual({ result: "finished" });
+        await expect(session.factory.run("after-body")).resolves.toMatchObject({
+            status: "completed",
+            result: "started",
+        });
+    });
+
+    it("allows a factory-body timer to start a factory after the body settles", async () => {
+        const delayedRun = Promise.withResolvers<unknown>();
+        const sendRequest = vi.fn(async (method: string) => {
+            if (method === "session.factory.run") {
+                return { runId: "run-from-timer", status: "completed", result: "started" };
+            }
+            throw new Error(`Unexpected method: ${method}`);
+        });
+        const session = new CopilotSession("session-timer", { sendRequest } as never);
+        const factory = defineFactory({
+            meta: {
+                name: "timer",
+                description: "Start a factory from an unawaited timer",
+                phases: [],
+            },
+            run: async () => {
+                setTimeout(() => {
+                    void session.factory
+                        .run("from-timer")
+                        .then(delayedRun.resolve, delayedRun.reject);
+                }, 0);
+                return "finished";
+            },
+        });
+        session.registerFactories([factory]);
+
+        await expect(
+            session.clientSessionApis.factory!.execute({
+                sessionId: session.sessionId,
+                name: "timer",
+                runId: "run-timer",
+                executionToken: "execution-token",
+                args: {},
+            })
+        ).resolves.toEqual({ result: "finished" });
+        await expect(delayedRun.promise).resolves.toMatchObject({
+            status: "completed",
+            result: "started",
+        });
+    });
+
     it("flushes progress incrementally while a factory body is awaiting", async () => {
         const sendRequest = vi.fn(async () => ({}));
         const session = new CopilotSession("session-live-progress", { sendRequest } as never);
@@ -653,6 +967,95 @@ describe("factories", () => {
         });
     });
 
+    it("forwards every declared factory.agent option", async () => {
+        const sendRequest = vi.fn(async (method: string) => {
+            if (method === "session.factory.agent") {
+                return { result: "pong" };
+            }
+            throw new Error(`Unexpected method: ${method}`);
+        });
+        const session = new CopilotSession("session-agent-options", { sendRequest } as never);
+        const factory = defineFactory({
+            meta: {
+                name: "agent-options",
+                description: "Agent option forwarding test",
+                phases: [],
+            },
+            run: async ({ agent }) =>
+                agent("Reply with pong", {
+                    label: "Pong helper",
+                    model: "gpt-test",
+                    schema: { type: "string" },
+                    agent: "reviewer",
+                    reasoningEffort: "high",
+                    contextTier: "long_context",
+                }),
+        });
+        session.registerFactories([factory]);
+
+        await expect(
+            session.clientSessionApis.factory!.execute({
+                sessionId: session.sessionId,
+                name: "agent-options",
+                runId: "run-agent-options",
+                executionToken: "execution-token",
+                args: {},
+            })
+        ).resolves.toEqual({ result: "pong" });
+        expect(sendRequest).toHaveBeenCalledWith("session.factory.agent", {
+            sessionId: session.sessionId,
+            factoryRunId: "run-agent-options",
+            executionToken: "execution-token",
+            prompt: "Reply with pong",
+            opts: {
+                label: "Pong helper",
+                model: "gpt-test",
+                schema: { type: "string" },
+                agent: "reviewer",
+                reasoningEffort: "high",
+                contextTier: "long_context",
+            },
+        });
+    });
+
+    it("sends empty factory.agent options when none are supplied", async () => {
+        const sendRequest = vi.fn(async (method: string) => {
+            if (method === "session.factory.agent") {
+                return { result: "pong" };
+            }
+            throw new Error(`Unexpected method: ${method}`);
+        });
+        const session = new CopilotSession("session-empty-agent-options", {
+            sendRequest,
+        } as never);
+        const factory = defineFactory({
+            meta: {
+                name: "empty-agent-options",
+                description: "Empty agent option forwarding test",
+                phases: [],
+            },
+            run: async ({ agent }) => agent("Reply with pong"),
+        });
+        session.registerFactories([factory]);
+
+        await expect(
+            session.clientSessionApis.factory!.execute({
+                sessionId: session.sessionId,
+                name: "empty-agent-options",
+                runId: "run-empty-agent-options",
+                executionToken: "execution-token",
+                args: {},
+            })
+        ).resolves.toEqual({ result: "pong" });
+        expect(sendRequest).toHaveBeenCalledWith("session.factory.agent", {
+            sessionId: session.sessionId,
+            factoryRunId: "run-empty-agent-options",
+            executionToken: "execution-token",
+            prompt: "Reply with pong",
+            opts: {},
+        });
+    });
+
     it("keeps each execution token on callbacks from overlapping contexts with the same run id", async () => {
         const sendRequest = vi.fn(async (method: string) => {
             if (method === "session.factory.agent") {
@@ -1431,6 +1834,56 @@ describe("factories", () => {
         );
     });
 
+    it("keeps a completed execution successful when a background progress flush fails", async () => {
+        vi.useFakeTimers();
+        const release = Promise.withResolvers<void>();
+        const sendRequest = vi.fn(async (method: string) => {
+            if (method === "session.factory.log") {
+                throw new Error("background transport failure");
+            }
+            return {};
+        });
+        const warning = vi.spyOn(console, "warn").mockImplementation(() => {});
+        const session = new CopilotSession("session-background-flush-failure", {
+            sendRequest,
+        } as never);
+        const factory = defineFactory({
+            meta: {
+                name: "background-flush-failure",
+                description: "Background flush failure regression test",
+                phases: [],
+            },
+            run: async ({ log }) => {
+                log("background line");
+                await release.promise;
+                return "done";
+            },
+        });
+        session.registerFactories([factory]);
+
+        try {
+            const execution = session.clientSessionApis.factory!.execute({
+                sessionId: session.sessionId,
+                name: "background-flush-failure",
+                runId: "run-background-flush-failure",
+                executionToken: "execution-token",
+                args: {},
+            });
+            await vi.advanceTimersByTimeAsync(10_000);
+            await Promise.resolve();
+
+            release.resolve();
+
+            await expect(execution).resolves.toEqual({ result: "done" });
+            expect(warning).toHaveBeenCalledWith(
+                "Ignoring a background factory progress flush failure after the factory body settled",
+                expect.objectContaining({ message: "background transport failure" })
+            );
+        } finally {
+            vi.useRealTimers();
+        }
+    });
+
     it("keeps a mid-run progress flush failure fatal", async () => {
         const sendRequest = vi.fn(async (method: string) => {
             if (method === "session.factory.log") {
@@ -1736,8 +2189,11 @@ describe("factories", () => {
         "not_found",
         "non_resumable",
         "already_active",
-        "reapproval_declined",
-        "no_approval_provider",
+        "factory_already_running",
+        "factory_limits_invalid",
+        "factory_session_disposed",
+        "factory_storage_unavailable",
+        "factory_storage_corrupt",
     ] as const)(
         "throws FactoryResumeError with code %s for pre-execution failures",
         async (code) => {
@@ -1755,6 +2211,21 @@ describe("factories", () => {
         }
     );
 
+    it("leaves an unreachable permission_denied response as a raw ResponseError", async () => {
+        const session = new CopilotSession("session-resume-permission-denied", {
+            sendRequest: vi.fn(async () => {
+                throw new ResponseError(-32602, "resume failed: permission_denied", {
+                    code: "permission_denied",
+                });
+            }),
+        } as never);
+
+        const error = await session.factory.resume("run-error").catch((caught: unknown) => caught);
+        expect(error).toBeInstanceOf(ResponseError);
+        expect(error).not.toBeInstanceOf(FactoryResumeError);
+        expect((error as ResponseError<{ code: string }>).data.code).toBe("permission_denied");
+    });
+
     it("returns resumed execution failures as envelopes", async () => {
         const envelope = {
             runId: "run-execution-error",
diff --git a/nodejs/test/github-token-provider.test.ts b/nodejs/test/github-token-provider.test.ts
new file mode 100644
index 0000000000..2202f466a1
--- /dev/null
+++ b/nodejs/test/github-token-provider.test.ts
@@ -0,0 +1,292 @@
+import { describe, expect, it, vi } from "vitest";
+import { CopilotClient, RuntimeConnection, type GitHubTokenProvider } from "../src/index.js";
+
+function createMockClient(
+    request: (method: string, params: Record<string, unknown>) => Promise<unknown>
+): CopilotClient {
+    const client = new CopilotClient({
+        connection: RuntimeConnection.forUri("localhost:1234"),
+    });
+    (client as unknown as { connection: unknown }).connection = {
+        sendRequest: request,
+        dispose: vi.fn(),
+    };
+    return client;
+}
+
+function getTokenHandler(client: CopilotClient) {
+    return (
+        client as unknown as {
+            clientGlobalHandlers: {
+                gitHubToken: {
+                    getToken(params: {
+                        registrationId: string;
+                        host: string;
+                        sessionId?: string;
+                        reason: "initial" | "refresh";
+                    }): Promise<unknown>;
+                };
+            };
+        }
+    ).clientGlobalHandlers.gitHubToken.getToken;
+}
+
+describe("session GitHub token providers", () => {
+    it("rejects a static token and provider together", async () => {
+        const client = new CopilotClient({
+            connection: RuntimeConnection.forUri("localhost:1234"),
+        });
+
+        await expect(
+            client.createSession({
+                gitHubToken: "static",
+                gitHubTokenProvider: async () => ({
+                    kind: "token",
+                    accessToken: "dynamic",
+                    expiresIn: 28_800,
+                }),
+            })
+        ).rejects.toThrow("gitHubToken and gitHubTokenProvider are mutually exclusive");
+    });
+
+    it("serializes only the opaque registration and maps token and cancellation results", async () => {
+        let createPayload: Record<string, unknown> | undefined;
+        const request = vi.fn(async (method: string, params: Record<string, unknown>) => {
+            if (method === "session.create") {
+                createPayload = params;
+                return { sessionId: params.sessionId };
+            }
+            throw new Error(`Unexpected method: ${method}`);
+        });
+        const observed: unknown[] = [];
+        const provider: GitHubTokenProvider = vi
+            .fn()
+            .mockImplementationOnce(async (args) => {
+                observed.push(args);
+                return {
+                    kind: "token",
+                    accessToken: "secret-token",
+                    tokenType: "Bearer",
+                    expiresIn: 28_800,
+                };
+            })
+            .mockImplementationOnce(async (args) => {
+                observed.push(args);
+                return { kind: "cancelled" };
+            });
+        const client = createMockClient(request);
+        const session = await client.createSession({
+            sessionId: "session-one",
+            gitHubTokenProvider: provider,
+        });
+
+        const registrationId = createPayload?.gitHubTokenProviderRegistrationId;
+        expect(registrationId).toMatch(
+            /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/
+        );
+        expect(createPayload).not.toHaveProperty("gitHubTokenProvider");
+        expect(createPayload?.gitHubToken).toBeUndefined();
+
+        const handler = getTokenHandler(client);
+        await expect(
+            handler({
+                registrationId: registrationId as string,
+                host: "github.example.com",
+                reason: "initial",
+            })
+        ).resolves.toEqual({
+            kind: "token",
+            accessToken: "secret-token",
+            tokenType: "Bearer",
+            expiresIn: 28_800,
+        });
+        await expect(
+            handler({
+                registrationId: registrationId as string,
+                host: "github.example.com",
+                sessionId: session.sessionId,
+                reason: "refresh",
+            })
+        ).resolves.toEqual({ kind: "cancelled" });
+        expect(observed).toEqual([
+            {
+                host: "github.example.com",
+                sessionId: "session-one",
+                reason: "initial",
+            },
+            {
+                host: "github.example.com",
+                sessionId: "session-one",
+                reason: "refresh",
+            },
+        ]);
+    });
+
+    it("preserves callback errors and rejects unknown registrations", async () => {
+        const client = createMockClient(async (_method, params) => ({
+            sessionId: params.sessionId,
+        }));
+        const failure = new Error("credential broker failed");
+        await client.createSession({
+            sessionId: "error-session",
+            gitHubTokenProvider: () => {
+                throw failure;
+            },
+        });
+        const registrationId = [
+            ...(
+                client as unknown as {
+                    githubTokenProviders: Map<string, unknown>;
+                }
+            ).githubTokenProviders.keys(),
+        ][0];
+        const handler = getTokenHandler(client);
+
+        await expect(
+            handler({
+                registrationId,
+                host: "github.com",
+                reason: "initial",
+            })
+        ).rejects.toBe(failure);
+        await expect(
+            handler({
+                registrationId: "unknown",
+                host: "github.com",
+                reason: "refresh",
+            })
+        ).rejects.toThrow("No GitHub token provider registered");
+    });
+
+    it("rolls back failed creation and cleans up on session and client close", async () => {
+        const failingClient = createMockClient(async () => {
+            throw new Error("create failed");
+        });
+        await expect(
+            failingClient.createSession({
+                gitHubTokenProvider: async () => ({ kind: "cancelled" }),
+            })
+        ).rejects.toThrow("create failed");
+        expect(
+            (
+                failingClient as unknown as {
+                    githubTokenProviders: Map<string, unknown>;
+                }
+            ).githubTokenProviders
+        ).toHaveLength(0);
+
+        const client = createMockClient(async (method, params) => {
+            if (method === "session.create") return { sessionId: params.sessionId };
+            if (method === "session.destroy") return {};
+            if (method === "session.delete") return { success: true };
+            throw new Error(`Unexpected method: ${method}`);
+        });
+        const first = await client.createSession({
+            sessionId: "first",
+            gitHubTokenProvider: async () => ({ kind: "cancelled" }),
+        });
+        await client.createSession({
+            sessionId: "second",
+            gitHubTokenProvider: async () => ({ kind: "cancelled" }),
+        });
+        const registrations = (
+            client as unknown as {
+                githubTokenProviders: Map<string, unknown>;
+            }
+        ).githubTokenProviders;
+        expect(registrations).toHaveLength(2);
+
+        await first.disconnect();
+        expect(registrations).toHaveLength(1);
+        await client.deleteSession("second");
+        expect(registrations).toHaveLength(0);
+        await client.forceStop();
+        expect(registrations).toHaveLength(0);
+    });
+
+    it("rotates a resumed session only after resume succeeds", async () => {
+        const payloads: Record<string, unknown>[] = [];
+        const client = createMockClient(async (method, params) => {
+            payloads.push(params);
+            if (method === "session.create" || method === "session.resume") {
+                return { sessionId: params.sessionId };
+            }
+            throw new Error(`Unexpected method: ${method}`);
+        });
+        const firstProvider = vi.fn(async () => ({ kind: "cancelled" as const }));
+        const secondProvider = vi.fn(async () => ({ kind: "cancelled" as const }));
+        await client.createSession({
+            sessionId: "resumed",
+            gitHubTokenProvider: firstProvider,
+        });
+        const firstRegistration = payloads[0].gitHubTokenProviderRegistrationId as string;
+
+        await client.resumeSession("resumed", {
+            gitHubTokenProvider: secondProvider,
+        });
+        const secondRegistration = payloads[1].gitHubTokenProviderRegistrationId as string;
+        const handler = getTokenHandler(client);
+
+        await expect(
+            handler({
+                registrationId: firstRegistration,
+                host: "github.com",
+                reason: "refresh",
+            })
+        ).rejects.toThrow("No GitHub token provider registered");
+        await expect(
+            handler({
+                registrationId: secondRegistration,
+                host: "github.com",
+                reason: "refresh",
+            })
+        ).resolves.toEqual({ kind: "cancelled" });
+        expect(secondProvider).toHaveBeenCalledOnce();
+        expect(firstProvider).not.toHaveBeenCalled();
+    });
+
+    it("does not retire a concurrent pending registration", async () => {
+        const resumeResolvers: Array<(value: { sessionId: string }) => void> = [];
+        const payloads: Record<string, unknown>[] = [];
+        const client = createMockClient(async (method, params) => {
+            payloads.push(params);
+            if (method === "session.create") {
+                return { sessionId: params.sessionId };
+            }
+            if (method === "session.resume") {
+                return await new Promise<{ sessionId: string }>((resolve) => {
+                    resumeResolvers.push(resolve);
+                });
+            }
+            throw new Error(`Unexpected method: ${method}`);
+        });
+        await client.createSession({
+            sessionId: "concurrent",
+            gitHubTokenProvider: async () => ({ kind: "cancelled" }),
+        });
+
+        const firstResume = client.resumeSession("concurrent", {
+            gitHubTokenProvider: async () => ({ kind: "cancelled" }),
+        });
+        const secondResume = client.resumeSession("concurrent", {
+            gitHubTokenProvider: async () => ({ kind: "cancelled" }),
+        });
+        await vi.waitFor(() => expect(resumeResolvers).toHaveLength(2));
+
+        resumeResolvers[0]({ sessionId: "concurrent" });
+        await firstResume;
+        const registrations = (
+            client as unknown as {
+                githubTokenProviders: Map<string, unknown>;
+            }
+        ).githubTokenProviders;
+        expect(registrations).toHaveLength(2);
+
+        resumeResolvers[1]({ sessionId: "concurrent" });
+        await secondResume;
+        expect(registrations).toHaveLength(1);
+        expect(registrations.has(payloads[2].gitHubTokenProviderRegistrationId as string)).toBe(
+            true
+        );
+    });
+});
diff --git a/nodejs/test/session-event-codegen.test.ts b/nodejs/test/session-event-codegen.test.ts
index 14340292be..c84d9bc082 100644
--- a/nodejs/test/session-event-codegen.test.ts
+++ b/nodejs/test/session-event-codegen.test.ts
@@ -84,6 +84,7 @@ describe("session event codegen", () => {
         expect(code).toContain("payload: str");
         expect(code).toContain("encoded: str");
         expect(code).toContain("count: int");
+        expect(code).toContain("assert not isinstance(x, float) or x.is_integer()");
     });
 
     it("strips Ms suffixes from duration member names while preserving JSON names", () => {
diff --git a/nodejs/test/session-event-types.test.ts b/nodejs/test/session-event-types.test.ts
index fef7acdb2b..5c41f2216a 100644
--- a/nodejs/test/session-event-types.test.ts
+++ b/nodejs/test/session-event-types.test.ts
@@ -16,12 +16,18 @@
 
 import { describe, expect, it } from "vitest";
 import { approveAll } from "../src/index.js";
+import { FACTORY_AGENT_OPTION_KEYS } from "../src/factory.js";
+import type { FactoryAgentOptions as WireFactoryAgentOptions } from "../src/generated/rpc.js";
 import type {
     // The aggregate union; must still resolve via the package root.
     SessionEvent,
     PermissionRequest,
     PermissionRequestedData,
     PermissionRequestedEvent,
+    PermissionResponseCapability,
+    ManagedSettingsResolvedData,
+    ManagedSettingsResolvedEvent,
+    ManagedSettingsResolvedSource,
 
     // *Data payload types from the v0.3.0 generated session-event schema.
     AssistantMessageData,
@@ -56,6 +62,8 @@ import type {
     WorkingDirectoryContextHostType,
     FactoryContext,
     FactoryDefinition,
+    FactoryAgentOptions,
+    FactoryRunResult,
     JsonValue,
 } from "../src/index.js";
 
@@ -94,6 +102,21 @@ type _DefaultFactoryResultIsJsonValueOrVoid = _AssertEqual<
     JsonValue | void
 >;
 const _defaultFactoryResultCheck: _DefaultFactoryResultIsJsonValueOrVoid = true;
+type _FactoryRunResultIsJsonValueOrUndefined = _AssertEqual<
+    FactoryRunResult["result"],
+    JsonValue | undefined
+>;
+const _factoryRunResultCheck: _FactoryRunResultIsJsonValueOrUndefined = true;
+type _FactoryAgentOptionKeysMatchPublicInterface = _AssertEqual<
+    (typeof FACTORY_AGENT_OPTION_KEYS)[number],
+    keyof FactoryAgentOptions
+>;
+const _factoryAgentOptionKeysCheck: _FactoryAgentOptionKeysMatchPublicInterface = true;
+type _PublicFactoryAgentOptionsMatchWire = _AssertEqual<
+    keyof FactoryAgentOptions,
+    keyof WireFactoryAgentOptions
+>;
+const _publicFactoryAgentOptionsCheck: _PublicFactoryAgentOptionsMatchWire = true;
 // @ts-expect-error Factory arguments must be representable on the JSON wire.
 type _FactoryArgsRejectUndefined = FactoryContext<undefined>;
 // @ts-expect-error Factory results must be JSON values or top-level void.
@@ -163,6 +186,45 @@ describe("Session event type exports (#1156)", () => {
         expect(permissionEvent.data.permissionRequest.managedApprovalRequired).toBe(true);
     });
 
+    it("exposes managed settings client and mixed provenance", () => {
+        const sources: ManagedSettingsResolvedSource[] = [
+            "server",
+            "device",
+            "client",
+            "mixed",
+            "none",
+        ];
+        expect(sources).toEqual(["server", "device", "client", "mixed", "none"]);
+
+        const clientData: ManagedSettingsResolvedData = {
+            bypassPermissionsDisabled: true,
+            clientManaged: true,
+            deviceManaged: false,
+            failClosed: false,
+            managedKeys: ["permissions"],
+            serverManaged: false,
+            source: "client",
+        };
+        const clientEvent: ManagedSettingsResolvedEvent = {
+            ephemeral: true,
+            id: "evt-managed-1",
+            parentId: null,
+            timestamp: "2026-01-01T00:00:00.000Z",
+            type: "session.managed_settings_resolved",
+            data: clientData,
+        };
+        expect(clientEvent.data.source).toBe("client");
+        expect(clientEvent.data.clientManaged).toBe(true);
+
+        const { clientManaged: _, ...withoutClientManaged } = clientData;
+        const mixedData: ManagedSettingsResolvedData = {
+            ...withoutClientManaged,
+            source: "mixed",
+        };
+        expect(mixedData.source).toBe("mixed");
+        expect("clientManaged" in mixedData).toBe(false);
+    });
+
     it("rejects approveAll in managed settings sessions", () => {
         expect(() =>
             approveAll(
@@ -260,6 +322,8 @@ describe("Session event type exports (#1156)", () => {
         assertImportable<ToolExecutionStartData>();
         assertImportable<UserMessageData>();
         assertImportable<PermissionRequestedData>();
+        assertImportable<PermissionResponseCapability>();
+        assertImportable<ManagedSettingsResolvedData>();
 
         assertImportable<AssistantMessageEvent>();
         assertImportable<ErrorEvent>();
@@ -270,6 +334,8 @@ describe("Session event type exports (#1156)", () => {
         assertImportable<ToolExecutionStartEvent>();
         assertImportable<UserMessageEvent>();
         assertImportable<PermissionRequestedEvent>();
+        assertImportable<ManagedSettingsResolvedEvent>();
+        assertImportable<ManagedSettingsResolvedSource>();
 
         // Supporting auxiliary types referenced by the *Data shapes — these
         // must round-trip through the package root too, otherwise consumers
diff --git a/nodejs/test/session-send-and-wait.test.ts b/nodejs/test/session-send-and-wait.test.ts
index 8b6e390c4a..4ee2e8eebc 100644
--- a/nodejs/test/session-send-and-wait.test.ts
+++ b/nodejs/test/session-send-and-wait.test.ts
@@ -7,7 +7,10 @@ import type { MessageConnection } from "vscode-jsonrpc/node.js";
 import { CopilotSession } from "../src/session.js";
 import type { SessionEvent } from "../src/generated/session-events.js";
 
-function sessionEvent(type: "session.idle", data: Record<string, never> = {}): SessionEvent {
+function sessionEvent(
+    type: "session.idle",
+    data: { mode?: "interactive" | "plan" | "autopilot" } = {}
+): SessionEvent {
     return {
         type,
         id: "00000000-0000-4000-8000-000000000001",
@@ -106,6 +109,24 @@ describe("sendAndWait", () => {
         await expect(pending).resolves.toBeUndefined();
     });
 
+    it("ignores autopilot continuation idle events", async () => {
+        const { session, sendStarted, resolveSend } = controlledSession();
+        const pending = session.sendAndWait({ prompt: "hi" });
+        await sendStarted;
+
+        session._dispatchEvent(sessionEvent("session.idle", { mode: "autopilot" }));
+        resolveSend();
+
+        const stateAfterContinuation = await Promise.race([
+            pending.then(() => "settled"),
+            new Promise<"pending">((resolve) => setTimeout(() => resolve("pending"), 0)),
+        ]);
+        expect(stateAfterContinuation).toBe("pending");
+
+        session._dispatchEvent(sessionEvent("session.idle", { mode: "interactive" }));
+        await expect(pending).resolves.toBeUndefined();
+    });
+
     it("preserves the send rejection when a session error arrives first", async () => {
         const { session, sendStarted, rejectSend } = controlledSession();
         const pending = session.sendAndWait({ prompt: "hi" });
diff --git a/nodejs/test/typescript-codegen.test.ts b/nodejs/test/typescript-codegen.test.ts
index e3f3d28571..0a63a5293a 100644
--- a/nodejs/test/typescript-codegen.test.ts
+++ b/nodejs/test/typescript-codegen.test.ts
@@ -48,6 +48,128 @@ describe("typescript schema codegen", () => {
         );
         expect(code).toContain('inlineMode: /** Use a direct value. */ "direct" | "indirect";');
     });
+
+    it("maps bare opaque properties to their marker aliases", async () => {
+        const code = await compile(
+            normalizeSchemaForTypeScript({
+                title: "OpaqueProperty",
+                type: "object",
+                properties: {
+                    json: { "x-opaque-json": true },
+                    inProcess: { "x-opaque-in-process": true },
+                },
+                required: ["json", "inProcess"],
+            }),
+            "OpaqueProperty",
+            { bannerComment: "", style: { semi: true, singleQuote: false } }
+        );
+
+        expect(code).toContain("json: JsonValue;");
+        expect(code).toContain("inProcess: OpaqueInProcessValue;");
+    });
+
+    it("maps a bare opaque JSON additional property to JsonValue", async () => {
+        const code = await compile(
+            normalizeSchemaForTypeScript({
+                title: "OpaqueMap",
+                type: "object",
+                additionalProperties: { "x-opaque-json": true },
+            }),
+            "OpaqueMap",
+            { bannerComment: "", style: { semi: true, singleQuote: false } }
+        );
+
+        expect(code).toContain("[k: string]: JsonValue;");
+    });
+
+    it("maps a bare opaque JSON array item to JsonValue", async () => {
+        const code = await compile(
+            normalizeSchemaForTypeScript({
+                title: "OpaqueArray",
+                type: "object",
+                properties: { values: { type: "array", items: { "x-opaque-json": true } } },
+                required: ["values"],
+            }),
+            "OpaqueArray",
+            { bannerComment: "", style: { semi: true, singleQuote: false } }
+        );
+
+        expect(code).toContain("values: JsonValue[];");
+    });
+
+    it("maps a bare opaque JSON definition to a named alias", async () => {
+        const code = await compile(
+            normalizeSchemaForTypeScript({
+                title: "OpaqueDefinitionRoot",
+                type: "object",
+                properties: { value: { $ref: "#/definitions/OpaqueDefinition" } },
+                definitions: { OpaqueDefinition: { "x-opaque-json": true } },
+            }),
+            "OpaqueDefinitionRoot",
+            { bannerComment: "", style: { semi: true, singleQuote: false } }
+        );
+
+        expect(code).toContain("export type OpaqueDefinition = JsonValue;");
+    });
+
+    it("keeps an opaque JSON node with anyOf as a union", async () => {
+        const code = await compile(
+            normalizeSchemaForTypeScript({
+                title: "ConstrainedUnion",
+                "x-opaque-json": true,
+                anyOf: [{ type: "string" }, { type: "number" }],
+            }),
+            "ConstrainedUnion",
+            { bannerComment: "", style: { semi: true, singleQuote: false } }
+        );
+
+        expect(code).toContain("export type ConstrainedUnion = string | number;");
+        expect(code).not.toContain("JsonValue");
+    });
+
+    it("keeps an opaque JSON node with object constraints as an object", async () => {
+        const code = await compile(
+            normalizeSchemaForTypeScript({
+                title: "ConstrainedObject",
+                type: "object",
+                "x-opaque-json": true,
+                properties: { name: { type: "string" } },
+                required: ["name"],
+            }),
+            "ConstrainedObject",
+            { bannerComment: "", style: { semi: true, singleQuote: false } }
+        );
+
+        expect(code).toContain("export interface ConstrainedObject {");
+        expect(code).toContain("name: string;");
+        expect(code).not.toContain("JsonValue");
+    });
+
+    it("removes both opaque markers from every normalized schema node", () => {
+        const normalized = normalizeSchemaForTypeScript({
+            type: "object",
+            "x-opaque-json": true,
+            properties: {
+                json: { "x-opaque-json": true },
+                inProcess: { "x-opaque-in-process": true },
+            },
+            additionalProperties: { "x-opaque-in-process": true },
+        }) as Record<string, unknown>;
+
+        const assertMarkersRemoved = (value: unknown): void => {
+            if (Array.isArray(value)) {
+                value.forEach(assertMarkersRemoved);
+            } else if (value && typeof value === "object") {
+                for (const [key, child] of Object.entries(value as Record<string, unknown>)) {
+                    expect(key).not.toBe("x-opaque-json");
+                    expect(key).not.toBe("x-opaque-in-process");
+                    assertMarkersRemoved(child);
+                }
+            }
+        };
+
+        assertMarkersRemoved(normalized);
+    });
 });
 
 describe("filterPublicSessionEventVariants", () => {
diff --git a/nodejs/vitest.config.ts b/nodejs/vitest.config.ts
index bb07cb0174..4ac56bb45e 100644
--- a/nodejs/vitest.config.ts
+++ b/nodejs/vitest.config.ts
@@ -2,6 +2,55 @@ import { defineConfig } from "vitest/config";
 
 const integrationTestTimeout = process.platform === "win32" ? 60000 : 30000;
 
+const isInProcessTransport =
+    (process.env.COPILOT_SDK_DEFAULT_CONNECTION ?? "").toLowerCase() === "inprocess";
+
+// TODO(cli-1.0.81-2): CLI 1.0.81-5 still stops completing model-driven turns when
+// hosted in-process against CAPI. The shared runtime then poisons every later
+// model-driven test. These suites still run over stdio on all three OSes, while
+// pure-RPC in-process coverage remains enabled.
+const inProcessBlockedE2E = [
+    "**/test/e2e/abort.e2e.test.ts",
+    "**/test/e2e/agent_and_compact_rpc.e2e.test.ts",
+    "**/test/e2e/ask_user.e2e.test.ts",
+    "**/test/e2e/builtin_tools.e2e.test.ts",
+    "**/test/e2e/client_api.e2e.test.ts",
+    "**/test/e2e/client_lifecycle.e2e.test.ts",
+    "**/test/e2e/compaction.e2e.test.ts",
+    "**/test/e2e/copilot_request_cancel_error.e2e.test.ts",
+    "**/test/e2e/copilot_request_handler.e2e.test.ts",
+    "**/test/e2e/copilot_request_session_id.e2e.test.ts",
+    "**/test/e2e/disabled_mcp_servers.e2e.test.ts",
+    "**/test/e2e/event_fidelity.e2e.test.ts",
+    "**/test/e2e/hooks.e2e.test.ts",
+    "**/test/e2e/hooks_extended.e2e.test.ts",
+    "**/test/e2e/mcp_and_agents.e2e.test.ts",
+    "**/test/e2e/mode_empty.e2e.test.ts",
+    "**/test/e2e/multi_turn.e2e.test.ts",
+    "**/test/e2e/permissions.e2e.test.ts",
+    "**/test/e2e/pre_mcp_tool_call_hook.e2e.test.ts",
+    "**/test/e2e/provider_endpoint.e2e.test.ts",
+    "**/test/e2e/rewind.e2e.test.ts",
+    "**/test/e2e/rpc_event_side_effects.e2e.test.ts",
+    "**/test/e2e/rpc_session_state.e2e.test.ts",
+    "**/test/e2e/rpc_session_state_extras.e2e.test.ts",
+    "**/test/e2e/rpc_shell_and_fleet.e2e.test.ts",
+    "**/test/e2e/session.e2e.test.ts",
+    "**/test/e2e/session_config.e2e.test.ts",
+    "**/test/e2e/session_fs.e2e.test.ts",
+    "**/test/e2e/session_fs_sqlite.e2e.test.ts",
+    "**/test/e2e/session_lifecycle.e2e.test.ts",
+    "**/test/e2e/session_todos_changed.e2e.test.ts",
+    "**/test/e2e/skills.e2e.test.ts",
+    "**/test/e2e/streaming_fidelity.e2e.test.ts",
+    "**/test/e2e/subagent_hooks.e2e.test.ts",
+    "**/test/e2e/suspend.e2e.test.ts",
+    "**/test/e2e/system_message_sections.e2e.test.ts",
+    "**/test/e2e/system_message_transform.e2e.test.ts",
+    "**/test/e2e/tool_results.e2e.test.ts",
+    "**/test/e2e/tools.e2e.test.ts",
+];
+
 export default defineConfig({
     test: {
         globals: true,
@@ -17,6 +66,7 @@ export default defineConfig({
             "**/dist/**",
             "**/*.d.ts",
             "**/basic-test.ts", // Old manual test
+            ...(isInProcessTransport ? inProcessBlockedE2E : []),
         ],
     },
 });
diff --git a/python/README.md b/python/README.md
index 10630fb841..61608c16a0 100644
--- a/python/README.md
+++ b/python/README.md
@@ -281,9 +281,25 @@ These are passed as keyword arguments to `create_session()`:
 - `infinite_sessions` (InfiniteSessionConfig): Automatic context compaction configuration
 - `working_directory` (str | None): Working directory for the session (default: runtime process working directory).
 - `enable_session_store` (bool): Enables the cross-session store for search and retrieval across sessions. When unset in `"copilot-cli"` mode, the runtime default applies (enabled). In `"empty"` mode, defaults to disabled.
+- `github_token_provider` (callable): Acquires rotating, session-scoped GitHub tokens. Token results require a positive `expiresIn` value in seconds remaining when the callback completes; production tokens typically last eight hours. Cannot be combined with `github_token`.
 - `on_permission_request` (callable): Optional handler called before each tool execution to approve or deny it. When omitted, permission requests are emitted as events and left pending for manual resolution. `PermissionHandler.approve_all` approves requests when managed settings are disabled and raises an error when `enable_managed_settings` is true. Custom handlers can inspect `managed_approval_required` for human-facing confirmation logic. See [Permission Handling](#permission-handling) section.
 - `on_user_input_request` (callable): Handler for user input requests from the agent (enables ask_user tool). See [User Input Requests](#user-input-requests) section.
 - `hooks` (SessionHooks): Hook handlers for session lifecycle events. See [Session Hooks](#session-hooks) section.
+
+```python
+async def provide_github_token(args):
+    return {
+        "kind": "token",
+        "accessToken": await acquire_token_for_host(args["host"]),
+        "expiresIn": 8 * 60 * 60,
+    }
+
+
+session = await client.create_session(github_token_provider=provide_github_token)
+```
+
+Initial acquisition runs during session creation or resume. Cancellation, provider errors, and invalid token responses reject that operation instead of falling back to ambient authentication. Idle sessions refresh only before their next credential-consuming operation; there is no background refresh timer.
+
 - `available_tools` / `excluded_tools` / `default_agent.excluded_tools` / custom-agent `tools`: MCP tools registered from `mcp_servers` are exposed to the runtime as `<server-key>-<tool-name>`. For `available_tools` and `excluded_tools`, prefer `ToolSet().add_mcp("<server-key>-<tool-name>")` or the raw `mcp:<server-key>-<tool-name>` form. For custom-agent `tools` and `default_agent.excluded_tools`, use `<server-key>-<tool-name>` directly.
 
 **Session Lifecycle Methods:**
@@ -349,7 +365,7 @@ async with await client.create_session(
 
 > **Note:** When using `from __future__ import annotations`, define Pydantic models at module level (not inside functions).
 
-**Low-level API (without Pydantic):**
+#### Low-level API (without Pydantic)
 
 For users who prefer manual schema definition:
 
@@ -710,9 +726,9 @@ async with await client.create_session(
     ...
 ```
 
-Available section IDs: `"identity"`, `"tone"`, `"tool_efficiency"`, `"environment_context"`, `"code_change_rules"`, `"guidelines"`, `"safety"`, `"tool_instructions"`, `"custom_instructions"`, `"last_instructions"`.
+Available section IDs: `"preamble"`, `"identity"`, `"tone"`, `"tool_efficiency"`, `"environment_context"`, `"code_change_rules"`, `"guidelines"`, `"safety"`, `"tool_instructions"`, `"custom_instructions"`, `"runtime_instructions"`, `"last_instructions"`. `"identity"` and `"tool_instructions"` are section groups that target a collection of related sub-sections as a unit; use `"preamble"` to target just the identity preamble.
 
-Each section override supports four string actions: `"replace"`, `"remove"`, `"append"`, and `"prepend"`. Unknown section IDs are handled gracefully: content is appended to additional instructions, and `"remove"` overrides are silently ignored.
+Each section override supports five string actions: `"replace"`, `"remove"`, `"append"`, `"prepend"`, and `"preserve"` (a no-op that opts an individually-addressable section out of a group-level `"remove"`). Unknown section IDs are handled gracefully: content from `"replace"`/`"append"`/`"prepend"` overrides is appended to additional instructions, and `"remove"` overrides are silently ignored.
 
 You can also pass a transform callback as the `action` instead of a string. The callback receives the current section content and returns the new content (sync or async):
 
diff --git a/python/copilot/__init__.py b/python/copilot/__init__.py
index 678fffbf14..608dacf253 100644
--- a/python/copilot/__init__.py
+++ b/python/copilot/__init__.py
@@ -35,12 +35,20 @@
     CloudSessionRepository,
     CopilotClient,
     CopilotExpAssignmentResponse,
+    DisableBypassPermissionsModes,
     ExpConfigEntry,
     ExpFlagValue,
     GetAuthStatusResponse,
     GetStatusResponse,
+    GitHubTokenCancelledResult,
+    GitHubTokenProvider,
+    GitHubTokenProviderArgs,
+    GitHubTokenProviderResult,
+    GitHubTokenResult,
     InProcessRuntimeConnection,
     LogLevel,
+    ManagedSettings,
+    ManagedSettingsPermissions,
     ModelBilling,
     ModelCapabilities,
     ModelInfo,
@@ -83,8 +91,16 @@
     GitHubTelemetryClientInfo,
     GitHubTelemetryEvent,
     GitHubTelemetryNotification,
+    GitHubTokenAcquireReason,
+    GitHubTokenAcquireResult,
+    GitHubTokenAcquireResultKind,
     ModelBillingTokenPrices,
     ModelBillingTokenPricesLongContext,
+    PermissionDecisionContext,
+    PermissionDecisionOutcome,
+    PermissionDecisionSource,
+    PermissionDecisionSurface,
+    PermissionResponseCapability,
 )
 from .generated.session_events import (
     PermissionRequest,
@@ -95,6 +111,7 @@
     AgentStopHandler,
     AgentStopHookInput,
     AgentStopHookOutput,
+    AttributedPermissionResult,
     AutoModeSwitchHandler,
     AutoModeSwitchRequest,
     AutoModeSwitchResponse,
@@ -176,6 +193,7 @@
     UserPromptTransformedHandler,
     UserPromptTransformedHookInput,
     UserPromptTransformedHookOutput,
+    create_attributed_permission_result,
 )
 from .session_fs_provider import (
     SessionFsFileInfo,
@@ -207,6 +225,7 @@
     "AgentStopHandler",
     "AgentStopHookInput",
     "AgentStopHookOutput",
+    "AttributedPermissionResult",
     "AutoModeSwitchHandler",
     "AutoModeSwitchRequest",
     "AutoModeSwitchResponse",
@@ -249,6 +268,7 @@
     "ExitPlanModeResult",
     "ExtensionInfo",
     "CopilotWebSocketForwarder",
+    "DisableBypassPermissionsModes",
     "GetAuthStatusResponse",
     "BearerTokenProvider",
     "GetStatusResponse",
@@ -256,6 +276,14 @@
     "GitHubTelemetryClientInfo",
     "GitHubTelemetryEvent",
     "GitHubTelemetryNotification",
+    "GitHubTokenAcquireReason",
+    "GitHubTokenAcquireResult",
+    "GitHubTokenAcquireResultKind",
+    "GitHubTokenProvider",
+    "GitHubTokenProviderArgs",
+    "GitHubTokenProviderResult",
+    "GitHubTokenResult",
+    "GitHubTokenCancelledResult",
     "InfiniteSessionConfig",
     "InProcessRuntimeConnection",
     "InputOptions",
@@ -272,6 +300,8 @@
     "McpAuthStaticClientConfig",
     "McpAuthToken",
     "McpAuthWwwAuthenticateParams",
+    "ManagedSettings",
+    "ManagedSettingsPermissions",
     "ModelBilling",
     "ModelBillingTokenPrices",
     "ModelBillingTokenPricesLongContext",
@@ -291,6 +321,11 @@
     "PermissionNoResult",
     "PermissionRequest",
     "PermissionRequestResult",
+    "PermissionDecisionContext",
+    "PermissionDecisionOutcome",
+    "PermissionDecisionSource",
+    "PermissionDecisionSurface",
+    "PermissionResponseCapability",
     "PingResponse",
     "PostToolUseHandler",
     "PostToolUseFailureHandler",
@@ -369,6 +404,7 @@
     "UserPromptTransformedHookInput",
     "UserPromptTransformedHookOutput",
     "convert_mcp_call_tool_result",
+    "create_attributed_permission_result",
     "create_session_fs_adapter",
     "define_tool",
 ]
diff --git a/python/copilot/_jsonrpc.py b/python/copilot/_jsonrpc.py
index ed70e4e8d0..6427a8007f 100644
--- a/python/copilot/_jsonrpc.py
+++ b/python/copilot/_jsonrpc.py
@@ -296,6 +296,9 @@ def _read_loop(self):
 
     def _fail_pending_requests(self):
         """Fail all pending requests when process exits"""
+        if self._stderr_thread and self._stderr_thread is not threading.current_thread():
+            self._stderr_thread.join(timeout=1.0)
+
         # Build error message with stderr output
         stderr_output = self.get_stderr_output()
         return_code = None
diff --git a/python/copilot/_mode.py b/python/copilot/_mode.py
index 1a9ed6e1f5..5e7de02d02 100644
--- a/python/copilot/_mode.py
+++ b/python/copilot/_mode.py
@@ -298,11 +298,14 @@ def _post_create_options_patch(
     custom_agents_local_only: bool | None,
     coauthor_enabled: bool | None,
     manage_schedule_enabled: bool | None,
+    included_builtin_skills: list[str] | None = None,
 ) -> dict[str, Any] | None:
     """Build the patch sent via ``session.options.update`` after create/resume.
 
     In empty mode the four overridable flags default to safe values
     (caller-supplied values win); ``installedPlugins=[]`` is unconditional.
+    ``includedBuiltinSkills`` defaults to an empty list, but callers can
+    explicitly allow selected runtime-bundled skills.
     Returns ``None`` if no patch should be sent.
     """
     if mode == "empty":
@@ -318,6 +321,9 @@ def _post_create_options_patch(
                 manage_schedule_enabled if manage_schedule_enabled is not None else False
             ),
             "installedPlugins": [],
+            "includedBuiltinSkills": (
+                included_builtin_skills if included_builtin_skills is not None else []
+            ),
         }
         return patch
     patch = {}
@@ -329,6 +335,8 @@ def _post_create_options_patch(
         patch["coauthorEnabled"] = coauthor_enabled
     if manage_schedule_enabled is not None:
         patch["manageScheduleEnabled"] = manage_schedule_enabled
+    if included_builtin_skills is not None:
+        patch["includedBuiltinSkills"] = included_builtin_skills
     return patch or None
 
 
diff --git a/python/copilot/client.py b/python/copilot/client.py
index 737619ef35..271fad626c 100644
--- a/python/copilot/client.py
+++ b/python/copilot/client.py
@@ -29,7 +29,7 @@
 from dataclasses import dataclass, field
 from datetime import UTC, datetime
 from types import TracebackType
-from typing import Any, ClassVar, Literal, TypedDict, cast, overload
+from typing import Any, ClassVar, Literal, NotRequired, TypedDict, cast, overload
 
 from ._diagnostics import log_timing
 from ._ffi_runtime_host import FfiRuntimeHost
@@ -69,6 +69,9 @@
     ClientGlobalApiHandlers,
     ClientSessionApiHandlers,
     GitHubTelemetryNotification,
+    GitHubTokenAcquireReason,
+    GitHubTokenAcquireRequest,
+    GitHubTokenAcquireResult,
     ModelBillingTokenPrices,
     ModelBillingTokenPricesLongContext,  # noqa: F401
     OpenCanvasInstance,
@@ -123,6 +126,50 @@
 
 logger = logging.getLogger(__name__)
 
+
+class GitHubTokenProviderArgs(TypedDict):
+    """Arguments passed to a session-scoped :data:`GitHubTokenProvider`.
+
+    The opaque callback registration identifier is intentionally not exposed.
+    """
+
+    host: str
+    session_id: str | None
+    reason: GitHubTokenAcquireReason
+
+
+class GitHubTokenResult(TypedDict):
+    """A GitHub token returned by a session-scoped provider."""
+
+    kind: Literal["token"]
+    accessToken: str
+    expiresIn: int
+    tokenType: NotRequired[str]
+
+
+class GitHubTokenCancelledResult(TypedDict):
+    """An explicit cancellation returned by a session-scoped provider."""
+
+    kind: Literal["cancelled"]
+
+
+GitHubTokenProviderResult = GitHubTokenResult | GitHubTokenCancelledResult
+"""Result returned by a session-scoped GitHub token provider."""
+
+
+GitHubTokenProvider = Callable[
+    [GitHubTokenProviderArgs],
+    GitHubTokenProviderResult | Awaitable[GitHubTokenProviderResult],
+]
+"""Acquire a GitHub credential for one session.
+
+Token results require ``expiresIn`` to be the positive number of seconds of
+remaining lifetime when the callback completes. Production GitHub tokens
+typically last eight hours. Initial cancellation, callback errors, and invalid
+token responses reject session creation or resume instead of falling back to
+ambient authentication.
+"""
+
 # ============================================================================
 # Connection Types
 # ============================================================================
@@ -247,6 +294,74 @@ def _capi_session_options_to_wire(options: CapiSessionOptions) -> dict[str, Any]
     return wire
 
 
+class DisableBypassPermissionsModes:
+    """Well-known managed bypass-permissions policies."""
+
+    DISABLE: ClassVar[str] = "disable"
+    """Turn off bypass-permissions mode entirely."""
+
+    ALLOW_AUTO_ONLY: ClassVar[str] = "allow-auto-only"
+    """Permit automatic bypass but block full allow-all."""
+
+
+@dataclass
+class ManagedSettingsPermissions:
+    """Permissions-only managed policy injected via :class:`ManagedSettings`.
+
+    Rule strings use the same vocabulary the runtime accepts for fetched
+    managed policy (e.g. ``"Read(**)"``, ``"Shell(git push *)"``); malformed
+    rules are rejected by the runtime at session creation.
+    """
+
+    disable_bypass_permissions_mode: str | None = None
+    """Restricts bypass-permissions mode for the session. See
+    :class:`DisableBypassPermissionsModes` for well-known values. Unknown values
+    are forwarded so newer runtime policies fail closed. Sent on the wire as
+    ``disableBypassPermissionsMode``."""
+    deny: list[str] | None = None
+    """Operations that must always be denied. Unioned across managed layers."""
+    ask: list[str] | None = None
+    """Operations that must prompt for approval. Unioned across managed layers."""
+    allow: list[str] | None = None
+    """Operations permitted without prompting. Every declared ``allow`` list
+    across managed layers must admit an operation for it to be allowed."""
+
+
+@dataclass
+class ManagedSettings:
+    """Host-injected enterprise managed settings for a session.
+
+    Unlike ``enable_managed_settings`` — which asks the runtime to *self-fetch*
+    account/org and device policy — this supplies the managed policy directly.
+    The runtime validates it with the same managed-permission parser it uses
+    for fetched policy and composes it restrictively with any self-fetched
+    (server) and device-managed (MDM) layers.
+
+    The first supported contract is permissions-only; unknown sibling keys are
+    rejected by the runtime. Serialized on the wire as ``managedSettings``.
+    """
+
+    permissions: ManagedSettingsPermissions | None = None
+    """Managed permission policy for the session."""
+
+
+def _managed_settings_to_dict(settings: ManagedSettings) -> dict[str, Any]:
+    wire: dict[str, Any] = {}
+    permissions = settings.permissions
+    if permissions is not None:
+        perms: dict[str, Any] = {}
+        if permissions.disable_bypass_permissions_mode is not None:
+            perms["disableBypassPermissionsMode"] = permissions.disable_bypass_permissions_mode
+        if permissions.deny is not None:
+            perms["deny"] = list(permissions.deny)
+        if permissions.ask is not None:
+            perms["ask"] = list(permissions.ask)
+        if permissions.allow is not None:
+            perms["allow"] = list(permissions.allow)
+        wire["permissions"] = perms
+    return wire
+
+
 # Implicit provider name for the singular, whole-session ``provider`` config.
 # Named providers are keyed by their own ``name``.
 _DEFAULT_BEARER_TOKEN_PROVIDER_NAME = "default"
@@ -565,6 +680,43 @@ async def event(self, params: GitHubTelemetryNotification) -> None:
             logger.warning("Error handling gitHubTelemetry.event notification", exc_info=True)
 
 
+@dataclass
+class _GitHubTokenProviderRegistration:
+    provider: GitHubTokenProvider
+    session_id: str | None = None
+    committed: bool = False
+
+
+class _GitHubTokenProviderAdapter:
+    """Routes global GitHub token requests to opaque session registrations."""
+
+    def __init__(self, client: CopilotClient) -> None:
+        self._client = client
+
+    async def get_token(self, params: GitHubTokenAcquireRequest) -> GitHubTokenAcquireResult:
+        with self._client._github_token_providers_lock:
+            registration = self._client._github_token_providers.get(params.registration_id)
+        if registration is None:
+            raise JsonRpcError(
+                -32603,
+                "No GitHub token provider registered for registration ID "
+                f"{params.registration_id!r}",
+            )
+
+        result = registration.provider(
+            GitHubTokenProviderArgs(
+                host=params.host,
+                session_id=params.session_id or registration.session_id,
+                reason=params.reason,
+            )
+        )
+        if inspect.isawaitable(result):
+            result = await result
+        # The generated global-handler wrapper forwards callback results directly,
+        # so the public tagged dictionary is already in the expected wire shape.
+        return cast(GitHubTokenAcquireResult, result)
+
+
 class _HooksAdapter:
     """Adapts session-scoped hook dispatch to the generated ``HooksHandler`` protocol.
 
@@ -598,6 +750,7 @@ class _CopilotClientOptions:
     env: dict[str, str] | None = None
     github_token: str | None = None
     base_directory: str | None = None
+    builtin_plugin_directories: tuple[str, ...] = ()
     use_logged_in_user: bool | None = None
     telemetry: TelemetryConfig | None = None
     session_fs: SessionFsConfig | None = None
@@ -1370,6 +1523,7 @@ def __init__(
         env: dict[str, str] | None = None,
         github_token: str | None = None,
         base_directory: str | None = None,
+        builtin_plugin_directories: Sequence[str] | None = None,
         use_logged_in_user: bool | None = None,
         telemetry: TelemetryConfig | None = None,
         session_fs: SessionFsConfig | None = None,
@@ -1405,6 +1559,9 @@ def __init__(
                 config, etc.). Sets the ``COPILOT_HOME`` environment variable on
                 the spawned runtime. When ``None``, the runtime defaults to
                 ``~/.copilot``.
+            builtin_plugin_directories: Absolute paths to trusted plugin
+                directories bundled by the host. When non-empty, the complete
+                set is registered during startup before sessions can be created.
             use_logged_in_user: Use the logged-in user for authentication.
                 ``None`` (default) resolves to ``True`` unless ``github_token``
                 is set.
@@ -1452,6 +1609,7 @@ def __init__(
             env=env,
             github_token=github_token,
             base_directory=base_directory,
+            builtin_plugin_directories=tuple(builtin_plugin_directories or ()),
             use_logged_in_user=use_logged_in_user,
             telemetry=telemetry,
             session_fs=session_fs,
@@ -1468,6 +1626,11 @@ def __init__(
             else _resolve_default_connection(os.environ)
         )
         _validate_environment_options(options, connection)
+        for path in options.builtin_plugin_directories:
+            if not os.path.isabs(path):
+                raise ValueError(
+                    f"builtin_plugin_directories must contain only absolute paths: {path}"
+                )
         _require_storage_for_empty_mode(
             mode=options.mode,
             base_directory=options.base_directory,
@@ -1543,6 +1706,9 @@ def __init__(
         self._state: _ConnectionState = "disconnected"
         self._sessions: dict[str, CopilotSession] = {}
         self._sessions_lock = threading.Lock()
+        self._github_token_providers: dict[str, _GitHubTokenProviderRegistration] = {}
+        self._github_token_providers_lock = threading.Lock()
+        self._github_token_provider_adapter = _GitHubTokenProviderAdapter(self)
         self._models_cache: list[ModelInfo] | None = None
         self._models_cache_lock = asyncio.Lock()
         self._lifecycle_handlers: list[SessionLifecycleHandler] = []
@@ -1750,6 +1916,17 @@ async def start(self) -> None:
                 start_time,
             )
 
+            if self._options.builtin_plugin_directories:
+                assert self._client is not None
+                try:
+                    await self._client.request(
+                        "plugins.builtin.set",
+                        {"paths": list(self._options.builtin_plugin_directories)},
+                    )
+                except Exception:
+                    await self.force_stop()
+                    raise
+
             if self._session_fs_config:
                 session_fs_start = time.perf_counter()
                 await self._set_session_fs_provider()
@@ -1846,6 +2023,8 @@ async def stop(self) -> None:
                 errors.append(
                     StopError(message=f"Failed to disconnect session {session.session_id}: {e}")
                 )
+        with self._github_token_providers_lock:
+            self._github_token_providers.clear()
 
         if (
             self._rpc is not None
@@ -1962,6 +2141,8 @@ async def force_stop(self) -> None:
         # Clear sessions immediately without trying to destroy them
         with self._sessions_lock:
             self._sessions.clear()
+        with self._github_token_providers_lock:
+            self._github_token_providers.clear()
 
         # Close the transport first to signal the server immediately.
         # For external servers (TCP), this closes the socket.
@@ -2037,6 +2218,7 @@ async def create_session(
         models: list[ProviderModelConfig] | None = None,
         enable_session_telemetry: bool | None = None,
         enable_citations: bool | None = None,
+        enable_file_change_tracking: bool | None = None,
         excluded_builtin_agents: list[str] | None = None,
         session_limits: SessionLimitsConfig | None = None,
         skip_custom_instructions: bool | None = None,
@@ -2061,10 +2243,12 @@ async def create_session(
         enable_host_git_operations: bool | None = None,
         enable_session_store: bool | None = None,
         enable_skills: bool | None = None,
+        included_builtin_skills: list[str] | None = None,
         skill_directories: list[str] | None = None,
         plugin_directories: list[str] | None = None,
         instruction_directories: list[str] | None = None,
         disabled_skills: list[str] | None = None,
+        disabled_mcp_servers: list[str] | None = None,
         infinite_sessions: InfiniteSessionConfig | None = None,
         large_output: LargeToolOutputConfig | None = None,
         memory: MemoryConfiguration | None = None,
@@ -2077,6 +2261,7 @@ async def create_session(
         on_auto_mode_switch_request: AutoModeSwitchHandler | None = None,
         create_session_fs_handler: CreateSessionFsHandler | None = None,
         github_token: str | None = None,
+        github_token_provider: GitHubTokenProvider | None = None,
         remote_session: RemoteSessionMode | None = None,
         cloud: CloudSessionOptions | None = None,
         canvases: list[CanvasDeclaration] | None = None,
@@ -2089,6 +2274,7 @@ async def create_session(
         exp_assignments: CopilotExpAssignmentResponse | None = None,
         enable_managed_settings: bool | None = None,
         github_mcp_tool_config: GitHubMcpToolConfig | None = None,
+        managed_settings: ManagedSettings | None = None,
     ) -> CopilotSession:
         """
         Create a new conversation session with the Copilot CLI.
@@ -2151,6 +2337,8 @@ async def create_session(
                 OpenTelemetry configuration.
             enable_citations: **Experimental.** Enables native model citations for
                 supported providers.
+            enable_file_change_tracking: Opts in to capturing file changes from the
+                first turn for session rewind and cumulative session diff.
             excluded_builtin_agents: Built-in agent names to exclude from the
                 session. Excluded built-in agents are hidden from discovery and
                 cannot be selected or invoked unless a custom agent with the same
@@ -2193,6 +2381,10 @@ async def create_session(
             instruction_directories: Additional directories to search for custom
                 instruction files.
             disabled_skills: Skills to disable.
+            disabled_mcp_servers: Exact MCP server names to disable only for this
+                session. Disabled servers are not started or authenticated on
+                create or cold resume; a resident resume cannot stop servers
+                already running. This does not change global MCP settings.
             infinite_sessions: Infinite session configuration.
             memory: Session memory configuration.
             cloud: Creates a remote session in the cloud instead of a local
@@ -2236,6 +2428,20 @@ async def create_session(
                 expected to reject session creation (fail-closed). When unset,
                 behaves exactly as before. Sent on the wire as
                 ``enableManagedSettings``.
+            managed_settings: Host-injected enterprise managed settings for the
+                session. Supplies managed policy directly instead of
+                self-fetching; the runtime validates it and composes it
+                restrictively with any self-fetched (server) and device-managed
+                layers. Startup-only and not persisted: re-supply on
+                :meth:`resume_session` (omitting it clears the injected layer).
+                May be combined with ``enable_managed_settings``. Requires a
+                runtime whose RPC schema includes ``managedSettings``. Sent on
+                the wire as ``managedSettings``.
+            github_token_provider: Callback that acquires a short-lived GitHub
+                credential for this session. Mutually exclusive with
+                ``github_token``. It receives the effective host, session ID
+                when assigned, and acquisition reason; the registration ID is
+                kept internal.
 
         Returns:
             A :class:`CopilotSession` instance for the new session.
@@ -2257,6 +2463,8 @@ async def create_session(
         """
         if on_permission_request is not None and not callable(on_permission_request):
             raise ValueError("on_permission_request must be callable when provided.")
+        if github_token is not None and github_token_provider is not None:
+            raise ValueError("github_token and github_token_provider are mutually exclusive")
         if not self._client:
             await self.start()
 
@@ -2277,6 +2485,8 @@ async def create_session(
                     definition["defer"] = tool.defer
                 if tool.metadata is not None:
                     definition["metadata"] = tool.metadata
+                if tool.is_terminal:
+                    definition["isTerminal"] = True
                 tool_defs.append(definition)
 
         # Empty-mode validation and normalization
@@ -2355,7 +2565,7 @@ async def create_session(
         # Serialize commands (name + description only) into payload
         if commands:
             payload["commands"] = [
-                {"name": cmd.name, "description": cmd.description} for cmd in commands
+                {"name": cmd.name, "description": cmd.description or ""} for cmd in commands
             ]
 
         # Enable hooks callback if any hook handler provided
@@ -2382,6 +2592,10 @@ async def create_session(
         if enable_managed_settings is not None:
             payload["enableManagedSettings"] = enable_managed_settings
 
+        # Host-injected managed settings (permissions-only contract)
+        if managed_settings is not None:
+            payload["managedSettings"] = _managed_settings_to_dict(managed_settings)
+
         # Add working directory if provided
         if working_directory:
             payload["workingDirectory"] = working_directory
@@ -2422,6 +2636,8 @@ async def create_session(
             payload["enableSessionTelemetry"] = enable_session_telemetry
         if enable_citations is not None:
             payload["enableCitations"] = enable_citations
+        if enable_file_change_tracking is not None:
+            payload["enableFileChangeTracking"] = enable_file_change_tracking
         if excluded_builtin_agents is not None:
             payload["excludedBuiltinAgents"] = excluded_builtin_agents
         if session_limits is not None:
@@ -2496,6 +2712,8 @@ async def create_session(
         # Add disabled skills configuration if provided
         if disabled_skills:
             payload["disabledSkills"] = disabled_skills
+        if disabled_mcp_servers is not None:
+            payload["disabledMcpServers"] = disabled_mcp_servers
 
         # Add infinite sessions configuration if provided
         if infinite_sessions:
@@ -2548,6 +2766,11 @@ async def create_session(
         )
         if local_session_id is not None:
             payload["sessionId"] = local_session_id
+        github_token_provider_registration_id = self._register_github_token_provider(
+            github_token_provider, local_session_id
+        )
+        if github_token_provider_registration_id is not None:
+            payload["gitHubTokenProviderRegistrationId"] = github_token_provider_registration_id
 
         # Propagate W3C Trace Context to CLI if OpenTelemetry is active
         trace_ctx = get_trace_context()
@@ -2566,7 +2789,15 @@ def _initialize_session(sid: str) -> CopilotSession:
                 sid,
                 self._client,
                 workspace_path=None,
-                managed_settings_enabled=enable_managed_settings is True,
+                managed_settings_enabled=enable_managed_settings is True
+                or managed_settings is not None,
+                on_disconnect=(
+                    None
+                    if github_token_provider_registration_id is None
+                    else lambda: self._unregister_github_token_provider(
+                        github_token_provider_registration_id
+                    )
+                ),
             )
             if self._session_fs_config:
                 if create_session_fs_handler is None:
@@ -2628,8 +2859,12 @@ def _initialize_session(sid: str) -> CopilotSession:
         # processing (e.g. sessionFs.writeFile for workspace metadata) can be
         # routed to the correct handlers.
         if local_session_id is not None:
-            session = _initialize_session(local_session_id)
-            registered_session_id = local_session_id
+            try:
+                session = _initialize_session(local_session_id)
+                registered_session_id = local_session_id
+            except BaseException:
+                self._unregister_github_token_provider(github_token_provider_registration_id)
+                raise
 
         try:
             rpc_start = time.perf_counter()
@@ -2669,6 +2904,9 @@ def _register_inline(raw_response: Any) -> None:
                     f"session.create returned sessionId {response.get('sessionId')} "
                     f"but the caller requested {local_session_id}"
                 )
+            self._assign_github_token_provider(
+                github_token_provider_registration_id, session.session_id
+            )
             if on_mcp_auth_request is not None:
                 await self._client.request(
                     "session.eventLog.registerInterest",
@@ -2681,6 +2919,7 @@ def _register_inline(raw_response: Any) -> None:
             if registered_session_id is not None:
                 with self._sessions_lock:
                     self._sessions.pop(registered_session_id, None)
+            self._unregister_github_token_provider(github_token_provider_registration_id)
             if not isinstance(exc, asyncio.CancelledError):
                 log_timing(
                     logger,
@@ -2699,6 +2938,10 @@ def _register_inline(raw_response: Any) -> None:
             custom_agents_local_only,
             coauthor_enabled,
             manage_schedule_enabled,
+            included_builtin_skills,
+        )
+        self._commit_github_token_provider(
+            session.session_id, github_token_provider_registration_id
         )
 
         log_timing(
@@ -2736,6 +2979,7 @@ async def resume_session(
         models: list[ProviderModelConfig] | None = None,
         enable_session_telemetry: bool | None = None,
         enable_citations: bool | None = None,
+        enable_file_change_tracking: bool | None = None,
         excluded_builtin_agents: list[str] | None = None,
         session_limits: SessionLimitsConfig | None = None,
         skip_custom_instructions: bool | None = None,
@@ -2760,10 +3004,12 @@ async def resume_session(
         enable_host_git_operations: bool | None = None,
         enable_session_store: bool | None = None,
         enable_skills: bool | None = None,
+        included_builtin_skills: list[str] | None = None,
         skill_directories: list[str] | None = None,
         plugin_directories: list[str] | None = None,
         instruction_directories: list[str] | None = None,
         disabled_skills: list[str] | None = None,
+        disabled_mcp_servers: list[str] | None = None,
         infinite_sessions: InfiniteSessionConfig | None = None,
         large_output: LargeToolOutputConfig | None = None,
         memory: MemoryConfiguration | None = None,
@@ -2776,6 +3022,7 @@ async def resume_session(
         on_auto_mode_switch_request: AutoModeSwitchHandler | None = None,
         create_session_fs_handler: CreateSessionFsHandler | None = None,
         github_token: str | None = None,
+        github_token_provider: GitHubTokenProvider | None = None,
         remote_session: RemoteSessionMode | None = None,
         continue_pending_work: bool | None = None,
         canvases: list[CanvasDeclaration] | None = None,
@@ -2789,6 +3036,7 @@ async def resume_session(
         exp_assignments: CopilotExpAssignmentResponse | None = None,
         enable_managed_settings: bool | None = None,
         github_mcp_tool_config: GitHubMcpToolConfig | None = None,
+        managed_settings: ManagedSettings | None = None,
     ) -> CopilotSession:
         """
         Resume an existing conversation session by its ID.
@@ -2851,6 +3099,9 @@ async def resume_session(
                 OpenTelemetry configuration.
             enable_citations: **Experimental.** Enables native model citations for
                 supported providers.
+            enable_file_change_tracking: Opts in to capturing file changes for
+                session rewind and cumulative session diff when the resumed session
+                has a valid baseline. Earlier untracked changes cannot be reconstructed.
             excluded_builtin_agents: Built-in agent names to exclude from the
                 resumed session. Excluded built-in agents are hidden from discovery
                 and cannot be selected or invoked unless a custom agent with the
@@ -2893,6 +3144,10 @@ async def resume_session(
             instruction_directories: Additional directories to search for custom
                 instruction files.
             disabled_skills: Skills to disable.
+            disabled_mcp_servers: Exact MCP server names to disable only for this
+                session. Disabled servers are not started or authenticated on
+                create or cold resume; a resident resume cannot stop servers
+                already running. This does not change global MCP settings.
             infinite_sessions: Infinite session configuration.
             memory: Session memory configuration.
             on_event: Callback for session events.
@@ -2937,6 +3192,15 @@ async def resume_session(
                 expected to reject session creation (fail-closed). When unset,
                 behaves exactly as before. Sent on the wire as
                 ``enableManagedSettings``.
+            managed_settings: Host-injected enterprise managed settings for the
+                session. Must be re-supplied on resume; it replaces the prior
+                injected layer, and omitting it clears that layer so warm and
+                cold resume behave identically. See :meth:`create_session`. Sent
+                on the wire as ``managedSettings``.
+            github_token_provider: Callback that acquires a short-lived GitHub
+                credential for this resumed session. Mutually exclusive with
+                ``github_token``. The new registration replaces the prior
+                provider only after resume succeeds.
 
         Returns:
             A :class:`CopilotSession` instance for the resumed session.
@@ -2960,6 +3224,8 @@ async def resume_session(
         """
         if on_permission_request is not None and not callable(on_permission_request):
             raise ValueError("on_permission_request must be callable when provided.")
+        if github_token is not None and github_token_provider is not None:
+            raise ValueError("github_token and github_token_provider are mutually exclusive")
         if not self._client:
             await self.start()
 
@@ -2980,6 +3246,8 @@ async def resume_session(
                     definition["defer"] = tool.defer
                 if tool.metadata is not None:
                     definition["metadata"] = tool.metadata
+                if tool.is_terminal:
+                    definition["isTerminal"] = True
                 tool_defs.append(definition)
 
         # Empty-mode validation and normalization
@@ -3045,6 +3313,8 @@ async def resume_session(
             payload["enableSessionTelemetry"] = enable_session_telemetry
         if enable_citations is not None:
             payload["enableCitations"] = enable_citations
+        if enable_file_change_tracking is not None:
+            payload["enableFileChangeTracking"] = enable_file_change_tracking
         if excluded_builtin_agents is not None:
             payload["excludedBuiltinAgents"] = excluded_builtin_agents
         if session_limits is not None:
@@ -3084,7 +3354,7 @@ async def resume_session(
         # Serialize commands (name + description only) into payload
         if commands:
             payload["commands"] = [
-                {"name": cmd.name, "description": cmd.description} for cmd in commands
+                {"name": cmd.name, "description": cmd.description or ""} for cmd in commands
             ]
 
         if hooks and any(hooks.values()):
@@ -3106,6 +3376,10 @@ async def resume_session(
         if enable_managed_settings is not None:
             payload["enableManagedSettings"] = enable_managed_settings
 
+        # Host-injected managed settings (permissions-only contract)
+        if managed_settings is not None:
+            payload["managedSettings"] = _managed_settings_to_dict(managed_settings)
+
         if working_directory:
             payload["workingDirectory"] = working_directory
         if additional_directories:
@@ -3165,6 +3439,8 @@ async def resume_session(
             payload["instructionDirectories"] = instruction_directories
         if disabled_skills:
             payload["disabledSkills"] = disabled_skills
+        if disabled_mcp_servers is not None:
+            payload["disabledMcpServers"] = disabled_mcp_servers
 
         if infinite_sessions:
             wire_config: dict[str, Any] = {}
@@ -3216,7 +3492,8 @@ async def resume_session(
             session_id,
             self._client,
             workspace_path=None,
-            managed_settings_enabled=enable_managed_settings is True,
+            managed_settings_enabled=enable_managed_settings is True
+            or managed_settings is not None,
         )
         if self._session_fs_config:
             if create_session_fs_handler is None:
@@ -3270,6 +3547,16 @@ async def resume_session(
             commands_count=len(commands or []),
             has_hooks=hooks is not None,
         )
+        github_token_provider_registration_id = self._register_github_token_provider(
+            github_token_provider, session_id
+        )
+        if github_token_provider_registration_id is not None:
+            payload["gitHubTokenProviderRegistrationId"] = github_token_provider_registration_id
+            session._set_disconnect_callback(
+                lambda: self._unregister_github_token_provider(
+                    github_token_provider_registration_id
+                )
+            )
 
         try:
             rpc_start = time.perf_counter()
@@ -3297,6 +3584,7 @@ async def resume_session(
         except BaseException as exc:
             with self._sessions_lock:
                 self._sessions.pop(session_id, None)
+            self._unregister_github_token_provider(github_token_provider_registration_id)
             if not isinstance(exc, asyncio.CancelledError):
                 log_timing(
                     logger,
@@ -3315,7 +3603,9 @@ async def resume_session(
             custom_agents_local_only,
             coauthor_enabled,
             manage_schedule_enabled,
+            included_builtin_skills,
         )
+        self._commit_github_token_provider(session_id, github_token_provider_registration_id)
 
         log_timing(
             logger,
@@ -3535,8 +3825,9 @@ async def delete_session(self, session_id: str) -> None:
 
         # Remove from local sessions map if present
         with self._sessions_lock:
-            if session_id in self._sessions:
-                del self._sessions[session_id]
+            session = self._sessions.pop(session_id, None)
+        if session is not None:
+            session._run_disconnect_callback()
 
     async def get_last_session_id(self) -> str | None:
         """
@@ -4205,7 +4496,7 @@ async def _connect_via_stdio(self) -> None:
 
         # Create JSON-RPC client with the process
         self._client = JsonRpcClient(self._process)
-        self._client.on_close = lambda: setattr(self, "_state", "disconnected")
+        self._client.on_close = self._handle_connection_close
         self._rpc = ServerRpc(self._client)
 
         # Set up notification handler for session events
@@ -4324,9 +4615,9 @@ def kill(self):
             def wait(self, timeout=None):
                 pass
 
-        self._process = SocketWrapper(sock_file, sock)  # type: ignore
+        self._process = SocketWrapper(sock_file, sock)
         self._client = JsonRpcClient(self._process)
-        self._client.on_close = lambda: setattr(self, "_state", "disconnected")
+        self._client.on_close = self._handle_connection_close
         self._rpc = ServerRpc(self._client)
 
         # Set up notification handler for session events
@@ -4370,6 +4661,7 @@ async def _apply_post_create_options_patch(
         custom_agents_local_only: bool | None,
         coauthor_enabled: bool | None,
         manage_schedule_enabled: bool | None,
+        included_builtin_skills: list[str] | None = None,
     ) -> None:
         """Apply empty-mode safe defaults (or caller-supplied overrides in
         copilot-cli mode) via ``session.options.update`` after create/resume.
@@ -4385,6 +4677,7 @@ async def _apply_post_create_options_patch(
             custom_agents_local_only,
             coauthor_enabled,
             manage_schedule_enabled,
+            included_builtin_skills,
         )
         if patch is None:
             return
@@ -4403,6 +4696,9 @@ async def _apply_post_create_options_patch(
                 SessionInstalledPlugin.from_dict(p) if isinstance(p, dict) else p
                 for p in patch["installedPlugins"]
             ]
+        if "includedBuiltinSkills" in patch:
+            skills = patch["includedBuiltinSkills"]
+            params.included_builtin_skills = list(skills) if skills is not None else None
 
         try:
             await session.rpc.options.update(params)
@@ -4447,9 +4743,56 @@ def _register_client_global_handlers(self) -> None:
                 hooks=_HooksAdapter(self._get_session),
                 llm_inference=llm_inference_adapter,
                 git_hub_telemetry=github_telemetry_adapter,
+                git_hub_token=self._github_token_provider_adapter,
             ),
         )
 
+    def _register_github_token_provider(
+        self, provider: GitHubTokenProvider | None, session_id: str | None
+    ) -> str | None:
+        if provider is None:
+            return None
+        registration_id = str(uuid.uuid4())
+        with self._github_token_providers_lock:
+            self._github_token_providers[registration_id] = _GitHubTokenProviderRegistration(
+                provider, session_id
+            )
+        return registration_id
+
+    def _handle_connection_close(self) -> None:
+        self._state = "disconnected"
+        with self._github_token_providers_lock:
+            self._github_token_providers.clear()
+
+    def _assign_github_token_provider(self, registration_id: str | None, session_id: str) -> None:
+        if registration_id is None:
+            return
+        with self._github_token_providers_lock:
+            registration = self._github_token_providers.get(registration_id)
+            if registration is not None:
+                registration.session_id = session_id
+
+    def _unregister_github_token_provider(self, registration_id: str | None) -> None:
+        if registration_id is None:
+            return
+        with self._github_token_providers_lock:
+            self._github_token_providers.pop(registration_id, None)
+
+    def _commit_github_token_provider(self, session_id: str, registration_id: str | None) -> None:
+        with self._github_token_providers_lock:
+            stale = [
+                candidate_id
+                for candidate_id, registration in self._github_token_providers.items()
+                if registration.session_id == session_id and registration.committed
+            ]
+            for candidate_id in stale:
+                self._github_token_providers.pop(candidate_id, None)
+            if registration_id is not None:
+                registration = self._github_token_providers.get(registration_id)
+                if registration is not None:
+                    registration.session_id = session_id
+                    registration.committed = True
+
     def _get_session(self, session_id: str) -> CopilotSession | None:
         with self._sessions_lock:
             return self._sessions.get(session_id)
diff --git a/python/copilot/copilot_request_handler.py b/python/copilot/copilot_request_handler.py
index e6465b7bbc..893309ca76 100644
--- a/python/copilot/copilot_request_handler.py
+++ b/python/copilot/copilot_request_handler.py
@@ -458,8 +458,12 @@ async def write_response(self, data: str | bytes) -> None:
             raise RuntimeError("Copilot request response write() called before start().")
         if self.finished:
             raise RuntimeError("Copilot request response write() called after end()/error().")
-        is_binary = isinstance(data, (bytes, bytearray))
-        payload = base64.b64encode(bytes(data)).decode("ascii") if is_binary else str(data)
+        if isinstance(data, bytes):
+            payload = base64.b64encode(data).decode("ascii")
+            is_binary = True
+        else:
+            payload = data
+            is_binary = False
         await self._require_rpc().http_response_chunk(
             LlmInferenceHTTPResponseChunkRequest(
                 data=payload,
diff --git a/python/copilot/generated/rpc.py b/python/copilot/generated/rpc.py
index 41e27fc12d..242e4041ed 100644
--- a/python/copilot/generated/rpc.py
+++ b/python/copilot/generated/rpc.py
@@ -6,7 +6,7 @@
 
 from typing import ClassVar, TYPE_CHECKING
 
-from .session_events import AbortReason, Attachment, ContextTier, EmbeddedBlobResourceContents, EmbeddedTextResourceContents, McpServerSource, McpServerStatus, PermissionPromptRequest, PermissionRule, ReasoningSummary, SessionEvent, SessionLimitsConfig, SessionMode, ShutdownType, SkillSource, UserToolSessionApproval, Verbosity
+from .session_events import AbortReason, Attachment, ContextTier, EmbeddedBlobResourceContents, EmbeddedTextResourceContents, McpOauthHttpResponse, McpOauthWWWAuthenticateParams, McpServerSource, McpServerStatus, ModelChangeSource, PermissionMode, PermissionPromptRequest, PermissionRule, ReasoningSummary, SessionEvent, SessionLimitsConfig, SessionMode, ShutdownType, SkillSource, TaskCompletionOutcome, UserToolSessionApproval, Verbosity
 
 if TYPE_CHECKING:
     from .._jsonrpc import JsonRpcClient
@@ -69,8 +69,9 @@ def to_enum(c: type[EnumT], x: Any) -> EnumT:
     return x.value
 
 def from_int(x: Any) -> int:
-    assert isinstance(x, int) and not isinstance(x, bool)
-    return x
+    assert isinstance(x, (int, float)) and not isinstance(x, bool)
+    assert not isinstance(x, float) or x.is_integer()
+    return int(x)
 
 def from_datetime(x: Any) -> datetime:
     return dateutil.parser.parse(x)
@@ -126,10 +127,19 @@ class CopilotUserResponseEndpoints:
     """Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough."""
 
     api: str | None = None
+    """Copilot API endpoint URL."""
+
     exp: str | None = None
+    """Experimental-service endpoint URL."""
+
     origin_tracker: str | None = None
+    """Origin-tracker endpoint URL."""
+
     proxy: str | None = None
+    """Copilot proxy endpoint URL."""
+
     telemetry: str | None = None
+    """Copilot telemetry endpoint URL."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'CopilotUserResponseEndpoints':
@@ -261,19 +271,22 @@ class AuthInfoType(Enum):
     GH_CLI = "gh-cli"
     HMAC = "hmac"
     TOKEN = "token"
+    TOKEN_PROVIDER = "token-provider"
     USER = "user"
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class AccountAllUsers:
-    """Authenticated account entry returned by `account.getAllUsers`, with auth info and an
-    optional associated token.
+    """Authenticated account entry returned by `account.getAllUsers`.
 
     List of all authenticated users
     """
     auth_info: AuthInfo
     """Authentication information for this user"""
 
+    selection_id: str | None = None
+    """Opaque identifier accepted by account and model selection APIs"""
+
     token: str | None = None
     """Associated token, if available"""
 
@@ -281,12 +294,15 @@ class AccountAllUsers:
     def from_dict(obj: Any) -> 'AccountAllUsers':
         assert isinstance(obj, dict)
         auth_info = _load_AuthInfo(obj.get("authInfo"))
+        selection_id = from_union([from_str, from_none], obj.get("selectionId"))
         token = from_union([from_str, from_none], obj.get("token"))
-        return AccountAllUsers(auth_info, token)
+        return AccountAllUsers(auth_info, selection_id, token)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["authInfo"] = (self.auth_info).to_dict()
+        if self.selection_id is not None:
+            result["selectionId"] = from_union([from_str, from_none], self.selection_id)
         if self.token is not None:
             result["token"] = from_union([from_str, from_none], self.token)
         return result
@@ -321,20 +337,27 @@ def to_dict(self) -> dict:
 @dataclass
 class AccountGetQuotaRequest:
     git_hub_token: str | None = None
-    """GitHub token for per-user quota lookup. When provided, resolves this token to determine
-    the user's quota instead of using the global auth.
+    """GitHub token accepted for compatibility with existing SDK clients. When provided,
+    resolves this token instead of using the current account.
+    """
+    selection_id: str | None = None
+    """Opaque account identifier returned by `account.getAllUsers`. When omitted, the current
+    account is used.
     """
 
     @staticmethod
     def from_dict(obj: Any) -> 'AccountGetQuotaRequest':
         assert isinstance(obj, dict)
         git_hub_token = from_union([from_str, from_none], obj.get("gitHubToken"))
-        return AccountGetQuotaRequest(git_hub_token)
+        selection_id = from_union([from_str, from_none], obj.get("selectionId"))
+        return AccountGetQuotaRequest(git_hub_token, selection_id)
 
     def to_dict(self) -> dict:
         result: dict = {}
         if self.git_hub_token is not None:
             result["gitHubToken"] = from_union([from_str, from_none], self.git_hub_token)
+        if self.selection_id is not None:
+            result["selectionId"] = from_union([from_str, from_none], self.selection_id)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -396,30 +419,34 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class AccountLoginRequest:
-    """Credentials to store after successful authentication"""
-
+    """Credentials to validate and store. Omit login to resolve the authenticated user from the
+    token.
+    """
     host: str
     """GitHub host URL"""
 
-    login: str
-    """User login/username"""
-
     token: str
     """GitHub authentication token"""
 
+    login: str | None = None
+    """User login/username. When omitted, the runtime validates the token and resolves the login
+    from GitHub.
+    """
+
     @staticmethod
     def from_dict(obj: Any) -> 'AccountLoginRequest':
         assert isinstance(obj, dict)
         host = from_str(obj.get("host"))
-        login = from_str(obj.get("login"))
         token = from_str(obj.get("token"))
-        return AccountLoginRequest(host, login, token)
+        login = from_union([from_str, from_none], obj.get("login"))
+        return AccountLoginRequest(host, token, login)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["host"] = from_str(self.host)
-        result["login"] = from_str(self.login)
         result["token"] = from_str(self.token)
+        if self.login is not None:
+            result["login"] = from_union([from_str, from_none], self.login)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -449,18 +476,25 @@ def to_dict(self) -> dict:
 class AccountLogoutRequest:
     """User to log out"""
 
-    auth_info: AuthInfo
+    auth_info: AuthInfo | None = None
     """Authentication information for the user to log out"""
 
+    selection_id: str | None = None
+    """Opaque account identifier returned by `account.getAllUsers`"""
+
     @staticmethod
     def from_dict(obj: Any) -> 'AccountLogoutRequest':
         assert isinstance(obj, dict)
-        auth_info = _load_AuthInfo(obj.get("authInfo"))
-        return AccountLogoutRequest(auth_info)
+        auth_info = from_union([_load_AuthInfo, from_none], obj.get("authInfo"))
+        selection_id = from_union([from_str, from_none], obj.get("selectionId"))
+        return AccountLogoutRequest(auth_info, selection_id)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["authInfo"] = (self.auth_info).to_dict()
+        if self.auth_info is not None:
+            result["authInfo"] = from_union([lambda x: (x).to_dict(), from_none], self.auth_info)
+        if self.selection_id is not None:
+            result["selectionId"] = from_union([from_str, from_none], self.selection_id)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -679,23 +713,101 @@ def to_dict(self) -> dict:
             result["projectPaths"] = from_union([lambda x: from_list(from_str, x), from_none], self.project_paths)
         return result
 
+class APIKeyAuthInfoType(Enum):
+    API_KEY = "api-key"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
-class PermissionsAllowAllMode(Enum):
-    """Authoritative allow-all mode after the mutation
+@dataclass
+class AuthValidationError:
+    """Validation error from an authentication attempt.
 
-    Current or requested allow-all mode.
+    Validation errors from the most recent authentication attempt.
+    """
+    message: str
+    """Authentication validation error message"""
 
-    Current allow-all mode
+    github_message: str | None = None
+    """Optional message returned by GitHub"""
 
-    Allow-all mode to apply. `on` enables full allow-all; `auto` enables advisory LLM
-    auto-approval; `off` disables both.
+    @staticmethod
+    def from_dict(obj: Any) -> 'AuthValidationError':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        github_message = from_union([from_str, from_none], obj.get("githubMessage"))
+        return AuthValidationError(message, github_message)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["message"] = from_str(self.message)
+        if self.github_message is not None:
+            result["githubMessage"] = from_union([from_str, from_none], self.github_message)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class BuiltInModelCatalogEntry:
+    """A well-known model in the runtime's built-in catalog."""
+
+    id: str
+    """Well-known runtime model ID suitable for provider or provider-model metadata. This is not
+    necessarily the provider-facing deployment or model name and does not indicate CAPI
+    entitlement or provider availability.
     """
-    AUTO = "auto"
-    OFF = "off"
-    ON = "on"
 
-class APIKeyAuthInfoType(Enum):
-    API_KEY = "api-key"
+    @staticmethod
+    def from_dict(obj: Any) -> 'BuiltInModelCatalogEntry':
+        assert isinstance(obj, dict)
+        id = from_str(obj.get("id"))
+        return BuiltInModelCatalogEntry(id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["id"] = from_str(self.id)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class BuiltinToolFormatType(Enum):
+    """Custom input-format discriminator.
+
+    Custom input-format kind.
+    """
+    GRAMMAR = "grammar"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class BuiltinToolInputSchemaType(Enum):
+    """Root type of the tool input schema.
+
+    Root JSON Schema type for a built-in tool input.
+    """
+    OBJECT = "object"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class BuiltinToolSafeTelemetryFields:
+    """Per-field telemetry safety
+
+    Per-field telemetry-safety policy for a built-in tool.
+    """
+    inputs_names: bool | None = None
+    """Whether tool input names may be included in telemetry without obfuscation."""
+
+    name: bool | None = None
+    """Whether the tool name may be included in telemetry without obfuscation."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'BuiltinToolSafeTelemetryFields':
+        assert isinstance(obj, dict)
+        inputs_names = from_union([from_bool, from_none], obj.get("inputsNames"))
+        name = from_union([from_bool, from_none], obj.get("name"))
+        return BuiltinToolSafeTelemetryFields(inputs_names, name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.inputs_names is not None:
+            result["inputsNames"] = from_union([from_bool, from_none], self.inputs_names)
+        if self.name is not None:
+            result["name"] = from_union([from_bool, from_none], self.name)
+        return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
@@ -886,6 +998,54 @@ def to_dict(self) -> dict:
             result["url"] = from_union([from_str, from_none], self.url)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CanvasProviderRegisterRequest:
+    """Internal canvas provider registration parameters."""
+
+    canvases: list[Any]
+    """Canvas contributions supplied by the provider"""
+
+    connection_id: str
+    """Connection identifier for callback routing"""
+
+    info: Any
+    """Provider metadata supplied by the host"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CanvasProviderRegisterRequest':
+        assert isinstance(obj, dict)
+        canvases = from_list(lambda x: x, obj.get("canvases"))
+        connection_id = from_str(obj.get("connectionId"))
+        info = obj.get("info")
+        return CanvasProviderRegisterRequest(canvases, connection_id, info)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canvases"] = from_list(lambda x: x, self.canvases)
+        result["connectionId"] = from_str(self.connection_id)
+        result["info"] = self.info
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CanvasProviderUnregisterRequest:
+    """Internal canvas provider unregistration parameters."""
+
+    connection_id: str
+    """Connection identifier to unregister"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CanvasProviderUnregisterRequest':
+        assert isinstance(obj, dict)
+        connection_id = from_str(obj.get("connectionId"))
+        return CanvasProviderUnregisterRequest(connection_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["connectionId"] = from_str(self.connection_id)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CapiSessionOptions:
@@ -911,6 +1071,418 @@ def to_dict(self) -> dict:
             result["enableWebSocketResponses"] = from_union([from_bool, from_none], self.enable_web_socket_responses)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CardDigestAlgorithm(Enum):
+    """Canonical digest algorithm for a validated MCP card"""
+
+    SHA256_RFC8785 = "sha256-rfc8785"
+
+class Installability(Enum):
+    NOT_INSTALLABLE_KIND = "not-installable-kind"
+
+class CatalogAISkillCandidateKind(Enum):
+    AI_SKILL = "ai-skill"
+
+class MediaType(Enum):
+    APPLICATION_AI_SKILL = "application/ai-skill"
+
+class CatalogCandidateSourceKind(Enum):
+    """Discriminator for a URL-backed MCP server card
+
+    Discriminator for an embedded MCP server card
+    """
+    EMBEDDED = "embedded"
+    URL = "url"
+
+class CatalogAuthenticationRequiredErrorKind(Enum):
+    AUTHENTICATION_REQUIRED = "authentication-required"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogAuthenticationRequiredReason(Enum):
+    """Why authentication failed. Only an expired credential justifies attempting a silent
+    refresh; an absent or rejected credential requires sign-in.
+
+    Why the catalog authority did not accept the caller's identity
+    """
+    CREDENTIAL_EXPIRED = "credential-expired"
+    CREDENTIAL_REJECTED = "credential-rejected"
+    NO_CREDENTIAL = "no-credential"
+
+class CatalogCandidateInstallability(Enum):
+    """Whether this MCP server can be planned for installation, and if policy prevents it.
+
+    Whether an MCP server candidate can be planned for installation
+    """
+    INSTALLABLE = "installable"
+    NOT_INSTALLABLE_KIND = "not-installable-kind"
+    NOT_INSTALLABLE_POLICY = "not-installable-policy"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogCandidateKind(Enum):
+    """What kind of resource a catalog candidate describes"""
+
+    AI_SKILL = "ai-skill"
+    MCP_SERVER = "mcp-server"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogMediaType(Enum):
+    """JSON MCP media type of the underlying card.
+
+    JSON MCP card media type accepted for install planning
+
+    JSON MCP media type advertised for the referenced card.
+
+    JSON MCP media type the validated card was interpreted as.
+
+    Media type the card is expected to conform to.
+
+    Media type the card was interpreted as, when it declared one this runtime recognises.
+
+    Media type a catalog card is interpreted as
+    """
+    APPLICATION_AI_SKILL = "application/ai-skill"
+    APPLICATION_MCP_SERVER_CARD_JSON = "application/mcp-server-card+json"
+    APPLICATION_MCP_SERVER_JSON = "application/mcp-server+json"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPServerCardEmbeddedKind(Enum):
+    """Discriminator for an embedded MCP server card"""
+
+    EMBEDDED = "embedded"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPServerCardURLKind(Enum):
+    """Discriminator for a URL-backed MCP server card"""
+
+    URL = "url"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogCapability(Enum):
+    """A wire feature a caller can require of the catalog surface, negotiated per request. A
+    grant means the runtime understands the feature's contract, not that the deployment has
+    enabled the operation; typed unavailable results report availability separately.
+    """
+    AI_SKILL_DISCOVERY = "ai-skill-discovery"
+    LEGACY_MCP_SERVER_CARD = "legacy-mcp-server-card"
+    MCP_INSTALL_PLANNING = "mcp-install-planning"
+    MCP_SERVER_CARD = "mcp-server-card"
+    MULTIPLE_TRANSPORT_CHOICE = "multiple-transport-choice"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogClientContract:
+    """The protocol version and capability set a caller requires, supplied on every catalog
+    request so negotiation cannot be skipped by omission.
+
+    Protocol version and capabilities the caller requires.
+    """
+    protocol_version: int
+    """SDK protocol version the caller was generated against. A caller below the runtime's
+    minimum supported version is refused rather than served a partial result.
+    """
+    required_capabilities: list[str]
+    """Wire features the caller requires the runtime to understand. Identifiers are bounded but
+    extensible so a newer caller can negotiate with an older runtime. Requiring an unknown
+    feature yields a typed refusal listing what is understood, never a partial grant. A grant
+    does not promise that a deployment has enabled the operation; typed unavailable results
+    report that separately.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogClientContract':
+        assert isinstance(obj, dict)
+        protocol_version = from_int(obj.get("protocolVersion"))
+        required_capabilities = from_list(from_str, obj.get("requiredCapabilities"))
+        return CatalogClientContract(protocol_version, required_capabilities)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["protocolVersion"] = from_int(self.protocol_version)
+        result["requiredCapabilities"] = from_list(from_str, self.required_capabilities)
+        return result
+
+class CatalogContractViolationErrorKind(Enum):
+    CONTRACT_VIOLATION = "contract-violation"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogContractViolationReason(Enum):
+    """Which rule the response broke.
+
+    Which wire-contract rule an upstream response broke
+    """
+    BOTH_URL_AND_DATA = "both-url-and-data"
+    DUPLICATE_IDENTITY = "duplicate-identity"
+    NEITHER_URL_NOR_DATA = "neither-url-nor-data"
+    UNKNOWN_MEDIA_TYPE = "unknown-media-type"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogHandleType(Enum):
+    """Which kind of handle was presented.
+
+    Which kind of opaque handle was presented
+    """
+    CANDIDATE = "candidate"
+    PLAN = "plan"
+
+class CatalogHandleRejectedErrorKind(Enum):
+    HANDLE_REJECTED = "handle-rejected"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogHandleRejectionReason(Enum):
+    """Why the handle was rejected.
+
+    Why a presented handle was rejected
+    """
+    FOREIGN = "foreign"
+    INVALID = "invalid"
+    REPLAYED = "replayed"
+    STALE = "stale"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogInvalidRequestField(Enum):
+    """Which request field was rejected.
+
+    Which request field was rejected before any work was done
+    """
+    CARD = "card"
+    CONTRACT = "contract"
+    KINDS = "kinds"
+    LIMIT = "limit"
+    QUERY = "query"
+    SCOPE = "scope"
+    SOURCE = "source"
+
+class CatalogInvalidRequestErrorKind(Enum):
+    INVALID_REQUEST = "invalid-request"
+
+class CatalogMalformedCardErrorKind(Enum):
+    MALFORMED_CARD = "malformed-card"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogMalformedCardReason(Enum):
+    """How the card failed validation.
+
+    How a card failed validation
+    """
+    INVALID_JSON = "invalid-json"
+    MISSING_REQUIRED_FIELD = "missing-required-field"
+    SCHEMA_VIOLATION = "schema-violation"
+    SIZE_LIMIT_EXCEEDED = "size-limit-exceeded"
+    UNSUPPORTED_MEDIA_TYPE = "unsupported-media-type"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogMCPServerInstallabilityEnum(Enum):
+    """Whether this MCP server can be planned for installation, and if policy prevents it.
+
+    Whether an MCP server candidate can be planned for installation
+    """
+    INSTALLABLE = "installable"
+    NOT_INSTALLABLE_POLICY = "not-installable-policy"
+
+class CatalogMCPServerCandidateKind(Enum):
+    MCP_SERVER = "mcp-server"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPServerCardMediaType(Enum):
+    """JSON MCP media type of the underlying card.
+
+    JSON MCP card media type accepted for install planning
+
+    JSON MCP media type advertised for the referenced card.
+
+    JSON MCP media type the validated card was interpreted as.
+
+    Media type the card is expected to conform to.
+    """
+    APPLICATION_MCP_SERVER_CARD_JSON = "application/mcp-server-card+json"
+    APPLICATION_MCP_SERVER_JSON = "application/mcp-server+json"
+
+class CatalogNegotiationRefusedErrorKind(Enum):
+    NEGOTIATION_REFUSED = "negotiation-refused"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogNegotiationRefusedReason(Enum):
+    """Whether the version or the capability set was the problem.
+
+    Why capability and protocol-version negotiation refused a caller
+    """
+    UNSUPPORTED_CAPABILITY = "unsupported-capability"
+    UNSUPPORTED_PROTOCOL_VERSION = "unsupported-protocol-version"
+
+class CatalogNetworkFailureErrorKind(Enum):
+    NETWORK_FAILURE = "network-failure"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogNetworkFailureReason(Enum):
+    """Categorised failure, low cardinality so it can be aggregated without carrying a URL.
+
+    Categorised network failure, low cardinality so it can be aggregated without carrying a
+    URL
+    """
+    CONNECTION_REFUSED = "connection-refused"
+    DNS = "dns"
+    HTTP_STATUS = "http-status"
+    OFFLINE = "offline"
+    REDIRECT_REJECTED = "redirect-rejected"
+    RESPONSE_TOO_LARGE = "response-too-large"
+    TIMEOUT = "timeout"
+    TLS = "tls"
+
+class CatalogNotInstallableErrorKind(Enum):
+    NOT_INSTALLABLE = "not-installable"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogNotInstallableReason(Enum):
+    """Why the candidate cannot be installed.
+
+    Why a discoverable candidate cannot be installed
+    """
+    AI_SKILL_NOT_INSTALLABLE = "ai-skill-not-installable"
+    KIND_NOT_INSTALLABLE = "kind-not-installable"
+    POLICY_FORBIDS = "policy-forbids"
+
+class CatalogPolicyRejectedErrorKind(Enum):
+    POLICY_REJECTED = "policy-rejected"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanPolicySource(Enum):
+    """Which authority produced the decision.
+
+    Which authority produced a policy decision
+    """
+    ENTERPRISE_ALLOWLIST = "enterprise-allowlist"
+    LOCAL_TRUST = "local-trust"
+    NONE = "none"
+    REGISTRY_POLICY = "registry-policy"
+
+class CatalogSearchResultKind(Enum):
+    AUTHENTICATION_REQUIRED = "authentication-required"
+    CONTRACT_VIOLATION = "contract-violation"
+    INVALID_REQUEST = "invalid-request"
+    MALFORMED_CARD = "malformed-card"
+    NEGOTIATION_REFUSED = "negotiation-refused"
+    NETWORK_FAILURE = "network-failure"
+    POLICY_REJECTED = "policy-rejected"
+    SUCCEEDED = "succeeded"
+    UNAVAILABLE = "unavailable"
+    UNSAFE_RETRIEVAL = "unsafe-retrieval"
+    UNSUPPORTED_KIND = "unsupported-kind"
+
+class CatalogSearchResultReason(Enum):
+    """Whether the version or the capability set was the problem.
+
+    Why capability and protocol-version negotiation refused a caller
+
+    Why authentication failed. Only an expired credential justifies attempting a silent
+    refresh; an absent or rejected credential requires sign-in.
+
+    Why the catalog authority did not accept the caller's identity
+
+    Categorised failure, low cardinality so it can be aggregated without carrying a URL.
+
+    Categorised network failure, low cardinality so it can be aggregated without carrying a
+    URL
+
+    Which control refused the retrieval, low cardinality so it can be aggregated without
+    carrying a URL.
+
+    Which hardened-fetch control refused a retrieval
+
+    How the card failed validation.
+
+    How a card failed validation
+
+    Which rule the response broke.
+
+    Which wire-contract rule an upstream response broke
+
+    Why the operation is unavailable.
+
+    Why a catalog operation is not available on this runtime
+    """
+    AUTHORITY_NOT_CONFIGURED = "authority-not-configured"
+    BLOCKED_ADDRESS = "blocked-address"
+    BLOCKED_SCHEME = "blocked-scheme"
+    BOTH_URL_AND_DATA = "both-url-and-data"
+    CONNECTION_REFUSED = "connection-refused"
+    CREDENTIALS_IN_URL = "credentials-in-url"
+    CREDENTIAL_EXPIRED = "credential-expired"
+    CREDENTIAL_REJECTED = "credential-rejected"
+    DISABLED_BY_POLICY = "disabled-by-policy"
+    DNS = "dns"
+    DUPLICATE_IDENTITY = "duplicate-identity"
+    HOST_NOT_PERMITTED = "host-not-permitted"
+    HTTP_STATUS = "http-status"
+    INVALID_JSON = "invalid-json"
+    MISSING_REQUIRED_FIELD = "missing-required-field"
+    NEITHER_URL_NOR_DATA = "neither-url-nor-data"
+    NO_CREDENTIAL = "no-credential"
+    OFFLINE = "offline"
+    PLANNING_UNAVAILABLE = "planning-unavailable"
+    PROXY_REJECTED = "proxy-rejected"
+    REDIRECT_REJECTED = "redirect-rejected"
+    REDIRECT_TO_BLOCKED_ADDRESS = "redirect-to-blocked-address"
+    RESPONSE_TOO_LARGE = "response-too-large"
+    SCHEMA_VIOLATION = "schema-violation"
+    SEARCH_UNAVAILABLE = "search-unavailable"
+    SIZE_LIMIT_EXCEEDED = "size-limit-exceeded"
+    TIMEOUT = "timeout"
+    TLS = "tls"
+    UNKNOWN_MEDIA_TYPE = "unknown-media-type"
+    UNSUPPORTED_CAPABILITY = "unsupported-capability"
+    UNSUPPORTED_MEDIA_TYPE = "unsupported-media-type"
+    UNSUPPORTED_PROTOCOL_VERSION = "unsupported-protocol-version"
+
+class CatalogSearchSucceededKind(Enum):
+    SUCCEEDED = "succeeded"
+
+class CatalogUnavailableErrorKind(Enum):
+    UNAVAILABLE = "unavailable"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogUnavailableReason(Enum):
+    """Why the operation is unavailable.
+
+    Why a catalog operation is not available on this runtime
+    """
+    AUTHORITY_NOT_CONFIGURED = "authority-not-configured"
+    DISABLED_BY_POLICY = "disabled-by-policy"
+    PLANNING_UNAVAILABLE = "planning-unavailable"
+    SEARCH_UNAVAILABLE = "search-unavailable"
+
+class CatalogUnavailableTransportErrorKind(Enum):
+    UNAVAILABLE_TRANSPORT = "unavailable-transport"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogUnavailableTransportReason(Enum):
+    """Why no transport could be offered.
+
+    Why no usable transport could be offered
+    """
+    NO_ELIGIBLE_TRANSPORT = "no-eligible-transport"
+    REMOTE_ENUMERATION_UNAVAILABLE = "remote-enumeration-unavailable"
+    TRANSPORT_NOT_SUPPORTED = "transport-not-supported"
+
+class CatalogUnsafeRetrievalErrorKind(Enum):
+    UNSAFE_RETRIEVAL = "unsafe-retrieval"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CatalogUnsafeRetrievalReason(Enum):
+    """Which control refused the retrieval, low cardinality so it can be aggregated without
+    carrying a URL.
+
+    Which hardened-fetch control refused a retrieval
+    """
+    BLOCKED_ADDRESS = "blocked-address"
+    BLOCKED_SCHEME = "blocked-scheme"
+    CREDENTIALS_IN_URL = "credentials-in-url"
+    HOST_NOT_PERMITTED = "host-not-permitted"
+    PROXY_REJECTED = "proxy-rejected"
+    REDIRECT_TO_BLOCKED_ADDRESS = "redirect-to-blocked-address"
+
+class CatalogUnsupportedKindErrorKind(Enum):
+    UNSUPPORTED_KIND = "unsupported-kind"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SlashCommandInputChoice:
@@ -950,6 +1522,41 @@ class SlashCommandKind(Enum):
     CLIENT = "client"
     SKILL = "skill"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class CommandsInvocationEffectOutcome(Enum):
+    """Whether the host applied or cancelled the pending invocation effect.
+
+    Whether a pending slash-command invocation effect was applied or cancelled by the host.
+    """
+    APPLIED = "applied"
+    CANCELLED = "cancelled"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CommandsFinalizeInvocationEffectResult:
+    """Whether finalizing the invocation effect succeeded, and the failure reason when it did
+    not.
+    """
+    success: bool
+    """Whether the pending invocation effect was finalized successfully."""
+
+    error: str | None = None
+    """Failure reason when the invocation effect could not be finalized."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CommandsFinalizeInvocationEffectResult':
+        assert isinstance(obj, dict)
+        success = from_bool(obj.get("success"))
+        error = from_union([from_str, from_none], obj.get("error"))
+        return CommandsFinalizeInvocationEffectResult(success, error)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["success"] = from_bool(self.success)
+        if self.error is not None:
+            result["error"] = from_union([from_str, from_none], self.error)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CommandsHandlePendingCommandRequest:
@@ -995,29 +1602,10 @@ def to_dict(self) -> dict:
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class CommandsInvokeRequest:
-    """Slash command name and optional raw input string to invoke."""
+class CommandsInvocationOrigin(Enum):
+    """Optional client surface that initiated the invocation"""
 
-    name: str
-    """Command name. Leading slashes are stripped and the name is matched case-insensitively."""
-
-    input: str | None = None
-    """Raw input after the command name"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'CommandsInvokeRequest':
-        assert isinstance(obj, dict)
-        name = from_str(obj.get("name"))
-        input = from_union([from_str, from_none], obj.get("input"))
-        return CommandsInvokeRequest(name, input)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["name"] = from_str(self.name)
-        if self.input is not None:
-            result["input"] = from_union([from_str, from_none], self.input)
-        return result
+    SETTINGS = "settings"
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
@@ -1165,59 +1753,68 @@ def to_dict(self) -> dict:
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
+# Internal: this type is an internal SDK API and is not part of the public surface.
 @dataclass
-class ConnectRemoteSessionParams:
-    """Remote session connection parameters."""
+class _ConnectClientInfo:
+    """Identity of the integrating host, declared once on the `server.connect` handshake so
+    telemetry from this connection is attributed to a single, consistent surface. All fields
+    are optional; omit them to keep the default attribution.
 
-    session_id: str
-    """Session ID to connect to."""
+    Identity of the integrating host. Optional; omit it to keep the default attribution.
+    """
+    editor_name: str | None = None
+    """Name of the host editor, e.g. `"vscode"`."""
+
+    editor_version: str | None = None
+    """Version of the host editor, e.g. `"1.124.2"`. Ignored unless it looks like a version
+    string.
+    """
+    extension_name: str | None = None
+    """Name of the Copilot extension within the host, e.g. `"copilot-chat"`."""
+
+    extension_version: str | None = None
+    """Version of the Copilot extension within the host, e.g. `"0.54.0"`. Ignored unless it
+    looks like a version string.
+    """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'ConnectRemoteSessionParams':
+    def from_dict(obj: Any) -> '_ConnectClientInfo':
         assert isinstance(obj, dict)
-        session_id = from_str(obj.get("sessionId"))
-        return ConnectRemoteSessionParams(session_id)
+        editor_name = from_union([from_str, from_none], obj.get("editorName"))
+        editor_version = from_union([from_str, from_none], obj.get("editorVersion"))
+        extension_name = from_union([from_str, from_none], obj.get("extensionName"))
+        extension_version = from_union([from_str, from_none], obj.get("extensionVersion"))
+        return _ConnectClientInfo(editor_name, editor_version, extension_name, extension_version)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["sessionId"] = from_str(self.session_id)
+        if self.editor_name is not None:
+            result["editorName"] = from_union([from_str, from_none], self.editor_name)
+        if self.editor_version is not None:
+            result["editorVersion"] = from_union([from_str, from_none], self.editor_version)
+        if self.extension_name is not None:
+            result["extensionName"] = from_union([from_str, from_none], self.extension_name)
+        if self.extension_version is not None:
+            result["extensionVersion"] = from_union([from_str, from_none], self.extension_version)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
-# Internal: this type is an internal SDK API and is not part of the public surface.
 @dataclass
-class _ConnectRequest:
-    """Parameters for the `server.connect` handshake: an optional connection token and optional
-    connection-level opt-ins (e.g. GitHub telemetry forwarding).
-    """
-    enable_git_hub_telemetry_forwarding: bool | None = None
-    """Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the
-    runtime forwards every internal telemetry event it emits — across all sessions, plus
-    sessionless events — to this connection over the `gitHubTelemetry.event` notification.
-    Regular events are also written to the runtime's normal GitHub/CTS path (dual-write);
-    host-only compatibility events are forward-only and intentionally skip that path.
-    Intended for first-party hosts that re-emit the events into their own telemetry stores.
-    Both unrestricted and restricted events are forwarded, each tagged with a `restricted`
-    discriminator; a backstop drops restricted events when restricted telemetry is disabled —
-    using the process-global gate for ordinary events and an explicit session-scoped decision
-    for host-only events.
-    """
-    token: str | None = None
-    """Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN"""
+class ConnectRemoteSessionParams:
+    """Remote session connection parameters."""
+
+    session_id: str
+    """Session ID to connect to."""
 
     @staticmethod
-    def from_dict(obj: Any) -> '_ConnectRequest':
+    def from_dict(obj: Any) -> 'ConnectRemoteSessionParams':
         assert isinstance(obj, dict)
-        enable_git_hub_telemetry_forwarding = from_union([from_bool, from_none], obj.get("enableGitHubTelemetryForwarding"))
-        token = from_union([from_str, from_none], obj.get("token"))
-        return _ConnectRequest(enable_git_hub_telemetry_forwarding, token)
+        session_id = from_str(obj.get("sessionId"))
+        return ConnectRemoteSessionParams(session_id)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        if self.enable_git_hub_telemetry_forwarding is not None:
-            result["enableGitHubTelemetryForwarding"] = from_union([from_bool, from_none], self.enable_git_hub_telemetry_forwarding)
-        if self.token is not None:
-            result["token"] = from_union([from_str, from_none], self.token)
+        result["sessionId"] = from_str(self.session_id)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -2096,6 +2693,8 @@ def to_dict(self) -> dict:
 class ExtensionSource(Enum):
     """Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin
     (installed plugin), or session (session-state/<id>/extensions/)
+
+    Discovery source for the extension entrypoint.
     """
     PLUGIN = "plugin"
     PROJECT = "project"
@@ -2114,6 +2713,39 @@ class ExtensionStatus(Enum):
 class ExtensionContextPushInputType(Enum):
     EXTENSION_CONTEXT = "extension_context"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ExtensionLaunchProfile:
+    """Opaque integrator-owned process launch profile for one extension entrypoint.
+
+    Opaque launch profile, omitted when this provider does not support the entrypoint.
+    """
+    args: list[str]
+    """Opaque integrator-defined arguments passed to the executable. The runtime does not append
+    the extension entrypoint.
+    """
+    env: dict[str, str]
+    """Opaque integrator-defined environment variables. Runtime-owned COPILOT_SDK_PATH,
+    SESSION_ID, and COPILOT_EXTENSION_PARENT_PID values take precedence.
+    """
+    executable: str
+    """Executable used to launch the extension entrypoint."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ExtensionLaunchProfile':
+        assert isinstance(obj, dict)
+        args = from_list(from_str, obj.get("args"))
+        env = from_dict(from_str, obj.get("env"))
+        executable = from_str(obj.get("executable"))
+        return ExtensionLaunchProfile(args, env, executable)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["args"] = from_list(from_str, self.args)
+        result["env"] = from_dict(from_str, self.env)
+        result["executable"] = from_str(self.executable)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ExtensionsDisableRequest:
@@ -2243,29 +2875,47 @@ class FactoryAgentOptions:
 
     Subagent execution options.
     """
+    agent: str | None = None
+    """Optional custom agent name for the subagent. This field is accepted but not yet honored."""
+
+    context_tier: ContextTier | None = None
+    """Optional context tier for the subagent. This field is accepted but not yet honored."""
+
     label: str | None = None
     """Optional label distinguishing otherwise identical memoized agent calls."""
 
     model: str | None = None
     """Optional model identifier for the subagent."""
 
+    reasoning_effort: str | None = None
+    """Optional reasoning effort for the subagent. This field is accepted but not yet honored."""
+
     schema: Any = None
     """Optional JSON Schema for structured agent output."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryAgentOptions':
         assert isinstance(obj, dict)
+        agent = from_union([from_str, from_none], obj.get("agent"))
+        context_tier = from_union([ContextTier, from_none], obj.get("contextTier"))
         label = from_union([from_str, from_none], obj.get("label"))
         model = from_union([from_str, from_none], obj.get("model"))
+        reasoning_effort = from_union([from_str, from_none], obj.get("reasoningEffort"))
         schema = obj.get("schema")
-        return FactoryAgentOptions(label, model, schema)
+        return FactoryAgentOptions(agent, context_tier, label, model, reasoning_effort, schema)
 
     def to_dict(self) -> dict:
         result: dict = {}
+        if self.agent is not None:
+            result["agent"] = from_union([from_str, from_none], self.agent)
+        if self.context_tier is not None:
+            result["contextTier"] = from_union([lambda x: to_enum(ContextTier, x), from_none], self.context_tier)
         if self.label is not None:
             result["label"] = from_union([from_str, from_none], self.label)
         if self.model is not None:
             result["model"] = from_union([from_str, from_none], self.model)
+        if self.reasoning_effort is not None:
+            result["reasoningEffort"] = from_union([from_str, from_none], self.reasoning_effort)
         if self.schema is not None:
             result["schema"] = self.schema
         return result
@@ -2290,65 +2940,6 @@ def to_dict(self) -> dict:
             result["result"] = self.result
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class FactoryAgentSummary:
-    """Prompt-safe durable identity and live status for a direct factory agent."""
-
-    active_ms: int
-    agent_id: str
-    agent_type: str
-    label: str
-    run_id: str
-    status: str
-    tool_call_id: str
-    activity: str | None = None
-    completed_at: int | None = None
-    phase_id: str | None = None
-    requested_model: str | None = None
-    resolved_model: str | None = None
-    started_at: int | None = None
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'FactoryAgentSummary':
-        assert isinstance(obj, dict)
-        active_ms = from_int(obj.get("activeMs"))
-        agent_id = from_str(obj.get("agentId"))
-        agent_type = from_str(obj.get("agentType"))
-        label = from_str(obj.get("label"))
-        run_id = from_str(obj.get("runId"))
-        status = from_str(obj.get("status"))
-        tool_call_id = from_str(obj.get("toolCallId"))
-        activity = from_union([from_str, from_none], obj.get("activity"))
-        completed_at = from_union([from_int, from_none], obj.get("completedAt"))
-        phase_id = from_union([from_none, from_str], obj.get("phaseId"))
-        requested_model = from_union([from_str, from_none], obj.get("requestedModel"))
-        resolved_model = from_union([from_str, from_none], obj.get("resolvedModel"))
-        started_at = from_union([from_int, from_none], obj.get("startedAt"))
-        return FactoryAgentSummary(active_ms, agent_id, agent_type, label, run_id, status, tool_call_id, activity, completed_at, phase_id, requested_model, resolved_model, started_at)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["activeMs"] = from_int(self.active_ms)
-        result["agentId"] = from_str(self.agent_id)
-        result["agentType"] = from_str(self.agent_type)
-        result["label"] = from_str(self.label)
-        result["runId"] = from_str(self.run_id)
-        result["status"] = from_str(self.status)
-        result["toolCallId"] = from_str(self.tool_call_id)
-        if self.activity is not None:
-            result["activity"] = from_union([from_str, from_none], self.activity)
-        if self.completed_at is not None:
-            result["completedAt"] = from_union([from_int, from_none], self.completed_at)
-        result["phaseId"] = from_union([from_none, from_str], self.phase_id)
-        if self.requested_model is not None:
-            result["requestedModel"] = from_union([from_str, from_none], self.requested_model)
-        if self.resolved_model is not None:
-            result["resolvedModel"] = from_union([from_str, from_none], self.resolved_model)
-        if self.started_at is not None:
-            result["startedAt"] = from_union([from_int, from_none], self.started_at)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class FactoryCancelRequest:
@@ -2374,7 +2965,10 @@ class FactoryCurrentPhase:
     """Current factory phase identity."""
 
     id: str
+    """Current phase identifier."""
+
     ordinal: int | None = None
+    """Zero-based declared phase ordinal, or null for an undeclared phase."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryCurrentPhase':
@@ -2392,12 +2986,21 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class FactoryDeclaredLimits:
-    """Declared or approved factory resource ceilings."""
+    """Declared or approved factory resource ceilings.
 
+    Resource ceilings declared by the factory.
+    """
     max_ai_credits: float | None = None
+    """Maximum AI credits consumed by subagents and descendants."""
+
     max_concurrent_subagents: int | None = None
+    """Maximum concurrently active subagents."""
+
     max_total_subagents: int | None = None
+    """Maximum total subagents spawned by the run."""
+
     timeout_seconds: float | None = None
+    """Maximum accumulated active execution time in seconds."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryDeclaredLimits':
@@ -2434,6 +3037,7 @@ class FactoryDurableOperation(Enum):
     JOURNAL_PUT = "journalPut"
     MARK_RUN_STARTED = "markRunStarted"
     RECONCILE_CREDIT_TOTAL = "reconcileCreditTotal"
+    REFRESH_LEASE = "refreshLease"
     RELEASE_AGENT = "releaseAgent"
     RESERVE_AGENT = "reserveAgent"
 
@@ -2649,24 +3253,50 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class FactoryListRunsRequest:
-    """Empty parameters for listing factory runs."""
+    """Parameters for paging factory runs."""
+
+    after_seq: int | None = None
+    """Exclusive forward cursor."""
+
+    before_seq: int | None = None
+    """Exclusive backward cursor."""
+
+    limit: int | None = None
+    """Maximum terminal runs to return. Defaults to 200 and is capped at 500."""
+
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryListRunsRequest':
         assert isinstance(obj, dict)
-        return FactoryListRunsRequest()
+        after_seq = from_union([from_int, from_none], obj.get("afterSeq"))
+        before_seq = from_union([from_int, from_none], obj.get("beforeSeq"))
+        limit = from_union([from_int, from_none], obj.get("limit"))
+        return FactoryListRunsRequest(after_seq, before_seq, limit)
 
     def to_dict(self) -> dict:
         result: dict = {}
+        if self.after_seq is not None:
+            result["afterSeq"] = from_union([from_int, from_none], self.after_seq)
+        if self.before_seq is not None:
+            result["beforeSeq"] = from_union([from_int, from_none], self.before_seq)
+        if self.limit is not None:
+            result["limit"] = from_union([from_int, from_none], self.limit)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class FactoryRunConsumed:
-    """Durable factory resource consumption."""
+    """Durable resource consumption.
 
+    Durable factory resource consumption.
+    """
     active_ms: int
+    """Accumulated active execution time in milliseconds."""
+
     nano_aiu: int
+    """AI usage consumed by the run in nano-AIU."""
+
     subagents: int
+    """Total subagents spawned by the run."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryRunConsumed':
@@ -2685,7 +3315,9 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 class FactoryRunStatus(Enum):
-    """Current or terminal state of a factory run.
+    """Current factory run status.
+
+    Current or terminal state of a factory run.
 
     Current or terminal factory run status.
     """
@@ -2707,6 +3339,7 @@ class FactoryRunFailureKind(Enum):
     TIMEOUT_SECONDS = "timeoutSeconds"
 
 class FactoryRunFailureType(Enum):
+    FACTORY_ACCOUNTING_INCOMPLETE = "factory_accounting_incomplete"
     FACTORY_DURABLE_FAILURE = "factory_durable_failure"
     FACTORY_LIMIT_REACHED = "factory_limit_reached"
     FACTORY_RESUME_DECLINED = "factory_resume_declined"
@@ -2724,8 +3357,10 @@ class FactoryLogLineKind(Enum):
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 class FactoryPhaseStatus(Enum):
-    """Derived lifecycle state of a factory phase."""
+    """Derived lifecycle state of the phase.
 
+    Derived lifecycle state of a factory phase.
+    """
     ACTIVE = "active"
     COMPLETED = "completed"
     PENDING = "pending"
@@ -2907,6 +3542,12 @@ class GitHubTelemetryClientInfo:
     copilot_plan: str | None = None
     """Copilot subscription plan, when known."""
 
+    cpu_count: int | None = None
+    """Number of logical CPU cores on the host."""
+
+    cpu_model: str | None = None
+    """Distinct CPU model names for the host, comma-separated."""
+
     dev_device_id: str | None = None
     """Stable machine identifier for the device."""
 
@@ -2924,9 +3565,11 @@ def from_dict(obj: Any) -> 'GitHubTelemetryClientInfo':
         client_name = from_union([from_str, from_none], obj.get("client_name"))
         client_type = from_union([from_str, from_none], obj.get("client_type"))
         copilot_plan = from_union([from_str, from_none], obj.get("copilot_plan"))
+        cpu_count = from_union([from_int, from_none], obj.get("cpu_count"))
+        cpu_model = from_union([from_str, from_none], obj.get("cpu_model"))
         dev_device_id = from_union([from_str, from_none], obj.get("dev_device_id"))
         is_staff = from_union([from_bool, from_none], obj.get("is_staff"))
-        return GitHubTelemetryClientInfo(cli_version, node_version, os_arch, os_platform, os_version, client_name, client_type, copilot_plan, dev_device_id, is_staff)
+        return GitHubTelemetryClientInfo(cli_version, node_version, os_arch, os_platform, os_version, client_name, client_type, copilot_plan, cpu_count, cpu_model, dev_device_id, is_staff)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -2941,12 +3584,26 @@ def to_dict(self) -> dict:
             result["client_type"] = from_union([from_str, from_none], self.client_type)
         if self.copilot_plan is not None:
             result["copilot_plan"] = from_union([from_str, from_none], self.copilot_plan)
+        if self.cpu_count is not None:
+            result["cpu_count"] = from_union([from_int, from_none], self.cpu_count)
+        if self.cpu_model is not None:
+            result["cpu_model"] = from_union([from_str, from_none], self.cpu_model)
         if self.dev_device_id is not None:
             result["dev_device_id"] = from_union([from_str, from_none], self.dev_device_id)
         if self.is_staff is not None:
             result["is_staff"] = from_union([from_bool, from_none], self.is_staff)
         return result
 
+class GitHubTokenAcquireReason(Enum):
+    """Why the runtime is requesting a GitHub credential."""
+
+    INITIAL = "initial"
+    REFRESH = "refresh"
+
+class GitHubTokenAcquireResultKind(Enum):
+    CANCELLED = "cancelled"
+    TOKEN = "token"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HandlePendingToolCallResult:
@@ -3373,20 +4030,17 @@ def to_dict(self) -> dict:
             result["output"] = self.output
         return result
 
-class PurpleSource(Enum):
+class InstalledPluginSourceURLSource(Enum):
     GITHUB = "github"
     LOCAL = "local"
     URL = "url"
 
-class FluffySource(Enum):
+class PurpleSource(Enum):
     GITHUB = "github"
 
-class TentacledSource(Enum):
+class FluffySource(Enum):
     LOCAL = "local"
 
-class StickySource(Enum):
-    URL = "url"
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 class InstructionLocation(Enum):
     """Which tier this target belongs to
@@ -3666,6 +4320,8 @@ class LlmInferenceHTTPResponseStartRequest:
     """Response head."""
 
     headers: dict[str, list[str]]
+    """HTTP response headers, preserving multiple values per name."""
+
     request_id: str
     """Matches the requestId from the originating httpRequestStart frame."""
 
@@ -3808,6 +4464,34 @@ def to_dict(self) -> dict:
             result["workingDirectory"] = from_union([from_str, from_none], self.working_directory)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ManagedSettingsReadResult:
+    """Validated device-managed settings discovered before a session exists."""
+
+    error_message: str | None = None
+    """Discovery or validation error text when managed settings could not be read safely."""
+
+    settings_json: Any = None
+    """Validated, canonical managed-settings JSON. Omitted when no managed settings were
+    discovered or when discovered settings failed validation.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ManagedSettingsReadResult':
+        assert isinstance(obj, dict)
+        error_message = from_union([from_str, from_none], obj.get("errorMessage"))
+        settings_json = obj.get("settingsJson")
+        return ManagedSettingsReadResult(error_message, settings_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.error_message is not None:
+            result["errorMessage"] = from_union([from_str, from_none], self.error_message)
+        if self.settings_json is not None:
+            result["settingsJson"] = self.settings_json
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MarketplaceAddResult:
@@ -4219,14 +4903,6 @@ def to_dict(self) -> dict:
             result["redirectPort"] = from_union([from_int, from_none], self.redirect_port)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-class MCPServerConfigDeferTools(Enum):
-    """Controls if tools provided by this server can be loaded on demand via tool search (auto)
-    or always included in the initial tool list (never)
-    """
-    AUTO = "auto"
-    NEVER = "never"
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 class MCPGrantType(Enum):
     """OAuth grant type to use when authenticating to the remote MCP server.
@@ -4240,11 +4916,40 @@ class MCPGrantType(Enum):
     CLIENT_CREDENTIALS = "client_credentials"
 
 # Experimental: this type is part of an experimental API and may change or be removed.
-class MCPServerConfigHTTPType(Enum):
-    """Remote transport type. Defaults to "http" when omitted."""
+@dataclass
+class MCPSafeForTelemetryFields:
+    """Per-field MCP telemetry-obfuscation policy."""
+
+    inputs_names: bool
+    """Whether MCP tool input names may be included in telemetry without obfuscation."""
+
+    name: bool
+    """Whether the MCP tool name may be included in telemetry without obfuscation."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPSafeForTelemetryFields':
+        assert isinstance(obj, dict)
+        inputs_names = from_bool(obj.get("inputsNames"))
+        name = from_bool(obj.get("name"))
+        return MCPSafeForTelemetryFields(inputs_names, name)
 
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["inputsNames"] = from_bool(self.inputs_names)
+        result["name"] = from_bool(self.name)
+        return result
+
+class MCPSerializableServerConfigType(Enum):
+    """Local transport type. Defaults to stdio when omitted.
+
+    Local MCP transport type.
+
+    Remote transport type. Defaults to "http" when omitted.
+    """
     HTTP = "http"
+    LOCAL = "local"
     SSE = "sse"
+    STDIO = "stdio"
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
@@ -4312,7 +5017,7 @@ def to_dict(self) -> dict:
 # Internal: this type is an internal SDK API and is not part of the public surface.
 @dataclass
 class MCPConfigureGitHubRequest:
-    """Opaque auth info used to configure GitHub MCP."""
+    """Credential-free authentication identity used to configure GitHub MCP."""
 
     auth_info: Any = None
     """Opaque runtime auth info for GitHub MCP configuration. Marked internal: an in-process
@@ -4388,6 +5093,14 @@ def to_dict(self) -> dict:
             result["workingDirectory"] = from_union([from_str, from_none], self.working_directory)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPElicitationFormMode(Enum):
+    """Structured MCP elicitation mode.
+
+    Elicitation mode. Omitted and form are equivalent for structured elicitation.
+    """
+    FORM = "form"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPEnableRequest:
@@ -4407,6 +5120,31 @@ def to_dict(self) -> dict:
         result["serverName"] = from_str(self.server_name)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPFailedServer:
+    """MCP server whose connection attempt failed."""
+
+    name: str
+    """The config key of the server that failed to connect."""
+
+    error: str | None = None
+    """The captured connection failure detail."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPFailedServer':
+        assert isinstance(obj, dict)
+        name = from_str(obj.get("name"))
+        error = from_union([from_str, from_none], obj.get("error"))
+        return MCPFailedServer(name, error)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["name"] = from_str(self.name)
+        if self.error is not None:
+            result["error"] = from_union([from_str, from_none], self.error)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPFilteredServer:
@@ -4511,6 +5249,164 @@ def to_dict(self) -> dict:
         result["timestamp"] = from_int(self.timestamp)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanConfigurationOperation(Enum):
+    """Whether the change would create a new entry or modify an existing one.
+
+    Whether a planned configuration change would create or modify an entry
+    """
+    ADD = "add"
+    UPDATE = "update"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanScope(Enum):
+    """Scope the change would be written to.
+
+    Configuration scope an MCP install plan targets
+
+    Configuration scope the plan targets.
+
+    Configuration scope the plan targets. Defaults to user scope when omitted.
+    """
+    USER = "user"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanResourceIdentity:
+    """Normalised identity of the server the plan would install.
+
+    Normalised identity of the MCP server a plan targets, independent of how the card spelled
+    it.
+    """
+    canonical_name: str
+    """Canonical, normalised name of the server, for example `io.github.owner/server`."""
+
+    server_name: str
+    """Local configuration key the server would be recorded under."""
+
+    registry_id: str | None = None
+    """Registry identifier of the server, when it came from a registry."""
+
+    version: str | None = None
+    """Version advertised by the card, when it declares one."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanResourceIdentity':
+        assert isinstance(obj, dict)
+        canonical_name = from_str(obj.get("canonicalName"))
+        server_name = from_str(obj.get("serverName"))
+        registry_id = from_union([from_str, from_none], obj.get("registryId"))
+        version = from_union([from_str, from_none], obj.get("version"))
+        return MCPPlanResourceIdentity(canonical_name, server_name, registry_id, version)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canonicalName"] = from_str(self.canonical_name)
+        result["serverName"] = from_str(self.server_name)
+        if self.registry_id is not None:
+            result["registryId"] = from_union([from_str, from_none], self.registry_id)
+        if self.version is not None:
+            result["version"] = from_union([from_str, from_none], self.version)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanPolicyDecision(Enum):
+    """What policy decided for this server.
+
+    What policy decided for a planned server
+    """
+    ALLOWED = "allowed"
+    BLOCKED = "blocked"
+    REQUIRES_APPROVAL = "requires-approval"
+
+class InstallMethod(Enum):
+    """Discriminator for a package-backed transport choice
+
+    Discriminator for a remote-endpoint transport choice
+    """
+    PACKAGE = "package"
+    REMOTE = "remote"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanValueCategory(Enum):
+    """Where the value is applied when the server is launched.
+
+    Where a required value is applied when the planned server is launched
+    """
+    ENVIRONMENT_VARIABLE = "environment-variable"
+    HEADER = "header"
+    PACKAGE_ARGUMENT = "package-argument"
+    RUNTIME_ARGUMENT = "runtime-argument"
+    URL_VARIABLE = "url-variable"
+
+class MCPPlanRequiredValueKind(Enum):
+    """Discriminator for a scalar required value
+
+    Discriminator for an enumerated required value
+    """
+    ENUM = "enum"
+    SCALAR = "scalar"
+
+class MCPPlanRequiredValueValueType(Enum):
+    """Scalar type the value must conform to.
+
+    Scalar type a required value must conform to
+
+    Discriminator for an enumerated required value
+    """
+    BOOLEAN = "boolean"
+    ENUM = "enum"
+    NUMBER = "number"
+    PATH = "path"
+    STRING = "string"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanSecretPlaceholder:
+    """A secret a transport choice needs, referenced by placeholder. No secret value ever
+    appears in a plan, and the placeholder resolves against the keychain only when a plan is
+    applied.
+    """
+    key: str
+    """Key the secret is supplied under. Inert untrusted data."""
+
+    placeholder: str
+    """The runtime-assigned `${secret:<id>}` placeholder written into configuration in place of
+    the value.
+    """
+    title: str | None = None
+    """Human-readable label from the card. Inert untrusted text."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanSecretPlaceholder':
+        assert isinstance(obj, dict)
+        key = from_str(obj.get("key"))
+        placeholder = from_str(obj.get("placeholder"))
+        title = from_union([from_str, from_none], obj.get("title"))
+        return MCPPlanSecretPlaceholder(key, placeholder, title)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["key"] = from_str(self.key)
+        result["placeholder"] = from_str(self.placeholder)
+        if self.title is not None:
+            result["title"] = from_union([from_str, from_none], self.title)
+        return result
+
+class MCPPlanETransport(Enum):
+    """Local process transport this package choice would use.
+
+    Transport exposed by a locally launched package
+
+    Endpoint transport this remote choice would use.
+
+    Transport exposed by a remote endpoint
+    """
+    HTTP = "http"
+    SSE = "sse"
+    STDIO = "stdio"
+    STREAMABLE_HTTP = "streamable-http"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPIsServerRunningRequest:
@@ -4604,10 +5500,6 @@ def to_dict(self) -> dict:
             result["serverName"] = from_union([from_str, from_none], self.server_name)
         return result
 
-class MCPOauthPendingRequestResponseKind(Enum):
-    CANCELLED = "cancelled"
-    TOKEN = "token"
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPOauthHandlePendingResult:
@@ -4655,6 +5547,63 @@ def to_dict(self) -> dict:
             result["authorizationUrl"] = from_union([from_str, from_none], self.authorization_url)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPOauthProbeNeedsAuthReason(Enum):
+    """Why a passive MCP OAuth probe determined authentication is needed.
+
+    Why authentication is needed.
+    """
+    INITIAL = "initial"
+    REFRESH = "refresh"
+    UPSCOPE = "upscope"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPOauthProbeRequest:
+    """Remote MCP server name for a passive OAuth status probe."""
+
+    server_name: str
+    """Name of the configured remote MCP server to probe."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPOauthProbeRequest':
+        assert isinstance(obj, dict)
+        server_name = from_str(obj.get("serverName"))
+        return MCPOauthProbeRequest(server_name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["serverName"] = from_str(self.server_name)
+        return result
+
+@dataclass
+class ExternalRefMCPOauthHTTPResponse:
+    """HTTP response returned by the server.
+
+    HTTP 401 or 403 response returned by the server.
+
+    HTTP response returned by the server, when the probe reached the server and captured the
+    complete response.
+    """
+    external_ref_marker_external_ref_mcp_oauth_http_response: str
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ExternalRefMCPOauthHTTPResponse':
+        assert isinstance(obj, dict)
+        external_ref_marker_external_ref_mcp_oauth_http_response = from_str(obj.get("__externalRefMarker___ExternalRef_McpOauthHttpResponse"))
+        return ExternalRefMCPOauthHTTPResponse(external_ref_marker_external_ref_mcp_oauth_http_response)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["__externalRefMarker___ExternalRef_McpOauthHttpResponse"] = from_str(self.external_ref_marker_external_ref_mcp_oauth_http_response)
+        return result
+
+class Status(Enum):
+    AUTHENTICATED = "authenticated"
+    FAILED = "failed"
+    NEEDS_AUTH = "needs-auth"
+    NO_AUTH_REQUIRED = "no-auth-required"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPOauthRespondRequest:
@@ -4695,6 +5644,199 @@ def to_dict(self) -> dict:
         result["success"] = from_bool(self.success)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlan(Enum):
+    """Discriminator for an enumerated required value"""
+
+    ENUM = "enum"
+
+class MCPPlanInstallPlannedKind(Enum):
+    PLANNED = "planned"
+
+class MCPPlanInstallSourceKind(Enum):
+    """Discriminator for a candidate-backed install-plan source
+
+    Discriminator for a caller-supplied-card install-plan source
+    """
+    CANDIDATE = "candidate"
+    CARD = "card"
+
+class MCPPlanInstallResultKind(Enum):
+    AUTHENTICATION_REQUIRED = "authentication-required"
+    CONTRACT_VIOLATION = "contract-violation"
+    HANDLE_REJECTED = "handle-rejected"
+    INVALID_REQUEST = "invalid-request"
+    MALFORMED_CARD = "malformed-card"
+    NEGOTIATION_REFUSED = "negotiation-refused"
+    NETWORK_FAILURE = "network-failure"
+    NOT_INSTALLABLE = "not-installable"
+    PLANNED = "planned"
+    POLICY_REJECTED = "policy-rejected"
+    UNAVAILABLE = "unavailable"
+    UNAVAILABLE_TRANSPORT = "unavailable-transport"
+    UNSAFE_RETRIEVAL = "unsafe-retrieval"
+
+class MCPPlanInstallResultReason(Enum):
+    """Whether the version or the capability set was the problem.
+
+    Why capability and protocol-version negotiation refused a caller
+
+    Why the handle was rejected.
+
+    Why a presented handle was rejected
+
+    Why authentication failed. Only an expired credential justifies attempting a silent
+    refresh; an absent or rejected credential requires sign-in.
+
+    Why the catalog authority did not accept the caller's identity
+
+    Categorised failure, low cardinality so it can be aggregated without carrying a URL.
+
+    Categorised network failure, low cardinality so it can be aggregated without carrying a
+    URL
+
+    Which control refused the retrieval, low cardinality so it can be aggregated without
+    carrying a URL.
+
+    Which hardened-fetch control refused a retrieval
+
+    How the card failed validation.
+
+    How a card failed validation
+
+    Which rule the response broke.
+
+    Which wire-contract rule an upstream response broke
+
+    Why no transport could be offered.
+
+    Why no usable transport could be offered
+
+    Why the candidate cannot be installed.
+
+    Why a discoverable candidate cannot be installed
+
+    Why the operation is unavailable.
+
+    Why a catalog operation is not available on this runtime
+    """
+    AI_SKILL_NOT_INSTALLABLE = "ai-skill-not-installable"
+    AUTHORITY_NOT_CONFIGURED = "authority-not-configured"
+    BLOCKED_ADDRESS = "blocked-address"
+    BLOCKED_SCHEME = "blocked-scheme"
+    BOTH_URL_AND_DATA = "both-url-and-data"
+    CONNECTION_REFUSED = "connection-refused"
+    CREDENTIALS_IN_URL = "credentials-in-url"
+    CREDENTIAL_EXPIRED = "credential-expired"
+    CREDENTIAL_REJECTED = "credential-rejected"
+    DISABLED_BY_POLICY = "disabled-by-policy"
+    DNS = "dns"
+    DUPLICATE_IDENTITY = "duplicate-identity"
+    FOREIGN = "foreign"
+    HOST_NOT_PERMITTED = "host-not-permitted"
+    HTTP_STATUS = "http-status"
+    INVALID = "invalid"
+    INVALID_JSON = "invalid-json"
+    KIND_NOT_INSTALLABLE = "kind-not-installable"
+    MISSING_REQUIRED_FIELD = "missing-required-field"
+    NEITHER_URL_NOR_DATA = "neither-url-nor-data"
+    NO_CREDENTIAL = "no-credential"
+    NO_ELIGIBLE_TRANSPORT = "no-eligible-transport"
+    OFFLINE = "offline"
+    PLANNING_UNAVAILABLE = "planning-unavailable"
+    POLICY_FORBIDS = "policy-forbids"
+    PROXY_REJECTED = "proxy-rejected"
+    REDIRECT_REJECTED = "redirect-rejected"
+    REDIRECT_TO_BLOCKED_ADDRESS = "redirect-to-blocked-address"
+    REMOTE_ENUMERATION_UNAVAILABLE = "remote-enumeration-unavailable"
+    REPLAYED = "replayed"
+    RESPONSE_TOO_LARGE = "response-too-large"
+    SCHEMA_VIOLATION = "schema-violation"
+    SEARCH_UNAVAILABLE = "search-unavailable"
+    SIZE_LIMIT_EXCEEDED = "size-limit-exceeded"
+    STALE = "stale"
+    TIMEOUT = "timeout"
+    TLS = "tls"
+    TRANSPORT_NOT_SUPPORTED = "transport-not-supported"
+    UNKNOWN_MEDIA_TYPE = "unknown-media-type"
+    UNSUPPORTED_CAPABILITY = "unsupported-capability"
+    UNSUPPORTED_MEDIA_TYPE = "unsupported-media-type"
+    UNSUPPORTED_PROTOCOL_VERSION = "unsupported-protocol-version"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanInstallSourceCandidateKind(Enum):
+    """Discriminator for a candidate-backed install-plan source"""
+
+    CANDIDATE = "candidate"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanInstallSourceCardKind(Enum):
+    """Discriminator for a caller-supplied-card install-plan source"""
+
+    CARD = "card"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanPackageInstallMethod(Enum):
+    """Discriminator for a package-backed transport choice"""
+
+    PACKAGE = "package"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanPackageTransport(Enum):
+    """Local process transport this package choice would use.
+
+    Transport exposed by a locally launched package
+    """
+    STDIO = "stdio"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanRemoteInstallMethod(Enum):
+    """Discriminator for a remote-endpoint transport choice"""
+
+    REMOTE = "remote"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanRemoteTransport(Enum):
+    """Endpoint transport this remote choice would use.
+
+    Transport exposed by a remote endpoint
+    """
+    HTTP = "http"
+    SSE = "sse"
+    STREAMABLE_HTTP = "streamable-http"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanRequiredValueScalarKind(Enum):
+    """Discriminator for a scalar required value"""
+
+    SCALAR = "scalar"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPPlanScalarValueTypeEnum(Enum):
+    """Scalar type the value must conform to.
+
+    Scalar type a required value must conform to
+    """
+    BOOLEAN = "boolean"
+    NUMBER = "number"
+    PATH = "path"
+    STRING = "string"
+
+class MCPServerConfigType(Enum):
+    """Local transport type. Defaults to stdio when omitted.
+
+    Local MCP transport type.
+
+    Remote transport type. Defaults to "http" when omitted.
+
+    In-process MCP transport type.
+    """
+    HTTP = "http"
+    LOCAL = "local"
+    MEMORY = "memory"
+    SSE = "sse"
+    STDIO = "stdio"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 # Internal: this type is an internal SDK API and is not part of the public surface.
 @dataclass
@@ -4868,6 +6010,29 @@ class MCPSamplingExecutionAction(Enum):
     FAILURE = "failure"
     SUCCESS = "success"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPServerConfigHTTPType(Enum):
+    """Remote transport type. Defaults to "http" when omitted."""
+
+    HTTP = "http"
+    SSE = "sse"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+class MCPServerConfigMemoryType(Enum):
+    """In-process MCP transport type."""
+
+    MEMORY = "memory"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPServerConfigStdioType(Enum):
+    """Local transport type. Defaults to stdio when omitted.
+
+    Local MCP transport type.
+    """
+    LOCAL = "local"
+    STDIO = "stdio"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class MCPSetEnvValueModeDetails(Enum):
     """How environment-variable values supplied to MCP servers are resolved. "direct" passes
@@ -4905,6 +6070,28 @@ def to_dict(self) -> dict:
         result["serverName"] = from_str(self.server_name)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPTaskMetadata:
+    """Metadata controlling an MCP task's lifetime.
+
+    MCP task metadata.
+    """
+    ttl: int | None = None
+    """Task time-to-live."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPTaskMetadata':
+        assert isinstance(obj, dict)
+        ttl = from_union([from_int, from_none], obj.get("ttl"))
+        return MCPTaskMetadata(ttl)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.ttl is not None:
+            result["ttl"] = from_union([from_int, from_none], self.ttl)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 # Internal: this type is an internal SDK API and is not part of the public surface.
 @dataclass
@@ -4944,6 +6131,57 @@ def to_dict(self) -> dict:
         result["enabled"] = from_bool(self.enabled)
         return result
 
+@dataclass
+class Categories:
+    """The six normalized `/context` header buckets, computed from the same tokenization as
+    `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer`
+    describe window capacity rather than occupied context, so the values do not sum to
+    `totalTokens`.
+    """
+    buffer: int
+    """Output reserve plus post-blocking-threshold buffer."""
+
+    custom_instructions: int
+    """Custom-instructions tokens (0 when none are configured)."""
+
+    free_space: int
+    """Remaining unused window capacity (clamped at 0)."""
+
+    mcp_tools: int
+    """MCP tool-definition tokens."""
+
+    messages: int
+    """Conversation (user/assistant/tool) message tokens."""
+
+    system_prompt: int
+    """System prompt tokens, excluding custom instructions."""
+
+    system_tools: int
+    """Non-MCP tool-definition tokens."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'Categories':
+        assert isinstance(obj, dict)
+        buffer = from_int(obj.get("buffer"))
+        custom_instructions = from_int(obj.get("customInstructions"))
+        free_space = from_int(obj.get("freeSpace"))
+        mcp_tools = from_int(obj.get("mcpTools"))
+        messages = from_int(obj.get("messages"))
+        system_prompt = from_int(obj.get("systemPrompt"))
+        system_tools = from_int(obj.get("systemTools"))
+        return Categories(buffer, custom_instructions, free_space, mcp_tools, messages, system_prompt, system_tools)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["buffer"] = from_int(self.buffer)
+        result["customInstructions"] = from_int(self.custom_instructions)
+        result["freeSpace"] = from_int(self.free_space)
+        result["mcpTools"] = from_int(self.mcp_tools)
+        result["messages"] = from_int(self.messages)
+        result["systemPrompt"] = from_int(self.system_prompt)
+        result["systemTools"] = from_int(self.system_tools)
+        return result
+
 @dataclass
 class Compactions:
     """Successful compaction history for the session."""
@@ -5281,21 +6519,67 @@ class TaskType(Enum):
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class ModeSetRequest:
-    """Agent interaction mode to apply to the session."""
+class ModelPickerSettingsContext:
+    """Filesystem and environment context used to resolve settings persistence.
 
-    mode: SessionMode
-    """The session mode the agent is operating in"""
+    Filesystem and environment context used to resolve model-picker settings.
+
+    Settings context used when persisting the selected plan model.
+    """
+    environment: dict[str, Any]
+    """Environment variables consulted while resolving model-picker settings."""
+
+    home_directory: str
+    """User home directory used when resolving persisted settings."""
+
+    config_dir: str | None = None
+    """Optional Copilot configuration directory containing persisted settings."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'ModeSetRequest':
+    def from_dict(obj: Any) -> 'ModelPickerSettingsContext':
         assert isinstance(obj, dict)
-        mode = SessionMode(obj.get("mode"))
-        return ModeSetRequest(mode)
+        environment = from_dict(lambda x: x, obj.get("environment"))
+        home_directory = from_str(obj.get("homeDirectory"))
+        config_dir = from_union([from_str, from_none], obj.get("configDir"))
+        return ModelPickerSettingsContext(environment, home_directory, config_dir)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["mode"] = to_enum(SessionMode, self.mode)
+        result["environment"] = from_dict(lambda x: x, self.environment)
+        result["homeDirectory"] = from_str(self.home_directory)
+        if self.config_dir is not None:
+            result["configDir"] = from_union([from_str, from_none], self.config_dir)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModelSwitchConfirmation:
+    """Compaction confirmation projection when status is confirmation_required
+
+    Compaction confirmation required before the mode change can complete.
+    """
+    current_tokens: float
+    """Current conversation token count before switching models."""
+
+    target_limit: float
+    """Target model token limit used by the compaction preflight."""
+
+    target_model_display_name: str
+    """Display name of the model that requires compaction confirmation."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModelSwitchConfirmation':
+        assert isinstance(obj, dict)
+        current_tokens = from_float(obj.get("currentTokens"))
+        target_limit = from_float(obj.get("targetLimit"))
+        target_model_display_name = from_str(obj.get("targetModelDisplayName"))
+        return ModelSwitchConfirmation(current_tokens, target_limit, target_model_display_name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["currentTokens"] = to_float(self.current_tokens)
+        result["targetLimit"] = to_float(self.target_limit)
+        result["targetModelDisplayName"] = from_str(self.target_model_display_name)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -5354,6 +6638,9 @@ class ModelBillingTokenPricesLongContext:
     cache_read_price: float | None = None
     """AI Credits cost per billing batch of cached (read) tokens"""
 
+    cache_write1_h_price: float | None = None
+    """AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens."""
+
     cache_write_price: float | None = None
     """AI Credits cost per billing batch of cache-write (cache creation) tokens."""
 
@@ -5376,12 +6663,13 @@ def from_dict(obj: Any) -> 'ModelBillingTokenPricesLongContext':
         assert isinstance(obj, dict)
         cache_price = from_union([from_float, from_none], obj.get("cachePrice"))
         cache_read_price = from_union([from_float, from_none], obj.get("cacheReadPrice"))
+        cache_write1_h_price = from_union([from_float, from_none], obj.get("cacheWrite1hPrice"))
         cache_write_price = from_union([from_float, from_none], obj.get("cacheWritePrice"))
         context_max = from_union([from_int, from_none], obj.get("contextMax"))
         input_price = from_union([from_float, from_none], obj.get("inputPrice"))
         max_prompt_tokens = from_union([from_int, from_none], obj.get("maxPromptTokens"))
         output_price = from_union([from_float, from_none], obj.get("outputPrice"))
-        return ModelBillingTokenPricesLongContext(cache_price, cache_read_price, cache_write_price, context_max, input_price, max_prompt_tokens, output_price)
+        return ModelBillingTokenPricesLongContext(cache_price, cache_read_price, cache_write1_h_price, cache_write_price, context_max, input_price, max_prompt_tokens, output_price)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -5389,6 +6677,8 @@ def to_dict(self) -> dict:
             result["cachePrice"] = from_union([to_float, from_none], self.cache_price)
         if self.cache_read_price is not None:
             result["cacheReadPrice"] = from_union([to_float, from_none], self.cache_read_price)
+        if self.cache_write1_h_price is not None:
+            result["cacheWrite1hPrice"] = from_union([to_float, from_none], self.cache_write1_h_price)
         if self.cache_write_price is not None:
             result["cacheWritePrice"] = from_union([to_float, from_none], self.cache_write_price)
         if self.context_max is not None:
@@ -5430,10 +6720,39 @@ def to_dict(self) -> dict:
         result["supported_media_types"] = from_list(from_str, self.supported_media_types)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModelMessage:
+    """A service-published message about a model, carrying a stable machine-readable code
+    alongside human-readable text.
+    """
+    code: str
+    """Stable machine-readable identifier for the message, such as `client_version_deprecated`.
+    Hosts can key custom presentation off this; unrecognized codes should fall back to
+    displaying `message`.
+    """
+    message: str
+    """Human-readable message text intended for display to the user."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModelMessage':
+        assert isinstance(obj, dict)
+        code = from_str(obj.get("code"))
+        message = from_str(obj.get("message"))
+        return ModelMessage(code, message)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["code"] = from_str(self.code)
+        result["message"] = from_str(self.message)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class ModelPickerPriceCategory(Enum):
-    """Relative cost tier for token-based billing users"""
+    """Relative cost tier for token-based billing users
 
+    Cost category assigned to the model.
+    """
     HIGH = "high"
     LOW = "low"
     MEDIUM = "medium"
@@ -5447,6 +6766,31 @@ class ModelPolicyState(Enum):
     ENABLED = "enabled"
     UNCONFIGURED = "unconfigured"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModelWarningText:
+    """Warning text the service requires hosts to surface for this model. Present only when the
+    service published at least one warning.
+
+    Service-published warning text that hosts should display when presenting a model.
+    """
+    data_retention: str | None = None
+    """Data-retention warning for the model. The text may contain Markdown links and should be
+    rendered as Markdown when supported.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModelWarningText':
+        assert isinstance(obj, dict)
+        data_retention = from_union([from_str, from_none], obj.get("dataRetention"))
+        return ModelWarningText(data_retention)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.data_retention is not None:
+            result["dataRetention"] = from_union([from_str, from_none], self.data_retention)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ModelCapabilitiesOverrideLimitsVision:
@@ -5523,51 +6867,51 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class ModelSwitchToResult:
-    """The model identifier active on the session after the switch."""
-
-    deferred: bool | None = None
-    """True when the switch was deferred (enqueued as a cancellable `/model` command) because a
-    turn was active or another model change was already queued, rather than applied
-    immediately. When true, the session's live model is unchanged until the queued change
-    drains.
+class ModelsListRequest:
+    git_hub_token: str | None = None
+    """GitHub token accepted for compatibility with existing SDK clients. When provided,
+    resolves this token instead of using the current account.
+    """
+    selection_id: str | None = None
+    """Opaque account identifier returned by `account.getAllUsers`. When omitted, the current
+    account is used.
     """
-    model_id: str | None = None
-    """Currently active model identifier after the switch"""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'ModelSwitchToResult':
+    def from_dict(obj: Any) -> 'ModelsListRequest':
         assert isinstance(obj, dict)
-        deferred = from_union([from_bool, from_none], obj.get("deferred"))
-        model_id = from_union([from_str, from_none], obj.get("modelId"))
-        return ModelSwitchToResult(deferred, model_id)
+        git_hub_token = from_union([from_str, from_none], obj.get("gitHubToken"))
+        selection_id = from_union([from_str, from_none], obj.get("selectionId"))
+        return ModelsListRequest(git_hub_token, selection_id)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        if self.deferred is not None:
-            result["deferred"] = from_union([from_bool, from_none], self.deferred)
-        if self.model_id is not None:
-            result["modelId"] = from_union([from_str, from_none], self.model_id)
+        if self.git_hub_token is not None:
+            result["gitHubToken"] = from_union([from_str, from_none], self.git_hub_token)
+        if self.selection_id is not None:
+            result["selectionId"] = from_union([from_str, from_none], self.selection_id)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class ModelsListRequest:
-    git_hub_token: str | None = None
-    """GitHub token for per-user model listing. When provided, resolves this token to determine
-    the user's Copilot plan and available models instead of using the global auth.
+class MoveMCPLoadingToBackgroundResult:
+    """Result of moving in-flight MCP loading to the background."""
+
+    moved_to_background: bool
+    """Whether an in-flight MCP load was moved to the background, releasing turns that were
+    waiting on it. False when no MCP load was in flight or the waiting turns had already been
+    released.
     """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'ModelsListRequest':
+    def from_dict(obj: Any) -> 'MoveMCPLoadingToBackgroundResult':
         assert isinstance(obj, dict)
-        git_hub_token = from_union([from_str, from_none], obj.get("gitHubToken"))
-        return ModelsListRequest(git_hub_token)
+        moved_to_background = from_bool(obj.get("movedToBackground"))
+        return MoveMCPLoadingToBackgroundResult(moved_to_background)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        if self.git_hub_token is not None:
-            result["gitHubToken"] = from_union([from_str, from_none], self.git_hub_token)
+        result["movedToBackground"] = from_bool(self.moved_to_background)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -5654,8 +6998,10 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ProviderConfigAzure:
-    """Azure-specific provider options."""
+    """Azure authentication configuration for the provider.
 
+    Azure-specific provider options.
+    """
     api_version: str | None = None
     """API version. When set, uses the versioned deployment route. When omitted, uses the GA
     versionless v1 route.
@@ -5675,7 +7021,9 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 class ProviderTransport(Enum):
-    """Provider transport. Defaults to "http".
+    """Transport used to communicate with the provider.
+
+    Provider transport. Defaults to "http".
 
     Transport to be used for provider requests.
     """
@@ -5684,7 +7032,9 @@ class ProviderTransport(Enum):
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 class ProviderType(Enum):
-    """Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.
+    """Provider protocol family.
+
+    Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.
 
     Provider family. Matches the `type` field of a BYOK provider config.
     """
@@ -5694,7 +7044,9 @@ class ProviderType(Enum):
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 class ProviderWireAPI(Enum):
-    """Wire API format (openai/azure only). Defaults to "completions".
+    """Wire API used to communicate with the provider.
+
+    Wire API format (openai/azure only). Defaults to "completions".
 
     Wire API to be used, when required for the provider type.
     """
@@ -5708,7 +7060,10 @@ class OptionsUpdateAdditionalContentExclusionPolicyRuleSource:
     and type.
     """
     name: str
+    """Name of the policy source."""
+
     type: str
+    """Type of the policy source."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'OptionsUpdateAdditionalContentExclusionPolicyRuleSource':
@@ -5782,6 +7137,7 @@ def to_dict(self) -> dict:
 class ApprovalKind(Enum):
     COMMANDS = "commands"
     CUSTOM_TOOL = "custom-tool"
+    EXTENSION_ENV_ACCESS = "extension-env-access"
     EXTENSION_MANAGEMENT = "extension-management"
     EXTENSION_PERMISSION_ACCESS = "extension-permission-access"
     FACTORY = "factory"
@@ -5817,6 +7173,9 @@ class PermissionDecisionApproveForLocationApprovalCommandsKind(Enum):
 class PermissionDecisionApproveForLocationApprovalCustomToolKind(Enum):
     CUSTOM_TOOL = "custom-tool"
 
+class PermissionDecisionApproveForLocationApprovalExtensionEnvAccessKind(Enum):
+    EXTENSION_ENV_ACCESS = "extension-env-access"
+
 class PermissionDecisionApproveForLocationApprovalExtensionManagementKind(Enum):
     EXTENSION_MANAGEMENT = "extension-management"
 
@@ -5832,9 +7191,6 @@ class PermissionDecisionApproveForLocationApprovalMCPKind(Enum):
 class PermissionDecisionApproveForLocationApprovalMCPSamplingKind(Enum):
     MCP_SAMPLING = "mcp-sampling"
 
-class PermissionDecisionApproveForLocationApprovalMemoryKind(Enum):
-    MEMORY = "memory"
-
 class PermissionDecisionApproveForLocationApprovalReadKind(Enum):
     READ = "read"
 
@@ -5862,6 +7218,50 @@ class PermissionDecisionApprovedForSessionKind(Enum):
 class PermissionDecisionCancelledKind(Enum):
     CANCELLED = "cancelled"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class PermissionDecisionOutcome(Enum):
+    """Disposition of the permission request as observed by the responding client.
+
+    Disposition of a permission request as observed by the responding client.
+    """
+    AUTOPILOT_DENIED = "autopilot_denied"
+    AUTO_APPROVED = "auto_approved"
+    PROMPTED_USER = "prompted_user"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class PermissionResponseCapability(Enum):
+    """Whether the responding client could ask a user interactively, was running headlessly, or
+    had no response path. Omit when the client cannot determine this authoritatively.
+
+    Response capability available to the client when it settled a permission request.
+    """
+    HEADLESS = "headless"
+    INTERACTIVE = "interactive"
+    NONE = "none"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class PermissionDecisionSource(Enum):
+    """Controlled reason or actor responsible for the response.
+
+    Controlled reason or actor responsible for a permission response.
+    """
+    ASSISTED_APPROVAL = "assisted_approval"
+    HOST_POLICY = "host_policy"
+    HUMAN_RESPONSE = "human_response"
+    UNATTENDED_FALLBACK = "unattended_fallback"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class PermissionDecisionSurface(Enum):
+    """Client surface that submitted the response.
+
+    Client surface that submitted a permission response.
+    """
+    ACP = "acp"
+    COPILOT_APP = "copilot_app"
+    PROMPT_MODE = "prompt_mode"
+    SDK = "sdk"
+    TUI = "tui"
+
 class PermissionDecisionDeniedByContentExclusionPolicyKind(Enum):
     DENIED_BY_CONTENT_EXCLUSION_POLICY = "denied-by-content-exclusion-policy"
 
@@ -5880,30 +7280,6 @@ class PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUserKind(Enum)
 class PermissionDecisionRejectKind(Enum):
     REJECT = "reject"
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class PermissionDecisionRequest:
-    """Pending permission request ID and the decision to apply (approve/reject and scope)."""
-
-    request_id: str
-    """Request ID of the pending permission request"""
-
-    result: PermissionDecision
-    """The client's response to the pending permission prompt"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'PermissionDecisionRequest':
-        assert isinstance(obj, dict)
-        request_id = from_str(obj.get("requestId"))
-        result = _load_PermissionDecision(obj.get("result"))
-        return PermissionDecisionRequest(request_id, result)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["requestId"] = from_str(self.request_id)
-        result["result"] = (self.result).to_dict()
-        return result
-
 class PermissionDecisionUserNotAvailableKind(Enum):
     USER_NOT_AVAILABLE = "user-not-available"
 
@@ -5959,7 +7335,9 @@ class PermissionPathsAddParams:
 
     path: str
     """Directory to add to the allow-list. The runtime resolves and validates the path before
-    adding.
+    adding, then loads conventional `.github/skills/` and `.github/agents/` definitions under
+    it when their subsystem gates are enabled. Adding the directory is therefore also a trust
+    decision for configuration stored there.
     """
 
     @staticmethod
@@ -6218,7 +7596,10 @@ class PermissionsConfigureAdditionalContentExclusionPolicyRuleSource:
     source name and type.
     """
     name: str
+    """Name of the policy source."""
+
     type: str
+    """Type of the policy source."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'PermissionsConfigureAdditionalContentExclusionPolicyRuleSource':
@@ -6273,15 +7654,34 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class PermissionsGetAllowAllRequest:
+class PermissionsGetModeRequest:
     """No parameters."""
     @staticmethod
-    def from_dict(obj: Any) -> 'PermissionsGetAllowAllRequest':
+    def from_dict(obj: Any) -> 'PermissionsGetModeRequest':
+        assert isinstance(obj, dict)
+        return PermissionsGetModeRequest()
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionsGetModeResult:
+    """Current permission mode."""
+
+    mode: PermissionMode
+    """Current permission mode"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionsGetModeResult':
         assert isinstance(obj, dict)
-        return PermissionsGetAllowAllRequest()
+        mode = PermissionMode(obj.get("mode"))
+        return PermissionsGetModeResult(mode)
 
     def to_dict(self) -> dict:
         result: dict = {}
+        result["mode"] = to_enum(PermissionMode, self.mode)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -6471,6 +7871,31 @@ def to_dict(self) -> dict:
         result["success"] = from_bool(self.success)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionsSetModeResult:
+    """Indicates whether the requested permission mode was applied and reports the authoritative
+    post-mutation mode.
+    """
+    mode: PermissionMode
+    """Authoritative permission mode after the mutation"""
+
+    success: bool
+    """Whether the operation succeeded"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionsSetModeResult':
+        assert isinstance(obj, dict)
+        mode = PermissionMode(obj.get("mode"))
+        success = from_bool(obj.get("success"))
+        return PermissionsSetModeResult(mode, success)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["mode"] = to_enum(PermissionMode, self.mode)
+        result["success"] = from_bool(self.success)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionsSetRequiredRequest:
@@ -6616,6 +8041,12 @@ class PlanSQLTodosRow:
     """A single todo row read from the session SQL `todos` table. All fields are optional
     because the SQL schema is best-effort and the agent may not have populated every column.
     """
+    created_at: str | None = None
+    """Todo creation time, as stored by the session SQL schema's `datetime('now')` default:
+    `YYYY-MM-DD HH:MM:SS` in UTC. Lets clients attribute todos to the work item that created
+    them (e.g. scoping a goal's progress to the todos it produced) rather than to the whole
+    session.
+    """
     description: str | None = None
     """Todo description."""
 
@@ -6631,14 +8062,17 @@ class PlanSQLTodosRow:
     @staticmethod
     def from_dict(obj: Any) -> 'PlanSQLTodosRow':
         assert isinstance(obj, dict)
+        created_at = from_union([from_str, from_none], obj.get("createdAt"))
         description = from_union([from_str, from_none], obj.get("description"))
         id = from_union([from_str, from_none], obj.get("id"))
         status = from_union([from_str, from_none], obj.get("status"))
         title = from_union([from_str, from_none], obj.get("title"))
-        return PlanSQLTodosRow(description, id, status, title)
+        return PlanSQLTodosRow(created_at, description, id, status, title)
 
     def to_dict(self) -> dict:
         result: dict = {}
+        if self.created_at is not None:
+            result["createdAt"] = from_union([from_str, from_none], self.created_at)
         if self.description is not None:
             result["description"] = from_union([from_str, from_none], self.description)
         if self.id is not None:
@@ -6759,6 +8193,27 @@ def to_dict(self) -> dict:
             result["previousVersion"] = from_union([from_str, from_none], self.previous_version)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PluginsBuiltinSetRequest:
+    """Trusted built-in plugin directories to use for this runtime process."""
+
+    paths: list[str]
+    """Complete replacement set of trusted built-in plugin directories. Every entry must be an
+    absolute local filesystem path no longer than 4096 characters.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PluginsBuiltinSetRequest':
+        assert isinstance(obj, dict)
+        paths = from_list(from_str, obj.get("paths"))
+        return PluginsBuiltinSetRequest(paths)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["paths"] = from_list(from_str, self.paths)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PluginsMarketplacesAddRequest:
@@ -6915,6 +8370,33 @@ def to_dict(self) -> dict:
             result["model"] = from_union([from_str, from_none], self.model)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ProviderTokenAcquireRequest:
+    """Asks the SDK client to acquire a bearer token for a BYOK provider whose config set
+    `hasBearerTokenProvider: true`. Issued by the runtime before each outbound model request;
+    the runtime does no caching, so this is sent once per request.
+    """
+    provider_name: str
+    """Name of the BYOK provider needing a token. For the legacy whole-session provider this is
+    the implicit provider name; for named providers it is the configured provider name.
+    """
+    session_id: str
+    """Target session identifier"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ProviderTokenAcquireRequest':
+        assert isinstance(obj, dict)
+        provider_name = from_str(obj.get("providerName"))
+        session_id = from_str(obj.get("sessionId"))
+        return ProviderTokenAcquireRequest(provider_name, session_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["providerName"] = from_str(self.provider_name)
+        result["sessionId"] = from_str(self.session_id)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ProviderTokenAcquireResult:
@@ -7198,6 +8680,7 @@ class QueueDuplicateAtRequest:
     """Parameters for duplicating a queued item."""
 
     id: str
+    """Stable opaque ID of the queued item to duplicate."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'QueueDuplicateAtRequest':
@@ -7426,6 +8909,7 @@ class QueueRemoveAtRequest:
     """Parameters for removing a queued item by stable id."""
 
     id: str
+    """Stable opaque ID of the queued item to remove."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'QueueRemoveAtRequest':
@@ -7484,6 +8968,7 @@ class QueueSendNowRequest:
     """Parameters for steering a queued message into a live turn."""
 
     id: str
+    """Stable opaque ID of the queued item to steer into the live turn."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'QueueSendNowRequest':
@@ -7526,6 +9011,7 @@ class QueueSetDrainPausedRequest:
     one that never acquired it.
     """
     paused: bool
+    """Whether queued-lane draining should be paused."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'QueueSetDrainPausedRequest':
@@ -7544,8 +9030,13 @@ class QueueUpdateTextRequest:
     """Parameters for editing a single queued message."""
 
     id: str
+    """Stable opaque ID of the queued item to edit."""
+
     prompt: str
+    """Replacement prompt sent to the model."""
+
     display_prompt: str | None = None
+    """Optional replacement prompt displayed to the user."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'QueueUpdateTextRequest':
@@ -7913,6 +9404,23 @@ def to_dict(self) -> dict:
         result: dict = {}
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class RemoteSessionHostStatus(Enum):
+    """What a remote host says one of its sessions is doing right now. Deliberately coarse: this
+    is what a host can report for EVERY session in a catalogue listing, without a client
+    subscribing to each one. AHP's `SessionSummary.status` is the source today;
+    `input-needed` covers both a permission prompt and an `ask_user` question, since the
+    summary does not say which.
+
+    Live status as the owning host reports it in its session listing, so a row for a session
+    running elsewhere can show that it is running. Absent for hosts that publish no such
+    status (the cloud task managers), which read as idle.
+    """
+    ERROR = "error"
+    IDLE = "idle"
+    INPUT_NEEDED = "input-needed"
+    WORKING = "working"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class RemoteSessionMetadataRepository:
@@ -7974,6 +9482,42 @@ def to_dict(self) -> dict:
             result["branch"] = from_union([from_str, from_none], self.branch)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SandboxConfigAuth:
+    """Credential-injection capability flags.
+
+    Credential-injection capability flags applied while the sandbox is enabled. For the same
+    capability independent of sandboxing, and matched to the credential's GitHub host, see
+    `shell.credentials`; the two are additive.
+    """
+    gh: bool | None = None
+    """Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the
+    OS keyring the sandbox blocks. Default: false (opt-in).
+    """
+    git: bool | None = None
+    """Whether to inject git credentials as an `http.<url>.extraheader` so authenticated HTTPS
+    git works inside the sandbox without the shell-based credential helper the sandbox
+    blocks. github.com is served by the Copilot token; every other forge (Azure DevOps,
+    GitHub Enterprise Server, GitLab, ...) by a credential the host resolves from the user's
+    own helper before the sandbox is applied. Default: false (opt-in).
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxConfigAuth':
+        assert isinstance(obj, dict)
+        gh = from_union([from_bool, from_none], obj.get("gh"))
+        git = from_union([from_bool, from_none], obj.get("git"))
+        return SandboxConfigAuth(gh, git)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.gh is not None:
+            result["gh"] = from_union([from_bool, from_none], self.gh)
+        if self.git is not None:
+            result["git"] = from_union([from_bool, from_none], self.git)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SandboxConfigUserPolicyExperimentalSeatbelt:
@@ -8104,6 +9648,22 @@ def to_dict(self) -> dict:
             result["keychainAccess"] = from_union([from_bool, from_none], self.keychain_access)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+class _SandboxConfigSource(Enum):
+    """Origin of the sandbox choice supplied by an internal client.
+
+    Origin of the sandbox choice. The runtime uses this only for internal telemetry
+    provenance; managed policy is derived independently.
+    """
+    NEVER_CONFIGURED = "never_configured"
+    REPOSITORY_POLICY = "repository_policy"
+    SESSION_DISABLED = "session_disabled"
+    SESSION_FLAG = "session_flag"
+    UNSUPPORTED_HOST = "unsupported_host"
+    USER_DISABLED = "user_disabled"
+    USER_ENABLED = "user_enabled"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ScheduleAddAtRequest:
@@ -8604,6 +10164,9 @@ class ServerSkill:
     """Optional freeform hint describing the skill's expected arguments, from the
     `argument-hint` frontmatter field
     """
+    command_name: str | None = None
+    """Canonical slash command name used to invoke the skill, without the leading '/'"""
+
     path: str | None = None
     """Absolute path to the skill file"""
 
@@ -8619,9 +10182,10 @@ def from_dict(obj: Any) -> 'ServerSkill':
         source = SkillSource(obj.get("source"))
         user_invocable = from_bool(obj.get("userInvocable"))
         argument_hint = from_union([from_str, from_none], obj.get("argumentHint"))
+        command_name = from_union([from_str, from_none], obj.get("commandName"))
         path = from_union([from_str, from_none], obj.get("path"))
         project_path = from_union([from_str, from_none], obj.get("projectPath"))
-        return ServerSkill(description, enabled, name, source, user_invocable, argument_hint, path, project_path)
+        return ServerSkill(description, enabled, name, source, user_invocable, argument_hint, command_name, path, project_path)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -8632,6 +10196,8 @@ def to_dict(self) -> dict:
         result["userInvocable"] = from_bool(self.user_invocable)
         if self.argument_hint is not None:
             result["argumentHint"] = from_union([from_str, from_none], self.argument_hint)
+        if self.command_name is not None:
+            result["commandName"] = from_union([from_str, from_none], self.command_name)
         if self.path is not None:
             result["path"] = from_union([from_str, from_none], self.path)
         if self.project_path is not None:
@@ -8662,6 +10228,85 @@ def to_dict(self) -> dict:
         result["hasActiveWork"] = from_bool(self.has_active_work)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionAuthLoginRequest:
+    """Internal GitHub login parameters."""
+
+    host: str
+    """GitHub host URL"""
+
+    login: str
+    """GitHub login"""
+
+    token: str
+    """GitHub authentication token"""
+
+    persist: bool | None = None
+    """Whether to persist the token after login"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionAuthLoginRequest':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        login = from_str(obj.get("login"))
+        token = from_str(obj.get("token"))
+        persist = from_union([from_bool, from_none], obj.get("persist"))
+        return SessionAuthLoginRequest(host, login, token, persist)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["login"] = from_str(self.login)
+        result["token"] = from_str(self.token)
+        if self.persist is not None:
+            result["persist"] = from_union([from_bool, from_none], self.persist)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionAuthLogoutUserRequest:
+    """Parameters identifying a GitHub authentication to log out."""
+
+    auth_info: AuthInfo
+    """Authentication information to log out"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionAuthLogoutUserRequest':
+        assert isinstance(obj, dict)
+        auth_info = _load_AuthInfo(obj.get("authInfo"))
+        return SessionAuthLogoutUserRequest(auth_info)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authInfo"] = (self.auth_info).to_dict()
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionAuthSwitchRequest:
+    """Parameters for switching the session's active authentication."""
+
+    auth_info: AuthInfo
+    """Authentication information to activate"""
+
+    token: str | None = None
+    """Optional token paired with the authentication information"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionAuthSwitchRequest':
+        assert isinstance(obj, dict)
+        auth_info = _load_AuthInfo(obj.get("authInfo"))
+        token = from_union([from_str, from_none], obj.get("token"))
+        return SessionAuthSwitchRequest(auth_info, token)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authInfo"] = (self.auth_info).to_dict()
+        if self.token is not None:
+            result["token"] = from_union([from_str, from_none], self.token)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionBulkDeleteResult:
@@ -9092,8 +10737,10 @@ class SessionFSSqliteQueryType(Enum):
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 class SessionFSSqliteTransactionErrorClass(Enum):
-    """SQLite transaction failure classification."""
+    """Machine-readable classification of the transaction failure.
 
+    SQLite transaction failure classification.
+    """
     BUSY_OR_LOCKED = "busyOrLocked"
     FATAL = "fatal"
     POST_COMMIT_AMBIGUOUS = "postCommitAmbiguous"
@@ -9207,6 +10854,8 @@ class SessionLimitPredictionTier(Enum):
     """Tier chosen as the recommended cap.
 
     Semantic usage tier used for a recommended cap or additional headroom.
+
+    Semantic usage tier.
     """
     ADDITIONAL_HEADROOM = "additional_headroom"
     GENEROUS_HEADROOM = "generous_headroom"
@@ -9318,6 +10967,53 @@ def to_dict(self) -> dict:
         result["startupPrompts"] = from_list(from_str, self.startup_prompts)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionManagedPermissions:
+    """Enterprise permission policy expressed with the runtime's managed permission-rule
+    syntax.
+
+    Managed permission policy injected by the SDK host.
+    """
+    allow: list[str] | None = None
+    """Permission rules that allow matching operations unless another managed source, deny, or
+    ask rule restricts them.
+    """
+    ask: list[str] | None = None
+    """Permission rules that require explicit human approval."""
+
+    deny: list[str] | None = None
+    """Permission rules that block matching operations. Deny has highest precedence."""
+
+    disable_bypass_permissions_mode: str | None = None
+    """When set to `disable`, prevents bypass/allow-all permission modes. `allow-auto-only`
+    blocks full allow-all but permits advisory auto-approval. Any other value is accepted
+    rather than failing the session, but is enforced as `disable`: the key is only present to
+    restrict something, so a mode this runtime cannot interpret fails closed to the most
+    restrictive one it knows. Omit the key entirely to impose no restriction.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionManagedPermissions':
+        assert isinstance(obj, dict)
+        allow = from_union([lambda x: from_list(from_str, x), from_none], obj.get("allow"))
+        ask = from_union([lambda x: from_list(from_str, x), from_none], obj.get("ask"))
+        deny = from_union([lambda x: from_list(from_str, x), from_none], obj.get("deny"))
+        disable_bypass_permissions_mode = from_union([from_str, from_none], obj.get("disableBypassPermissionsMode"))
+        return SessionManagedPermissions(allow, ask, deny, disable_bypass_permissions_mode)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.allow is not None:
+            result["allow"] = from_union([lambda x: from_list(from_str, x), from_none], self.allow)
+        if self.ask is not None:
+            result["ask"] = from_union([lambda x: from_list(from_str, x), from_none], self.ask)
+        if self.deny is not None:
+            result["deny"] = from_union([lambda x: from_list(from_str, x), from_none], self.deny)
+        if self.disable_bypass_permissions_mode is not None:
+            result["disableBypassPermissionsMode"] = from_union([from_str, from_none], self.disable_bypass_permissions_mode)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionModelListRequest:
@@ -9342,7 +11038,10 @@ class SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource:
     """Source descriptor for a `sessions.open` content-exclusion rule, with source name and type."""
 
     name: str
+    """Name of the policy source."""
+
     type: str
+    """Type of the policy source."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource':
@@ -9357,6 +11056,75 @@ def to_dict(self) -> dict:
         result["type"] = from_str(self.type)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ShellCredentials:
+    """Command-scoped GitHub credential injection for shell commands.
+
+    Command-scoped GitHub credential injection for the shell commands an agent runs.
+
+    Each channel is opt-in and independent, and injection is scoped to the individual command
+    spawn: the credential is resolved from the session's *current* authentication at every
+    spawn
+    and reaches only spawns whose script actually invokes `git` or `gh`. Because nothing is
+    retained between spawns, replacing the session credential
+    (`session.gitHubAuth.setCredentials`)
+    changes what the next spawned command presents — which seeding a credential into the
+    runtime
+    process's own environment cannot do, since a child's environment is fixed at `exec`.
+
+    The credential is matched to the host it authenticates to, so a github.com credential is
+    never
+    presented to a GitHub Enterprise host and vice versa. Where a channel cannot express that
+    boundary it injects nothing rather than crossing it -- see `gh` below.
+
+    This is independent of `sandboxConfig`: it is a decision about which identity the agent
+    presents, not about what the agent may touch, and it works on every platform whether or
+    not
+    an OS sandboxing backend is available. `sandboxConfig.auth` remains the sandbox-scoped
+    spelling and is additive with this one.
+    """
+    gh: bool | None = None
+    """Whether to authenticate the agent's `gh` commands as the session's GitHub credential, by
+    exporting `GH_TOKEN` to a spawn that runs `gh`. Any inherited `gh` credential is removed
+    from
+    spawns that do not, so the credential stays command-scoped.
+
+    Applies to a github.com credential only. `gh` picks its credential variable from the host
+    a
+    command targets rather than the one the credential belongs to, and the command can choose
+    that
+    target, so `GH_ENTERPRISE_TOKEN` would offer a single-tenant enterprise credential to
+    every
+    other enterprise host. A session whose credential is enterprise-scoped therefore runs
+    `gh`
+    unauthenticated; its `git` commands are unaffected, because `http.<host>.extraheader` is
+    scoped
+    to one host by construction. Default: false (opt-in).
+    """
+    git: bool | None = None
+    """Whether to authenticate the agent's `git` commands as the session's GitHub credential, by
+    injecting an `http.<host>.extraheader` (plus `insteadOf` rewrites so SSH-spelled remotes
+    for
+    that host use the authenticated HTTPS transport). Applied only to a spawn that runs a
+    remote-contacting `git` subcommand. Default: false (opt-in).
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ShellCredentials':
+        assert isinstance(obj, dict)
+        gh = from_union([from_bool, from_none], obj.get("gh"))
+        git = from_union([from_bool, from_none], obj.get("git"))
+        return ShellCredentials(gh, git)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.gh is not None:
+            result["gh"] = from_union([from_bool, from_none], self.gh)
+        if self.git is not None:
+            result["git"] = from_union([from_bool, from_none], self.git)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class ShellInitProfile(Enum):
     """Controls automatic non-interactive profile loading where supported. Explicit initScripts
@@ -9497,12 +11265,21 @@ def to_dict(self) -> dict:
         result["skipped"] = from_list(from_str, self.skipped)
         return result
 
+class SettableAuthInfoType(Enum):
+    API_KEY = "api-key"
+    COPILOT_API_TOKEN = "copilot-api-token"
+    ENV = "env"
+    GH_CLI = "gh-cli"
+    HMAC = "hmac"
+    TOKEN = "token"
+    USER = "user"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionSetCredentialsParams:
     """New auth credentials to install on the session. Omit to leave credentials unchanged."""
 
-    credentials: AuthInfo | None = None
+    credentials: SettableAuthInfo | None = None
     """The new auth credentials to install on the session. When omitted or `undefined`, the call
     is a no-op and the session's existing credentials are preserved. The runtime installs the
     supplied value immediately for outbound model/API requests. When the credential carries a
@@ -9517,7 +11294,7 @@ class SessionSetCredentialsParams:
     @staticmethod
     def from_dict(obj: Any) -> 'SessionSetCredentialsParams':
         assert isinstance(obj, dict)
-        credentials = from_union([_load_AuthInfo, from_none], obj.get("credentials"))
+        credentials = from_union([_load_SettableAuthInfo, from_none], obj.get("credentials"))
         return SessionSetCredentialsParams(credentials)
 
     def to_dict(self) -> dict:
@@ -9562,10 +11339,15 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionSettingsBuiltInToolAvailabilitySnapshot:
-    """Availability of built-in job tools surfaced to boundary consumers."""
+    """Availability of built-in job tools surfaced to boundary consumers.
 
+    Availability of job-specific built-in tools.
+    """
     create_pull_request: bool | None = None
+    """Whether the create-pull-request tool is available."""
+
     report_progress: bool | None = None
+    """Whether the report-progress tool is available."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionSettingsBuiltInToolAvailabilitySnapshot':
@@ -9615,6 +11397,7 @@ class SessionSettingsEvaluatePredicateResult:
     """Result of evaluating a Rust-owned settings predicate."""
 
     enabled: bool
+    """Whether the named settings predicate evaluated to enabled."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionSettingsEvaluatePredicateResult':
@@ -9630,12 +11413,21 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionSettingsModelSnapshot:
-    """Redacted model routing settings for a session."""
+    """Redacted model routing settings for a session.
 
+    Redacted model routing settings.
+    """
     callback_url: str | None = None
+    """Agent service callback URL for job and progress updates."""
+
     default_reasoning_effort: str | None = None
+    """Default reasoning effort for the selected model."""
+
     instance_id: str | None = None
+    """Agent job identifier for the session."""
+
     model: str | None = None
+    """Selected model identifier."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionSettingsModelSnapshot':
@@ -9661,10 +11453,15 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionSettingsOnlineEvaluationSnapshot:
-    """Online-evaluation settings safe to expose across the SDK boundary."""
+    """Online-evaluation settings safe to expose across the SDK boundary.
 
+    Online-evaluation settings safe for SDK consumers.
+    """
     disable_online_evaluation: bool | None = None
+    """Whether online evaluation is disabled."""
+
     enable_online_evaluation_output_file: bool | None = None
+    """Whether online-evaluation output-file generation is enabled."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionSettingsOnlineEvaluationSnapshot':
@@ -9684,20 +11481,45 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionSettingsRepoSnapshot:
-    """Redacted repository and GitHub host settings for a session."""
+    """Redacted repository and GitHub host settings for a session.
 
+    Redacted repository and host settings.
+    """
     branch: str | None = None
+    """Checked-out repository branch."""
+
     commit: str | None = None
+    """Checked-out commit SHA."""
+
     host: str | None = None
+    """GitHub server host name."""
+
     host_protocol: str | None = None
+    """Protocol used to access the GitHub host."""
+
     id: float | None = None
+    """GitHub repository database ID."""
+
     name: str | None = None
+    """Repository name."""
+
     owner_id: float | None = None
+    """GitHub repository owner database ID."""
+
     owner_name: str | None = None
+    """Repository owner login."""
+
     pr_commit_count: float | None = None
+    """Number of commits in the pull request."""
+
     read_write: bool | None = None
+    """Whether the repository is writable."""
+
     secret_scanning_url: str | None = None
+    """GitHub secret-scanning service URL."""
+
     server_url: str | None = None
+    """GitHub server base URL."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionSettingsRepoSnapshot':
@@ -9744,57 +11566,6 @@ def to_dict(self) -> dict:
             result["serverUrl"] = from_union([from_str, from_none], self.server_url)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class SessionSettingsValidationSnapshot:
-    """Redacted validation and memory-tool settings for a session."""
-
-    advisory_enabled: bool | None = None
-    codeql_enabled: bool | None = None
-    code_review_enabled: bool | None = None
-    code_review_model: str | None = None
-    dependabot_timeout: float | None = None
-    memory_store_enabled: bool | None = None
-    memory_vote_enabled: bool | None = None
-    secret_scanning_enabled: bool | None = None
-    timeout: float | None = None
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'SessionSettingsValidationSnapshot':
-        assert isinstance(obj, dict)
-        advisory_enabled = from_union([from_bool, from_none], obj.get("advisoryEnabled"))
-        codeql_enabled = from_union([from_bool, from_none], obj.get("codeqlEnabled"))
-        code_review_enabled = from_union([from_bool, from_none], obj.get("codeReviewEnabled"))
-        code_review_model = from_union([from_str, from_none], obj.get("codeReviewModel"))
-        dependabot_timeout = from_union([from_float, from_none], obj.get("dependabotTimeout"))
-        memory_store_enabled = from_union([from_bool, from_none], obj.get("memoryStoreEnabled"))
-        memory_vote_enabled = from_union([from_bool, from_none], obj.get("memoryVoteEnabled"))
-        secret_scanning_enabled = from_union([from_bool, from_none], obj.get("secretScanningEnabled"))
-        timeout = from_union([from_float, from_none], obj.get("timeout"))
-        return SessionSettingsValidationSnapshot(advisory_enabled, codeql_enabled, code_review_enabled, code_review_model, dependabot_timeout, memory_store_enabled, memory_vote_enabled, secret_scanning_enabled, timeout)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        if self.advisory_enabled is not None:
-            result["advisoryEnabled"] = from_union([from_bool, from_none], self.advisory_enabled)
-        if self.codeql_enabled is not None:
-            result["codeqlEnabled"] = from_union([from_bool, from_none], self.codeql_enabled)
-        if self.code_review_enabled is not None:
-            result["codeReviewEnabled"] = from_union([from_bool, from_none], self.code_review_enabled)
-        if self.code_review_model is not None:
-            result["codeReviewModel"] = from_union([from_str, from_none], self.code_review_model)
-        if self.dependabot_timeout is not None:
-            result["dependabotTimeout"] = from_union([to_float, from_none], self.dependabot_timeout)
-        if self.memory_store_enabled is not None:
-            result["memoryStoreEnabled"] = from_union([from_bool, from_none], self.memory_store_enabled)
-        if self.memory_vote_enabled is not None:
-            result["memoryVoteEnabled"] = from_union([from_bool, from_none], self.memory_vote_enabled)
-        if self.secret_scanning_enabled is not None:
-            result["secretScanningEnabled"] = from_union([from_bool, from_none], self.secret_scanning_enabled)
-        if self.timeout is not None:
-            result["timeout"] = from_union([to_float, from_none], self.timeout)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionSizes:
@@ -10371,9 +12142,6 @@ class SessionsOpenCreateKind(Enum):
 class SessionsOpenHandoffKind(Enum):
     HANDOFF = "handoff"
 
-class SessionsOpenRemoteKind(Enum):
-    REMOTE = "remote"
-
 class SessionsOpenResumeKind(Enum):
     RESUME = "resume"
 
@@ -10620,6 +12388,9 @@ def to_dict(self) -> dict:
             result["expectedFromSessionId"] = from_union([from_str, from_none], self.expected_from_session_id)
         return result
 
+class SettableTokenAuthInfoType(Enum):
+    TOKEN = "token"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ShellCancelUserRequestedRequest:
@@ -10794,6 +12565,9 @@ class Skill:
     """Optional freeform hint describing the skill's expected arguments, from the
     `argument-hint` frontmatter field
     """
+    command_name: str | None = None
+    """Canonical slash command name used to invoke the skill, without the leading '/'"""
+
     path: str | None = None
     """Absolute path to the skill file"""
 
@@ -10809,9 +12583,10 @@ def from_dict(obj: Any) -> 'Skill':
         source = SkillSource(obj.get("source"))
         user_invocable = from_bool(obj.get("userInvocable"))
         argument_hint = from_union([from_str, from_none], obj.get("argumentHint"))
+        command_name = from_union([from_str, from_none], obj.get("commandName"))
         path = from_union([from_str, from_none], obj.get("path"))
         plugin_name = from_union([from_str, from_none], obj.get("pluginName"))
-        return Skill(description, enabled, name, source, user_invocable, argument_hint, path, plugin_name)
+        return Skill(description, enabled, name, source, user_invocable, argument_hint, command_name, path, plugin_name)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -10822,6 +12597,8 @@ def to_dict(self) -> dict:
         result["userInvocable"] = from_bool(self.user_invocable)
         if self.argument_hint is not None:
             result["argumentHint"] = from_union([from_str, from_none], self.argument_hint)
+        if self.command_name is not None:
+            result["commandName"] = from_union([from_str, from_none], self.command_name)
         if self.path is not None:
             result["path"] = from_union([from_str, from_none], self.path)
         if self.plugin_name is not None:
@@ -10837,6 +12614,31 @@ class SkillDiscoveryScope(Enum):
     PERSONAL_COPILOT = "personal-copilot"
     PROJECT = "project"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SkillsConfigSetSkillDisabledRequest:
+    """Adds or removes a single skill from the global disabled list, leaving every other entry
+    untouched.
+    """
+    disabled: bool
+    """True to disable the skill, false to enable it"""
+
+    name: str
+    """Name of the skill to add to or remove from the disabled list"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SkillsConfigSetSkillDisabledRequest':
+        assert isinstance(obj, dict)
+        disabled = from_bool(obj.get("disabled"))
+        name = from_str(obj.get("name"))
+        return SkillsConfigSetSkillDisabledRequest(disabled, name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["disabled"] = from_bool(self.disabled)
+        result["name"] = from_str(self.name)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SkillsDisableRequest:
@@ -10961,16 +12763,56 @@ def to_dict(self) -> dict:
         result["warnings"] = from_list(from_str, self.warnings)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SlashCommandTimelineEntry:
+    """Timeline entry the host should append."""
+
+    text: str
+    """Text displayed for the timeline entry."""
+
+    type: str
+    """Timeline entry presentation type."""
+
+    url: str | None = None
+    """Optional URL associated with the timeline entry."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SlashCommandTimelineEntry':
+        assert isinstance(obj, dict)
+        text = from_str(obj.get("text"))
+        type = from_str(obj.get("type"))
+        url = from_union([from_str, from_none], obj.get("url"))
+        return SlashCommandTimelineEntry(text, type, url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["text"] = from_str(self.text)
+        result["type"] = from_str(self.type)
+        if self.url is not None:
+            result["url"] = from_union([from_str, from_none], self.url)
+        return result
+
+class SlashCommandAddTimelineEntryResultKind(Enum):
+    ADD_TIMELINE_ENTRY = "add-timeline-entry"
+
 class SlashCommandAgentPromptResultKind(Enum):
     AGENT_PROMPT = "agent-prompt"
 
 class SlashCommandCompletedResultKind(Enum):
     COMPLETED = "completed"
 
+class SlashCommandModelPickerDialogKind(Enum):
+    MODEL_PICKER = "model-picker"
+
 class SlashCommandInvocationResultKind(Enum):
+    ADD_TIMELINE_ENTRY = "add-timeline-entry"
     AGENT_PROMPT = "agent-prompt"
     COMPLETED = "completed"
     SELECT_SUBCOMMAND = "select-subcommand"
+    SET_MODEL = "set-model"
+    SET_PLAN_MODEL = "set-plan-model"
+    SHOW_DIALOG = "show-dialog"
     TEXT = "text"
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -11007,6 +12849,15 @@ def to_dict(self) -> dict:
 class SlashCommandSelectSubcommandResultKind(Enum):
     SELECT_SUBCOMMAND = "select-subcommand"
 
+class SlashCommandSetModelResultKind(Enum):
+    SET_MODEL = "set-model"
+
+class SlashCommandSetPlanModelResultKind(Enum):
+    SET_PLAN_MODEL = "set-plan-model"
+
+class SlashCommandShowDialogResultKind(Enum):
+    SHOW_DIALOG = "show-dialog"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class SubagentSettingsEntryContextTier(Enum):
     """Context tier override for matching subagents"""
@@ -11059,6 +12910,109 @@ def to_dict(self) -> dict:
         result["timestamp"] = self.timestamp.isoformat()
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class TaskCompleteData:
+    """Task completion notification with summary from the agent"""
+
+    objective_id: int | None = None
+    """Active autopilot objective ID evaluated by the completion reviewer"""
+
+    outcome: TaskCompletionOutcome | None = None
+    """Semantic completion decision. Absent on legacy events and invalid tool calls"""
+
+    reason: str | None = None
+    """Label-safe runtime rationale for the completion decision (e.g. a cancellation or
+    pause/resume downgrade), when one applies. Reviewer-authored rationale is intentionally
+    omitted here because this event has no IFC label channel; the reviewer's findings remain
+    available through its own labeled sub-agent events
+    """
+    success: bool | None = None
+    """Whether the task was accepted as complete. False when validation failed or completion was
+    rejected or blocked by the reviewer
+    """
+    summary: str | None = None
+    """Summary of the completed task, provided by the agent"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'TaskCompleteData':
+        assert isinstance(obj, dict)
+        objective_id = from_union([from_int, from_none], obj.get("objectiveId"))
+        outcome = from_union([TaskCompletionOutcome, from_none], obj.get("outcome"))
+        reason = from_union([from_str, from_none], obj.get("reason"))
+        success = from_union([from_bool, from_none], obj.get("success"))
+        summary = from_union([from_str, from_none], obj.get("summary"))
+        return TaskCompleteData(objective_id, outcome, reason, success, summary)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.objective_id is not None:
+            result["objectiveId"] = from_union([from_int, from_none], self.objective_id)
+        if self.outcome is not None:
+            result["outcome"] = from_union([lambda x: to_enum(TaskCompletionOutcome, x), from_none], self.outcome)
+        if self.reason is not None:
+            result["reason"] = from_union([from_str, from_none], self.reason)
+        if self.success is not None:
+            result["success"] = from_union([from_bool, from_none], self.success)
+        if self.summary is not None:
+            result["summary"] = from_union([from_str, from_none], self.summary)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class TaskCompletionDecision:
+    """Completion-review decision produced by the task-completion tool."""
+
+    outcome: TaskCompletionOutcome
+    """Semantic result of evaluating the task completion request."""
+
+    completion_eligibility_token: int | None = None
+    """Objective eligibility token captured when the decision was evaluated."""
+
+    completion_rejection_budget_exhausted: bool | None = None
+    """Whether completion was accepted after the reviewer-rejection budget was exhausted."""
+
+    objective_id: int | None = None
+    """Active autopilot objective evaluated by the completion reviewer."""
+
+    reason: str | None = None
+    """Rationale for the completion decision, when one is available."""
+
+    reviewer_derived: bool | None = None
+    """Whether the rationale was derived from completion-reviewer output."""
+
+    reviewer_result_meta: Any = None
+    """Information-flow metadata captured from the completion reviewer."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'TaskCompletionDecision':
+        assert isinstance(obj, dict)
+        outcome = TaskCompletionOutcome(obj.get("outcome"))
+        completion_eligibility_token = from_union([from_int, from_none], obj.get("completionEligibilityToken"))
+        completion_rejection_budget_exhausted = from_union([from_bool, from_none], obj.get("completionRejectionBudgetExhausted"))
+        objective_id = from_union([from_int, from_none], obj.get("objectiveId"))
+        reason = from_union([from_str, from_none], obj.get("reason"))
+        reviewer_derived = from_union([from_bool, from_none], obj.get("reviewerDerived"))
+        reviewer_result_meta = obj.get("reviewerResultMeta")
+        return TaskCompletionDecision(outcome, completion_eligibility_token, completion_rejection_budget_exhausted, objective_id, reason, reviewer_derived, reviewer_result_meta)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["outcome"] = to_enum(TaskCompletionOutcome, self.outcome)
+        if self.completion_eligibility_token is not None:
+            result["completionEligibilityToken"] = from_union([from_int, from_none], self.completion_eligibility_token)
+        if self.completion_rejection_budget_exhausted is not None:
+            result["completionRejectionBudgetExhausted"] = from_union([from_bool, from_none], self.completion_rejection_budget_exhausted)
+        if self.objective_id is not None:
+            result["objectiveId"] = from_union([from_int, from_none], self.objective_id)
+        if self.reason is not None:
+            result["reason"] = from_union([from_str, from_none], self.reason)
+        if self.reviewer_derived is not None:
+            result["reviewerDerived"] = from_union([from_bool, from_none], self.reviewer_derived)
+        if self.reviewer_result_meta is not None:
+            result["reviewerResultMeta"] = self.reviewer_result_meta
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class TaskShellInfoAttachmentMode(Enum):
     """Whether the shell runs inside a managed PTY session or as an independent background
@@ -11355,7 +13309,7 @@ class TasksStartAgentRequest:
     """Type of agent to start (e.g., 'explore', 'task', 'general-purpose')"""
 
     name: str
-    """Short name for the agent, used to generate a human-readable ID"""
+    """Friendly, non-unique name used when displaying the agent"""
 
     prompt: str
     """Task prompt for the agent"""
@@ -11445,8 +13399,8 @@ def to_dict(self) -> dict:
         result["features"] = from_dict(from_str, self.features)
         return result
 
-class TokenAuthInfoType(Enum):
-    TOKEN = "token"
+class TokenProviderAuthInfoType(Enum):
+    TOKEN_PROVIDER = "token-provider"
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
@@ -11492,6 +13446,70 @@ def to_dict(self) -> dict:
             result["parameters"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.parameters)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ToolResultNewMessage:
+    """A message injected by a tool result."""
+
+    content: str
+    """Message content to inject after the tool result."""
+
+    source: str
+    """Source attributed to the injected message."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolResultNewMessage':
+        assert isinstance(obj, dict)
+        content = from_str(obj.get("content"))
+        source = from_str(obj.get("source"))
+        return ToolResultNewMessage(content, source)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["content"] = from_str(self.content)
+        result["source"] = from_str(self.source)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class ToolResultType(Enum):
+    """Execution outcome classification."""
+
+    DENIED = "denied"
+    FAILURE = "failure"
+    REJECTED = "rejected"
+    SUCCESS = "success"
+    TIMEOUT = "timeout"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ToolsExecuteRequest:
+    """A tool name and arguments to execute through the session's native invocation pipeline."""
+
+    arguments: Any
+    """Arguments supplied to the tool."""
+
+    name: str
+    """Name of the currently offered tool to execute."""
+
+    tool_call_id: str | None = None
+    """Optional identifier used to correlate this invocation with its tool call."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolsExecuteRequest':
+        assert isinstance(obj, dict)
+        arguments = obj.get("arguments")
+        name = from_str(obj.get("name"))
+        tool_call_id = from_union([from_str, from_none], obj.get("toolCallId"))
+        return ToolsExecuteRequest(arguments, name, tool_call_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["arguments"] = self.arguments
+        result["name"] = from_str(self.name)
+        if self.tool_call_id is not None:
+            result["toolCallId"] = from_union([from_str, from_none], self.tool_call_id)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ToolsInitializeAndValidateResult:
@@ -11530,6 +13548,19 @@ def to_dict(self) -> dict:
             result["model"] = from_union([from_str, from_none], self.model)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ToolsSetResult:
+    """Empty result after replacing the calling connection's externally implemented tools."""
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolsSetResult':
+        assert isinstance(obj, dict)
+        return ToolsSetResult()
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ToolsUpdateSubagentSettingsResult:
@@ -11626,9 +13657,6 @@ class UIElicitationSchemaPropertyType(Enum):
     NUMBER = "number"
     STRING = "string"
 
-class UIElicitationSchemaType(Enum):
-    OBJECT = "object"
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 class UIElicitationResponseAction(Enum):
     """The user's response: accept (submitted), decline (rejected), or cancel (dismissed)"""
@@ -11672,10 +13700,11 @@ class UIElicitationSchemaPropertyNumberType(Enum):
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class UIEphemeralQueryResult:
-    """Transient answer generated from current conversation context."""
-
+    """Completed transient query. Ordered chunks and the terminal outcome are also delivered
+    through `ui.ephemeral_query` session events while it runs.
+    """
     answer: str
-    """Full assistant response text."""
+    """Answer returned by the model"""
 
     @staticmethod
     def from_dict(obj: Any) -> 'UIEphemeralQueryResult':
@@ -11852,40 +13881,6 @@ def to_dict(self) -> dict:
         result["unregistered"] = from_bool(self.unregistered)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class UsageMetricsCodeChanges:
-    """Aggregated code change metrics"""
-
-    files_modified: list[str]
-    """Distinct file paths modified during the session"""
-
-    files_modified_count: int
-    """Number of distinct files modified"""
-
-    lines_added: int
-    """Total lines of code added"""
-
-    lines_removed: int
-    """Total lines of code removed"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'UsageMetricsCodeChanges':
-        assert isinstance(obj, dict)
-        files_modified = from_list(from_str, obj.get("filesModified"))
-        files_modified_count = from_int(obj.get("filesModifiedCount"))
-        lines_added = from_int(obj.get("linesAdded"))
-        lines_removed = from_int(obj.get("linesRemoved"))
-        return UsageMetricsCodeChanges(files_modified, files_modified_count, lines_added, lines_removed)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["filesModified"] = from_list(from_str, self.files_modified)
-        result["filesModifiedCount"] = from_int(self.files_modified_count)
-        result["linesAdded"] = from_int(self.lines_added)
-        result["linesRemoved"] = from_int(self.lines_removed)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class UsageMetricsModelMetricRequests:
@@ -11969,6 +13964,40 @@ def to_dict(self) -> dict:
             result["reasoningTokens"] = from_union([from_int, from_none], self.reasoning_tokens)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UsageMetricsCodeChanges:
+    """Aggregated code change metrics"""
+
+    files_modified: list[str]
+    """Distinct file paths modified during the session"""
+
+    files_modified_count: int
+    """Number of distinct files modified"""
+
+    lines_added: int
+    """Total lines of code added"""
+
+    lines_removed: int
+    """Total lines of code removed"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UsageMetricsCodeChanges':
+        assert isinstance(obj, dict)
+        files_modified = from_list(from_str, obj.get("filesModified"))
+        files_modified_count = from_int(obj.get("filesModifiedCount"))
+        lines_added = from_int(obj.get("linesAdded"))
+        lines_removed = from_int(obj.get("linesRemoved"))
+        return UsageMetricsCodeChanges(files_modified, files_modified_count, lines_added, lines_removed)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["filesModified"] = from_list(from_str, self.files_modified)
+        result["filesModifiedCount"] = from_int(self.files_modified_count)
+        result["linesAdded"] = from_int(self.lines_added)
+        result["linesRemoved"] = from_int(self.lines_removed)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class UsageMetricsTokenDetail:
@@ -11988,9 +14017,6 @@ def to_dict(self) -> dict:
         result["tokenCount"] = from_int(self.token_count)
         return result
 
-class UserAuthInfoType(Enum):
-    USER = "user"
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class UserSettingMetadata:
@@ -12115,7 +14141,10 @@ class WorkspacesAddSummaryResult:
     """Persisted summary metadata and refreshed workspace metadata."""
 
     summary: dict[str, Any] | None = None
+    """Metadata for the persisted summary."""
+
     workspace: dict[str, Any] | None = None
+    """Refreshed metadata for the containing workspace."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'WorkspacesAddSummaryResult':
@@ -12433,8 +14462,10 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionAuthStatus:
-    """Authentication status and account metadata for the session."""
+    """Authentication status and account metadata for the session.
 
+    Authentication accounts available to the internal session host.
+    """
     is_authenticated: bool
     """Whether the session has resolved authentication"""
 
@@ -12706,451 +14737,1404 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class AllowAllPermissionSetResult:
-    """Indicates whether the operation succeeded and reports the post-mutation state."""
+class BuiltInModelCatalog:
+    """The running runtime's complete catalog of well-known built-in model IDs, including
+    supported models and additional IDs with built-in metadata.
+    """
+    models: list[BuiltInModelCatalogEntry]
+    """Built-in model entries."""
 
-    enabled: bool
-    """Authoritative full allow-all state after the mutation"""
+    @staticmethod
+    def from_dict(obj: Any) -> 'BuiltInModelCatalog':
+        assert isinstance(obj, dict)
+        models = from_list(BuiltInModelCatalogEntry.from_dict, obj.get("models"))
+        return BuiltInModelCatalog(models)
 
-    success: bool
-    """Whether the operation succeeded"""
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["models"] = from_list(lambda x: to_class(BuiltInModelCatalogEntry, x), self.models)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class BuiltinToolFormat:
+    """Custom grammar input format accepted by a built-in tool."""
+
+    definition: str
+    """Grammar definition accepted by the tool."""
 
-    mode: PermissionsAllowAllMode | None = None
-    """Authoritative allow-all mode after the mutation"""
+    syntax: str
+    """Grammar syntax used by the format definition."""
+
+    type: BuiltinToolFormatType
+    """Custom input-format discriminator."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'AllowAllPermissionSetResult':
+    def from_dict(obj: Any) -> 'BuiltinToolFormat':
         assert isinstance(obj, dict)
-        enabled = from_bool(obj.get("enabled"))
-        success = from_bool(obj.get("success"))
-        mode = from_union([PermissionsAllowAllMode, from_none], obj.get("mode"))
-        return AllowAllPermissionSetResult(enabled, success, mode)
+        definition = from_str(obj.get("definition"))
+        syntax = from_str(obj.get("syntax"))
+        type = BuiltinToolFormatType(obj.get("type"))
+        return BuiltinToolFormat(definition, syntax, type)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["enabled"] = from_bool(self.enabled)
-        result["success"] = from_bool(self.success)
-        if self.mode is not None:
-            result["mode"] = from_union([lambda x: to_enum(PermissionsAllowAllMode, x), from_none], self.mode)
+        result["definition"] = from_str(self.definition)
+        result["syntax"] = from_str(self.syntax)
+        result["type"] = to_enum(BuiltinToolFormatType, self.type)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class AllowAllPermissionState:
-    """Current allow-all permission mode."""
+class BuiltinToolInputSchema:
+    """JSON Schema object accepted by a built-in tool."""
 
-    enabled: bool
-    """Whether full allow-all permissions are currently active"""
-
-    mode: PermissionsAllowAllMode | None = None
-    """Current allow-all mode"""
+    type: BuiltinToolInputSchemaType
+    """Root type of the tool input schema."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'AllowAllPermissionState':
+    def from_dict(obj: Any) -> 'BuiltinToolInputSchema':
         assert isinstance(obj, dict)
-        enabled = from_bool(obj.get("enabled"))
-        mode = from_union([PermissionsAllowAllMode, from_none], obj.get("mode"))
-        return AllowAllPermissionState(enabled, mode)
+        type = BuiltinToolInputSchemaType(obj.get("type"))
+        return BuiltinToolInputSchema(type)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["enabled"] = from_bool(self.enabled)
-        if self.mode is not None:
-            result["mode"] = from_union([lambda x: to_enum(PermissionsAllowAllMode, x), from_none], self.mode)
+        result["type"] = to_enum(BuiltinToolInputSchemaType, self.type)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class SlashCommandInput:
-    """Optional unstructured input hint"""
+class CardDigest:
+    """Semantic digest of a strictly parsed and schema-validated JSON MCP card. Both URL-backed
+    and embedded cards are canonicalised with RFC 8785 JSON Canonicalization Scheme, encoded
+    as UTF-8, and hashed with SHA-256.
 
-    hint: str
-    """Hint to display when command input has not been provided"""
+    Semantic digest of the exact validated JSON content bound to the plan handle.
+    """
+    algorithm: CardDigestAlgorithm
+    """Digest algorithm and canonical representation"""
 
-    choices: list[SlashCommandInputChoice] | None = None
-    """Optional literal choices the input accepts, each with a human-facing description; clients
-    may render these as selectable options
+    value: str
+    """SHA-256 digest of the RFC 8785 canonical UTF-8 bytes, encoded as exactly 64 lowercase
+    hexadecimal characters.
     """
-    completion: SlashCommandInputCompletion | None = None
-    """Optional completion hint for the input (e.g. 'directory' for filesystem path completion)"""
 
-    preserve_multiline_input: bool | None = None
-    """When true, clients should pass the full text after the command name as a single argument
-    rather than splitting on whitespace
+    @staticmethod
+    def from_dict(obj: Any) -> 'CardDigest':
+        assert isinstance(obj, dict)
+        algorithm = CardDigestAlgorithm(obj.get("algorithm"))
+        value = from_str(obj.get("value"))
+        return CardDigest(algorithm, value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["algorithm"] = to_enum(CardDigestAlgorithm, self.algorithm)
+        result["value"] = from_str(self.value)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogAuthenticationRequiredError:
+    """An optional catalog authentication exchange did not establish the caller's identity.
+    Anonymous search remains supported; this refusal is reserved for an operation that cannot
+    continue after the attempted exchange. It is distinct from `policy-rejected` and from a
+    network failure, and the reason identifies the recovery action.
     """
-    required: bool | None = None
-    """When true, the command requires non-empty input; clients should render the input hint as
-    required
+    kind: ClassVar[str] = "authentication-required"
+    """Discriminator: the caller is not authenticated"""
+
+    message: str
+    """Human-readable explanation, safe to surface. Never contains a credential or token, nor a
+    query, URL, handle, or secret.
+    """
+    reason: CatalogAuthenticationRequiredReason
+    """Why authentication failed. Only an expired credential justifies attempting a silent
+    refresh; an absent or rejected credential requires sign-in.
     """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'SlashCommandInput':
+    def from_dict(obj: Any) -> 'CatalogAuthenticationRequiredError':
         assert isinstance(obj, dict)
-        hint = from_str(obj.get("hint"))
-        choices = from_union([lambda x: from_list(SlashCommandInputChoice.from_dict, x), from_none], obj.get("choices"))
-        completion = from_union([SlashCommandInputCompletion, from_none], obj.get("completion"))
-        preserve_multiline_input = from_union([from_bool, from_none], obj.get("preserveMultilineInput"))
-        required = from_union([from_bool, from_none], obj.get("required"))
-        return SlashCommandInput(hint, choices, completion, preserve_multiline_input, required)
+        message = from_str(obj.get("message"))
+        reason = CatalogAuthenticationRequiredReason(obj.get("reason"))
+        return CatalogAuthenticationRequiredError(message, reason)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["hint"] = from_str(self.hint)
-        if self.choices is not None:
-            result["choices"] = from_union([lambda x: from_list(lambda x: to_class(SlashCommandInputChoice, x), x), from_none], self.choices)
-        if self.completion is not None:
-            result["completion"] = from_union([lambda x: to_enum(SlashCommandInputCompletion, x), from_none], self.completion)
-        if self.preserve_multiline_input is not None:
-            result["preserveMultilineInput"] = from_union([from_bool, from_none], self.preserve_multiline_input)
-        if self.required is not None:
-            result["required"] = from_union([from_bool, from_none], self.required)
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["reason"] = to_enum(CatalogAuthenticationRequiredReason, self.reason)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class PushAttachmentDirectory:
-    """Directory attachment"""
+class CatalogCandidateSourceEmbedded:
+    """Candidate whose card reference arrived inline. The document and its content-derived
+    properties stay behind the runtime boundary.
+    """
+    kind: ClassVar[str] = "embedded"
+    """Discriminator: the card is embedded, and carries no URL"""
 
-    display_name: str
-    """User-facing display name for the attachment"""
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogCandidateSourceEmbedded':
+        assert isinstance(obj, dict)
+        return CatalogCandidateSourceEmbedded()
 
-    path: str
-    """Absolute directory path"""
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        return result
 
-    type: ClassVar[str] = "directory"
-    """Attachment type discriminator"""
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogCandidateSourceURL:
+    """Candidate whose card is retrieved from a URL through the runtime's hardened fetch
+    boundary.
+    """
+    kind: ClassVar[str] = "url"
+    """Discriminator: the card is URL-backed, and carries no embedded data"""
+
+    url: str
+    """Card URL as advertised. Inert untrusted data: the runtime retrieves it only through its
+    own hardened boundary, and it is never logged.
+    """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'PushAttachmentDirectory':
+    def from_dict(obj: Any) -> 'CatalogCandidateSourceURL':
         assert isinstance(obj, dict)
-        display_name = from_str(obj.get("displayName"))
-        path = from_str(obj.get("path"))
-        return PushAttachmentDirectory(display_name, path)
+        url = from_str(obj.get("url"))
+        return CatalogCandidateSourceURL(url)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["displayName"] = from_str(self.display_name)
-        result["path"] = from_str(self.path)
-        result["type"] = self.type
+        result["kind"] = self.kind
+        result["url"] = from_str(self.url)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class ConnectedRemoteSessionMetadata:
-    """Metadata for a connected remote session."""
+class InstalledPluginSourceURL:
+    """Source descriptor for a direct URL plugin install, with URL, optional ref or full commit
+    SHA, and optional subpath.
+    """
+    source: MCPServerCardURLKind
+    """Constant value. Always "url"."""
 
-    kind: ConnectedRemoteSessionMetadataKind
-    """Neutral SDK discriminator for the connected remote session kind."""
+    url: str
+    """URL of the plugin source."""
 
-    modified_time: datetime
-    """Last session update time as an ISO 8601 string."""
+    path: str | None = None
+    """Optional source-relative path to the plugin."""
 
-    repository: ConnectedRemoteSessionMetadataRepository
-    """Repository associated with the connected remote session."""
+    ref: str | None = None
+    """Optional Git ref to resolve."""
 
-    session_id: str
-    """SDK session ID for the connected remote session."""
+    sha: str | None = None
+    """Optional full 40-character hexadecimal commit SHA."""
 
-    start_time: datetime
-    """Session start time as an ISO 8601 string."""
+    @staticmethod
+    def from_dict(obj: Any) -> 'InstalledPluginSourceURL':
+        assert isinstance(obj, dict)
+        source = MCPServerCardURLKind(obj.get("source"))
+        url = from_str(obj.get("url"))
+        path = from_union([from_str, from_none], obj.get("path"))
+        ref = from_union([from_str, from_none], obj.get("ref"))
+        sha = from_union([from_str, from_none], obj.get("sha"))
+        return InstalledPluginSourceURL(source, url, path, ref, sha)
 
-    name: str | None = None
-    """Optional friendly session name."""
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["source"] = to_enum(MCPServerCardURLKind, self.source)
+        result["url"] = from_str(self.url)
+        if self.path is not None:
+            result["path"] = from_union([from_str, from_none], self.path)
+        if self.ref is not None:
+            result["ref"] = from_union([from_str, from_none], self.ref)
+        if self.sha is not None:
+            result["sha"] = from_union([from_str, from_none], self.sha)
+        return result
 
-    pull_request_number: int | None = None
-    """Pull request number associated with the session."""
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionInstalledPluginSourceURL:
+    """Source descriptor for a direct URL plugin install, with URL, optional ref or full commit
+    SHA, and optional subpath.
+    """
+    source: MCPServerCardURLKind
+    """Constant value. Always "url"."""
 
-    resource_id: str | None = None
-    """Original remote resource identifier."""
+    url: str
+    """URL of the plugin source."""
 
-    stale_at: datetime | None = None
-    """Remote session staleness deadline as an ISO 8601 string."""
+    path: str | None = None
+    """Optional source-relative path to the plugin."""
 
-    state: str | None = None
-    """Remote session state returned by the backing service."""
+    ref: str | None = None
+    """Optional Git ref to resolve."""
 
-    summary: str | None = None
-    """Optional session summary."""
+    sha: str | None = None
+    """Optional full 40-character hexadecimal commit SHA."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'ConnectedRemoteSessionMetadata':
+    def from_dict(obj: Any) -> 'SessionInstalledPluginSourceURL':
         assert isinstance(obj, dict)
-        kind = ConnectedRemoteSessionMetadataKind(obj.get("kind"))
-        modified_time = from_datetime(obj.get("modifiedTime"))
-        repository = ConnectedRemoteSessionMetadataRepository.from_dict(obj.get("repository"))
-        session_id = from_str(obj.get("sessionId"))
-        start_time = from_datetime(obj.get("startTime"))
-        name = from_union([from_str, from_none], obj.get("name"))
-        pull_request_number = from_union([from_int, from_none], obj.get("pullRequestNumber"))
-        resource_id = from_union([from_str, from_none], obj.get("resourceId"))
-        stale_at = from_union([from_datetime, from_none], obj.get("staleAt"))
-        state = from_union([from_str, from_none], obj.get("state"))
-        summary = from_union([from_str, from_none], obj.get("summary"))
-        return ConnectedRemoteSessionMetadata(kind, modified_time, repository, session_id, start_time, name, pull_request_number, resource_id, stale_at, state, summary)
+        source = MCPServerCardURLKind(obj.get("source"))
+        url = from_str(obj.get("url"))
+        path = from_union([from_str, from_none], obj.get("path"))
+        ref = from_union([from_str, from_none], obj.get("ref"))
+        sha = from_union([from_str, from_none], obj.get("sha"))
+        return SessionInstalledPluginSourceURL(source, url, path, ref, sha)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["kind"] = to_enum(ConnectedRemoteSessionMetadataKind, self.kind)
-        result["modifiedTime"] = self.modified_time.isoformat()
-        result["repository"] = to_class(ConnectedRemoteSessionMetadataRepository, self.repository)
-        result["sessionId"] = from_str(self.session_id)
-        result["startTime"] = self.start_time.isoformat()
-        if self.name is not None:
-            result["name"] = from_union([from_str, from_none], self.name)
-        if self.pull_request_number is not None:
-            result["pullRequestNumber"] = from_union([from_int, from_none], self.pull_request_number)
-        if self.resource_id is not None:
-            result["resourceId"] = from_union([from_str, from_none], self.resource_id)
-        if self.stale_at is not None:
-            result["staleAt"] = from_union([lambda x: x.isoformat(), from_none], self.stale_at)
-        if self.state is not None:
-            result["state"] = from_union([from_str, from_none], self.state)
-        if self.summary is not None:
-            result["summary"] = from_union([from_str, from_none], self.summary)
+        result["source"] = to_enum(MCPServerCardURLKind, self.source)
+        result["url"] = from_str(self.url)
+        if self.path is not None:
+            result["path"] = from_union([from_str, from_none], self.path)
+        if self.ref is not None:
+            result["ref"] = from_union([from_str, from_none], self.ref)
+        if self.sha is not None:
+            result["sha"] = from_union([from_str, from_none], self.sha)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class ContentExclusionCheckPathsResult:
-    """Batch content-exclusion result. Callers must fail closed when policy evaluation is
-    unavailable.
+class CatalogNegotiatedContract:
+    """The protocol version and capability set the runtime actually honoured for a successful
+    catalog operation.
+
+    Protocol version and capabilities the runtime honoured.
     """
-    available: bool
-    """Whether the session's policy service was available for the complete batch. When false,
-    checks is empty and callers must treat every requested path as excluded.
+    granted_capabilities: list[CatalogCapability]
+    """Wire features the runtime understood for this operation. Always a superset of the
+    caller's required features, because any shortfall is a refusal instead. Operation
+    availability remains a separate typed result.
     """
-    checks: list[ContentExclusionPathCheck]
-    """Per-path decisions in request order. Empty when available is false."""
+    runtime_protocol_version: int
+    """Protocol version of the runtime that served the request."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'ContentExclusionCheckPathsResult':
+    def from_dict(obj: Any) -> 'CatalogNegotiatedContract':
         assert isinstance(obj, dict)
-        available = from_bool(obj.get("available"))
-        checks = from_list(ContentExclusionPathCheck.from_dict, obj.get("checks"))
-        return ContentExclusionCheckPathsResult(available, checks)
+        granted_capabilities = from_list(CatalogCapability, obj.get("grantedCapabilities"))
+        runtime_protocol_version = from_int(obj.get("runtimeProtocolVersion"))
+        return CatalogNegotiatedContract(granted_capabilities, runtime_protocol_version)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["available"] = from_bool(self.available)
-        result["checks"] = from_list(lambda x: to_class(ContentExclusionPathCheck, x), self.checks)
+        result["grantedCapabilities"] = from_list(lambda x: to_enum(CatalogCapability, x), self.granted_capabilities)
+        result["runtimeProtocolVersion"] = from_int(self.runtime_protocol_version)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class MetadataContextHeaviestMessagesResult:
-    """The heaviest individual messages in the session's context window, most-expensive first."""
+class CatalogSearchRequest:
+    """A bounded catalog search. Both the query length and the result count are capped by the
+    schema so a caller cannot request an unbounded scan.
+    """
+    contract: CatalogClientContract
+    """Protocol version and capabilities the caller requires."""
 
-    messages: list[ContextHeaviestMessage]
-    """Heaviest messages, most-expensive first."""
+    query: str
+    """Free-text search query. Never written to logs or telemetry."""
 
-    total_tokens: int
-    """Total token count of the current context window, so callers can compute each message's
-    share without a second call.
+    kinds: list[CatalogCandidateKind] | None = None
+    """Restrict results to these candidate kinds. When omitted, every kind the runtime supports
+    is searched.
     """
+    limit: int | None = None
+    """Maximum number of candidates to return. Defaults to 10 when omitted."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'MetadataContextHeaviestMessagesResult':
+    def from_dict(obj: Any) -> 'CatalogSearchRequest':
         assert isinstance(obj, dict)
-        messages = from_list(ContextHeaviestMessage.from_dict, obj.get("messages"))
-        total_tokens = from_int(obj.get("totalTokens"))
-        return MetadataContextHeaviestMessagesResult(messages, total_tokens)
+        contract = CatalogClientContract.from_dict(obj.get("contract"))
+        query = from_str(obj.get("query"))
+        kinds = from_union([lambda x: from_list(CatalogCandidateKind, x), from_none], obj.get("kinds"))
+        limit = from_union([from_int, from_none], obj.get("limit"))
+        return CatalogSearchRequest(contract, query, kinds, limit)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["messages"] = from_list(lambda x: to_class(ContextHeaviestMessage, x), self.messages)
-        result["totalTokens"] = from_int(self.total_tokens)
+        result["contract"] = to_class(CatalogClientContract, self.contract)
+        result["query"] = from_str(self.query)
+        if self.kinds is not None:
+            result["kinds"] = from_union([lambda x: from_list(lambda x: to_enum(CatalogCandidateKind, x), x), from_none], self.kinds)
+        if self.limit is not None:
+            result["limit"] = from_union([from_int, from_none], self.limit)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class CanvasHostContextCapabilities:
-    """Host capabilities"""
+class CatalogContractViolationError:
+    """An upstream catalog response broke the wire contract. Most importantly, every result must
+    carry exactly one of a URL or embedded data: a result carrying both, or neither, is
+    refused here rather than being guessed at.
+    """
+    kind: ClassVar[str] = "contract-violation"
+    """Discriminator: the upstream response broke the contract"""
 
-    canvases: bool | None = None
-    """Whether canvas rendering is supported"""
+    message: str
+    """Human-readable explanation, safe to surface. Never echoes response content, nor a query,
+    URL, handle, or secret.
+    """
+    reason: CatalogContractViolationReason
+    """Which rule the response broke."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'CanvasHostContextCapabilities':
+    def from_dict(obj: Any) -> 'CatalogContractViolationError':
         assert isinstance(obj, dict)
-        canvases = from_union([from_bool, from_none], obj.get("canvases"))
-        return CanvasHostContextCapabilities(canvases)
+        message = from_str(obj.get("message"))
+        reason = CatalogContractViolationReason(obj.get("reason"))
+        return CatalogContractViolationError(message, reason)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        if self.canvases is not None:
-            result["canvases"] = from_union([from_bool, from_none], self.canvases)
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["reason"] = to_enum(CatalogContractViolationReason, self.reason)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class DiscoveredCanvas:
-    """Canvas available in the current session."""
-
-    canvas_id: str
-    """Provider-local canvas identifier"""
+class CatalogHandleRejectedError:
+    """A presented handle was not accepted. Handles are runtime-instance scoped, TTL-bound, and
+    single-use, so each way of failing is reported distinctly.
+    """
+    handle_type: CatalogHandleType
+    """Which kind of handle was presented."""
 
-    description: str
-    """Short, single-sentence description shown to the agent in canvas catalogs."""
+    kind: ClassVar[str] = "handle-rejected"
+    """Discriminator: a handle was rejected"""
 
-    display_name: str
-    """Human-readable canvas name"""
+    message: str
+    """Human-readable explanation, safe to surface. Never contains the handle itself, nor a
+    query, URL, or secret.
+    """
+    reason: CatalogHandleRejectionReason
+    """Why the handle was rejected."""
 
-    extension_id: str
-    """Owning provider identifier"""
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogHandleRejectedError':
+        assert isinstance(obj, dict)
+        handle_type = CatalogHandleType(obj.get("handleType"))
+        message = from_str(obj.get("message"))
+        reason = CatalogHandleRejectionReason(obj.get("reason"))
+        return CatalogHandleRejectedError(handle_type, message, reason)
 
-    actions: list[CanvasAction] | None = None
-    """Actions the agent or host may invoke on an open instance"""
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["handleType"] = to_enum(CatalogHandleType, self.handle_type)
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["reason"] = to_enum(CatalogHandleRejectionReason, self.reason)
+        return result
 
-    extension_name: str | None = None
-    """Owning extension display name, when available"""
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogInvalidRequestError:
+    """The request was rejected before any work was done, because a bounded field fell outside
+    its permitted range or a required field was unusable.
+    """
+    field: CatalogInvalidRequestField
+    """Which request field was rejected."""
 
-    icon: str | None = None
-    """Host-local PNG path for the canvas icon, when supplied"""
+    kind: ClassVar[str] = "invalid-request"
+    """Discriminator: the request itself was invalid"""
 
-    input_schema: Any = None
-    """JSON Schema for canvas open input"""
+    message: str
+    """Human-readable explanation, safe to surface. Never echoes the offending value, nor a
+    query, URL, handle, or secret.
+    """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'DiscoveredCanvas':
+    def from_dict(obj: Any) -> 'CatalogInvalidRequestError':
         assert isinstance(obj, dict)
-        canvas_id = from_str(obj.get("canvasId"))
-        description = from_str(obj.get("description"))
-        display_name = from_str(obj.get("displayName"))
-        extension_id = from_str(obj.get("extensionId"))
-        actions = from_union([lambda x: from_list(CanvasAction.from_dict, x), from_none], obj.get("actions"))
-        extension_name = from_union([from_str, from_none], obj.get("extensionName"))
-        icon = from_union([from_str, from_none], obj.get("icon"))
-        input_schema = obj.get("inputSchema")
-        return DiscoveredCanvas(canvas_id, description, display_name, extension_id, actions, extension_name, icon, input_schema)
+        field = CatalogInvalidRequestField(obj.get("field"))
+        message = from_str(obj.get("message"))
+        return CatalogInvalidRequestError(field, message)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["canvasId"] = from_str(self.canvas_id)
-        result["description"] = from_str(self.description)
-        result["displayName"] = from_str(self.display_name)
-        result["extensionId"] = from_str(self.extension_id)
-        if self.actions is not None:
-            result["actions"] = from_union([lambda x: from_list(lambda x: to_class(CanvasAction, x), x), from_none], self.actions)
-        if self.extension_name is not None:
-            result["extensionName"] = from_union([from_str, from_none], self.extension_name)
-        if self.icon is not None:
-            result["icon"] = from_union([from_str, from_none], self.icon)
-        if self.input_schema is not None:
-            result["inputSchema"] = self.input_schema
+        result["field"] = to_enum(CatalogInvalidRequestField, self.field)
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class OpenCanvasInstance:
-    """Open canvas instance snapshot."""
+class CatalogMalformedCardError:
+    """A card could not be parsed or did not satisfy its declared media type's schema."""
 
-    canvas_id: str
-    """Provider-local canvas identifier"""
-
-    extension_id: str
-    """Owning provider identifier"""
+    kind: ClassVar[str] = "malformed-card"
+    """Discriminator: the card was malformed"""
 
-    instance_id: str
-    """Stable caller-supplied canvas instance identifier"""
+    message: str
+    """Human-readable explanation, safe to surface. Never echoes card content, nor a query, URL,
+    handle, or secret.
+    """
+    reason: CatalogMalformedCardReason
+    """How the card failed validation."""
 
-    extension_name: str | None = None
-    """Owning extension display name, when available"""
+    media_type: CatalogMediaType | None = None
+    """Media type the card was interpreted as, when it declared one this runtime recognises."""
 
-    icon: str | None = None
-    """Host-local PNG path for the canvas icon, when supplied"""
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogMalformedCardError':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        reason = CatalogMalformedCardReason(obj.get("reason"))
+        media_type = from_union([CatalogMediaType, from_none], obj.get("mediaType"))
+        return CatalogMalformedCardError(message, reason, media_type)
 
-    input: Any = None
-    """Input supplied when the instance was opened"""
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["reason"] = to_enum(CatalogMalformedCardReason, self.reason)
+        if self.media_type is not None:
+            result["mediaType"] = from_union([lambda x: to_enum(CatalogMediaType, x), from_none], self.media_type)
+        return result
 
-    status: str | None = None
-    """Provider-supplied status text"""
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPServerCardEmbedded:
+    """An MCP server card supplied inline as an inert document."""
 
-    title: str | None = None
-    """Rendered title"""
+    data: str
+    """The card document verbatim, treated as inert untrusted bytes. The runtime parses and
+    validates it; the host is not expected to interpret it. Never logged.
+    """
+    kind: ClassVar[str] = "embedded"
+    """Discriminator: the card is embedded, and carries no URL"""
 
-    url: str | None = None
-    """URL for web-rendered canvases"""
+    media_type: MCPServerCardMediaType
+    """Media type the card is expected to conform to."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'OpenCanvasInstance':
+    def from_dict(obj: Any) -> 'MCPServerCardEmbedded':
         assert isinstance(obj, dict)
-        canvas_id = from_str(obj.get("canvasId"))
-        extension_id = from_str(obj.get("extensionId"))
-        instance_id = from_str(obj.get("instanceId"))
-        extension_name = from_union([from_str, from_none], obj.get("extensionName"))
-        icon = from_union([from_str, from_none], obj.get("icon"))
-        input = obj.get("input")
-        status = from_union([from_str, from_none], obj.get("status"))
-        title = from_union([from_str, from_none], obj.get("title"))
-        url = from_union([from_str, from_none], obj.get("url"))
-        return OpenCanvasInstance(canvas_id, extension_id, instance_id, extension_name, icon, input, status, title, url)
+        data = from_str(obj.get("data"))
+        media_type = MCPServerCardMediaType(obj.get("mediaType"))
+        return MCPServerCardEmbedded(data, media_type)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["canvasId"] = from_str(self.canvas_id)
-        result["extensionId"] = from_str(self.extension_id)
-        result["instanceId"] = from_str(self.instance_id)
-        if self.extension_name is not None:
-            result["extensionName"] = from_union([from_str, from_none], self.extension_name)
-        if self.icon is not None:
-            result["icon"] = from_union([from_str, from_none], self.icon)
-        if self.input is not None:
-            result["input"] = self.input
-        if self.status is not None:
-            result["status"] = from_union([from_str, from_none], self.status)
-        if self.title is not None:
-            result["title"] = from_union([from_str, from_none], self.title)
-        if self.url is not None:
-            result["url"] = from_union([from_str, from_none], self.url)
+        result["data"] = from_str(self.data)
+        result["kind"] = self.kind
+        result["mediaType"] = to_enum(MCPServerCardMediaType, self.media_type)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class CompletionsRequestResult:
-    """Host-driven completion items for the current composer input. Empty when the host returns
-    no items or does not support completions.
+class MCPServerCardURL:
+    """An MCP server card to be retrieved from a URL through the runtime's hardened fetch
+    boundary.
+    """
+    kind: ClassVar[str] = "url"
+    """Discriminator: the card is URL-backed, and carries no embedded data"""
+
+    media_type: MCPServerCardMediaType
+    """Media type the card is expected to conform to."""
+
+    url: str
+    """Card URL. Retrieved only through the runtime's hardened boundary, with scheme,
+    credential, address-range, redirect, timeout, and response-size controls applied. Never
+    logged.
     """
-    items: list[SessionCompletionItem]
-    """Completion items in host-ranked order."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'CompletionsRequestResult':
+    def from_dict(obj: Any) -> 'MCPServerCardURL':
         assert isinstance(obj, dict)
-        items = from_list(SessionCompletionItem.from_dict, obj.get("items"))
-        return CompletionsRequestResult(items)
+        media_type = MCPServerCardMediaType(obj.get("mediaType"))
+        url = from_str(obj.get("url"))
+        return MCPServerCardURL(media_type, url)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["items"] = from_list(lambda x: to_class(SessionCompletionItem, x), self.items)
+        result["kind"] = self.kind
+        result["mediaType"] = to_enum(MCPServerCardMediaType, self.media_type)
+        result["url"] = from_str(self.url)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class DebugCollectLogsCollectedEntry:
-    """A file included in the redacted debug bundle."""
+class CatalogNegotiationRefusedError:
+    """The caller's protocol version or required capabilities cannot be honoured. Returned
+    instead of a partial or ambiguous success.
+    """
+    kind: ClassVar[str] = "negotiation-refused"
+    """Discriminator: capability or protocol-version negotiation failed"""
 
-    bundle_path: str
-    """Relative path of the file in the staged bundle/archive."""
+    message: str
+    """Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+    secret.
+    """
+    minimum_supported_protocol_version: int
+    """Lowest caller protocol version this runtime will serve."""
 
-    size_bytes: int
-    """Redacted output size in bytes."""
+    reason: CatalogNegotiationRefusedReason
+    """Whether the version or the capability set was the problem."""
 
-    source: DebugCollectLogsSource
-    """Source category for this entry."""
+    runtime_protocol_version: int
+    """Protocol version of the runtime that refused the request."""
+
+    supported_capabilities: list[CatalogCapability]
+    """Every wire feature this runtime understands, so the caller can retry within that
+    contract. This list does not imply that every deployment has enabled every operation.
+    """
+    unsupported_capabilities: list[str]
+    """The subset of the caller's bounded extensible capability identifiers this runtime cannot
+    honour.
+    """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'DebugCollectLogsCollectedEntry':
+    def from_dict(obj: Any) -> 'CatalogNegotiationRefusedError':
         assert isinstance(obj, dict)
-        bundle_path = from_str(obj.get("bundlePath"))
-        size_bytes = from_int(obj.get("sizeBytes"))
-        source = DebugCollectLogsSource(obj.get("source"))
-        return DebugCollectLogsCollectedEntry(bundle_path, size_bytes, source)
+        message = from_str(obj.get("message"))
+        minimum_supported_protocol_version = from_int(obj.get("minimumSupportedProtocolVersion"))
+        reason = CatalogNegotiationRefusedReason(obj.get("reason"))
+        runtime_protocol_version = from_int(obj.get("runtimeProtocolVersion"))
+        supported_capabilities = from_list(CatalogCapability, obj.get("supportedCapabilities"))
+        unsupported_capabilities = from_list(from_str, obj.get("unsupportedCapabilities"))
+        return CatalogNegotiationRefusedError(message, minimum_supported_protocol_version, reason, runtime_protocol_version, supported_capabilities, unsupported_capabilities)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["bundlePath"] = from_str(self.bundle_path)
-        result["sizeBytes"] = from_int(self.size_bytes)
-        result["source"] = to_enum(DebugCollectLogsSource, self.source)
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["minimumSupportedProtocolVersion"] = from_int(self.minimum_supported_protocol_version)
+        result["reason"] = to_enum(CatalogNegotiationRefusedReason, self.reason)
+        result["runtimeProtocolVersion"] = from_int(self.runtime_protocol_version)
+        result["supportedCapabilities"] = from_list(lambda x: to_enum(CatalogCapability, x), self.supported_capabilities)
+        result["unsupportedCapabilities"] = from_list(from_str, self.unsupported_capabilities)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogNetworkFailureError:
+    """The runtime could not reach the catalog authority or retrieve a card. Covers being
+    offline as well as transport-level failure.
+    """
+    kind: ClassVar[str] = "network-failure"
+    """Discriminator: the network operation failed"""
+
+    message: str
+    """Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+    secret.
+    """
+    reason: CatalogNetworkFailureReason
+    """Categorised failure, low cardinality so it can be aggregated without carrying a URL."""
+
+    status_code: int | None = None
+    """HTTP status code, when the failure was a rejected response."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogNetworkFailureError':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        reason = CatalogNetworkFailureReason(obj.get("reason"))
+        status_code = from_union([from_int, from_none], obj.get("statusCode"))
+        return CatalogNetworkFailureError(message, reason, status_code)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["reason"] = to_enum(CatalogNetworkFailureReason, self.reason)
+        if self.status_code is not None:
+            result["statusCode"] = from_union([from_int, from_none], self.status_code)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogNotInstallableError:
+    """The candidate is discoverable but cannot be installed. `application/ai-skill` resolves
+    here, because it stays searchable while remaining typed non-installable.
+    """
+    kind: ClassVar[str] = "not-installable"
+    """Discriminator: the candidate cannot be installed"""
+
+    message: str
+    """Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+    secret.
+    """
+    reason: CatalogNotInstallableReason
+    """Why the candidate cannot be installed."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogNotInstallableError':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        reason = CatalogNotInstallableReason(obj.get("reason"))
+        return CatalogNotInstallableError(message, reason)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["reason"] = to_enum(CatalogNotInstallableReason, self.reason)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogPolicyRejectedError:
+    """Registry or enterprise policy refused the operation."""
+
+    kind: ClassVar[str] = "policy-rejected"
+    """Discriminator: policy refused the operation"""
+
+    message: str
+    """Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+    secret.
+    """
+    source: MCPPlanPolicySource
+    """Which authority produced the decision."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogPolicyRejectedError':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        source = MCPPlanPolicySource(obj.get("source"))
+        return CatalogPolicyRejectedError(message, source)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["source"] = to_enum(MCPPlanPolicySource, self.source)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogUnavailableError:
+    """The operation is not available on this runtime. Distinct from a network failure: nothing
+    was attempted.
+    """
+    kind: ClassVar[str] = "unavailable"
+    """Discriminator: the operation is not available"""
+
+    message: str
+    """Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+    secret.
+    """
+    reason: CatalogUnavailableReason
+    """Why the operation is unavailable."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogUnavailableError':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        reason = CatalogUnavailableReason(obj.get("reason"))
+        return CatalogUnavailableError(message, reason)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["reason"] = to_enum(CatalogUnavailableReason, self.reason)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogUnavailableTransportError:
+    """No transport this runtime can use is available for the requested server."""
+
+    kind: ClassVar[str] = "unavailable-transport"
+    """Discriminator: no usable transport is available"""
+
+    message: str
+    """Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+    secret.
+    """
+    reason: CatalogUnavailableTransportReason
+    """Why no transport could be offered."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogUnavailableTransportError':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        reason = CatalogUnavailableTransportReason(obj.get("reason"))
+        return CatalogUnavailableTransportError(message, reason)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["reason"] = to_enum(CatalogUnavailableTransportReason, self.reason)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogUnsafeRetrievalError:
+    """Retrieval was refused by the runtime's hardened fetch boundary before any request left
+    the process, or before a redirect was followed.
+    """
+    kind: ClassVar[str] = "unsafe-retrieval"
+    """Discriminator: retrieval was refused as unsafe"""
+
+    message: str
+    """Human-readable explanation, safe to surface. Never contains the refused URL, nor a query,
+    handle, or secret.
+    """
+    reason: CatalogUnsafeRetrievalReason
+    """Which control refused the retrieval, low cardinality so it can be aggregated without
+    carrying a URL.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogUnsafeRetrievalError':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        reason = CatalogUnsafeRetrievalReason(obj.get("reason"))
+        return CatalogUnsafeRetrievalError(message, reason)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["reason"] = to_enum(CatalogUnsafeRetrievalReason, self.reason)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogUnsupportedKindError:
+    """The request asked for a candidate kind this runtime does not serve."""
+
+    kind: ClassVar[str] = "unsupported-kind"
+    """Discriminator: an unsupported candidate kind was requested"""
+
+    message: str
+    """Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+    secret.
+    """
+    requested_kinds: list[CatalogCandidateKind]
+    """The kinds from the request that are not supported."""
+
+    supported_kinds: list[CatalogCandidateKind]
+    """Every candidate kind this runtime can serve."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogUnsupportedKindError':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        requested_kinds = from_list(CatalogCandidateKind, obj.get("requestedKinds"))
+        supported_kinds = from_list(CatalogCandidateKind, obj.get("supportedKinds"))
+        return CatalogUnsupportedKindError(message, requested_kinds, supported_kinds)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        result["requestedKinds"] = from_list(lambda x: to_enum(CatalogCandidateKind, x), self.requested_kinds)
+        result["supportedKinds"] = from_list(lambda x: to_enum(CatalogCandidateKind, x), self.supported_kinds)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SlashCommandInput:
+    """Optional unstructured input hint"""
+
+    hint: str
+    """Hint to display when command input has not been provided"""
+
+    choices: list[SlashCommandInputChoice] | None = None
+    """Optional literal choices the input accepts, each with a human-facing description; clients
+    may render these as selectable options
+    """
+    completion: SlashCommandInputCompletion | None = None
+    """Optional completion hint for the input (e.g. 'directory' for filesystem path completion)"""
+
+    preserve_multiline_input: bool | None = None
+    """When true, clients should pass the full text after the command name as a single argument
+    rather than splitting on whitespace
+    """
+    required: bool | None = None
+    """When true, the command requires non-empty input; clients should render the input hint as
+    required
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SlashCommandInput':
+        assert isinstance(obj, dict)
+        hint = from_str(obj.get("hint"))
+        choices = from_union([lambda x: from_list(SlashCommandInputChoice.from_dict, x), from_none], obj.get("choices"))
+        completion = from_union([SlashCommandInputCompletion, from_none], obj.get("completion"))
+        preserve_multiline_input = from_union([from_bool, from_none], obj.get("preserveMultilineInput"))
+        required = from_union([from_bool, from_none], obj.get("required"))
+        return SlashCommandInput(hint, choices, completion, preserve_multiline_input, required)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["hint"] = from_str(self.hint)
+        if self.choices is not None:
+            result["choices"] = from_union([lambda x: from_list(lambda x: to_class(SlashCommandInputChoice, x), x), from_none], self.choices)
+        if self.completion is not None:
+            result["completion"] = from_union([lambda x: to_enum(SlashCommandInputCompletion, x), from_none], self.completion)
+        if self.preserve_multiline_input is not None:
+            result["preserveMultilineInput"] = from_union([from_bool, from_none], self.preserve_multiline_input)
+        if self.required is not None:
+            result["required"] = from_union([from_bool, from_none], self.required)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PushAttachmentDirectory:
+    """Directory attachment"""
+
+    display_name: str
+    """User-facing display name for the attachment"""
+
+    path: str
+    """Absolute directory path"""
+
+    type: ClassVar[str] = "directory"
+    """Attachment type discriminator"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PushAttachmentDirectory':
+        assert isinstance(obj, dict)
+        display_name = from_str(obj.get("displayName"))
+        path = from_str(obj.get("path"))
+        return PushAttachmentDirectory(display_name, path)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["displayName"] = from_str(self.display_name)
+        result["path"] = from_str(self.path)
+        result["type"] = self.type
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CommandsFinalizeInvocationEffectRequest:
+    """The pending slash-command invocation effect to finalize, plus whether the host applied or
+    cancelled it.
+    """
+    effect: dict[str, Any]
+    """The slash-command result object that produced the pending effect, echoed back unchanged."""
+
+    outcome: CommandsInvocationEffectOutcome
+    """Whether the host applied or cancelled the pending invocation effect."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CommandsFinalizeInvocationEffectRequest':
+        assert isinstance(obj, dict)
+        effect = from_dict(lambda x: x, obj.get("effect"))
+        outcome = CommandsInvocationEffectOutcome(obj.get("outcome"))
+        return CommandsFinalizeInvocationEffectRequest(effect, outcome)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["effect"] = from_dict(lambda x: x, self.effect)
+        result["outcome"] = to_enum(CommandsInvocationEffectOutcome, self.outcome)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CommandsInvokeRequest:
+    """Slash command name and optional raw input string to invoke."""
+
+    name: str
+    """Command name. Leading slashes are stripped and the name is matched case-insensitively."""
+
+    input: str | None = None
+    """Raw input after the command name"""
+
+    origin: CommandsInvocationOrigin | None = None
+    """Optional client surface that initiated the invocation"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CommandsInvokeRequest':
+        assert isinstance(obj, dict)
+        name = from_str(obj.get("name"))
+        input = from_union([from_str, from_none], obj.get("input"))
+        origin = from_union([CommandsInvocationOrigin, from_none], obj.get("origin"))
+        return CommandsInvokeRequest(name, input, origin)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["name"] = from_str(self.name)
+        if self.input is not None:
+            result["input"] = from_union([from_str, from_none], self.input)
+        if self.origin is not None:
+            result["origin"] = from_union([lambda x: to_enum(CommandsInvocationOrigin, x), from_none], self.origin)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _ConnectRequest:
+    """Connection-level opt-ins for the `server.connect` handshake. Transport authentication is
+    consumed by the native protocol boundary before dispatch.
+    """
+    client_info: _ConnectClientInfo | None = None
+    """Identity of the integrating host. Optional; omit it to keep the default attribution."""
+
+    enable_git_hub_telemetry_forwarding: bool | None = None
+    """Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the
+    runtime forwards every internal telemetry event it emits — across all sessions, plus
+    sessionless events — to this connection over the `gitHubTelemetry.event` notification.
+    Regular events are also written to the runtime's normal GitHub/CTS path (dual-write);
+    host-only compatibility events are forward-only and intentionally skip that path.
+    Intended for first-party hosts that re-emit the events into their own telemetry stores.
+    Both unrestricted and restricted events are forwarded, each tagged with a `restricted`
+    discriminator; a backstop drops restricted events when restricted telemetry is disabled —
+    using the process-global gate for ordinary events and an explicit session-scoped decision
+    for host-only events.
+    """
+    token: str | None = None
+    """Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ConnectRequest':
+        assert isinstance(obj, dict)
+        client_info = from_union([_ConnectClientInfo.from_dict, from_none], obj.get("clientInfo"))
+        enable_git_hub_telemetry_forwarding = from_union([from_bool, from_none], obj.get("enableGitHubTelemetryForwarding"))
+        token = from_union([from_str, from_none], obj.get("token"))
+        return _ConnectRequest(client_info, enable_git_hub_telemetry_forwarding, token)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.client_info is not None:
+            result["clientInfo"] = from_union([lambda x: to_class(_ConnectClientInfo, x), from_none], self.client_info)
+        if self.enable_git_hub_telemetry_forwarding is not None:
+            result["enableGitHubTelemetryForwarding"] = from_union([from_bool, from_none], self.enable_git_hub_telemetry_forwarding)
+        if self.token is not None:
+            result["token"] = from_union([from_str, from_none], self.token)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ConnectedRemoteSessionMetadata:
+    """Metadata for a connected remote session."""
+
+    kind: ConnectedRemoteSessionMetadataKind
+    """Neutral SDK discriminator for the connected remote session kind."""
+
+    modified_time: datetime
+    """Last session update time as an ISO 8601 string."""
+
+    repository: ConnectedRemoteSessionMetadataRepository
+    """Repository associated with the connected remote session."""
+
+    session_id: str
+    """SDK session ID for the connected remote session."""
+
+    start_time: datetime
+    """Session start time as an ISO 8601 string."""
+
+    name: str | None = None
+    """Optional friendly session name."""
+
+    pull_request_number: int | None = None
+    """Pull request number associated with the session."""
+
+    resource_id: str | None = None
+    """Original remote resource identifier."""
+
+    stale_at: datetime | None = None
+    """Remote session staleness deadline as an ISO 8601 string."""
+
+    state: str | None = None
+    """Remote session state returned by the backing service."""
+
+    summary: str | None = None
+    """Optional session summary."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ConnectedRemoteSessionMetadata':
+        assert isinstance(obj, dict)
+        kind = ConnectedRemoteSessionMetadataKind(obj.get("kind"))
+        modified_time = from_datetime(obj.get("modifiedTime"))
+        repository = ConnectedRemoteSessionMetadataRepository.from_dict(obj.get("repository"))
+        session_id = from_str(obj.get("sessionId"))
+        start_time = from_datetime(obj.get("startTime"))
+        name = from_union([from_str, from_none], obj.get("name"))
+        pull_request_number = from_union([from_int, from_none], obj.get("pullRequestNumber"))
+        resource_id = from_union([from_str, from_none], obj.get("resourceId"))
+        stale_at = from_union([from_datetime, from_none], obj.get("staleAt"))
+        state = from_union([from_str, from_none], obj.get("state"))
+        summary = from_union([from_str, from_none], obj.get("summary"))
+        return ConnectedRemoteSessionMetadata(kind, modified_time, repository, session_id, start_time, name, pull_request_number, resource_id, stale_at, state, summary)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = to_enum(ConnectedRemoteSessionMetadataKind, self.kind)
+        result["modifiedTime"] = self.modified_time.isoformat()
+        result["repository"] = to_class(ConnectedRemoteSessionMetadataRepository, self.repository)
+        result["sessionId"] = from_str(self.session_id)
+        result["startTime"] = self.start_time.isoformat()
+        if self.name is not None:
+            result["name"] = from_union([from_str, from_none], self.name)
+        if self.pull_request_number is not None:
+            result["pullRequestNumber"] = from_union([from_int, from_none], self.pull_request_number)
+        if self.resource_id is not None:
+            result["resourceId"] = from_union([from_str, from_none], self.resource_id)
+        if self.stale_at is not None:
+            result["staleAt"] = from_union([lambda x: x.isoformat(), from_none], self.stale_at)
+        if self.state is not None:
+            result["state"] = from_union([from_str, from_none], self.state)
+        if self.summary is not None:
+            result["summary"] = from_union([from_str, from_none], self.summary)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ContentExclusionCheckPathsResult:
+    """Batch content-exclusion result. Callers must fail closed when policy evaluation is
+    unavailable.
+    """
+    available: bool
+    """Whether the session's policy service was available for the complete batch. When false,
+    checks is empty and callers must treat every requested path as excluded.
+    """
+    checks: list[ContentExclusionPathCheck]
+    """Per-path decisions in request order. Empty when available is false."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ContentExclusionCheckPathsResult':
+        assert isinstance(obj, dict)
+        available = from_bool(obj.get("available"))
+        checks = from_list(ContentExclusionPathCheck.from_dict, obj.get("checks"))
+        return ContentExclusionCheckPathsResult(available, checks)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["available"] = from_bool(self.available)
+        result["checks"] = from_list(lambda x: to_class(ContentExclusionPathCheck, x), self.checks)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MetadataContextHeaviestMessagesResult:
+    """The heaviest individual messages in the session's context window, most-expensive first."""
+
+    messages: list[ContextHeaviestMessage]
+    """Heaviest messages, most-expensive first."""
+
+    total_tokens: int
+    """Total token count of the current context window, so callers can compute each message's
+    share without a second call.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MetadataContextHeaviestMessagesResult':
+        assert isinstance(obj, dict)
+        messages = from_list(ContextHeaviestMessage.from_dict, obj.get("messages"))
+        total_tokens = from_int(obj.get("totalTokens"))
+        return MetadataContextHeaviestMessagesResult(messages, total_tokens)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["messages"] = from_list(lambda x: to_class(ContextHeaviestMessage, x), self.messages)
+        result["totalTokens"] = from_int(self.total_tokens)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CanvasHostContextCapabilities:
+    """Host capabilities"""
+
+    canvases: bool | None = None
+    """Whether canvas rendering is supported"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CanvasHostContextCapabilities':
+        assert isinstance(obj, dict)
+        canvases = from_union([from_bool, from_none], obj.get("canvases"))
+        return CanvasHostContextCapabilities(canvases)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.canvases is not None:
+            result["canvases"] = from_union([from_bool, from_none], self.canvases)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class DiscoveredCanvas:
+    """Canvas available in the current session."""
+
+    canvas_id: str
+    """Provider-local canvas identifier"""
+
+    description: str
+    """Short, single-sentence description shown to the agent in canvas catalogs."""
+
+    display_name: str
+    """Human-readable canvas name"""
+
+    extension_id: str
+    """Owning provider identifier"""
+
+    actions: list[CanvasAction] | None = None
+    """Actions the agent or host may invoke on an open instance"""
+
+    extension_name: str | None = None
+    """Owning extension display name, when available"""
+
+    icon: str | None = None
+    """Host-local PNG path for the canvas icon, when supplied"""
+
+    input_schema: Any = None
+    """JSON Schema for canvas open input"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'DiscoveredCanvas':
+        assert isinstance(obj, dict)
+        canvas_id = from_str(obj.get("canvasId"))
+        description = from_str(obj.get("description"))
+        display_name = from_str(obj.get("displayName"))
+        extension_id = from_str(obj.get("extensionId"))
+        actions = from_union([lambda x: from_list(CanvasAction.from_dict, x), from_none], obj.get("actions"))
+        extension_name = from_union([from_str, from_none], obj.get("extensionName"))
+        icon = from_union([from_str, from_none], obj.get("icon"))
+        input_schema = obj.get("inputSchema")
+        return DiscoveredCanvas(canvas_id, description, display_name, extension_id, actions, extension_name, icon, input_schema)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canvasId"] = from_str(self.canvas_id)
+        result["description"] = from_str(self.description)
+        result["displayName"] = from_str(self.display_name)
+        result["extensionId"] = from_str(self.extension_id)
+        if self.actions is not None:
+            result["actions"] = from_union([lambda x: from_list(lambda x: to_class(CanvasAction, x), x), from_none], self.actions)
+        if self.extension_name is not None:
+            result["extensionName"] = from_union([from_str, from_none], self.extension_name)
+        if self.icon is not None:
+            result["icon"] = from_union([from_str, from_none], self.icon)
+        if self.input_schema is not None:
+            result["inputSchema"] = self.input_schema
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class OpenCanvasInstance:
+    """Open canvas instance snapshot."""
+
+    canvas_id: str
+    """Provider-local canvas identifier"""
+
+    extension_id: str
+    """Owning provider identifier"""
+
+    instance_id: str
+    """Stable caller-supplied canvas instance identifier"""
+
+    extension_name: str | None = None
+    """Owning extension display name, when available"""
+
+    icon: str | None = None
+    """Host-local PNG path for the canvas icon, when supplied"""
+
+    input: Any = None
+    """Input supplied when the instance was opened"""
+
+    status: str | None = None
+    """Provider-supplied status text"""
+
+    title: str | None = None
+    """Rendered title"""
+
+    url: str | None = None
+    """URL for web-rendered canvases"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'OpenCanvasInstance':
+        assert isinstance(obj, dict)
+        canvas_id = from_str(obj.get("canvasId"))
+        extension_id = from_str(obj.get("extensionId"))
+        instance_id = from_str(obj.get("instanceId"))
+        extension_name = from_union([from_str, from_none], obj.get("extensionName"))
+        icon = from_union([from_str, from_none], obj.get("icon"))
+        input = obj.get("input")
+        status = from_union([from_str, from_none], obj.get("status"))
+        title = from_union([from_str, from_none], obj.get("title"))
+        url = from_union([from_str, from_none], obj.get("url"))
+        return OpenCanvasInstance(canvas_id, extension_id, instance_id, extension_name, icon, input, status, title, url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canvasId"] = from_str(self.canvas_id)
+        result["extensionId"] = from_str(self.extension_id)
+        result["instanceId"] = from_str(self.instance_id)
+        if self.extension_name is not None:
+            result["extensionName"] = from_union([from_str, from_none], self.extension_name)
+        if self.icon is not None:
+            result["icon"] = from_union([from_str, from_none], self.icon)
+        if self.input is not None:
+            result["input"] = self.input
+        if self.status is not None:
+            result["status"] = from_union([from_str, from_none], self.status)
+        if self.title is not None:
+            result["title"] = from_union([from_str, from_none], self.title)
+        if self.url is not None:
+            result["url"] = from_union([from_str, from_none], self.url)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogAISkillCandidateProvenance:
+    """Where the catalog reference was observed, without the card itself or any content digest.
+
+    Where and when an AI skill catalog reference was observed. Discovery provenance
+    deliberately carries no content digest because search does not establish the exact
+    validated content a later plan will bind.
+    """
+    authority: str
+    """Host of the catalog authority that advertised the reference, without path, query, or
+    credentials. Inert untrusted data.
+    """
+    media_type: MediaType
+    """Media type advertised for the referenced AI skill card"""
+
+    observed_at: str
+    """ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a
+    retrieval or validation timestamp.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogAISkillCandidateProvenance':
+        assert isinstance(obj, dict)
+        authority = from_str(obj.get("authority"))
+        media_type = MediaType(obj.get("mediaType"))
+        observed_at = from_str(obj.get("observedAt"))
+        return CatalogAISkillCandidateProvenance(authority, media_type, observed_at)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authority"] = from_str(self.authority)
+        result["mediaType"] = to_enum(MediaType, self.media_type)
+        result["observedAt"] = from_str(self.observed_at)
+        return result
+
+@dataclass
+class CatalogCandidateProvenance:
+    """Where the catalog reference was observed, without the card itself or any content digest.
+
+    Where and when an MCP server catalog reference was observed. Discovery provenance
+    deliberately carries no content digest because search does not establish the exact
+    validated content a later plan will bind.
+
+    Where and when an AI skill catalog reference was observed. Discovery provenance
+    deliberately carries no content digest because search does not establish the exact
+    validated content a later plan will bind.
+    """
+    authority: str
+    """Host of the catalog authority that advertised the reference, without path, query, or
+    credentials. Inert untrusted data.
+    """
+    media_type: CatalogMediaType
+    """JSON MCP media type advertised for the referenced card.
+
+    Media type advertised for the referenced AI skill card
+    """
+    observed_at: str
+    """ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a
+    retrieval or validation timestamp.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogCandidateProvenance':
+        assert isinstance(obj, dict)
+        authority = from_str(obj.get("authority"))
+        media_type = CatalogMediaType(obj.get("mediaType"))
+        observed_at = from_str(obj.get("observedAt"))
+        return CatalogCandidateProvenance(authority, media_type, observed_at)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authority"] = from_str(self.authority)
+        result["mediaType"] = to_enum(CatalogMediaType, self.media_type)
+        result["observedAt"] = from_str(self.observed_at)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogMCPServerCandidateProvenance:
+    """Where the catalog reference was observed, without the card itself or any content digest.
+
+    Where and when an MCP server catalog reference was observed. Discovery provenance
+    deliberately carries no content digest because search does not establish the exact
+    validated content a later plan will bind.
+    """
+    authority: str
+    """Host of the catalog authority that advertised the reference, without path, query, or
+    credentials. Inert untrusted data.
+    """
+    media_type: MCPServerCardMediaType
+    """JSON MCP media type advertised for the referenced card."""
+
+    observed_at: str
+    """ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a
+    retrieval or validation timestamp.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogMCPServerCandidateProvenance':
+        assert isinstance(obj, dict)
+        authority = from_str(obj.get("authority"))
+        media_type = MCPServerCardMediaType(obj.get("mediaType"))
+        observed_at = from_str(obj.get("observedAt"))
+        return CatalogMCPServerCandidateProvenance(authority, media_type, observed_at)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authority"] = from_str(self.authority)
+        result["mediaType"] = to_enum(MCPServerCardMediaType, self.media_type)
+        result["observedAt"] = from_str(self.observed_at)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CompletionsRequestResult:
+    """Host-driven completion items for the current composer input. Empty when the host returns
+    no items or does not support completions.
+    """
+    items: list[SessionCompletionItem]
+    """Completion items in host-ranked order."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CompletionsRequestResult':
+        assert isinstance(obj, dict)
+        items = from_list(SessionCompletionItem.from_dict, obj.get("items"))
+        return CompletionsRequestResult(items)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["items"] = from_list(lambda x: to_class(SessionCompletionItem, x), self.items)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class DebugCollectLogsCollectedEntry:
+    """A file included in the redacted debug bundle."""
+
+    bundle_path: str
+    """Relative path of the file in the staged bundle/archive."""
+
+    size_bytes: int
+    """Redacted output size in bytes."""
+
+    source: DebugCollectLogsSource
+    """Source category for this entry."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'DebugCollectLogsCollectedEntry':
+        assert isinstance(obj, dict)
+        bundle_path = from_str(obj.get("bundlePath"))
+        size_bytes = from_int(obj.get("sizeBytes"))
+        source = DebugCollectLogsSource(obj.get("source"))
+        return DebugCollectLogsCollectedEntry(bundle_path, size_bytes, source)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["bundlePath"] = from_str(self.bundle_path)
+        result["sizeBytes"] = from_int(self.size_bytes)
+        result["source"] = to_enum(DebugCollectLogsSource, self.source)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -13162,6 +16146,8 @@ class DebugCollectLogsDestination:
     `directory` to stage redacted files for caller-managed upload/post-processing.
     """
     kind: DebugCollectLogsResultKind
+    """Destination variant discriminator."""
+
     no_overwrite: bool | None = None
     """When true, create the archive atomically without overwriting an existing file by
     appending ` (N)` before the extension as needed. Defaults to false.
@@ -13382,6 +16368,41 @@ def to_dict(self) -> dict:
         result["hasMore"] = from_bool(self.has_more)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ExtensionLaunchProviderResolveRequest:
+    """A discovered extension entrypoint that the registered integrator may classify and resolve
+    to an opaque launch profile.
+    """
+    id: str
+    """Source-qualified extension identifier."""
+
+    module_path: str
+    """Absolute path to the discovered extension entrypoint."""
+
+    name: str
+    """Human-readable extension name."""
+
+    source: ExtensionSource
+    """Discovery source for the extension entrypoint."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ExtensionLaunchProviderResolveRequest':
+        assert isinstance(obj, dict)
+        id = from_str(obj.get("id"))
+        module_path = from_str(obj.get("modulePath"))
+        name = from_str(obj.get("name"))
+        source = ExtensionSource(obj.get("source"))
+        return ExtensionLaunchProviderResolveRequest(id, module_path, name, source)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["id"] = from_str(self.id)
+        result["modulePath"] = from_str(self.module_path)
+        result["name"] = from_str(self.name)
+        result["source"] = to_enum(ExtensionSource, self.source)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class Extension:
@@ -13453,6 +16474,27 @@ def to_dict(self) -> dict:
         result["type"] = self.type
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ExtensionLaunchProviderResolveResult:
+    """The launch profile for a supported entrypoint. Omit launch when the provider does not
+    support the entrypoint.
+    """
+    launch: ExtensionLaunchProfile | None = None
+    """Opaque launch profile, omitted when this provider does not support the entrypoint."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ExtensionLaunchProviderResolveResult':
+        assert isinstance(obj, dict)
+        launch = from_union([ExtensionLaunchProfile.from_dict, from_none], obj.get("launch"))
+        return ExtensionLaunchProviderResolveResult(launch)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.launch is not None:
+            result["launch"] = from_union([lambda x: to_class(ExtensionLaunchProfile, x), from_none], self.launch)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ExternalToolTextResultForLlmBinaryResultsForLlm:
@@ -13841,9 +16883,13 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class FactoryRunFailure:
-    """Machine-readable factory run failure.
+    """Machine-readable terminal failure.
+
+    Machine-readable factory run failure.
 
     Machine-readable failure details for an errored run.
+
+    The run stopped because its usage accounting could not be completed.
     """
     run_id: str
     """Factory run identifier.
@@ -13851,6 +16897,8 @@ class FactoryRunFailure:
     Factory run identifier whose changed limits were declined.
     """
     type: FactoryRunFailureType
+    """Factory failure variant discriminator."""
+
     kind: FactoryRunFailureKind | None = None
     """Resource ceiling that stopped the run."""
 
@@ -13866,6 +16914,9 @@ class FactoryRunFailure:
     operation: FactoryDurableOperation | None = None
     """Execution-critical durable operation that failed."""
 
+    drained_nano_aiu: int | None = None
+    """Confirmed usage in nano-AIU, representing the floor of what the run spent."""
+
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryRunFailure':
         assert isinstance(obj, dict)
@@ -13876,7 +16927,8 @@ def from_dict(obj: Any) -> 'FactoryRunFailure':
         reason = from_union([from_str, from_none], obj.get("reason"))
         code = from_union([from_str, from_none], obj.get("code"))
         operation = from_union([FactoryDurableOperation, from_none], obj.get("operation"))
-        return FactoryRunFailure(run_id, type, kind, value, reason, code, operation)
+        drained_nano_aiu = from_union([from_int, from_none], obj.get("drainedNanoAiu"))
+        return FactoryRunFailure(run_id, type, kind, value, reason, code, operation, drained_nano_aiu)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -13892,6 +16944,8 @@ def to_dict(self) -> dict:
             result["code"] = from_union([from_str, from_none], self.code)
         if self.operation is not None:
             result["operation"] = from_union([lambda x: to_enum(FactoryDurableOperation, x), from_none], self.operation)
+        if self.drained_nano_aiu is not None:
+            result["drainedNanoAiu"] = from_union([from_int, from_none], self.drained_nano_aiu)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -13973,18 +17027,47 @@ class FactoryPhaseObservation:
     """Durable lifecycle and timing for one factory phase."""
 
     accumulated_active_ms: int
+    """Completed active time accumulated by this phase in milliseconds."""
+
     current_active_ms: int
+    """Current live active time for this phase in milliseconds."""
+
     entry_count: int
+    """Number of times execution entered this phase."""
+
     id: str
+    """Phase identifier."""
+
     last_entered_run_attempt: int
+    """Most recent run attempt that entered this phase, or `0` if the phase has never been
+    entered.
+    """
     live_agent_count: int
+    """Direct agents in this phase that are currently live."""
+
     status: FactoryPhaseStatus
+    """Derived lifecycle state of the phase."""
+
     title: str
+    """Human-readable phase title."""
+
     total_agent_count: int
+    """Total direct agents associated with this phase."""
+
     completed_at: int | None = None
+    """Epoch milliseconds when this phase completed; for a skipped phase, the synthetic skip
+    timestamp (equal to `startedAt`).
+    """
     detail: str | None = None
+    """Optional human-readable phase detail."""
+
     ordinal: int | None = None
+    """Zero-based declared phase ordinal, or null for an undeclared phase."""
+
     started_at: int | None = None
+    """Epoch milliseconds when this phase first started; for a skipped phase, the synthetic skip
+    timestamp (equal to `completedAt`).
+    """
 
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryPhaseObservation':
@@ -14077,6 +17160,116 @@ def to_dict(self) -> dict:
             result["resumeFromRunId"] = from_union([from_str, from_none], self.resume_from_run_id)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class GitHubTokenAcquireRequest:
+    """Asks the SDK client to acquire a GitHub access token from an opaque callback registration."""
+
+    host: str
+    """Effective GitHub host for which the callback must return a token."""
+
+    reason: GitHubTokenAcquireReason
+    """Why the runtime is requesting a GitHub credential."""
+
+    registration_id: str
+    """Opaque identifier generated by the SDK for this callback registration."""
+
+    session_id: str | None = None
+    """Session receiving the token. Absent only before a cloud session has been assigned its id."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'GitHubTokenAcquireRequest':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        reason = GitHubTokenAcquireReason(obj.get("reason"))
+        registration_id = from_str(obj.get("registrationId"))
+        session_id = from_union([from_str, from_none], obj.get("sessionId"))
+        return GitHubTokenAcquireRequest(host, reason, registration_id, session_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["reason"] = to_enum(GitHubTokenAcquireReason, self.reason)
+        result["registrationId"] = from_str(self.registration_id)
+        if self.session_id is not None:
+            result["sessionId"] = from_union([from_str, from_none], self.session_id)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class GitHubTokenAcquireResult:
+    """SDK host response to a GitHub credential request."""
+
+    kind: GitHubTokenAcquireResultKind
+    """GitHub credential response variant discriminator."""
+
+    access_token: str | None = None
+    """GitHub access token acquired by the SDK host."""
+
+    expires_in: int | None = None
+    """Remaining token lifetime in seconds when callback execution completes. It must exceed the
+    one-hour preflight refresh threshold.
+    """
+    token_type: str | None = None
+    """OAuth token type. Defaults to bearer when omitted."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'GitHubTokenAcquireResult':
+        assert isinstance(obj, dict)
+        kind = GitHubTokenAcquireResultKind(obj.get("kind"))
+        access_token = from_union([from_str, from_none], obj.get("accessToken"))
+        expires_in = from_union([from_int, from_none], obj.get("expiresIn"))
+        token_type = from_union([from_str, from_none], obj.get("tokenType"))
+        return GitHubTokenAcquireResult(kind, access_token, expires_in, token_type)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = to_enum(GitHubTokenAcquireResultKind, self.kind)
+        if self.access_token is not None:
+            result["accessToken"] = from_union([from_str, from_none], self.access_token)
+        if self.expires_in is not None:
+            result["expiresIn"] = from_union([from_int, from_none], self.expires_in)
+        if self.token_type is not None:
+            result["tokenType"] = from_union([from_str, from_none], self.token_type)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPOauthPendingRequestResponse:
+    """Host response to the pending OAuth request."""
+
+    kind: GitHubTokenAcquireResultKind
+    """OAuth response variant discriminator."""
+
+    access_token: str | None = None
+    """Access token acquired by the SDK host"""
+
+    expires_in: int | None = None
+    """Token lifetime in seconds, if known."""
+
+    token_type: str | None = None
+    """OAuth token type. Defaults to bearer when omitted."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPOauthPendingRequestResponse':
+        assert isinstance(obj, dict)
+        kind = GitHubTokenAcquireResultKind(obj.get("kind"))
+        access_token = from_union([from_str, from_none], obj.get("accessToken"))
+        expires_in = from_union([from_int, from_none], obj.get("expiresIn"))
+        token_type = from_union([from_str, from_none], obj.get("tokenType"))
+        return MCPOauthPendingRequestResponse(kind, access_token, expires_in, token_type)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = to_enum(GitHubTokenAcquireResultKind, self.kind)
+        if self.access_token is not None:
+            result["accessToken"] = from_union([from_str, from_none], self.access_token)
+        if self.expires_in is not None:
+            result["expiresIn"] = from_union([from_int, from_none], self.expires_in)
+        if self.token_type is not None:
+            result["tokenType"] = from_union([from_str, from_none], self.token_type)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HistoryCompactResult:
@@ -14277,7 +17470,7 @@ class InstalledPluginSource:
 
     Source descriptor for a direct local plugin install, with a local filesystem path.
     """
-    source: PurpleSource
+    source: InstalledPluginSourceURLSource
     """Constant value. Always "github".
 
     Constant value. Always "url".
@@ -14285,17 +17478,28 @@ class InstalledPluginSource:
     Constant value. Always "local".
     """
     path: str | None = None
+    """Optional repository-relative path to the plugin.
+
+    Optional source-relative path to the plugin.
+
+    Local filesystem path to the plugin.
+    """
     ref: str | None = None
+    """Optional Git ref to resolve."""
+
     repo: str | None = None
+    """GitHub repository in `owner/repo` form."""
+
     sha: str | None = None
     """Optional full 40-character hexadecimal commit SHA."""
 
     url: str | None = None
+    """URL of the plugin source."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'InstalledPluginSource':
         assert isinstance(obj, dict)
-        source = PurpleSource(obj.get("source"))
+        source = InstalledPluginSourceURLSource(obj.get("source"))
         path = from_union([from_str, from_none], obj.get("path"))
         ref = from_union([from_str, from_none], obj.get("ref"))
         repo = from_union([from_str, from_none], obj.get("repo"))
@@ -14305,7 +17509,7 @@ def from_dict(obj: Any) -> 'InstalledPluginSource':
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["source"] = to_enum(PurpleSource, self.source)
+        result["source"] = to_enum(InstalledPluginSourceURLSource, self.source)
         if self.path is not None:
             result["path"] = from_union([from_str, from_none], self.path)
         if self.ref is not None:
@@ -14329,7 +17533,7 @@ class SessionInstalledPluginSource:
 
     Source descriptor for a direct local plugin install, with a local filesystem path.
     """
-    source: PurpleSource
+    source: InstalledPluginSourceURLSource
     """Constant value. Always "github".
 
     Constant value. Always "url".
@@ -14337,17 +17541,28 @@ class SessionInstalledPluginSource:
     Constant value. Always "local".
     """
     path: str | None = None
+    """Optional repository-relative path to the plugin.
+
+    Optional source-relative path to the plugin.
+
+    Local filesystem path to the plugin.
+    """
     ref: str | None = None
+    """Optional Git ref to resolve."""
+
     repo: str | None = None
+    """GitHub repository in `owner/repo` form."""
+
     sha: str | None = None
     """Optional full 40-character hexadecimal commit SHA."""
 
     url: str | None = None
+    """URL of the plugin source."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionInstalledPluginSource':
         assert isinstance(obj, dict)
-        source = PurpleSource(obj.get("source"))
+        source = InstalledPluginSourceURLSource(obj.get("source"))
         path = from_union([from_str, from_none], obj.get("path"))
         ref = from_union([from_str, from_none], obj.get("ref"))
         repo = from_union([from_str, from_none], obj.get("repo"))
@@ -14357,7 +17572,7 @@ def from_dict(obj: Any) -> 'SessionInstalledPluginSource':
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["source"] = to_enum(PurpleSource, self.source)
+        result["source"] = to_enum(InstalledPluginSourceURLSource, self.source)
         if self.path is not None:
             result["path"] = from_union([from_str, from_none], self.path)
         if self.ref is not None:
@@ -14377,11 +17592,17 @@ class InstalledPluginSourceGitHub:
     full commit SHA, and optional subpath.
     """
     repo: str
-    source: FluffySource
+    """GitHub repository in `owner/repo` form."""
+
+    source: PurpleSource
     """Constant value. Always "github"."""
 
     path: str | None = None
+    """Optional repository-relative path to the plugin."""
+
     ref: str | None = None
+    """Optional Git ref to resolve."""
+
     sha: str | None = None
     """Optional full 40-character hexadecimal commit SHA."""
 
@@ -14389,7 +17610,7 @@ class InstalledPluginSourceGitHub:
     def from_dict(obj: Any) -> 'InstalledPluginSourceGitHub':
         assert isinstance(obj, dict)
         repo = from_str(obj.get("repo"))
-        source = FluffySource(obj.get("source"))
+        source = PurpleSource(obj.get("source"))
         path = from_union([from_str, from_none], obj.get("path"))
         ref = from_union([from_str, from_none], obj.get("ref"))
         sha = from_union([from_str, from_none], obj.get("sha"))
@@ -14398,7 +17619,7 @@ def from_dict(obj: Any) -> 'InstalledPluginSourceGitHub':
     def to_dict(self) -> dict:
         result: dict = {}
         result["repo"] = from_str(self.repo)
-        result["source"] = to_enum(FluffySource, self.source)
+        result["source"] = to_enum(PurpleSource, self.source)
         if self.path is not None:
             result["path"] = from_union([from_str, from_none], self.path)
         if self.ref is not None:
@@ -14414,11 +17635,17 @@ class SessionInstalledPluginSourceGitHub:
     full commit SHA, and optional subpath.
     """
     repo: str
-    source: FluffySource
+    """GitHub repository in `owner/repo` form."""
+
+    source: PurpleSource
     """Constant value. Always "github"."""
 
     path: str | None = None
+    """Optional repository-relative path to the plugin."""
+
     ref: str | None = None
+    """Optional Git ref to resolve."""
+
     sha: str | None = None
     """Optional full 40-character hexadecimal commit SHA."""
 
@@ -14426,7 +17653,7 @@ class SessionInstalledPluginSourceGitHub:
     def from_dict(obj: Any) -> 'SessionInstalledPluginSourceGitHub':
         assert isinstance(obj, dict)
         repo = from_str(obj.get("repo"))
-        source = FluffySource(obj.get("source"))
+        source = PurpleSource(obj.get("source"))
         path = from_union([from_str, from_none], obj.get("path"))
         ref = from_union([from_str, from_none], obj.get("ref"))
         sha = from_union([from_str, from_none], obj.get("sha"))
@@ -14435,7 +17662,7 @@ def from_dict(obj: Any) -> 'SessionInstalledPluginSourceGitHub':
     def to_dict(self) -> dict:
         result: dict = {}
         result["repo"] = from_str(self.repo)
-        result["source"] = to_enum(FluffySource, self.source)
+        result["source"] = to_enum(PurpleSource, self.source)
         if self.path is not None:
             result["path"] = from_union([from_str, from_none], self.path)
         if self.ref is not None:
@@ -14450,20 +17677,22 @@ class InstalledPluginSourceLocal:
     """Source descriptor for a direct local plugin install, with a local filesystem path."""
 
     path: str
-    source: TentacledSource
+    """Local filesystem path to the plugin."""
+
+    source: FluffySource
     """Constant value. Always "local"."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'InstalledPluginSourceLocal':
         assert isinstance(obj, dict)
         path = from_str(obj.get("path"))
-        source = TentacledSource(obj.get("source"))
+        source = FluffySource(obj.get("source"))
         return InstalledPluginSourceLocal(path, source)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["path"] = from_str(self.path)
-        result["source"] = to_enum(TentacledSource, self.source)
+        result["source"] = to_enum(FluffySource, self.source)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -14472,94 +17701,22 @@ class SessionInstalledPluginSourceLocal:
     """Source descriptor for a direct local plugin install, with a local filesystem path."""
 
     path: str
-    source: TentacledSource
+    """Local filesystem path to the plugin."""
+
+    source: FluffySource
     """Constant value. Always "local"."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionInstalledPluginSourceLocal':
         assert isinstance(obj, dict)
         path = from_str(obj.get("path"))
-        source = TentacledSource(obj.get("source"))
+        source = FluffySource(obj.get("source"))
         return SessionInstalledPluginSourceLocal(path, source)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["path"] = from_str(self.path)
-        result["source"] = to_enum(TentacledSource, self.source)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class InstalledPluginSourceURL:
-    """Source descriptor for a direct URL plugin install, with URL, optional ref or full commit
-    SHA, and optional subpath.
-    """
-    source: StickySource
-    """Constant value. Always "url"."""
-
-    url: str
-    path: str | None = None
-    ref: str | None = None
-    sha: str | None = None
-    """Optional full 40-character hexadecimal commit SHA."""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'InstalledPluginSourceURL':
-        assert isinstance(obj, dict)
-        source = StickySource(obj.get("source"))
-        url = from_str(obj.get("url"))
-        path = from_union([from_str, from_none], obj.get("path"))
-        ref = from_union([from_str, from_none], obj.get("ref"))
-        sha = from_union([from_str, from_none], obj.get("sha"))
-        return InstalledPluginSourceURL(source, url, path, ref, sha)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["source"] = to_enum(StickySource, self.source)
-        result["url"] = from_str(self.url)
-        if self.path is not None:
-            result["path"] = from_union([from_str, from_none], self.path)
-        if self.ref is not None:
-            result["ref"] = from_union([from_str, from_none], self.ref)
-        if self.sha is not None:
-            result["sha"] = from_union([from_str, from_none], self.sha)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class SessionInstalledPluginSourceURL:
-    """Source descriptor for a direct URL plugin install, with URL, optional ref or full commit
-    SHA, and optional subpath.
-    """
-    source: StickySource
-    """Constant value. Always "url"."""
-
-    url: str
-    path: str | None = None
-    ref: str | None = None
-    sha: str | None = None
-    """Optional full 40-character hexadecimal commit SHA."""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'SessionInstalledPluginSourceURL':
-        assert isinstance(obj, dict)
-        source = StickySource(obj.get("source"))
-        url = from_str(obj.get("url"))
-        path = from_union([from_str, from_none], obj.get("path"))
-        ref = from_union([from_str, from_none], obj.get("ref"))
-        sha = from_union([from_str, from_none], obj.get("sha"))
-        return SessionInstalledPluginSourceURL(source, url, path, ref, sha)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["source"] = to_enum(StickySource, self.source)
-        result["url"] = from_str(self.url)
-        if self.path is not None:
-            result["path"] = from_union([from_str, from_none], self.path)
-        if self.ref is not None:
-            result["ref"] = from_union([from_str, from_none], self.ref)
-        if self.sha is not None:
-            result["sha"] = from_union([from_str, from_none], self.sha)
+        result["source"] = to_enum(FluffySource, self.source)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -14640,6 +17797,8 @@ class LlmInferenceHTTPRequestStartRequest:
     """The head of an outbound model-layer HTTP request."""
 
     headers: dict[str, list[str]]
+    """HTTP request headers, preserving multiple values per name."""
+
     method: str
     """HTTP method, e.g. GET, POST."""
 
@@ -14892,24 +18051,55 @@ def to_dict(self) -> dict:
 @dataclass
 class Workspace:
     id: str
+    """Stable workspace identifier."""
+
     branch: str | None = None
+    """Current Git branch."""
+
     chronicle_sync_dismissed: bool | None = None
+    """Whether the per-session Chronicle upgrade prompt was dismissed for the workspace."""
+
     client_name: str | None = None
+    """Name of the client that created the workspace."""
+
     created_at: datetime | None = None
+    """Timestamp when the workspace was created."""
+
     cwd: str | None = None
+    """Current working directory associated with the workspace."""
+
     git_root: str | None = None
+    """Git repository root associated with the workspace."""
+
     host_type: HostType | None = None
     """Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration."""
 
     mc_last_event_id: str | None = None
+    """Most recent Mission Control event identifier observed for the workspace."""
+
     mc_session_id: str | None = None
+    """Mission Control session identifier associated with the workspace."""
+
     mc_task_id: str | None = None
+    """Mission Control task identifier associated with the workspace."""
+
     name: str | None = None
+    """Workspace display name."""
+
     remote_steerable: bool | None = None
+    """Whether the workspace session can be steered remotely."""
+
     repository: str | None = None
+    """Repository identifier associated with the workspace."""
+
     summary_count: int | None = None
+    """Number of persisted summaries in the workspace."""
+
     updated_at: datetime | None = None
+    """Timestamp when the workspace was last updated."""
+
     user_named: bool | None = None
+    """Whether the workspace name was explicitly chosen by the user."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'Workspace':
@@ -15215,95 +18405,6 @@ def to_dict(self) -> dict:
         result["contents"] = from_list(lambda x: to_class(MCPAppsResourceContent, x), self.contents)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class MCPServerConfigStdio:
-    """Stdio MCP server configuration launched as a child process."""
-
-    command: str
-    """Executable command used to start the Stdio MCP server process."""
-
-    args: list[str] | None = None
-    """Command-line arguments passed to the Stdio MCP server process."""
-
-    auth: bool | MCPServerAuthConfigRedirectPort | None = None
-    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
-
-    cwd: str | None = None
-    """Working directory for the Stdio MCP server process."""
-
-    defer_tools: MCPServerConfigDeferTools | None = None
-    """Controls if tools provided by this server can be loaded on demand via tool search (auto)
-    or always included in the initial tool list (never)
-    """
-    disable_tool_cache: bool | None = None
-    """Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
-    is unaffected.
-    """
-    env: dict[str, str] | None = None
-    """Environment variables to pass to the Stdio MCP server process."""
-
-    filter_mapping: dict[str, ContentFilterMode] | ContentFilterMode | None = None
-    """Content filtering mode to apply to all tools, or a map of tool name to content filtering
-    mode.
-    """
-    is_default_server: bool | None = None
-    """Whether this server is a built-in fallback used when the user has not configured their
-    own server.
-    """
-    oidc: bool | MCPServerAuthConfigRedirectPort | None = None
-    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
-
-    timeout: int | None = None
-    """Timeout in milliseconds for tool calls to this server."""
-
-    tools: list[str] | None = None
-    """Tools to include. Defaults to all tools if not specified."""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'MCPServerConfigStdio':
-        assert isinstance(obj, dict)
-        command = from_str(obj.get("command"))
-        args = from_union([lambda x: from_list(from_str, x), from_none], obj.get("args"))
-        auth = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("auth"))
-        cwd = from_union([from_str, from_none], obj.get("cwd"))
-        defer_tools = from_union([MCPServerConfigDeferTools, from_none], obj.get("deferTools"))
-        disable_tool_cache = from_union([from_bool, from_none], obj.get("disableToolCache"))
-        env = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("env"))
-        filter_mapping = from_union([lambda x: from_dict(ContentFilterMode, x), ContentFilterMode, from_none], obj.get("filterMapping"))
-        is_default_server = from_union([from_bool, from_none], obj.get("isDefaultServer"))
-        oidc = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("oidc"))
-        timeout = from_union([from_int, from_none], obj.get("timeout"))
-        tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("tools"))
-        return MCPServerConfigStdio(command, args, auth, cwd, defer_tools, disable_tool_cache, env, filter_mapping, is_default_server, oidc, timeout, tools)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["command"] = from_str(self.command)
-        if self.args is not None:
-            result["args"] = from_union([lambda x: from_list(from_str, x), from_none], self.args)
-        if self.auth is not None:
-            result["auth"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.auth)
-        if self.cwd is not None:
-            result["cwd"] = from_union([from_str, from_none], self.cwd)
-        if self.defer_tools is not None:
-            result["deferTools"] = from_union([lambda x: to_enum(MCPServerConfigDeferTools, x), from_none], self.defer_tools)
-        if self.disable_tool_cache is not None:
-            result["disableToolCache"] = from_union([from_bool, from_none], self.disable_tool_cache)
-        if self.env is not None:
-            result["env"] = from_union([lambda x: from_dict(from_str, x), from_none], self.env)
-        if self.filter_mapping is not None:
-            result["filterMapping"] = from_union([lambda x: from_dict(lambda x: to_enum(ContentFilterMode, x), x), lambda x: to_enum(ContentFilterMode, x), from_none], self.filter_mapping)
-        if self.is_default_server is not None:
-            result["isDefaultServer"] = from_union([from_bool, from_none], self.is_default_server)
-        if self.oidc is not None:
-            result["oidc"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.oidc)
-        if self.timeout is not None:
-            result["timeout"] = from_union([from_int, from_none], self.timeout)
-        if self.tools is not None:
-            result["tools"] = from_union([lambda x: from_list(from_str, x), from_none], self.tools)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPOauthLoginRequest:
@@ -15319,303 +18420,66 @@ class MCPOauthLoginRequest:
     should pass surface-specific copy telling the user where to return.
     """
     client_id: str | None = None
-    """Optional OAuth client ID override for this login. When set, the runtime uses this
-    pre-registered static client instead of dynamic client registration.
-    """
-    client_name: str | None = None
-    """Optional override for the OAuth client display name shown on the consent screen. Applies
-    to newly registered dynamic clients only — existing registrations keep the name they were
-    created with. When omitted, the runtime applies a neutral fallback; callers driving
-    interactive auth should pass their own surface-specific label so the consent screen
-    matches the product the user sees.
-    """
-    client_secret: str | None = None
-    """Optional OAuth client secret override for this login. The runtime treats this as an
-    ephemeral host-owned secret, uses it for this authentication attempt and does not persist
-    it.
-    """
-    force_reauth: bool | None = None
-    """When true, clears any cached OAuth token for the server and runs a full new
-    authorization. Use when the user explicitly wants to switch accounts or believes their
-    session is stuck.
-    """
-    grant_type: MCPGrantType | None = None
-    """Optional OAuth grant type override for this login. Defaults to the server configuration,
-    or authorization_code when no grant type is specified.
-    """
-    public_client: bool | None = None
-    """Optional override indicating whether the static OAuth client is public. When false, the
-    runtime treats it as confidential and uses the per-login clientSecret if provided,
-    otherwise retrieving the client secret from the MCP OAuth secret store.
-    """
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'MCPOauthLoginRequest':
-        assert isinstance(obj, dict)
-        server_name = from_str(obj.get("serverName"))
-        callback_success_message = from_union([from_str, from_none], obj.get("callbackSuccessMessage"))
-        client_id = from_union([from_str, from_none], obj.get("clientId"))
-        client_name = from_union([from_str, from_none], obj.get("clientName"))
-        client_secret = from_union([from_str, from_none], obj.get("clientSecret"))
-        force_reauth = from_union([from_bool, from_none], obj.get("forceReauth"))
-        grant_type = from_union([MCPGrantType, from_none], obj.get("grantType"))
-        public_client = from_union([from_bool, from_none], obj.get("publicClient"))
-        return MCPOauthLoginRequest(server_name, callback_success_message, client_id, client_name, client_secret, force_reauth, grant_type, public_client)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["serverName"] = from_str(self.server_name)
-        if self.callback_success_message is not None:
-            result["callbackSuccessMessage"] = from_union([from_str, from_none], self.callback_success_message)
-        if self.client_id is not None:
-            result["clientId"] = from_union([from_str, from_none], self.client_id)
-        if self.client_name is not None:
-            result["clientName"] = from_union([from_str, from_none], self.client_name)
-        if self.client_secret is not None:
-            result["clientSecret"] = from_union([from_str, from_none], self.client_secret)
-        if self.force_reauth is not None:
-            result["forceReauth"] = from_union([from_bool, from_none], self.force_reauth)
-        if self.grant_type is not None:
-            result["grantType"] = from_union([lambda x: to_enum(MCPGrantType, x), from_none], self.grant_type)
-        if self.public_client is not None:
-            result["publicClient"] = from_union([from_bool, from_none], self.public_client)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class MCPServerConfig:
-    """MCP server configuration (stdio process or remote HTTP/SSE)
-
-    Replacement MCP server configuration (stdio process or remote HTTP/SSE). Omit to restart
-    the server with its already-registered configuration (config-free restart-by-name).
-
-    MCP server configuration (stdio process or remote HTTP/SSE). Omit to start the server
-    with its already-registered configuration (config-free start-by-name).
-
-    Stdio MCP server configuration launched as a child process.
-
-    Remote MCP server configuration accessed over HTTP or SSE.
-    """
-    args: list[str] | None = None
-    """Command-line arguments passed to the Stdio MCP server process."""
-
-    auth: bool | MCPServerAuthConfigRedirectPort | None = None
-    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
-
-    command: str | None = None
-    """Executable command used to start the Stdio MCP server process."""
-
-    cwd: str | None = None
-    """Working directory for the Stdio MCP server process."""
-
-    defer_tools: MCPServerConfigDeferTools | None = None
-    """Controls if tools provided by this server can be loaded on demand via tool search (auto)
-    or always included in the initial tool list (never)
-    """
-    disable_tool_cache: bool | None = None
-    """Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
-    is unaffected.
-    """
-    env: dict[str, str] | None = None
-    """Environment variables to pass to the Stdio MCP server process."""
-
-    filter_mapping: dict[str, ContentFilterMode] | ContentFilterMode | None = None
-    """Content filtering mode to apply to all tools, or a map of tool name to content filtering
-    mode.
-    """
-    is_default_server: bool | None = None
-    """Whether this server is a built-in fallback used when the user has not configured their
-    own server.
-    """
-    oidc: bool | MCPServerAuthConfigRedirectPort | None = None
-    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
-
-    timeout: int | None = None
-    """Timeout in milliseconds for tool calls to this server."""
-
-    tools: list[str] | None = None
-    """Tools to include. Defaults to all tools if not specified."""
-
-    headers: dict[str, str] | None = None
-    """HTTP headers to include in requests to the remote MCP server."""
-
-    oauth_client_id: str | None = None
-    """OAuth client ID for a pre-registered remote MCP OAuth client."""
-
-    oauth_grant_type: MCPGrantType | None = None
-    """OAuth grant type to use when authenticating to the remote MCP server."""
-
-    oauth_public_client: bool | None = None
-    """Whether the configured OAuth client is public and does not require a client secret."""
-
-    type: MCPServerConfigHTTPType | None = None
-    """Remote transport type. Defaults to "http" when omitted."""
-
-    url: str | None = None
-    """URL of the remote MCP server endpoint."""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'MCPServerConfig':
-        assert isinstance(obj, dict)
-        args = from_union([lambda x: from_list(from_str, x), from_none], obj.get("args"))
-        auth = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("auth"))
-        command = from_union([from_str, from_none], obj.get("command"))
-        cwd = from_union([from_str, from_none], obj.get("cwd"))
-        defer_tools = from_union([MCPServerConfigDeferTools, from_none], obj.get("deferTools"))
-        disable_tool_cache = from_union([from_bool, from_none], obj.get("disableToolCache"))
-        env = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("env"))
-        filter_mapping = from_union([lambda x: from_dict(ContentFilterMode, x), ContentFilterMode, from_none], obj.get("filterMapping"))
-        is_default_server = from_union([from_bool, from_none], obj.get("isDefaultServer"))
-        oidc = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("oidc"))
-        timeout = from_union([from_int, from_none], obj.get("timeout"))
-        tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("tools"))
-        headers = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("headers"))
-        oauth_client_id = from_union([from_str, from_none], obj.get("oauthClientId"))
-        oauth_grant_type = from_union([MCPGrantType, from_none], obj.get("oauthGrantType"))
-        oauth_public_client = from_union([from_bool, from_none], obj.get("oauthPublicClient"))
-        type = from_union([MCPServerConfigHTTPType, from_none], obj.get("type"))
-        url = from_union([from_str, from_none], obj.get("url"))
-        return MCPServerConfig(args, auth, command, cwd, defer_tools, disable_tool_cache, env, filter_mapping, is_default_server, oidc, timeout, tools, headers, oauth_client_id, oauth_grant_type, oauth_public_client, type, url)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        if self.args is not None:
-            result["args"] = from_union([lambda x: from_list(from_str, x), from_none], self.args)
-        if self.auth is not None:
-            result["auth"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.auth)
-        if self.command is not None:
-            result["command"] = from_union([from_str, from_none], self.command)
-        if self.cwd is not None:
-            result["cwd"] = from_union([from_str, from_none], self.cwd)
-        if self.defer_tools is not None:
-            result["deferTools"] = from_union([lambda x: to_enum(MCPServerConfigDeferTools, x), from_none], self.defer_tools)
-        if self.disable_tool_cache is not None:
-            result["disableToolCache"] = from_union([from_bool, from_none], self.disable_tool_cache)
-        if self.env is not None:
-            result["env"] = from_union([lambda x: from_dict(from_str, x), from_none], self.env)
-        if self.filter_mapping is not None:
-            result["filterMapping"] = from_union([lambda x: from_dict(lambda x: to_enum(ContentFilterMode, x), x), lambda x: to_enum(ContentFilterMode, x), from_none], self.filter_mapping)
-        if self.is_default_server is not None:
-            result["isDefaultServer"] = from_union([from_bool, from_none], self.is_default_server)
-        if self.oidc is not None:
-            result["oidc"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.oidc)
-        if self.timeout is not None:
-            result["timeout"] = from_union([from_int, from_none], self.timeout)
-        if self.tools is not None:
-            result["tools"] = from_union([lambda x: from_list(from_str, x), from_none], self.tools)
-        if self.headers is not None:
-            result["headers"] = from_union([lambda x: from_dict(from_str, x), from_none], self.headers)
-        if self.oauth_client_id is not None:
-            result["oauthClientId"] = from_union([from_str, from_none], self.oauth_client_id)
-        if self.oauth_grant_type is not None:
-            result["oauthGrantType"] = from_union([lambda x: to_enum(MCPGrantType, x), from_none], self.oauth_grant_type)
-        if self.oauth_public_client is not None:
-            result["oauthPublicClient"] = from_union([from_bool, from_none], self.oauth_public_client)
-        if self.type is not None:
-            result["type"] = from_union([lambda x: to_enum(MCPServerConfigHTTPType, x), from_none], self.type)
-        if self.url is not None:
-            result["url"] = from_union([from_str, from_none], self.url)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class MCPServerConfigHTTP:
-    """Remote MCP server configuration accessed over HTTP or SSE."""
-
-    url: str
-    """URL of the remote MCP server endpoint."""
-
-    auth: bool | MCPServerAuthConfigRedirectPort | None = None
-    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
-
-    defer_tools: MCPServerConfigDeferTools | None = None
-    """Controls if tools provided by this server can be loaded on demand via tool search (auto)
-    or always included in the initial tool list (never)
+    """Optional OAuth client ID override for this login. When set, the runtime uses this
+    pre-registered static client instead of dynamic client registration.
     """
-    disable_tool_cache: bool | None = None
-    """Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
-    is unaffected.
+    client_name: str | None = None
+    """Optional override for the OAuth client display name shown on the consent screen. Applies
+    to newly registered dynamic clients only — existing registrations keep the name they were
+    created with. When omitted, the runtime applies a neutral fallback; callers driving
+    interactive auth should pass their own surface-specific label so the consent screen
+    matches the product the user sees.
     """
-    filter_mapping: dict[str, ContentFilterMode] | ContentFilterMode | None = None
-    """Content filtering mode to apply to all tools, or a map of tool name to content filtering
-    mode.
+    client_secret: str | None = None
+    """Optional OAuth client secret override for this login. The runtime treats this as an
+    ephemeral host-owned secret, uses it for this authentication attempt and does not persist
+    it.
     """
-    headers: dict[str, str] | None = None
-    """HTTP headers to include in requests to the remote MCP server."""
-
-    is_default_server: bool | None = None
-    """Whether this server is a built-in fallback used when the user has not configured their
-    own server.
+    force_reauth: bool | None = None
+    """When true, clears any cached OAuth token for the server and runs a full new
+    authorization. Use when the user explicitly wants to switch accounts or believes their
+    session is stuck.
+    """
+    grant_type: MCPGrantType | None = None
+    """Optional OAuth grant type override for this login. Defaults to the server configuration,
+    or authorization_code when no grant type is specified.
+    """
+    public_client: bool | None = None
+    """Optional override indicating whether the static OAuth client is public. When false, the
+    runtime treats it as confidential and uses the per-login clientSecret if provided,
+    otherwise retrieving the client secret from the MCP OAuth secret store.
     """
-    oauth_client_id: str | None = None
-    """OAuth client ID for a pre-registered remote MCP OAuth client."""
-
-    oauth_grant_type: MCPGrantType | None = None
-    """OAuth grant type to use when authenticating to the remote MCP server."""
-
-    oauth_public_client: bool | None = None
-    """Whether the configured OAuth client is public and does not require a client secret."""
-
-    oidc: bool | MCPServerAuthConfigRedirectPort | None = None
-    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
-
-    timeout: int | None = None
-    """Timeout in milliseconds for tool calls to this server."""
-
-    tools: list[str] | None = None
-    """Tools to include. Defaults to all tools if not specified."""
-
-    type: MCPServerConfigHTTPType | None = None
-    """Remote transport type. Defaults to "http" when omitted."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'MCPServerConfigHTTP':
+    def from_dict(obj: Any) -> 'MCPOauthLoginRequest':
         assert isinstance(obj, dict)
-        url = from_str(obj.get("url"))
-        auth = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("auth"))
-        defer_tools = from_union([MCPServerConfigDeferTools, from_none], obj.get("deferTools"))
-        disable_tool_cache = from_union([from_bool, from_none], obj.get("disableToolCache"))
-        filter_mapping = from_union([lambda x: from_dict(ContentFilterMode, x), ContentFilterMode, from_none], obj.get("filterMapping"))
-        headers = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("headers"))
-        is_default_server = from_union([from_bool, from_none], obj.get("isDefaultServer"))
-        oauth_client_id = from_union([from_str, from_none], obj.get("oauthClientId"))
-        oauth_grant_type = from_union([MCPGrantType, from_none], obj.get("oauthGrantType"))
-        oauth_public_client = from_union([from_bool, from_none], obj.get("oauthPublicClient"))
-        oidc = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("oidc"))
-        timeout = from_union([from_int, from_none], obj.get("timeout"))
-        tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("tools"))
-        type = from_union([MCPServerConfigHTTPType, from_none], obj.get("type"))
-        return MCPServerConfigHTTP(url, auth, defer_tools, disable_tool_cache, filter_mapping, headers, is_default_server, oauth_client_id, oauth_grant_type, oauth_public_client, oidc, timeout, tools, type)
+        server_name = from_str(obj.get("serverName"))
+        callback_success_message = from_union([from_str, from_none], obj.get("callbackSuccessMessage"))
+        client_id = from_union([from_str, from_none], obj.get("clientId"))
+        client_name = from_union([from_str, from_none], obj.get("clientName"))
+        client_secret = from_union([from_str, from_none], obj.get("clientSecret"))
+        force_reauth = from_union([from_bool, from_none], obj.get("forceReauth"))
+        grant_type = from_union([MCPGrantType, from_none], obj.get("grantType"))
+        public_client = from_union([from_bool, from_none], obj.get("publicClient"))
+        return MCPOauthLoginRequest(server_name, callback_success_message, client_id, client_name, client_secret, force_reauth, grant_type, public_client)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["url"] = from_str(self.url)
-        if self.auth is not None:
-            result["auth"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.auth)
-        if self.defer_tools is not None:
-            result["deferTools"] = from_union([lambda x: to_enum(MCPServerConfigDeferTools, x), from_none], self.defer_tools)
-        if self.disable_tool_cache is not None:
-            result["disableToolCache"] = from_union([from_bool, from_none], self.disable_tool_cache)
-        if self.filter_mapping is not None:
-            result["filterMapping"] = from_union([lambda x: from_dict(lambda x: to_enum(ContentFilterMode, x), x), lambda x: to_enum(ContentFilterMode, x), from_none], self.filter_mapping)
-        if self.headers is not None:
-            result["headers"] = from_union([lambda x: from_dict(from_str, x), from_none], self.headers)
-        if self.is_default_server is not None:
-            result["isDefaultServer"] = from_union([from_bool, from_none], self.is_default_server)
-        if self.oauth_client_id is not None:
-            result["oauthClientId"] = from_union([from_str, from_none], self.oauth_client_id)
-        if self.oauth_grant_type is not None:
-            result["oauthGrantType"] = from_union([lambda x: to_enum(MCPGrantType, x), from_none], self.oauth_grant_type)
-        if self.oauth_public_client is not None:
-            result["oauthPublicClient"] = from_union([from_bool, from_none], self.oauth_public_client)
-        if self.oidc is not None:
-            result["oidc"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.oidc)
-        if self.timeout is not None:
-            result["timeout"] = from_union([from_int, from_none], self.timeout)
-        if self.tools is not None:
-            result["tools"] = from_union([lambda x: from_list(from_str, x), from_none], self.tools)
-        if self.type is not None:
-            result["type"] = from_union([lambda x: to_enum(MCPServerConfigHTTPType, x), from_none], self.type)
+        result["serverName"] = from_str(self.server_name)
+        if self.callback_success_message is not None:
+            result["callbackSuccessMessage"] = from_union([from_str, from_none], self.callback_success_message)
+        if self.client_id is not None:
+            result["clientId"] = from_union([from_str, from_none], self.client_id)
+        if self.client_name is not None:
+            result["clientName"] = from_union([from_str, from_none], self.client_name)
+        if self.client_secret is not None:
+            result["clientSecret"] = from_union([from_str, from_none], self.client_secret)
+        if self.force_reauth is not None:
+            result["forceReauth"] = from_union([from_bool, from_none], self.force_reauth)
+        if self.grant_type is not None:
+            result["grantType"] = from_union([lambda x: to_enum(MCPGrantType, x), from_none], self.grant_type)
+        if self.public_client is not None:
+            result["publicClient"] = from_union([from_bool, from_none], self.public_client)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -15629,18 +18493,24 @@ class MCPStartServersResult:
     allowed_servers: list[MCPAllowedServer] | None = None
     """Non-default servers allowed by policy"""
 
+    failed_servers: list[MCPFailedServer] | None = None
+    """Servers whose connection attempt failed."""
+
     @staticmethod
     def from_dict(obj: Any) -> 'MCPStartServersResult':
         assert isinstance(obj, dict)
         filtered_servers = from_list(MCPFilteredServer.from_dict, obj.get("filteredServers"))
         allowed_servers = from_union([lambda x: from_list(MCPAllowedServer.from_dict, x), from_none], obj.get("allowedServers"))
-        return MCPStartServersResult(filtered_servers, allowed_servers)
+        failed_servers = from_union([lambda x: from_list(MCPFailedServer.from_dict, x), from_none], obj.get("failedServers"))
+        return MCPStartServersResult(filtered_servers, allowed_servers, failed_servers)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["filteredServers"] = from_list(lambda x: to_class(MCPFilteredServer, x), self.filtered_servers)
         if self.allowed_servers is not None:
             result["allowedServers"] = from_union([lambda x: from_list(lambda x: to_class(MCPAllowedServer, x), x), from_none], self.allowed_servers)
+        if self.failed_servers is not None:
+            result["failedServers"] = from_union([lambda x: from_list(lambda x: to_class(MCPFailedServer, x), x), from_none], self.failed_servers)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -15649,6 +18519,8 @@ class MCPHeadersHandlePendingHeadersRefreshRequest:
     """Host response: supply dynamic headers or decline this refresh."""
 
     kind: MCPHeadersHandlePendingHeadersRefreshRequestKind
+    """Headers-refresh response variant discriminator."""
+
     headers: dict[str, str] | None = None
     """Headers to overlay onto the MCP request. Dynamic headers override static config headers
     but do not replace SDK-managed request headers.
@@ -15719,37 +18591,422 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class MCPOauthPendingRequestResponse:
-    """Host response to the pending OAuth request."""
+class MCPPlanConfigurationChange:
+    """One change applying the plan would make, described rather than serialised so the
+    configuration payload stays behind the runtime boundary.
+    """
+    changed_fields: list[str]
+    """Names of the configuration fields the change would set, without their values."""
 
-    kind: MCPOauthPendingRequestResponseKind
-    access_token: str | None = None
-    """Access token acquired by the SDK host"""
+    config_key: str
+    """Configuration key the change applies to."""
 
-    expires_in: int | None = None
-    """Token lifetime in seconds, if known."""
+    operation: MCPPlanConfigurationOperation
+    """Whether the change would create a new entry or modify an existing one."""
 
-    token_type: str | None = None
-    """OAuth token type. Defaults to Bearer when omitted."""
+    scope: MCPPlanScope
+    """Scope the change would be written to."""
+
+    secret_references: list[str]
+    """Secret placeholders the written configuration would reference. The constrained
+    placeholder type cannot carry a literal secret value.
+    """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'MCPOauthPendingRequestResponse':
+    def from_dict(obj: Any) -> 'MCPPlanConfigurationChange':
         assert isinstance(obj, dict)
-        kind = MCPOauthPendingRequestResponseKind(obj.get("kind"))
-        access_token = from_union([from_str, from_none], obj.get("accessToken"))
-        expires_in = from_union([from_int, from_none], obj.get("expiresIn"))
-        token_type = from_union([from_str, from_none], obj.get("tokenType"))
-        return MCPOauthPendingRequestResponse(kind, access_token, expires_in, token_type)
+        changed_fields = from_list(from_str, obj.get("changedFields"))
+        config_key = from_str(obj.get("configKey"))
+        operation = MCPPlanConfigurationOperation(obj.get("operation"))
+        scope = MCPPlanScope(obj.get("scope"))
+        secret_references = from_list(from_str, obj.get("secretReferences"))
+        return MCPPlanConfigurationChange(changed_fields, config_key, operation, scope, secret_references)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["kind"] = to_enum(MCPOauthPendingRequestResponseKind, self.kind)
-        if self.access_token is not None:
-            result["accessToken"] = from_union([from_str, from_none], self.access_token)
-        if self.expires_in is not None:
-            result["expiresIn"] = from_union([from_int, from_none], self.expires_in)
-        if self.token_type is not None:
-            result["tokenType"] = from_union([from_str, from_none], self.token_type)
+        result["changedFields"] = from_list(from_str, self.changed_fields)
+        result["configKey"] = from_str(self.config_key)
+        result["operation"] = to_enum(MCPPlanConfigurationOperation, self.operation)
+        result["scope"] = to_enum(MCPPlanScope, self.scope)
+        result["secretReferences"] = from_list(from_str, self.secret_references)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanTarget:
+    """Configuration scope and key the plan would write to.
+
+    Where a plan would be written.
+    """
+    config_key: str
+    """Configuration key the server would be recorded under within that scope."""
+
+    scope: MCPPlanScope
+    """Configuration scope the plan targets."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanTarget':
+        assert isinstance(obj, dict)
+        config_key = from_str(obj.get("configKey"))
+        scope = MCPPlanScope(obj.get("scope"))
+        return MCPPlanTarget(config_key, scope)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["configKey"] = from_str(self.config_key)
+        result["scope"] = to_enum(MCPPlanScope, self.scope)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanInstallRequest:
+    """A side-effect-free request for an MCP install plan. Computing a plan never writes
+    configuration, stores a secret, or reloads MCP servers.
+    """
+    contract: CatalogClientContract
+    """Protocol version and capabilities the caller requires."""
+
+    source: MCPPlanInstallSource
+    """What to plan: either a candidate handle from a previous search, or a card supplied
+    directly.
+    """
+    scope: MCPPlanScope | None = None
+    """Configuration scope the plan targets. Defaults to user scope when omitted."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanInstallRequest':
+        assert isinstance(obj, dict)
+        contract = CatalogClientContract.from_dict(obj.get("contract"))
+        source = _load_MCPPlanInstallSource(obj.get("source"))
+        scope = from_union([MCPPlanScope, from_none], obj.get("scope"))
+        return MCPPlanInstallRequest(contract, source, scope)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["contract"] = to_class(CatalogClientContract, self.contract)
+        result["source"] = (self.source).to_dict()
+        if self.scope is not None:
+            result["scope"] = from_union([lambda x: to_enum(MCPPlanScope, x), from_none], self.scope)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanPolicyResult:
+    """Outcome of evaluating the server against registry and enterprise policy.
+
+    Outcome of evaluating the planned server against registry and enterprise policy.
+    Evaluation is read-only.
+    """
+    decision: MCPPlanPolicyDecision
+    """What policy decided for this server."""
+
+    source: MCPPlanPolicySource
+    """Which authority produced the decision."""
+
+    reason: str | None = None
+    """Human-readable explanation, safe to surface. Never contains a query, URL, handle, or
+    secret.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanPolicyResult':
+        assert isinstance(obj, dict)
+        decision = MCPPlanPolicyDecision(obj.get("decision"))
+        source = MCPPlanPolicySource(obj.get("source"))
+        reason = from_union([from_str, from_none], obj.get("reason"))
+        return MCPPlanPolicyResult(decision, source, reason)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["decision"] = to_enum(MCPPlanPolicyDecision, self.decision)
+        result["source"] = to_enum(MCPPlanPolicySource, self.source)
+        if self.reason is not None:
+            result["reason"] = from_union([from_str, from_none], self.reason)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanRequiredValueEnum:
+    """One enumerated non-secret value a transport choice needs before it can be applied. The
+    permitted values are structurally required.
+    """
+    category: MCPPlanValueCategory
+    """Where the value is applied when the server is launched."""
+
+    enum_values: list[str]
+    """Non-empty permitted value set. Inert untrusted data."""
+
+    is_repeated: bool
+    """Whether the value may be supplied more than once."""
+
+    key: str
+    """Key the value is supplied under. Inert untrusted data."""
+
+    kind: ClassVar[str] = "enum"
+    """Discriminator: this required value uses a fixed enumeration."""
+
+    required: bool
+    """Whether the value must be present for the plan to be applicable."""
+
+    value_type: MCPPlan
+    """Discriminator: the value must be one of `enumValues`."""
+
+    default_value: str | None = None
+    """Default supplied by the card, when the value can be resolved without input. Presence is
+    the authoritative indication that a default exists. Inert untrusted data.
+    """
+    description: str | None = None
+    """Human-readable explanation from the card. Inert untrusted text."""
+
+    title: str | None = None
+    """Human-readable label from the card. Inert untrusted text."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanRequiredValueEnum':
+        assert isinstance(obj, dict)
+        category = MCPPlanValueCategory(obj.get("category"))
+        enum_values = from_list(from_str, obj.get("enumValues"))
+        is_repeated = from_bool(obj.get("isRepeated"))
+        key = from_str(obj.get("key"))
+        required = from_bool(obj.get("required"))
+        value_type = MCPPlan(obj.get("valueType"))
+        default_value = from_union([from_str, from_none], obj.get("defaultValue"))
+        description = from_union([from_str, from_none], obj.get("description"))
+        title = from_union([from_str, from_none], obj.get("title"))
+        return MCPPlanRequiredValueEnum(category, enum_values, is_repeated, key, required, value_type, default_value, description, title)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["category"] = to_enum(MCPPlanValueCategory, self.category)
+        result["enumValues"] = from_list(from_str, self.enum_values)
+        result["isRepeated"] = from_bool(self.is_repeated)
+        result["key"] = from_str(self.key)
+        result["kind"] = self.kind
+        result["required"] = from_bool(self.required)
+        result["valueType"] = to_enum(MCPPlan, self.value_type)
+        if self.default_value is not None:
+            result["defaultValue"] = from_union([from_str, from_none], self.default_value)
+        if self.description is not None:
+            result["description"] = from_union([from_str, from_none], self.description)
+        if self.title is not None:
+            result["title"] = from_union([from_str, from_none], self.title)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanInstallSourceCandidate:
+    """Plan from a candidate returned by a previous catalog search."""
+
+    candidate_handle: str
+    """Single-use candidate handle. Consumed by this call, so a replay of the same handle is
+    rejected.
+    """
+    kind: ClassVar[str] = "candidate"
+    """Discriminator: plan from a previously returned candidate"""
+
+    search_id: str
+    """The runtime- or authority-minted `searchId` returned with the search that produced this
+    candidate. A search implementation binds it to private candidate-handle context; a
+    planning implementation must verify that context before returning a plan. The unavailable
+    planning implementation in this contract layer validates presence but does not claim the
+    verification has occurred. It identifies a search rather than a person and must never be
+    joined with user identity to re-identify anyone.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanInstallSourceCandidate':
+        assert isinstance(obj, dict)
+        candidate_handle = from_str(obj.get("candidateHandle"))
+        search_id = from_str(obj.get("searchId"))
+        return MCPPlanInstallSourceCandidate(candidate_handle, search_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["candidateHandle"] = from_str(self.candidate_handle)
+        result["kind"] = self.kind
+        result["searchId"] = from_str(self.search_id)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanInstallSourceCard:
+    """Plan from a card supplied directly by the caller, without a preceding search."""
+
+    card: MCPServerCardReference
+    """The card to plan from: exactly one of a URL or embedded data."""
+
+    kind: ClassVar[str] = "card"
+    """Discriminator: plan from a caller-supplied card"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanInstallSourceCard':
+        assert isinstance(obj, dict)
+        card = _load_MCPServerCardReference(obj.get("card"))
+        return MCPPlanInstallSourceCard(card)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["card"] = (self.card).to_dict()
+        result["kind"] = self.kind
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanTransportChoicePackage:
+    """An eligible local-package transport choice. Package identity is required and a remote
+    endpoint cannot be represented.
+    """
+    choice_id: str
+    """Stable identifier for this choice within the plan, used to select it when the plan is
+    applied.
+    """
+    install_method: MCPPlanPackageInstallMethod
+    """Discriminator: this choice runs a local package"""
+
+    package_identifier: str
+    """Package identifier. Inert untrusted data."""
+
+    package_type: str
+    """Packaging ecosystem, for example `oci` or `npm`."""
+
+    required_values: list[MCPPlanRequiredValue]
+    """Typed values this choice requires, excluding secrets."""
+
+    secret_placeholders: list[MCPPlanSecretPlaceholder]
+    """Secrets this choice requires, referenced by placeholder only."""
+
+    transport: MCPPlanPackageTransport
+    """Local process transport this package choice would use."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanTransportChoicePackage':
+        assert isinstance(obj, dict)
+        choice_id = from_str(obj.get("choiceId"))
+        install_method = MCPPlanPackageInstallMethod(obj.get("installMethod"))
+        package_identifier = from_str(obj.get("packageIdentifier"))
+        package_type = from_str(obj.get("packageType"))
+        required_values = from_list(_load_MCPPlanRequiredValue, obj.get("requiredValues"))
+        secret_placeholders = from_list(MCPPlanSecretPlaceholder.from_dict, obj.get("secretPlaceholders"))
+        transport = MCPPlanPackageTransport(obj.get("transport"))
+        return MCPPlanTransportChoicePackage(choice_id, install_method, package_identifier, package_type, required_values, secret_placeholders, transport)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["choiceId"] = from_str(self.choice_id)
+        result["installMethod"] = to_enum(MCPPlanPackageInstallMethod, self.install_method)
+        result["packageIdentifier"] = from_str(self.package_identifier)
+        result["packageType"] = from_str(self.package_type)
+        result["requiredValues"] = from_list(lambda x: (x).to_dict(), self.required_values)
+        result["secretPlaceholders"] = from_list(lambda x: to_class(MCPPlanSecretPlaceholder, x), self.secret_placeholders)
+        result["transport"] = to_enum(MCPPlanPackageTransport, self.transport)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanTransportChoiceRemote:
+    """An eligible remote-endpoint transport choice. The endpoint is required and package
+    identity cannot be represented.
+    """
+    choice_id: str
+    """Stable identifier for this choice within the plan, used to select it when the plan is
+    applied.
+    """
+    endpoint: str
+    """Endpoint URL. Inert untrusted data."""
+
+    install_method: MCPPlanRemoteInstallMethod
+    """Discriminator: this choice connects to a remote endpoint"""
+
+    required_values: list[MCPPlanRequiredValue]
+    """Typed values this choice requires, excluding secrets."""
+
+    secret_placeholders: list[MCPPlanSecretPlaceholder]
+    """Secrets this choice requires, referenced by placeholder only."""
+
+    transport: MCPPlanRemoteTransport
+    """Endpoint transport this remote choice would use."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanTransportChoiceRemote':
+        assert isinstance(obj, dict)
+        choice_id = from_str(obj.get("choiceId"))
+        endpoint = from_str(obj.get("endpoint"))
+        install_method = MCPPlanRemoteInstallMethod(obj.get("installMethod"))
+        required_values = from_list(_load_MCPPlanRequiredValue, obj.get("requiredValues"))
+        secret_placeholders = from_list(MCPPlanSecretPlaceholder.from_dict, obj.get("secretPlaceholders"))
+        transport = MCPPlanRemoteTransport(obj.get("transport"))
+        return MCPPlanTransportChoiceRemote(choice_id, endpoint, install_method, required_values, secret_placeholders, transport)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["choiceId"] = from_str(self.choice_id)
+        result["endpoint"] = from_str(self.endpoint)
+        result["installMethod"] = to_enum(MCPPlanRemoteInstallMethod, self.install_method)
+        result["requiredValues"] = from_list(lambda x: (x).to_dict(), self.required_values)
+        result["secretPlaceholders"] = from_list(lambda x: to_class(MCPPlanSecretPlaceholder, x), self.secret_placeholders)
+        result["transport"] = to_enum(MCPPlanRemoteTransport, self.transport)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanRequiredValueScalar:
+    """One non-secret scalar value a transport choice needs before it can be applied."""
+
+    category: MCPPlanValueCategory
+    """Where the value is applied when the server is launched."""
+
+    is_repeated: bool
+    """Whether the value may be supplied more than once."""
+
+    key: str
+    """Key the value is supplied under. Inert untrusted data."""
+
+    kind: ClassVar[str] = "scalar"
+    """Discriminator: this required value uses a scalar type."""
+
+    required: bool
+    """Whether the value must be present for the plan to be applicable."""
+
+    value_type: MCPPlanScalarValueTypeEnum
+    """Scalar type the value must conform to."""
+
+    default_value: str | None = None
+    """Default supplied by the card, when the value can be resolved without input. Presence is
+    the authoritative indication that a default exists. Inert untrusted data.
+    """
+    description: str | None = None
+    """Human-readable explanation from the card. Inert untrusted text."""
+
+    title: str | None = None
+    """Human-readable label from the card. Inert untrusted text."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanRequiredValueScalar':
+        assert isinstance(obj, dict)
+        category = MCPPlanValueCategory(obj.get("category"))
+        is_repeated = from_bool(obj.get("isRepeated"))
+        key = from_str(obj.get("key"))
+        required = from_bool(obj.get("required"))
+        value_type = MCPPlanScalarValueTypeEnum(obj.get("valueType"))
+        default_value = from_union([from_str, from_none], obj.get("defaultValue"))
+        description = from_union([from_str, from_none], obj.get("description"))
+        title = from_union([from_str, from_none], obj.get("title"))
+        return MCPPlanRequiredValueScalar(category, is_repeated, key, required, value_type, default_value, description, title)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["category"] = to_enum(MCPPlanValueCategory, self.category)
+        result["isRepeated"] = from_bool(self.is_repeated)
+        result["key"] = from_str(self.key)
+        result["kind"] = self.kind
+        result["required"] = from_bool(self.required)
+        result["valueType"] = to_enum(MCPPlanScalarValueTypeEnum, self.value_type)
+        if self.default_value is not None:
+            result["defaultValue"] = from_union([from_str, from_none], self.default_value)
+        if self.description is not None:
+            result["description"] = from_union([from_str, from_none], self.description)
+        if self.title is not None:
+            result["title"] = from_union([from_str, from_none], self.title)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -15807,6 +19064,60 @@ def to_dict(self) -> dict:
             result["result"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.result)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionDecisionApproveForLocationApprovalMemory:
+    """Location-scoped approval details for writes to long-term memory."""
+
+    kind: ClassVar[str] = "memory"
+    """Approval covering writes to long-term memory."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionDecisionApproveForLocationApprovalMemory':
+        assert isinstance(obj, dict)
+        return PermissionDecisionApproveForLocationApprovalMemory()
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionDecisionApproveForSessionApprovalMemory:
+    """Session-scoped approval details for writes to long-term memory."""
+
+    kind: ClassVar[str] = "memory"
+    """Approval covering writes to long-term memory."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionDecisionApproveForSessionApprovalMemory':
+        assert isinstance(obj, dict)
+        return PermissionDecisionApproveForSessionApprovalMemory()
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionsLocationsAddToolApprovalDetailsMemory:
+    """Location-persisted tool approval details for writes to long-term memory."""
+
+    kind: ClassVar[str] = "memory"
+    """Approval covering writes to long-term memory."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionsLocationsAddToolApprovalDetailsMemory':
+        assert isinstance(obj, dict)
+        return PermissionsLocationsAddToolApprovalDetailsMemory()
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPSetEnvValueModeParams:
@@ -15869,13 +19180,47 @@ class SessionContextAttribution:
     """Per-source token attribution snapshot for the current context window. The heaviest
     individual messages are available separately via `metadata.getContextHeaviestMessages`.
     """
+    buffer_tokens: int
+    """Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors
+    `SessionContextInfo.bufferTokens`.
+    """
+    categories: Categories
+    """The six normalized `/context` header buckets, computed from the same tokenization as
+    `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer`
+    describe window capacity rather than occupied context, so the values do not sum to
+    `totalTokens`.
+    """
     compactions: Compactions
     """Successful compaction history for the session."""
 
+    compaction_threshold: int
+    """Token count at which background compaction starts. Mirrors
+    `SessionContextInfo.compactionThreshold`.
+    """
     entries: list[Entry]
     """Flat list of per-source attribution entries. Group by `kind` and render unrecognized
     kinds generically. Nesting and rollups are expressed via `parentId`.
     """
+    limit: int
+    """Prompt limit plus the model's output reserve: the full context window
+    `categories.freeSpace` and `categories.buffer` are measured against. Mirrors
+    `SessionContextInfo.limit`.
+    """
+    model_id: str
+    """The concrete model id the entire breakdown was tokenized against (feeds the per-model
+    token multiplier). Under `Auto` (Free/Student) this is the resolved model, not the
+    literal `auto` sentinel, so totals are not undercounted. A single-model approximation of
+    a potentially multi-model Auto session.
+    """
+    model_source: str
+    """How `modelId` was chosen. Not a closed set — tolerate unknown values. Known values today:
+    `autoResolved` (the model Auto resolved to), `selected` (the user's explicitly selected
+    model), `default` (a fallback before any model is known).
+    """
+    prompt_token_limit: int
+    """Maximum prompt tokens the resolved model accepts — the denominator for a `##k/###k`
+    context-usage display. Mirrors `SessionContextInfo.promptTokenLimit`.
+    """
     total_tokens: int
     """Total token count of the current context window the entries are measured against (system
     message + conversation messages + tool definitions — the same total reported by
@@ -15885,15 +19230,29 @@ class SessionContextAttribution:
     @staticmethod
     def from_dict(obj: Any) -> 'SessionContextAttribution':
         assert isinstance(obj, dict)
+        buffer_tokens = from_int(obj.get("bufferTokens"))
+        categories = Categories.from_dict(obj.get("categories"))
         compactions = Compactions.from_dict(obj.get("compactions"))
+        compaction_threshold = from_int(obj.get("compactionThreshold"))
         entries = from_list(Entry.from_dict, obj.get("entries"))
+        limit = from_int(obj.get("limit"))
+        model_id = from_str(obj.get("modelId"))
+        model_source = from_str(obj.get("modelSource"))
+        prompt_token_limit = from_int(obj.get("promptTokenLimit"))
         total_tokens = from_int(obj.get("totalTokens"))
-        return SessionContextAttribution(compactions, entries, total_tokens)
+        return SessionContextAttribution(buffer_tokens, categories, compactions, compaction_threshold, entries, limit, model_id, model_source, prompt_token_limit, total_tokens)
 
     def to_dict(self) -> dict:
         result: dict = {}
+        result["bufferTokens"] = from_int(self.buffer_tokens)
+        result["categories"] = to_class(Categories, self.categories)
         result["compactions"] = to_class(Compactions, self.compactions)
+        result["compactionThreshold"] = from_int(self.compaction_threshold)
         result["entries"] = from_list(lambda x: to_class(Entry, x), self.entries)
+        result["limit"] = from_int(self.limit)
+        result["modelId"] = from_str(self.model_id)
+        result["modelSource"] = from_str(self.model_source)
+        result["promptTokenLimit"] = from_int(self.prompt_token_limit)
         result["totalTokens"] = from_int(self.total_tokens)
         return result
 
@@ -15960,6 +19319,242 @@ def to_dict(self) -> dict:
             result["taskType"] = from_union([lambda x: to_enum(TaskType, x), from_none], self.task_type)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModeSetRequest:
+    """Agent interaction mode to apply to the session."""
+
+    mode: SessionMode
+    """The session mode the agent is operating in"""
+
+    compaction_decision: str | None = None
+    """Explicit response to a model-switch compaction preflight."""
+
+    inherit_plan_base_from_session_id: str | None = None
+    """Session whose plan-mode base state should be inherited."""
+
+    persist_plan_selection: bool | None = None
+    """Whether the selected plan model should be persisted."""
+
+    picker_settings_context: ModelPickerSettingsContext | None = None
+    """Settings context used when persisting the selected plan model."""
+
+    plan_context_tier: str | None = None
+    """Context tier to use with the dedicated plan model."""
+
+    plan_exit_action: str | None = None
+    """Action to perform when leaving plan mode."""
+
+    plan_model: str | None = None
+    """Dedicated model to use in plan mode, when configured."""
+
+    plan_model_configured: bool | None = None
+    """Whether a dedicated plan model is configured."""
+
+    plan_reasoning_effort: str | None = None
+    """Reasoning effort to use with the dedicated plan model."""
+
+    restore_plan_model: bool | None = None
+    """Whether leaving plan mode should restore the session's previous model."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModeSetRequest':
+        assert isinstance(obj, dict)
+        mode = SessionMode(obj.get("mode"))
+        compaction_decision = from_union([from_str, from_none], obj.get("compactionDecision"))
+        inherit_plan_base_from_session_id = from_union([from_str, from_none], obj.get("inheritPlanBaseFromSessionId"))
+        persist_plan_selection = from_union([from_bool, from_none], obj.get("persistPlanSelection"))
+        picker_settings_context = from_union([ModelPickerSettingsContext.from_dict, from_none], obj.get("pickerSettingsContext"))
+        plan_context_tier = from_union([from_str, from_none], obj.get("planContextTier"))
+        plan_exit_action = from_union([from_str, from_none], obj.get("planExitAction"))
+        plan_model = from_union([from_str, from_none], obj.get("planModel"))
+        plan_model_configured = from_union([from_bool, from_none], obj.get("planModelConfigured"))
+        plan_reasoning_effort = from_union([from_str, from_none], obj.get("planReasoningEffort"))
+        restore_plan_model = from_union([from_bool, from_none], obj.get("restorePlanModel"))
+        return ModeSetRequest(mode, compaction_decision, inherit_plan_base_from_session_id, persist_plan_selection, picker_settings_context, plan_context_tier, plan_exit_action, plan_model, plan_model_configured, plan_reasoning_effort, restore_plan_model)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["mode"] = to_enum(SessionMode, self.mode)
+        if self.compaction_decision is not None:
+            result["compactionDecision"] = from_union([from_str, from_none], self.compaction_decision)
+        if self.inherit_plan_base_from_session_id is not None:
+            result["inheritPlanBaseFromSessionId"] = from_union([from_str, from_none], self.inherit_plan_base_from_session_id)
+        if self.persist_plan_selection is not None:
+            result["persistPlanSelection"] = from_union([from_bool, from_none], self.persist_plan_selection)
+        if self.picker_settings_context is not None:
+            result["pickerSettingsContext"] = from_union([lambda x: to_class(ModelPickerSettingsContext, x), from_none], self.picker_settings_context)
+        if self.plan_context_tier is not None:
+            result["planContextTier"] = from_union([from_str, from_none], self.plan_context_tier)
+        if self.plan_exit_action is not None:
+            result["planExitAction"] = from_union([from_str, from_none], self.plan_exit_action)
+        if self.plan_model is not None:
+            result["planModel"] = from_union([from_str, from_none], self.plan_model)
+        if self.plan_model_configured is not None:
+            result["planModelConfigured"] = from_union([from_bool, from_none], self.plan_model_configured)
+        if self.plan_reasoning_effort is not None:
+            result["planReasoningEffort"] = from_union([from_str, from_none], self.plan_reasoning_effort)
+        if self.restore_plan_model is not None:
+            result["restorePlanModel"] = from_union([from_bool, from_none], self.restore_plan_model)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModelPickerPersistenceRequest:
+    """Optional settings context and explicit-override flags used to persist a picker selection."""
+
+    settings_context: ModelPickerSettingsContext
+    """Filesystem and environment context used to resolve settings persistence."""
+
+    context_tier_explicit: bool | None = None
+    """Whether context tier was explicitly selected and should be persisted."""
+
+    reasoning_effort_explicit: bool | None = None
+    """Whether reasoning effort was explicitly selected and should be persisted."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModelPickerPersistenceRequest':
+        assert isinstance(obj, dict)
+        settings_context = ModelPickerSettingsContext.from_dict(obj.get("settingsContext"))
+        context_tier_explicit = from_union([from_bool, from_none], obj.get("contextTierExplicit"))
+        reasoning_effort_explicit = from_union([from_bool, from_none], obj.get("reasoningEffortExplicit"))
+        return ModelPickerPersistenceRequest(settings_context, context_tier_explicit, reasoning_effort_explicit)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settingsContext"] = to_class(ModelPickerSettingsContext, self.settings_context)
+        if self.context_tier_explicit is not None:
+            result["contextTierExplicit"] = from_union([from_bool, from_none], self.context_tier_explicit)
+        if self.reasoning_effort_explicit is not None:
+            result["reasoningEffortExplicit"] = from_union([from_bool, from_none], self.reasoning_effort_explicit)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModeSetResult:
+    """Outcome of a session mode change, including any model switch it triggered and follow-up
+    the host must perform.
+    """
+    model_changed: bool
+    """Whether applying the mode changed the active model."""
+
+    status: str
+    """Lifecycle status of the requested mode change."""
+
+    arm_interactive_continuation: bool | None = None
+    """Whether the host should arm an interactive continuation after the mode change."""
+
+    confirmation: ModelSwitchConfirmation | None = None
+    """Compaction confirmation required before the mode change can complete."""
+
+    defer_implementation: bool | None = None
+    """Whether the host must defer implementing the requested mode change."""
+
+    deprecation_warnings: list[str] | None = None
+    """Deprecation warnings associated with the model selected by the mode change."""
+
+    message: str | None = None
+    """User-facing outcome message for the model switch triggered by the mode change."""
+
+    warning: str | None = None
+    """User-facing warning produced while applying the mode change."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModeSetResult':
+        assert isinstance(obj, dict)
+        model_changed = from_bool(obj.get("modelChanged"))
+        status = from_str(obj.get("status"))
+        arm_interactive_continuation = from_union([from_bool, from_none], obj.get("armInteractiveContinuation"))
+        confirmation = from_union([ModelSwitchConfirmation.from_dict, from_none], obj.get("confirmation"))
+        defer_implementation = from_union([from_bool, from_none], obj.get("deferImplementation"))
+        deprecation_warnings = from_union([lambda x: from_list(from_str, x), from_none], obj.get("deprecationWarnings"))
+        message = from_union([from_str, from_none], obj.get("message"))
+        warning = from_union([from_str, from_none], obj.get("warning"))
+        return ModeSetResult(model_changed, status, arm_interactive_continuation, confirmation, defer_implementation, deprecation_warnings, message, warning)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["modelChanged"] = from_bool(self.model_changed)
+        result["status"] = from_str(self.status)
+        if self.arm_interactive_continuation is not None:
+            result["armInteractiveContinuation"] = from_union([from_bool, from_none], self.arm_interactive_continuation)
+        if self.confirmation is not None:
+            result["confirmation"] = from_union([lambda x: to_class(ModelSwitchConfirmation, x), from_none], self.confirmation)
+        if self.defer_implementation is not None:
+            result["deferImplementation"] = from_union([from_bool, from_none], self.defer_implementation)
+        if self.deprecation_warnings is not None:
+            result["deprecationWarnings"] = from_union([lambda x: from_list(from_str, x), from_none], self.deprecation_warnings)
+        if self.message is not None:
+            result["message"] = from_union([from_str, from_none], self.message)
+        if self.warning is not None:
+            result["warning"] = from_union([from_str, from_none], self.warning)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModelSwitchToResult:
+    """The model identifier active on the session after the switch."""
+
+    confirmation: ModelSwitchConfirmation | None = None
+    """Compaction confirmation projection when status is confirmation_required"""
+
+    deferred: bool | None = None
+    """True when the switch was deferred (enqueued as a cancellable `/model` command) because a
+    turn was active or another model change was already queued, rather than applied
+    immediately. When true, the session's live model is unchanged until the queued change
+    drains.
+    """
+    deprecation_warnings: list[str] | None = None
+    """Deprecation warnings associated with the selected model or options."""
+
+    message: str | None = None
+    """User-facing outcome message for the model switch."""
+
+    model_id: str | None = None
+    """Currently active model identifier after the switch"""
+
+    persistence_error: str | None = None
+    """Persistence failure encountered after applying the model switch."""
+
+    status: str | None = None
+    """Lifecycle result for the requested switch"""
+
+    warning: str | None = None
+    """User-facing warning produced while applying the model switch."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModelSwitchToResult':
+        assert isinstance(obj, dict)
+        confirmation = from_union([ModelSwitchConfirmation.from_dict, from_none], obj.get("confirmation"))
+        deferred = from_union([from_bool, from_none], obj.get("deferred"))
+        deprecation_warnings = from_union([lambda x: from_list(from_str, x), from_none], obj.get("deprecationWarnings"))
+        message = from_union([from_str, from_none], obj.get("message"))
+        model_id = from_union([from_str, from_none], obj.get("modelId"))
+        persistence_error = from_union([from_str, from_none], obj.get("persistenceError"))
+        status = from_union([from_str, from_none], obj.get("status"))
+        warning = from_union([from_str, from_none], obj.get("warning"))
+        return ModelSwitchToResult(confirmation, deferred, deprecation_warnings, message, model_id, persistence_error, status, warning)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.confirmation is not None:
+            result["confirmation"] = from_union([lambda x: to_class(ModelSwitchConfirmation, x), from_none], self.confirmation)
+        if self.deferred is not None:
+            result["deferred"] = from_union([from_bool, from_none], self.deferred)
+        if self.deprecation_warnings is not None:
+            result["deprecationWarnings"] = from_union([lambda x: from_list(from_str, x), from_none], self.deprecation_warnings)
+        if self.message is not None:
+            result["message"] = from_union([from_str, from_none], self.message)
+        if self.model_id is not None:
+            result["modelId"] = from_union([from_str, from_none], self.model_id)
+        if self.persistence_error is not None:
+            result["persistenceError"] = from_union([from_str, from_none], self.persistence_error)
+        if self.status is not None:
+            result["status"] = from_union([from_str, from_none], self.status)
+        if self.warning is not None:
+            result["warning"] = from_union([from_str, from_none], self.warning)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ModelBillingTokenPrices:
@@ -15974,6 +19569,9 @@ class ModelBillingTokenPrices:
     cache_read_price: float | None = None
     """AI Credits cost per billing batch of cached (read) tokens"""
 
+    cache_write1_h_price: float | None = None
+    """AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens."""
+
     cache_write_price: float | None = None
     """AI Credits cost per billing batch of cache-write (cache creation) tokens."""
 
@@ -16000,13 +19598,14 @@ def from_dict(obj: Any) -> 'ModelBillingTokenPrices':
         batch_size = from_union([from_int, from_none], obj.get("batchSize"))
         cache_price = from_union([from_float, from_none], obj.get("cachePrice"))
         cache_read_price = from_union([from_float, from_none], obj.get("cacheReadPrice"))
+        cache_write1_h_price = from_union([from_float, from_none], obj.get("cacheWrite1hPrice"))
         cache_write_price = from_union([from_float, from_none], obj.get("cacheWritePrice"))
         context_max = from_union([from_int, from_none], obj.get("contextMax"))
         input_price = from_union([from_float, from_none], obj.get("inputPrice"))
         long_context = from_union([ModelBillingTokenPricesLongContext.from_dict, from_none], obj.get("longContext"))
         max_prompt_tokens = from_union([from_int, from_none], obj.get("maxPromptTokens"))
         output_price = from_union([from_float, from_none], obj.get("outputPrice"))
-        return ModelBillingTokenPrices(batch_size, cache_price, cache_read_price, cache_write_price, context_max, input_price, long_context, max_prompt_tokens, output_price)
+        return ModelBillingTokenPrices(batch_size, cache_price, cache_read_price, cache_write1_h_price, cache_write_price, context_max, input_price, long_context, max_prompt_tokens, output_price)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -16016,6 +19615,8 @@ def to_dict(self) -> dict:
             result["cachePrice"] = from_union([to_float, from_none], self.cache_price)
         if self.cache_read_price is not None:
             result["cacheReadPrice"] = from_union([to_float, from_none], self.cache_read_price)
+        if self.cache_write1_h_price is not None:
+            result["cacheWrite1hPrice"] = from_union([to_float, from_none], self.cache_write1_h_price)
         if self.cache_write_price is not None:
             result["cacheWritePrice"] = from_union([to_float, from_none], self.cache_write_price)
         if self.context_max is not None:
@@ -16074,7 +19675,10 @@ class SessionModelPriceCategory:
     """Cost-category metadata for a CAPI model."""
 
     id: str
+    """CAPI model identifier."""
+
     price_category: ModelPickerPriceCategory
+    """Cost category assigned to the model."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionModelPriceCategory':
@@ -16155,47 +19759,38 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class NamedProviderConfig:
-    """A named BYOK provider connection (transport + credentials)."""
-
+    """External SDK input for a named custom model provider. Ingested by the native protocol
+    boundary before host dispatch.
+    """
     base_url: str
-    """API endpoint URL."""
+    """Base URL for provider API requests."""
 
     name: str
-    """Stable identifier referenced by BYOK model definitions. Must not contain '/'."""
+    """Unique provider name used to qualify model selection IDs."""
 
     api_key: str | None = None
-    """API key. Optional for local providers like Ollama."""
+    """Static API key used to authenticate provider requests."""
 
     azure: ProviderConfigAzure | None = None
-    """Azure-specific provider options."""
+    """Azure authentication configuration for the provider."""
 
     bearer_token: str | None = None
-    """Bearer token for authentication. Sets the Authorization header directly. Takes precedence
-    over apiKey when both are set.
-    """
+    """Static bearer token used to authenticate provider requests."""
+
     has_bearer_token_provider: bool | None = None
-    """When true, the SDK client supplies bearer tokens on demand: the runtime calls the
-    client-session `providerToken.getToken` callback before each request and applies the
-    returned token as an `Authorization: Bearer <token>` header. This is the bearer/OAuth
-    scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens
-    (including Anthropic's), not a provider-specific API-key header such as Anthropic's
-    `x-api-key`. The token-acquiring function itself stays on the SDK side and is never
-    serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`,
-    the callback takes precedence: the runtime applies the token returned by
-    `providerToken.getToken` as the `Authorization: Bearer` header for each request and does
-    not send the static credential.
-    """
+    """Whether the host supplies bearer tokens dynamically."""
+
     headers: dict[str, str] | None = None
-    """Custom HTTP headers to include in all outbound requests to the provider."""
+    """Additional HTTP headers included with provider requests."""
 
     transport: ProviderTransport | None = None
-    """Provider transport. Defaults to "http"."""
+    """Transport used to communicate with the provider."""
 
     type: ProviderType | None = None
-    """Provider type. Defaults to "openai" for generic OpenAI-compatible APIs."""
+    """Provider protocol family."""
 
     wire_api: ProviderWireAPI | None = None
-    """Wire API format (openai/azure only). Defaults to "completions"."""
+    """Wire API used to communicate with the provider."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'NamedProviderConfig':
@@ -16234,116 +19829,6 @@ def to_dict(self) -> dict:
             result["wireApi"] = from_union([lambda x: to_enum(ProviderWireAPI, x), from_none], self.wire_api)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class ProviderConfig:
-    """Custom model-provider configuration (BYOK)."""
-
-    base_url: str
-    """API endpoint URL."""
-
-    api_key: str | None = None
-    """API key. Optional for local providers like Ollama."""
-
-    azure: ProviderConfigAzure | None = None
-    """Azure-specific provider options."""
-
-    bearer_token: str | None = None
-    """Bearer token for authentication. Sets the Authorization header directly. Takes precedence
-    over apiKey when both are set.
-    """
-    has_bearer_token_provider: bool | None = None
-    """When true, the SDK client supplies bearer tokens on demand: the runtime calls the
-    client-session `providerToken.getToken` callback before each request and applies the
-    returned token as an `Authorization: Bearer <token>` header. This is the bearer/OAuth
-    scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens
-    (including Anthropic's), not a provider-specific API-key header such as Anthropic's
-    `x-api-key`. The token-acquiring function itself stays on the SDK side and is never
-    serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`,
-    the callback takes precedence: the runtime applies the token returned by
-    `providerToken.getToken` as the `Authorization: Bearer` header for each request and does
-    not send the static credential.
-    """
-    headers: dict[str, str] | None = None
-    """Custom HTTP headers to include in all outbound requests to the provider."""
-
-    max_context_window_tokens: float | None = None
-    """Maximum context window tokens for the model."""
-
-    max_output_tokens: float | None = None
-    """Maximum output tokens for the model."""
-
-    max_prompt_tokens: float | None = None
-    """Maximum prompt/input tokens for the model."""
-
-    model_id: str | None = None
-    """Well-known model ID used for capability lookup. When set, agent behavior config and token
-    limits are inferred from this model.
-    """
-    transport: ProviderTransport | None = None
-    """Provider transport. Defaults to "http"."""
-
-    type: ProviderType | None = None
-    """Provider type. Defaults to "openai" for generic OpenAI-compatible APIs."""
-
-    wire_api: ProviderWireAPI | None = None
-    """Wire API format (openai/azure only). Defaults to "completions"."""
-
-    wire_model: str | None = None
-    """The model identifier sent to the provider API for inference (the "wire" model), as
-    opposed to modelId which is the well-known base.
-    """
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'ProviderConfig':
-        assert isinstance(obj, dict)
-        base_url = from_str(obj.get("baseUrl"))
-        api_key = from_union([from_str, from_none], obj.get("apiKey"))
-        azure = from_union([ProviderConfigAzure.from_dict, from_none], obj.get("azure"))
-        bearer_token = from_union([from_str, from_none], obj.get("bearerToken"))
-        has_bearer_token_provider = from_union([from_bool, from_none], obj.get("hasBearerTokenProvider"))
-        headers = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("headers"))
-        max_context_window_tokens = from_union([from_float, from_none], obj.get("maxContextWindowTokens"))
-        max_output_tokens = from_union([from_float, from_none], obj.get("maxOutputTokens"))
-        max_prompt_tokens = from_union([from_float, from_none], obj.get("maxPromptTokens"))
-        model_id = from_union([from_str, from_none], obj.get("modelId"))
-        transport = from_union([ProviderTransport, from_none], obj.get("transport"))
-        type = from_union([ProviderType, from_none], obj.get("type"))
-        wire_api = from_union([ProviderWireAPI, from_none], obj.get("wireApi"))
-        wire_model = from_union([from_str, from_none], obj.get("wireModel"))
-        return ProviderConfig(base_url, api_key, azure, bearer_token, has_bearer_token_provider, headers, max_context_window_tokens, max_output_tokens, max_prompt_tokens, model_id, transport, type, wire_api, wire_model)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["baseUrl"] = from_str(self.base_url)
-        if self.api_key is not None:
-            result["apiKey"] = from_union([from_str, from_none], self.api_key)
-        if self.azure is not None:
-            result["azure"] = from_union([lambda x: to_class(ProviderConfigAzure, x), from_none], self.azure)
-        if self.bearer_token is not None:
-            result["bearerToken"] = from_union([from_str, from_none], self.bearer_token)
-        if self.has_bearer_token_provider is not None:
-            result["hasBearerTokenProvider"] = from_union([from_bool, from_none], self.has_bearer_token_provider)
-        if self.headers is not None:
-            result["headers"] = from_union([lambda x: from_dict(from_str, x), from_none], self.headers)
-        if self.max_context_window_tokens is not None:
-            result["maxContextWindowTokens"] = from_union([to_float, from_none], self.max_context_window_tokens)
-        if self.max_output_tokens is not None:
-            result["maxOutputTokens"] = from_union([to_float, from_none], self.max_output_tokens)
-        if self.max_prompt_tokens is not None:
-            result["maxPromptTokens"] = from_union([to_float, from_none], self.max_prompt_tokens)
-        if self.model_id is not None:
-            result["modelId"] = from_union([from_str, from_none], self.model_id)
-        if self.transport is not None:
-            result["transport"] = from_union([lambda x: to_enum(ProviderTransport, x), from_none], self.transport)
-        if self.type is not None:
-            result["type"] = from_union([lambda x: to_enum(ProviderType, x), from_none], self.type)
-        if self.wire_api is not None:
-            result["wireApi"] = from_union([lambda x: to_enum(ProviderWireAPI, x), from_none], self.wire_api)
-        if self.wire_model is not None:
-            result["wireModel"] = from_union([from_str, from_none], self.wire_model)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class OptionsUpdateAdditionalContentExclusionPolicyRule:
@@ -16351,12 +19836,17 @@ class OptionsUpdateAdditionalContentExclusionPolicyRule:
     conditions, and source.
     """
     paths: list[str]
+    """Path patterns covered by this rule."""
+
     source: OptionsUpdateAdditionalContentExclusionPolicyRuleSource
     """Source descriptor for a `session.options.update` content-exclusion rule, with source name
     and type.
     """
     if_any_match: list[str] | None = None
+    """Conditions of which at least one must match."""
+
     if_none_match: list[str] | None = None
+    """Conditions none of which may match."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'OptionsUpdateAdditionalContentExclusionPolicyRule':
@@ -16882,60 +20372,6 @@ def to_dict(self) -> dict:
         result["serverName"] = from_str(self.server_name)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class PermissionDecisionApproveForLocationApprovalMemory:
-    """Location-scoped approval details for writes to long-term memory."""
-
-    kind: ClassVar[str] = "memory"
-    """Approval covering writes to long-term memory."""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'PermissionDecisionApproveForLocationApprovalMemory':
-        assert isinstance(obj, dict)
-        return PermissionDecisionApproveForLocationApprovalMemory()
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["kind"] = self.kind
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class PermissionDecisionApproveForSessionApprovalMemory:
-    """Session-scoped approval details for writes to long-term memory."""
-
-    kind: ClassVar[str] = "memory"
-    """Approval covering writes to long-term memory."""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'PermissionDecisionApproveForSessionApprovalMemory':
-        assert isinstance(obj, dict)
-        return PermissionDecisionApproveForSessionApprovalMemory()
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["kind"] = self.kind
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class PermissionsLocationsAddToolApprovalDetailsMemory:
-    """Location-persisted tool approval details for writes to long-term memory."""
-
-    kind: ClassVar[str] = "memory"
-    """Approval covering writes to long-term memory."""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'PermissionsLocationsAddToolApprovalDetailsMemory':
-        assert isinstance(obj, dict)
-        return PermissionsLocationsAddToolApprovalDetailsMemory()
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["kind"] = self.kind
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionDecisionApproveForLocationApprovalRead:
@@ -17218,6 +20654,47 @@ def to_dict(self) -> dict:
             result["reason"] = from_union([from_str, from_none], self.reason)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionDecisionContext:
+    """Optional informational context describing how and where the permission decision was made.
+    This does not affect permission behavior.
+
+    Optional informational context describing how and where this response was made. Omit it
+    to preserve legacy behavior without attributing an origin.
+    """
+    outcome: PermissionDecisionOutcome
+    """Disposition of the permission request as observed by the responding client."""
+
+    source: PermissionDecisionSource
+    """Controlled reason or actor responsible for the response."""
+
+    surface: PermissionDecisionSurface
+    """Client surface that submitted the response."""
+
+    response_capability: PermissionResponseCapability | None = None
+    """Whether the responding client could ask a user interactively, was running headlessly, or
+    had no response path. Omit when the client cannot determine this authoritatively.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionDecisionContext':
+        assert isinstance(obj, dict)
+        outcome = PermissionDecisionOutcome(obj.get("outcome"))
+        source = PermissionDecisionSource(obj.get("source"))
+        surface = PermissionDecisionSurface(obj.get("surface"))
+        response_capability = from_union([PermissionResponseCapability, from_none], obj.get("responseCapability"))
+        return PermissionDecisionContext(outcome, source, surface, response_capability)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["outcome"] = to_enum(PermissionDecisionOutcome, self.outcome)
+        result["source"] = to_enum(PermissionDecisionSource, self.source)
+        result["surface"] = to_enum(PermissionDecisionSurface, self.surface)
+        if self.response_capability is not None:
+            result["responseCapability"] = from_union([lambda x: to_enum(PermissionResponseCapability, x), from_none], self.response_capability)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionDecisionDeniedByContentExclusionPolicy:
@@ -17470,12 +20947,17 @@ class PermissionsConfigureAdditionalContentExclusionPolicyRule:
     match conditions, and source.
     """
     paths: list[str]
+    """Path patterns covered by this rule."""
+
     source: PermissionsConfigureAdditionalContentExclusionPolicyRuleSource
     """Source descriptor for a `session.permissions.configure` content-exclusion rule, with
     source name and type.
     """
     if_any_match: list[str] | None = None
+    """Conditions of which at least one must match."""
+
     if_none_match: list[str] | None = None
+    """Conditions none of which may match."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'PermissionsConfigureAdditionalContentExclusionPolicyRule':
@@ -17543,7 +21025,9 @@ class PlanReadSQLTodosResult:
     """Todo rows read from the session SQL database. Empty when no session database is available."""
 
     rows: list[PlanSQLTodosRow]
-    """Rows from the session SQL todos table, ordered by creation time and id."""
+    """Rows from the session SQL todos table, ordered by creation time with insertion order used
+    to break ties when available and id used for WITHOUT ROWID tables.
+    """
 
     @staticmethod
     def from_dict(obj: Any) -> 'PlanReadSQLTodosResult':
@@ -17567,7 +21051,8 @@ class PlanReadSQLTodosWithDependenciesResult:
     not affect the rows result and vice versa.
     """
     rows: list[PlanSQLTodosRow]
-    """Rows from the session SQL todos table, ordered by creation time and id. Empty when no
+    """Rows from the session SQL todos table, ordered by creation time with insertion order used
+    to break ties when available and id used for WITHOUT ROWID tables. Empty when no
     database, no todos table, or the SELECT failed.
     """
 
@@ -17678,6 +21163,14 @@ class InstalledPluginInfo:
     for direct repo / URL / local installs; absent for marketplace plugins. Same source
     yields the same id; distinct sources never collide.
     """
+    installed_from: str | None = None
+    """Absolute path of the marketplace directory a live plugin was resolved from. Present only
+    on live, never-persisted records — a plugin belonging to a directory/local marketplace,
+    which is loaded from its real directory on every pass instead of a copy under the
+    installed-plugins cache. Its presence is what marks a listed plugin as live: such a
+    plugin is always present on disk, so `enabled` is its only meaningful state and it is
+    never "not installed".
+    """
     version: str | None = None
     """Installed version (when reported by the plugin manifest)"""
 
@@ -17688,8 +21181,9 @@ def from_dict(obj: Any) -> 'InstalledPluginInfo':
         marketplace = from_str(obj.get("marketplace"))
         name = from_str(obj.get("name"))
         direct_source_id = from_union([from_str, from_none], obj.get("directSourceId"))
+        installed_from = from_union([from_str, from_none], obj.get("installedFrom"))
         version = from_union([from_str, from_none], obj.get("version"))
-        return InstalledPluginInfo(enabled, marketplace, name, direct_source_id, version)
+        return InstalledPluginInfo(enabled, marketplace, name, direct_source_id, installed_from, version)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -17698,6 +21192,8 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         if self.direct_source_id is not None:
             result["directSourceId"] = from_union([from_str, from_none], self.direct_source_id)
+        if self.installed_from is not None:
+            result["installedFrom"] = from_union([from_str, from_none], self.installed_from)
         if self.version is not None:
             result["version"] = from_union([from_str, from_none], self.version)
         return result
@@ -18497,8 +21993,10 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class QueueInsertMessage:
-    """Serializable message fields accepted by queue.insertAt."""
+    """Queued message contents and delivery metadata.
 
+    Serializable message fields accepted by queue.insertAt.
+    """
     prompt: str
     """The user message text."""
 
@@ -18841,9 +22339,8 @@ class RemoteControlStatusActive:
     # Internal: this field is an internal SDK API and is not part of the public surface.
     prompt_manager: Any = None
     """In-process prompt-manager handle (CLI-only optimization). Marked internal: this field is
-    excluded from the public SDK surface. When the CLI migrates to a process-separated SDK,
-    the same bidirectional prompt-routing handshake is expressed via dedicated remote-control
-    RPCs (register/resolve) rather than a shared in-process object.
+    excluded from the public SDK surface. Retained as an optional compatibility field; native
+    remote control does not populate or consume it.
     """
 
     @staticmethod
@@ -19324,9 +22821,14 @@ def to_dict(self) -> dict:
 class SessionFSSqliteTransactionError:
     """Classified SQLite transaction failure. busyOrLocked guarantees rollback;
     postCommitAmbiguous must never be retried.
+
+    Classified transaction failure, when execution did not succeed.
     """
     error_class: SessionFSSqliteTransactionErrorClass
+    """Machine-readable classification of the transaction failure."""
+
     message: str
+    """Human-readable transaction failure message."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionFSSqliteTransactionError':
@@ -19436,6 +22938,7 @@ class SessionLimitPredictionTierOption:
     """AI-credit cap for this tier."""
 
     tier: SessionLimitPredictionTier
+    """Semantic usage tier."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionLimitPredictionTierOption':
@@ -19450,6 +22953,30 @@ def to_dict(self) -> dict:
         result["tier"] = to_enum(SessionLimitPredictionTier, self.tier)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionManagedSettings:
+    """Managed settings an SDK host may inject at session startup. Only permissions are accepted
+    in this initial contract.
+
+    Permissions-only enterprise policy injected by the SDK host at session create or resume.
+    Composes restrictively with self-fetched and device policy and is not persisted.
+    """
+    permissions: SessionManagedPermissions | None = None
+    """Managed permission policy injected by the SDK host."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionManagedSettings':
+        assert isinstance(obj, dict)
+        permissions = from_union([SessionManagedPermissions.from_dict, from_none], obj.get("permissions"))
+        return SessionManagedSettings(permissions)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.permissions is not None:
+            result["permissions"] = from_union([lambda x: to_class(SessionManagedPermissions, x), from_none], self.permissions)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionOpenOptionsAdditionalContentExclusionPolicyRule:
@@ -19457,11 +22984,16 @@ class SessionOpenOptionsAdditionalContentExclusionPolicyRule:
     conditions, and source.
     """
     paths: list[str]
+    """Path patterns covered by this rule."""
+
     source: SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource
     """Source descriptor for a `sessions.open` content-exclusion rule, with source name and type."""
 
     if_any_match: list[str] | None = None
+    """Conditions of which at least one must match."""
+
     if_none_match: list[str] | None = None
+    """Conditions none of which may match."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionOpenOptionsAdditionalContentExclusionPolicyRule':
@@ -19540,11 +23072,18 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionSettingsJobSnapshot:
-    """Redacted job settings for a session. The job nonce is excluded."""
+    """Redacted job settings for a session. The job nonce is excluded.
 
+    Redacted job settings.
+    """
     built_in_tool_availability: SessionSettingsBuiltInToolAvailabilitySnapshot | None = None
+    """Availability of job-specific built-in tools."""
+
     event_type: str | None = None
+    """GitHub Actions event type for the job."""
+
     is_trigger_job: bool | None = None
+    """Whether this is the workflow's trigger job."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionSettingsJobSnapshot':
@@ -19968,6 +23507,39 @@ def to_dict(self) -> dict:
             result["projectPath"] = from_union([from_str, from_none], self.project_path)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SlashCommandAddTimelineEntryResult:
+    entry: SlashCommandTimelineEntry
+    """Timeline entry the host should append."""
+
+    kind: ClassVar[str] = "add-timeline-entry"
+    """Discriminator for an add-timeline-entry result."""
+
+    prefill_input: str | None = None
+    """Optional text the host should prefill into the input editor."""
+
+    runtime_settings_changed: bool | None = None
+    """Whether command execution changed persisted runtime settings."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SlashCommandAddTimelineEntryResult':
+        assert isinstance(obj, dict)
+        entry = SlashCommandTimelineEntry.from_dict(obj.get("entry"))
+        prefill_input = from_union([from_str, from_none], obj.get("prefillInput"))
+        runtime_settings_changed = from_union([from_bool, from_none], obj.get("runtimeSettingsChanged"))
+        return SlashCommandAddTimelineEntryResult(entry, prefill_input, runtime_settings_changed)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["entry"] = to_class(SlashCommandTimelineEntry, self.entry)
+        result["kind"] = self.kind
+        if self.prefill_input is not None:
+            result["prefillInput"] = from_union([from_str, from_none], self.prefill_input)
+        if self.runtime_settings_changed is not None:
+            result["runtimeSettingsChanged"] = from_union([from_bool, from_none], self.runtime_settings_changed)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SlashCommandAgentPromptResult:
@@ -20092,6 +23664,39 @@ def to_dict(self) -> dict:
             result["runtimeSettingsChanged"] = from_union([from_bool, from_none], self.runtime_settings_changed)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SlashCommandSetPlanModelResult:
+    kind: ClassVar[str] = "set-plan-model"
+    """Discriminator for a set-plan-model result."""
+
+    message: str
+    """User-facing confirmation message for the plan-model selection."""
+
+    plan_model: str | None = None
+    """Dedicated model selected for plan mode."""
+
+    runtime_settings_changed: bool | None = None
+    """Whether command execution changed persisted runtime settings."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SlashCommandSetPlanModelResult':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        plan_model = from_union([from_str, from_none], obj.get("planModel"))
+        runtime_settings_changed = from_union([from_bool, from_none], obj.get("runtimeSettingsChanged"))
+        return SlashCommandSetPlanModelResult(message, plan_model, runtime_settings_changed)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["message"] = from_str(self.message)
+        if self.plan_model is not None:
+            result["planModel"] = from_union([from_str, from_none], self.plan_model)
+        if self.runtime_settings_changed is not None:
+            result["runtimeSettingsChanged"] = from_union([from_bool, from_none], self.runtime_settings_changed)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class TaskAgentProgress:
@@ -20318,6 +23923,20 @@ def to_dict(self) -> dict:
             result["arguments"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.arguments)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class MCPServerConfigDeferTools(Enum):
+    """Controls if tools provided by this server can be loaded on demand via tool search (auto)
+    or always included in the initial tool list (never)
+
+    Controls whether tools can be loaded on demand.
+
+    Controls whether the runtime may defer loading an external tool definition.
+
+    Tool-loading deferral policy.
+    """
+    AUTO = "auto"
+    NEVER = "never"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPToolUI:
@@ -20442,6 +24061,9 @@ class TaskAgentInfo:
     completed_at: datetime | None = None
     """ISO 8601 timestamp when the task finished"""
 
+    display_name: str | None = None
+    """Friendly, non-unique name intended for display"""
+
     error: str | None = None
     """Error message when the task failed"""
 
@@ -20477,6 +24099,7 @@ def from_dict(obj: Any) -> 'TaskAgentInfo':
         active_time_ms = from_union([from_int, from_none], obj.get("activeTimeMs"))
         can_promote_to_background = from_union([from_bool, from_none], obj.get("canPromoteToBackground"))
         completed_at = from_union([from_datetime, from_none], obj.get("completedAt"))
+        display_name = from_union([from_str, from_none], obj.get("displayName"))
         error = from_union([from_str, from_none], obj.get("error"))
         execution_mode = from_union([TaskExecutionMode, from_none], obj.get("executionMode"))
         idle_since = from_union([from_datetime, from_none], obj.get("idleSince"))
@@ -20484,7 +24107,7 @@ def from_dict(obj: Any) -> 'TaskAgentInfo':
         model = from_union([from_str, from_none], obj.get("model"))
         resolved_model = from_union([from_str, from_none], obj.get("resolvedModel"))
         result = from_union([from_str, from_none], obj.get("result"))
-        return TaskAgentInfo(agent_type, description, id, prompt, started_at, status, tool_call_id, active_started_at, active_time_ms, can_promote_to_background, completed_at, error, execution_mode, idle_since, latest_response, model, resolved_model, result)
+        return TaskAgentInfo(agent_type, description, id, prompt, started_at, status, tool_call_id, active_started_at, active_time_ms, can_promote_to_background, completed_at, display_name, error, execution_mode, idle_since, latest_response, model, resolved_model, result)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -20504,6 +24127,8 @@ def to_dict(self) -> dict:
             result["canPromoteToBackground"] = from_union([from_bool, from_none], self.can_promote_to_background)
         if self.completed_at is not None:
             result["completedAt"] = from_union([lambda x: x.isoformat(), from_none], self.completed_at)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_str, from_none], self.display_name)
         if self.error is not None:
             result["error"] = from_union([from_str, from_none], self.error)
         if self.execution_mode is not None:
@@ -20539,6 +24164,58 @@ def to_dict(self) -> dict:
         result["tools"] = from_list(lambda x: to_class(Tool, x), self.tools)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ToolsShellDescriptorConfig:
+    """Shell-specific names and description lines for shell tools.
+
+    Shell-specific names and description lines used to materialize built-in shell tool
+    descriptors.
+    """
+    description_lines: list[str]
+    """Additional model-facing shell description lines."""
+
+    display_name: str
+    """Human-readable shell name."""
+
+    list_shells_tool_name: str
+    """Tool name used to list active shells."""
+
+    read_shell_tool_name: str
+    """Tool name used to read shell output."""
+
+    shell_tool_name: str
+    """Tool name used to start shell commands."""
+
+    shell_type: str
+    """Stable shell type identifier."""
+
+    stop_shell_tool_name: str
+    """Tool name used to stop shell commands."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolsShellDescriptorConfig':
+        assert isinstance(obj, dict)
+        description_lines = from_list(from_str, obj.get("descriptionLines"))
+        display_name = from_str(obj.get("displayName"))
+        list_shells_tool_name = from_str(obj.get("listShellsToolName"))
+        read_shell_tool_name = from_str(obj.get("readShellToolName"))
+        shell_tool_name = from_str(obj.get("shellToolName"))
+        shell_type = from_str(obj.get("shellType"))
+        stop_shell_tool_name = from_str(obj.get("stopShellToolName"))
+        return ToolsShellDescriptorConfig(description_lines, display_name, list_shells_tool_name, read_shell_tool_name, shell_tool_name, shell_type, stop_shell_tool_name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["descriptionLines"] = from_list(from_str, self.description_lines)
+        result["displayName"] = from_str(self.display_name)
+        result["listShellsToolName"] = from_str(self.list_shells_tool_name)
+        result["readShellToolName"] = from_str(self.read_shell_tool_name)
+        result["shellToolName"] = from_str(self.shell_tool_name)
+        result["shellType"] = from_str(self.shell_type)
+        result["stopShellToolName"] = from_str(self.stop_shell_tool_name)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class UserRequestedShellCommandResult:
@@ -20833,6 +24510,9 @@ class UIElicitationResponse:
     action: UIElicitationResponseAction
     """The user's response: accept (submitted), decline (rejected), or cancel (dismissed)"""
 
+    meta: dict[str, Any] | None = None
+    """MCP response metadata."""
+
     content: dict[str, float | bool | list[str] | str] | None = None
     """The form values submitted by the user (present when action is 'accept')"""
 
@@ -20840,12 +24520,15 @@ class UIElicitationResponse:
     def from_dict(obj: Any) -> 'UIElicitationResponse':
         assert isinstance(obj, dict)
         action = UIElicitationResponseAction(obj.get("action"))
+        meta = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("_meta"))
         content = from_union([lambda x: from_dict(lambda x: from_union([from_float, from_bool, lambda x: from_list(from_str, x), from_str], x), x), from_none], obj.get("content"))
-        return UIElicitationResponse(action, content)
+        return UIElicitationResponse(action, meta, content)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["action"] = to_enum(UIElicitationResponseAction, self.action)
+        if self.meta is not None:
+            result["_meta"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.meta)
         if self.content is not None:
             result["content"] = from_union([lambda x: from_dict(lambda x: from_union([to_float, from_bool, lambda x: from_list(from_str, x), from_str], x), x), from_none], self.content)
         return result
@@ -21249,6 +24932,47 @@ def to_dict(self) -> dict:
             result["logCapture"] = from_union([lambda x: to_class(AgentRegistryLogCapture, x), from_none], self.log_capture)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPPlanProvenance:
+    """Origin and semantic digest of the exact validated JSON MCP card content bound to this
+    plan.
+
+    Provenance of the exact validated JSON MCP card content bound privately to a completed
+    plan and its opaque handle.
+    """
+    authority: str
+    """Authority associated with the validated card, without path, query, or credentials. Inert
+    untrusted data.
+    """
+    card_digest: CardDigest
+    """Semantic digest of the exact validated JSON content bound to the plan handle."""
+
+    media_type: MCPServerCardMediaType
+    """JSON MCP media type the validated card was interpreted as."""
+
+    validated_at: str
+    """ISO 8601 timestamp at which the runtime completed strict parsing and schema validation of
+    the card content.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPPlanProvenance':
+        assert isinstance(obj, dict)
+        authority = from_str(obj.get("authority"))
+        card_digest = CardDigest.from_dict(obj.get("cardDigest"))
+        media_type = MCPServerCardMediaType(obj.get("mediaType"))
+        validated_at = from_str(obj.get("validatedAt"))
+        return MCPPlanProvenance(authority, card_digest, media_type, validated_at)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authority"] = from_str(self.authority)
+        result["cardDigest"] = to_class(CardDigest, self.card_digest)
+        result["mediaType"] = to_enum(MCPServerCardMediaType, self.media_type)
+        result["validatedAt"] = from_str(self.validated_at)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SlashCommandInfo:
@@ -21394,6 +25118,230 @@ def to_dict(self) -> dict:
         result["openCanvases"] = from_list(lambda x: to_class(OpenCanvasInstance, x), self.open_canvases)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogAISkillCandidate:
+    """An inert AI skill catalog result. AI skills are discovery-only and cannot be represented
+    as installable through this surface.
+    """
+    display_name: str
+    """Display name taken verbatim from the card. Inert untrusted text."""
+
+    handle: str
+    """Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries
+    no readable information and is rejected when stale, replayed, or presented to a different
+    runtime instance. Never logged.
+    """
+    handle_expires_at: str
+    """ISO 8601 timestamp after which the handle is stale and will be rejected."""
+
+    installability: Installability
+    """AI skills are discovery-only and cannot be installed through this surface"""
+
+    kind: CatalogAISkillCandidateKind
+    """Discriminator: this candidate describes an AI skill"""
+
+    media_type: MediaType
+    """Media type of the underlying AI skill card"""
+
+    provenance: CatalogAISkillCandidateProvenance
+    """Where the catalog reference was observed, without the card itself or any content digest."""
+
+    source: CatalogCandidateSource
+    """Where the card came from: exactly one of a URL or embedded data, encoded as a tagged
+    union so neither both nor neither can be represented.
+    """
+    description: str | None = None
+    """Description taken verbatim from the card. Inert untrusted text."""
+
+    publisher: str | None = None
+    """Publisher taken verbatim from the card. Inert untrusted text."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogAISkillCandidate':
+        assert isinstance(obj, dict)
+        display_name = from_str(obj.get("displayName"))
+        handle = from_str(obj.get("handle"))
+        handle_expires_at = from_str(obj.get("handleExpiresAt"))
+        installability = Installability(obj.get("installability"))
+        kind = CatalogAISkillCandidateKind(obj.get("kind"))
+        media_type = MediaType(obj.get("mediaType"))
+        provenance = CatalogAISkillCandidateProvenance.from_dict(obj.get("provenance"))
+        source = _load_CatalogCandidateSource(obj.get("source"))
+        description = from_union([from_str, from_none], obj.get("description"))
+        publisher = from_union([from_str, from_none], obj.get("publisher"))
+        return CatalogAISkillCandidate(display_name, handle, handle_expires_at, installability, kind, media_type, provenance, source, description, publisher)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["displayName"] = from_str(self.display_name)
+        result["handle"] = from_str(self.handle)
+        result["handleExpiresAt"] = from_str(self.handle_expires_at)
+        result["installability"] = to_enum(Installability, self.installability)
+        result["kind"] = to_enum(CatalogAISkillCandidateKind, self.kind)
+        result["mediaType"] = to_enum(MediaType, self.media_type)
+        result["provenance"] = to_class(CatalogAISkillCandidateProvenance, self.provenance)
+        result["source"] = (self.source).to_dict()
+        if self.description is not None:
+            result["description"] = from_union([from_str, from_none], self.description)
+        if self.publisher is not None:
+            result["publisher"] = from_union([from_str, from_none], self.publisher)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogCandidate:
+    """One inert catalog result, represented as an MCP server or discovery-only AI skill variant
+    so kind, media type, provenance, and installability cannot contradict each other.
+
+    An inert MCP server catalog result. Every free-text field is untrusted external data and
+    must never be treated as an instruction, and the handle is the only way to refer to the
+    candidate in a later operation.
+
+    An inert AI skill catalog result. AI skills are discovery-only and cannot be represented
+    as installable through this surface.
+    """
+    display_name: str
+    """Display name taken verbatim from the card. Inert untrusted text."""
+
+    handle: str
+    """Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries
+    no readable information and is rejected when stale, replayed, or presented to a different
+    runtime instance. Never logged.
+    """
+    handle_expires_at: str
+    """ISO 8601 timestamp after which the handle is stale and will be rejected."""
+
+    installability: CatalogCandidateInstallability
+    """Whether this MCP server can be planned for installation, and if policy prevents it.
+
+    AI skills are discovery-only and cannot be installed through this surface
+    """
+    kind: CatalogCandidateKind
+    """Discriminator: this candidate describes an MCP server
+
+    Discriminator: this candidate describes an AI skill
+    """
+    media_type: CatalogMediaType
+    """JSON MCP media type of the underlying card.
+
+    Media type of the underlying AI skill card
+    """
+    provenance: CatalogCandidateProvenance
+    """Where the catalog reference was observed, without the card itself or any content digest."""
+
+    source: CatalogCandidateSource
+    """Where the card came from: exactly one of a URL or embedded data, encoded as a tagged
+    union so neither both nor neither can be represented.
+    """
+    description: str | None = None
+    """Description taken verbatim from the card. Inert untrusted text."""
+
+    publisher: str | None = None
+    """Publisher taken verbatim from the card. Inert untrusted text."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogCandidate':
+        assert isinstance(obj, dict)
+        display_name = from_str(obj.get("displayName"))
+        handle = from_str(obj.get("handle"))
+        handle_expires_at = from_str(obj.get("handleExpiresAt"))
+        installability = CatalogCandidateInstallability(obj.get("installability"))
+        kind = CatalogCandidateKind(obj.get("kind"))
+        media_type = CatalogMediaType(obj.get("mediaType"))
+        provenance = CatalogCandidateProvenance.from_dict(obj.get("provenance"))
+        source = _load_CatalogCandidateSource(obj.get("source"))
+        description = from_union([from_str, from_none], obj.get("description"))
+        publisher = from_union([from_str, from_none], obj.get("publisher"))
+        return CatalogCandidate(display_name, handle, handle_expires_at, installability, kind, media_type, provenance, source, description, publisher)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["displayName"] = from_str(self.display_name)
+        result["handle"] = from_str(self.handle)
+        result["handleExpiresAt"] = from_str(self.handle_expires_at)
+        result["installability"] = to_enum(CatalogCandidateInstallability, self.installability)
+        result["kind"] = to_enum(CatalogCandidateKind, self.kind)
+        result["mediaType"] = to_enum(CatalogMediaType, self.media_type)
+        result["provenance"] = to_class(CatalogCandidateProvenance, self.provenance)
+        result["source"] = (self.source).to_dict()
+        if self.description is not None:
+            result["description"] = from_union([from_str, from_none], self.description)
+        if self.publisher is not None:
+            result["publisher"] = from_union([from_str, from_none], self.publisher)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogMCPServerCandidate:
+    """An inert MCP server catalog result. Every free-text field is untrusted external data and
+    must never be treated as an instruction, and the handle is the only way to refer to the
+    candidate in a later operation.
+    """
+    display_name: str
+    """Display name taken verbatim from the card. Inert untrusted text."""
+
+    handle: str
+    """Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries
+    no readable information and is rejected when stale, replayed, or presented to a different
+    runtime instance. Never logged.
+    """
+    handle_expires_at: str
+    """ISO 8601 timestamp after which the handle is stale and will be rejected."""
+
+    installability: CatalogMCPServerInstallabilityEnum
+    """Whether this MCP server can be planned for installation, and if policy prevents it."""
+
+    kind: CatalogMCPServerCandidateKind
+    """Discriminator: this candidate describes an MCP server"""
+
+    media_type: MCPServerCardMediaType
+    """JSON MCP media type of the underlying card."""
+
+    provenance: CatalogMCPServerCandidateProvenance
+    """Where the catalog reference was observed, without the card itself or any content digest."""
+
+    source: CatalogCandidateSource
+    """Where the card came from: exactly one of a URL or embedded data, encoded as a tagged
+    union so neither both nor neither can be represented.
+    """
+    description: str | None = None
+    """Description taken verbatim from the card. Inert untrusted text."""
+
+    publisher: str | None = None
+    """Publisher taken verbatim from the card. Inert untrusted text."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogMCPServerCandidate':
+        assert isinstance(obj, dict)
+        display_name = from_str(obj.get("displayName"))
+        handle = from_str(obj.get("handle"))
+        handle_expires_at = from_str(obj.get("handleExpiresAt"))
+        installability = CatalogMCPServerInstallabilityEnum(obj.get("installability"))
+        kind = CatalogMCPServerCandidateKind(obj.get("kind"))
+        media_type = MCPServerCardMediaType(obj.get("mediaType"))
+        provenance = CatalogMCPServerCandidateProvenance.from_dict(obj.get("provenance"))
+        source = _load_CatalogCandidateSource(obj.get("source"))
+        description = from_union([from_str, from_none], obj.get("description"))
+        publisher = from_union([from_str, from_none], obj.get("publisher"))
+        return CatalogMCPServerCandidate(display_name, handle, handle_expires_at, installability, kind, media_type, provenance, source, description, publisher)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["displayName"] = from_str(self.display_name)
+        result["handle"] = from_str(self.handle)
+        result["handleExpiresAt"] = from_str(self.handle_expires_at)
+        result["installability"] = to_enum(CatalogMCPServerInstallabilityEnum, self.installability)
+        result["kind"] = to_enum(CatalogMCPServerCandidateKind, self.kind)
+        result["mediaType"] = to_enum(MCPServerCardMediaType, self.media_type)
+        result["provenance"] = to_class(CatalogMCPServerCandidateProvenance, self.provenance)
+        result["source"] = (self.source).to_dict()
+        if self.description is not None:
+            result["description"] = from_union([from_str, from_none], self.description)
+        if self.publisher is not None:
+            result["publisher"] = from_union([from_str, from_none], self.publisher)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class DebugCollectLogsResult:
@@ -21474,6 +25422,36 @@ def to_dict(self) -> dict:
         result["extensions"] = from_list(lambda x: to_class(Extension, x), self.extensions)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionDecisionApproveForLocationApprovalExtensionEnvAccess:
+    """Location-scoped approval details for an extension's access to sensitive environment
+    variables, keyed by extension name and the exact set of variable names.
+    """
+    environment_variables: list[str]
+    """Names of the sensitive environment variables this approval covers. Values are never
+    persisted.
+    """
+    extension_name: str
+    """Extension name."""
+
+    kind: ClassVar[str] = "extension-env-access"
+    """Approval covering an extension's request to read sensitive environment variables."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionDecisionApproveForLocationApprovalExtensionEnvAccess':
+        assert isinstance(obj, dict)
+        environment_variables = from_list(from_str, obj.get("environmentVariables"))
+        extension_name = from_str(obj.get("extensionName"))
+        return PermissionDecisionApproveForLocationApprovalExtensionEnvAccess(environment_variables, extension_name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environmentVariables"] = from_list(from_str, self.environment_variables)
+        result["extensionName"] = from_str(self.extension_name)
+        result["kind"] = self.kind
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess:
@@ -21498,6 +25476,36 @@ def to_dict(self) -> dict:
         result["kind"] = self.kind
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionDecisionApproveForSessionApprovalExtensionEnvAccess:
+    """Session-scoped approval details for an extension's access to sensitive environment
+    variables, keyed by extension name and the exact set of variable names.
+    """
+    environment_variables: list[str]
+    """Names of the sensitive environment variables this approval covers. Values are never
+    persisted.
+    """
+    extension_name: str
+    """Extension name."""
+
+    kind: ClassVar[str] = "extension-env-access"
+    """Approval covering an extension's request to read sensitive environment variables."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionDecisionApproveForSessionApprovalExtensionEnvAccess':
+        assert isinstance(obj, dict)
+        environment_variables = from_list(from_str, obj.get("environmentVariables"))
+        extension_name = from_str(obj.get("extensionName"))
+        return PermissionDecisionApproveForSessionApprovalExtensionEnvAccess(environment_variables, extension_name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environmentVariables"] = from_list(from_str, self.environment_variables)
+        result["extensionName"] = from_str(self.extension_name)
+        result["kind"] = self.kind
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess:
@@ -21522,6 +25530,36 @@ def to_dict(self) -> dict:
         result["kind"] = self.kind
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess:
+    """Location-persisted tool approval details for an extension's access to sensitive
+    environment variables, keyed by extension name and the exact set of variable names.
+    """
+    environment_variables: list[str]
+    """Names of the sensitive environment variables this approval covers. Values are never
+    persisted.
+    """
+    extension_name: str
+    """Extension name."""
+
+    kind: ClassVar[str] = "extension-env-access"
+    """Approval covering an extension's request to read sensitive environment variables."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess':
+        assert isinstance(obj, dict)
+        environment_variables = from_list(from_str, obj.get("environmentVariables"))
+        extension_name = from_str(obj.get("extensionName"))
+        return PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess(environment_variables, extension_name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environmentVariables"] = from_list(from_str, self.environment_variables)
+        result["extensionName"] = from_str(self.extension_name)
+        result["kind"] = self.kind
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess:
@@ -21610,6 +25648,124 @@ def to_dict(self) -> dict:
             result["toolTelemetry"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.tool_telemetry)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ToolResultExpanded:
+    """Expanded canonical tool result
+
+    Expanded canonical result returned by a session tool.
+
+    Final expanded result returned by the task_complete tool.
+    """
+    result_type: ToolResultType
+    """Execution outcome classification."""
+
+    text_result_for_llm: str
+    """Text result returned to the model."""
+
+    binary_results_for_llm: list[ExternalToolTextResultForLlmBinaryResultsForLlm] | None = None
+    """Base64-encoded binary results returned to the model."""
+
+    citable_sources: list[Any] | None = None
+    """Sources returned by the tool that the model may cite."""
+
+    contents: list[ExternalToolTextResultForLlmContent] | None = None
+    """Structured content blocks returned to the model."""
+
+    error: str | None = None
+    """Error message for an unsuccessful execution."""
+
+    mcp_meta: dict[str, Any] | None = None
+    """Metadata propagated with the tool result, including information-flow labels."""
+
+    new_messages: list[ToolResultNewMessage] | None = None
+    """Messages to inject after the tool result."""
+
+    post_tool_use_failure_hooks_processed: bool | None = None
+    """Whether post-tool-use failure hooks have already processed this result."""
+
+    session_log: str | None = None
+    """Detailed log content available for session display."""
+
+    skill_invocation: Any = None
+    """Skill invocation metadata produced by the tool."""
+
+    skip_large_output_processing: bool | None = None
+    """Whether large-output post-processing should be skipped."""
+
+    structured_content: Any = None
+    """Structured result content in addition to the model-facing text."""
+
+    task_completion_decision: TaskCompletionDecision | None = None
+    """Completion-review decision produced by the task-completion tool."""
+
+    tool_references: list[str] | None = None
+    """Deferred tool names made available by this result."""
+
+    tool_telemetry: Any = None
+    """Tool-specific telemetry payload."""
+
+    ui_resource: Any = None
+    """Optional UI resource produced by the tool."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolResultExpanded':
+        assert isinstance(obj, dict)
+        result_type = ToolResultType(obj.get("resultType"))
+        text_result_for_llm = from_str(obj.get("textResultForLlm"))
+        binary_results_for_llm = from_union([lambda x: from_list(ExternalToolTextResultForLlmBinaryResultsForLlm.from_dict, x), from_none], obj.get("binaryResultsForLlm"))
+        citable_sources = from_union([lambda x: from_list(lambda x: x, x), from_none], obj.get("citableSources"))
+        contents = from_union([lambda x: from_list(_load_ExternalToolTextResultForLlmContent, x), from_none], obj.get("contents"))
+        error = from_union([from_str, from_none], obj.get("error"))
+        mcp_meta = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("mcpMeta"))
+        new_messages = from_union([lambda x: from_list(ToolResultNewMessage.from_dict, x), from_none], obj.get("newMessages"))
+        post_tool_use_failure_hooks_processed = from_union([from_bool, from_none], obj.get("postToolUseFailureHooksProcessed"))
+        session_log = from_union([from_str, from_none], obj.get("sessionLog"))
+        skill_invocation = obj.get("skillInvocation")
+        skip_large_output_processing = from_union([from_bool, from_none], obj.get("skipLargeOutputProcessing"))
+        structured_content = obj.get("structuredContent")
+        task_completion_decision = from_union([TaskCompletionDecision.from_dict, from_none], obj.get("taskCompletionDecision"))
+        tool_references = from_union([lambda x: from_list(from_str, x), from_none], obj.get("toolReferences"))
+        tool_telemetry = obj.get("toolTelemetry")
+        ui_resource = obj.get("uiResource")
+        return ToolResultExpanded(result_type, text_result_for_llm, binary_results_for_llm, citable_sources, contents, error, mcp_meta, new_messages, post_tool_use_failure_hooks_processed, session_log, skill_invocation, skip_large_output_processing, structured_content, task_completion_decision, tool_references, tool_telemetry, ui_resource)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["resultType"] = to_enum(ToolResultType, self.result_type)
+        result["textResultForLlm"] = from_str(self.text_result_for_llm)
+        if self.binary_results_for_llm is not None:
+            result["binaryResultsForLlm"] = from_union([lambda x: from_list(lambda x: to_class(ExternalToolTextResultForLlmBinaryResultsForLlm, x), x), from_none], self.binary_results_for_llm)
+        if self.citable_sources is not None:
+            result["citableSources"] = from_union([lambda x: from_list(lambda x: x, x), from_none], self.citable_sources)
+        if self.contents is not None:
+            result["contents"] = from_union([lambda x: from_list(lambda x: (x).to_dict(), x), from_none], self.contents)
+        if self.error is not None:
+            result["error"] = from_union([from_str, from_none], self.error)
+        if self.mcp_meta is not None:
+            result["mcpMeta"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.mcp_meta)
+        if self.new_messages is not None:
+            result["newMessages"] = from_union([lambda x: from_list(lambda x: to_class(ToolResultNewMessage, x), x), from_none], self.new_messages)
+        if self.post_tool_use_failure_hooks_processed is not None:
+            result["postToolUseFailureHooksProcessed"] = from_union([from_bool, from_none], self.post_tool_use_failure_hooks_processed)
+        if self.session_log is not None:
+            result["sessionLog"] = from_union([from_str, from_none], self.session_log)
+        if self.skill_invocation is not None:
+            result["skillInvocation"] = self.skill_invocation
+        if self.skip_large_output_processing is not None:
+            result["skipLargeOutputProcessing"] = from_union([from_bool, from_none], self.skip_large_output_processing)
+        if self.structured_content is not None:
+            result["structuredContent"] = self.structured_content
+        if self.task_completion_decision is not None:
+            result["taskCompletionDecision"] = from_union([lambda x: to_class(TaskCompletionDecision, x), from_none], self.task_completion_decision)
+        if self.tool_references is not None:
+            result["toolReferences"] = from_union([lambda x: from_list(from_str, x), from_none], self.tool_references)
+        if self.tool_telemetry is not None:
+            result["toolTelemetry"] = self.tool_telemetry
+        if self.ui_resource is not None:
+            result["uiResource"] = self.ui_resource
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ExternalToolTextResultForLlmContentResourceLink:
@@ -21674,9 +25830,16 @@ class FactoryRunTerminal:
     """Prompt-safe terminal factory outcome."""
 
     error: str | None = None
+    """Human-readable terminal error."""
+
     failure: FactoryRunFailure | None = None
+    """Machine-readable terminal failure."""
+
     reason: str | None = None
+    """Human-readable terminal reason."""
+
     result_preview: str | None = None
+    """Prompt-safe preview of the completed result."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryRunTerminal':
@@ -21787,16 +25950,27 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class FactoryProgressPage:
-    """A bidirectional page of factory progress."""
+    """A bidirectional page of factory progress.
 
+    Bidirectional page of durable factory progress.
+    """
     has_more_newer: bool
+    """Whether progress records newer than this page exist."""
+
     has_more_older: bool
+    """Whether progress records older than this page exist."""
+
     records: list[FactoryProgressLine]
+    """Progress records in sequence order."""
+
     revision: int
     """Run revision reflected by this page."""
 
     newest_seq: int | None = None
+    """Newest sequence number in this page, or null when empty."""
+
     oldest_seq: int | None = None
+    """Oldest sequence number in this page, or null when empty."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryProgressPage':
@@ -21849,6 +26023,30 @@ def to_dict(self) -> dict:
             result["options"] = from_union([lambda x: to_class(RunOptions, x), from_none], self.options)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPOauthHandlePendingRequest:
+    """Pending MCP OAuth request ID and host-provided token or cancellation response."""
+
+    request_id: str
+    """OAuth request identifier from the mcp.oauth_required event"""
+
+    result: MCPOauthPendingRequestResponse
+    """Host response to the pending OAuth request."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPOauthHandlePendingRequest':
+        assert isinstance(obj, dict)
+        request_id = from_str(obj.get("requestId"))
+        result = MCPOauthPendingRequestResponse.from_dict(obj.get("result"))
+        return MCPOauthHandlePendingRequest(request_id, result)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["requestId"] = from_str(self.request_id)
+        result["result"] = to_class(MCPOauthPendingRequestResponse, self.result)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HistoryRewindResult:
@@ -21967,6 +26165,13 @@ class InstalledPlugin:
     cache_path: str | None = None
     """Path where the plugin is cached locally"""
 
+    installed_from: str | None = None
+    """Absolute path of the marketplace directory a live plugin was resolved from. Present only
+    on live, never-persisted records — those synthesized at session start for a
+    directory/local marketplace, whose cache_path points at the real plugin directory on disk
+    rather than a copy under the installed-plugins cache. Its presence is what marks a record
+    as live, and no record carrying it is ever written to the persisted installedPlugins key.
+    """
     source: InstalledPluginSource | str | None = None
     """Source for direct repo installs (when marketplace is empty)"""
 
@@ -21988,10 +26193,11 @@ def from_dict(obj: Any) -> 'InstalledPlugin':
         marketplace = from_str(obj.get("marketplace"))
         name = from_str(obj.get("name"))
         cache_path = from_union([from_str, from_none], obj.get("cache_path"))
+        installed_from = from_union([from_str, from_none], obj.get("installed_from"))
         source = from_union([InstalledPluginSource.from_dict, from_str, from_none], obj.get("source"))
         source_sha = from_union([from_str, from_none], obj.get("source_sha"))
         version = from_union([from_str, from_none], obj.get("version"))
-        return InstalledPlugin(enabled, installed_at, marketplace, name, cache_path, source, source_sha, version)
+        return InstalledPlugin(enabled, installed_at, marketplace, name, cache_path, installed_from, source, source_sha, version)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -22001,6 +26207,8 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         if self.cache_path is not None:
             result["cache_path"] = from_union([from_str, from_none], self.cache_path)
+        if self.installed_from is not None:
+            result["installed_from"] = from_union([from_str, from_none], self.installed_from)
         if self.source is not None:
             result["source"] = from_union([lambda x: to_class(InstalledPluginSource, x), from_str, from_none], self.source)
         if self.source_sha is not None:
@@ -22030,6 +26238,13 @@ class SessionInstalledPlugin:
     cache_path: str | None = None
     """Path where the plugin is cached locally"""
 
+    installed_from: str | None = None
+    """Absolute path of the marketplace directory a live plugin was resolved from. Present only
+    on live, never-persisted records — those synthesized at session start for a
+    directory/local marketplace, whose cache_path points at the real plugin directory on disk
+    rather than a copy under the installed-plugins cache. Its presence is what marks a record
+    as live, and no record carrying it is ever written to the persisted installedPlugins key.
+    """
     source: SessionInstalledPluginSource | str | None = None
     """Source descriptor for direct repo installs (when marketplace is empty)"""
 
@@ -22051,10 +26266,11 @@ def from_dict(obj: Any) -> 'SessionInstalledPlugin':
         marketplace = from_str(obj.get("marketplace"))
         name = from_str(obj.get("name"))
         cache_path = from_union([from_str, from_none], obj.get("cache_path"))
+        installed_from = from_union([from_str, from_none], obj.get("installed_from"))
         source = from_union([SessionInstalledPluginSource.from_dict, from_str, from_none], obj.get("source"))
         source_sha = from_union([from_str, from_none], obj.get("source_sha"))
         version = from_union([from_str, from_none], obj.get("version"))
-        return SessionInstalledPlugin(enabled, installed_at, marketplace, name, cache_path, source, source_sha, version)
+        return SessionInstalledPlugin(enabled, installed_at, marketplace, name, cache_path, installed_from, source, source_sha, version)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -22064,6 +26280,8 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         if self.cache_path is not None:
             result["cache_path"] = from_union([from_str, from_none], self.cache_path)
+        if self.installed_from is not None:
+            result["installed_from"] = from_union([from_str, from_none], self.installed_from)
         if self.source is not None:
             result["source"] = from_union([lambda x: to_class(SessionInstalledPluginSource, x), from_str, from_none], self.source)
         if self.source_sha is not None:
@@ -22215,6 +26433,16 @@ class RemoteSessionMetadataValue:
     context: SessionContext | None = None
     """Most recent working directory context."""
 
+    host_activity: str | None = None
+    """Host-supplied human description of what the session is doing right now ("running tests",
+    "waiting for approval"). Optional in the protocol and absent on hosts that do not publish
+    it, so never rely on it -- it enriches `hostStatus`, it does not replace it.
+    """
+    host_status: RemoteSessionHostStatus | None = None
+    """Live status as the owning host reports it in its session listing, so a row for a session
+    running elsewhere can show that it is running. Absent for hosts that publish no such
+    status (the cloud task managers), which read as idle.
+    """
     name: str | None = None
     """Optional human-friendly name set via /rename."""
 
@@ -22247,6 +26475,8 @@ def from_dict(obj: Any) -> 'RemoteSessionMetadataValue':
         session_id = from_str(obj.get("sessionId"))
         start_time = from_str(obj.get("startTime"))
         context = from_union([SessionContext.from_dict, from_none], obj.get("context"))
+        host_activity = from_union([from_str, from_none], obj.get("hostActivity"))
+        host_status = from_union([RemoteSessionHostStatus, from_none], obj.get("hostStatus"))
         name = from_union([from_str, from_none], obj.get("name"))
         pull_request_number = from_union([from_int, from_none], obj.get("pullRequestNumber"))
         resource_id = from_union([from_str, from_none], obj.get("resourceId"))
@@ -22254,7 +26484,7 @@ def from_dict(obj: Any) -> 'RemoteSessionMetadataValue':
         state = from_union([from_str, from_none], obj.get("state"))
         summary = from_union([from_str, from_none], obj.get("summary"))
         task_type = from_union([TaskType, from_none], obj.get("taskType"))
-        return RemoteSessionMetadataValue(is_remote, modified_time, remote_session_ids, repository, session_id, start_time, context, name, pull_request_number, resource_id, stale_at, state, summary, task_type)
+        return RemoteSessionMetadataValue(is_remote, modified_time, remote_session_ids, repository, session_id, start_time, context, host_activity, host_status, name, pull_request_number, resource_id, stale_at, state, summary, task_type)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -22266,6 +26496,10 @@ def to_dict(self) -> dict:
         result["startTime"] = from_str(self.start_time)
         if self.context is not None:
             result["context"] = from_union([lambda x: to_class(SessionContext, x), from_none], self.context)
+        if self.host_activity is not None:
+            result["hostActivity"] = from_union([from_str, from_none], self.host_activity)
+        if self.host_status is not None:
+            result["hostStatus"] = from_union([lambda x: to_enum(RemoteSessionHostStatus, x), from_none], self.host_status)
         if self.name is not None:
             result["name"] = from_union([from_str, from_none], self.name)
         if self.pull_request_number is not None:
@@ -22334,9 +26568,11 @@ class PermissionPathsConfig:
     """
     additional_directories: list[str] | None = None
     """Additional directories to allow tool access to (in addition to the session's working
-    directory). When `unrestricted` is true, these are still pre-populated on the
-    UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention
-    completion).
+    directory). Conventional `.github/skills/` and `.github/agents/` definitions under them
+    also join the session catalogs when their subsystem gates are enabled, so supplying a
+    directory is a trust decision for configuration stored there. When `unrestricted` is
+    true, these are still pre-populated on the UnrestrictedPathManager so they remain visible
+    via getDirectories() (e.g. for @-mention completion).
     """
     include_temp_directory: bool | None = None
     """Whether to include the system temp directory in the allowed list (defaults to true).
@@ -22566,129 +26802,6 @@ def to_dict(self) -> dict:
         result["context"] = to_class(MCPAppsSetHostContextDetails, self.context)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class MCPConfigAddRequest:
-    """MCP server name and configuration to add to user configuration."""
-
-    config: MCPServerConfig
-    """MCP server configuration (stdio process or remote HTTP/SSE)"""
-
-    name: str
-    """Unique name for the MCP server"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'MCPConfigAddRequest':
-        assert isinstance(obj, dict)
-        config = MCPServerConfig.from_dict(obj.get("config"))
-        name = from_str(obj.get("name"))
-        return MCPConfigAddRequest(config, name)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["config"] = to_class(MCPServerConfig, self.config)
-        result["name"] = from_str(self.name)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class MCPConfigList:
-    """User-configured MCP servers, keyed by server name."""
-
-    servers: dict[str, MCPServerConfig]
-    """All MCP servers from user config, keyed by name"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'MCPConfigList':
-        assert isinstance(obj, dict)
-        servers = from_dict(MCPServerConfig.from_dict, obj.get("servers"))
-        return MCPConfigList(servers)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["servers"] = from_dict(lambda x: to_class(MCPServerConfig, x), self.servers)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class MCPConfigUpdateRequest:
-    """MCP server name and replacement configuration to write to user configuration."""
-
-    config: MCPServerConfig
-    """MCP server configuration (stdio process or remote HTTP/SSE)"""
-
-    name: str
-    """Name of the MCP server to update"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'MCPConfigUpdateRequest':
-        assert isinstance(obj, dict)
-        config = MCPServerConfig.from_dict(obj.get("config"))
-        name = from_str(obj.get("name"))
-        return MCPConfigUpdateRequest(config, name)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["config"] = to_class(MCPServerConfig, self.config)
-        result["name"] = from_str(self.name)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class MCPRestartServerRequest:
-    """Server name and optional replacement configuration for an individual MCP server restart.
-    Omit `config` for a config-free restart-by-name of an already-configured server.
-    """
-    server_name: str
-    """Name of the MCP server to restart"""
-
-    config: MCPServerConfig | None = None
-    """Replacement MCP server configuration (stdio process or remote HTTP/SSE). Omit to restart
-    the server with its already-registered configuration (config-free restart-by-name).
-    """
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'MCPRestartServerRequest':
-        assert isinstance(obj, dict)
-        server_name = from_str(obj.get("serverName"))
-        config = from_union([MCPServerConfig.from_dict, from_none], obj.get("config"))
-        return MCPRestartServerRequest(server_name, config)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["serverName"] = from_str(self.server_name)
-        if self.config is not None:
-            result["config"] = from_union([lambda x: to_class(MCPServerConfig, x), from_none], self.config)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class MCPStartServerRequest:
-    """Server name and optional configuration for an individual MCP server start. Omit `config`
-    for a config-free start-by-name of an already-configured server.
-    """
-    server_name: str
-    """Name of the MCP server to start"""
-
-    config: MCPServerConfig | None = None
-    """MCP server configuration (stdio process or remote HTTP/SSE). Omit to start the server
-    with its already-registered configuration (config-free start-by-name).
-    """
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'MCPStartServerRequest':
-        assert isinstance(obj, dict)
-        server_name = from_str(obj.get("serverName"))
-        config = from_union([MCPServerConfig.from_dict, from_none], obj.get("config"))
-        return MCPStartServerRequest(server_name, config)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["serverName"] = from_str(self.server_name)
-        if self.config is not None:
-            result["config"] = from_union([lambda x: to_class(MCPServerConfig, x), from_none], self.config)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPHeadersHandlePendingHeadersRefreshRequestRequest:
@@ -22713,30 +26826,6 @@ def to_dict(self) -> dict:
         result["result"] = to_class(MCPHeadersHandlePendingHeadersRefreshRequest, self.result)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class MCPOauthHandlePendingRequest:
-    """Pending MCP OAuth request ID and host-provided token or cancellation response."""
-
-    request_id: str
-    """OAuth request identifier from the mcp.oauth_required event"""
-
-    result: MCPOauthPendingRequestResponse
-    """Host response to the pending OAuth request."""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'MCPOauthHandlePendingRequest':
-        assert isinstance(obj, dict)
-        request_id = from_str(obj.get("requestId"))
-        result = MCPOauthPendingRequestResponse.from_dict(obj.get("result"))
-        return MCPOauthHandlePendingRequest(request_id, result)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["requestId"] = from_str(self.request_id)
-        result["result"] = to_class(MCPOauthPendingRequestResponse, self.result)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class DebugCollectLogsEntry:
@@ -22952,6 +27041,8 @@ class ModelCapabilitiesOverride:
 
     Override individual model capabilities resolved by the runtime
 
+    Overrides for model capabilities when they cannot be inferred from modelId.
+
     Initial model capability overrides.
 
     Per-property model capability overrides for the selected model.
@@ -22977,33 +27068,6 @@ def to_dict(self) -> dict:
             result["supports"] = from_union([lambda x: to_class(ModelCapabilitiesOverrideSupports, x), from_none], self.supports)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class ProviderTokenAcquireRequest:
-    """Asks the SDK client to acquire a bearer token for a BYOK provider whose config set
-    `hasBearerTokenProvider: true`. Issued by the runtime before each outbound model request;
-    the runtime does no caching, so this is sent once per request.
-    """
-    provider_name: str
-    """Name of the BYOK provider needing a token. For the legacy whole-session `provider` this
-    is the implicit provider name; for named providers it is `NamedProviderConfig.name`.
-    """
-    session_id: str
-    """Target session identifier"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'ProviderTokenAcquireRequest':
-        assert isinstance(obj, dict)
-        provider_name = from_str(obj.get("providerName"))
-        session_id = from_str(obj.get("sessionId"))
-        return ProviderTokenAcquireRequest(provider_name, session_id)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["providerName"] = from_str(self.provider_name)
-        result["sessionId"] = from_str(self.session_id)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class OptionsUpdateAdditionalContentExclusionPolicy:
@@ -23011,7 +27075,11 @@ class OptionsUpdateAdditionalContentExclusionPolicy:
     data, and scope.
     """
     last_updated_at: Any
+    """Opaque policy update timestamp supplied by the host."""
+
     rules: list[OptionsUpdateAdditionalContentExclusionPolicyRule]
+    """Content-exclusion rules to apply."""
+
     scope: AdditionalContentExclusionPolicyScope
     """Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration."""
 
@@ -23030,6 +27098,38 @@ def to_dict(self) -> dict:
         result["scope"] = to_enum(AdditionalContentExclusionPolicyScope, self.scope)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionDecisionRequest:
+    """Pending permission request ID and the decision to apply (approve/reject and scope)."""
+
+    request_id: str
+    """Request ID of the pending permission request"""
+
+    result: PermissionDecision
+    """The client's response to the pending permission prompt"""
+
+    decision_context: PermissionDecisionContext | None = None
+    """Optional informational context describing how and where this response was made. Omit it
+    to preserve legacy behavior without attributing an origin.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionDecisionRequest':
+        assert isinstance(obj, dict)
+        request_id = from_str(obj.get("requestId"))
+        result = _load_PermissionDecision(obj.get("result"))
+        decision_context = from_union([PermissionDecisionContext.from_dict, from_none], obj.get("decisionContext"))
+        return PermissionDecisionRequest(request_id, result, decision_context)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["requestId"] = from_str(self.request_id)
+        result["result"] = (self.result).to_dict()
+        if self.decision_context is not None:
+            result["decisionContext"] = from_union([lambda x: to_class(PermissionDecisionContext, x), from_none], self.decision_context)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionsConfigureAdditionalContentExclusionPolicy:
@@ -23037,7 +27137,11 @@ class PermissionsConfigureAdditionalContentExclusionPolicy:
     last-updated data, and scope.
     """
     last_updated_at: Any
+    """Opaque policy update timestamp supplied by the host."""
+
     rules: list[PermissionsConfigureAdditionalContentExclusionPolicyRule]
+    """Content-exclusion rules to apply."""
+
     scope: AdditionalContentExclusionPolicyScope
     """Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope`
     enumeration.
@@ -23308,6 +27412,8 @@ class QueueInsertAtRequest:
     """Parameters for inserting a queued message at a public visible position."""
 
     message: QueueInsertMessage
+    """Queued message contents and delivery metadata."""
+
     position: int
     """Zero-based position in the public visible queue. Values outside the queue clamp to an end."""
 
@@ -23337,18 +27443,26 @@ class QueuePendingItemsResult:
     """Display text for messages currently in the immediate steering queue (interjections sent
     during a running turn).
     """
+    in_flight_steering_count: int | None = None
+    """How many leading entries of `steeringMessages` have already been folded into the running
+    turn (and so have an emitted `user.message`), as opposed to still waiting for one. Absent
+    for hosts that do not distinguish the two.
+    """
 
     @staticmethod
     def from_dict(obj: Any) -> 'QueuePendingItemsResult':
         assert isinstance(obj, dict)
         items = from_list(QueuePendingItems.from_dict, obj.get("items"))
         steering_messages = from_list(from_str, obj.get("steeringMessages"))
-        return QueuePendingItemsResult(items, steering_messages)
+        in_flight_steering_count = from_union([from_int, from_none], obj.get("inFlightSteeringCount"))
+        return QueuePendingItemsResult(items, steering_messages, in_flight_steering_count)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["items"] = from_list(lambda x: to_class(QueuePendingItems, x), self.items)
         result["steeringMessages"] = from_list(from_str, self.steering_messages)
+        if self.in_flight_steering_count is not None:
+            result["inFlightSteeringCount"] = from_union([from_int, from_none], self.in_flight_steering_count)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -23596,6 +27710,7 @@ class SessionFSSqliteTransactionRequest:
     """Target session identifier"""
 
     statements: list[SessionFSSqliteTransactionStatement]
+    """Ordered SQL statements to execute in one transaction."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionFSSqliteTransactionRequest':
@@ -23617,7 +27732,11 @@ class SessionOpenOptionsAdditionalContentExclusionPolicy:
     data, and scope.
     """
     last_updated_at: Any
+    """Opaque policy update timestamp supplied by the host."""
+
     rules: list[SessionOpenOptionsAdditionalContentExclusionPolicyRule]
+    """Content-exclusion rules to apply."""
+
     scope: AdditionalContentExclusionPolicyScope
     """Allowed values for the `SessionOpenOptionsAdditionalContentExclusionPolicyScope`
     enumeration.
@@ -23643,6 +27762,9 @@ def to_dict(self) -> dict:
 class ShellOptions:
     """Per-session settings for built-in shell tools."""
 
+    credentials: ShellCredentials | None = None
+    """Command-scoped GitHub credential injection for shell commands."""
+
     init_profile: ShellInitProfile | None = None
     """Controls automatic non-interactive profile loading where supported. Explicit initScripts
     are unaffected.
@@ -23669,71 +27791,27 @@ class ShellOptions:
     flags.
     When omitted, the built-in Bash shell uses `--norc --noprofile`,
     and the built-in PowerShell shell uses `-NoProfile -NoLogo`.
-    """
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'ShellOptions':
-        assert isinstance(obj, dict)
-        init_profile = from_union([ShellInitProfile, from_none], obj.get("initProfile"))
-        init_scripts = from_union([lambda x: from_list(ShellInitScript.from_dict, x), from_none], obj.get("initScripts"))
-        process_flags = from_union([lambda x: from_list(from_str, x), from_none], obj.get("processFlags"))
-        return ShellOptions(init_profile, init_scripts, process_flags)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        if self.init_profile is not None:
-            result["initProfile"] = from_union([lambda x: to_enum(ShellInitProfile, x), from_none], self.init_profile)
-        if self.init_scripts is not None:
-            result["initScripts"] = from_union([lambda x: from_list(lambda x: to_class(ShellInitScript, x), x), from_none], self.init_scripts)
-        if self.process_flags is not None:
-            result["processFlags"] = from_union([lambda x: from_list(from_str, x), from_none], self.process_flags)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class SessionSettingsSnapshot:
-    """Redacted, serializable view of session runtime settings for SDK boundary consumers.
-    Secrets and raw feature flags are intentionally excluded.
-    """
-    job: SessionSettingsJobSnapshot
-    model: SessionSettingsModelSnapshot
-    online_evaluation: SessionSettingsOnlineEvaluationSnapshot
-    repo: SessionSettingsRepoSnapshot
-    validation: SessionSettingsValidationSnapshot
-    client_name: str | None = None
-    start_time_ms: float | None = None
-    timeout_ms: float | None = None
-    version: str | None = None
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'SessionSettingsSnapshot':
-        assert isinstance(obj, dict)
-        job = SessionSettingsJobSnapshot.from_dict(obj.get("job"))
-        model = SessionSettingsModelSnapshot.from_dict(obj.get("model"))
-        online_evaluation = SessionSettingsOnlineEvaluationSnapshot.from_dict(obj.get("onlineEvaluation"))
-        repo = SessionSettingsRepoSnapshot.from_dict(obj.get("repo"))
-        validation = SessionSettingsValidationSnapshot.from_dict(obj.get("validation"))
-        client_name = from_union([from_str, from_none], obj.get("clientName"))
-        start_time_ms = from_union([from_float, from_none], obj.get("startTimeMs"))
-        timeout_ms = from_union([from_float, from_none], obj.get("timeoutMs"))
-        version = from_union([from_str, from_none], obj.get("version"))
-        return SessionSettingsSnapshot(job, model, online_evaluation, repo, validation, client_name, start_time_ms, timeout_ms, version)
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ShellOptions':
+        assert isinstance(obj, dict)
+        credentials = from_union([ShellCredentials.from_dict, from_none], obj.get("credentials"))
+        init_profile = from_union([ShellInitProfile, from_none], obj.get("initProfile"))
+        init_scripts = from_union([lambda x: from_list(ShellInitScript.from_dict, x), from_none], obj.get("initScripts"))
+        process_flags = from_union([lambda x: from_list(from_str, x), from_none], obj.get("processFlags"))
+        return ShellOptions(credentials, init_profile, init_scripts, process_flags)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["job"] = to_class(SessionSettingsJobSnapshot, self.job)
-        result["model"] = to_class(SessionSettingsModelSnapshot, self.model)
-        result["onlineEvaluation"] = to_class(SessionSettingsOnlineEvaluationSnapshot, self.online_evaluation)
-        result["repo"] = to_class(SessionSettingsRepoSnapshot, self.repo)
-        result["validation"] = to_class(SessionSettingsValidationSnapshot, self.validation)
-        if self.client_name is not None:
-            result["clientName"] = from_union([from_str, from_none], self.client_name)
-        if self.start_time_ms is not None:
-            result["startTimeMs"] = from_union([to_float, from_none], self.start_time_ms)
-        if self.timeout_ms is not None:
-            result["timeoutMs"] = from_union([to_float, from_none], self.timeout_ms)
-        if self.version is not None:
-            result["version"] = from_union([from_str, from_none], self.version)
+        if self.credentials is not None:
+            result["credentials"] = from_union([lambda x: to_class(ShellCredentials, x), from_none], self.credentials)
+        if self.init_profile is not None:
+            result["initProfile"] = from_union([lambda x: to_enum(ShellInitProfile, x), from_none], self.init_profile)
+        if self.init_scripts is not None:
+            result["initScripts"] = from_union([lambda x: from_list(lambda x: to_class(ShellInitScript, x), x), from_none], self.init_scripts)
+        if self.process_flags is not None:
+            result["processFlags"] = from_union([lambda x: from_list(from_str, x), from_none], self.process_flags)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -23922,6 +28000,570 @@ def to_dict(self) -> dict:
             result["progress"] = from_union([lambda x: to_class(TaskProgress, x), from_none], self.progress)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPSerializableServerConfig:
+    """MCP server configuration (stdio process or remote HTTP/SSE)
+
+    Serializable MCP server configuration (stdio process or remote HTTP/SSE)
+
+    Replacement MCP server configuration (stdio process or remote HTTP/SSE). Omit to restart
+    the server with its already-registered configuration (config-free restart-by-name).
+
+    MCP server configuration (stdio process or remote HTTP/SSE). Omit to start the server
+    with its already-registered configuration (config-free start-by-name).
+
+    Stdio MCP server configuration launched as a child process.
+
+    Remote MCP server configuration accessed over HTTP or SSE.
+    """
+    args: list[str] | None = None
+    """Command-line arguments passed to the Stdio MCP server process."""
+
+    auth: bool | MCPServerAuthConfigRedirectPort | None = None
+    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
+
+    command: str | None = None
+    """Executable command used to start the Stdio MCP server process."""
+
+    config_warnings: list[str] | None = None
+    """Configuration warnings recorded while loading the server."""
+
+    cwd: str | None = None
+    """Working directory for the Stdio MCP server process."""
+
+    defer_tools: MCPServerConfigDeferTools | None = None
+    """Controls if tools provided by this server can be loaded on demand via tool search (auto)
+    or always included in the initial tool list (never)
+    """
+    disable_secret_masking: bool | None = None
+    """Whether secret masking is disabled for calls to this server."""
+
+    disable_tool_cache: bool | None = None
+    """Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
+    is unaffected.
+    """
+    display_name: str | None = None
+    """Optional human-readable server name."""
+
+    env: dict[str, str] | None = None
+    """Environment variables to pass to the Stdio MCP server process."""
+
+    events: list[str] | None = None
+    """Event types this server receives as Copilot notifications."""
+
+    exclude_tools: list[str] | None = None
+    """Tool names excluded after the include filter is applied."""
+
+    filter_mapping: dict[str, ContentFilterMode] | ContentFilterMode | None = None
+    """Content filtering mode to apply to all tools, or a map of tool name to content filtering
+    mode.
+    """
+    is_default_server: bool | None = None
+    """Whether this server is a built-in fallback used when the user has not configured their
+    own server.
+    """
+    notifications: list[str] | None = None
+    """Copilot notification types this server may send to the host."""
+
+    oidc: bool | MCPServerAuthConfigRedirectPort | None = None
+    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
+
+    safe_for_telemetry: bool | MCPSafeForTelemetryFields | None = None
+    """Telemetry-obfuscation policy for this server's tools."""
+
+    source: McpServerSource | None = None
+    """The origin of this server configuration."""
+
+    source_path: str | None = None
+    """Source file path recorded while loading the config."""
+
+    source_plugin: str | None = None
+    """Plugin that provided this server."""
+
+    source_plugin_spec: bool | None = None
+    """Whether the providing plugin uses the Open Plugin Spec."""
+
+    source_plugin_version: str | None = None
+    """Version of the plugin that provided this server."""
+
+    timeout: int | None = None
+    """Timeout in milliseconds for tool discovery and tool calls."""
+
+    tools: list[str] | None = None
+    """Tools to include. Defaults to all tools if not specified."""
+
+    type: MCPSerializableServerConfigType | None = None
+    """Local transport type. Defaults to stdio when omitted.
+
+    Remote transport type. Defaults to "http" when omitted.
+    """
+    headers: dict[str, str] | None = None
+    """HTTP headers to include in requests to the remote MCP server."""
+
+    headers_refresh_ttl_ms: int | None = None
+    """Dynamic-header refresh cache lifetime in milliseconds."""
+
+    oauth_client_id: str | None = None
+    """OAuth client ID for a pre-registered remote MCP OAuth client."""
+
+    oauth_grant_type: MCPGrantType | None = None
+    """OAuth grant type to use when authenticating to the remote MCP server."""
+
+    oauth_public_client: bool | None = None
+    """Whether the configured OAuth client is public and does not require a client secret."""
+
+    url: str | None = None
+    """URL of the remote MCP server endpoint."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPSerializableServerConfig':
+        assert isinstance(obj, dict)
+        args = from_union([lambda x: from_list(from_str, x), from_none], obj.get("args"))
+        auth = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("auth"))
+        command = from_union([from_str, from_none], obj.get("command"))
+        config_warnings = from_union([lambda x: from_list(from_str, x), from_none], obj.get("configWarnings"))
+        cwd = from_union([from_str, from_none], obj.get("cwd"))
+        defer_tools = from_union([MCPServerConfigDeferTools, from_none], obj.get("deferTools"))
+        disable_secret_masking = from_union([from_bool, from_none], obj.get("disableSecretMasking"))
+        disable_tool_cache = from_union([from_bool, from_none], obj.get("disableToolCache"))
+        display_name = from_union([from_str, from_none], obj.get("displayName"))
+        env = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("env"))
+        events = from_union([lambda x: from_list(from_str, x), from_none], obj.get("events"))
+        exclude_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("excludeTools"))
+        filter_mapping = from_union([lambda x: from_dict(ContentFilterMode, x), ContentFilterMode, from_none], obj.get("filterMapping"))
+        is_default_server = from_union([from_bool, from_none], obj.get("isDefaultServer"))
+        notifications = from_union([lambda x: from_list(from_str, x), from_none], obj.get("notifications"))
+        oidc = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("oidc"))
+        safe_for_telemetry = from_union([from_bool, MCPSafeForTelemetryFields.from_dict, from_none], obj.get("safeForTelemetry"))
+        source = from_union([McpServerSource, from_none], obj.get("source"))
+        source_path = from_union([from_str, from_none], obj.get("sourcePath"))
+        source_plugin = from_union([from_str, from_none], obj.get("sourcePlugin"))
+        source_plugin_spec = from_union([from_bool, from_none], obj.get("sourcePluginSpec"))
+        source_plugin_version = from_union([from_str, from_none], obj.get("sourcePluginVersion"))
+        timeout = from_union([from_int, from_none], obj.get("timeout"))
+        tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("tools"))
+        type = from_union([MCPSerializableServerConfigType, from_none], obj.get("type"))
+        headers = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("headers"))
+        headers_refresh_ttl_ms = from_union([from_int, from_none], obj.get("headersRefreshTtlMs"))
+        oauth_client_id = from_union([from_str, from_none], obj.get("oauthClientId"))
+        oauth_grant_type = from_union([MCPGrantType, from_none], obj.get("oauthGrantType"))
+        oauth_public_client = from_union([from_bool, from_none], obj.get("oauthPublicClient"))
+        url = from_union([from_str, from_none], obj.get("url"))
+        return MCPSerializableServerConfig(args, auth, command, config_warnings, cwd, defer_tools, disable_secret_masking, disable_tool_cache, display_name, env, events, exclude_tools, filter_mapping, is_default_server, notifications, oidc, safe_for_telemetry, source, source_path, source_plugin, source_plugin_spec, source_plugin_version, timeout, tools, type, headers, headers_refresh_ttl_ms, oauth_client_id, oauth_grant_type, oauth_public_client, url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.args is not None:
+            result["args"] = from_union([lambda x: from_list(from_str, x), from_none], self.args)
+        if self.auth is not None:
+            result["auth"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.auth)
+        if self.command is not None:
+            result["command"] = from_union([from_str, from_none], self.command)
+        if self.config_warnings is not None:
+            result["configWarnings"] = from_union([lambda x: from_list(from_str, x), from_none], self.config_warnings)
+        if self.cwd is not None:
+            result["cwd"] = from_union([from_str, from_none], self.cwd)
+        if self.defer_tools is not None:
+            result["deferTools"] = from_union([lambda x: to_enum(MCPServerConfigDeferTools, x), from_none], self.defer_tools)
+        if self.disable_secret_masking is not None:
+            result["disableSecretMasking"] = from_union([from_bool, from_none], self.disable_secret_masking)
+        if self.disable_tool_cache is not None:
+            result["disableToolCache"] = from_union([from_bool, from_none], self.disable_tool_cache)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_str, from_none], self.display_name)
+        if self.env is not None:
+            result["env"] = from_union([lambda x: from_dict(from_str, x), from_none], self.env)
+        if self.events is not None:
+            result["events"] = from_union([lambda x: from_list(from_str, x), from_none], self.events)
+        if self.exclude_tools is not None:
+            result["excludeTools"] = from_union([lambda x: from_list(from_str, x), from_none], self.exclude_tools)
+        if self.filter_mapping is not None:
+            result["filterMapping"] = from_union([lambda x: from_dict(lambda x: to_enum(ContentFilterMode, x), x), lambda x: to_enum(ContentFilterMode, x), from_none], self.filter_mapping)
+        if self.is_default_server is not None:
+            result["isDefaultServer"] = from_union([from_bool, from_none], self.is_default_server)
+        if self.notifications is not None:
+            result["notifications"] = from_union([lambda x: from_list(from_str, x), from_none], self.notifications)
+        if self.oidc is not None:
+            result["oidc"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.oidc)
+        if self.safe_for_telemetry is not None:
+            result["safeForTelemetry"] = from_union([from_bool, lambda x: to_class(MCPSafeForTelemetryFields, x), from_none], self.safe_for_telemetry)
+        if self.source is not None:
+            result["source"] = from_union([lambda x: to_enum(McpServerSource, x), from_none], self.source)
+        if self.source_path is not None:
+            result["sourcePath"] = from_union([from_str, from_none], self.source_path)
+        if self.source_plugin is not None:
+            result["sourcePlugin"] = from_union([from_str, from_none], self.source_plugin)
+        if self.source_plugin_spec is not None:
+            result["sourcePluginSpec"] = from_union([from_bool, from_none], self.source_plugin_spec)
+        if self.source_plugin_version is not None:
+            result["sourcePluginVersion"] = from_union([from_str, from_none], self.source_plugin_version)
+        if self.timeout is not None:
+            result["timeout"] = from_union([from_int, from_none], self.timeout)
+        if self.tools is not None:
+            result["tools"] = from_union([lambda x: from_list(from_str, x), from_none], self.tools)
+        if self.type is not None:
+            result["type"] = from_union([lambda x: to_enum(MCPSerializableServerConfigType, x), from_none], self.type)
+        if self.headers is not None:
+            result["headers"] = from_union([lambda x: from_dict(from_str, x), from_none], self.headers)
+        if self.headers_refresh_ttl_ms is not None:
+            result["headersRefreshTtlMs"] = from_union([from_int, from_none], self.headers_refresh_ttl_ms)
+        if self.oauth_client_id is not None:
+            result["oauthClientId"] = from_union([from_str, from_none], self.oauth_client_id)
+        if self.oauth_grant_type is not None:
+            result["oauthGrantType"] = from_union([lambda x: to_enum(MCPGrantType, x), from_none], self.oauth_grant_type)
+        if self.oauth_public_client is not None:
+            result["oauthPublicClient"] = from_union([from_bool, from_none], self.oauth_public_client)
+        if self.url is not None:
+            result["url"] = from_union([from_str, from_none], self.url)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPServerConfigHTTP:
+    """Remote MCP server configuration accessed over HTTP or SSE."""
+
+    url: str
+    """URL of the remote MCP server endpoint."""
+
+    auth: bool | MCPServerAuthConfigRedirectPort | None = None
+    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
+
+    config_warnings: list[str] | None = None
+    """Configuration warnings recorded while loading the server."""
+
+    defer_tools: MCPServerConfigDeferTools | None = None
+    """Controls if tools provided by this server can be loaded on demand via tool search (auto)
+    or always included in the initial tool list (never)
+    """
+    disable_secret_masking: bool | None = None
+    """Whether secret masking is disabled for calls to this server."""
+
+    disable_tool_cache: bool | None = None
+    """Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
+    is unaffected.
+    """
+    display_name: str | None = None
+    """Optional human-readable server name."""
+
+    events: list[str] | None = None
+    """Event types this server receives as Copilot notifications."""
+
+    exclude_tools: list[str] | None = None
+    """Tool names excluded after the include filter is applied."""
+
+    filter_mapping: dict[str, ContentFilterMode] | ContentFilterMode | None = None
+    """Content filtering mode to apply to all tools, or a map of tool name to content filtering
+    mode.
+    """
+    headers: dict[str, str] | None = None
+    """HTTP headers to include in requests to the remote MCP server."""
+
+    headers_refresh_ttl_ms: int | None = None
+    """Dynamic-header refresh cache lifetime in milliseconds."""
+
+    is_default_server: bool | None = None
+    """Whether this server is a built-in fallback used when the user has not configured their
+    own server.
+    """
+    notifications: list[str] | None = None
+    """Copilot notification types this server may send to the host."""
+
+    oauth_client_id: str | None = None
+    """OAuth client ID for a pre-registered remote MCP OAuth client."""
+
+    oauth_grant_type: MCPGrantType | None = None
+    """OAuth grant type to use when authenticating to the remote MCP server."""
+
+    oauth_public_client: bool | None = None
+    """Whether the configured OAuth client is public and does not require a client secret."""
+
+    oidc: bool | MCPServerAuthConfigRedirectPort | None = None
+    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
+
+    safe_for_telemetry: bool | MCPSafeForTelemetryFields | None = None
+    """Telemetry-obfuscation policy for this server's tools."""
+
+    source: McpServerSource | None = None
+    """The origin of this server configuration."""
+
+    source_path: str | None = None
+    """Source file path recorded while loading the config."""
+
+    source_plugin: str | None = None
+    """Plugin that provided this server."""
+
+    source_plugin_spec: bool | None = None
+    """Whether the providing plugin uses the Open Plugin Spec."""
+
+    source_plugin_version: str | None = None
+    """Version of the plugin that provided this server."""
+
+    timeout: int | None = None
+    """Timeout in milliseconds for tool discovery and tool calls."""
+
+    tools: list[str] | None = None
+    """Tools to include. Defaults to all tools if not specified."""
+
+    type: MCPServerConfigHTTPType | None = None
+    """Remote transport type. Defaults to "http" when omitted."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPServerConfigHTTP':
+        assert isinstance(obj, dict)
+        url = from_str(obj.get("url"))
+        auth = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("auth"))
+        config_warnings = from_union([lambda x: from_list(from_str, x), from_none], obj.get("configWarnings"))
+        defer_tools = from_union([MCPServerConfigDeferTools, from_none], obj.get("deferTools"))
+        disable_secret_masking = from_union([from_bool, from_none], obj.get("disableSecretMasking"))
+        disable_tool_cache = from_union([from_bool, from_none], obj.get("disableToolCache"))
+        display_name = from_union([from_str, from_none], obj.get("displayName"))
+        events = from_union([lambda x: from_list(from_str, x), from_none], obj.get("events"))
+        exclude_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("excludeTools"))
+        filter_mapping = from_union([lambda x: from_dict(ContentFilterMode, x), ContentFilterMode, from_none], obj.get("filterMapping"))
+        headers = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("headers"))
+        headers_refresh_ttl_ms = from_union([from_int, from_none], obj.get("headersRefreshTtlMs"))
+        is_default_server = from_union([from_bool, from_none], obj.get("isDefaultServer"))
+        notifications = from_union([lambda x: from_list(from_str, x), from_none], obj.get("notifications"))
+        oauth_client_id = from_union([from_str, from_none], obj.get("oauthClientId"))
+        oauth_grant_type = from_union([MCPGrantType, from_none], obj.get("oauthGrantType"))
+        oauth_public_client = from_union([from_bool, from_none], obj.get("oauthPublicClient"))
+        oidc = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("oidc"))
+        safe_for_telemetry = from_union([from_bool, MCPSafeForTelemetryFields.from_dict, from_none], obj.get("safeForTelemetry"))
+        source = from_union([McpServerSource, from_none], obj.get("source"))
+        source_path = from_union([from_str, from_none], obj.get("sourcePath"))
+        source_plugin = from_union([from_str, from_none], obj.get("sourcePlugin"))
+        source_plugin_spec = from_union([from_bool, from_none], obj.get("sourcePluginSpec"))
+        source_plugin_version = from_union([from_str, from_none], obj.get("sourcePluginVersion"))
+        timeout = from_union([from_int, from_none], obj.get("timeout"))
+        tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("tools"))
+        type = from_union([MCPServerConfigHTTPType, from_none], obj.get("type"))
+        return MCPServerConfigHTTP(url, auth, config_warnings, defer_tools, disable_secret_masking, disable_tool_cache, display_name, events, exclude_tools, filter_mapping, headers, headers_refresh_ttl_ms, is_default_server, notifications, oauth_client_id, oauth_grant_type, oauth_public_client, oidc, safe_for_telemetry, source, source_path, source_plugin, source_plugin_spec, source_plugin_version, timeout, tools, type)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["url"] = from_str(self.url)
+        if self.auth is not None:
+            result["auth"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.auth)
+        if self.config_warnings is not None:
+            result["configWarnings"] = from_union([lambda x: from_list(from_str, x), from_none], self.config_warnings)
+        if self.defer_tools is not None:
+            result["deferTools"] = from_union([lambda x: to_enum(MCPServerConfigDeferTools, x), from_none], self.defer_tools)
+        if self.disable_secret_masking is not None:
+            result["disableSecretMasking"] = from_union([from_bool, from_none], self.disable_secret_masking)
+        if self.disable_tool_cache is not None:
+            result["disableToolCache"] = from_union([from_bool, from_none], self.disable_tool_cache)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_str, from_none], self.display_name)
+        if self.events is not None:
+            result["events"] = from_union([lambda x: from_list(from_str, x), from_none], self.events)
+        if self.exclude_tools is not None:
+            result["excludeTools"] = from_union([lambda x: from_list(from_str, x), from_none], self.exclude_tools)
+        if self.filter_mapping is not None:
+            result["filterMapping"] = from_union([lambda x: from_dict(lambda x: to_enum(ContentFilterMode, x), x), lambda x: to_enum(ContentFilterMode, x), from_none], self.filter_mapping)
+        if self.headers is not None:
+            result["headers"] = from_union([lambda x: from_dict(from_str, x), from_none], self.headers)
+        if self.headers_refresh_ttl_ms is not None:
+            result["headersRefreshTtlMs"] = from_union([from_int, from_none], self.headers_refresh_ttl_ms)
+        if self.is_default_server is not None:
+            result["isDefaultServer"] = from_union([from_bool, from_none], self.is_default_server)
+        if self.notifications is not None:
+            result["notifications"] = from_union([lambda x: from_list(from_str, x), from_none], self.notifications)
+        if self.oauth_client_id is not None:
+            result["oauthClientId"] = from_union([from_str, from_none], self.oauth_client_id)
+        if self.oauth_grant_type is not None:
+            result["oauthGrantType"] = from_union([lambda x: to_enum(MCPGrantType, x), from_none], self.oauth_grant_type)
+        if self.oauth_public_client is not None:
+            result["oauthPublicClient"] = from_union([from_bool, from_none], self.oauth_public_client)
+        if self.oidc is not None:
+            result["oidc"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.oidc)
+        if self.safe_for_telemetry is not None:
+            result["safeForTelemetry"] = from_union([from_bool, lambda x: to_class(MCPSafeForTelemetryFields, x), from_none], self.safe_for_telemetry)
+        if self.source is not None:
+            result["source"] = from_union([lambda x: to_enum(McpServerSource, x), from_none], self.source)
+        if self.source_path is not None:
+            result["sourcePath"] = from_union([from_str, from_none], self.source_path)
+        if self.source_plugin is not None:
+            result["sourcePlugin"] = from_union([from_str, from_none], self.source_plugin)
+        if self.source_plugin_spec is not None:
+            result["sourcePluginSpec"] = from_union([from_bool, from_none], self.source_plugin_spec)
+        if self.source_plugin_version is not None:
+            result["sourcePluginVersion"] = from_union([from_str, from_none], self.source_plugin_version)
+        if self.timeout is not None:
+            result["timeout"] = from_union([from_int, from_none], self.timeout)
+        if self.tools is not None:
+            result["tools"] = from_union([lambda x: from_list(from_str, x), from_none], self.tools)
+        if self.type is not None:
+            result["type"] = from_union([lambda x: to_enum(MCPServerConfigHTTPType, x), from_none], self.type)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPServerConfigStdio:
+    """Stdio MCP server configuration launched as a child process."""
+
+    command: str
+    """Executable command used to start the Stdio MCP server process."""
+
+    args: list[str] | None = None
+    """Command-line arguments passed to the Stdio MCP server process."""
+
+    auth: bool | MCPServerAuthConfigRedirectPort | None = None
+    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
+
+    config_warnings: list[str] | None = None
+    """Configuration warnings recorded while loading the server."""
+
+    cwd: str | None = None
+    """Working directory for the Stdio MCP server process."""
+
+    defer_tools: MCPServerConfigDeferTools | None = None
+    """Controls if tools provided by this server can be loaded on demand via tool search (auto)
+    or always included in the initial tool list (never)
+    """
+    disable_secret_masking: bool | None = None
+    """Whether secret masking is disabled for calls to this server."""
+
+    disable_tool_cache: bool | None = None
+    """Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
+    is unaffected.
+    """
+    display_name: str | None = None
+    """Optional human-readable server name."""
+
+    env: dict[str, str] | None = None
+    """Environment variables to pass to the Stdio MCP server process."""
+
+    events: list[str] | None = None
+    """Event types this server receives as Copilot notifications."""
+
+    exclude_tools: list[str] | None = None
+    """Tool names excluded after the include filter is applied."""
+
+    filter_mapping: dict[str, ContentFilterMode] | ContentFilterMode | None = None
+    """Content filtering mode to apply to all tools, or a map of tool name to content filtering
+    mode.
+    """
+    is_default_server: bool | None = None
+    """Whether this server is a built-in fallback used when the user has not configured their
+    own server.
+    """
+    notifications: list[str] | None = None
+    """Copilot notification types this server may send to the host."""
+
+    oidc: bool | MCPServerAuthConfigRedirectPort | None = None
+    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
+
+    safe_for_telemetry: bool | MCPSafeForTelemetryFields | None = None
+    """Telemetry-obfuscation policy for this server's tools."""
+
+    source: McpServerSource | None = None
+    """The origin of this server configuration."""
+
+    source_path: str | None = None
+    """Source file path recorded while loading the config."""
+
+    source_plugin: str | None = None
+    """Plugin that provided this server."""
+
+    source_plugin_spec: bool | None = None
+    """Whether the providing plugin uses the Open Plugin Spec."""
+
+    source_plugin_version: str | None = None
+    """Version of the plugin that provided this server."""
+
+    timeout: int | None = None
+    """Timeout in milliseconds for tool discovery and tool calls."""
+
+    tools: list[str] | None = None
+    """Tools to include. Defaults to all tools if not specified."""
+
+    type: MCPServerConfigStdioType | None = None
+    """Local transport type. Defaults to stdio when omitted."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPServerConfigStdio':
+        assert isinstance(obj, dict)
+        command = from_str(obj.get("command"))
+        args = from_union([lambda x: from_list(from_str, x), from_none], obj.get("args"))
+        auth = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("auth"))
+        config_warnings = from_union([lambda x: from_list(from_str, x), from_none], obj.get("configWarnings"))
+        cwd = from_union([from_str, from_none], obj.get("cwd"))
+        defer_tools = from_union([MCPServerConfigDeferTools, from_none], obj.get("deferTools"))
+        disable_secret_masking = from_union([from_bool, from_none], obj.get("disableSecretMasking"))
+        disable_tool_cache = from_union([from_bool, from_none], obj.get("disableToolCache"))
+        display_name = from_union([from_str, from_none], obj.get("displayName"))
+        env = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("env"))
+        events = from_union([lambda x: from_list(from_str, x), from_none], obj.get("events"))
+        exclude_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("excludeTools"))
+        filter_mapping = from_union([lambda x: from_dict(ContentFilterMode, x), ContentFilterMode, from_none], obj.get("filterMapping"))
+        is_default_server = from_union([from_bool, from_none], obj.get("isDefaultServer"))
+        notifications = from_union([lambda x: from_list(from_str, x), from_none], obj.get("notifications"))
+        oidc = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("oidc"))
+        safe_for_telemetry = from_union([from_bool, MCPSafeForTelemetryFields.from_dict, from_none], obj.get("safeForTelemetry"))
+        source = from_union([McpServerSource, from_none], obj.get("source"))
+        source_path = from_union([from_str, from_none], obj.get("sourcePath"))
+        source_plugin = from_union([from_str, from_none], obj.get("sourcePlugin"))
+        source_plugin_spec = from_union([from_bool, from_none], obj.get("sourcePluginSpec"))
+        source_plugin_version = from_union([from_str, from_none], obj.get("sourcePluginVersion"))
+        timeout = from_union([from_int, from_none], obj.get("timeout"))
+        tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("tools"))
+        type = from_union([MCPServerConfigStdioType, from_none], obj.get("type"))
+        return MCPServerConfigStdio(command, args, auth, config_warnings, cwd, defer_tools, disable_secret_masking, disable_tool_cache, display_name, env, events, exclude_tools, filter_mapping, is_default_server, notifications, oidc, safe_for_telemetry, source, source_path, source_plugin, source_plugin_spec, source_plugin_version, timeout, tools, type)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["command"] = from_str(self.command)
+        if self.args is not None:
+            result["args"] = from_union([lambda x: from_list(from_str, x), from_none], self.args)
+        if self.auth is not None:
+            result["auth"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.auth)
+        if self.config_warnings is not None:
+            result["configWarnings"] = from_union([lambda x: from_list(from_str, x), from_none], self.config_warnings)
+        if self.cwd is not None:
+            result["cwd"] = from_union([from_str, from_none], self.cwd)
+        if self.defer_tools is not None:
+            result["deferTools"] = from_union([lambda x: to_enum(MCPServerConfigDeferTools, x), from_none], self.defer_tools)
+        if self.disable_secret_masking is not None:
+            result["disableSecretMasking"] = from_union([from_bool, from_none], self.disable_secret_masking)
+        if self.disable_tool_cache is not None:
+            result["disableToolCache"] = from_union([from_bool, from_none], self.disable_tool_cache)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_str, from_none], self.display_name)
+        if self.env is not None:
+            result["env"] = from_union([lambda x: from_dict(from_str, x), from_none], self.env)
+        if self.events is not None:
+            result["events"] = from_union([lambda x: from_list(from_str, x), from_none], self.events)
+        if self.exclude_tools is not None:
+            result["excludeTools"] = from_union([lambda x: from_list(from_str, x), from_none], self.exclude_tools)
+        if self.filter_mapping is not None:
+            result["filterMapping"] = from_union([lambda x: from_dict(lambda x: to_enum(ContentFilterMode, x), x), lambda x: to_enum(ContentFilterMode, x), from_none], self.filter_mapping)
+        if self.is_default_server is not None:
+            result["isDefaultServer"] = from_union([from_bool, from_none], self.is_default_server)
+        if self.notifications is not None:
+            result["notifications"] = from_union([lambda x: from_list(from_str, x), from_none], self.notifications)
+        if self.oidc is not None:
+            result["oidc"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.oidc)
+        if self.safe_for_telemetry is not None:
+            result["safeForTelemetry"] = from_union([from_bool, lambda x: to_class(MCPSafeForTelemetryFields, x), from_none], self.safe_for_telemetry)
+        if self.source is not None:
+            result["source"] = from_union([lambda x: to_enum(McpServerSource, x), from_none], self.source)
+        if self.source_path is not None:
+            result["sourcePath"] = from_union([from_str, from_none], self.source_path)
+        if self.source_plugin is not None:
+            result["sourcePlugin"] = from_union([from_str, from_none], self.source_plugin)
+        if self.source_plugin_spec is not None:
+            result["sourcePluginSpec"] = from_union([from_bool, from_none], self.source_plugin_spec)
+        if self.source_plugin_version is not None:
+            result["sourcePluginVersion"] = from_union([from_str, from_none], self.source_plugin_version)
+        if self.timeout is not None:
+            result["timeout"] = from_union([from_int, from_none], self.timeout)
+        if self.tools is not None:
+            result["tools"] = from_union([lambda x: from_list(from_str, x), from_none], self.tools)
+        if self.type is not None:
+            result["type"] = from_union([lambda x: to_enum(MCPServerConfigStdioType, x), from_none], self.type)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPTools:
@@ -23956,6 +28598,74 @@ def to_dict(self) -> dict:
             result["ui"] = from_union([lambda x: to_class(MCPToolUI, x), from_none], self.ui)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ToolsGetBuiltinDescriptorsRequest:
+    """Options controlling how Rust-owned built-in tool descriptors are materialized."""
+
+    background_task_notifications_enabled: bool | None = None
+    """Whether background task completion notifications are enabled."""
+
+    include_author: bool | None = None
+    """Whether tool descriptors should include authoring metadata."""
+
+    no_view_line_numbers: bool | None = None
+    """Whether line numbers should be omitted from the view tool descriptor."""
+
+    reduce_user_intervention: bool | None = None
+    """Whether descriptors should favor fewer user-intervention prompts."""
+
+    shell_async_only_enabled: bool | None = None
+    """Whether shell commands may only run asynchronously."""
+
+    shell_config: ToolsShellDescriptorConfig | None = None
+    """Shell-specific names and description lines for shell tools."""
+
+    shell_supports_power_shell7_syntax: bool | None = None
+    """Whether the configured shell supports PowerShell 7 syntax."""
+
+    shell_timeout_ms: float | None = None
+    """Default shell timeout in milliseconds."""
+
+    skill_embedding_enabled: bool | None = None
+    """Whether semantic skill lookup is available."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolsGetBuiltinDescriptorsRequest':
+        assert isinstance(obj, dict)
+        background_task_notifications_enabled = from_union([from_bool, from_none], obj.get("backgroundTaskNotificationsEnabled"))
+        include_author = from_union([from_bool, from_none], obj.get("includeAuthor"))
+        no_view_line_numbers = from_union([from_bool, from_none], obj.get("noViewLineNumbers"))
+        reduce_user_intervention = from_union([from_bool, from_none], obj.get("reduceUserIntervention"))
+        shell_async_only_enabled = from_union([from_bool, from_none], obj.get("shellAsyncOnlyEnabled"))
+        shell_config = from_union([ToolsShellDescriptorConfig.from_dict, from_none], obj.get("shellConfig"))
+        shell_supports_power_shell7_syntax = from_union([from_bool, from_none], obj.get("shellSupportsPowerShell7Syntax"))
+        shell_timeout_ms = from_union([from_float, from_none], obj.get("shellTimeoutMs"))
+        skill_embedding_enabled = from_union([from_bool, from_none], obj.get("skillEmbeddingEnabled"))
+        return ToolsGetBuiltinDescriptorsRequest(background_task_notifications_enabled, include_author, no_view_line_numbers, reduce_user_intervention, shell_async_only_enabled, shell_config, shell_supports_power_shell7_syntax, shell_timeout_ms, skill_embedding_enabled)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.background_task_notifications_enabled is not None:
+            result["backgroundTaskNotificationsEnabled"] = from_union([from_bool, from_none], self.background_task_notifications_enabled)
+        if self.include_author is not None:
+            result["includeAuthor"] = from_union([from_bool, from_none], self.include_author)
+        if self.no_view_line_numbers is not None:
+            result["noViewLineNumbers"] = from_union([from_bool, from_none], self.no_view_line_numbers)
+        if self.reduce_user_intervention is not None:
+            result["reduceUserIntervention"] = from_union([from_bool, from_none], self.reduce_user_intervention)
+        if self.shell_async_only_enabled is not None:
+            result["shellAsyncOnlyEnabled"] = from_union([from_bool, from_none], self.shell_async_only_enabled)
+        if self.shell_config is not None:
+            result["shellConfig"] = from_union([lambda x: to_class(ToolsShellDescriptorConfig, x), from_none], self.shell_config)
+        if self.shell_supports_power_shell7_syntax is not None:
+            result["shellSupportsPowerShell7Syntax"] = from_union([from_bool, from_none], self.shell_supports_power_shell7_syntax)
+        if self.shell_timeout_ms is not None:
+            result["shellTimeoutMs"] = from_union([to_float, from_none], self.shell_timeout_ms)
+        if self.skill_embedding_enabled is not None:
+            result["skillEmbeddingEnabled"] = from_union([from_bool, from_none], self.skill_embedding_enabled)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class UIElicitationArrayAnyOfField:
@@ -24269,76 +28979,47 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class UsageGetMetricsResult:
-    """Accumulated session usage metrics, including premium request cost, token counts, model
-    breakdown, and code-change totals.
+class UsageMetricsAgentMetric:
+    """Usage attributed to one agent instance, including its identity, API duration, AI units,
+    and per-model breakdown.
     """
-    code_changes: UsageMetricsCodeChanges
-    """Aggregated code change metrics"""
-
-    last_call_input_tokens: int
-    """Input tokens from the most recent main-agent API call"""
-
-    last_call_output_tokens: int
-    """Output tokens from the most recent main-agent API call"""
-
     model_metrics: dict[str, UsageMetricsModelMetric]
-    """Per-model token and request metrics, keyed by model identifier"""
-
-    session_start_time: datetime
-    """ISO 8601 timestamp when the session started"""
+    """Per-model usage for this agent, keyed by model identifier"""
 
     total_api_duration_ms: int
-    """Total time spent in model API calls (milliseconds)"""
-
-    total_premium_request_cost: float
-    """Total user-initiated premium request cost across all models (may be fractional due to
-    multipliers)
-    """
-    total_user_requests: int
-    """Raw count of user-initiated API requests"""
-
-    current_model: str | None = None
-    """Currently active model identifier"""
+    """Time spent in model API calls by this agent, in milliseconds"""
 
-    token_details: dict[str, UsageMetricsTokenDetail] | None = None
-    """Session-wide per-token-type accumulated token counts"""
+    total_nano_aiu: float
+    """Accumulated nano-AI units cost for this agent"""
 
-    total_nano_aiu: float | None = None
-    """Session-wide accumulated nano-AI units cost"""
+    agent_display_name: str | None = None
+    """Human-readable label for this subagent invocation, copied from the originating
+    `subagent.started` event. For task-tool subagents this is the invocation's task
+    description rather than the agent's configured display name, so group by `agentName` for
+    stable per-agent labels.
+    """
+    agent_name: str | None = None
+    """Configured agent name, when this is a subagent"""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UsageGetMetricsResult':
+    def from_dict(obj: Any) -> 'UsageMetricsAgentMetric':
         assert isinstance(obj, dict)
-        code_changes = UsageMetricsCodeChanges.from_dict(obj.get("codeChanges"))
-        last_call_input_tokens = from_int(obj.get("lastCallInputTokens"))
-        last_call_output_tokens = from_int(obj.get("lastCallOutputTokens"))
         model_metrics = from_dict(UsageMetricsModelMetric.from_dict, obj.get("modelMetrics"))
-        session_start_time = from_datetime(obj.get("sessionStartTime"))
         total_api_duration_ms = from_int(obj.get("totalApiDurationMs"))
-        total_premium_request_cost = from_float(obj.get("totalPremiumRequestCost"))
-        total_user_requests = from_int(obj.get("totalUserRequests"))
-        current_model = from_union([from_str, from_none], obj.get("currentModel"))
-        token_details = from_union([lambda x: from_dict(UsageMetricsTokenDetail.from_dict, x), from_none], obj.get("tokenDetails"))
-        total_nano_aiu = from_union([from_float, from_none], obj.get("totalNanoAiu"))
-        return UsageGetMetricsResult(code_changes, last_call_input_tokens, last_call_output_tokens, model_metrics, session_start_time, total_api_duration_ms, total_premium_request_cost, total_user_requests, current_model, token_details, total_nano_aiu)
+        total_nano_aiu = from_float(obj.get("totalNanoAiu"))
+        agent_display_name = from_union([from_str, from_none], obj.get("agentDisplayName"))
+        agent_name = from_union([from_str, from_none], obj.get("agentName"))
+        return UsageMetricsAgentMetric(model_metrics, total_api_duration_ms, total_nano_aiu, agent_display_name, agent_name)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["codeChanges"] = to_class(UsageMetricsCodeChanges, self.code_changes)
-        result["lastCallInputTokens"] = from_int(self.last_call_input_tokens)
-        result["lastCallOutputTokens"] = from_int(self.last_call_output_tokens)
         result["modelMetrics"] = from_dict(lambda x: to_class(UsageMetricsModelMetric, x), self.model_metrics)
-        result["sessionStartTime"] = self.session_start_time.isoformat()
         result["totalApiDurationMs"] = from_int(self.total_api_duration_ms)
-        result["totalPremiumRequestCost"] = to_float(self.total_premium_request_cost)
-        result["totalUserRequests"] = from_int(self.total_user_requests)
-        if self.current_model is not None:
-            result["currentModel"] = from_union([from_str, from_none], self.current_model)
-        if self.token_details is not None:
-            result["tokenDetails"] = from_union([lambda x: from_dict(lambda x: to_class(UsageMetricsTokenDetail, x), x), from_none], self.token_details)
-        if self.total_nano_aiu is not None:
-            result["totalNanoAiu"] = from_union([to_float, from_none], self.total_nano_aiu)
+        result["totalNanoAiu"] = to_float(self.total_nano_aiu)
+        if self.agent_display_name is not None:
+            result["agentDisplayName"] = from_union([from_str, from_none], self.agent_display_name)
+        if self.agent_name is not None:
+            result["agentName"] = from_union([from_str, from_none], self.agent_name)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -24395,6 +29076,90 @@ def to_dict(self) -> dict:
             result["unavailableReason"] = from_union([lambda x: to_enum(HistoryRewindUnavailableReason, x), from_none], self.unavailable_reason)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPInstallPlan:
+    """A normalised, inert description of what installing an MCP server would involve. Carries
+    no raw card, no install specification, and no secret value.
+
+    The normalised plan.
+    """
+    configuration_changes: list[MCPPlanConfigurationChange]
+    """The configuration changes installing would make, described rather than serialised, so the
+    mutable configuration payload stays behind the runtime boundary.
+    """
+    identity: MCPPlanResourceIdentity
+    """Normalised identity of the server the plan would install."""
+
+    plan_handle: str
+    """Opaque, runtime-instance scoped, TTL-bound, single-use handle for this plan. Rejected
+    when stale, replayed, or presented to a different runtime instance. Never logged.
+    """
+    plan_handle_expires_at: str
+    """ISO 8601 timestamp after which the plan handle is stale and will be rejected. Abandoning
+    a plan needs no call: an unused handle simply expires, so cancellation before commit is
+    side-effect free.
+    """
+    policy: MCPPlanPolicyResult
+    """Outcome of evaluating the server against registry and enterprise policy."""
+
+    provenance: MCPPlanProvenance
+    """Origin and semantic digest of the exact validated JSON MCP card content bound to this
+    plan.
+    """
+    reload_required: bool
+    """Whether applying this plan would require an MCP reload to take effect. Planning itself
+    never reloads.
+    """
+    requires_interactive_configuration: bool
+    """Whether the plan cannot be applied without further input, because a required value has no
+    default or a secret must be supplied.
+    """
+    target: MCPPlanTarget
+    """Configuration scope and key the plan would write to."""
+
+    transport_choices: list[MCPPlanTransportChoice]
+    """Every eligible transport, so a host can present an explicit choice. A completed plan
+    always has at least one; when none is eligible, planning returns
+    `CatalogUnavailableTransportError` instead.
+    """
+    recommended_transport_choice_id: str | None = None
+    """Identifier of the choice the runtime would pick by default. Omitted when there is no
+    eligible transport, or when the runtime expresses no preference.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPInstallPlan':
+        assert isinstance(obj, dict)
+        configuration_changes = from_list(MCPPlanConfigurationChange.from_dict, obj.get("configurationChanges"))
+        identity = MCPPlanResourceIdentity.from_dict(obj.get("identity"))
+        plan_handle = from_str(obj.get("planHandle"))
+        plan_handle_expires_at = from_str(obj.get("planHandleExpiresAt"))
+        policy = MCPPlanPolicyResult.from_dict(obj.get("policy"))
+        provenance = MCPPlanProvenance.from_dict(obj.get("provenance"))
+        reload_required = from_bool(obj.get("reloadRequired"))
+        requires_interactive_configuration = from_bool(obj.get("requiresInteractiveConfiguration"))
+        target = MCPPlanTarget.from_dict(obj.get("target"))
+        transport_choices = from_list(_load_MCPPlanTransportChoice, obj.get("transportChoices"))
+        recommended_transport_choice_id = from_union([from_str, from_none], obj.get("recommendedTransportChoiceId"))
+        return MCPInstallPlan(configuration_changes, identity, plan_handle, plan_handle_expires_at, policy, provenance, reload_required, requires_interactive_configuration, target, transport_choices, recommended_transport_choice_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["configurationChanges"] = from_list(lambda x: to_class(MCPPlanConfigurationChange, x), self.configuration_changes)
+        result["identity"] = to_class(MCPPlanResourceIdentity, self.identity)
+        result["planHandle"] = from_str(self.plan_handle)
+        result["planHandleExpiresAt"] = from_str(self.plan_handle_expires_at)
+        result["policy"] = to_class(MCPPlanPolicyResult, self.policy)
+        result["provenance"] = to_class(MCPPlanProvenance, self.provenance)
+        result["reloadRequired"] = from_bool(self.reload_required)
+        result["requiresInteractiveConfiguration"] = from_bool(self.requires_interactive_configuration)
+        result["target"] = to_class(MCPPlanTarget, self.target)
+        result["transportChoices"] = from_list(lambda x: (x).to_dict(), self.transport_choices)
+        if self.recommended_transport_choice_id is not None:
+            result["recommendedTransportChoiceId"] = from_union([from_str, from_none], self.recommended_transport_choice_id)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CommandList:
@@ -24569,6 +29334,50 @@ def to_dict(self) -> dict:
             result["session"] = from_union([lambda x: to_class(CanvasSessionContext, x), from_none], self.session)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class CatalogSearchSucceeded:
+    """A completed catalog search: inert candidate summaries, each carrying a single-use handle."""
+
+    candidates: list[CatalogCandidate]
+    """Matching candidates, never more than the requested limit. All text is inert untrusted
+    data.
+    """
+    kind: ClassVar[str] = "succeeded"
+    """Discriminator: the search completed"""
+
+    negotiated: CatalogNegotiatedContract
+    """Protocol version and capabilities the runtime honoured."""
+
+    search_id: str
+    """Pseudonymous identifier for this search, issued by the runtime or by the catalog
+    authority it queried and never by the caller, so it cannot be forged or replayed to
+    attribute an install to a search that never happened. Always present on a success, so a
+    result set can be tied to the installs it leads to. It identifies a search rather than a
+    person: it is derived from no user, account, device, or query data, and must never be
+    joined with user identity to re-identify anyone.
+    """
+    truncated: bool
+    """Whether further matches existed beyond the requested limit."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CatalogSearchSucceeded':
+        assert isinstance(obj, dict)
+        candidates = from_list(CatalogCandidate.from_dict, obj.get("candidates"))
+        negotiated = CatalogNegotiatedContract.from_dict(obj.get("negotiated"))
+        search_id = from_str(obj.get("searchId"))
+        truncated = from_bool(obj.get("truncated"))
+        return CatalogSearchSucceeded(candidates, negotiated, search_id, truncated)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["candidates"] = from_list(lambda x: to_class(CatalogCandidate, x), self.candidates)
+        result["kind"] = self.kind
+        result["negotiated"] = to_class(CatalogNegotiatedContract, self.negotiated)
+        result["searchId"] = from_str(self.search_id)
+        result["truncated"] = from_bool(self.truncated)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HandlePendingToolCallRequest:
@@ -24601,30 +29410,92 @@ def to_dict(self) -> dict:
             result["result"] = from_union([lambda x: to_class(ExternalToolTextResultForLlm, x), from_str, from_none], self.result)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ToolsTaskCompleteEventDataRequest:
+    """Task-completion tool arguments and final result used to build a label-safe session event
+    payload.
+    """
+    final_result: ToolResultExpanded
+    """Final expanded result returned by the task_complete tool."""
+
+    tool_args: Any
+    """Arguments supplied to the completed task_complete tool call."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolsTaskCompleteEventDataRequest':
+        assert isinstance(obj, dict)
+        final_result = ToolResultExpanded.from_dict(obj.get("finalResult"))
+        tool_args = obj.get("toolArgs")
+        return ToolsTaskCompleteEventDataRequest(final_result, tool_args)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["finalResult"] = to_class(ToolResultExpanded, self.final_result)
+        result["toolArgs"] = self.tool_args
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class FactoryRunSummary:
     """Durable factory run summary with read-time live overlays."""
 
     consumed: FactoryRunConsumed
+    """Durable resource consumption."""
+
     created_at: int
+    """Epoch milliseconds when the run was created."""
+
     declared_limits: FactoryDeclaredLimits
+    """Resource ceilings declared by the factory."""
+
     declared_phase_count: int
+    """Number of phases declared by the factory."""
+
     description: str
+    """Human-readable factory description."""
+
     factory_name: str
+    """Registered factory name."""
+
     live_agent_count: int
+    """Number of direct factory agents currently live."""
+
     observed_at: int
+    """Epoch milliseconds when this live-overlay snapshot was observed."""
+
     revision: int
+    """Monotonic durable run revision."""
+
     run_id: str
+    """Factory run identifier."""
+
     status: FactoryRunStatus
+    """Current factory run status."""
+
     total_spawned_agent_count: int
+    """Total direct factory agents spawned across all attempts."""
+
     updated_at: int
+    """Epoch milliseconds when the durable run was last updated."""
+
     active_segment_started_at: int | None = None
+    """Epoch milliseconds when the current active segment started, or null while inactive."""
+
     approved: FactoryDeclaredLimits | None = None
+    """Approved effective resource ceilings, or null until approved."""
+
     completed_at: int | None = None
+    """Epoch milliseconds when the run completed, or null while nonterminal."""
+
     current_phase: FactoryCurrentPhase | None = None
+    """Current phase identity, or null before any phase is entered."""
+
     started_at: int | None = None
+    """Epoch milliseconds when execution first started, or null before start."""
+
     terminal: FactoryRunTerminal | None = None
+    """Terminal run outcome, or null while nonterminal."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'FactoryRunSummary':
@@ -24697,87 +29568,6 @@ def to_dict(self) -> dict:
         result["run"] = to_class(FactoryRunResult, self.run)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class FactoryRunDetail:
-    """Full factory run observability detail."""
-
-    agents: list[FactoryAgentSummary]
-    consumed: FactoryRunConsumed
-    created_at: int
-    declared_limits: FactoryDeclaredLimits
-    declared_phase_count: int
-    description: str
-    factory_name: str
-    live_agent_count: int
-    observed_at: int
-    phases: list[FactoryPhaseObservation]
-    progress: FactoryProgressPage
-    revision: int
-    run_id: str
-    status: FactoryRunStatus
-    total_spawned_agent_count: int
-    updated_at: int
-    active_segment_started_at: int | None = None
-    approved: FactoryDeclaredLimits | None = None
-    completed_at: int | None = None
-    current_phase: FactoryCurrentPhase | None = None
-    started_at: int | None = None
-    terminal: FactoryRunTerminal | None = None
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'FactoryRunDetail':
-        assert isinstance(obj, dict)
-        agents = from_list(FactoryAgentSummary.from_dict, obj.get("agents"))
-        consumed = FactoryRunConsumed.from_dict(obj.get("consumed"))
-        created_at = from_int(obj.get("createdAt"))
-        declared_limits = FactoryDeclaredLimits.from_dict(obj.get("declaredLimits"))
-        declared_phase_count = from_int(obj.get("declaredPhaseCount"))
-        description = from_str(obj.get("description"))
-        factory_name = from_str(obj.get("factoryName"))
-        live_agent_count = from_int(obj.get("liveAgentCount"))
-        observed_at = from_int(obj.get("observedAt"))
-        phases = from_list(FactoryPhaseObservation.from_dict, obj.get("phases"))
-        progress = FactoryProgressPage.from_dict(obj.get("progress"))
-        revision = from_int(obj.get("revision"))
-        run_id = from_str(obj.get("runId"))
-        status = FactoryRunStatus(obj.get("status"))
-        total_spawned_agent_count = from_int(obj.get("totalSpawnedAgentCount"))
-        updated_at = from_int(obj.get("updatedAt"))
-        active_segment_started_at = from_union([from_int, from_none], obj.get("activeSegmentStartedAt"))
-        approved = from_union([FactoryDeclaredLimits.from_dict, from_none], obj.get("approved"))
-        completed_at = from_union([from_int, from_none], obj.get("completedAt"))
-        current_phase = from_union([FactoryCurrentPhase.from_dict, from_none], obj.get("currentPhase"))
-        started_at = from_union([from_int, from_none], obj.get("startedAt"))
-        terminal = from_union([FactoryRunTerminal.from_dict, from_none], obj.get("terminal"))
-        return FactoryRunDetail(agents, consumed, created_at, declared_limits, declared_phase_count, description, factory_name, live_agent_count, observed_at, phases, progress, revision, run_id, status, total_spawned_agent_count, updated_at, active_segment_started_at, approved, completed_at, current_phase, started_at, terminal)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["agents"] = from_list(lambda x: to_class(FactoryAgentSummary, x), self.agents)
-        result["consumed"] = to_class(FactoryRunConsumed, self.consumed)
-        result["createdAt"] = from_int(self.created_at)
-        result["declaredLimits"] = to_class(FactoryDeclaredLimits, self.declared_limits)
-        result["declaredPhaseCount"] = from_int(self.declared_phase_count)
-        result["description"] = from_str(self.description)
-        result["factoryName"] = from_str(self.factory_name)
-        result["liveAgentCount"] = from_int(self.live_agent_count)
-        result["observedAt"] = from_int(self.observed_at)
-        result["phases"] = from_list(lambda x: to_class(FactoryPhaseObservation, x), self.phases)
-        result["progress"] = to_class(FactoryProgressPage, self.progress)
-        result["revision"] = from_int(self.revision)
-        result["runId"] = from_str(self.run_id)
-        result["status"] = to_enum(FactoryRunStatus, self.status)
-        result["totalSpawnedAgentCount"] = from_int(self.total_spawned_agent_count)
-        result["updatedAt"] = from_int(self.updated_at)
-        result["activeSegmentStartedAt"] = from_union([from_int, from_none], self.active_segment_started_at)
-        result["approved"] = from_union([lambda x: to_class(FactoryDeclaredLimits, x), from_none], self.approved)
-        result["completedAt"] = from_union([from_int, from_none], self.completed_at)
-        result["currentPhase"] = from_union([lambda x: to_class(FactoryCurrentPhase, x), from_none], self.current_phase)
-        result["startedAt"] = from_union([from_int, from_none], self.started_at)
-        result["terminal"] = from_union([lambda x: to_class(FactoryRunTerminal, x), from_none], self.terminal)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionsSetAdditionalPluginsRequest:
@@ -25138,7 +29928,7 @@ class ProviderModelConfig:
     in the model list and passed to switchTo) is the provider-qualified `provider/id`.
     """
     provider: str
-    """Name of the NamedProviderConfig that serves this model."""
+    """Name of the configured provider that serves this model."""
 
     capabilities: ModelCapabilitiesOverride | None = None
     """Optional capability overrides (vision, tool_calls, reasoning, etc.)."""
@@ -25196,6 +29986,128 @@ def to_dict(self) -> dict:
             result["wireModel"] = from_union([from_str, from_none], self.wire_model)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ProviderConfig:
+    """Custom model-provider configuration (BYOK)."""
+
+    base_url: str
+    """API endpoint URL."""
+
+    api_key: str | None = None
+    """API key. Optional for local providers like Ollama."""
+
+    azure: ProviderConfigAzure | None = None
+    """Azure-specific provider options."""
+
+    bearer_token: str | None = None
+    """Bearer token for authentication. Sets the Authorization header directly. Takes precedence
+    over apiKey when both are set.
+    """
+    has_bearer_token_provider: bool | None = None
+    """When true, the SDK client supplies bearer tokens on demand: the runtime calls the
+    client-session `providerToken.getToken` callback before each request and applies the
+    returned token as an `Authorization: Bearer <token>` header. This is the bearer/OAuth
+    scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens
+    (including Anthropic's), not a provider-specific API-key header such as Anthropic's
+    `x-api-key`. The token-acquiring function itself stays on the SDK side and is never
+    serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`,
+    the callback takes precedence: the runtime applies the token returned by
+    `providerToken.getToken` as the `Authorization: Bearer` header for each request and does
+    not send the static credential.
+    """
+    headers: dict[str, str] | None = None
+    """Custom HTTP headers to include in all outbound requests to the provider."""
+
+    max_context_window_tokens: float | None = None
+    """Maximum context window tokens for the model."""
+
+    max_output_tokens: float | None = None
+    """Maximum output tokens for the model."""
+
+    max_prompt_tokens: float | None = None
+    """Maximum prompt/input tokens for the model."""
+
+    model_capabilities: ModelCapabilitiesOverride | None = None
+    """Overrides for model capabilities when they cannot be inferred from modelId."""
+
+    model_id: str | None = None
+    """Well-known model ID used for capability lookup. When set, agent behavior config and token
+    limits are inferred from this model.
+    """
+    provider_name: str | None = None
+    """Provider name used for model and telemetry attribution."""
+
+    transport: ProviderTransport | None = None
+    """Provider transport. Defaults to "http"."""
+
+    type: ProviderType | None = None
+    """Provider type. Defaults to "openai" for generic OpenAI-compatible APIs."""
+
+    wire_api: ProviderWireAPI | None = None
+    """Wire API format (openai/azure only). Defaults to "completions"."""
+
+    wire_model: str | None = None
+    """The model identifier sent to the provider API for inference (the "wire" model), as
+    opposed to modelId which is the well-known base.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ProviderConfig':
+        assert isinstance(obj, dict)
+        base_url = from_str(obj.get("baseUrl"))
+        api_key = from_union([from_str, from_none], obj.get("apiKey"))
+        azure = from_union([ProviderConfigAzure.from_dict, from_none], obj.get("azure"))
+        bearer_token = from_union([from_str, from_none], obj.get("bearerToken"))
+        has_bearer_token_provider = from_union([from_bool, from_none], obj.get("hasBearerTokenProvider"))
+        headers = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("headers"))
+        max_context_window_tokens = from_union([from_float, from_none], obj.get("maxContextWindowTokens"))
+        max_output_tokens = from_union([from_float, from_none], obj.get("maxOutputTokens"))
+        max_prompt_tokens = from_union([from_float, from_none], obj.get("maxPromptTokens"))
+        model_capabilities = from_union([ModelCapabilitiesOverride.from_dict, from_none], obj.get("modelCapabilities"))
+        model_id = from_union([from_str, from_none], obj.get("modelId"))
+        provider_name = from_union([from_str, from_none], obj.get("providerName"))
+        transport = from_union([ProviderTransport, from_none], obj.get("transport"))
+        type = from_union([ProviderType, from_none], obj.get("type"))
+        wire_api = from_union([ProviderWireAPI, from_none], obj.get("wireApi"))
+        wire_model = from_union([from_str, from_none], obj.get("wireModel"))
+        return ProviderConfig(base_url, api_key, azure, bearer_token, has_bearer_token_provider, headers, max_context_window_tokens, max_output_tokens, max_prompt_tokens, model_capabilities, model_id, provider_name, transport, type, wire_api, wire_model)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["baseUrl"] = from_str(self.base_url)
+        if self.api_key is not None:
+            result["apiKey"] = from_union([from_str, from_none], self.api_key)
+        if self.azure is not None:
+            result["azure"] = from_union([lambda x: to_class(ProviderConfigAzure, x), from_none], self.azure)
+        if self.bearer_token is not None:
+            result["bearerToken"] = from_union([from_str, from_none], self.bearer_token)
+        if self.has_bearer_token_provider is not None:
+            result["hasBearerTokenProvider"] = from_union([from_bool, from_none], self.has_bearer_token_provider)
+        if self.headers is not None:
+            result["headers"] = from_union([lambda x: from_dict(from_str, x), from_none], self.headers)
+        if self.max_context_window_tokens is not None:
+            result["maxContextWindowTokens"] = from_union([to_float, from_none], self.max_context_window_tokens)
+        if self.max_output_tokens is not None:
+            result["maxOutputTokens"] = from_union([to_float, from_none], self.max_output_tokens)
+        if self.max_prompt_tokens is not None:
+            result["maxPromptTokens"] = from_union([to_float, from_none], self.max_prompt_tokens)
+        if self.model_capabilities is not None:
+            result["modelCapabilities"] = from_union([lambda x: to_class(ModelCapabilitiesOverride, x), from_none], self.model_capabilities)
+        if self.model_id is not None:
+            result["modelId"] = from_union([from_str, from_none], self.model_id)
+        if self.provider_name is not None:
+            result["providerName"] = from_union([from_str, from_none], self.provider_name)
+        if self.transport is not None:
+            result["transport"] = from_union([lambda x: to_enum(ProviderTransport, x), from_none], self.transport)
+        if self.type is not None:
+            result["type"] = from_union([lambda x: to_enum(ProviderType, x), from_none], self.type)
+        if self.wire_api is not None:
+            result["wireApi"] = from_union([lambda x: to_enum(ProviderWireAPI, x), from_none], self.wire_api)
+        if self.wire_model is not None:
+            result["wireModel"] = from_union([from_str, from_none], self.wire_model)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionsConfigureParams:
@@ -25267,23 +30179,26 @@ class SandboxConfig:
     add_current_working_directory: bool | None = None
     """Whether to auto-add the current working directory to readwritePaths. Default: true."""
 
-    allow_dev_tool_caches: bool | None = None
-    """Whether to auto-grant read access to common developer-tool caches, registries, and
-    toolchains in their default home locations (cargo, go, npm, Maven, and more), plus
-    read-write access to (and, on Unix, up-front creation of) the scratch caches builds write
-    on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so
-    builds work without exporting CARGO_HOME/GOPATH/etc. Default: true (enabled by default;
-    set to false to opt out).
-    """
-    gh_auth: bool | None = None
-    """Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the
-    OS keyring the sandbox blocks. Default: false (opt-in).
-    """
-    git_auth: bool | None = None
-    """Whether to inject the Copilot GitHub token as an `http.<host>.extraheader` so
-    authenticated HTTPS git works inside the sandbox without the shell-based credential
-    helper the sandbox blocks. Default: false (opt-in).
-    """
+    allow_dev_tool_access: bool | None = None
+    """Whether to auto-grant read access to the tool directories discovered on PATH and in
+    toolchain environment variables (GOROOT, CARGO_HOME, JAVA_HOME, VIRTUAL_ENV, and
+    similar), and to common developer-tool caches, registries, and toolchains in their
+    default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and
+    up-front creation of) the scratch caches builds write on every run (go-build, ccache,
+    sccache, Gradle caches, Cargo lock/tracker files), so builds work without extra
+    configuration; a relocated CARGO_HOME additionally gets its Cargo lock files granted
+    read-write. Set to false to disable every grant listed above: user-installed toolchains
+    (rustup, nvm, pyenv, conda, pipx) then need explicit userPolicy.filesystem entries —
+    readonlyPaths to read them, plus readwriteFiles for a relocated CARGO_HOME's
+    .package-cache and .global-cache, which Cargo locks on every build. Only these
+    developer-tool grants are affected: the working directory (see
+    addCurrentWorkingDirectory), temporary storage, session log paths, and system locations
+    follow their own rules and stay granted, so commands still run. Default: true (enabled by
+    default; set to false to opt out).
+    """
+    auth: SandboxConfigAuth | None = None
+    """Credential-injection capability flags."""
+
     user_policy: SandboxConfigUserPolicy | None = None
     """User-managed sandbox policy fragment merged into the auto-discovered base policy."""
 
@@ -25292,23 +30207,20 @@ def from_dict(obj: Any) -> 'SandboxConfig':
         assert isinstance(obj, dict)
         enabled = from_bool(obj.get("enabled"))
         add_current_working_directory = from_union([from_bool, from_none], obj.get("addCurrentWorkingDirectory"))
-        allow_dev_tool_caches = from_union([from_bool, from_none], obj.get("allowDevToolCaches"))
-        gh_auth = from_union([from_bool, from_none], obj.get("ghAuth"))
-        git_auth = from_union([from_bool, from_none], obj.get("gitAuth"))
+        allow_dev_tool_access = from_union([from_bool, from_none], obj.get("allowDevToolAccess"))
+        auth = from_union([SandboxConfigAuth.from_dict, from_none], obj.get("auth"))
         user_policy = from_union([SandboxConfigUserPolicy.from_dict, from_none], obj.get("userPolicy"))
-        return SandboxConfig(enabled, add_current_working_directory, allow_dev_tool_caches, gh_auth, git_auth, user_policy)
+        return SandboxConfig(enabled, add_current_working_directory, allow_dev_tool_access, auth, user_policy)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["enabled"] = from_bool(self.enabled)
         if self.add_current_working_directory is not None:
             result["addCurrentWorkingDirectory"] = from_union([from_bool, from_none], self.add_current_working_directory)
-        if self.allow_dev_tool_caches is not None:
-            result["allowDevToolCaches"] = from_union([from_bool, from_none], self.allow_dev_tool_caches)
-        if self.gh_auth is not None:
-            result["ghAuth"] = from_union([from_bool, from_none], self.gh_auth)
-        if self.git_auth is not None:
-            result["gitAuth"] = from_union([from_bool, from_none], self.git_auth)
+        if self.allow_dev_tool_access is not None:
+            result["allowDevToolAccess"] = from_union([from_bool, from_none], self.allow_dev_tool_access)
+        if self.auth is not None:
+            result["auth"] = from_union([lambda x: to_class(SandboxConfigAuth, x), from_none], self.auth)
         if self.user_policy is not None:
             result["userPolicy"] = from_union([lambda x: to_class(SandboxConfigUserPolicy, x), from_none], self.user_policy)
         return result
@@ -25319,7 +30231,10 @@ class SessionFSSqliteTransactionResult:
     """Per-statement results, or a classified transaction error."""
 
     results: list[SessionFSSqliteQueryResult]
+    """Per-statement query results in input order."""
+
     error: SessionFSSqliteTransactionError | None = None
+    """Classified transaction failure, when execution did not succeed."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionFSSqliteTransactionResult':
@@ -25335,6 +30250,129 @@ def to_dict(self) -> dict:
             result["error"] = from_union([lambda x: to_class(SessionFSSqliteTransactionError, x), from_none], self.error)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPConfigAddRequest:
+    """MCP server name and configuration to add to user configuration."""
+
+    config: MCPSerializableServerConfig
+    """MCP server configuration (stdio process or remote HTTP/SSE)"""
+
+    name: str
+    """Unique name for the MCP server"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPConfigAddRequest':
+        assert isinstance(obj, dict)
+        config = MCPSerializableServerConfig.from_dict(obj.get("config"))
+        name = from_str(obj.get("name"))
+        return MCPConfigAddRequest(config, name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["config"] = to_class(MCPSerializableServerConfig, self.config)
+        result["name"] = from_str(self.name)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPConfigList:
+    """User-configured MCP servers, keyed by server name."""
+
+    servers: dict[str, MCPSerializableServerConfig]
+    """All MCP servers from user config, keyed by name"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPConfigList':
+        assert isinstance(obj, dict)
+        servers = from_dict(MCPSerializableServerConfig.from_dict, obj.get("servers"))
+        return MCPConfigList(servers)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["servers"] = from_dict(lambda x: to_class(MCPSerializableServerConfig, x), self.servers)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPConfigUpdateRequest:
+    """MCP server name and replacement configuration to write to user configuration."""
+
+    config: MCPSerializableServerConfig
+    """MCP server configuration (stdio process or remote HTTP/SSE)"""
+
+    name: str
+    """Name of the MCP server to update"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPConfigUpdateRequest':
+        assert isinstance(obj, dict)
+        config = MCPSerializableServerConfig.from_dict(obj.get("config"))
+        name = from_str(obj.get("name"))
+        return MCPConfigUpdateRequest(config, name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["config"] = to_class(MCPSerializableServerConfig, self.config)
+        result["name"] = from_str(self.name)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPRestartServerRequest:
+    """Server name and optional replacement configuration for an individual MCP server restart.
+    Omit `config` for a config-free restart-by-name of an already-configured server.
+    """
+    server_name: str
+    """Name of the MCP server to restart"""
+
+    config: MCPSerializableServerConfig | None = None
+    """Replacement MCP server configuration (stdio process or remote HTTP/SSE). Omit to restart
+    the server with its already-registered configuration (config-free restart-by-name).
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPRestartServerRequest':
+        assert isinstance(obj, dict)
+        server_name = from_str(obj.get("serverName"))
+        config = from_union([MCPSerializableServerConfig.from_dict, from_none], obj.get("config"))
+        return MCPRestartServerRequest(server_name, config)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["serverName"] = from_str(self.server_name)
+        if self.config is not None:
+            result["config"] = from_union([lambda x: to_class(MCPSerializableServerConfig, x), from_none], self.config)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPStartServerRequest:
+    """Server name and optional configuration for an individual MCP server start. Omit `config`
+    for a config-free start-by-name of an already-configured server.
+    """
+    server_name: str
+    """Name of the MCP server to start"""
+
+    config: MCPSerializableServerConfig | None = None
+    """MCP server configuration (stdio process or remote HTTP/SSE). Omit to start the server
+    with its already-registered configuration (config-free start-by-name).
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPStartServerRequest':
+        assert isinstance(obj, dict)
+        server_name = from_str(obj.get("serverName"))
+        config = from_union([MCPSerializableServerConfig.from_dict, from_none], obj.get("config"))
+        return MCPStartServerRequest(server_name, config)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["serverName"] = from_str(self.server_name)
+        if self.config is not None:
+            result["config"] = from_union([lambda x: to_class(MCPSerializableServerConfig, x), from_none], self.config)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPListToolsResult:
@@ -25362,7 +30400,7 @@ class UIElicitationSchema:
     properties: dict[str, UIElicitationSchemaProperty]
     """Form field definitions, keyed by field name"""
 
-    type: UIElicitationSchemaType
+    type: BuiltinToolInputSchemaType
     """Schema type indicator (always 'object')"""
 
     required: list[str] | None = None
@@ -25372,56 +30410,169 @@ class UIElicitationSchema:
     def from_dict(obj: Any) -> 'UIElicitationSchema':
         assert isinstance(obj, dict)
         properties = from_dict(UIElicitationSchemaProperty.from_dict, obj.get("properties"))
-        type = UIElicitationSchemaType(obj.get("type"))
+        type = BuiltinToolInputSchemaType(obj.get("type"))
         required = from_union([lambda x: from_list(from_str, x), from_none], obj.get("required"))
         return UIElicitationSchema(properties, type, required)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["properties"] = from_dict(lambda x: to_class(UIElicitationSchemaProperty, x), self.properties)
-        result["type"] = to_enum(UIElicitationSchemaType, self.type)
+        result["type"] = to_enum(BuiltinToolInputSchemaType, self.type)
         if self.required is not None:
             result["required"] = from_union([lambda x: from_list(from_str, x), from_none], self.required)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class FactoryListRunsResult:
-    """Factory runs in durable creation order."""
+class UsageGetMetricsResult:
+    """Accumulated session usage metrics, including premium request cost, token counts, model
+    breakdown, and code-change totals.
+    """
+    code_changes: UsageMetricsCodeChanges
+    """Aggregated code change metrics"""
 
-    runs: list[FactoryRunSummary]
+    last_call_input_tokens: int
+    """Input tokens from the most recent main-agent API call"""
+
+    last_call_output_tokens: int
+    """Output tokens from the most recent main-agent API call"""
+
+    model_metrics: dict[str, UsageMetricsModelMetric]
+    """Per-model token and request metrics, keyed by model identifier"""
+
+    session_start_time: datetime
+    """ISO 8601 timestamp when the session started"""
+
+    total_api_duration_ms: int
+    """Total time spent in model API calls (milliseconds)"""
+
+    total_premium_request_cost: float
+    """Total user-initiated premium request cost across all models (may be fractional due to
+    multipliers)
+    """
+    total_user_requests: int
+    """Raw count of user-initiated API requests"""
+
+    agent_metrics: dict[str, UsageMetricsAgentMetric] | None = None
+    """Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses
+    the stable key `main`.
+    """
+    current_model: str | None = None
+    """Currently active model identifier"""
+
+    token_details: dict[str, UsageMetricsTokenDetail] | None = None
+    """Session-wide per-token-type accumulated token counts"""
+
+    total_nano_aiu: float | None = None
+    """Session-wide accumulated nano-AI units cost"""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'FactoryListRunsResult':
+    def from_dict(obj: Any) -> 'UsageGetMetricsResult':
         assert isinstance(obj, dict)
-        runs = from_list(FactoryRunSummary.from_dict, obj.get("runs"))
-        return FactoryListRunsResult(runs)
+        code_changes = UsageMetricsCodeChanges.from_dict(obj.get("codeChanges"))
+        last_call_input_tokens = from_int(obj.get("lastCallInputTokens"))
+        last_call_output_tokens = from_int(obj.get("lastCallOutputTokens"))
+        model_metrics = from_dict(UsageMetricsModelMetric.from_dict, obj.get("modelMetrics"))
+        session_start_time = from_datetime(obj.get("sessionStartTime"))
+        total_api_duration_ms = from_int(obj.get("totalApiDurationMs"))
+        total_premium_request_cost = from_float(obj.get("totalPremiumRequestCost"))
+        total_user_requests = from_int(obj.get("totalUserRequests"))
+        agent_metrics = from_union([lambda x: from_dict(UsageMetricsAgentMetric.from_dict, x), from_none], obj.get("agentMetrics"))
+        current_model = from_union([from_str, from_none], obj.get("currentModel"))
+        token_details = from_union([lambda x: from_dict(UsageMetricsTokenDetail.from_dict, x), from_none], obj.get("tokenDetails"))
+        total_nano_aiu = from_union([from_float, from_none], obj.get("totalNanoAiu"))
+        return UsageGetMetricsResult(code_changes, last_call_input_tokens, last_call_output_tokens, model_metrics, session_start_time, total_api_duration_ms, total_premium_request_cost, total_user_requests, agent_metrics, current_model, token_details, total_nano_aiu)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["runs"] = from_list(lambda x: to_class(FactoryRunSummary, x), self.runs)
+        result["codeChanges"] = to_class(UsageMetricsCodeChanges, self.code_changes)
+        result["lastCallInputTokens"] = from_int(self.last_call_input_tokens)
+        result["lastCallOutputTokens"] = from_int(self.last_call_output_tokens)
+        result["modelMetrics"] = from_dict(lambda x: to_class(UsageMetricsModelMetric, x), self.model_metrics)
+        result["sessionStartTime"] = self.session_start_time.isoformat()
+        result["totalApiDurationMs"] = from_int(self.total_api_duration_ms)
+        result["totalPremiumRequestCost"] = to_float(self.total_premium_request_cost)
+        result["totalUserRequests"] = from_int(self.total_user_requests)
+        if self.agent_metrics is not None:
+            result["agentMetrics"] = from_union([lambda x: from_dict(lambda x: to_class(UsageMetricsAgentMetric, x), x), from_none], self.agent_metrics)
+        if self.current_model is not None:
+            result["currentModel"] = from_union([from_str, from_none], self.current_model)
+        if self.token_details is not None:
+            result["tokenDetails"] = from_union([lambda x: from_dict(lambda x: to_class(UsageMetricsTokenDetail, x), x), from_none], self.token_details)
+        if self.total_nano_aiu is not None:
+            result["totalNanoAiu"] = from_union([to_float, from_none], self.total_nano_aiu)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class BuiltInModelCatalogEntry:
-    """A well-known model in the runtime's built-in catalog."""
-
-    id: str
-    """Well-known runtime model ID suitable for `ProviderConfig.modelId` or
-    `ProviderModelConfig.modelId`. This is not necessarily the provider-facing deployment or
-    model name and does not indicate CAPI entitlement or provider availability.
+class MCPPlanInstallPlanned:
+    """A computed MCP install plan. Nothing has been applied: the plan describes what installing
+    would change, and the plan handle is what a later apply operation would consume.
     """
+    kind: ClassVar[str] = "planned"
+    """Discriminator: a plan was computed and nothing was changed"""
+
+    negotiated: CatalogNegotiatedContract
+    """Protocol version and capabilities the runtime honoured."""
+
+    plan: MCPInstallPlan
+    """The normalised plan."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'BuiltInModelCatalogEntry':
+    def from_dict(obj: Any) -> 'MCPPlanInstallPlanned':
         assert isinstance(obj, dict)
-        id = from_str(obj.get("id"))
-        return BuiltInModelCatalogEntry(id)
+        negotiated = CatalogNegotiatedContract.from_dict(obj.get("negotiated"))
+        plan = MCPInstallPlan.from_dict(obj.get("plan"))
+        return MCPPlanInstallPlanned(negotiated, plan)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["id"] = from_str(self.id)
+        result["kind"] = self.kind
+        result["negotiated"] = to_class(CatalogNegotiatedContract, self.negotiated)
+        result["plan"] = to_class(MCPInstallPlan, self.plan)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class FactoryListRunsResult:
+    """A page of factory runs in durable creation order."""
+
+    runs: list[FactoryRunSummary]
+    """Factory run summaries in durable creation order."""
+
+    has_more_newer: bool | None = None
+    """Whether terminal runs newer than this page exist."""
+
+    newest_seq: int | None = None
+    """Newest terminal-run cursor in this page, or null when the terminal window is empty."""
+
+    oldest_seq: int | None = None
+    """Oldest terminal-run cursor in this page, or null when the terminal window is empty."""
+
+    omitted_older: int | None = None
+    """Number of terminal runs older than this page."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'FactoryListRunsResult':
+        assert isinstance(obj, dict)
+        runs = from_list(FactoryRunSummary.from_dict, obj.get("runs"))
+        has_more_newer = from_union([from_bool, from_none], obj.get("hasMoreNewer"))
+        newest_seq = from_union([from_int, from_none], obj.get("newestSeq"))
+        oldest_seq = from_union([from_int, from_none], obj.get("oldestSeq"))
+        omitted_older = from_union([from_int, from_none], obj.get("omittedOlder"))
+        return FactoryListRunsResult(runs, has_more_newer, newest_seq, oldest_seq, omitted_older)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["runs"] = from_list(lambda x: to_class(FactoryRunSummary, x), self.runs)
+        if self.has_more_newer is not None:
+            result["hasMoreNewer"] = from_union([from_bool, from_none], self.has_more_newer)
+        if self.newest_seq is not None:
+            result["newestSeq"] = from_union([from_int, from_none], self.newest_seq)
+        if self.oldest_seq is not None:
+            result["oldestSeq"] = from_union([from_int, from_none], self.oldest_seq)
+        if self.omitted_older is not None:
+            result["omittedOlder"] = from_union([from_int, from_none], self.omitted_older)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -25474,11 +30625,15 @@ class SessionOpenOptions:
     additional_directories: list[str] | None = None
     """Additional directories the agent may access beyond the working directory. Each entry is
     granted to the session's file-access allow-list and surfaced to the model (system prompt
-    context and `@`-mention completion). Absolute paths are recommended; a relative path is
-    resolved against the session's working directory. Nonexistent or unresolvable entries are
-    skipped with a warning. This is applied on both session creation and resume, and is not
-    persisted: a resumed session that omits this option does not retain previously supplied
-    directories (re-supply them, exactly as the CLI re-passes `--add-dir`).
+    context and `@`-mention completion). Conventional `.github/skills/` and `.github/agents/`
+    definitions under each directory also join the session's project catalogs when their
+    existing subsystem gates are enabled: added-root skills require both
+    `enableConfigDiscovery` and effective `enableSkills`; added-root agents require
+    `enableConfigDiscovery`. Supplying a directory therefore activates configuration from it
+    and should be treated as a trust decision. Absolute paths are recommended; a relative
+    path is resolved against the session's working directory. Nonexistent or unresolvable
+    entries are skipped with a warning. This is applied during session creation and cold
+    resume and is not persisted, so a cold resume must re-supply the directories.
     """
     agent_context: str | None = None
     """Runtime context discriminator for agent filtering."""
@@ -25529,13 +30684,17 @@ class SessionOpenOptions:
     disabled_instruction_sources: list[str] | None = None
     """Instruction source IDs disabled for this session."""
 
+    disabled_mcp_servers: list[str] | None = None
+    """MCP server names disabled for this session. Disabled servers are not started or
+    authenticated on create or cold resume.
+    """
     disabled_skills: list[str] | None = None
     """Skill IDs disabled for this session."""
 
     enable_citations: bool | None = None
-    """Experimental: enable native model citations (Anthropic models today), normalized onto the
-    `assistant.message` event. Off by default; may change or be removed while the citations
-    surface is experimental.
+    """Experimental: enable native model citations for supported Anthropic and OpenAI models,
+    normalized onto the `assistant.message` event. Off by default; may change or be removed
+    while the citations surface is experimental.
     """
     enable_file_change_tracking: bool | None = None
     """Opt in to capturing file changes for session rewind and session diff. Capture cannot
@@ -25603,6 +30762,11 @@ class SessionOpenOptions:
     are available, subject to runtime availability and exclusions. Custom agents with the
     same name remain available.
     """
+    included_builtin_skills: list[str] | None = None
+    """Built-in skill names to include in this session. When specified, only these
+    runtime-bundled skills are available. Skills from other sources with the same name remain
+    available.
+    """
     installed_plugins: list[InstalledPlugin] | None = None
     """Installed plugins visible to the session."""
 
@@ -25618,6 +30782,10 @@ class SessionOpenOptions:
     lsp_client_name: str | None = None
     """Identifier sent to LSP-style integrations."""
 
+    managed_settings: SessionManagedSettings | None = None
+    """Permissions-only enterprise policy injected by the SDK host at session create or resume.
+    Composes restrictively with self-fetched and device policy and is not persisted.
+    """
     max_inline_binary_bytes: int | None = None
     """Maximum decoded byte size of a single inline model-facing binary tool result persisted in
     session events (default 10 MB).
@@ -25668,6 +30836,11 @@ class SessionOpenOptions:
     sandbox_config: SandboxConfig | None = None
     """Resolved sandbox configuration."""
 
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    sandbox_config_source: _SandboxConfigSource | None = None
+    """Origin of the sandbox choice. The runtime uses this only for internal telemetry
+    provenance; managed policy is derived independently.
+    """
     session_capabilities: list[SessionCapability] | None = None
     """Capabilities enabled for this session."""
 
@@ -25725,6 +30898,7 @@ def from_dict(obj: Any) -> 'SessionOpenOptions':
         detached_from_spawning_parent_engagement_id = from_union([from_str, from_none], obj.get("detachedFromSpawningParentEngagementId"))
         detached_from_spawning_parent_session_id = from_union([from_str, from_none], obj.get("detachedFromSpawningParentSessionId"))
         disabled_instruction_sources = from_union([lambda x: from_list(from_str, x), from_none], obj.get("disabledInstructionSources"))
+        disabled_mcp_servers = from_union([lambda x: from_list(from_str, x), from_none], obj.get("disabledMcpServers"))
         disabled_skills = from_union([lambda x: from_list(from_str, x), from_none], obj.get("disabledSkills"))
         enable_citations = from_union([from_bool, from_none], obj.get("enableCitations"))
         enable_file_change_tracking = from_union([from_bool, from_none], obj.get("enableFileChangeTracking"))
@@ -25740,11 +30914,13 @@ def from_dict(obj: Any) -> 'SessionOpenOptions':
         exp_assignments = obj.get("expAssignments")
         feature_flags = from_union([lambda x: from_dict(from_bool, x), from_none], obj.get("featureFlags"))
         included_builtin_agents = from_union([lambda x: from_list(from_str, x), from_none], obj.get("includedBuiltinAgents"))
+        included_builtin_skills = from_union([lambda x: from_list(from_str, x), from_none], obj.get("includedBuiltinSkills"))
         installed_plugins = from_union([lambda x: from_list(InstalledPlugin.from_dict, x), from_none], obj.get("installedPlugins"))
         integration_id = from_union([from_str, from_none], obj.get("integrationId"))
         is_experimental_mode = from_union([from_bool, from_none], obj.get("isExperimentalMode"))
         log_interactive_shells = from_union([from_bool, from_none], obj.get("logInteractiveShells"))
         lsp_client_name = from_union([from_str, from_none], obj.get("lspClientName"))
+        managed_settings = from_union([SessionManagedSettings.from_dict, from_none], obj.get("managedSettings"))
         max_inline_binary_bytes = from_union([from_int, from_none], obj.get("maxInlineBinaryBytes"))
         memory = from_union([MemoryConfiguration.from_dict, from_none], obj.get("memory"))
         model = from_union([from_str, from_none], obj.get("model"))
@@ -25760,6 +30936,7 @@ def from_dict(obj: Any) -> 'SessionOpenOptions':
         remote_steerable = from_union([from_bool, from_none], obj.get("remoteSteerable"))
         running_in_interactive_mode = from_union([from_bool, from_none], obj.get("runningInInteractiveMode"))
         sandbox_config = from_union([SandboxConfig.from_dict, from_none], obj.get("sandboxConfig"))
+        sandbox_config_source = from_union([_SandboxConfigSource, from_none], obj.get("sandboxConfigSource"))
         session_capabilities = from_union([lambda x: from_list(SessionCapability, x), from_none], obj.get("sessionCapabilities"))
         session_id = from_union([from_str, from_none], obj.get("sessionId"))
         session_limits = from_union([SessionLimitsConfig.from_dict, from_none], obj.get("sessionLimits"))
@@ -25772,7 +30949,7 @@ def from_dict(obj: Any) -> 'SessionOpenOptions':
         verbosity = from_union([Verbosity, from_none], obj.get("verbosity"))
         working_directory = from_union([from_str, from_none], obj.get("workingDirectory"))
         working_directory_context = from_union([SessionContext.from_dict, from_none], obj.get("workingDirectoryContext"))
-        return SessionOpenOptions(additional_content_exclusion_policies, additional_directories, agent_context, allow_all_mcp_server_instructions, ask_user_disabled, auth_info, available_tools, capi, client_kind, client_name, coauthor_enabled, config_dir, continue_on_auto_mode, copilot_url, custom_agents_local_only, detached_from_spawning_parent_engagement_id, detached_from_spawning_parent_session_id, disabled_instruction_sources, disabled_skills, enable_citations, enable_file_change_tracking, enable_managed_settings, enable_on_demand_instruction_discovery, enable_script_safety, enable_streaming, env_value_mode, events_log_directory, events_log_includes_subagents, excluded_builtin_agents, excluded_tools, exp_assignments, feature_flags, included_builtin_agents, installed_plugins, integration_id, is_experimental_mode, log_interactive_shells, lsp_client_name, max_inline_binary_bytes, memory, model, model_capabilities_overrides, models, name, provider, providers, reasoning_effort, reasoning_summary, remote_defaulted_on, remote_exporting, remote_steerable, running_in_interactive_mode, sandbox_config, session_capabilities, session_id, session_limits, shell, shell_init_profile, shell_process_flags, skill_directories, skip_custom_instructions, trajectory_file, verbosity, working_directory, working_directory_context)
+        return SessionOpenOptions(additional_content_exclusion_policies, additional_directories, agent_context, allow_all_mcp_server_instructions, ask_user_disabled, auth_info, available_tools, capi, client_kind, client_name, coauthor_enabled, config_dir, continue_on_auto_mode, copilot_url, custom_agents_local_only, detached_from_spawning_parent_engagement_id, detached_from_spawning_parent_session_id, disabled_instruction_sources, disabled_mcp_servers, disabled_skills, enable_citations, enable_file_change_tracking, enable_managed_settings, enable_on_demand_instruction_discovery, enable_script_safety, enable_streaming, env_value_mode, events_log_directory, events_log_includes_subagents, excluded_builtin_agents, excluded_tools, exp_assignments, feature_flags, included_builtin_agents, included_builtin_skills, installed_plugins, integration_id, is_experimental_mode, log_interactive_shells, lsp_client_name, managed_settings, max_inline_binary_bytes, memory, model, model_capabilities_overrides, models, name, provider, providers, reasoning_effort, reasoning_summary, remote_defaulted_on, remote_exporting, remote_steerable, running_in_interactive_mode, sandbox_config, sandbox_config_source, session_capabilities, session_id, session_limits, shell, shell_init_profile, shell_process_flags, skill_directories, skip_custom_instructions, trajectory_file, verbosity, working_directory, working_directory_context)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -25812,6 +30989,8 @@ def to_dict(self) -> dict:
             result["detachedFromSpawningParentSessionId"] = from_union([from_str, from_none], self.detached_from_spawning_parent_session_id)
         if self.disabled_instruction_sources is not None:
             result["disabledInstructionSources"] = from_union([lambda x: from_list(from_str, x), from_none], self.disabled_instruction_sources)
+        if self.disabled_mcp_servers is not None:
+            result["disabledMcpServers"] = from_union([lambda x: from_list(from_str, x), from_none], self.disabled_mcp_servers)
         if self.disabled_skills is not None:
             result["disabledSkills"] = from_union([lambda x: from_list(from_str, x), from_none], self.disabled_skills)
         if self.enable_citations is not None:
@@ -25842,6 +31021,8 @@ def to_dict(self) -> dict:
             result["featureFlags"] = from_union([lambda x: from_dict(from_bool, x), from_none], self.feature_flags)
         if self.included_builtin_agents is not None:
             result["includedBuiltinAgents"] = from_union([lambda x: from_list(from_str, x), from_none], self.included_builtin_agents)
+        if self.included_builtin_skills is not None:
+            result["includedBuiltinSkills"] = from_union([lambda x: from_list(from_str, x), from_none], self.included_builtin_skills)
         if self.installed_plugins is not None:
             result["installedPlugins"] = from_union([lambda x: from_list(lambda x: to_class(InstalledPlugin, x), x), from_none], self.installed_plugins)
         if self.integration_id is not None:
@@ -25852,6 +31033,8 @@ def to_dict(self) -> dict:
             result["logInteractiveShells"] = from_union([from_bool, from_none], self.log_interactive_shells)
         if self.lsp_client_name is not None:
             result["lspClientName"] = from_union([from_str, from_none], self.lsp_client_name)
+        if self.managed_settings is not None:
+            result["managedSettings"] = from_union([lambda x: to_class(SessionManagedSettings, x), from_none], self.managed_settings)
         if self.max_inline_binary_bytes is not None:
             result["maxInlineBinaryBytes"] = from_union([from_int, from_none], self.max_inline_binary_bytes)
         if self.memory is not None:
@@ -25882,6 +31065,8 @@ def to_dict(self) -> dict:
             result["runningInInteractiveMode"] = from_union([from_bool, from_none], self.running_in_interactive_mode)
         if self.sandbox_config is not None:
             result["sandboxConfig"] = from_union([lambda x: to_class(SandboxConfig, x), from_none], self.sandbox_config)
+        if self.sandbox_config_source is not None:
+            result["sandboxConfigSource"] = from_union([lambda x: to_enum(_SandboxConfigSource, x), from_none], self.sandbox_config_source)
         if self.session_capabilities is not None:
             result["sessionCapabilities"] = from_union([lambda x: from_list(lambda x: to_enum(SessionCapability, x), x), from_none], self.session_capabilities)
         if self.session_id is not None:
@@ -26014,6 +31199,11 @@ class SessionUpdateOptionsParams:
     are available, subject to runtime availability and exclusions. Custom agents with the
     same name remain available. Set to null to remove the allowlist restriction.
     """
+    included_builtin_skills: list[str] | None = None
+    """Built-in skill names to include in this session. When specified, only these
+    runtime-bundled skills are available. Skills from other sources with the same name remain
+    available. Set to null to remove the allowlist restriction.
+    """
     installed_plugins: list[SessionInstalledPlugin] | None = None
     """Full set of installed plugins for the session. Replaces the existing list; the runtime
     invalidates the skills cache only when the list materially changes.
@@ -26067,6 +31257,11 @@ class SessionUpdateOptionsParams:
     sandbox_config: SandboxConfig | None = None
     """Resolved sandbox configuration."""
 
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    sandbox_config_source: _SandboxConfigSource | None = None
+    """Origin of the sandbox choice. The runtime uses this only for internal telemetry
+    provenance; managed policy is derived independently.
+    """
     session_capabilities: list[SessionCapability] | None = None
     """Replaces the session's capability set with the given list. Use to enable or disable
     capabilities mid-session (e.g., remove `memory` for reproducible scripted runs). Omit the
@@ -26143,6 +31338,7 @@ def from_dict(obj: Any) -> 'SessionUpdateOptionsParams':
         excluded_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("excludedTools"))
         feature_flags = from_union([lambda x: from_dict(from_bool, x), from_none], obj.get("featureFlags"))
         included_builtin_agents = from_union([lambda x: from_list(from_str, x), from_none], obj.get("includedBuiltinAgents"))
+        included_builtin_skills = from_union([lambda x: from_list(from_str, x), from_none], obj.get("includedBuiltinSkills"))
         installed_plugins = from_union([lambda x: from_list(SessionInstalledPlugin.from_dict, x), from_none], obj.get("installedPlugins"))
         integration_id = from_union([from_str, from_none], obj.get("integrationId"))
         is_experimental_mode = from_union([from_bool, from_none], obj.get("isExperimentalMode"))
@@ -26158,6 +31354,7 @@ def from_dict(obj: Any) -> 'SessionUpdateOptionsParams':
         reasoning_summary = from_union([ReasoningSummary, from_none], obj.get("reasoningSummary"))
         running_in_interactive_mode = from_union([from_bool, from_none], obj.get("runningInInteractiveMode"))
         sandbox_config = from_union([SandboxConfig.from_dict, from_none], obj.get("sandboxConfig"))
+        sandbox_config_source = from_union([_SandboxConfigSource, from_none], obj.get("sandboxConfigSource"))
         session_capabilities = from_union([lambda x: from_list(SessionCapability, x), from_none], obj.get("sessionCapabilities"))
         session_limits = from_union([SessionLimitsConfig.from_dict, from_none], obj.get("sessionLimits"))
         shell = from_union([ShellOptions.from_dict, from_none], obj.get("shell"))
@@ -26171,7 +31368,7 @@ def from_dict(obj: Any) -> 'SessionUpdateOptionsParams':
         trajectory_file = from_union([from_str, from_none], obj.get("trajectoryFile"))
         verbosity = from_union([Verbosity, from_none], obj.get("verbosity"))
         working_directory = from_union([from_str, from_none], obj.get("workingDirectory"))
-        return SessionUpdateOptionsParams(additional_content_exclusion_policies, agent_context, allow_all_mcp_server_instructions, ask_user_disabled, available_tools, capi, client_name, coauthor_enabled, context_tier, continue_on_auto_mode, copilot_url, custom_agents_local_only, disabled_instruction_sources, disabled_skills, enable_file_hooks, enable_host_git_operations, enable_on_demand_instruction_discovery, enable_reasoning_summaries, enable_script_safety, enable_session_store, enable_skills, enable_streaming, env_value_mode, events_log_directory, events_log_includes_subagents, excluded_builtin_agents, excluded_tools, feature_flags, included_builtin_agents, installed_plugins, integration_id, is_experimental_mode, log_interactive_shells, lsp_client_name, manage_schedule_enabled, max_inline_binary_bytes, model, model_capabilities_overrides, organization_custom_instructions, provider, reasoning_effort, reasoning_summary, running_in_interactive_mode, sandbox_config, session_capabilities, session_limits, shell, shell_init_profile, shell_process_flags, skill_directories, skip_custom_instructions, skip_embedding_retrieval, suppress_custom_agent_prompt, tool_filter_precedence, trajectory_file, verbosity, working_directory)
+        return SessionUpdateOptionsParams(additional_content_exclusion_policies, agent_context, allow_all_mcp_server_instructions, ask_user_disabled, available_tools, capi, client_name, coauthor_enabled, context_tier, continue_on_auto_mode, copilot_url, custom_agents_local_only, disabled_instruction_sources, disabled_skills, enable_file_hooks, enable_host_git_operations, enable_on_demand_instruction_discovery, enable_reasoning_summaries, enable_script_safety, enable_session_store, enable_skills, enable_streaming, env_value_mode, events_log_directory, events_log_includes_subagents, excluded_builtin_agents, excluded_tools, feature_flags, included_builtin_agents, included_builtin_skills, installed_plugins, integration_id, is_experimental_mode, log_interactive_shells, lsp_client_name, manage_schedule_enabled, max_inline_binary_bytes, model, model_capabilities_overrides, organization_custom_instructions, provider, reasoning_effort, reasoning_summary, running_in_interactive_mode, sandbox_config, sandbox_config_source, session_capabilities, session_limits, shell, shell_init_profile, shell_process_flags, skill_directories, skip_custom_instructions, skip_embedding_retrieval, suppress_custom_agent_prompt, tool_filter_precedence, trajectory_file, verbosity, working_directory)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -26233,6 +31430,8 @@ def to_dict(self) -> dict:
             result["featureFlags"] = from_union([lambda x: from_dict(from_bool, x), from_none], self.feature_flags)
         if self.included_builtin_agents is not None:
             result["includedBuiltinAgents"] = from_union([lambda x: from_list(from_str, x), from_none], self.included_builtin_agents)
+        if self.included_builtin_skills is not None:
+            result["includedBuiltinSkills"] = from_union([lambda x: from_list(from_str, x), from_none], self.included_builtin_skills)
         if self.installed_plugins is not None:
             result["installedPlugins"] = from_union([lambda x: from_list(lambda x: to_class(SessionInstalledPlugin, x), x), from_none], self.installed_plugins)
         if self.integration_id is not None:
@@ -26263,6 +31462,8 @@ def to_dict(self) -> dict:
             result["runningInInteractiveMode"] = from_union([from_bool, from_none], self.running_in_interactive_mode)
         if self.sandbox_config is not None:
             result["sandboxConfig"] = from_union([lambda x: to_class(SandboxConfig, x), from_none], self.sandbox_config)
+        if self.sandbox_config_source is not None:
+            result["sandboxConfigSource"] = from_union([lambda x: to_enum(_SandboxConfigSource, x), from_none], self.sandbox_config_source)
         if self.session_capabilities is not None:
             result["sessionCapabilities"] = from_union([lambda x: from_list(lambda x: to_enum(SessionCapability, x), x), from_none], self.session_capabilities)
         if self.session_limits is not None:
@@ -26302,37 +31503,35 @@ class UIElicitationRequest:
     requested_schema: UIElicitationSchema
     """JSON Schema describing the form fields to present to the user"""
 
+    meta: dict[str, Any] | None = None
+    """MCP request metadata."""
+
+    mode: MCPElicitationFormMode | None = None
+    """Elicitation mode. Omitted and form are equivalent for structured elicitation."""
+
+    task: MCPTaskMetadata | None = None
+    """MCP task metadata."""
+
     @staticmethod
     def from_dict(obj: Any) -> 'UIElicitationRequest':
         assert isinstance(obj, dict)
         message = from_str(obj.get("message"))
         requested_schema = UIElicitationSchema.from_dict(obj.get("requestedSchema"))
-        return UIElicitationRequest(message, requested_schema)
+        meta = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("_meta"))
+        mode = from_union([MCPElicitationFormMode, from_none], obj.get("mode"))
+        task = from_union([MCPTaskMetadata.from_dict, from_none], obj.get("task"))
+        return UIElicitationRequest(message, requested_schema, meta, mode, task)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["message"] = from_str(self.message)
         result["requestedSchema"] = to_class(UIElicitationSchema, self.requested_schema)
-        return result
-
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class BuiltInModelCatalog:
-    """The running runtime's complete catalog of well-known built-in model IDs, including
-    supported models and additional IDs with built-in metadata.
-    """
-    models: list[BuiltInModelCatalogEntry]
-    """Built-in model entries."""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'BuiltInModelCatalog':
-        assert isinstance(obj, dict)
-        models = from_list(BuiltInModelCatalogEntry.from_dict, obj.get("models"))
-        return BuiltInModelCatalog(models)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["models"] = from_list(lambda x: to_class(BuiltInModelCatalogEntry, x), self.models)
+        if self.meta is not None:
+            result["_meta"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.meta)
+        if self.mode is not None:
+            result["mode"] = from_union([lambda x: to_enum(MCPElicitationFormMode, x), from_none], self.mode)
+        if self.task is not None:
+            result["task"] = from_union([lambda x: to_class(MCPTaskMetadata, x), from_none], self.task)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -26483,6 +31682,10 @@ class CopilotUserResponse:
     """Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
     GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
     verbatim and does not re-fetch when set.
+
+    Snapshot of the authenticated user's Copilot subscription info, if known.
+
+    Snapshot of the authenticated user's Copilot subscription info, if known
     """
     access_type_sku: str | None = None
     """Copilot access SKU identifier (e.g. `free_limited_copilot`,
@@ -26878,8 +32081,8 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class APIKeyAuthInfo:
-    """Authentication-info variant for API-key authentication to a non-GitHub LLM provider,
-    carrying the secret `apiKey` and host.
+    """Authentication-info input variant for API-key authentication to a non-GitHub LLM
+    provider, carrying the secret `apiKey` and host.
     """
     api_key: str
     """The API key. Treat as a secret."""
@@ -26913,6 +32116,120 @@ def to_dict(self) -> dict:
             result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class AuthIdentity:
+    """Credential-free authentication identity safe to expose to hosts and user interfaces."""
+
+    host: str
+    """Authentication host"""
+
+    type: AuthInfoType
+    """Authentication type"""
+
+    copilot_user: CopilotUserResponse | None = None
+    """Snapshot of the authenticated user's Copilot subscription info, if known"""
+
+    env_var: str | None = None
+    """Name of the environment variable that supplied the credential, when applicable"""
+
+    login: str | None = None
+    """Authenticated login, when available"""
+
+    registration_id: str | None = None
+    """Opaque SDK GitHub credential registration backing this identity. Routing metadata only;
+    never a credential.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AuthIdentity':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        type = AuthInfoType(obj.get("type"))
+        copilot_user = from_union([CopilotUserResponse.from_dict, from_none], obj.get("copilotUser"))
+        env_var = from_union([from_str, from_none], obj.get("envVar"))
+        login = from_union([from_str, from_none], obj.get("login"))
+        registration_id = from_union([from_str, from_none], obj.get("registrationId"))
+        return AuthIdentity(host, type, copilot_user, env_var, login, registration_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["type"] = to_enum(AuthInfoType, self.type)
+        if self.copilot_user is not None:
+            result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
+        if self.env_var is not None:
+            result["envVar"] = from_union([from_str, from_none], self.env_var)
+        if self.login is not None:
+            result["login"] = from_union([from_str, from_none], self.login)
+        if self.registration_id is not None:
+            result["registrationId"] = from_union([from_str, from_none], self.registration_id)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class BuiltinToolDescriptor:
+    """Rust-owned metadata and input schema for a built-in tool."""
+
+    description: str
+    """Model-facing description of the tool's behavior."""
+
+    has_summarise_intention: bool
+    """Whether the tool provides a specialized intention summary."""
+
+    is_terminal: bool
+    """Whether the tool executes commands in a terminal."""
+
+    name: str
+    """Stable name used to invoke the built-in tool."""
+
+    safe_for_telemetry: bool | BuiltinToolSafeTelemetryFields
+    """Policy describing which tool metadata may be recorded without obfuscation."""
+
+    format: BuiltinToolFormat | None = None
+    """Optional custom input format used instead of a JSON Schema."""
+
+    input_schema: BuiltinToolInputSchema | None = None
+    """JSON Schema for the tool input, or null when the tool uses a custom format."""
+
+    instructions: str | None = None
+    """Optional supplemental usage instructions for the tool."""
+
+    title: str | None = None
+    """Optional human-readable title for the tool."""
+
+    type: str | None = None
+    """Optional tool category discriminator."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'BuiltinToolDescriptor':
+        assert isinstance(obj, dict)
+        description = from_str(obj.get("description"))
+        has_summarise_intention = from_bool(obj.get("hasSummariseIntention"))
+        is_terminal = from_bool(obj.get("isTerminal"))
+        name = from_str(obj.get("name"))
+        safe_for_telemetry = from_union([from_bool, BuiltinToolSafeTelemetryFields.from_dict], obj.get("safeForTelemetry"))
+        format = from_union([BuiltinToolFormat.from_dict, from_none], obj.get("format"))
+        input_schema = from_union([BuiltinToolInputSchema.from_dict, from_none], obj.get("inputSchema"))
+        instructions = from_union([from_none, from_str], obj.get("instructions"))
+        title = from_union([from_none, from_str], obj.get("title"))
+        type = from_union([from_none, from_str], obj.get("type"))
+        return BuiltinToolDescriptor(description, has_summarise_intention, is_terminal, name, safe_for_telemetry, format, input_schema, instructions, title, type)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["description"] = from_str(self.description)
+        result["hasSummariseIntention"] = from_bool(self.has_summarise_intention)
+        result["isTerminal"] = from_bool(self.is_terminal)
+        result["name"] = from_str(self.name)
+        result["safeForTelemetry"] = from_union([from_bool, lambda x: to_class(BuiltinToolSafeTelemetryFields, x)], self.safe_for_telemetry)
+        result["format"] = from_union([lambda x: to_class(BuiltinToolFormat, x), from_none], self.format)
+        result["inputSchema"] = from_union([lambda x: to_class(BuiltinToolInputSchema, x), from_none], self.input_schema)
+        result["instructions"] = from_union([from_none, from_str], self.instructions)
+        result["title"] = from_union([from_none, from_str], self.title)
+        result["type"] = from_union([from_none, from_str], self.type)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CopilotAPITokenAuthInfo:
@@ -27005,8 +32322,8 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class EnvAuthInfo:
-    """Authentication-info variant for a token sourced from an environment variable, with host,
-    optional login, token, and env var name.
+    """Authentication-info input variant for a token sourced from an environment variable, with
+    host, optional login, token, and env var name.
     """
     env_var: str
     """Name of the environment variable the token was sourced from."""
@@ -27053,11 +32370,225 @@ def to_dict(self) -> dict:
             result["login"] = from_union([from_str, from_none], self.login)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class FactoryAgentSummary:
+    """Prompt-safe durable identity and live status for a direct factory agent."""
+
+    active_ms: int
+    """Accumulated active agent time in milliseconds."""
+
+    agent_id: str
+    """Stable direct-agent identifier."""
+
+    agent_type: str
+    """Registered agent type."""
+
+    label: str
+    """Friendly, non-unique name intended for display"""
+
+    run_id: str
+    """Owning factory run identifier."""
+
+    status: str
+    """Current durable or live agent status."""
+
+    tool_call_id: str
+    """Tool-call identifier that launched the agent."""
+
+    activity: str | None = None
+    """Prompt-safe live activity text."""
+
+    completed_at: int | None = None
+    """Epoch milliseconds when the agent completed."""
+
+    display_name: str | None = None
+    """Friendly, non-unique name intended for display"""
+
+    phase_id: str | None = None
+    """Phase identifier active when the agent was launched, or null."""
+
+    requested_model: str | None = None
+    """Model requested when the agent was launched."""
+
+    resolved_model: str | None = None
+    """Concrete model resolved for the agent."""
+
+    started_at: int | None = None
+    """Epoch milliseconds when the agent started."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'FactoryAgentSummary':
+        assert isinstance(obj, dict)
+        active_ms = from_int(obj.get("activeMs"))
+        agent_id = from_str(obj.get("agentId"))
+        agent_type = from_str(obj.get("agentType"))
+        label = from_str(obj.get("label"))
+        run_id = from_str(obj.get("runId"))
+        status = from_str(obj.get("status"))
+        tool_call_id = from_str(obj.get("toolCallId"))
+        activity = from_union([from_str, from_none], obj.get("activity"))
+        completed_at = from_union([from_int, from_none], obj.get("completedAt"))
+        display_name = from_union([from_str, from_none], obj.get("displayName"))
+        phase_id = from_union([from_none, from_str], obj.get("phaseId"))
+        requested_model = from_union([from_str, from_none], obj.get("requestedModel"))
+        resolved_model = from_union([from_str, from_none], obj.get("resolvedModel"))
+        started_at = from_union([from_int, from_none], obj.get("startedAt"))
+        return FactoryAgentSummary(active_ms, agent_id, agent_type, label, run_id, status, tool_call_id, activity, completed_at, display_name, phase_id, requested_model, resolved_model, started_at)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["activeMs"] = from_int(self.active_ms)
+        result["agentId"] = from_str(self.agent_id)
+        result["agentType"] = from_str(self.agent_type)
+        result["label"] = from_str(self.label)
+        result["runId"] = from_str(self.run_id)
+        result["status"] = from_str(self.status)
+        result["toolCallId"] = from_str(self.tool_call_id)
+        if self.activity is not None:
+            result["activity"] = from_union([from_str, from_none], self.activity)
+        if self.completed_at is not None:
+            result["completedAt"] = from_union([from_int, from_none], self.completed_at)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_str, from_none], self.display_name)
+        result["phaseId"] = from_union([from_none, from_str], self.phase_id)
+        if self.requested_model is not None:
+            result["requestedModel"] = from_union([from_str, from_none], self.requested_model)
+        if self.resolved_model is not None:
+            result["resolvedModel"] = from_union([from_str, from_none], self.resolved_model)
+        if self.started_at is not None:
+            result["startedAt"] = from_union([from_int, from_none], self.started_at)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class FactoryRunDetail:
+    """Full factory run observability detail."""
+
+    agents: list[FactoryAgentSummary]
+    """Durable identities and live statuses for direct factory agents."""
+
+    consumed: FactoryRunConsumed
+    """Durable resource consumption."""
+
+    created_at: int
+    """Epoch milliseconds when the run was created."""
+
+    declared_limits: FactoryDeclaredLimits
+    """Resource ceilings declared by the factory."""
+
+    declared_phase_count: int
+    """Number of phases declared by the factory."""
+
+    description: str
+    """Human-readable factory description."""
+
+    factory_name: str
+    """Registered factory name."""
+
+    live_agent_count: int
+    """Number of direct factory agents currently live."""
+
+    observed_at: int
+    """Epoch milliseconds when this live-overlay snapshot was observed."""
+
+    phases: list[FactoryPhaseObservation]
+    """Lifecycle and timing observations for each factory phase."""
+
+    progress: FactoryProgressPage
+    """Bidirectional page of durable factory progress."""
+
+    revision: int
+    """Monotonic durable run revision."""
+
+    run_id: str
+    """Factory run identifier."""
+
+    status: FactoryRunStatus
+    """Current factory run status."""
+
+    total_spawned_agent_count: int
+    """Total direct factory agents spawned across all attempts."""
+
+    updated_at: int
+    """Epoch milliseconds when the durable run was last updated."""
+
+    active_segment_started_at: int | None = None
+    """Epoch milliseconds when the current active segment started, or null while inactive."""
+
+    approved: FactoryDeclaredLimits | None = None
+    """Approved effective resource ceilings, or null until approved."""
+
+    completed_at: int | None = None
+    """Epoch milliseconds when the run completed, or null while nonterminal."""
+
+    current_phase: FactoryCurrentPhase | None = None
+    """Current phase identity, or null before any phase is entered."""
+
+    started_at: int | None = None
+    """Epoch milliseconds when execution first started, or null before start."""
+
+    terminal: FactoryRunTerminal | None = None
+    """Terminal run outcome, or null while nonterminal."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'FactoryRunDetail':
+        assert isinstance(obj, dict)
+        agents = from_list(FactoryAgentSummary.from_dict, obj.get("agents"))
+        consumed = FactoryRunConsumed.from_dict(obj.get("consumed"))
+        created_at = from_int(obj.get("createdAt"))
+        declared_limits = FactoryDeclaredLimits.from_dict(obj.get("declaredLimits"))
+        declared_phase_count = from_int(obj.get("declaredPhaseCount"))
+        description = from_str(obj.get("description"))
+        factory_name = from_str(obj.get("factoryName"))
+        live_agent_count = from_int(obj.get("liveAgentCount"))
+        observed_at = from_int(obj.get("observedAt"))
+        phases = from_list(FactoryPhaseObservation.from_dict, obj.get("phases"))
+        progress = FactoryProgressPage.from_dict(obj.get("progress"))
+        revision = from_int(obj.get("revision"))
+        run_id = from_str(obj.get("runId"))
+        status = FactoryRunStatus(obj.get("status"))
+        total_spawned_agent_count = from_int(obj.get("totalSpawnedAgentCount"))
+        updated_at = from_int(obj.get("updatedAt"))
+        active_segment_started_at = from_union([from_int, from_none], obj.get("activeSegmentStartedAt"))
+        approved = from_union([FactoryDeclaredLimits.from_dict, from_none], obj.get("approved"))
+        completed_at = from_union([from_int, from_none], obj.get("completedAt"))
+        current_phase = from_union([FactoryCurrentPhase.from_dict, from_none], obj.get("currentPhase"))
+        started_at = from_union([from_int, from_none], obj.get("startedAt"))
+        terminal = from_union([FactoryRunTerminal.from_dict, from_none], obj.get("terminal"))
+        return FactoryRunDetail(agents, consumed, created_at, declared_limits, declared_phase_count, description, factory_name, live_agent_count, observed_at, phases, progress, revision, run_id, status, total_spawned_agent_count, updated_at, active_segment_started_at, approved, completed_at, current_phase, started_at, terminal)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["agents"] = from_list(lambda x: to_class(FactoryAgentSummary, x), self.agents)
+        result["consumed"] = to_class(FactoryRunConsumed, self.consumed)
+        result["createdAt"] = from_int(self.created_at)
+        result["declaredLimits"] = to_class(FactoryDeclaredLimits, self.declared_limits)
+        result["declaredPhaseCount"] = from_int(self.declared_phase_count)
+        result["description"] = from_str(self.description)
+        result["factoryName"] = from_str(self.factory_name)
+        result["liveAgentCount"] = from_int(self.live_agent_count)
+        result["observedAt"] = from_int(self.observed_at)
+        result["phases"] = from_list(lambda x: to_class(FactoryPhaseObservation, x), self.phases)
+        result["progress"] = to_class(FactoryProgressPage, self.progress)
+        result["revision"] = from_int(self.revision)
+        result["runId"] = from_str(self.run_id)
+        result["status"] = to_enum(FactoryRunStatus, self.status)
+        result["totalSpawnedAgentCount"] = from_int(self.total_spawned_agent_count)
+        result["updatedAt"] = from_int(self.updated_at)
+        result["activeSegmentStartedAt"] = from_union([from_int, from_none], self.active_segment_started_at)
+        result["approved"] = from_union([lambda x: to_class(FactoryDeclaredLimits, x), from_none], self.approved)
+        result["completedAt"] = from_union([from_int, from_none], self.completed_at)
+        result["currentPhase"] = from_union([lambda x: to_class(FactoryCurrentPhase, x), from_none], self.current_phase)
+        result["startedAt"] = from_union([from_int, from_none], self.started_at)
+        result["terminal"] = from_union([lambda x: to_class(FactoryRunTerminal, x), from_none], self.terminal)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class GhCLIAuthInfo:
-    """Authentication-info variant for GitHub CLI credentials, carrying host, login, and the `gh
-    auth token` value.
+    """Authentication-info input variant for GitHub CLI credentials, carrying host, login, and
+    the `gh auth token` value.
     """
     host: str
     """Authentication host."""
@@ -27211,8 +32742,8 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HMACAuthInfo:
-    """Authentication-info variant for GitHub-internal HMAC auth, carrying the public GitHub
-    host and HMAC secret.
+    """Authentication-info input variant for GitHub-internal HMAC auth, carrying the public
+    GitHub host and HMAC secret.
     """
     hmac: str
     """HMAC secret used to sign requests."""
@@ -27286,6 +32817,58 @@ def to_dict(self) -> dict:
         result["serverName"] = from_str(self.server_name)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPOauthProbeResult:
+    """Passive MCP OAuth probe result. `authenticated` means the server accepted the probe
+    request while an OAuth-origin access token was attached; it does not prove the server
+    required or independently validated that token. The probe does not make a second
+    unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are
+    reserved for API-call failures.
+    """
+    status: Status
+    """Probe outcome variant discriminator."""
+
+    http_response: ExternalRefMCPOauthHTTPResponse | None = None
+    """HTTP response returned by the server.
+
+    HTTP 401 or 403 response returned by the server.
+
+    HTTP response returned by the server, when the probe reached the server and captured the
+    complete response.
+    """
+    reason: MCPOauthProbeNeedsAuthReason | None = None
+    """Why authentication is needed."""
+
+    www_authenticate_params: McpOauthWWWAuthenticateParams | None = None
+    """Parsed WWW-Authenticate challenge parameters, when present and parseable."""
+
+    error: str | None = None
+    """Human-readable probe failure detail."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPOauthProbeResult':
+        assert isinstance(obj, dict)
+        status = Status(obj.get("status"))
+        http_response = from_union([ExternalRefMCPOauthHTTPResponse.from_dict, from_none], obj.get("httpResponse"))
+        reason = from_union([MCPOauthProbeNeedsAuthReason, from_none], obj.get("reason"))
+        www_authenticate_params = from_union([McpOauthWWWAuthenticateParams.from_dict, from_none], obj.get("wwwAuthenticateParams"))
+        error = from_union([from_str, from_none], obj.get("error"))
+        return MCPOauthProbeResult(status, http_response, reason, www_authenticate_params, error)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["status"] = to_enum(Status, self.status)
+        if self.http_response is not None:
+            result["httpResponse"] = from_union([lambda x: to_class(ExternalRefMCPOauthHTTPResponse, x), from_none], self.http_response)
+        if self.reason is not None:
+            result["reason"] = from_union([lambda x: to_enum(MCPOauthProbeNeedsAuthReason, x), from_none], self.reason)
+        if self.www_authenticate_params is not None:
+            result["wwwAuthenticateParams"] = from_union([lambda x: to_class(McpOauthWWWAuthenticateParams, x), from_none], self.www_authenticate_params)
+        if self.error is not None:
+            result["error"] = from_union([from_str, from_none], self.error)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 # Internal: this type is an internal SDK API and is not part of the public surface.
 @dataclass
@@ -27325,6 +32908,304 @@ def to_dict(self) -> dict:
         result["transport"] = self.transport
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPServerConfig:
+    """MCP server configuration (stdio, remote HTTP/SSE, or in-process)
+
+    Stdio MCP server configuration launched as a child process.
+
+    Remote MCP server configuration accessed over HTTP or SSE.
+
+    In-process MCP server configuration used by embedded SDK clients.
+    """
+    args: list[str] | None = None
+    """Command-line arguments passed to the Stdio MCP server process."""
+
+    auth: bool | MCPServerAuthConfigRedirectPort | None = None
+    """Set to `true` to use defaults, or provide an object with additional auth or OIDC settings."""
+
+    command: str | None = None
+    """Executable command used to start the Stdio MCP server process."""
+
+    config_warnings: list[str] | None = None
+    """Configuration warnings recorded while loading the server."""
+
+    cwd: str | None = None
+    """Working directory for the Stdio MCP server process."""
+
+    defer_tools: MCPServerConfigDeferTools | None = None
+    """Controls if tools provided by this server can be loaded on demand via tool search (auto)
+    or always included in the initial tool list (never)
+
+    Controls whether tools can be loaded on demand.
+    """
+    disable_secret_masking: bool | None = None
+    """Whether secret masking is disabled for calls to this server."""
+
+    disable_tool_cache: bool | None = None
+    """Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery
+    is unaffected.
+
+    Whether persisted tool snapshots are disabled.
+    """
+    display_name: str | None = None
+    """Optional human-readable server name."""
+
+    env: dict[str, str] | None = None
+    """Environment variables to pass to the Stdio MCP server process."""
+
+    events: list[str] | None = None
+    """Event types this server receives as Copilot notifications."""
+
+    exclude_tools: list[str] | None = None
+    """Tool names excluded after the include filter is applied."""
+
+    filter_mapping: dict[str, ContentFilterMode] | ContentFilterMode | None = None
+    """Content filtering mode to apply to all tools, or a map of tool name to content filtering
+    mode.
+
+    Content filtering mode to apply to this server's tools.
+    """
+    is_default_server: bool | None = None
+    """Whether this server is a built-in fallback used when the user has not configured their
+    own server.
+
+    Whether this server is a built-in fallback.
+    """
+    notifications: list[str] | None = None
+    """Copilot notification types this server may send to the host."""
+
+    oidc: bool | MCPServerAuthConfigRedirectPort | None = None
+    """Set to `true` to use defaults, or provide an object with additional auth or OIDC
+    settings.
+
+    Set to `true` to use default OIDC settings.
+    """
+    safe_for_telemetry: bool | MCPSafeForTelemetryFields | None = None
+    """Telemetry-obfuscation policy for this server's tools."""
+
+    source: McpServerSource | None = None
+    """The origin of this server configuration."""
+
+    source_path: str | None = None
+    """Source file path recorded while loading the config."""
+
+    source_plugin: str | None = None
+    """Plugin that provided this server."""
+
+    source_plugin_spec: bool | None = None
+    """Whether the providing plugin uses the Open Plugin Spec."""
+
+    source_plugin_version: str | None = None
+    """Version of the plugin that provided this server."""
+
+    timeout: int | None = None
+    """Timeout in milliseconds for tool discovery and tool calls."""
+
+    tools: list[str] | None = None
+    """Tools to include. Defaults to all tools if not specified."""
+
+    type: MCPServerConfigType | None = None
+    """Local transport type. Defaults to stdio when omitted.
+
+    Remote transport type. Defaults to "http" when omitted.
+    """
+    headers: dict[str, str] | None = None
+    """HTTP headers to include in requests to the remote MCP server."""
+
+    headers_refresh_ttl_ms: int | None = None
+    """Dynamic-header refresh cache lifetime in milliseconds."""
+
+    oauth_client_id: str | None = None
+    """OAuth client ID for a pre-registered remote MCP OAuth client."""
+
+    oauth_grant_type: MCPGrantType | None = None
+    """OAuth grant type to use when authenticating to the remote MCP server."""
+
+    oauth_public_client: bool | None = None
+    """Whether the configured OAuth client is public and does not require a client secret."""
+
+    url: str | None = None
+    """URL of the remote MCP server endpoint."""
+
+    server_instance: Any = None
+    """In-process MCP server instance. This value cannot cross a JSON-RPC boundary."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPServerConfig':
+        assert isinstance(obj, dict)
+        args = from_union([lambda x: from_list(from_str, x), from_none], obj.get("args"))
+        auth = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("auth"))
+        command = from_union([from_str, from_none], obj.get("command"))
+        config_warnings = from_union([lambda x: from_list(from_str, x), from_none], obj.get("configWarnings"))
+        cwd = from_union([from_str, from_none], obj.get("cwd"))
+        defer_tools = from_union([MCPServerConfigDeferTools, from_none], obj.get("deferTools"))
+        disable_secret_masking = from_union([from_bool, from_none], obj.get("disableSecretMasking"))
+        disable_tool_cache = from_union([from_bool, from_none], obj.get("disableToolCache"))
+        display_name = from_union([from_str, from_none], obj.get("displayName"))
+        env = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("env"))
+        events = from_union([lambda x: from_list(from_str, x), from_none], obj.get("events"))
+        exclude_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("excludeTools"))
+        filter_mapping = from_union([lambda x: from_dict(ContentFilterMode, x), ContentFilterMode, from_none], obj.get("filterMapping"))
+        is_default_server = from_union([from_bool, from_none], obj.get("isDefaultServer"))
+        notifications = from_union([lambda x: from_list(from_str, x), from_none], obj.get("notifications"))
+        oidc = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("oidc"))
+        safe_for_telemetry = from_union([from_bool, MCPSafeForTelemetryFields.from_dict, from_none], obj.get("safeForTelemetry"))
+        source = from_union([McpServerSource, from_none], obj.get("source"))
+        source_path = from_union([from_str, from_none], obj.get("sourcePath"))
+        source_plugin = from_union([from_str, from_none], obj.get("sourcePlugin"))
+        source_plugin_spec = from_union([from_bool, from_none], obj.get("sourcePluginSpec"))
+        source_plugin_version = from_union([from_str, from_none], obj.get("sourcePluginVersion"))
+        timeout = from_union([from_int, from_none], obj.get("timeout"))
+        tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("tools"))
+        type = from_union([MCPServerConfigType, from_none], obj.get("type"))
+        headers = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("headers"))
+        headers_refresh_ttl_ms = from_union([from_int, from_none], obj.get("headersRefreshTtlMs"))
+        oauth_client_id = from_union([from_str, from_none], obj.get("oauthClientId"))
+        oauth_grant_type = from_union([MCPGrantType, from_none], obj.get("oauthGrantType"))
+        oauth_public_client = from_union([from_bool, from_none], obj.get("oauthPublicClient"))
+        url = from_union([from_str, from_none], obj.get("url"))
+        server_instance = obj.get("serverInstance")
+        return MCPServerConfig(args, auth, command, config_warnings, cwd, defer_tools, disable_secret_masking, disable_tool_cache, display_name, env, events, exclude_tools, filter_mapping, is_default_server, notifications, oidc, safe_for_telemetry, source, source_path, source_plugin, source_plugin_spec, source_plugin_version, timeout, tools, type, headers, headers_refresh_ttl_ms, oauth_client_id, oauth_grant_type, oauth_public_client, url, server_instance)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.args is not None:
+            result["args"] = from_union([lambda x: from_list(from_str, x), from_none], self.args)
+        if self.auth is not None:
+            result["auth"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.auth)
+        if self.command is not None:
+            result["command"] = from_union([from_str, from_none], self.command)
+        if self.config_warnings is not None:
+            result["configWarnings"] = from_union([lambda x: from_list(from_str, x), from_none], self.config_warnings)
+        if self.cwd is not None:
+            result["cwd"] = from_union([from_str, from_none], self.cwd)
+        if self.defer_tools is not None:
+            result["deferTools"] = from_union([lambda x: to_enum(MCPServerConfigDeferTools, x), from_none], self.defer_tools)
+        if self.disable_secret_masking is not None:
+            result["disableSecretMasking"] = from_union([from_bool, from_none], self.disable_secret_masking)
+        if self.disable_tool_cache is not None:
+            result["disableToolCache"] = from_union([from_bool, from_none], self.disable_tool_cache)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_str, from_none], self.display_name)
+        if self.env is not None:
+            result["env"] = from_union([lambda x: from_dict(from_str, x), from_none], self.env)
+        if self.events is not None:
+            result["events"] = from_union([lambda x: from_list(from_str, x), from_none], self.events)
+        if self.exclude_tools is not None:
+            result["excludeTools"] = from_union([lambda x: from_list(from_str, x), from_none], self.exclude_tools)
+        if self.filter_mapping is not None:
+            result["filterMapping"] = from_union([lambda x: from_dict(lambda x: to_enum(ContentFilterMode, x), x), lambda x: to_enum(ContentFilterMode, x), from_none], self.filter_mapping)
+        if self.is_default_server is not None:
+            result["isDefaultServer"] = from_union([from_bool, from_none], self.is_default_server)
+        if self.notifications is not None:
+            result["notifications"] = from_union([lambda x: from_list(from_str, x), from_none], self.notifications)
+        if self.oidc is not None:
+            result["oidc"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.oidc)
+        if self.safe_for_telemetry is not None:
+            result["safeForTelemetry"] = from_union([from_bool, lambda x: to_class(MCPSafeForTelemetryFields, x), from_none], self.safe_for_telemetry)
+        if self.source is not None:
+            result["source"] = from_union([lambda x: to_enum(McpServerSource, x), from_none], self.source)
+        if self.source_path is not None:
+            result["sourcePath"] = from_union([from_str, from_none], self.source_path)
+        if self.source_plugin is not None:
+            result["sourcePlugin"] = from_union([from_str, from_none], self.source_plugin)
+        if self.source_plugin_spec is not None:
+            result["sourcePluginSpec"] = from_union([from_bool, from_none], self.source_plugin_spec)
+        if self.source_plugin_version is not None:
+            result["sourcePluginVersion"] = from_union([from_str, from_none], self.source_plugin_version)
+        if self.timeout is not None:
+            result["timeout"] = from_union([from_int, from_none], self.timeout)
+        if self.tools is not None:
+            result["tools"] = from_union([lambda x: from_list(from_str, x), from_none], self.tools)
+        if self.type is not None:
+            result["type"] = from_union([lambda x: to_enum(MCPServerConfigType, x), from_none], self.type)
+        if self.headers is not None:
+            result["headers"] = from_union([lambda x: from_dict(from_str, x), from_none], self.headers)
+        if self.headers_refresh_ttl_ms is not None:
+            result["headersRefreshTtlMs"] = from_union([from_int, from_none], self.headers_refresh_ttl_ms)
+        if self.oauth_client_id is not None:
+            result["oauthClientId"] = from_union([from_str, from_none], self.oauth_client_id)
+        if self.oauth_grant_type is not None:
+            result["oauthGrantType"] = from_union([lambda x: to_enum(MCPGrantType, x), from_none], self.oauth_grant_type)
+        if self.oauth_public_client is not None:
+            result["oauthPublicClient"] = from_union([from_bool, from_none], self.oauth_public_client)
+        if self.url is not None:
+            result["url"] = from_union([from_str, from_none], self.url)
+        if self.server_instance is not None:
+            result["serverInstance"] = self.server_instance
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class MCPReloadConfig:
+    """In-process MCP reload configuration."""
+
+    mcp_servers: dict[str, MCPServerConfig]
+    active_git_hub_token: str | None = None
+    cli_enabled_servers: list[str] | None = None
+    """Server names the CLI enabled for this session via `--enable-mcp-server`."""
+
+    config_filter: Any = None
+    disabled_servers: list[str] | None = None
+    enabled_servers: list[str] | None = None
+    force_restart: bool | None = None
+    github_mcp_tool_options: Any = None
+    github_mcp_user_override: bool | None = None
+    include_workspace_sources: bool | None = None
+    mcp3_p_enabled: bool | None = None
+    secret_store: Any = None
+    use_cached_tool_snapshots: bool | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPReloadConfig':
+        assert isinstance(obj, dict)
+        mcp_servers = from_dict(MCPServerConfig.from_dict, obj.get("mcpServers"))
+        active_git_hub_token = from_union([from_str, from_none], obj.get("activeGitHubToken"))
+        cli_enabled_servers = from_union([lambda x: from_list(from_str, x), from_none], obj.get("cliEnabledServers"))
+        config_filter = obj.get("configFilter")
+        disabled_servers = from_union([lambda x: from_list(from_str, x), from_none], obj.get("disabledServers"))
+        enabled_servers = from_union([lambda x: from_list(from_str, x), from_none], obj.get("enabledServers"))
+        force_restart = from_union([from_bool, from_none], obj.get("forceRestart"))
+        github_mcp_tool_options = obj.get("githubMcpToolOptions")
+        github_mcp_user_override = from_union([from_bool, from_none], obj.get("githubMcpUserOverride"))
+        include_workspace_sources = from_union([from_bool, from_none], obj.get("includeWorkspaceSources"))
+        mcp3_p_enabled = from_union([from_bool, from_none], obj.get("mcp3pEnabled"))
+        secret_store = obj.get("secretStore")
+        use_cached_tool_snapshots = from_union([from_bool, from_none], obj.get("useCachedToolSnapshots"))
+        return MCPReloadConfig(mcp_servers, active_git_hub_token, cli_enabled_servers, config_filter, disabled_servers, enabled_servers, force_restart, github_mcp_tool_options, github_mcp_user_override, include_workspace_sources, mcp3_p_enabled, secret_store, use_cached_tool_snapshots)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["mcpServers"] = from_dict(lambda x: to_class(MCPServerConfig, x), self.mcp_servers)
+        if self.active_git_hub_token is not None:
+            result["activeGitHubToken"] = from_union([from_str, from_none], self.active_git_hub_token)
+        if self.cli_enabled_servers is not None:
+            result["cliEnabledServers"] = from_union([lambda x: from_list(from_str, x), from_none], self.cli_enabled_servers)
+        if self.config_filter is not None:
+            result["configFilter"] = self.config_filter
+        if self.disabled_servers is not None:
+            result["disabledServers"] = from_union([lambda x: from_list(from_str, x), from_none], self.disabled_servers)
+        if self.enabled_servers is not None:
+            result["enabledServers"] = from_union([lambda x: from_list(from_str, x), from_none], self.enabled_servers)
+        if self.force_restart is not None:
+            result["forceRestart"] = from_union([from_bool, from_none], self.force_restart)
+        if self.github_mcp_tool_options is not None:
+            result["githubMcpToolOptions"] = self.github_mcp_tool_options
+        if self.github_mcp_user_override is not None:
+            result["githubMcpUserOverride"] = from_union([from_bool, from_none], self.github_mcp_user_override)
+        if self.include_workspace_sources is not None:
+            result["includeWorkspaceSources"] = from_union([from_bool, from_none], self.include_workspace_sources)
+        if self.mcp3_p_enabled is not None:
+            result["mcp3pEnabled"] = from_union([from_bool, from_none], self.mcp3_p_enabled)
+        if self.secret_store is not None:
+            result["secretStore"] = self.secret_store
+        if self.use_cached_tool_snapshots is not None:
+            result["useCachedToolSnapshots"] = from_union([from_bool, from_none], self.use_cached_tool_snapshots)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPResourceAnnotations:
@@ -27560,6 +33441,143 @@ def to_dict(self) -> dict:
             result["nextCursor"] = from_union([from_str, from_none], self.next_cursor)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class MCPServerConfigMemory:
+    """In-process MCP server configuration used by embedded SDK clients."""
+
+    type: MCPServerConfigMemoryType
+    server_instance: Any = None
+    """In-process MCP server instance. This value cannot cross a JSON-RPC boundary."""
+
+    config_warnings: list[str] | None = None
+    """Configuration warnings recorded while loading the server."""
+
+    defer_tools: MCPServerConfigDeferTools | None = None
+    """Controls whether tools can be loaded on demand."""
+
+    disable_secret_masking: bool | None = None
+    """Whether secret masking is disabled for calls to this server."""
+
+    disable_tool_cache: bool | None = None
+    """Whether persisted tool snapshots are disabled."""
+
+    display_name: str | None = None
+    """Optional human-readable server name."""
+
+    events: list[str] | None = None
+    """Event types this server receives as Copilot notifications."""
+
+    exclude_tools: list[str] | None = None
+    """Tool names excluded after the include filter is applied."""
+
+    filter_mapping: dict[str, ContentFilterMode] | ContentFilterMode | None = None
+    """Content filtering mode to apply to this server's tools."""
+
+    is_default_server: bool | None = None
+    """Whether this server is a built-in fallback."""
+
+    notifications: list[str] | None = None
+    """Copilot notification types this server may send to the host."""
+
+    oidc: bool | MCPServerAuthConfigRedirectPort | None = None
+    """Set to `true` to use default OIDC settings."""
+
+    safe_for_telemetry: bool | MCPSafeForTelemetryFields | None = None
+    """Telemetry-obfuscation policy for this server's tools."""
+
+    source: McpServerSource | None = None
+    """The origin of this server configuration."""
+
+    source_path: str | None = None
+    """Source file path recorded while loading the config."""
+
+    source_plugin: str | None = None
+    """Plugin that provided this server."""
+
+    source_plugin_spec: bool | None = None
+    """Whether the providing plugin uses the Open Plugin Spec."""
+
+    source_plugin_version: str | None = None
+    """Version of the plugin that provided this server."""
+
+    timeout: int | None = None
+    """Timeout in milliseconds for tool discovery and tool calls."""
+
+    tools: list[str] | None = None
+    """Tools to include. Defaults to all tools if not specified."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPServerConfigMemory':
+        assert isinstance(obj, dict)
+        server_instance = obj.get("serverInstance")
+        type = MCPServerConfigMemoryType(obj.get("type"))
+        config_warnings = from_union([lambda x: from_list(from_str, x), from_none], obj.get("configWarnings"))
+        defer_tools = from_union([MCPServerConfigDeferTools, from_none], obj.get("deferTools"))
+        disable_secret_masking = from_union([from_bool, from_none], obj.get("disableSecretMasking"))
+        disable_tool_cache = from_union([from_bool, from_none], obj.get("disableToolCache"))
+        display_name = from_union([from_str, from_none], obj.get("displayName"))
+        events = from_union([lambda x: from_list(from_str, x), from_none], obj.get("events"))
+        exclude_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("excludeTools"))
+        filter_mapping = from_union([lambda x: from_dict(ContentFilterMode, x), ContentFilterMode, from_none], obj.get("filterMapping"))
+        is_default_server = from_union([from_bool, from_none], obj.get("isDefaultServer"))
+        notifications = from_union([lambda x: from_list(from_str, x), from_none], obj.get("notifications"))
+        oidc = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict, from_none], obj.get("oidc"))
+        safe_for_telemetry = from_union([from_bool, MCPSafeForTelemetryFields.from_dict, from_none], obj.get("safeForTelemetry"))
+        source = from_union([McpServerSource, from_none], obj.get("source"))
+        source_path = from_union([from_str, from_none], obj.get("sourcePath"))
+        source_plugin = from_union([from_str, from_none], obj.get("sourcePlugin"))
+        source_plugin_spec = from_union([from_bool, from_none], obj.get("sourcePluginSpec"))
+        source_plugin_version = from_union([from_str, from_none], obj.get("sourcePluginVersion"))
+        timeout = from_union([from_int, from_none], obj.get("timeout"))
+        tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("tools"))
+        return MCPServerConfigMemory(server_instance, type, config_warnings, defer_tools, disable_secret_masking, disable_tool_cache, display_name, events, exclude_tools, filter_mapping, is_default_server, notifications, oidc, safe_for_telemetry, source, source_path, source_plugin, source_plugin_spec, source_plugin_version, timeout, tools)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["serverInstance"] = self.server_instance
+        result["type"] = to_enum(MCPServerConfigMemoryType, self.type)
+        if self.config_warnings is not None:
+            result["configWarnings"] = from_union([lambda x: from_list(from_str, x), from_none], self.config_warnings)
+        if self.defer_tools is not None:
+            result["deferTools"] = from_union([lambda x: to_enum(MCPServerConfigDeferTools, x), from_none], self.defer_tools)
+        if self.disable_secret_masking is not None:
+            result["disableSecretMasking"] = from_union([from_bool, from_none], self.disable_secret_masking)
+        if self.disable_tool_cache is not None:
+            result["disableToolCache"] = from_union([from_bool, from_none], self.disable_tool_cache)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_str, from_none], self.display_name)
+        if self.events is not None:
+            result["events"] = from_union([lambda x: from_list(from_str, x), from_none], self.events)
+        if self.exclude_tools is not None:
+            result["excludeTools"] = from_union([lambda x: from_list(from_str, x), from_none], self.exclude_tools)
+        if self.filter_mapping is not None:
+            result["filterMapping"] = from_union([lambda x: from_dict(lambda x: to_enum(ContentFilterMode, x), x), lambda x: to_enum(ContentFilterMode, x), from_none], self.filter_mapping)
+        if self.is_default_server is not None:
+            result["isDefaultServer"] = from_union([from_bool, from_none], self.is_default_server)
+        if self.notifications is not None:
+            result["notifications"] = from_union([lambda x: from_list(from_str, x), from_none], self.notifications)
+        if self.oidc is not None:
+            result["oidc"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x), from_none], self.oidc)
+        if self.safe_for_telemetry is not None:
+            result["safeForTelemetry"] = from_union([from_bool, lambda x: to_class(MCPSafeForTelemetryFields, x), from_none], self.safe_for_telemetry)
+        if self.source is not None:
+            result["source"] = from_union([lambda x: to_enum(McpServerSource, x), from_none], self.source)
+        if self.source_path is not None:
+            result["sourcePath"] = from_union([from_str, from_none], self.source_path)
+        if self.source_plugin is not None:
+            result["sourcePlugin"] = from_union([from_str, from_none], self.source_plugin)
+        if self.source_plugin_spec is not None:
+            result["sourcePluginSpec"] = from_union([from_bool, from_none], self.source_plugin_spec)
+        if self.source_plugin_version is not None:
+            result["sourcePluginVersion"] = from_union([from_str, from_none], self.source_plugin_version)
+        if self.timeout is not None:
+            result["timeout"] = from_union([from_int, from_none], self.timeout)
+        if self.tools is not None:
+            result["tools"] = from_union([lambda x: from_list(from_str, x), from_none], self.tools)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MetadataContextInfoRequest:
@@ -27665,6 +33683,14 @@ class Model:
     billing: ModelBilling | None = None
     """Billing information"""
 
+    default_reasoning_effort: str | None = None
+    """Default reasoning effort level (only present if model supports reasoning effort)"""
+
+    info_messages: list[ModelMessage] | None = None
+    """Informational notices the service published for this model, such as an upcoming change or
+    a recommended alternative. Present only when the service published at least one notice.
+    Hosts should surface these without implying anything is wrong with the model.
+    """
     model_picker_category: ModelPickerCategory | None = None
     """Model capability category for grouping in the model picker"""
 
@@ -27674,9 +33700,25 @@ class Model:
     policy: ModelPolicy | None = None
     """Policy state (if applicable)"""
 
+    supported_context_tiers: list[str] | None = None
+    """Context-window tiers this model offers, when the provider advertises them independently
+    of tiered token pricing. Copilot models carry their tiers in `billing.tokenPrices`; a
+    provider that has no pricing to publish (an agent host reached over AHP, for example)
+    declares them here instead, so the model picker can still offer the tier toggle.
+    """
     supported_reasoning_efforts: list[str] | None = None
     """Supported reasoning effort levels (only present if model supports reasoning effort)"""
 
+    warning_messages: list[ModelMessage] | None = None
+    """Warnings the service published for this model, such as a deprecated client version.
+    Present only when the service published at least one warning. The model remains usable;
+    hosts should surface these as advisory rather than blocking.
+    """
+    warning_text: ModelWarningText | None = None
+    """Warning text the service requires hosts to surface for this model. Present only when the
+    service published at least one warning.
+    """
+
     @staticmethod
     def from_dict(obj: Any) -> 'Model':
         assert isinstance(obj, dict)
@@ -27684,11 +33726,16 @@ def from_dict(obj: Any) -> 'Model':
         id = from_str(obj.get("id"))
         name = from_str(obj.get("name"))
         billing = from_union([ModelBilling.from_dict, from_none], obj.get("billing"))
+        default_reasoning_effort = from_union([from_str, from_none], obj.get("defaultReasoningEffort"))
+        info_messages = from_union([lambda x: from_list(ModelMessage.from_dict, x), from_none], obj.get("infoMessages"))
         model_picker_category = from_union([ModelPickerCategory, from_none], obj.get("modelPickerCategory"))
         model_picker_price_category = from_union([ModelPickerPriceCategory, from_none], obj.get("modelPickerPriceCategory"))
         policy = from_union([ModelPolicy.from_dict, from_none], obj.get("policy"))
+        supported_context_tiers = from_union([lambda x: from_list(from_str, x), from_none], obj.get("supportedContextTiers"))
         supported_reasoning_efforts = from_union([lambda x: from_list(from_str, x), from_none], obj.get("supportedReasoningEfforts"))
-        return Model(capabilities, id, name, billing, model_picker_category, model_picker_price_category, policy, supported_reasoning_efforts)
+        warning_messages = from_union([lambda x: from_list(ModelMessage.from_dict, x), from_none], obj.get("warningMessages"))
+        warning_text = from_union([ModelWarningText.from_dict, from_none], obj.get("warningText"))
+        return Model(capabilities, id, name, billing, default_reasoning_effort, info_messages, model_picker_category, model_picker_price_category, policy, supported_context_tiers, supported_reasoning_efforts, warning_messages, warning_text)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -27697,14 +33744,80 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         if self.billing is not None:
             result["billing"] = from_union([lambda x: to_class(ModelBilling, x), from_none], self.billing)
+        if self.default_reasoning_effort is not None:
+            result["defaultReasoningEffort"] = from_union([from_str, from_none], self.default_reasoning_effort)
+        if self.info_messages is not None:
+            result["infoMessages"] = from_union([lambda x: from_list(lambda x: to_class(ModelMessage, x), x), from_none], self.info_messages)
         if self.model_picker_category is not None:
             result["modelPickerCategory"] = from_union([lambda x: to_enum(ModelPickerCategory, x), from_none], self.model_picker_category)
         if self.model_picker_price_category is not None:
             result["modelPickerPriceCategory"] = from_union([lambda x: to_enum(ModelPickerPriceCategory, x), from_none], self.model_picker_price_category)
         if self.policy is not None:
             result["policy"] = from_union([lambda x: to_class(ModelPolicy, x), from_none], self.policy)
+        if self.supported_context_tiers is not None:
+            result["supportedContextTiers"] = from_union([lambda x: from_list(from_str, x), from_none], self.supported_context_tiers)
         if self.supported_reasoning_efforts is not None:
             result["supportedReasoningEfforts"] = from_union([lambda x: from_list(from_str, x), from_none], self.supported_reasoning_efforts)
+        if self.warning_messages is not None:
+            result["warningMessages"] = from_union([lambda x: from_list(lambda x: to_class(ModelMessage, x), x), from_none], self.warning_messages)
+        if self.warning_text is not None:
+            result["warningText"] = from_union([lambda x: to_class(ModelWarningText, x), from_none], self.warning_text)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModelApplyStartupOverlayRequest:
+    """Managed, repository, and CLI model overrides to overlay onto the session at startup."""
+
+    cli_model: str | None = None
+    """Model explicitly selected by the CLI, when provided."""
+
+    deferred_resume: bool | None = None
+    """Whether the overlay is being applied while resuming a deferred session."""
+
+    device_managed_model: str | None = None
+    """Model required by device-managed policy, when configured."""
+
+    repo_context_tier: str | None = None
+    """Context tier selected by repository settings, when configured."""
+
+    repo_model: str | None = None
+    """Model selected by repository settings, when configured."""
+
+    repo_reasoning_effort: str | None = None
+    """Reasoning effort selected by repository settings, when configured."""
+
+    server_managed_model: str | None = None
+    """Model required by server-managed policy, when configured."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModelApplyStartupOverlayRequest':
+        assert isinstance(obj, dict)
+        cli_model = from_union([from_str, from_none], obj.get("cliModel"))
+        deferred_resume = from_union([from_bool, from_none], obj.get("deferredResume"))
+        device_managed_model = from_union([from_str, from_none], obj.get("deviceManagedModel"))
+        repo_context_tier = from_union([from_str, from_none], obj.get("repoContextTier"))
+        repo_model = from_union([from_str, from_none], obj.get("repoModel"))
+        repo_reasoning_effort = from_union([from_str, from_none], obj.get("repoReasoningEffort"))
+        server_managed_model = from_union([from_str, from_none], obj.get("serverManagedModel"))
+        return ModelApplyStartupOverlayRequest(cli_model, deferred_resume, device_managed_model, repo_context_tier, repo_model, repo_reasoning_effort, server_managed_model)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.cli_model is not None:
+            result["cliModel"] = from_union([from_str, from_none], self.cli_model)
+        if self.deferred_resume is not None:
+            result["deferredResume"] = from_union([from_bool, from_none], self.deferred_resume)
+        if self.device_managed_model is not None:
+            result["deviceManagedModel"] = from_union([from_str, from_none], self.device_managed_model)
+        if self.repo_context_tier is not None:
+            result["repoContextTier"] = from_union([from_str, from_none], self.repo_context_tier)
+        if self.repo_model is not None:
+            result["repoModel"] = from_union([from_str, from_none], self.repo_model)
+        if self.repo_reasoning_effort is not None:
+            result["repoReasoningEffort"] = from_union([from_str, from_none], self.repo_reasoning_effort)
+        if self.server_managed_model is not None:
+            result["serverManagedModel"] = from_union([from_str, from_none], self.server_managed_model)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -27738,6 +33851,10 @@ class ModelSwitchToRequest:
     `claude-sonnet-4.6`) names a Copilot (CAPI) model; a provider-qualified id
     (`provider/id`, e.g. `acme/claude-sonnet`) targets a registry BYOK model.
     """
+    compaction_decision: str | None = None
+    """Explicit response to a model-switch compaction preflight. Omit to request a confirmation
+    projection when compaction is necessary.
+    """
     context_tier: ContextTier | None = None
     """Explicit context tier for the selected model. `"default"` / `"long_context"` apply the
     requested tier; omit this field to use normal model behavior with no explicit tier.
@@ -27752,6 +33869,12 @@ class ModelSwitchToRequest:
     model_capabilities: ModelCapabilitiesOverride | None = None
     """Override individual model capabilities resolved by the runtime"""
 
+    model_change_scope: str | None = None
+    """Settings scope used when persisting the selected model."""
+
+    picker_persistence: ModelPickerPersistenceRequest | None = None
+    """Optional settings context and explicit-override flags used to persist a picker selection."""
+
     reasoning_effort: str | None = None
     """Reasoning effort level to use for the model. CAPI values are model-defined and validated
     against the selected model; BYOK providers may define additional values. "none" disables
@@ -27760,6 +33883,19 @@ class ModelSwitchToRequest:
     reasoning_summary: ReasoningSummary | None = None
     """Reasoning summary mode to request for supported model clients"""
 
+    repo_scope: str | None = None
+    """Optional repository settings scope to persist after the switch commits."""
+
+    require_available: bool | None = None
+    """Require the target to be currently available and enabled before applying the switch."""
+
+    run_compaction_preflight: bool | None = None
+    """When true, evaluate context-window compaction policy before applying the switch."""
+
+    source: ModelChangeSource | None = None
+    """Origin to record on the effective `session.model_change` event. Defaults to `sdk` when
+    omitted.
+    """
     verbosity: Verbosity | None = None
     """Output verbosity level to request for supported models"""
 
@@ -27767,105 +33903,190 @@ class ModelSwitchToRequest:
     def from_dict(obj: Any) -> 'ModelSwitchToRequest':
         assert isinstance(obj, dict)
         model_id = from_str(obj.get("modelId"))
+        compaction_decision = from_union([from_str, from_none], obj.get("compactionDecision"))
         context_tier = from_union([ContextTier, from_none], obj.get("contextTier"))
         defer_if_model_change_queued = from_union([from_bool, from_none], obj.get("deferIfModelChangeQueued"))
         model_capabilities = from_union([ModelCapabilitiesOverride.from_dict, from_none], obj.get("modelCapabilities"))
+        model_change_scope = from_union([from_str, from_none], obj.get("modelChangeScope"))
+        picker_persistence = from_union([ModelPickerPersistenceRequest.from_dict, from_none], obj.get("pickerPersistence"))
         reasoning_effort = from_union([from_str, from_none], obj.get("reasoningEffort"))
         reasoning_summary = from_union([ReasoningSummary, from_none], obj.get("reasoningSummary"))
+        repo_scope = from_union([from_str, from_none], obj.get("repoScope"))
+        require_available = from_union([from_bool, from_none], obj.get("requireAvailable"))
+        run_compaction_preflight = from_union([from_bool, from_none], obj.get("runCompactionPreflight"))
+        source = from_union([ModelChangeSource, from_none], obj.get("source"))
         verbosity = from_union([Verbosity, from_none], obj.get("verbosity"))
-        return ModelSwitchToRequest(model_id, context_tier, defer_if_model_change_queued, model_capabilities, reasoning_effort, reasoning_summary, verbosity)
+        return ModelSwitchToRequest(model_id, compaction_decision, context_tier, defer_if_model_change_queued, model_capabilities, model_change_scope, picker_persistence, reasoning_effort, reasoning_summary, repo_scope, require_available, run_compaction_preflight, source, verbosity)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["modelId"] = from_str(self.model_id)
+        if self.compaction_decision is not None:
+            result["compactionDecision"] = from_union([from_str, from_none], self.compaction_decision)
         if self.context_tier is not None:
             result["contextTier"] = from_union([lambda x: to_enum(ContextTier, x), from_none], self.context_tier)
         if self.defer_if_model_change_queued is not None:
             result["deferIfModelChangeQueued"] = from_union([from_bool, from_none], self.defer_if_model_change_queued)
         if self.model_capabilities is not None:
             result["modelCapabilities"] = from_union([lambda x: to_class(ModelCapabilitiesOverride, x), from_none], self.model_capabilities)
+        if self.model_change_scope is not None:
+            result["modelChangeScope"] = from_union([from_str, from_none], self.model_change_scope)
+        if self.picker_persistence is not None:
+            result["pickerPersistence"] = from_union([lambda x: to_class(ModelPickerPersistenceRequest, x), from_none], self.picker_persistence)
         if self.reasoning_effort is not None:
             result["reasoningEffort"] = from_union([from_str, from_none], self.reasoning_effort)
         if self.reasoning_summary is not None:
             result["reasoningSummary"] = from_union([lambda x: to_enum(ReasoningSummary, x), from_none], self.reasoning_summary)
+        if self.repo_scope is not None:
+            result["repoScope"] = from_union([from_str, from_none], self.repo_scope)
+        if self.require_available is not None:
+            result["requireAvailable"] = from_union([from_bool, from_none], self.require_available)
+        if self.run_compaction_preflight is not None:
+            result["runCompactionPreflight"] = from_union([from_bool, from_none], self.run_compaction_preflight)
+        if self.source is not None:
+            result["source"] = from_union([lambda x: to_enum(ModelChangeSource, x), from_none], self.source)
         if self.verbosity is not None:
             result["verbosity"] = from_union([lambda x: to_enum(Verbosity, x), from_none], self.verbosity)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
-class PermissionsSetAAllSource(Enum):
-    """Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers."""
+class PermissionSource(Enum):
+    """Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK
+    callers.
 
+    Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
+    """
     AUTOPILOT_CONFIRMATION = "autopilot_confirmation"
     CLI_FLAG = "cli_flag"
     RPC = "rpc"
     SLASH_COMMAND = "slash_command"
+    USER_SETTING = "user_setting"
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class PermissionsSetAllowAllRequest:
-    """Allow-all mode to apply for the session."""
+class PermissionsSetApproveAllRequest:
+    """Allow-all toggle for tool permission requests, with an optional telemetry source."""
 
-    enabled: bool | None = None
-    """Legacy full allow-all toggle. Prefer `mode`; when `mode` is omitted, `enabled: true` is
-    treated as `mode: "on"` and any other value is treated as `mode: "off"`.
-    """
-    mode: PermissionsAllowAllMode | None = None
-    """Allow-all mode to apply. `on` enables full allow-all; `auto` enables advisory LLM
-    auto-approval; `off` disables both.
-    """
-    model: str | None = None
-    """Optional model id for the `auto` mode auto-approval LLM judging. Only meaningful when
-    `mode` is `auto`; ignored otherwise. When omitted, the session resolves a default judge
-    model: `gpt-5.5` for CAPI sessions and the session's active model for BYOK sessions.
-    """
-    source: PermissionsSetAAllSource | None = None
+    enabled: bool
+    """Whether to auto-approve all tool permission requests"""
+
+    source: PermissionSource | None = None
     """Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'PermissionsSetAllowAllRequest':
+    def from_dict(obj: Any) -> 'PermissionsSetApproveAllRequest':
         assert isinstance(obj, dict)
-        enabled = from_union([from_bool, from_none], obj.get("enabled"))
-        mode = from_union([PermissionsAllowAllMode, from_none], obj.get("mode"))
-        model = from_union([from_str, from_none], obj.get("model"))
-        source = from_union([PermissionsSetAAllSource, from_none], obj.get("source"))
-        return PermissionsSetAllowAllRequest(enabled, mode, model, source)
+        enabled = from_bool(obj.get("enabled"))
+        source = from_union([PermissionSource, from_none], obj.get("source"))
+        return PermissionsSetApproveAllRequest(enabled, source)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        if self.enabled is not None:
-            result["enabled"] = from_union([from_bool, from_none], self.enabled)
-        if self.mode is not None:
-            result["mode"] = from_union([lambda x: to_enum(PermissionsAllowAllMode, x), from_none], self.mode)
-        if self.model is not None:
-            result["model"] = from_union([from_str, from_none], self.model)
+        result["enabled"] = from_bool(self.enabled)
         if self.source is not None:
-            result["source"] = from_union([lambda x: to_enum(PermissionsSetAAllSource, x), from_none], self.source)
+            result["source"] = from_union([lambda x: to_enum(PermissionSource, x), from_none], self.source)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class PermissionsSetApproveAllRequest:
-    """Allow-all toggle for tool permission requests, with an optional telemetry source."""
+class PermissionsSetModeRequest:
+    """Permission mode to apply for the session."""
 
-    enabled: bool
-    """Whether to auto-approve all tool permission requests"""
+    mode: PermissionMode
+    """Permission mode to apply"""
 
-    source: PermissionsSetAAllSource | None = None
-    """Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers."""
+    assisted_approval_model: str | None = None
+    """Optional judge model id for assisted mode. When omitted, the session resolves the
+    provider default: `gpt-5.5` for CAPI sessions and the active session model for BYOK
+    sessions.
+    """
+    source: PermissionSource | None = None
+    """Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK
+    callers.
+    """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'PermissionsSetApproveAllRequest':
+    def from_dict(obj: Any) -> 'PermissionsSetModeRequest':
         assert isinstance(obj, dict)
-        enabled = from_bool(obj.get("enabled"))
-        source = from_union([PermissionsSetAAllSource, from_none], obj.get("source"))
-        return PermissionsSetApproveAllRequest(enabled, source)
+        mode = PermissionMode(obj.get("mode"))
+        assisted_approval_model = from_union([from_str, from_none], obj.get("assistedApprovalModel"))
+        source = from_union([PermissionSource, from_none], obj.get("source"))
+        return PermissionsSetModeRequest(mode, assisted_approval_model, source)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["enabled"] = from_bool(self.enabled)
+        result["mode"] = to_enum(PermissionMode, self.mode)
+        if self.assisted_approval_model is not None:
+            result["assistedApprovalModel"] = from_union([from_str, from_none], self.assisted_approval_model)
         if self.source is not None:
-            result["source"] = from_union([lambda x: to_enum(PermissionsSetAAllSource, x), from_none], self.source)
+            result["source"] = from_union([lambda x: to_enum(PermissionSource, x), from_none], self.source)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ProtocolExternalToolDefinition:
+    """Serializable definition of a caller-implemented tool whose execution is handled over the
+    SDK connection.
+    """
+    description: str
+    """Model-visible explanation of what the tool does."""
+
+    name: str
+    """Unique model-visible tool name."""
+
+    defer: MCPServerConfigDeferTools | None = None
+    """Tool-loading deferral policy."""
+
+    is_terminal: bool | None = None
+    """Whether the tool executes commands in a terminal."""
+
+    metadata: dict[str, Any] | None = None
+    """Optional caller-defined metadata associated with the tool."""
+
+    overrides_built_in_tool: bool | None = None
+    """Whether this definition replaces a built-in tool with the same name."""
+
+    parameters: dict[str, Any] | None = None
+    """JSON Schema describing the tool's input arguments."""
+
+    skip_permission: bool | None = None
+    """Whether execution bypasses the normal tool permission prompt."""
+
+    title: str | None = None
+    """Optional human-readable display title."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ProtocolExternalToolDefinition':
+        assert isinstance(obj, dict)
+        description = from_str(obj.get("description"))
+        name = from_str(obj.get("name"))
+        defer = from_union([MCPServerConfigDeferTools, from_none], obj.get("defer"))
+        is_terminal = from_union([from_bool, from_none], obj.get("isTerminal"))
+        metadata = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("metadata"))
+        overrides_built_in_tool = from_union([from_bool, from_none], obj.get("overridesBuiltInTool"))
+        parameters = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("parameters"))
+        skip_permission = from_union([from_bool, from_none], obj.get("skipPermission"))
+        title = from_union([from_str, from_none], obj.get("title"))
+        return ProtocolExternalToolDefinition(description, name, defer, is_terminal, metadata, overrides_built_in_tool, parameters, skip_permission, title)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["description"] = from_str(self.description)
+        result["name"] = from_str(self.name)
+        if self.defer is not None:
+            result["defer"] = from_union([lambda x: to_enum(MCPServerConfigDeferTools, x), from_none], self.defer)
+        if self.is_terminal is not None:
+            result["isTerminal"] = from_union([from_bool, from_none], self.is_terminal)
+        if self.metadata is not None:
+            result["metadata"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.metadata)
+        if self.overrides_built_in_tool is not None:
+            result["overridesBuiltInTool"] = from_union([from_bool, from_none], self.overrides_built_in_tool)
+        if self.parameters is not None:
+            result["parameters"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.parameters)
+        if self.skip_permission is not None:
+            result["skipPermission"] = from_union([from_bool, from_none], self.skip_permission)
+        if self.title is not None:
+            result["title"] = from_union([from_str, from_none], self.title)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -27959,6 +34180,8 @@ class SessionLimitPredictionResult:
     include an explicit reason.
     """
     kind: SessionLimitPredictionResultKind
+    """Prediction result variant discriminator."""
+
     prediction: SessionLimitPredictionDetails | None = None
     """Predicted session limit details."""
 
@@ -28002,6 +34225,142 @@ def to_dict(self) -> dict:
             result["modelId"] = from_union([from_str, from_none], self.model_id)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionSettingsValidationSnapshot:
+    """Redacted validation and memory-tool settings.
+
+    Redacted validation and memory-tool settings for a session.
+    """
+    advisory_enabled: bool | None = None
+    """Whether advisory validation is enabled."""
+
+    codeql_enabled: bool | None = None
+    """Whether CodeQL validation is enabled."""
+
+    code_review_enabled: bool | None = None
+    """Whether code-review validation is enabled."""
+
+    code_review_model: str | None = None
+    """Model used for code-review validation."""
+
+    dependabot_timeout: float | None = None
+    """Dependabot validation timeout budget in seconds."""
+
+    memory_store_enabled: bool | None = None
+    """Whether the memory-store tool is enabled."""
+
+    memory_vote_enabled: bool | None = None
+    """Whether the memory-vote tool is enabled."""
+
+    secret_scanning_enabled: bool | None = None
+    """Whether secret-scanning validation is enabled."""
+
+    timeout: float | None = None
+    """General validation timeout budget in seconds."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionSettingsValidationSnapshot':
+        assert isinstance(obj, dict)
+        advisory_enabled = from_union([from_bool, from_none], obj.get("advisoryEnabled"))
+        codeql_enabled = from_union([from_bool, from_none], obj.get("codeqlEnabled"))
+        code_review_enabled = from_union([from_bool, from_none], obj.get("codeReviewEnabled"))
+        code_review_model = from_union([from_str, from_none], obj.get("codeReviewModel"))
+        dependabot_timeout = from_union([from_float, from_none], obj.get("dependabotTimeout"))
+        memory_store_enabled = from_union([from_bool, from_none], obj.get("memoryStoreEnabled"))
+        memory_vote_enabled = from_union([from_bool, from_none], obj.get("memoryVoteEnabled"))
+        secret_scanning_enabled = from_union([from_bool, from_none], obj.get("secretScanningEnabled"))
+        timeout = from_union([from_float, from_none], obj.get("timeout"))
+        return SessionSettingsValidationSnapshot(advisory_enabled, codeql_enabled, code_review_enabled, code_review_model, dependabot_timeout, memory_store_enabled, memory_vote_enabled, secret_scanning_enabled, timeout)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.advisory_enabled is not None:
+            result["advisoryEnabled"] = from_union([from_bool, from_none], self.advisory_enabled)
+        if self.codeql_enabled is not None:
+            result["codeqlEnabled"] = from_union([from_bool, from_none], self.codeql_enabled)
+        if self.code_review_enabled is not None:
+            result["codeReviewEnabled"] = from_union([from_bool, from_none], self.code_review_enabled)
+        if self.code_review_model is not None:
+            result["codeReviewModel"] = from_union([from_str, from_none], self.code_review_model)
+        if self.dependabot_timeout is not None:
+            result["dependabotTimeout"] = from_union([to_float, from_none], self.dependabot_timeout)
+        if self.memory_store_enabled is not None:
+            result["memoryStoreEnabled"] = from_union([from_bool, from_none], self.memory_store_enabled)
+        if self.memory_vote_enabled is not None:
+            result["memoryVoteEnabled"] = from_union([from_bool, from_none], self.memory_vote_enabled)
+        if self.secret_scanning_enabled is not None:
+            result["secretScanningEnabled"] = from_union([from_bool, from_none], self.secret_scanning_enabled)
+        if self.timeout is not None:
+            result["timeout"] = from_union([to_float, from_none], self.timeout)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionSettingsSnapshot:
+    """Redacted, serializable view of session runtime settings for SDK boundary consumers.
+    Secrets and raw feature flags are intentionally excluded.
+    """
+    job: SessionSettingsJobSnapshot
+    """Redacted job settings."""
+
+    model: SessionSettingsModelSnapshot
+    """Redacted model routing settings."""
+
+    online_evaluation: SessionSettingsOnlineEvaluationSnapshot
+    """Online-evaluation settings safe for SDK consumers."""
+
+    repo: SessionSettingsRepoSnapshot
+    """Redacted repository and host settings."""
+
+    validation: SessionSettingsValidationSnapshot
+    """Redacted validation and memory-tool settings."""
+
+    client_name: str | None = None
+    """Name of the SDK client that created the session."""
+
+    start_time_ms: float | None = None
+    """Session start time as Unix epoch milliseconds."""
+
+    timeout_ms: float | None = None
+    """Session timeout in milliseconds."""
+
+    version: str | None = None
+    """Agent runtime version selector copied from the session settings, such as `latest` or a
+    runtime release identifier.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionSettingsSnapshot':
+        assert isinstance(obj, dict)
+        job = SessionSettingsJobSnapshot.from_dict(obj.get("job"))
+        model = SessionSettingsModelSnapshot.from_dict(obj.get("model"))
+        online_evaluation = SessionSettingsOnlineEvaluationSnapshot.from_dict(obj.get("onlineEvaluation"))
+        repo = SessionSettingsRepoSnapshot.from_dict(obj.get("repo"))
+        validation = SessionSettingsValidationSnapshot.from_dict(obj.get("validation"))
+        client_name = from_union([from_str, from_none], obj.get("clientName"))
+        start_time_ms = from_union([from_float, from_none], obj.get("startTimeMs"))
+        timeout_ms = from_union([from_float, from_none], obj.get("timeoutMs"))
+        version = from_union([from_str, from_none], obj.get("version"))
+        return SessionSettingsSnapshot(job, model, online_evaluation, repo, validation, client_name, start_time_ms, timeout_ms, version)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["job"] = to_class(SessionSettingsJobSnapshot, self.job)
+        result["model"] = to_class(SessionSettingsModelSnapshot, self.model)
+        result["onlineEvaluation"] = to_class(SessionSettingsOnlineEvaluationSnapshot, self.online_evaluation)
+        result["repo"] = to_class(SessionSettingsRepoSnapshot, self.repo)
+        result["validation"] = to_class(SessionSettingsValidationSnapshot, self.validation)
+        if self.client_name is not None:
+            result["clientName"] = from_union([from_str, from_none], self.client_name)
+        if self.start_time_ms is not None:
+            result["startTimeMs"] = from_union([to_float, from_none], self.start_time_ms)
+        if self.timeout_ms is not None:
+            result["timeoutMs"] = from_union([to_float, from_none], self.timeout_ms)
+        if self.version is not None:
+            result["version"] = from_union([from_str, from_none], self.version)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionsOpenCloud:
@@ -28112,6 +34471,164 @@ def to_dict(self) -> dict:
             result["taskType"] = from_union([lambda x: to_enum(TaskType, x), from_none], self.task_type)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SettableTokenAuthInfo:
+    """Token authentication accepted by session.gitHubAuth.setCredentials."""
+
+    host: str
+    """Authentication host."""
+
+    token: str
+    """The token value itself. Treat as a secret."""
+
+    type: ClassVar[str] = "token"
+    """SDK-side token authentication; the host configured the token directly via the SDK."""
+
+    copilot_user: CopilotUserResponse | None = None
+    """Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
+    GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
+    verbatim and does not re-fetch when set.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SettableTokenAuthInfo':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        token = from_str(obj.get("token"))
+        copilot_user = from_union([CopilotUserResponse.from_dict, from_none], obj.get("copilotUser"))
+        return SettableTokenAuthInfo(host, token, copilot_user)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["token"] = from_str(self.token)
+        result["type"] = self.type
+        if self.copilot_user is not None:
+            result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SlashCommandModelPickerDialog:
+    """Dialog the host should display."""
+
+    kind: SlashCommandModelPickerDialogKind
+    """Discriminator for a model-picker dialog."""
+
+    model_to_enable: str | None = None
+    """Model that should be enabled before it can be selected."""
+
+    scope: str | None = None
+    """Settings scope the picker should modify."""
+
+    target: str | None = None
+    """Model-selection target represented by the picker."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SlashCommandModelPickerDialog':
+        assert isinstance(obj, dict)
+        kind = SlashCommandModelPickerDialogKind(obj.get("kind"))
+        model_to_enable = from_union([from_str, from_none], obj.get("modelToEnable"))
+        scope = from_union([from_str, from_none], obj.get("scope"))
+        target = from_union([from_str, from_none], obj.get("target"))
+        return SlashCommandModelPickerDialog(kind, model_to_enable, scope, target)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = to_enum(SlashCommandModelPickerDialogKind, self.kind)
+        if self.model_to_enable is not None:
+            result["modelToEnable"] = from_union([from_str, from_none], self.model_to_enable)
+        if self.scope is not None:
+            result["scope"] = from_union([from_str, from_none], self.scope)
+        if self.target is not None:
+            result["target"] = from_union([from_str, from_none], self.target)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SlashCommandSetModelResult:
+    kind: ClassVar[str] = "set-model"
+    """Discriminator for a set-model result."""
+
+    model: str
+    """Model selected by the command."""
+
+    reasoning_effort: str | None = None
+    """Reasoning effort selected for the model."""
+
+    repo_scope: str | None = None
+    """Repository settings scope modified by the command."""
+
+    revert_on_cancel: dict[str, Any] | None = None
+    """User-settings snapshot to restore if the host cancels the model switch."""
+
+    runtime_settings_changed: bool | None = None
+    """Whether command execution changed persisted runtime settings."""
+
+    scope: str | None = None
+    """Settings scope modified by the command."""
+
+    warning: str | None = None
+    """User-facing warning produced while selecting the model."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SlashCommandSetModelResult':
+        assert isinstance(obj, dict)
+        model = from_str(obj.get("model"))
+        reasoning_effort = from_union([from_str, from_none], obj.get("reasoningEffort"))
+        repo_scope = from_union([from_str, from_none], obj.get("repoScope"))
+        revert_on_cancel = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("revertOnCancel"))
+        runtime_settings_changed = from_union([from_bool, from_none], obj.get("runtimeSettingsChanged"))
+        scope = from_union([from_str, from_none], obj.get("scope"))
+        warning = from_union([from_str, from_none], obj.get("warning"))
+        return SlashCommandSetModelResult(model, reasoning_effort, repo_scope, revert_on_cancel, runtime_settings_changed, scope, warning)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = self.kind
+        result["model"] = from_str(self.model)
+        if self.reasoning_effort is not None:
+            result["reasoningEffort"] = from_union([from_str, from_none], self.reasoning_effort)
+        if self.repo_scope is not None:
+            result["repoScope"] = from_union([from_str, from_none], self.repo_scope)
+        if self.revert_on_cancel is not None:
+            result["revertOnCancel"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.revert_on_cancel)
+        if self.runtime_settings_changed is not None:
+            result["runtimeSettingsChanged"] = from_union([from_bool, from_none], self.runtime_settings_changed)
+        if self.scope is not None:
+            result["scope"] = from_union([from_str, from_none], self.scope)
+        if self.warning is not None:
+            result["warning"] = from_union([from_str, from_none], self.warning)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SlashCommandShowDialogResult:
+    dialog: SlashCommandModelPickerDialog
+    """Dialog the host should display."""
+
+    kind: ClassVar[str] = "show-dialog"
+    """Discriminator for a show-dialog result."""
+
+    runtime_settings_changed: bool | None = None
+    """Whether command execution changed persisted runtime settings."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SlashCommandShowDialogResult':
+        assert isinstance(obj, dict)
+        dialog = SlashCommandModelPickerDialog.from_dict(obj.get("dialog"))
+        runtime_settings_changed = from_union([from_bool, from_none], obj.get("runtimeSettingsChanged"))
+        return SlashCommandShowDialogResult(dialog, runtime_settings_changed)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["dialog"] = to_class(SlashCommandModelPickerDialog, self.dialog)
+        result["kind"] = self.kind
+        if self.runtime_settings_changed is not None:
+            result["runtimeSettingsChanged"] = from_union([from_bool, from_none], self.runtime_settings_changed)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SubagentSettingsEntry:
@@ -28186,8 +34703,8 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class TokenAuthInfo:
-    """Authentication-info variant for SDK-configured token authentication, carrying host and
-    the secret token value.
+    """Authentication-info input variant for SDK-configured token authentication, carrying host
+    and the secret token value.
     """
     host: str
     """Authentication host."""
@@ -28203,6 +34720,8 @@ class TokenAuthInfo:
     GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
     verbatim and does not re-fetch when set.
     """
+    registration_id: str | None = None
+    """Opaque native GitHub credential registration backing this token identity, when applicable."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'TokenAuthInfo':
@@ -28210,7 +34729,8 @@ def from_dict(obj: Any) -> 'TokenAuthInfo':
         host = from_str(obj.get("host"))
         token = from_str(obj.get("token"))
         copilot_user = from_union([CopilotUserResponse.from_dict, from_none], obj.get("copilotUser"))
-        return TokenAuthInfo(host, token, copilot_user)
+        registration_id = from_union([from_str, from_none], obj.get("registrationId"))
+        return TokenAuthInfo(host, token, copilot_user, registration_id)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -28219,6 +34739,62 @@ def to_dict(self) -> dict:
         result["type"] = self.type
         if self.copilot_user is not None:
             result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
+        if self.registration_id is not None:
+            result["registrationId"] = from_union([from_str, from_none], self.registration_id)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class TokenProviderAuthInfo:
+    """Authentication-info variant backed by an SDK GitHub token callback. It carries routing
+    metadata but never a plaintext token.
+    """
+    host: str
+    """Authentication host."""
+
+    registration_id: str
+    """Opaque SDK callback registration identifier."""
+
+    type: ClassVar[str] = "token-provider"
+    """SDK callback-backed GitHub token authentication."""
+
+    copilot_user: CopilotUserResponse | None = None
+    """Snapshot of the authenticated user's Copilot subscription info, if known."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'TokenProviderAuthInfo':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        registration_id = from_str(obj.get("registrationId"))
+        copilot_user = from_union([CopilotUserResponse.from_dict, from_none], obj.get("copilotUser"))
+        return TokenProviderAuthInfo(host, registration_id, copilot_user)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["registrationId"] = from_str(self.registration_id)
+        result["type"] = self.type
+        if self.copilot_user is not None:
+            result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ToolsGetBuiltinDescriptorsResult:
+    """Rust-owned built-in tool descriptors for the session."""
+
+    tools: list[BuiltinToolDescriptor]
+    """Built-in tool descriptors materialized for the session."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolsGetBuiltinDescriptorsResult':
+        assert isinstance(obj, dict)
+        tools = from_list(BuiltinToolDescriptor.from_dict, obj.get("tools"))
+        return ToolsGetBuiltinDescriptorsResult(tools)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["tools"] = from_list(lambda x: to_class(BuiltinToolDescriptor, x), self.tools)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -28240,6 +34816,26 @@ def to_dict(self) -> dict:
         result["tools"] = from_union([lambda x: from_list(lambda x: to_class(CurrentToolMetadata, x), x), from_none], self.tools)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ToolsSetRequest:
+    """Complete externally implemented tool list for the calling connection. An empty list
+    removes every tool previously supplied by that connection.
+    """
+    tools: list[ProtocolExternalToolDefinition]
+    """Complete replacement list for the calling connection."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolsSetRequest':
+        assert isinstance(obj, dict)
+        tools = from_list(ProtocolExternalToolDefinition.from_dict, obj.get("tools"))
+        return ToolsSetRequest(tools)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["tools"] = from_list(lambda x: to_class(ProtocolExternalToolDefinition, x), self.tools)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class UIEphemeralQueryRequest:
@@ -28382,13 +34978,21 @@ class RPC:
     agent_select_result: AgentSelectResult
     agent_set_prompt_request: AgentSetPromptRequest
     agents_get_discovery_paths_request: AgentsGetDiscoveryPathsRequest
-    allow_all_permission_set_result: AllowAllPermissionSetResult
-    allow_all_permission_state: AllowAllPermissionState
     api_key_auth_info: APIKeyAuthInfo
+    auth_identity: AuthIdentity
     auth_info: AuthInfo
     auth_info_type: AuthInfoType
+    auth_validation_error: AuthValidationError
+    auth_validation_errors: list[AuthValidationError]
     built_in_model_catalog: BuiltInModelCatalog
     built_in_model_catalog_entry: BuiltInModelCatalogEntry
+    builtin_tool_descriptor: BuiltinToolDescriptor
+    builtin_tool_format: BuiltinToolFormat
+    builtin_tool_format_type: BuiltinToolFormatType
+    builtin_tool_input_schema: BuiltinToolInputSchema
+    builtin_tool_input_schema_type: BuiltinToolInputSchemaType
+    builtin_tool_safe_for_telemetry: bool | BuiltinToolSafeTelemetryFields
+    builtin_tool_safe_telemetry_fields: BuiltinToolSafeTelemetryFields
     cancel_user_requested_shell_command_result: CancelUserRequestedShellCommandResult
     canvas_action: CanvasAction
     canvas_action_invoke_request: CanvasActionInvokeRequest
@@ -28404,11 +35008,63 @@ class RPC:
     canvas_provider_invoke_action_request: CanvasProviderInvokeActionRequest
     canvas_provider_open_request: CanvasProviderOpenRequest
     canvas_provider_open_result: CanvasProviderOpenResult
+    canvas_provider_register_request: CanvasProviderRegisterRequest
+    canvas_provider_unregister_request: CanvasProviderUnregisterRequest
     canvas_session_context: CanvasSessionContext
     capi_session_options: CapiSessionOptions
+    card_digest: CardDigest
+    card_digest_algorithm: CardDigestAlgorithm
+    card_digest_value: str
+    catalog_ai_skill_candidate: CatalogAISkillCandidate
+    catalog_ai_skill_candidate_provenance: CatalogAISkillCandidateProvenance
+    catalog_authentication_required_error: CatalogAuthenticationRequiredError
+    catalog_authentication_required_reason: CatalogAuthenticationRequiredReason
+    catalog_candidate: CatalogCandidate
+    catalog_candidate_kind: CatalogCandidateKind
+    catalog_candidate_source: CatalogCandidateSource
+    catalog_candidate_source_embedded: CatalogCandidateSourceEmbedded
+    catalog_candidate_source_url: CatalogCandidateSourceURL
+    catalog_capability: CatalogCapability
+    catalog_capability_id: str
+    catalog_client_contract: CatalogClientContract
+    catalog_contract_violation_error: CatalogContractViolationError
+    catalog_contract_violation_reason: CatalogContractViolationReason
+    catalog_handle_rejected_error: CatalogHandleRejectedError
+    catalog_handle_rejection_reason: CatalogHandleRejectionReason
+    catalog_handle_type: CatalogHandleType
+    catalog_invalid_request_error: CatalogInvalidRequestError
+    catalog_invalid_request_field: CatalogInvalidRequestField
+    catalog_malformed_card_error: CatalogMalformedCardError
+    catalog_malformed_card_reason: CatalogMalformedCardReason
+    catalog_mcp_server_candidate: CatalogMCPServerCandidate
+    catalog_mcp_server_candidate_provenance: CatalogMCPServerCandidateProvenance
+    catalog_mcp_server_installability: CatalogMCPServerInstallabilityEnum
+    catalog_media_type: CatalogMediaType
+    catalog_negotiated_contract: CatalogNegotiatedContract
+    catalog_negotiation_refused_error: CatalogNegotiationRefusedError
+    catalog_negotiation_refused_reason: CatalogNegotiationRefusedReason
+    catalog_network_failure_error: CatalogNetworkFailureError
+    catalog_network_failure_reason: CatalogNetworkFailureReason
+    catalog_not_installable_error: CatalogNotInstallableError
+    catalog_not_installable_reason: CatalogNotInstallableReason
+    catalog_policy_rejected_error: CatalogPolicyRejectedError
+    catalog_search_request: CatalogSearchRequest
+    catalog_search_result: CatalogSearchResult
+    catalog_search_succeeded: CatalogSearchSucceeded
+    catalog_unavailable_error: CatalogUnavailableError
+    catalog_unavailable_reason: CatalogUnavailableReason
+    catalog_unavailable_transport_error: CatalogUnavailableTransportError
+    catalog_unavailable_transport_reason: CatalogUnavailableTransportReason
+    catalog_unsafe_retrieval_error: CatalogUnsafeRetrievalError
+    catalog_unsafe_retrieval_reason: CatalogUnsafeRetrievalReason
+    catalog_unsupported_kind_error: CatalogUnsupportedKindError
     command_list: CommandList
+    commands_finalize_invocation_effect_request: CommandsFinalizeInvocationEffectRequest
+    commands_finalize_invocation_effect_result: CommandsFinalizeInvocationEffectResult
     commands_handle_pending_command_request: CommandsHandlePendingCommandRequest
     commands_handle_pending_command_result: CommandsHandlePendingCommandResult
+    commands_invocation_effect_outcome: CommandsInvocationEffectOutcome
+    commands_invocation_origin: CommandsInvocationOrigin
     commands_invoke_request: CommandsInvokeRequest
     commands_list_request: Any
     commands_respond_to_queued_command_request: CommandsRespondToQueuedCommandRequest
@@ -28417,6 +35073,7 @@ class RPC:
     completions_request_request: CompletionsRequestRequest
     completions_request_result: CompletionsRequestResult
     configure_session_extensions_params: _ConfigureSessionExtensionsParams
+    connect_client_info: _ConnectClientInfo
     connected_remote_session_metadata: ConnectedRemoteSessionMetadata
     connected_remote_session_metadata_kind: ConnectedRemoteSessionMetadataKind
     connected_remote_session_metadata_repository: ConnectedRemoteSessionMetadataRepository
@@ -28473,6 +35130,9 @@ class RPC:
     execute_command_result: ExecuteCommandResult
     extension: Extension
     extension_context_push_input: ExtensionContextPushInput
+    extension_launch_profile: ExtensionLaunchProfile
+    extension_launch_provider_resolve_request: ExtensionLaunchProviderResolveRequest
+    extension_launch_provider_resolve_result: ExtensionLaunchProviderResolveResult
     extension_list: ExtensionList
     extensions_disable_request: ExtensionsDisableRequest
     extensions_enable_request: ExtensionsEnableRequest
@@ -28541,6 +35201,9 @@ class RPC:
     git_hub_telemetry_client_info: GitHubTelemetryClientInfo
     git_hub_telemetry_event: GitHubTelemetryEvent
     git_hub_telemetry_notification: GitHubTelemetryNotification
+    git_hub_token_acquire_reason: GitHubTokenAcquireReason
+    git_hub_token_acquire_request: GitHubTokenAcquireRequest
+    git_hub_token_acquire_result: GitHubTokenAcquireResult
     handle_pending_tool_call_request: HandlePendingToolCallRequest
     handle_pending_tool_call_result: HandlePendingToolCallResult
     history_abort_manual_compaction_result: HistoryAbortManualCompactionResult
@@ -28604,6 +35267,7 @@ class RPC:
     log_request: LogRequest
     log_result: LogResult
     lsp_initialize_request: LspInitializeRequest
+    managed_settings_read_result: ManagedSettingsReadResult
     marketplace_add_result: MarketplaceAddResult
     marketplace_browse_result: MarketplaceBrowseResult
     marketplace_info: MarketplaceInfo
@@ -28648,15 +35312,18 @@ class RPC:
     mcp_disable_request: MCPDisableRequest
     mcp_discover_request: MCPDiscoverRequest
     mcp_discover_result: MCPDiscoverResult
+    mcp_elicitation_form_mode: MCPElicitationFormMode
     mcp_enable_request: MCPEnableRequest
     mcp_execute_sampling_params: MCPExecuteSamplingParams
     mcp_execute_sampling_request: dict[str, Any]
     mcp_execute_sampling_result: dict[str, Any]
+    mcp_failed_server: MCPFailedServer
     mcp_filtered_server: MCPFilteredServer
     mcp_headers_handle_pending_headers_refresh_request: MCPHeadersHandlePendingHeadersRefreshRequest
     mcp_headers_handle_pending_headers_refresh_request_request: MCPHeadersHandlePendingHeadersRefreshRequestRequest
     mcp_headers_handle_pending_headers_refresh_request_result: MCPHeadersHandlePendingHeadersRefreshRequestResult
     mcp_host_state: MCPHostState
+    mcp_install_plan: MCPInstallPlan
     mcp_is_server_running_request: MCPIsServerRunningRequest
     mcp_is_server_running_result: MCPIsServerRunningResult
     mcp_list_tools_request: MCPListToolsRequest
@@ -28668,9 +35335,47 @@ class RPC:
     mcp_oauth_login_request: MCPOauthLoginRequest
     mcp_oauth_login_result: MCPOauthLoginResult
     mcp_oauth_pending_request_response: MCPOauthPendingRequestResponse
+    mcp_oauth_probe_needs_auth_reason: MCPOauthProbeNeedsAuthReason
+    mcp_oauth_probe_request: MCPOauthProbeRequest
+    mcp_oauth_probe_result: MCPOauthProbeResult
     mcp_oauth_respond_request: MCPOauthRespondRequest
     mcp_oauth_respond_result: MCPOauthRespondResult
+    mcp_plan_configuration_change: MCPPlanConfigurationChange
+    mcp_plan_configuration_operation: MCPPlanConfigurationOperation
+    mcp_plan_enum_value_type: MCPPlan
+    mcp_plan_install_planned: MCPPlanInstallPlanned
+    mcp_plan_install_request: MCPPlanInstallRequest
+    mcp_plan_install_result: MCPPlanInstallResult
+    mcp_plan_install_source: MCPPlanInstallSource
+    mcp_plan_install_source_candidate: MCPPlanInstallSourceCandidate
+    mcp_plan_install_source_candidate_kind: MCPPlanInstallSourceCandidateKind
+    mcp_plan_install_source_card: MCPPlanInstallSourceCard
+    mcp_plan_install_source_card_kind: MCPPlanInstallSourceCardKind
+    mcp_plan_package_install_method: MCPPlanPackageInstallMethod
+    mcp_plan_package_transport: MCPPlanPackageTransport
+    mcp_plan_policy_decision: MCPPlanPolicyDecision
+    mcp_plan_policy_result: MCPPlanPolicyResult
+    mcp_plan_policy_source: MCPPlanPolicySource
+    mcp_plan_provenance: MCPPlanProvenance
+    mcp_plan_remote_install_method: MCPPlanRemoteInstallMethod
+    mcp_plan_remote_transport: MCPPlanRemoteTransport
+    mcp_plan_required_value: MCPPlanRequiredValue
+    mcp_plan_required_value_enum: MCPPlanRequiredValueEnum
+    mcp_plan_required_value_enum_kind: MCPPlan
+    mcp_plan_required_value_scalar: MCPPlanRequiredValueScalar
+    mcp_plan_required_value_scalar_kind: MCPPlanRequiredValueScalarKind
+    mcp_plan_resource_identity: MCPPlanResourceIdentity
+    mcp_plan_scalar_value_type: MCPPlanScalarValueTypeEnum
+    mcp_plan_scope: MCPPlanScope
+    mcp_plan_secret_placeholder: MCPPlanSecretPlaceholder
+    mcp_plan_secret_reference: str
+    mcp_plan_target: MCPPlanTarget
+    mcp_plan_transport_choice: MCPPlanTransportChoice
+    mcp_plan_transport_choice_package: MCPPlanTransportChoicePackage
+    mcp_plan_transport_choice_remote: MCPPlanTransportChoiceRemote
+    mcp_plan_value_category: MCPPlanValueCategory
     mcp_register_external_client_request: MCPRegisterExternalClientRequest
+    mcp_reload_config: MCPReloadConfig
     mcp_reload_with_config_request: MCPReloadWithConfigRequest
     mcp_remove_git_hub_result: MCPRemoveGitHubResult
     mcp_resource: MCPResource
@@ -28685,17 +35390,29 @@ class RPC:
     mcp_resources_read_result: MCPResourcesReadResult
     mcp_resource_template: MCPResourceTemplate
     mcp_restart_server_request: MCPRestartServerRequest
+    mcp_safe_for_telemetry: bool | MCPSafeForTelemetryFields
+    mcp_safe_for_telemetry_fields: MCPSafeForTelemetryFields
     mcp_sampling_execution_action: MCPSamplingExecutionAction
     mcp_sampling_execution_result: MCPSamplingExecutionResult
+    mcp_serializable_server_config: MCPSerializableServerConfig
     mcp_server: MCPServer
     mcp_server_auth_config: bool | MCPServerAuthConfigRedirectPort
     mcp_server_auth_config_redirect_port: MCPServerAuthConfigRedirectPort
+    mcp_server_card_embedded: MCPServerCardEmbedded
+    mcp_server_card_embedded_kind: MCPServerCardEmbeddedKind
+    mcp_server_card_media_type: MCPServerCardMediaType
+    mcp_server_card_reference: MCPServerCardReference
+    mcp_server_card_url: MCPServerCardURL
+    mcp_server_card_url_kind: MCPServerCardURLKind
     mcp_server_config: MCPServerConfig
     mcp_server_config_defer_tools: MCPServerConfigDeferTools
     mcp_server_config_http: MCPServerConfigHTTP
     mcp_server_config_http_oauth_grant_type: MCPGrantType
     mcp_server_config_http_type: MCPServerConfigHTTPType
+    mcp_server_config_memory: MCPServerConfigMemory
+    mcp_server_config_memory_type: MCPServerConfigMemoryType
     mcp_server_config_stdio: MCPServerConfigStdio
+    mcp_server_config_stdio_type: MCPServerConfigStdioType
     mcp_server_failure_info: MCPServerFailureInfo
     mcp_server_list: MCPServerList
     mcp_server_needs_auth_info: MCPServerNeedsAuthInfo
@@ -28705,6 +35422,7 @@ class RPC:
     mcp_start_server_request: MCPStartServerRequest
     mcp_start_servers_result: MCPStartServersResult
     mcp_stop_server_request: MCPStopServerRequest
+    mcp_task_metadata: MCPTaskMetadata
     mcp_tools: MCPTools
     mcp_tool_ui: MCPToolUI
     mcp_tool_ui_visibility: MCPToolUIVisibility
@@ -28727,6 +35445,7 @@ class RPC:
     metadata_snapshot_remote_metadata_repository: MetadataSnapshotRemoteMetadataRepository
     metadata_snapshot_remote_metadata_task_type: TaskType
     model: Model
+    model_apply_startup_overlay_request: ModelApplyStartupOverlayRequest
     model_billing: ModelBilling
     model_billing_promo: ModelBillingPromo
     model_billing_token_prices: ModelBillingTokenPrices
@@ -28741,16 +35460,23 @@ class RPC:
     model_capabilities_supports: ModelCapabilitiesSupports
     model_list: ModelList
     model_list_request: Any
+    model_message: ModelMessage
     model_picker_category: ModelPickerCategory
+    model_picker_persistence_request: ModelPickerPersistenceRequest
     model_picker_price_category: ModelPickerPriceCategory
+    model_picker_settings_context: ModelPickerSettingsContext
     model_policy: ModelPolicy
     model_policy_state: ModelPolicyState
     model_set_reasoning_effort_request: ModelSetReasoningEffortRequest
     model_set_reasoning_effort_result: ModelSetReasoningEffortResult
     models_list_request: ModelsListRequest
+    model_switch_confirmation: ModelSwitchConfirmation
     model_switch_to_request: ModelSwitchToRequest
     model_switch_to_result: ModelSwitchToResult
+    model_warning_text: ModelWarningText
     mode_set_request: ModeSetRequest
+    mode_set_result: ModeSetResult
+    move_mcp_loading_to_background_result: MoveMCPLoadingToBackgroundResult
     named_provider_config: NamedProviderConfig
     name_get_result: NameGetResult
     name_set_auto_request: NameSetAutoRequest
@@ -28775,6 +35501,7 @@ class RPC:
     permission_decision_approve_for_location_approval: PermissionDecisionApproveForLocationApproval
     permission_decision_approve_for_location_approval_commands: PermissionDecisionApproveForLocationApprovalCommands
     permission_decision_approve_for_location_approval_custom_tool: PermissionDecisionApproveForLocationApprovalCustomTool
+    permission_decision_approve_for_location_approval_extension_env_access: PermissionDecisionApproveForLocationApprovalExtensionEnvAccess
     permission_decision_approve_for_location_approval_extension_management: PermissionDecisionApproveForLocationApprovalExtensionManagement
     permission_decision_approve_for_location_approval_extension_permission_access: PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess
     permission_decision_approve_for_location_approval_factory: PermissionDecisionApproveForLocationApprovalFactory
@@ -28787,6 +35514,7 @@ class RPC:
     permission_decision_approve_for_session_approval: PermissionDecisionApproveForSessionApproval
     permission_decision_approve_for_session_approval_commands: PermissionDecisionApproveForSessionApprovalCommands
     permission_decision_approve_for_session_approval_custom_tool: PermissionDecisionApproveForSessionApprovalCustomTool
+    permission_decision_approve_for_session_approval_extension_env_access: PermissionDecisionApproveForSessionApprovalExtensionEnvAccess
     permission_decision_approve_for_session_approval_extension_management: PermissionDecisionApproveForSessionApprovalExtensionManagement
     permission_decision_approve_for_session_approval_extension_permission_access: PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess
     permission_decision_approve_for_session_approval_factory: PermissionDecisionApproveForSessionApprovalFactory
@@ -28798,13 +35526,17 @@ class RPC:
     permission_decision_approve_once: PermissionDecisionApproveOnce
     permission_decision_approve_permanently: PermissionDecisionApprovePermanently
     permission_decision_cancelled: PermissionDecisionCancelled
+    permission_decision_context: PermissionDecisionContext
     permission_decision_denied_by_content_exclusion_policy: PermissionDecisionDeniedByContentExclusionPolicy
     permission_decision_denied_by_permission_request_hook: PermissionDecisionDeniedByPermissionRequestHook
     permission_decision_denied_by_rules: PermissionDecisionDeniedByRules
     permission_decision_denied_interactively_by_user: PermissionDecisionDeniedInteractivelyByUser
     permission_decision_denied_no_approval_rule_and_could_not_request_from_user: PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser
+    permission_decision_outcome: PermissionDecisionOutcome
     permission_decision_reject: PermissionDecisionReject
     permission_decision_request: PermissionDecisionRequest
+    permission_decision_source: PermissionDecisionSource
+    permission_decision_surface: PermissionDecisionSurface
     permission_decision_user_not_available: PermissionDecisionUserNotAvailable
     permission_location_add_tool_approval_params: PermissionLocationAddToolApprovalParams
     permission_location_apply_params: PermissionLocationApplyParams
@@ -28812,6 +35544,7 @@ class RPC:
     permission_location_resolve_params: PermissionLocationResolveParams
     permission_location_resolve_result: PermissionLocationResolveResult
     permission_location_type: PermissionLocationType
+    permission_mode_source: PermissionSource
     permission_paths_add_params: PermissionPathsAddParams
     permission_paths_allowed_check_params: PermissionPathsAllowedCheckParams
     permission_paths_allowed_check_result: PermissionPathsAllowedCheckResult
@@ -28822,8 +35555,8 @@ class RPC:
     permission_paths_workspace_check_result: PermissionPathsWorkspaceCheckResult
     permission_prompt_shown_notification: PermissionPromptShownNotification
     permission_request_result: PermissionRequestResult
+    permission_response_capability: PermissionResponseCapability
     permission_rules_set: PermissionRulesSet
-    permissions_allow_all_mode: PermissionsAllowAllMode
     permissions_configure_additional_content_exclusion_policy: PermissionsConfigureAdditionalContentExclusionPolicy
     permissions_configure_additional_content_exclusion_policy_rule: PermissionsConfigureAdditionalContentExclusionPolicyRule
     permissions_configure_additional_content_exclusion_policy_rule_source: PermissionsConfigureAdditionalContentExclusionPolicyRuleSource
@@ -28831,10 +35564,12 @@ class RPC:
     permissions_configure_params: PermissionsConfigureParams
     permissions_configure_result: PermissionsConfigureResult
     permissions_folder_trust_add_trusted_result: PermissionsFolderTrustAddTrustedResult
-    permissions_get_allow_all_request: PermissionsGetAllowAllRequest
+    permissions_get_mode_request: PermissionsGetModeRequest
+    permissions_get_mode_result: PermissionsGetModeResult
     permissions_locations_add_tool_approval_details: PermissionsLocationsAddToolApprovalDetails
     permissions_locations_add_tool_approval_details_commands: PermissionsLocationsAddToolApprovalDetailsCommands
     permissions_locations_add_tool_approval_details_custom_tool: PermissionsLocationsAddToolApprovalDetailsCustomTool
+    permissions_locations_add_tool_approval_details_extension_env_access: PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess
     permissions_locations_add_tool_approval_details_extension_management: PermissionsLocationsAddToolApprovalDetailsExtensionManagement
     permissions_locations_add_tool_approval_details_extension_permission_access: PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess
     permissions_locations_add_tool_approval_details_factory: PermissionsLocationsAddToolApprovalDetailsFactory
@@ -28854,11 +35589,11 @@ class RPC:
     permissions_pending_requests_request: PermissionsPendingRequestsRequest
     permissions_reset_session_approvals_request: PermissionsResetSessionApprovalsRequest
     permissions_reset_session_approvals_result: PermissionsResetSessionApprovalsResult
-    permissions_set_allow_all_request: PermissionsSetAllowAllRequest
-    permissions_set_allow_all_source: PermissionsSetAAllSource
     permissions_set_approve_all_request: PermissionsSetApproveAllRequest
     permissions_set_approve_all_result: PermissionsSetApproveAllResult
-    permissions_set_approve_all_source: PermissionsSetAAllSource
+    permissions_set_approve_all_source: PermissionSource
+    permissions_set_mode_request: PermissionsSetModeRequest
+    permissions_set_mode_result: PermissionsSetModeResult
     permissions_set_required_request: PermissionsSetRequiredRequest
     permissions_set_required_result: PermissionsSetRequiredResult
     permissions_urls_set_unrestricted_mode_result: PermissionsUrlsSetUnrestrictedModeResult
@@ -28876,6 +35611,7 @@ class RPC:
     plugin_install_result: PluginInstallResult
     plugin_list: PluginList
     plugin_list_result: PluginListResult
+    plugins_builtin_set_request: PluginsBuiltinSetRequest
     plugins_disable_request: PluginsDisableRequest
     plugins_enable_request: PluginsEnableRequest
     plugins_install_request: PluginsInstallRequest
@@ -28889,6 +35625,8 @@ class RPC:
     plugin_update_all_entry: PluginUpdateAllEntry
     plugin_update_all_result: PluginUpdateAllResult
     plugin_update_result: PluginUpdateResult
+    protocol_external_tool_defer: MCPServerConfigDeferTools
+    protocol_external_tool_definition: ProtocolExternalToolDefinition
     provider_add_request: ProviderAddRequest
     provider_add_result: ProviderAddResult
     provider_config: ProviderConfig
@@ -28978,6 +35716,7 @@ class RPC:
     remote_notify_steerable_changed_request: RemoteNotifySteerableChangedRequest
     remote_notify_steerable_changed_result: RemoteNotifySteerableChangedResult
     remote_session_connection_result: RemoteSessionConnectionResult
+    remote_session_host_status: RemoteSessionHostStatus
     remote_session_metadata_repository: RemoteSessionMetadataRepository
     remote_session_metadata_task_type: TaskType
     remote_session_metadata_value: RemoteSessionMetadataValue
@@ -28985,6 +35724,8 @@ class RPC:
     remote_session_repository: RemoteSessionRepository
     run_options: RunOptions
     sandbox_config: SandboxConfig
+    sandbox_config_auth: SandboxConfigAuth
+    sandbox_config_source: _SandboxConfigSource
     sandbox_config_user_policy: SandboxConfigUserPolicy
     sandbox_config_user_policy_experimental: SandboxConfigUserPolicyExperimental
     sandbox_config_user_policy_experimental_seatbelt: SandboxConfigUserPolicyExperimentalSeatbelt
@@ -29020,7 +35761,10 @@ class RPC:
     server_skill_list: ServerSkillList
     session_activity: SessionActivity
     session_agent_list_request: SessionAgentListRequest
+    session_auth_login_request: SessionAuthLoginRequest
+    session_auth_logout_user_request: SessionAuthLogoutUserRequest
     session_auth_status: SessionAuthStatus
+    session_auth_switch_request: SessionAuthSwitchRequest
     session_bulk_delete_result: SessionBulkDeleteResult
     session_cancel_all_background_agents_result: int
     session_capability: SessionCapability
@@ -29062,6 +35806,9 @@ class RPC:
     session_fs_stat_request: SessionFSStatRequest
     session_fs_stat_result: SessionFSStatResult
     session_fs_write_file_request: SessionFSWriteFileRequest
+    session_git_hub_auth_get_all_auth_available_result: list[SessionAuthStatus]
+    session_git_hub_auth_logout_result: bool
+    session_git_hub_auth_logout_user_result: bool
     session_history_compact_request: SessionHistoryCompactRequest
     session_installed_plugin: SessionInstalledPlugin
     session_installed_plugin_source: SessionInstalledPluginSource | str
@@ -29083,6 +35830,8 @@ class RPC:
     session_list_filter: SessionListFilter
     session_load_deferred_repo_hooks_result: SessionLoadDeferredRepoHooksResult
     session_log_level: SessionLogLevel
+    session_managed_permissions: SessionManagedPermissions
+    session_managed_settings: SessionManagedSettings
     session_mcp_apps_call_tool_result: dict[str, Any]
     session_metadata_snapshot: SessionMetadataSnapshot
     session_mode: SessionMode
@@ -29174,7 +35923,10 @@ class RPC:
     session_visibility_status: SessionVisibilityStatus
     session_working_directory_context: SessionWorkingDirectoryContext
     session_working_directory_context_host_type: HostType
+    settable_auth_info: SettableAuthInfo
+    settable_token_auth_info: SettableTokenAuthInfo
     shell_cancel_user_requested_request: ShellCancelUserRequestedRequest
+    shell_credentials: ShellCredentials
     shell_exec_request: ShellExecRequest
     shell_exec_result: ShellExecResult
     shell_execute_user_requested_request: ShellExecuteUserRequestedRequest
@@ -29192,6 +35944,7 @@ class RPC:
     skill_discovery_scope: SkillDiscoveryScope
     skill_list: SkillList
     skills_config_set_disabled_skills_request: SkillsConfigSetDisabledSkillsRequest
+    skills_config_set_skill_disabled_request: SkillsConfigSetSkillDisabledRequest
     skills_disable_request: SkillsDisableRequest
     skills_discover_request: SkillsDiscoverRequest
     skills_enable_request: SkillsEnableRequest
@@ -29199,6 +35952,7 @@ class RPC:
     skills_get_invoked_result: SkillsGetInvokedResult
     skills_invoked_skill: SkillsInvokedSkill
     skills_load_diagnostics: SkillsLoadDiagnostics
+    slash_command_add_timeline_entry_result: SlashCommandAddTimelineEntryResult
     slash_command_agent_prompt_result: SlashCommandAgentPromptResult
     slash_command_completed_result: SlashCommandCompletedResult
     slash_command_info: SlashCommandInfo
@@ -29207,13 +35961,20 @@ class RPC:
     slash_command_input_completion: SlashCommandInputCompletion
     slash_command_invocation_result: SlashCommandInvocationResult
     slash_command_kind: SlashCommandKind
+    slash_command_model_picker_dialog: SlashCommandModelPickerDialog
     slash_command_select_subcommand_option: SlashCommandSelectSubcommandOption
     slash_command_select_subcommand_result: SlashCommandSelectSubcommandResult
+    slash_command_set_model_result: SlashCommandSetModelResult
+    slash_command_set_plan_model_result: SlashCommandSetPlanModelResult
+    slash_command_show_dialog_result: SlashCommandShowDialogResult
     slash_command_text_result: SlashCommandTextResult
+    slash_command_timeline_entry: SlashCommandTimelineEntry
     subagent_settings_entry: SubagentSettingsEntry
     subagent_settings_entry_context_tier: SubagentSettingsEntryContextTier
     task_agent_info: TaskAgentInfo
     task_agent_progress: TaskAgentProgress
+    task_complete_data: TaskCompleteData
+    task_completion_decision: TaskCompletionDecision
     task_execution_mode: TaskExecutionMode
     task_info: TaskInfo
     task_list: TaskList
@@ -29240,11 +36001,23 @@ class RPC:
     tasks_wait_for_pending_result: TasksWaitForPendingResult
     telemetry_set_feature_overrides_request: TelemetrySetFeatureOverridesRequest
     token_auth_info: TokenAuthInfo
+    token_provider_auth_info: TokenProviderAuthInfo
     tool: Tool
     tool_list: ToolList
+    tool_result: ToolResultExpanded | str
+    tool_result_expanded: ToolResultExpanded
+    tool_result_new_message: ToolResultNewMessage
+    tool_result_type: ToolResultType
+    tools_execute_request: ToolsExecuteRequest
+    tools_get_builtin_descriptors_request: ToolsGetBuiltinDescriptorsRequest
+    tools_get_builtin_descriptors_result: ToolsGetBuiltinDescriptorsResult
     tools_get_current_metadata_result: ToolsGetCurrentMetadataResult
     tools_initialize_and_validate_result: ToolsInitializeAndValidateResult
     tools_list_request: ToolsListRequest
+    tools_set_request: ToolsSetRequest
+    tools_set_result: ToolsSetResult
+    tools_shell_descriptor_config: ToolsShellDescriptorConfig
+    tools_task_complete_event_data_request: ToolsTaskCompleteEventDataRequest
     tools_update_subagent_settings_result: ToolsUpdateSubagentSettingsResult
     ui_auto_mode_switch_response: UIAutoModeSwitchResponse
     ui_elicitation_array_any_of_field: UIElicitationArrayAnyOfField
@@ -29288,6 +36061,7 @@ class RPC:
     ui_user_input_response: UIUserInputResponse
     update_subagent_settings_request: UpdateSubagentSettingsRequest
     usage_get_metrics_result: UsageGetMetricsResult
+    usage_metrics_agent_metric: UsageMetricsAgentMetric
     usage_metrics_code_changes: UsageMetricsCodeChanges
     usage_metrics_model_metric: UsageMetricsModelMetric
     usage_metrics_model_metric_requests: UsageMetricsModelMetricRequests
@@ -29331,6 +36105,7 @@ class RPC:
     workspaces_workspace_details_host_type: HostType
     workspaces_write_autopilot_objective_request: WorkspacesWriteAutopilotObjectiveRequest
     workspaces_write_autopilot_objective_result: WorkspacesWriteAutopilotObjectiveResult
+    session_auth_info_result: AuthIdentity | None = None
     session_context_attribution: SessionContextAttribution | None = None
     session_context_info: SessionContextInfo | None = None
     subagent_settings: SubagentSettings | None = None
@@ -29383,13 +36158,21 @@ def from_dict(obj: Any) -> 'RPC':
         agent_select_result = AgentSelectResult.from_dict(obj.get("AgentSelectResult"))
         agent_set_prompt_request = AgentSetPromptRequest.from_dict(obj.get("AgentSetPromptRequest"))
         agents_get_discovery_paths_request = AgentsGetDiscoveryPathsRequest.from_dict(obj.get("AgentsGetDiscoveryPathsRequest"))
-        allow_all_permission_set_result = AllowAllPermissionSetResult.from_dict(obj.get("AllowAllPermissionSetResult"))
-        allow_all_permission_state = AllowAllPermissionState.from_dict(obj.get("AllowAllPermissionState"))
         api_key_auth_info = APIKeyAuthInfo.from_dict(obj.get("ApiKeyAuthInfo"))
+        auth_identity = AuthIdentity.from_dict(obj.get("AuthIdentity"))
         auth_info = _load_AuthInfo(obj.get("AuthInfo"))
         auth_info_type = AuthInfoType(obj.get("AuthInfoType"))
+        auth_validation_error = AuthValidationError.from_dict(obj.get("AuthValidationError"))
+        auth_validation_errors = from_list(AuthValidationError.from_dict, obj.get("AuthValidationErrors"))
         built_in_model_catalog = BuiltInModelCatalog.from_dict(obj.get("BuiltInModelCatalog"))
         built_in_model_catalog_entry = BuiltInModelCatalogEntry.from_dict(obj.get("BuiltInModelCatalogEntry"))
+        builtin_tool_descriptor = BuiltinToolDescriptor.from_dict(obj.get("BuiltinToolDescriptor"))
+        builtin_tool_format = BuiltinToolFormat.from_dict(obj.get("BuiltinToolFormat"))
+        builtin_tool_format_type = BuiltinToolFormatType(obj.get("BuiltinToolFormatType"))
+        builtin_tool_input_schema = BuiltinToolInputSchema.from_dict(obj.get("BuiltinToolInputSchema"))
+        builtin_tool_input_schema_type = BuiltinToolInputSchemaType(obj.get("BuiltinToolInputSchemaType"))
+        builtin_tool_safe_for_telemetry = from_union([from_bool, BuiltinToolSafeTelemetryFields.from_dict], obj.get("BuiltinToolSafeForTelemetry"))
+        builtin_tool_safe_telemetry_fields = BuiltinToolSafeTelemetryFields.from_dict(obj.get("BuiltinToolSafeTelemetryFields"))
         cancel_user_requested_shell_command_result = CancelUserRequestedShellCommandResult.from_dict(obj.get("CancelUserRequestedShellCommandResult"))
         canvas_action = CanvasAction.from_dict(obj.get("CanvasAction"))
         canvas_action_invoke_request = CanvasActionInvokeRequest.from_dict(obj.get("CanvasActionInvokeRequest"))
@@ -29405,11 +36188,63 @@ def from_dict(obj: Any) -> 'RPC':
         canvas_provider_invoke_action_request = CanvasProviderInvokeActionRequest.from_dict(obj.get("CanvasProviderInvokeActionRequest"))
         canvas_provider_open_request = CanvasProviderOpenRequest.from_dict(obj.get("CanvasProviderOpenRequest"))
         canvas_provider_open_result = CanvasProviderOpenResult.from_dict(obj.get("CanvasProviderOpenResult"))
+        canvas_provider_register_request = CanvasProviderRegisterRequest.from_dict(obj.get("CanvasProviderRegisterRequest"))
+        canvas_provider_unregister_request = CanvasProviderUnregisterRequest.from_dict(obj.get("CanvasProviderUnregisterRequest"))
         canvas_session_context = CanvasSessionContext.from_dict(obj.get("CanvasSessionContext"))
         capi_session_options = CapiSessionOptions.from_dict(obj.get("CapiSessionOptions"))
+        card_digest = CardDigest.from_dict(obj.get("CardDigest"))
+        card_digest_algorithm = CardDigestAlgorithm(obj.get("CardDigestAlgorithm"))
+        card_digest_value = from_str(obj.get("CardDigestValue"))
+        catalog_ai_skill_candidate = CatalogAISkillCandidate.from_dict(obj.get("CatalogAiSkillCandidate"))
+        catalog_ai_skill_candidate_provenance = CatalogAISkillCandidateProvenance.from_dict(obj.get("CatalogAiSkillCandidateProvenance"))
+        catalog_authentication_required_error = CatalogAuthenticationRequiredError.from_dict(obj.get("CatalogAuthenticationRequiredError"))
+        catalog_authentication_required_reason = CatalogAuthenticationRequiredReason(obj.get("CatalogAuthenticationRequiredReason"))
+        catalog_candidate = CatalogCandidate.from_dict(obj.get("CatalogCandidate"))
+        catalog_candidate_kind = CatalogCandidateKind(obj.get("CatalogCandidateKind"))
+        catalog_candidate_source = _load_CatalogCandidateSource(obj.get("CatalogCandidateSource"))
+        catalog_candidate_source_embedded = CatalogCandidateSourceEmbedded.from_dict(obj.get("CatalogCandidateSourceEmbedded"))
+        catalog_candidate_source_url = CatalogCandidateSourceURL.from_dict(obj.get("CatalogCandidateSourceUrl"))
+        catalog_capability = CatalogCapability(obj.get("CatalogCapability"))
+        catalog_capability_id = from_str(obj.get("CatalogCapabilityId"))
+        catalog_client_contract = CatalogClientContract.from_dict(obj.get("CatalogClientContract"))
+        catalog_contract_violation_error = CatalogContractViolationError.from_dict(obj.get("CatalogContractViolationError"))
+        catalog_contract_violation_reason = CatalogContractViolationReason(obj.get("CatalogContractViolationReason"))
+        catalog_handle_rejected_error = CatalogHandleRejectedError.from_dict(obj.get("CatalogHandleRejectedError"))
+        catalog_handle_rejection_reason = CatalogHandleRejectionReason(obj.get("CatalogHandleRejectionReason"))
+        catalog_handle_type = CatalogHandleType(obj.get("CatalogHandleType"))
+        catalog_invalid_request_error = CatalogInvalidRequestError.from_dict(obj.get("CatalogInvalidRequestError"))
+        catalog_invalid_request_field = CatalogInvalidRequestField(obj.get("CatalogInvalidRequestField"))
+        catalog_malformed_card_error = CatalogMalformedCardError.from_dict(obj.get("CatalogMalformedCardError"))
+        catalog_malformed_card_reason = CatalogMalformedCardReason(obj.get("CatalogMalformedCardReason"))
+        catalog_mcp_server_candidate = CatalogMCPServerCandidate.from_dict(obj.get("CatalogMcpServerCandidate"))
+        catalog_mcp_server_candidate_provenance = CatalogMCPServerCandidateProvenance.from_dict(obj.get("CatalogMcpServerCandidateProvenance"))
+        catalog_mcp_server_installability = CatalogMCPServerInstallabilityEnum(obj.get("CatalogMcpServerInstallability"))
+        catalog_media_type = CatalogMediaType(obj.get("CatalogMediaType"))
+        catalog_negotiated_contract = CatalogNegotiatedContract.from_dict(obj.get("CatalogNegotiatedContract"))
+        catalog_negotiation_refused_error = CatalogNegotiationRefusedError.from_dict(obj.get("CatalogNegotiationRefusedError"))
+        catalog_negotiation_refused_reason = CatalogNegotiationRefusedReason(obj.get("CatalogNegotiationRefusedReason"))
+        catalog_network_failure_error = CatalogNetworkFailureError.from_dict(obj.get("CatalogNetworkFailureError"))
+        catalog_network_failure_reason = CatalogNetworkFailureReason(obj.get("CatalogNetworkFailureReason"))
+        catalog_not_installable_error = CatalogNotInstallableError.from_dict(obj.get("CatalogNotInstallableError"))
+        catalog_not_installable_reason = CatalogNotInstallableReason(obj.get("CatalogNotInstallableReason"))
+        catalog_policy_rejected_error = CatalogPolicyRejectedError.from_dict(obj.get("CatalogPolicyRejectedError"))
+        catalog_search_request = CatalogSearchRequest.from_dict(obj.get("CatalogSearchRequest"))
+        catalog_search_result = _load_CatalogSearchResult(obj.get("CatalogSearchResult"))
+        catalog_search_succeeded = CatalogSearchSucceeded.from_dict(obj.get("CatalogSearchSucceeded"))
+        catalog_unavailable_error = CatalogUnavailableError.from_dict(obj.get("CatalogUnavailableError"))
+        catalog_unavailable_reason = CatalogUnavailableReason(obj.get("CatalogUnavailableReason"))
+        catalog_unavailable_transport_error = CatalogUnavailableTransportError.from_dict(obj.get("CatalogUnavailableTransportError"))
+        catalog_unavailable_transport_reason = CatalogUnavailableTransportReason(obj.get("CatalogUnavailableTransportReason"))
+        catalog_unsafe_retrieval_error = CatalogUnsafeRetrievalError.from_dict(obj.get("CatalogUnsafeRetrievalError"))
+        catalog_unsafe_retrieval_reason = CatalogUnsafeRetrievalReason(obj.get("CatalogUnsafeRetrievalReason"))
+        catalog_unsupported_kind_error = CatalogUnsupportedKindError.from_dict(obj.get("CatalogUnsupportedKindError"))
         command_list = CommandList.from_dict(obj.get("CommandList"))
+        commands_finalize_invocation_effect_request = CommandsFinalizeInvocationEffectRequest.from_dict(obj.get("CommandsFinalizeInvocationEffectRequest"))
+        commands_finalize_invocation_effect_result = CommandsFinalizeInvocationEffectResult.from_dict(obj.get("CommandsFinalizeInvocationEffectResult"))
         commands_handle_pending_command_request = CommandsHandlePendingCommandRequest.from_dict(obj.get("CommandsHandlePendingCommandRequest"))
         commands_handle_pending_command_result = CommandsHandlePendingCommandResult.from_dict(obj.get("CommandsHandlePendingCommandResult"))
+        commands_invocation_effect_outcome = CommandsInvocationEffectOutcome(obj.get("CommandsInvocationEffectOutcome"))
+        commands_invocation_origin = CommandsInvocationOrigin(obj.get("CommandsInvocationOrigin"))
         commands_invoke_request = CommandsInvokeRequest.from_dict(obj.get("CommandsInvokeRequest"))
         commands_list_request = obj.get("CommandsListRequest")
         commands_respond_to_queued_command_request = CommandsRespondToQueuedCommandRequest.from_dict(obj.get("CommandsRespondToQueuedCommandRequest"))
@@ -29418,6 +36253,7 @@ def from_dict(obj: Any) -> 'RPC':
         completions_request_request = CompletionsRequestRequest.from_dict(obj.get("CompletionsRequestRequest"))
         completions_request_result = CompletionsRequestResult.from_dict(obj.get("CompletionsRequestResult"))
         configure_session_extensions_params = _ConfigureSessionExtensionsParams.from_dict(obj.get("ConfigureSessionExtensionsParams"))
+        connect_client_info = _ConnectClientInfo.from_dict(obj.get("ConnectClientInfo"))
         connected_remote_session_metadata = ConnectedRemoteSessionMetadata.from_dict(obj.get("ConnectedRemoteSessionMetadata"))
         connected_remote_session_metadata_kind = ConnectedRemoteSessionMetadataKind(obj.get("ConnectedRemoteSessionMetadataKind"))
         connected_remote_session_metadata_repository = ConnectedRemoteSessionMetadataRepository.from_dict(obj.get("ConnectedRemoteSessionMetadataRepository"))
@@ -29474,6 +36310,9 @@ def from_dict(obj: Any) -> 'RPC':
         execute_command_result = ExecuteCommandResult.from_dict(obj.get("ExecuteCommandResult"))
         extension = Extension.from_dict(obj.get("Extension"))
         extension_context_push_input = ExtensionContextPushInput.from_dict(obj.get("ExtensionContextPushInput"))
+        extension_launch_profile = ExtensionLaunchProfile.from_dict(obj.get("ExtensionLaunchProfile"))
+        extension_launch_provider_resolve_request = ExtensionLaunchProviderResolveRequest.from_dict(obj.get("ExtensionLaunchProviderResolveRequest"))
+        extension_launch_provider_resolve_result = ExtensionLaunchProviderResolveResult.from_dict(obj.get("ExtensionLaunchProviderResolveResult"))
         extension_list = ExtensionList.from_dict(obj.get("ExtensionList"))
         extensions_disable_request = ExtensionsDisableRequest.from_dict(obj.get("ExtensionsDisableRequest"))
         extensions_enable_request = ExtensionsEnableRequest.from_dict(obj.get("ExtensionsEnableRequest"))
@@ -29542,6 +36381,9 @@ def from_dict(obj: Any) -> 'RPC':
         git_hub_telemetry_client_info = GitHubTelemetryClientInfo.from_dict(obj.get("GitHubTelemetryClientInfo"))
         git_hub_telemetry_event = GitHubTelemetryEvent.from_dict(obj.get("GitHubTelemetryEvent"))
         git_hub_telemetry_notification = GitHubTelemetryNotification.from_dict(obj.get("GitHubTelemetryNotification"))
+        git_hub_token_acquire_reason = GitHubTokenAcquireReason(obj.get("GitHubTokenAcquireReason"))
+        git_hub_token_acquire_request = GitHubTokenAcquireRequest.from_dict(obj.get("GitHubTokenAcquireRequest"))
+        git_hub_token_acquire_result = GitHubTokenAcquireResult.from_dict(obj.get("GitHubTokenAcquireResult"))
         handle_pending_tool_call_request = HandlePendingToolCallRequest.from_dict(obj.get("HandlePendingToolCallRequest"))
         handle_pending_tool_call_result = HandlePendingToolCallResult.from_dict(obj.get("HandlePendingToolCallResult"))
         history_abort_manual_compaction_result = HistoryAbortManualCompactionResult.from_dict(obj.get("HistoryAbortManualCompactionResult"))
@@ -29605,6 +36447,7 @@ def from_dict(obj: Any) -> 'RPC':
         log_request = LogRequest.from_dict(obj.get("LogRequest"))
         log_result = LogResult.from_dict(obj.get("LogResult"))
         lsp_initialize_request = LspInitializeRequest.from_dict(obj.get("LspInitializeRequest"))
+        managed_settings_read_result = ManagedSettingsReadResult.from_dict(obj.get("ManagedSettingsReadResult"))
         marketplace_add_result = MarketplaceAddResult.from_dict(obj.get("MarketplaceAddResult"))
         marketplace_browse_result = MarketplaceBrowseResult.from_dict(obj.get("MarketplaceBrowseResult"))
         marketplace_info = MarketplaceInfo.from_dict(obj.get("MarketplaceInfo"))
@@ -29649,15 +36492,18 @@ def from_dict(obj: Any) -> 'RPC':
         mcp_disable_request = MCPDisableRequest.from_dict(obj.get("McpDisableRequest"))
         mcp_discover_request = MCPDiscoverRequest.from_dict(obj.get("McpDiscoverRequest"))
         mcp_discover_result = MCPDiscoverResult.from_dict(obj.get("McpDiscoverResult"))
+        mcp_elicitation_form_mode = MCPElicitationFormMode(obj.get("McpElicitationFormMode"))
         mcp_enable_request = MCPEnableRequest.from_dict(obj.get("McpEnableRequest"))
         mcp_execute_sampling_params = MCPExecuteSamplingParams.from_dict(obj.get("McpExecuteSamplingParams"))
         mcp_execute_sampling_request = from_dict(lambda x: x, obj.get("McpExecuteSamplingRequest"))
         mcp_execute_sampling_result = from_dict(lambda x: x, obj.get("McpExecuteSamplingResult"))
+        mcp_failed_server = MCPFailedServer.from_dict(obj.get("McpFailedServer"))
         mcp_filtered_server = MCPFilteredServer.from_dict(obj.get("McpFilteredServer"))
         mcp_headers_handle_pending_headers_refresh_request = MCPHeadersHandlePendingHeadersRefreshRequest.from_dict(obj.get("McpHeadersHandlePendingHeadersRefreshRequest"))
         mcp_headers_handle_pending_headers_refresh_request_request = MCPHeadersHandlePendingHeadersRefreshRequestRequest.from_dict(obj.get("McpHeadersHandlePendingHeadersRefreshRequestRequest"))
         mcp_headers_handle_pending_headers_refresh_request_result = MCPHeadersHandlePendingHeadersRefreshRequestResult.from_dict(obj.get("McpHeadersHandlePendingHeadersRefreshRequestResult"))
         mcp_host_state = MCPHostState.from_dict(obj.get("McpHostState"))
+        mcp_install_plan = MCPInstallPlan.from_dict(obj.get("McpInstallPlan"))
         mcp_is_server_running_request = MCPIsServerRunningRequest.from_dict(obj.get("McpIsServerRunningRequest"))
         mcp_is_server_running_result = MCPIsServerRunningResult.from_dict(obj.get("McpIsServerRunningResult"))
         mcp_list_tools_request = MCPListToolsRequest.from_dict(obj.get("McpListToolsRequest"))
@@ -29669,9 +36515,47 @@ def from_dict(obj: Any) -> 'RPC':
         mcp_oauth_login_request = MCPOauthLoginRequest.from_dict(obj.get("McpOauthLoginRequest"))
         mcp_oauth_login_result = MCPOauthLoginResult.from_dict(obj.get("McpOauthLoginResult"))
         mcp_oauth_pending_request_response = MCPOauthPendingRequestResponse.from_dict(obj.get("McpOauthPendingRequestResponse"))
+        mcp_oauth_probe_needs_auth_reason = MCPOauthProbeNeedsAuthReason(obj.get("McpOauthProbeNeedsAuthReason"))
+        mcp_oauth_probe_request = MCPOauthProbeRequest.from_dict(obj.get("McpOauthProbeRequest"))
+        mcp_oauth_probe_result = MCPOauthProbeResult.from_dict(obj.get("McpOauthProbeResult"))
         mcp_oauth_respond_request = MCPOauthRespondRequest.from_dict(obj.get("McpOauthRespondRequest"))
         mcp_oauth_respond_result = MCPOauthRespondResult.from_dict(obj.get("McpOauthRespondResult"))
+        mcp_plan_configuration_change = MCPPlanConfigurationChange.from_dict(obj.get("McpPlanConfigurationChange"))
+        mcp_plan_configuration_operation = MCPPlanConfigurationOperation(obj.get("McpPlanConfigurationOperation"))
+        mcp_plan_enum_value_type = MCPPlan(obj.get("McpPlanEnumValueType"))
+        mcp_plan_install_planned = MCPPlanInstallPlanned.from_dict(obj.get("McpPlanInstallPlanned"))
+        mcp_plan_install_request = MCPPlanInstallRequest.from_dict(obj.get("McpPlanInstallRequest"))
+        mcp_plan_install_result = _load_MCPPlanInstallResult(obj.get("McpPlanInstallResult"))
+        mcp_plan_install_source = _load_MCPPlanInstallSource(obj.get("McpPlanInstallSource"))
+        mcp_plan_install_source_candidate = MCPPlanInstallSourceCandidate.from_dict(obj.get("McpPlanInstallSourceCandidate"))
+        mcp_plan_install_source_candidate_kind = MCPPlanInstallSourceCandidateKind(obj.get("McpPlanInstallSourceCandidateKind"))
+        mcp_plan_install_source_card = MCPPlanInstallSourceCard.from_dict(obj.get("McpPlanInstallSourceCard"))
+        mcp_plan_install_source_card_kind = MCPPlanInstallSourceCardKind(obj.get("McpPlanInstallSourceCardKind"))
+        mcp_plan_package_install_method = MCPPlanPackageInstallMethod(obj.get("McpPlanPackageInstallMethod"))
+        mcp_plan_package_transport = MCPPlanPackageTransport(obj.get("McpPlanPackageTransport"))
+        mcp_plan_policy_decision = MCPPlanPolicyDecision(obj.get("McpPlanPolicyDecision"))
+        mcp_plan_policy_result = MCPPlanPolicyResult.from_dict(obj.get("McpPlanPolicyResult"))
+        mcp_plan_policy_source = MCPPlanPolicySource(obj.get("McpPlanPolicySource"))
+        mcp_plan_provenance = MCPPlanProvenance.from_dict(obj.get("McpPlanProvenance"))
+        mcp_plan_remote_install_method = MCPPlanRemoteInstallMethod(obj.get("McpPlanRemoteInstallMethod"))
+        mcp_plan_remote_transport = MCPPlanRemoteTransport(obj.get("McpPlanRemoteTransport"))
+        mcp_plan_required_value = _load_MCPPlanRequiredValue(obj.get("McpPlanRequiredValue"))
+        mcp_plan_required_value_enum = MCPPlanRequiredValueEnum.from_dict(obj.get("McpPlanRequiredValueEnum"))
+        mcp_plan_required_value_enum_kind = MCPPlan(obj.get("McpPlanRequiredValueEnumKind"))
+        mcp_plan_required_value_scalar = MCPPlanRequiredValueScalar.from_dict(obj.get("McpPlanRequiredValueScalar"))
+        mcp_plan_required_value_scalar_kind = MCPPlanRequiredValueScalarKind(obj.get("McpPlanRequiredValueScalarKind"))
+        mcp_plan_resource_identity = MCPPlanResourceIdentity.from_dict(obj.get("McpPlanResourceIdentity"))
+        mcp_plan_scalar_value_type = MCPPlanScalarValueTypeEnum(obj.get("McpPlanScalarValueType"))
+        mcp_plan_scope = MCPPlanScope(obj.get("McpPlanScope"))
+        mcp_plan_secret_placeholder = MCPPlanSecretPlaceholder.from_dict(obj.get("McpPlanSecretPlaceholder"))
+        mcp_plan_secret_reference = from_str(obj.get("McpPlanSecretReference"))
+        mcp_plan_target = MCPPlanTarget.from_dict(obj.get("McpPlanTarget"))
+        mcp_plan_transport_choice = _load_MCPPlanTransportChoice(obj.get("McpPlanTransportChoice"))
+        mcp_plan_transport_choice_package = MCPPlanTransportChoicePackage.from_dict(obj.get("McpPlanTransportChoicePackage"))
+        mcp_plan_transport_choice_remote = MCPPlanTransportChoiceRemote.from_dict(obj.get("McpPlanTransportChoiceRemote"))
+        mcp_plan_value_category = MCPPlanValueCategory(obj.get("McpPlanValueCategory"))
         mcp_register_external_client_request = MCPRegisterExternalClientRequest.from_dict(obj.get("McpRegisterExternalClientRequest"))
+        mcp_reload_config = MCPReloadConfig.from_dict(obj.get("McpReloadConfig"))
         mcp_reload_with_config_request = MCPReloadWithConfigRequest.from_dict(obj.get("McpReloadWithConfigRequest"))
         mcp_remove_git_hub_result = MCPRemoveGitHubResult.from_dict(obj.get("McpRemoveGitHubResult"))
         mcp_resource = MCPResource.from_dict(obj.get("McpResource"))
@@ -29686,17 +36570,29 @@ def from_dict(obj: Any) -> 'RPC':
         mcp_resources_read_result = MCPResourcesReadResult.from_dict(obj.get("McpResourcesReadResult"))
         mcp_resource_template = MCPResourceTemplate.from_dict(obj.get("McpResourceTemplate"))
         mcp_restart_server_request = MCPRestartServerRequest.from_dict(obj.get("McpRestartServerRequest"))
+        mcp_safe_for_telemetry = from_union([from_bool, MCPSafeForTelemetryFields.from_dict], obj.get("McpSafeForTelemetry"))
+        mcp_safe_for_telemetry_fields = MCPSafeForTelemetryFields.from_dict(obj.get("McpSafeForTelemetryFields"))
         mcp_sampling_execution_action = MCPSamplingExecutionAction(obj.get("McpSamplingExecutionAction"))
         mcp_sampling_execution_result = MCPSamplingExecutionResult.from_dict(obj.get("McpSamplingExecutionResult"))
+        mcp_serializable_server_config = MCPSerializableServerConfig.from_dict(obj.get("McpSerializableServerConfig"))
         mcp_server = MCPServer.from_dict(obj.get("McpServer"))
         mcp_server_auth_config = from_union([from_bool, MCPServerAuthConfigRedirectPort.from_dict], obj.get("McpServerAuthConfig"))
         mcp_server_auth_config_redirect_port = MCPServerAuthConfigRedirectPort.from_dict(obj.get("McpServerAuthConfigRedirectPort"))
+        mcp_server_card_embedded = MCPServerCardEmbedded.from_dict(obj.get("McpServerCardEmbedded"))
+        mcp_server_card_embedded_kind = MCPServerCardEmbeddedKind(obj.get("McpServerCardEmbeddedKind"))
+        mcp_server_card_media_type = MCPServerCardMediaType(obj.get("McpServerCardMediaType"))
+        mcp_server_card_reference = _load_MCPServerCardReference(obj.get("McpServerCardReference"))
+        mcp_server_card_url = MCPServerCardURL.from_dict(obj.get("McpServerCardUrl"))
+        mcp_server_card_url_kind = MCPServerCardURLKind(obj.get("McpServerCardUrlKind"))
         mcp_server_config = MCPServerConfig.from_dict(obj.get("McpServerConfig"))
         mcp_server_config_defer_tools = MCPServerConfigDeferTools(obj.get("McpServerConfigDeferTools"))
         mcp_server_config_http = MCPServerConfigHTTP.from_dict(obj.get("McpServerConfigHttp"))
         mcp_server_config_http_oauth_grant_type = MCPGrantType(obj.get("McpServerConfigHttpOauthGrantType"))
         mcp_server_config_http_type = MCPServerConfigHTTPType(obj.get("McpServerConfigHttpType"))
+        mcp_server_config_memory = MCPServerConfigMemory.from_dict(obj.get("McpServerConfigMemory"))
+        mcp_server_config_memory_type = MCPServerConfigMemoryType(obj.get("McpServerConfigMemoryType"))
         mcp_server_config_stdio = MCPServerConfigStdio.from_dict(obj.get("McpServerConfigStdio"))
+        mcp_server_config_stdio_type = MCPServerConfigStdioType(obj.get("McpServerConfigStdioType"))
         mcp_server_failure_info = MCPServerFailureInfo.from_dict(obj.get("McpServerFailureInfo"))
         mcp_server_list = MCPServerList.from_dict(obj.get("McpServerList"))
         mcp_server_needs_auth_info = MCPServerNeedsAuthInfo.from_dict(obj.get("McpServerNeedsAuthInfo"))
@@ -29706,6 +36602,7 @@ def from_dict(obj: Any) -> 'RPC':
         mcp_start_server_request = MCPStartServerRequest.from_dict(obj.get("McpStartServerRequest"))
         mcp_start_servers_result = MCPStartServersResult.from_dict(obj.get("McpStartServersResult"))
         mcp_stop_server_request = MCPStopServerRequest.from_dict(obj.get("McpStopServerRequest"))
+        mcp_task_metadata = MCPTaskMetadata.from_dict(obj.get("McpTaskMetadata"))
         mcp_tools = MCPTools.from_dict(obj.get("McpTools"))
         mcp_tool_ui = MCPToolUI.from_dict(obj.get("McpToolUi"))
         mcp_tool_ui_visibility = MCPToolUIVisibility(obj.get("McpToolUiVisibility"))
@@ -29728,6 +36625,7 @@ def from_dict(obj: Any) -> 'RPC':
         metadata_snapshot_remote_metadata_repository = MetadataSnapshotRemoteMetadataRepository.from_dict(obj.get("MetadataSnapshotRemoteMetadataRepository"))
         metadata_snapshot_remote_metadata_task_type = TaskType(obj.get("MetadataSnapshotRemoteMetadataTaskType"))
         model = Model.from_dict(obj.get("Model"))
+        model_apply_startup_overlay_request = ModelApplyStartupOverlayRequest.from_dict(obj.get("ModelApplyStartupOverlayRequest"))
         model_billing = ModelBilling.from_dict(obj.get("ModelBilling"))
         model_billing_promo = ModelBillingPromo.from_dict(obj.get("ModelBillingPromo"))
         model_billing_token_prices = ModelBillingTokenPrices.from_dict(obj.get("ModelBillingTokenPrices"))
@@ -29742,16 +36640,23 @@ def from_dict(obj: Any) -> 'RPC':
         model_capabilities_supports = ModelCapabilitiesSupports.from_dict(obj.get("ModelCapabilitiesSupports"))
         model_list = ModelList.from_dict(obj.get("ModelList"))
         model_list_request = obj.get("ModelListRequest")
+        model_message = ModelMessage.from_dict(obj.get("ModelMessage"))
         model_picker_category = ModelPickerCategory(obj.get("ModelPickerCategory"))
+        model_picker_persistence_request = ModelPickerPersistenceRequest.from_dict(obj.get("ModelPickerPersistenceRequest"))
         model_picker_price_category = ModelPickerPriceCategory(obj.get("ModelPickerPriceCategory"))
+        model_picker_settings_context = ModelPickerSettingsContext.from_dict(obj.get("ModelPickerSettingsContext"))
         model_policy = ModelPolicy.from_dict(obj.get("ModelPolicy"))
         model_policy_state = ModelPolicyState(obj.get("ModelPolicyState"))
         model_set_reasoning_effort_request = ModelSetReasoningEffortRequest.from_dict(obj.get("ModelSetReasoningEffortRequest"))
         model_set_reasoning_effort_result = ModelSetReasoningEffortResult.from_dict(obj.get("ModelSetReasoningEffortResult"))
         models_list_request = ModelsListRequest.from_dict(obj.get("ModelsListRequest"))
+        model_switch_confirmation = ModelSwitchConfirmation.from_dict(obj.get("ModelSwitchConfirmation"))
         model_switch_to_request = ModelSwitchToRequest.from_dict(obj.get("ModelSwitchToRequest"))
         model_switch_to_result = ModelSwitchToResult.from_dict(obj.get("ModelSwitchToResult"))
+        model_warning_text = ModelWarningText.from_dict(obj.get("ModelWarningText"))
         mode_set_request = ModeSetRequest.from_dict(obj.get("ModeSetRequest"))
+        mode_set_result = ModeSetResult.from_dict(obj.get("ModeSetResult"))
+        move_mcp_loading_to_background_result = MoveMCPLoadingToBackgroundResult.from_dict(obj.get("MoveMcpLoadingToBackgroundResult"))
         named_provider_config = NamedProviderConfig.from_dict(obj.get("NamedProviderConfig"))
         name_get_result = NameGetResult.from_dict(obj.get("NameGetResult"))
         name_set_auto_request = NameSetAutoRequest.from_dict(obj.get("NameSetAutoRequest"))
@@ -29776,6 +36681,7 @@ def from_dict(obj: Any) -> 'RPC':
         permission_decision_approve_for_location_approval = _load_PermissionDecisionApproveForLocationApproval(obj.get("PermissionDecisionApproveForLocationApproval"))
         permission_decision_approve_for_location_approval_commands = PermissionDecisionApproveForLocationApprovalCommands.from_dict(obj.get("PermissionDecisionApproveForLocationApprovalCommands"))
         permission_decision_approve_for_location_approval_custom_tool = PermissionDecisionApproveForLocationApprovalCustomTool.from_dict(obj.get("PermissionDecisionApproveForLocationApprovalCustomTool"))
+        permission_decision_approve_for_location_approval_extension_env_access = PermissionDecisionApproveForLocationApprovalExtensionEnvAccess.from_dict(obj.get("PermissionDecisionApproveForLocationApprovalExtensionEnvAccess"))
         permission_decision_approve_for_location_approval_extension_management = PermissionDecisionApproveForLocationApprovalExtensionManagement.from_dict(obj.get("PermissionDecisionApproveForLocationApprovalExtensionManagement"))
         permission_decision_approve_for_location_approval_extension_permission_access = PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess.from_dict(obj.get("PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess"))
         permission_decision_approve_for_location_approval_factory = PermissionDecisionApproveForLocationApprovalFactory.from_dict(obj.get("PermissionDecisionApproveForLocationApprovalFactory"))
@@ -29788,6 +36694,7 @@ def from_dict(obj: Any) -> 'RPC':
         permission_decision_approve_for_session_approval = _load_PermissionDecisionApproveForSessionApproval(obj.get("PermissionDecisionApproveForSessionApproval"))
         permission_decision_approve_for_session_approval_commands = PermissionDecisionApproveForSessionApprovalCommands.from_dict(obj.get("PermissionDecisionApproveForSessionApprovalCommands"))
         permission_decision_approve_for_session_approval_custom_tool = PermissionDecisionApproveForSessionApprovalCustomTool.from_dict(obj.get("PermissionDecisionApproveForSessionApprovalCustomTool"))
+        permission_decision_approve_for_session_approval_extension_env_access = PermissionDecisionApproveForSessionApprovalExtensionEnvAccess.from_dict(obj.get("PermissionDecisionApproveForSessionApprovalExtensionEnvAccess"))
         permission_decision_approve_for_session_approval_extension_management = PermissionDecisionApproveForSessionApprovalExtensionManagement.from_dict(obj.get("PermissionDecisionApproveForSessionApprovalExtensionManagement"))
         permission_decision_approve_for_session_approval_extension_permission_access = PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess.from_dict(obj.get("PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess"))
         permission_decision_approve_for_session_approval_factory = PermissionDecisionApproveForSessionApprovalFactory.from_dict(obj.get("PermissionDecisionApproveForSessionApprovalFactory"))
@@ -29799,13 +36706,17 @@ def from_dict(obj: Any) -> 'RPC':
         permission_decision_approve_once = PermissionDecisionApproveOnce.from_dict(obj.get("PermissionDecisionApproveOnce"))
         permission_decision_approve_permanently = PermissionDecisionApprovePermanently.from_dict(obj.get("PermissionDecisionApprovePermanently"))
         permission_decision_cancelled = PermissionDecisionCancelled.from_dict(obj.get("PermissionDecisionCancelled"))
+        permission_decision_context = PermissionDecisionContext.from_dict(obj.get("PermissionDecisionContext"))
         permission_decision_denied_by_content_exclusion_policy = PermissionDecisionDeniedByContentExclusionPolicy.from_dict(obj.get("PermissionDecisionDeniedByContentExclusionPolicy"))
         permission_decision_denied_by_permission_request_hook = PermissionDecisionDeniedByPermissionRequestHook.from_dict(obj.get("PermissionDecisionDeniedByPermissionRequestHook"))
         permission_decision_denied_by_rules = PermissionDecisionDeniedByRules.from_dict(obj.get("PermissionDecisionDeniedByRules"))
         permission_decision_denied_interactively_by_user = PermissionDecisionDeniedInteractivelyByUser.from_dict(obj.get("PermissionDecisionDeniedInteractivelyByUser"))
         permission_decision_denied_no_approval_rule_and_could_not_request_from_user = PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser.from_dict(obj.get("PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser"))
+        permission_decision_outcome = PermissionDecisionOutcome(obj.get("PermissionDecisionOutcome"))
         permission_decision_reject = PermissionDecisionReject.from_dict(obj.get("PermissionDecisionReject"))
         permission_decision_request = PermissionDecisionRequest.from_dict(obj.get("PermissionDecisionRequest"))
+        permission_decision_source = PermissionDecisionSource(obj.get("PermissionDecisionSource"))
+        permission_decision_surface = PermissionDecisionSurface(obj.get("PermissionDecisionSurface"))
         permission_decision_user_not_available = PermissionDecisionUserNotAvailable.from_dict(obj.get("PermissionDecisionUserNotAvailable"))
         permission_location_add_tool_approval_params = PermissionLocationAddToolApprovalParams.from_dict(obj.get("PermissionLocationAddToolApprovalParams"))
         permission_location_apply_params = PermissionLocationApplyParams.from_dict(obj.get("PermissionLocationApplyParams"))
@@ -29813,6 +36724,7 @@ def from_dict(obj: Any) -> 'RPC':
         permission_location_resolve_params = PermissionLocationResolveParams.from_dict(obj.get("PermissionLocationResolveParams"))
         permission_location_resolve_result = PermissionLocationResolveResult.from_dict(obj.get("PermissionLocationResolveResult"))
         permission_location_type = PermissionLocationType(obj.get("PermissionLocationType"))
+        permission_mode_source = PermissionSource(obj.get("PermissionModeSource"))
         permission_paths_add_params = PermissionPathsAddParams.from_dict(obj.get("PermissionPathsAddParams"))
         permission_paths_allowed_check_params = PermissionPathsAllowedCheckParams.from_dict(obj.get("PermissionPathsAllowedCheckParams"))
         permission_paths_allowed_check_result = PermissionPathsAllowedCheckResult.from_dict(obj.get("PermissionPathsAllowedCheckResult"))
@@ -29823,8 +36735,8 @@ def from_dict(obj: Any) -> 'RPC':
         permission_paths_workspace_check_result = PermissionPathsWorkspaceCheckResult.from_dict(obj.get("PermissionPathsWorkspaceCheckResult"))
         permission_prompt_shown_notification = PermissionPromptShownNotification.from_dict(obj.get("PermissionPromptShownNotification"))
         permission_request_result = PermissionRequestResult.from_dict(obj.get("PermissionRequestResult"))
+        permission_response_capability = PermissionResponseCapability(obj.get("PermissionResponseCapability"))
         permission_rules_set = PermissionRulesSet.from_dict(obj.get("PermissionRulesSet"))
-        permissions_allow_all_mode = PermissionsAllowAllMode(obj.get("PermissionsAllowAllMode"))
         permissions_configure_additional_content_exclusion_policy = PermissionsConfigureAdditionalContentExclusionPolicy.from_dict(obj.get("PermissionsConfigureAdditionalContentExclusionPolicy"))
         permissions_configure_additional_content_exclusion_policy_rule = PermissionsConfigureAdditionalContentExclusionPolicyRule.from_dict(obj.get("PermissionsConfigureAdditionalContentExclusionPolicyRule"))
         permissions_configure_additional_content_exclusion_policy_rule_source = PermissionsConfigureAdditionalContentExclusionPolicyRuleSource.from_dict(obj.get("PermissionsConfigureAdditionalContentExclusionPolicyRuleSource"))
@@ -29832,10 +36744,12 @@ def from_dict(obj: Any) -> 'RPC':
         permissions_configure_params = PermissionsConfigureParams.from_dict(obj.get("PermissionsConfigureParams"))
         permissions_configure_result = PermissionsConfigureResult.from_dict(obj.get("PermissionsConfigureResult"))
         permissions_folder_trust_add_trusted_result = PermissionsFolderTrustAddTrustedResult.from_dict(obj.get("PermissionsFolderTrustAddTrustedResult"))
-        permissions_get_allow_all_request = PermissionsGetAllowAllRequest.from_dict(obj.get("PermissionsGetAllowAllRequest"))
+        permissions_get_mode_request = PermissionsGetModeRequest.from_dict(obj.get("PermissionsGetModeRequest"))
+        permissions_get_mode_result = PermissionsGetModeResult.from_dict(obj.get("PermissionsGetModeResult"))
         permissions_locations_add_tool_approval_details = _load_PermissionsLocationsAddToolApprovalDetails(obj.get("PermissionsLocationsAddToolApprovalDetails"))
         permissions_locations_add_tool_approval_details_commands = PermissionsLocationsAddToolApprovalDetailsCommands.from_dict(obj.get("PermissionsLocationsAddToolApprovalDetailsCommands"))
         permissions_locations_add_tool_approval_details_custom_tool = PermissionsLocationsAddToolApprovalDetailsCustomTool.from_dict(obj.get("PermissionsLocationsAddToolApprovalDetailsCustomTool"))
+        permissions_locations_add_tool_approval_details_extension_env_access = PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess.from_dict(obj.get("PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess"))
         permissions_locations_add_tool_approval_details_extension_management = PermissionsLocationsAddToolApprovalDetailsExtensionManagement.from_dict(obj.get("PermissionsLocationsAddToolApprovalDetailsExtensionManagement"))
         permissions_locations_add_tool_approval_details_extension_permission_access = PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess.from_dict(obj.get("PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess"))
         permissions_locations_add_tool_approval_details_factory = PermissionsLocationsAddToolApprovalDetailsFactory.from_dict(obj.get("PermissionsLocationsAddToolApprovalDetailsFactory"))
@@ -29855,11 +36769,11 @@ def from_dict(obj: Any) -> 'RPC':
         permissions_pending_requests_request = PermissionsPendingRequestsRequest.from_dict(obj.get("PermissionsPendingRequestsRequest"))
         permissions_reset_session_approvals_request = PermissionsResetSessionApprovalsRequest.from_dict(obj.get("PermissionsResetSessionApprovalsRequest"))
         permissions_reset_session_approvals_result = PermissionsResetSessionApprovalsResult.from_dict(obj.get("PermissionsResetSessionApprovalsResult"))
-        permissions_set_allow_all_request = PermissionsSetAllowAllRequest.from_dict(obj.get("PermissionsSetAllowAllRequest"))
-        permissions_set_allow_all_source = PermissionsSetAAllSource(obj.get("PermissionsSetAllowAllSource"))
         permissions_set_approve_all_request = PermissionsSetApproveAllRequest.from_dict(obj.get("PermissionsSetApproveAllRequest"))
         permissions_set_approve_all_result = PermissionsSetApproveAllResult.from_dict(obj.get("PermissionsSetApproveAllResult"))
-        permissions_set_approve_all_source = PermissionsSetAAllSource(obj.get("PermissionsSetApproveAllSource"))
+        permissions_set_approve_all_source = PermissionSource(obj.get("PermissionsSetApproveAllSource"))
+        permissions_set_mode_request = PermissionsSetModeRequest.from_dict(obj.get("PermissionsSetModeRequest"))
+        permissions_set_mode_result = PermissionsSetModeResult.from_dict(obj.get("PermissionsSetModeResult"))
         permissions_set_required_request = PermissionsSetRequiredRequest.from_dict(obj.get("PermissionsSetRequiredRequest"))
         permissions_set_required_result = PermissionsSetRequiredResult.from_dict(obj.get("PermissionsSetRequiredResult"))
         permissions_urls_set_unrestricted_mode_result = PermissionsUrlsSetUnrestrictedModeResult.from_dict(obj.get("PermissionsUrlsSetUnrestrictedModeResult"))
@@ -29877,6 +36791,7 @@ def from_dict(obj: Any) -> 'RPC':
         plugin_install_result = PluginInstallResult.from_dict(obj.get("PluginInstallResult"))
         plugin_list = PluginList.from_dict(obj.get("PluginList"))
         plugin_list_result = PluginListResult.from_dict(obj.get("PluginListResult"))
+        plugins_builtin_set_request = PluginsBuiltinSetRequest.from_dict(obj.get("PluginsBuiltinSetRequest"))
         plugins_disable_request = PluginsDisableRequest.from_dict(obj.get("PluginsDisableRequest"))
         plugins_enable_request = PluginsEnableRequest.from_dict(obj.get("PluginsEnableRequest"))
         plugins_install_request = PluginsInstallRequest.from_dict(obj.get("PluginsInstallRequest"))
@@ -29890,6 +36805,8 @@ def from_dict(obj: Any) -> 'RPC':
         plugin_update_all_entry = PluginUpdateAllEntry.from_dict(obj.get("PluginUpdateAllEntry"))
         plugin_update_all_result = PluginUpdateAllResult.from_dict(obj.get("PluginUpdateAllResult"))
         plugin_update_result = PluginUpdateResult.from_dict(obj.get("PluginUpdateResult"))
+        protocol_external_tool_defer = MCPServerConfigDeferTools(obj.get("ProtocolExternalToolDefer"))
+        protocol_external_tool_definition = ProtocolExternalToolDefinition.from_dict(obj.get("ProtocolExternalToolDefinition"))
         provider_add_request = ProviderAddRequest.from_dict(obj.get("ProviderAddRequest"))
         provider_add_result = ProviderAddResult.from_dict(obj.get("ProviderAddResult"))
         provider_config = ProviderConfig.from_dict(obj.get("ProviderConfig"))
@@ -29979,6 +36896,7 @@ def from_dict(obj: Any) -> 'RPC':
         remote_notify_steerable_changed_request = RemoteNotifySteerableChangedRequest.from_dict(obj.get("RemoteNotifySteerableChangedRequest"))
         remote_notify_steerable_changed_result = RemoteNotifySteerableChangedResult.from_dict(obj.get("RemoteNotifySteerableChangedResult"))
         remote_session_connection_result = RemoteSessionConnectionResult.from_dict(obj.get("RemoteSessionConnectionResult"))
+        remote_session_host_status = RemoteSessionHostStatus(obj.get("RemoteSessionHostStatus"))
         remote_session_metadata_repository = RemoteSessionMetadataRepository.from_dict(obj.get("RemoteSessionMetadataRepository"))
         remote_session_metadata_task_type = TaskType(obj.get("RemoteSessionMetadataTaskType"))
         remote_session_metadata_value = RemoteSessionMetadataValue.from_dict(obj.get("RemoteSessionMetadataValue"))
@@ -29986,6 +36904,8 @@ def from_dict(obj: Any) -> 'RPC':
         remote_session_repository = RemoteSessionRepository.from_dict(obj.get("RemoteSessionRepository"))
         run_options = RunOptions.from_dict(obj.get("RunOptions"))
         sandbox_config = SandboxConfig.from_dict(obj.get("SandboxConfig"))
+        sandbox_config_auth = SandboxConfigAuth.from_dict(obj.get("SandboxConfigAuth"))
+        sandbox_config_source = _SandboxConfigSource(obj.get("SandboxConfigSource"))
         sandbox_config_user_policy = SandboxConfigUserPolicy.from_dict(obj.get("SandboxConfigUserPolicy"))
         sandbox_config_user_policy_experimental = SandboxConfigUserPolicyExperimental.from_dict(obj.get("SandboxConfigUserPolicyExperimental"))
         sandbox_config_user_policy_experimental_seatbelt = SandboxConfigUserPolicyExperimentalSeatbelt.from_dict(obj.get("SandboxConfigUserPolicyExperimentalSeatbelt"))
@@ -30021,7 +36941,10 @@ def from_dict(obj: Any) -> 'RPC':
         server_skill_list = ServerSkillList.from_dict(obj.get("ServerSkillList"))
         session_activity = SessionActivity.from_dict(obj.get("SessionActivity"))
         session_agent_list_request = SessionAgentListRequest.from_dict(obj.get("SessionAgentListRequest"))
+        session_auth_login_request = SessionAuthLoginRequest.from_dict(obj.get("SessionAuthLoginRequest"))
+        session_auth_logout_user_request = SessionAuthLogoutUserRequest.from_dict(obj.get("SessionAuthLogoutUserRequest"))
         session_auth_status = SessionAuthStatus.from_dict(obj.get("SessionAuthStatus"))
+        session_auth_switch_request = SessionAuthSwitchRequest.from_dict(obj.get("SessionAuthSwitchRequest"))
         session_bulk_delete_result = SessionBulkDeleteResult.from_dict(obj.get("SessionBulkDeleteResult"))
         session_cancel_all_background_agents_result = from_int(obj.get("SessionCancelAllBackgroundAgentsResult"))
         session_capability = SessionCapability(obj.get("SessionCapability"))
@@ -30063,6 +36986,9 @@ def from_dict(obj: Any) -> 'RPC':
         session_fs_stat_request = SessionFSStatRequest.from_dict(obj.get("SessionFsStatRequest"))
         session_fs_stat_result = SessionFSStatResult.from_dict(obj.get("SessionFsStatResult"))
         session_fs_write_file_request = SessionFSWriteFileRequest.from_dict(obj.get("SessionFsWriteFileRequest"))
+        session_git_hub_auth_get_all_auth_available_result = from_list(SessionAuthStatus.from_dict, obj.get("SessionGitHubAuthGetAllAuthAvailableResult"))
+        session_git_hub_auth_logout_result = from_bool(obj.get("SessionGitHubAuthLogoutResult"))
+        session_git_hub_auth_logout_user_result = from_bool(obj.get("SessionGitHubAuthLogoutUserResult"))
         session_history_compact_request = SessionHistoryCompactRequest.from_dict(obj.get("SessionHistoryCompactRequest"))
         session_installed_plugin = SessionInstalledPlugin.from_dict(obj.get("SessionInstalledPlugin"))
         session_installed_plugin_source = from_union([SessionInstalledPluginSource.from_dict, from_str], obj.get("SessionInstalledPluginSource"))
@@ -30084,6 +37010,8 @@ def from_dict(obj: Any) -> 'RPC':
         session_list_filter = SessionListFilter.from_dict(obj.get("SessionListFilter"))
         session_load_deferred_repo_hooks_result = SessionLoadDeferredRepoHooksResult.from_dict(obj.get("SessionLoadDeferredRepoHooksResult"))
         session_log_level = SessionLogLevel(obj.get("SessionLogLevel"))
+        session_managed_permissions = SessionManagedPermissions.from_dict(obj.get("SessionManagedPermissions"))
+        session_managed_settings = SessionManagedSettings.from_dict(obj.get("SessionManagedSettings"))
         session_mcp_apps_call_tool_result = from_dict(lambda x: x, obj.get("SessionMcpAppsCallToolResult"))
         session_metadata_snapshot = SessionMetadataSnapshot.from_dict(obj.get("SessionMetadataSnapshot"))
         session_mode = SessionMode(obj.get("SessionMode"))
@@ -30175,7 +37103,10 @@ def from_dict(obj: Any) -> 'RPC':
         session_visibility_status = SessionVisibilityStatus(obj.get("SessionVisibilityStatus"))
         session_working_directory_context = SessionWorkingDirectoryContext.from_dict(obj.get("SessionWorkingDirectoryContext"))
         session_working_directory_context_host_type = HostType(obj.get("SessionWorkingDirectoryContextHostType"))
+        settable_auth_info = _load_SettableAuthInfo(obj.get("SettableAuthInfo"))
+        settable_token_auth_info = SettableTokenAuthInfo.from_dict(obj.get("SettableTokenAuthInfo"))
         shell_cancel_user_requested_request = ShellCancelUserRequestedRequest.from_dict(obj.get("ShellCancelUserRequestedRequest"))
+        shell_credentials = ShellCredentials.from_dict(obj.get("ShellCredentials"))
         shell_exec_request = ShellExecRequest.from_dict(obj.get("ShellExecRequest"))
         shell_exec_result = ShellExecResult.from_dict(obj.get("ShellExecResult"))
         shell_execute_user_requested_request = ShellExecuteUserRequestedRequest.from_dict(obj.get("ShellExecuteUserRequestedRequest"))
@@ -30193,6 +37124,7 @@ def from_dict(obj: Any) -> 'RPC':
         skill_discovery_scope = SkillDiscoveryScope(obj.get("SkillDiscoveryScope"))
         skill_list = SkillList.from_dict(obj.get("SkillList"))
         skills_config_set_disabled_skills_request = SkillsConfigSetDisabledSkillsRequest.from_dict(obj.get("SkillsConfigSetDisabledSkillsRequest"))
+        skills_config_set_skill_disabled_request = SkillsConfigSetSkillDisabledRequest.from_dict(obj.get("SkillsConfigSetSkillDisabledRequest"))
         skills_disable_request = SkillsDisableRequest.from_dict(obj.get("SkillsDisableRequest"))
         skills_discover_request = SkillsDiscoverRequest.from_dict(obj.get("SkillsDiscoverRequest"))
         skills_enable_request = SkillsEnableRequest.from_dict(obj.get("SkillsEnableRequest"))
@@ -30200,6 +37132,7 @@ def from_dict(obj: Any) -> 'RPC':
         skills_get_invoked_result = SkillsGetInvokedResult.from_dict(obj.get("SkillsGetInvokedResult"))
         skills_invoked_skill = SkillsInvokedSkill.from_dict(obj.get("SkillsInvokedSkill"))
         skills_load_diagnostics = SkillsLoadDiagnostics.from_dict(obj.get("SkillsLoadDiagnostics"))
+        slash_command_add_timeline_entry_result = SlashCommandAddTimelineEntryResult.from_dict(obj.get("SlashCommandAddTimelineEntryResult"))
         slash_command_agent_prompt_result = SlashCommandAgentPromptResult.from_dict(obj.get("SlashCommandAgentPromptResult"))
         slash_command_completed_result = SlashCommandCompletedResult.from_dict(obj.get("SlashCommandCompletedResult"))
         slash_command_info = SlashCommandInfo.from_dict(obj.get("SlashCommandInfo"))
@@ -30208,13 +37141,20 @@ def from_dict(obj: Any) -> 'RPC':
         slash_command_input_completion = SlashCommandInputCompletion(obj.get("SlashCommandInputCompletion"))
         slash_command_invocation_result = _load_SlashCommandInvocationResult(obj.get("SlashCommandInvocationResult"))
         slash_command_kind = SlashCommandKind(obj.get("SlashCommandKind"))
+        slash_command_model_picker_dialog = SlashCommandModelPickerDialog.from_dict(obj.get("SlashCommandModelPickerDialog"))
         slash_command_select_subcommand_option = SlashCommandSelectSubcommandOption.from_dict(obj.get("SlashCommandSelectSubcommandOption"))
         slash_command_select_subcommand_result = SlashCommandSelectSubcommandResult.from_dict(obj.get("SlashCommandSelectSubcommandResult"))
+        slash_command_set_model_result = SlashCommandSetModelResult.from_dict(obj.get("SlashCommandSetModelResult"))
+        slash_command_set_plan_model_result = SlashCommandSetPlanModelResult.from_dict(obj.get("SlashCommandSetPlanModelResult"))
+        slash_command_show_dialog_result = SlashCommandShowDialogResult.from_dict(obj.get("SlashCommandShowDialogResult"))
         slash_command_text_result = SlashCommandTextResult.from_dict(obj.get("SlashCommandTextResult"))
+        slash_command_timeline_entry = SlashCommandTimelineEntry.from_dict(obj.get("SlashCommandTimelineEntry"))
         subagent_settings_entry = SubagentSettingsEntry.from_dict(obj.get("SubagentSettingsEntry"))
         subagent_settings_entry_context_tier = SubagentSettingsEntryContextTier(obj.get("SubagentSettingsEntryContextTier"))
         task_agent_info = TaskAgentInfo.from_dict(obj.get("TaskAgentInfo"))
         task_agent_progress = TaskAgentProgress.from_dict(obj.get("TaskAgentProgress"))
+        task_complete_data = TaskCompleteData.from_dict(obj.get("TaskCompleteData"))
+        task_completion_decision = TaskCompletionDecision.from_dict(obj.get("TaskCompletionDecision"))
         task_execution_mode = TaskExecutionMode(obj.get("TaskExecutionMode"))
         task_info = _load_TaskInfo(obj.get("TaskInfo"))
         task_list = TaskList.from_dict(obj.get("TaskList"))
@@ -30241,11 +37181,23 @@ def from_dict(obj: Any) -> 'RPC':
         tasks_wait_for_pending_result = TasksWaitForPendingResult.from_dict(obj.get("TasksWaitForPendingResult"))
         telemetry_set_feature_overrides_request = TelemetrySetFeatureOverridesRequest.from_dict(obj.get("TelemetrySetFeatureOverridesRequest"))
         token_auth_info = TokenAuthInfo.from_dict(obj.get("TokenAuthInfo"))
+        token_provider_auth_info = TokenProviderAuthInfo.from_dict(obj.get("TokenProviderAuthInfo"))
         tool = Tool.from_dict(obj.get("Tool"))
         tool_list = ToolList.from_dict(obj.get("ToolList"))
+        tool_result = from_union([ToolResultExpanded.from_dict, from_str], obj.get("ToolResult"))
+        tool_result_expanded = ToolResultExpanded.from_dict(obj.get("ToolResultExpanded"))
+        tool_result_new_message = ToolResultNewMessage.from_dict(obj.get("ToolResultNewMessage"))
+        tool_result_type = ToolResultType(obj.get("ToolResultType"))
+        tools_execute_request = ToolsExecuteRequest.from_dict(obj.get("ToolsExecuteRequest"))
+        tools_get_builtin_descriptors_request = ToolsGetBuiltinDescriptorsRequest.from_dict(obj.get("ToolsGetBuiltinDescriptorsRequest"))
+        tools_get_builtin_descriptors_result = ToolsGetBuiltinDescriptorsResult.from_dict(obj.get("ToolsGetBuiltinDescriptorsResult"))
         tools_get_current_metadata_result = ToolsGetCurrentMetadataResult.from_dict(obj.get("ToolsGetCurrentMetadataResult"))
         tools_initialize_and_validate_result = ToolsInitializeAndValidateResult.from_dict(obj.get("ToolsInitializeAndValidateResult"))
         tools_list_request = ToolsListRequest.from_dict(obj.get("ToolsListRequest"))
+        tools_set_request = ToolsSetRequest.from_dict(obj.get("ToolsSetRequest"))
+        tools_set_result = ToolsSetResult.from_dict(obj.get("ToolsSetResult"))
+        tools_shell_descriptor_config = ToolsShellDescriptorConfig.from_dict(obj.get("ToolsShellDescriptorConfig"))
+        tools_task_complete_event_data_request = ToolsTaskCompleteEventDataRequest.from_dict(obj.get("ToolsTaskCompleteEventDataRequest"))
         tools_update_subagent_settings_result = ToolsUpdateSubagentSettingsResult.from_dict(obj.get("ToolsUpdateSubagentSettingsResult"))
         ui_auto_mode_switch_response = UIAutoModeSwitchResponse(obj.get("UIAutoModeSwitchResponse"))
         ui_elicitation_array_any_of_field = UIElicitationArrayAnyOfField.from_dict(obj.get("UIElicitationArrayAnyOfField"))
@@ -30289,6 +37241,7 @@ def from_dict(obj: Any) -> 'RPC':
         ui_user_input_response = UIUserInputResponse.from_dict(obj.get("UIUserInputResponse"))
         update_subagent_settings_request = UpdateSubagentSettingsRequest.from_dict(obj.get("UpdateSubagentSettingsRequest"))
         usage_get_metrics_result = UsageGetMetricsResult.from_dict(obj.get("UsageGetMetricsResult"))
+        usage_metrics_agent_metric = UsageMetricsAgentMetric.from_dict(obj.get("UsageMetricsAgentMetric"))
         usage_metrics_code_changes = UsageMetricsCodeChanges.from_dict(obj.get("UsageMetricsCodeChanges"))
         usage_metrics_model_metric = UsageMetricsModelMetric.from_dict(obj.get("UsageMetricsModelMetric"))
         usage_metrics_model_metric_requests = UsageMetricsModelMetricRequests.from_dict(obj.get("UsageMetricsModelMetricRequests"))
@@ -30332,12 +37285,13 @@ def from_dict(obj: Any) -> 'RPC':
         workspaces_workspace_details_host_type = HostType(obj.get("WorkspacesWorkspaceDetailsHostType"))
         workspaces_write_autopilot_objective_request = WorkspacesWriteAutopilotObjectiveRequest.from_dict(obj.get("WorkspacesWriteAutopilotObjectiveRequest"))
         workspaces_write_autopilot_objective_result = WorkspacesWriteAutopilotObjectiveResult.from_dict(obj.get("WorkspacesWriteAutopilotObjectiveResult"))
+        session_auth_info_result = from_union([AuthIdentity.from_dict, from_none], obj.get("SessionAuthInfoResult"))
         session_context_attribution = from_union([SessionContextAttribution.from_dict, from_none], obj.get("SessionContextAttribution"))
         session_context_info = from_union([SessionContextInfo.from_dict, from_none], obj.get("SessionContextInfo"))
         subagent_settings = from_union([SubagentSettings.from_dict, from_none], obj.get("SubagentSettings"))
         task_progress = from_union([TaskProgress.from_dict, from_none], obj.get("TaskProgress"))
         workspace_summary = from_union([WorkspaceSummary.from_dict, from_none], obj.get("WorkspaceSummary"))
-        return RPC(abort_request, abort_result, account_all_users, account_get_all_users_result, account_get_current_auth_result, account_get_quota_request, account_get_quota_result, account_login_request, account_login_result, account_logout_request, account_logout_result, account_quota_snapshot, adaptive_thinking_support, agent_discovery_path, agent_discovery_path_list, agent_discovery_path_scope, agent_get_current_result, agent_info, agent_info_source, agent_list, agent_list_request, agent_registry_live_target_entry, agent_registry_live_target_entry_attention_kind, agent_registry_live_target_entry_kind, agent_registry_live_target_entry_last_terminal_event, agent_registry_live_target_entry_status, agent_registry_log_capture, agent_registry_log_capture_open_error_reason, agent_registry_spawn_error, agent_registry_spawn_permission_mode, agent_registry_spawn_registry_timeout, agent_registry_spawn_request, agent_registry_spawn_result, agent_registry_spawn_spawned, agent_registry_spawn_validation_error, agent_registry_spawn_validation_error_field, agent_registry_spawn_validation_error_reason, agent_reload_result, agents_discover_request, agent_select_request, agent_select_result, agent_set_prompt_request, agents_get_discovery_paths_request, allow_all_permission_set_result, allow_all_permission_state, api_key_auth_info, auth_info, auth_info_type, built_in_model_catalog, built_in_model_catalog_entry, cancel_user_requested_shell_command_result, canvas_action, canvas_action_invoke_request, canvas_action_invoke_result, canvas_close_request, canvas_host_context, canvas_host_context_capabilities, canvas_json_schema, canvas_list, canvas_list_open_result, canvas_open_request, canvas_provider_close_request, canvas_provider_invoke_action_request, canvas_provider_open_request, canvas_provider_open_result, canvas_session_context, capi_session_options, command_list, commands_handle_pending_command_request, commands_handle_pending_command_result, commands_invoke_request, commands_list_request, commands_respond_to_queued_command_request, commands_respond_to_queued_command_result, completions_get_trigger_characters_result, completions_request_request, completions_request_result, configure_session_extensions_params, connected_remote_session_metadata, connected_remote_session_metadata_kind, connected_remote_session_metadata_repository, connect_remote_session_params, connect_request, connect_result, content_exclusion_check_paths_request, content_exclusion_check_paths_result, content_exclusion_path_check, content_filter_mode, context_heaviest_message, copilot_api_token_auth_info, copilot_user_response, copilot_user_response_endpoints, copilot_user_response_quota_snapshots, copilot_user_response_quota_snapshots_chat, copilot_user_response_quota_snapshots_completions, copilot_user_response_quota_snapshots_premium_interactions, current_model, current_tool_metadata, debug_collect_logs_collected_entry, debug_collect_logs_destination, debug_collect_logs_entry, debug_collect_logs_entry_kind, debug_collect_logs_include, debug_collect_logs_redaction, debug_collect_logs_request, debug_collect_logs_result, debug_collect_logs_result_kind, debug_collect_logs_skipped_entry, debug_collect_logs_source, discovered_canvas, discovered_extension, discovered_extension_mode, discovered_extension_plugin, discovered_extensions, discovered_extensions_disable_request, discovered_extensions_enable_request, discovered_extension_source, discovered_mcp_server, discovered_mcp_server_type, enqueue_command_params, enqueue_command_result, env_auth_info, event_log_read_request, event_log_release_interest_result, event_log_tail_result, event_log_types, events_agent_scope, events_cursor_status, events_read_direction, events_read_result, execute_command_params, execute_command_result, extension, extension_context_push_input, extension_list, extensions_disable_request, extensions_enable_request, extension_source, extension_status, external_tool_result, external_tool_text_result_for_llm, external_tool_text_result_for_llm_binary_results_for_llm, external_tool_text_result_for_llm_binary_results_for_llm_type, external_tool_text_result_for_llm_content, external_tool_text_result_for_llm_content_audio, external_tool_text_result_for_llm_content_image, external_tool_text_result_for_llm_content_resource, external_tool_text_result_for_llm_content_resource_details, external_tool_text_result_for_llm_content_resource_link, external_tool_text_result_for_llm_content_resource_link_icon, external_tool_text_result_for_llm_content_resource_link_icon_theme, external_tool_text_result_for_llm_content_shell_exit, external_tool_text_result_for_llm_content_terminal, external_tool_text_result_for_llm_content_text, factory_abort_request, factory_ack_result, factory_agent_options, factory_agent_request, factory_agent_result, factory_agent_summary, factory_cancel_request, factory_current_phase, factory_declared_limits, factory_durable_operation, factory_execute_request, factory_execute_result, factory_get_run_progress_request, factory_get_run_request, factory_journal_get_request, factory_journal_get_result, factory_journal_put_request, factory_list_runs_request, factory_list_runs_result, factory_log_line, factory_log_line_kind, factory_log_request, factory_phase_observation, factory_phase_status, factory_progress_line, factory_progress_page, factory_resume_request, factory_resume_result, factory_run_consumed, factory_run_detail, factory_run_failure, factory_run_failure_kind, factory_run_limits, factory_run_request, factory_run_result, factory_run_status, factory_run_summary, factory_run_terminal, filter_mapping, fleet_start_request, fleet_start_result, folder_trust_add_params, folder_trust_check_params, folder_trust_check_result, gh_cli_auth_info, git_hub_telemetry_client_info, git_hub_telemetry_event, git_hub_telemetry_notification, handle_pending_tool_call_request, handle_pending_tool_call_result, history_abort_manual_compaction_result, history_cancel_background_compaction_result, history_clear_context_request, history_clear_context_result, history_compact_context_window, history_compact_request, history_compact_result, history_file_restore_skip_reason, history_list_rewind_points_result, history_preview_rewind_request, history_preview_rewind_result, history_rewind_change_type, history_rewind_file_preview, history_rewind_mode, history_rewind_outcome, history_rewind_point, history_rewind_request, history_rewind_result, history_rewind_unavailable_reason, history_skipped_file_restore, history_summarize_for_handoff_result, history_truncate_request, history_truncate_result, hmac_auth_info, hook_invoke_request, hook_invoke_response, hook_type, installed_plugin, installed_plugin_info, installed_plugin_source, installed_plugin_source_git_hub, installed_plugin_source_local, installed_plugin_source_url, instruction_discovery_path, instruction_discovery_path_kind, instruction_discovery_path_list, instruction_discovery_path_location, instructions_discover_request, instructions_get_discovery_paths_request, instructions_get_sources_result, instruction_source, instruction_source_location, instruction_source_type, interrupt_main_turn_request, interrupt_main_turn_result, llm_inference_headers, llm_inference_http_request_chunk_request, llm_inference_http_request_chunk_result, llm_inference_http_request_start_request, llm_inference_http_request_start_result, llm_inference_http_request_start_transport, llm_inference_http_response_chunk_error, llm_inference_http_response_chunk_request, llm_inference_http_response_chunk_result, llm_inference_http_response_start_request, llm_inference_http_response_start_result, llm_inference_set_provider_result, local_session_metadata_value, log_request, log_result, lsp_initialize_request, marketplace_add_result, marketplace_browse_result, marketplace_info, marketplace_list_result, marketplace_plugin_info, marketplace_refresh_entry, marketplace_refresh_result, marketplace_remove_result, mcp_allowed_server, mcp_apps_call_tool_request, mcp_apps_diagnose_capability, mcp_apps_diagnose_request, mcp_apps_diagnose_result, mcp_apps_diagnose_server, mcp_apps_host_context, mcp_apps_host_context_details, mcp_apps_host_context_details_available_display_mode, mcp_apps_host_context_details_display_mode, mcp_apps_host_context_details_platform, mcp_apps_host_context_details_theme, mcp_apps_list_tools_request, mcp_apps_list_tools_result, mcp_apps_read_resource_request, mcp_apps_read_resource_result, mcp_apps_resource_content, mcp_apps_set_host_context_details, mcp_apps_set_host_context_details_available_display_mode, mcp_apps_set_host_context_details_display_mode, mcp_apps_set_host_context_details_platform, mcp_apps_set_host_context_details_theme, mcp_apps_set_host_context_request, mcp_cancel_sampling_execution_params, mcp_cancel_sampling_execution_result, mcp_config_add_request, mcp_config_disable_request, mcp_config_enable_request, mcp_config_list, mcp_config_remove_request, mcp_config_update_request, mcp_configure_git_hub_request, mcp_configure_git_hub_result, mcp_disable_request, mcp_discover_request, mcp_discover_result, mcp_enable_request, mcp_execute_sampling_params, mcp_execute_sampling_request, mcp_execute_sampling_result, mcp_filtered_server, mcp_headers_handle_pending_headers_refresh_request, mcp_headers_handle_pending_headers_refresh_request_request, mcp_headers_handle_pending_headers_refresh_request_result, mcp_host_state, mcp_is_server_running_request, mcp_is_server_running_result, mcp_list_tools_request, mcp_list_tools_result, mcp_oauth_authentication_state_changed_request, mcp_oauth_handle_pending_request, mcp_oauth_handle_pending_result, mcp_oauth_login_grant_type, mcp_oauth_login_request, mcp_oauth_login_result, mcp_oauth_pending_request_response, mcp_oauth_respond_request, mcp_oauth_respond_result, mcp_register_external_client_request, mcp_reload_with_config_request, mcp_remove_git_hub_result, mcp_resource, mcp_resource_annotations, mcp_resource_content, mcp_resource_icon, mcp_resources_list_request, mcp_resources_list_result, mcp_resources_list_templates_request, mcp_resources_list_templates_result, mcp_resources_read_request, mcp_resources_read_result, mcp_resource_template, mcp_restart_server_request, mcp_sampling_execution_action, mcp_sampling_execution_result, mcp_server, mcp_server_auth_config, mcp_server_auth_config_redirect_port, mcp_server_config, mcp_server_config_defer_tools, mcp_server_config_http, mcp_server_config_http_oauth_grant_type, mcp_server_config_http_type, mcp_server_config_stdio, mcp_server_failure_info, mcp_server_list, mcp_server_needs_auth_info, mcp_set_env_value_mode_details, mcp_set_env_value_mode_params, mcp_set_env_value_mode_result, mcp_start_server_request, mcp_start_servers_result, mcp_stop_server_request, mcp_tools, mcp_tool_ui, mcp_tool_ui_visibility, mcp_unregister_external_client_request, memory_configuration, metadata_context_attribution_result, metadata_context_heaviest_messages_request, metadata_context_heaviest_messages_result, metadata_context_info_request, metadata_context_info_result, metadata_is_processing_result, metadata_recompute_context_tokens_request, metadata_recompute_context_tokens_result, metadata_record_context_change_request, metadata_record_context_change_result, metadata_set_working_directory_request, metadata_set_working_directory_result, metadata_snapshot_current_mode, metadata_snapshot_remote_metadata, metadata_snapshot_remote_metadata_repository, metadata_snapshot_remote_metadata_task_type, model, model_billing, model_billing_promo, model_billing_token_prices, model_billing_token_prices_long_context, model_capabilities, model_capabilities_limits, model_capabilities_limits_vision, model_capabilities_override, model_capabilities_override_limits, model_capabilities_override_limits_vision, model_capabilities_override_supports, model_capabilities_supports, model_list, model_list_request, model_picker_category, model_picker_price_category, model_policy, model_policy_state, model_set_reasoning_effort_request, model_set_reasoning_effort_result, models_list_request, model_switch_to_request, model_switch_to_result, mode_set_request, named_provider_config, name_get_result, name_set_auto_request, name_set_auto_result, name_set_request, open_canvas_instance, options_update_additional_content_exclusion_policy, options_update_additional_content_exclusion_policy_rule, options_update_additional_content_exclusion_policy_rule_source, options_update_additional_content_exclusion_policy_scope, options_update_context_tier, options_update_env_value_mode, options_update_reasoning_summary, options_update_tool_filter_precedence, pending_permission_request, pending_permission_request_list, permission_decision, permission_decision_approved, permission_decision_approved_for_location, permission_decision_approved_for_session, permission_decision_approve_for_location, permission_decision_approve_for_location_approval, permission_decision_approve_for_location_approval_commands, permission_decision_approve_for_location_approval_custom_tool, permission_decision_approve_for_location_approval_extension_management, permission_decision_approve_for_location_approval_extension_permission_access, permission_decision_approve_for_location_approval_factory, permission_decision_approve_for_location_approval_mcp, permission_decision_approve_for_location_approval_mcp_sampling, permission_decision_approve_for_location_approval_memory, permission_decision_approve_for_location_approval_read, permission_decision_approve_for_location_approval_write, permission_decision_approve_for_session, permission_decision_approve_for_session_approval, permission_decision_approve_for_session_approval_commands, permission_decision_approve_for_session_approval_custom_tool, permission_decision_approve_for_session_approval_extension_management, permission_decision_approve_for_session_approval_extension_permission_access, permission_decision_approve_for_session_approval_factory, permission_decision_approve_for_session_approval_mcp, permission_decision_approve_for_session_approval_mcp_sampling, permission_decision_approve_for_session_approval_memory, permission_decision_approve_for_session_approval_read, permission_decision_approve_for_session_approval_write, permission_decision_approve_once, permission_decision_approve_permanently, permission_decision_cancelled, permission_decision_denied_by_content_exclusion_policy, permission_decision_denied_by_permission_request_hook, permission_decision_denied_by_rules, permission_decision_denied_interactively_by_user, permission_decision_denied_no_approval_rule_and_could_not_request_from_user, permission_decision_reject, permission_decision_request, permission_decision_user_not_available, permission_location_add_tool_approval_params, permission_location_apply_params, permission_location_apply_result, permission_location_resolve_params, permission_location_resolve_result, permission_location_type, permission_paths_add_params, permission_paths_allowed_check_params, permission_paths_allowed_check_result, permission_paths_config, permission_paths_list, permission_paths_update_primary_params, permission_paths_workspace_check_params, permission_paths_workspace_check_result, permission_prompt_shown_notification, permission_request_result, permission_rules_set, permissions_allow_all_mode, permissions_configure_additional_content_exclusion_policy, permissions_configure_additional_content_exclusion_policy_rule, permissions_configure_additional_content_exclusion_policy_rule_source, permissions_configure_additional_content_exclusion_policy_scope, permissions_configure_params, permissions_configure_result, permissions_folder_trust_add_trusted_result, permissions_get_allow_all_request, permissions_locations_add_tool_approval_details, permissions_locations_add_tool_approval_details_commands, permissions_locations_add_tool_approval_details_custom_tool, permissions_locations_add_tool_approval_details_extension_management, permissions_locations_add_tool_approval_details_extension_permission_access, permissions_locations_add_tool_approval_details_factory, permissions_locations_add_tool_approval_details_mcp, permissions_locations_add_tool_approval_details_mcp_sampling, permissions_locations_add_tool_approval_details_memory, permissions_locations_add_tool_approval_details_read, permissions_locations_add_tool_approval_details_write, permissions_locations_add_tool_approval_result, permissions_modify_rules_params, permissions_modify_rules_result, permissions_modify_rules_scope, permissions_notify_prompt_shown_result, permissions_paths_add_result, permissions_paths_list_request, permissions_paths_update_primary_result, permissions_pending_requests_request, permissions_reset_session_approvals_request, permissions_reset_session_approvals_result, permissions_set_allow_all_request, permissions_set_allow_all_source, permissions_set_approve_all_request, permissions_set_approve_all_result, permissions_set_approve_all_source, permissions_set_required_request, permissions_set_required_result, permissions_urls_set_unrestricted_mode_result, permission_urls_config, permission_urls_set_unrestricted_mode_params, ping_request, ping_result, plan_read_result, plan_read_sql_todos_result, plan_read_sql_todos_with_dependencies_result, plan_sql_todo_dependency, plan_sql_todos_row, plan_update_request, plugin, plugin_install_result, plugin_list, plugin_list_result, plugins_disable_request, plugins_enable_request, plugins_install_request, plugins_marketplaces_add_request, plugins_marketplaces_browse_request, plugins_marketplaces_refresh_request, plugins_marketplaces_remove_request, plugins_reload_request, plugins_uninstall_request, plugins_update_request, plugin_update_all_entry, plugin_update_all_result, plugin_update_result, provider_add_request, provider_add_result, provider_config, provider_config_azure, provider_config_transport, provider_config_type, provider_config_wire_api, provider_endpoint, provider_endpoint_transport, provider_endpoint_type, provider_endpoint_wire_api, provider_get_endpoint_request, provider_model_config, provider_session_token, provider_token_acquire_request, provider_token_acquire_result, push_attachment, push_attachment_blob, push_attachment_directory, push_attachment_file, push_attachment_file_line_range, push_attachment_git_hub_actions_job, push_attachment_git_hub_commit, push_attachment_git_hub_file, push_attachment_git_hub_file_diff, push_attachment_git_hub_file_diff_side, push_attachment_git_hub_reference, push_attachment_git_hub_reference_type, push_attachment_git_hub_release, push_attachment_git_hub_repository, push_attachment_git_hub_snippet, push_attachment_git_hub_tree_comparison, push_attachment_git_hub_tree_comparison_side, push_attachment_git_hub_url, push_attachment_selection, push_attachment_selection_details, push_attachment_selection_details_end, push_attachment_selection_details_start, push_git_hub_repo_ref, queue_begin_deferred_idle_drain_request, queue_begin_deferred_idle_drain_result, queue_consume_system_notifications_request, queued_command_handled, queued_command_not_handled, queued_command_result, queue_defer_session_idle_request, queue_duplicate_at_request, queue_duplicate_at_result, queue_enqueue_resume_pending_result, queue_finish_deferred_idle_drain_request, queue_finish_deferred_idle_drain_result, queue_has_pending_result, queue_insert_at_request, queue_insert_at_result, queue_insert_message, queue_move_item_request, queue_move_item_result, queue_pending_items, queue_pending_items_kind, queue_pending_items_result, queue_remove_at_request, queue_remove_at_result, queue_remove_most_recent_result, queue_send_now_request, queue_send_now_result, queue_set_drain_paused_request, queue_snapshot_result, queue_update_text_request, queue_update_text_result, register_event_interest_params, register_event_interest_result, register_extension_tools_params, register_extension_tools_result, release_event_interest_params, remote_control_config, remote_control_config_existing_mc_session, remote_control_status, remote_control_status_active, remote_control_status_connecting, remote_control_status_error, remote_control_status_off, remote_control_status_result, remote_control_stop_result, remote_control_transfer_result, remote_enable_request, remote_enable_result, remote_notify_steerable_changed_request, remote_notify_steerable_changed_result, remote_session_connection_result, remote_session_metadata_repository, remote_session_metadata_task_type, remote_session_metadata_value, remote_session_mode, remote_session_repository, run_options, sandbox_config, sandbox_config_user_policy, sandbox_config_user_policy_experimental, sandbox_config_user_policy_experimental_seatbelt, sandbox_config_user_policy_filesystem, sandbox_config_user_policy_network, sandbox_config_user_policy_network_proxy, sandbox_config_user_policy_seatbelt, schedule_add_at_request, schedule_add_cron_request, schedule_add_request, schedule_add_result, schedule_add_self_paced_request, schedule_entry, schedule_has_self_paced_result, schedule_list, schedule_rearm_self_paced_request, schedule_stop_request, schedule_stop_result, secrets_add_filter_values_request, secrets_add_filter_values_result, send_agent_mode, send_attachments_to_message_params, send_message_item, send_messages_request, send_messages_result, send_mode, send_request, send_result, send_system_notification_request, server_agent_list, server_instruction_source_list, server_skill, server_skill_list, session_activity, session_agent_list_request, session_auth_status, session_bulk_delete_result, session_cancel_all_background_agents_result, session_capability, session_commands_list_request, session_completion_item, session_context, session_context_host_type, session_enrich_metadata_result, session_fs_append_file_request, session_fs_error, session_fs_error_code, session_fs_exists_request, session_fs_exists_result, session_fs_mkdir_request, session_fs_readdir_request, session_fs_readdir_result, session_fs_readdir_with_types_entry, session_fs_readdir_with_types_entry_type, session_fs_readdir_with_types_request, session_fs_readdir_with_types_result, session_fs_read_file_request, session_fs_read_file_result, session_fs_rename_request, session_fs_rm_request, session_fs_set_provider_capabilities, session_fs_set_provider_conventions, session_fs_set_provider_request, session_fs_set_provider_result, session_fs_sqlite_exists_request, session_fs_sqlite_exists_result, session_fs_sqlite_query_request, session_fs_sqlite_query_result, session_fs_sqlite_query_type, session_fs_sqlite_transaction_error, session_fs_sqlite_transaction_error_class, session_fs_sqlite_transaction_request, session_fs_sqlite_transaction_result, session_fs_sqlite_transaction_statement, session_fs_stat_request, session_fs_stat_result, session_fs_write_file_request, session_history_compact_request, session_installed_plugin, session_installed_plugin_source, session_installed_plugin_source_git_hub, session_installed_plugin_source_local, session_installed_plugin_source_url, session_limit_prediction_baseline_data, session_limit_prediction_client_type, session_limit_prediction_details, session_limit_prediction_predict_request, session_limit_prediction_request, session_limit_prediction_result, session_limit_prediction_source, session_limit_prediction_tier, session_limit_prediction_tier_option, session_limit_prediction_unavailable_reason, session_list, session_list_entry, session_list_filter, session_load_deferred_repo_hooks_result, session_log_level, session_mcp_apps_call_tool_result, session_metadata_snapshot, session_mode, session_model_list, session_model_list_request, session_model_price_category, session_open_options, session_open_options_additional_content_exclusion_policy, session_open_options_additional_content_exclusion_policy_rule, session_open_options_additional_content_exclusion_policy_rule_source, session_open_options_additional_content_exclusion_policy_scope, session_open_options_env_value_mode, session_open_options_reasoning_summary, session_open_params, session_open_result, session_plugins_reload_request, session_provider_get_endpoint_request, session_prune_result, sessions_bulk_delete_request, sessions_check_in_use_request, sessions_check_in_use_result, sessions_close_request, sessions_close_result, sessions_delete_request, sessions_enrich_metadata_request, session_set_credentials_params, session_set_credentials_result, session_settings_built_in_tool_availability_snapshot, session_settings_evaluate_predicate_request, session_settings_evaluate_predicate_result, session_settings_job_snapshot, session_settings_model_snapshot, session_settings_online_evaluation_snapshot, session_settings_predicate_name, session_settings_repo_snapshot, session_settings_snapshot, session_settings_validation_snapshot, sessions_find_by_prefix_request, sessions_find_by_prefix_result, sessions_find_by_task_id_request, sessions_find_by_task_id_result, sessions_fork_request, sessions_fork_result, sessions_get_board_entry_count_request, sessions_get_board_entry_count_result, sessions_get_event_file_path_request, sessions_get_event_file_path_result, sessions_get_last_for_context_request, sessions_get_last_for_context_result, sessions_get_metadata_request, sessions_get_metadata_result, sessions_get_persisted_remote_steerable_request, sessions_get_persisted_remote_steerable_result, session_sizes, sessions_list_non_empty_session_ids_request, sessions_list_non_empty_session_ids_result, sessions_list_request, sessions_load_deferred_repo_hooks_request, sessions_open_attach, sessions_open_cloud, sessions_open_create, sessions_open_handoff, sessions_open_handoff_task_type, sessions_open_progress, sessions_open_progress_status, sessions_open_progress_step, sessions_open_remote, sessions_open_resume, sessions_open_resume_last, sessions_open_status, session_source, sessions_prune_old_request, sessions_register_extension_tools_on_session_options, sessions_release_lock_request, sessions_release_lock_result, sessions_reload_plugin_hooks_request, sessions_reload_plugin_hooks_result, sessions_save_request, sessions_save_result, sessions_set_additional_plugins_request, sessions_set_additional_plugins_result, sessions_set_remote_control_steering_request, sessions_start_remote_control_request, sessions_stop_remote_control_request, sessions_transfer_remote_control_request, session_telemetry_engagement, session_update_options_params, session_update_options_result, session_visibility_status, session_working_directory_context, session_working_directory_context_host_type, shell_cancel_user_requested_request, shell_exec_request, shell_exec_result, shell_execute_user_requested_request, shell_init_profile, shell_init_script, shell_init_script_shell, shell_kill_request, shell_kill_result, shell_kill_signal, shell_options, shutdown_request, skill, skill_discovery_path, skill_discovery_path_list, skill_discovery_scope, skill_list, skills_config_set_disabled_skills_request, skills_disable_request, skills_discover_request, skills_enable_request, skills_get_discovery_paths_request, skills_get_invoked_result, skills_invoked_skill, skills_load_diagnostics, slash_command_agent_prompt_result, slash_command_completed_result, slash_command_info, slash_command_input, slash_command_input_choice, slash_command_input_completion, slash_command_invocation_result, slash_command_kind, slash_command_select_subcommand_option, slash_command_select_subcommand_result, slash_command_text_result, subagent_settings_entry, subagent_settings_entry_context_tier, task_agent_info, task_agent_progress, task_execution_mode, task_info, task_list, task_progress_line, tasks_cancel_request, tasks_cancel_result, tasks_get_current_promotable_result, tasks_get_progress_request, tasks_get_progress_result, task_shell_info, task_shell_info_attachment_mode, task_shell_progress, tasks_promote_current_to_background_result, tasks_promote_to_background_request, tasks_promote_to_background_result, tasks_refresh_result, tasks_remove_request, tasks_remove_result, tasks_send_message_request, tasks_send_message_result, tasks_start_agent_request, tasks_start_agent_result, task_status, tasks_wait_for_pending_result, telemetry_set_feature_overrides_request, token_auth_info, tool, tool_list, tools_get_current_metadata_result, tools_initialize_and_validate_result, tools_list_request, tools_update_subagent_settings_result, ui_auto_mode_switch_response, ui_elicitation_array_any_of_field, ui_elicitation_array_any_of_field_items, ui_elicitation_array_any_of_field_items_any_of, ui_elicitation_array_enum_field, ui_elicitation_array_enum_field_items, ui_elicitation_field_value, ui_elicitation_request, ui_elicitation_response, ui_elicitation_response_action, ui_elicitation_response_content, ui_elicitation_result, ui_elicitation_schema, ui_elicitation_schema_property, ui_elicitation_schema_property_boolean, ui_elicitation_schema_property_number, ui_elicitation_schema_property_number_type, ui_elicitation_schema_property_string, ui_elicitation_schema_property_string_format, ui_elicitation_string_enum_field, ui_elicitation_string_one_of_field, ui_elicitation_string_one_of_field_one_of, ui_ephemeral_query_request, ui_ephemeral_query_result, ui_exit_plan_mode_action, ui_exit_plan_mode_response, ui_handle_pending_auto_mode_switch_request, ui_handle_pending_elicitation_request, ui_handle_pending_exit_plan_mode_request, ui_handle_pending_result, ui_handle_pending_sampling_request, ui_handle_pending_sampling_response, ui_handle_pending_session_limits_exhausted_request, ui_handle_pending_user_input_request, ui_register_direct_auto_mode_switch_handler_result, ui_session_limits_exhausted_response, ui_session_limits_exhausted_response_action, ui_unregister_direct_auto_mode_switch_handler_request, ui_unregister_direct_auto_mode_switch_handler_result, ui_user_input_response, update_subagent_settings_request, usage_get_metrics_result, usage_metrics_code_changes, usage_metrics_model_metric, usage_metrics_model_metric_requests, usage_metrics_model_metric_token_detail, usage_metrics_model_metric_usage, usage_metrics_token_detail, user_auth_info, user_requested_shell_command_result, user_setting_metadata, user_settings_get_result, user_settings_set_request, user_settings_set_result, visibility_get_result, visibility_set_request, visibility_set_result, workspace_diff_file_change, workspace_diff_file_change_type, workspace_diff_mode, workspace_diff_result, workspaces_add_summary_request, workspaces_add_summary_result, workspaces_autopilot_objective_exists_result, workspaces_checkpoints, workspaces_create_file_request, workspaces_delete_autopilot_objective_result, workspaces_diff_request, workspaces_ensure_request, workspaces_get_workspace_result, workspaces_list_checkpoints_result, workspaces_list_files_result, workspaces_read_autopilot_objective_result, workspaces_read_checkpoint_request, workspaces_read_checkpoint_result, workspaces_read_file_request, workspaces_read_file_result, workspaces_save_large_paste_request, workspaces_save_large_paste_result, workspaces_truncate_summaries_request, workspace_summary_host_type, workspaces_update_metadata_request, workspaces_workspace_details_host_type, workspaces_write_autopilot_objective_request, workspaces_write_autopilot_objective_result, session_context_attribution, session_context_info, subagent_settings, task_progress, workspace_summary)
+        return RPC(abort_request, abort_result, account_all_users, account_get_all_users_result, account_get_current_auth_result, account_get_quota_request, account_get_quota_result, account_login_request, account_login_result, account_logout_request, account_logout_result, account_quota_snapshot, adaptive_thinking_support, agent_discovery_path, agent_discovery_path_list, agent_discovery_path_scope, agent_get_current_result, agent_info, agent_info_source, agent_list, agent_list_request, agent_registry_live_target_entry, agent_registry_live_target_entry_attention_kind, agent_registry_live_target_entry_kind, agent_registry_live_target_entry_last_terminal_event, agent_registry_live_target_entry_status, agent_registry_log_capture, agent_registry_log_capture_open_error_reason, agent_registry_spawn_error, agent_registry_spawn_permission_mode, agent_registry_spawn_registry_timeout, agent_registry_spawn_request, agent_registry_spawn_result, agent_registry_spawn_spawned, agent_registry_spawn_validation_error, agent_registry_spawn_validation_error_field, agent_registry_spawn_validation_error_reason, agent_reload_result, agents_discover_request, agent_select_request, agent_select_result, agent_set_prompt_request, agents_get_discovery_paths_request, api_key_auth_info, auth_identity, auth_info, auth_info_type, auth_validation_error, auth_validation_errors, built_in_model_catalog, built_in_model_catalog_entry, builtin_tool_descriptor, builtin_tool_format, builtin_tool_format_type, builtin_tool_input_schema, builtin_tool_input_schema_type, builtin_tool_safe_for_telemetry, builtin_tool_safe_telemetry_fields, cancel_user_requested_shell_command_result, canvas_action, canvas_action_invoke_request, canvas_action_invoke_result, canvas_close_request, canvas_host_context, canvas_host_context_capabilities, canvas_json_schema, canvas_list, canvas_list_open_result, canvas_open_request, canvas_provider_close_request, canvas_provider_invoke_action_request, canvas_provider_open_request, canvas_provider_open_result, canvas_provider_register_request, canvas_provider_unregister_request, canvas_session_context, capi_session_options, card_digest, card_digest_algorithm, card_digest_value, catalog_ai_skill_candidate, catalog_ai_skill_candidate_provenance, catalog_authentication_required_error, catalog_authentication_required_reason, catalog_candidate, catalog_candidate_kind, catalog_candidate_source, catalog_candidate_source_embedded, catalog_candidate_source_url, catalog_capability, catalog_capability_id, catalog_client_contract, catalog_contract_violation_error, catalog_contract_violation_reason, catalog_handle_rejected_error, catalog_handle_rejection_reason, catalog_handle_type, catalog_invalid_request_error, catalog_invalid_request_field, catalog_malformed_card_error, catalog_malformed_card_reason, catalog_mcp_server_candidate, catalog_mcp_server_candidate_provenance, catalog_mcp_server_installability, catalog_media_type, catalog_negotiated_contract, catalog_negotiation_refused_error, catalog_negotiation_refused_reason, catalog_network_failure_error, catalog_network_failure_reason, catalog_not_installable_error, catalog_not_installable_reason, catalog_policy_rejected_error, catalog_search_request, catalog_search_result, catalog_search_succeeded, catalog_unavailable_error, catalog_unavailable_reason, catalog_unavailable_transport_error, catalog_unavailable_transport_reason, catalog_unsafe_retrieval_error, catalog_unsafe_retrieval_reason, catalog_unsupported_kind_error, command_list, commands_finalize_invocation_effect_request, commands_finalize_invocation_effect_result, commands_handle_pending_command_request, commands_handle_pending_command_result, commands_invocation_effect_outcome, commands_invocation_origin, commands_invoke_request, commands_list_request, commands_respond_to_queued_command_request, commands_respond_to_queued_command_result, completions_get_trigger_characters_result, completions_request_request, completions_request_result, configure_session_extensions_params, connect_client_info, connected_remote_session_metadata, connected_remote_session_metadata_kind, connected_remote_session_metadata_repository, connect_remote_session_params, connect_request, connect_result, content_exclusion_check_paths_request, content_exclusion_check_paths_result, content_exclusion_path_check, content_filter_mode, context_heaviest_message, copilot_api_token_auth_info, copilot_user_response, copilot_user_response_endpoints, copilot_user_response_quota_snapshots, copilot_user_response_quota_snapshots_chat, copilot_user_response_quota_snapshots_completions, copilot_user_response_quota_snapshots_premium_interactions, current_model, current_tool_metadata, debug_collect_logs_collected_entry, debug_collect_logs_destination, debug_collect_logs_entry, debug_collect_logs_entry_kind, debug_collect_logs_include, debug_collect_logs_redaction, debug_collect_logs_request, debug_collect_logs_result, debug_collect_logs_result_kind, debug_collect_logs_skipped_entry, debug_collect_logs_source, discovered_canvas, discovered_extension, discovered_extension_mode, discovered_extension_plugin, discovered_extensions, discovered_extensions_disable_request, discovered_extensions_enable_request, discovered_extension_source, discovered_mcp_server, discovered_mcp_server_type, enqueue_command_params, enqueue_command_result, env_auth_info, event_log_read_request, event_log_release_interest_result, event_log_tail_result, event_log_types, events_agent_scope, events_cursor_status, events_read_direction, events_read_result, execute_command_params, execute_command_result, extension, extension_context_push_input, extension_launch_profile, extension_launch_provider_resolve_request, extension_launch_provider_resolve_result, extension_list, extensions_disable_request, extensions_enable_request, extension_source, extension_status, external_tool_result, external_tool_text_result_for_llm, external_tool_text_result_for_llm_binary_results_for_llm, external_tool_text_result_for_llm_binary_results_for_llm_type, external_tool_text_result_for_llm_content, external_tool_text_result_for_llm_content_audio, external_tool_text_result_for_llm_content_image, external_tool_text_result_for_llm_content_resource, external_tool_text_result_for_llm_content_resource_details, external_tool_text_result_for_llm_content_resource_link, external_tool_text_result_for_llm_content_resource_link_icon, external_tool_text_result_for_llm_content_resource_link_icon_theme, external_tool_text_result_for_llm_content_shell_exit, external_tool_text_result_for_llm_content_terminal, external_tool_text_result_for_llm_content_text, factory_abort_request, factory_ack_result, factory_agent_options, factory_agent_request, factory_agent_result, factory_agent_summary, factory_cancel_request, factory_current_phase, factory_declared_limits, factory_durable_operation, factory_execute_request, factory_execute_result, factory_get_run_progress_request, factory_get_run_request, factory_journal_get_request, factory_journal_get_result, factory_journal_put_request, factory_list_runs_request, factory_list_runs_result, factory_log_line, factory_log_line_kind, factory_log_request, factory_phase_observation, factory_phase_status, factory_progress_line, factory_progress_page, factory_resume_request, factory_resume_result, factory_run_consumed, factory_run_detail, factory_run_failure, factory_run_failure_kind, factory_run_limits, factory_run_request, factory_run_result, factory_run_status, factory_run_summary, factory_run_terminal, filter_mapping, fleet_start_request, fleet_start_result, folder_trust_add_params, folder_trust_check_params, folder_trust_check_result, gh_cli_auth_info, git_hub_telemetry_client_info, git_hub_telemetry_event, git_hub_telemetry_notification, git_hub_token_acquire_reason, git_hub_token_acquire_request, git_hub_token_acquire_result, handle_pending_tool_call_request, handle_pending_tool_call_result, history_abort_manual_compaction_result, history_cancel_background_compaction_result, history_clear_context_request, history_clear_context_result, history_compact_context_window, history_compact_request, history_compact_result, history_file_restore_skip_reason, history_list_rewind_points_result, history_preview_rewind_request, history_preview_rewind_result, history_rewind_change_type, history_rewind_file_preview, history_rewind_mode, history_rewind_outcome, history_rewind_point, history_rewind_request, history_rewind_result, history_rewind_unavailable_reason, history_skipped_file_restore, history_summarize_for_handoff_result, history_truncate_request, history_truncate_result, hmac_auth_info, hook_invoke_request, hook_invoke_response, hook_type, installed_plugin, installed_plugin_info, installed_plugin_source, installed_plugin_source_git_hub, installed_plugin_source_local, installed_plugin_source_url, instruction_discovery_path, instruction_discovery_path_kind, instruction_discovery_path_list, instruction_discovery_path_location, instructions_discover_request, instructions_get_discovery_paths_request, instructions_get_sources_result, instruction_source, instruction_source_location, instruction_source_type, interrupt_main_turn_request, interrupt_main_turn_result, llm_inference_headers, llm_inference_http_request_chunk_request, llm_inference_http_request_chunk_result, llm_inference_http_request_start_request, llm_inference_http_request_start_result, llm_inference_http_request_start_transport, llm_inference_http_response_chunk_error, llm_inference_http_response_chunk_request, llm_inference_http_response_chunk_result, llm_inference_http_response_start_request, llm_inference_http_response_start_result, llm_inference_set_provider_result, local_session_metadata_value, log_request, log_result, lsp_initialize_request, managed_settings_read_result, marketplace_add_result, marketplace_browse_result, marketplace_info, marketplace_list_result, marketplace_plugin_info, marketplace_refresh_entry, marketplace_refresh_result, marketplace_remove_result, mcp_allowed_server, mcp_apps_call_tool_request, mcp_apps_diagnose_capability, mcp_apps_diagnose_request, mcp_apps_diagnose_result, mcp_apps_diagnose_server, mcp_apps_host_context, mcp_apps_host_context_details, mcp_apps_host_context_details_available_display_mode, mcp_apps_host_context_details_display_mode, mcp_apps_host_context_details_platform, mcp_apps_host_context_details_theme, mcp_apps_list_tools_request, mcp_apps_list_tools_result, mcp_apps_read_resource_request, mcp_apps_read_resource_result, mcp_apps_resource_content, mcp_apps_set_host_context_details, mcp_apps_set_host_context_details_available_display_mode, mcp_apps_set_host_context_details_display_mode, mcp_apps_set_host_context_details_platform, mcp_apps_set_host_context_details_theme, mcp_apps_set_host_context_request, mcp_cancel_sampling_execution_params, mcp_cancel_sampling_execution_result, mcp_config_add_request, mcp_config_disable_request, mcp_config_enable_request, mcp_config_list, mcp_config_remove_request, mcp_config_update_request, mcp_configure_git_hub_request, mcp_configure_git_hub_result, mcp_disable_request, mcp_discover_request, mcp_discover_result, mcp_elicitation_form_mode, mcp_enable_request, mcp_execute_sampling_params, mcp_execute_sampling_request, mcp_execute_sampling_result, mcp_failed_server, mcp_filtered_server, mcp_headers_handle_pending_headers_refresh_request, mcp_headers_handle_pending_headers_refresh_request_request, mcp_headers_handle_pending_headers_refresh_request_result, mcp_host_state, mcp_install_plan, mcp_is_server_running_request, mcp_is_server_running_result, mcp_list_tools_request, mcp_list_tools_result, mcp_oauth_authentication_state_changed_request, mcp_oauth_handle_pending_request, mcp_oauth_handle_pending_result, mcp_oauth_login_grant_type, mcp_oauth_login_request, mcp_oauth_login_result, mcp_oauth_pending_request_response, mcp_oauth_probe_needs_auth_reason, mcp_oauth_probe_request, mcp_oauth_probe_result, mcp_oauth_respond_request, mcp_oauth_respond_result, mcp_plan_configuration_change, mcp_plan_configuration_operation, mcp_plan_enum_value_type, mcp_plan_install_planned, mcp_plan_install_request, mcp_plan_install_result, mcp_plan_install_source, mcp_plan_install_source_candidate, mcp_plan_install_source_candidate_kind, mcp_plan_install_source_card, mcp_plan_install_source_card_kind, mcp_plan_package_install_method, mcp_plan_package_transport, mcp_plan_policy_decision, mcp_plan_policy_result, mcp_plan_policy_source, mcp_plan_provenance, mcp_plan_remote_install_method, mcp_plan_remote_transport, mcp_plan_required_value, mcp_plan_required_value_enum, mcp_plan_required_value_enum_kind, mcp_plan_required_value_scalar, mcp_plan_required_value_scalar_kind, mcp_plan_resource_identity, mcp_plan_scalar_value_type, mcp_plan_scope, mcp_plan_secret_placeholder, mcp_plan_secret_reference, mcp_plan_target, mcp_plan_transport_choice, mcp_plan_transport_choice_package, mcp_plan_transport_choice_remote, mcp_plan_value_category, mcp_register_external_client_request, mcp_reload_config, mcp_reload_with_config_request, mcp_remove_git_hub_result, mcp_resource, mcp_resource_annotations, mcp_resource_content, mcp_resource_icon, mcp_resources_list_request, mcp_resources_list_result, mcp_resources_list_templates_request, mcp_resources_list_templates_result, mcp_resources_read_request, mcp_resources_read_result, mcp_resource_template, mcp_restart_server_request, mcp_safe_for_telemetry, mcp_safe_for_telemetry_fields, mcp_sampling_execution_action, mcp_sampling_execution_result, mcp_serializable_server_config, mcp_server, mcp_server_auth_config, mcp_server_auth_config_redirect_port, mcp_server_card_embedded, mcp_server_card_embedded_kind, mcp_server_card_media_type, mcp_server_card_reference, mcp_server_card_url, mcp_server_card_url_kind, mcp_server_config, mcp_server_config_defer_tools, mcp_server_config_http, mcp_server_config_http_oauth_grant_type, mcp_server_config_http_type, mcp_server_config_memory, mcp_server_config_memory_type, mcp_server_config_stdio, mcp_server_config_stdio_type, mcp_server_failure_info, mcp_server_list, mcp_server_needs_auth_info, mcp_set_env_value_mode_details, mcp_set_env_value_mode_params, mcp_set_env_value_mode_result, mcp_start_server_request, mcp_start_servers_result, mcp_stop_server_request, mcp_task_metadata, mcp_tools, mcp_tool_ui, mcp_tool_ui_visibility, mcp_unregister_external_client_request, memory_configuration, metadata_context_attribution_result, metadata_context_heaviest_messages_request, metadata_context_heaviest_messages_result, metadata_context_info_request, metadata_context_info_result, metadata_is_processing_result, metadata_recompute_context_tokens_request, metadata_recompute_context_tokens_result, metadata_record_context_change_request, metadata_record_context_change_result, metadata_set_working_directory_request, metadata_set_working_directory_result, metadata_snapshot_current_mode, metadata_snapshot_remote_metadata, metadata_snapshot_remote_metadata_repository, metadata_snapshot_remote_metadata_task_type, model, model_apply_startup_overlay_request, model_billing, model_billing_promo, model_billing_token_prices, model_billing_token_prices_long_context, model_capabilities, model_capabilities_limits, model_capabilities_limits_vision, model_capabilities_override, model_capabilities_override_limits, model_capabilities_override_limits_vision, model_capabilities_override_supports, model_capabilities_supports, model_list, model_list_request, model_message, model_picker_category, model_picker_persistence_request, model_picker_price_category, model_picker_settings_context, model_policy, model_policy_state, model_set_reasoning_effort_request, model_set_reasoning_effort_result, models_list_request, model_switch_confirmation, model_switch_to_request, model_switch_to_result, model_warning_text, mode_set_request, mode_set_result, move_mcp_loading_to_background_result, named_provider_config, name_get_result, name_set_auto_request, name_set_auto_result, name_set_request, open_canvas_instance, options_update_additional_content_exclusion_policy, options_update_additional_content_exclusion_policy_rule, options_update_additional_content_exclusion_policy_rule_source, options_update_additional_content_exclusion_policy_scope, options_update_context_tier, options_update_env_value_mode, options_update_reasoning_summary, options_update_tool_filter_precedence, pending_permission_request, pending_permission_request_list, permission_decision, permission_decision_approved, permission_decision_approved_for_location, permission_decision_approved_for_session, permission_decision_approve_for_location, permission_decision_approve_for_location_approval, permission_decision_approve_for_location_approval_commands, permission_decision_approve_for_location_approval_custom_tool, permission_decision_approve_for_location_approval_extension_env_access, permission_decision_approve_for_location_approval_extension_management, permission_decision_approve_for_location_approval_extension_permission_access, permission_decision_approve_for_location_approval_factory, permission_decision_approve_for_location_approval_mcp, permission_decision_approve_for_location_approval_mcp_sampling, permission_decision_approve_for_location_approval_memory, permission_decision_approve_for_location_approval_read, permission_decision_approve_for_location_approval_write, permission_decision_approve_for_session, permission_decision_approve_for_session_approval, permission_decision_approve_for_session_approval_commands, permission_decision_approve_for_session_approval_custom_tool, permission_decision_approve_for_session_approval_extension_env_access, permission_decision_approve_for_session_approval_extension_management, permission_decision_approve_for_session_approval_extension_permission_access, permission_decision_approve_for_session_approval_factory, permission_decision_approve_for_session_approval_mcp, permission_decision_approve_for_session_approval_mcp_sampling, permission_decision_approve_for_session_approval_memory, permission_decision_approve_for_session_approval_read, permission_decision_approve_for_session_approval_write, permission_decision_approve_once, permission_decision_approve_permanently, permission_decision_cancelled, permission_decision_context, permission_decision_denied_by_content_exclusion_policy, permission_decision_denied_by_permission_request_hook, permission_decision_denied_by_rules, permission_decision_denied_interactively_by_user, permission_decision_denied_no_approval_rule_and_could_not_request_from_user, permission_decision_outcome, permission_decision_reject, permission_decision_request, permission_decision_source, permission_decision_surface, permission_decision_user_not_available, permission_location_add_tool_approval_params, permission_location_apply_params, permission_location_apply_result, permission_location_resolve_params, permission_location_resolve_result, permission_location_type, permission_mode_source, permission_paths_add_params, permission_paths_allowed_check_params, permission_paths_allowed_check_result, permission_paths_config, permission_paths_list, permission_paths_update_primary_params, permission_paths_workspace_check_params, permission_paths_workspace_check_result, permission_prompt_shown_notification, permission_request_result, permission_response_capability, permission_rules_set, permissions_configure_additional_content_exclusion_policy, permissions_configure_additional_content_exclusion_policy_rule, permissions_configure_additional_content_exclusion_policy_rule_source, permissions_configure_additional_content_exclusion_policy_scope, permissions_configure_params, permissions_configure_result, permissions_folder_trust_add_trusted_result, permissions_get_mode_request, permissions_get_mode_result, permissions_locations_add_tool_approval_details, permissions_locations_add_tool_approval_details_commands, permissions_locations_add_tool_approval_details_custom_tool, permissions_locations_add_tool_approval_details_extension_env_access, permissions_locations_add_tool_approval_details_extension_management, permissions_locations_add_tool_approval_details_extension_permission_access, permissions_locations_add_tool_approval_details_factory, permissions_locations_add_tool_approval_details_mcp, permissions_locations_add_tool_approval_details_mcp_sampling, permissions_locations_add_tool_approval_details_memory, permissions_locations_add_tool_approval_details_read, permissions_locations_add_tool_approval_details_write, permissions_locations_add_tool_approval_result, permissions_modify_rules_params, permissions_modify_rules_result, permissions_modify_rules_scope, permissions_notify_prompt_shown_result, permissions_paths_add_result, permissions_paths_list_request, permissions_paths_update_primary_result, permissions_pending_requests_request, permissions_reset_session_approvals_request, permissions_reset_session_approvals_result, permissions_set_approve_all_request, permissions_set_approve_all_result, permissions_set_approve_all_source, permissions_set_mode_request, permissions_set_mode_result, permissions_set_required_request, permissions_set_required_result, permissions_urls_set_unrestricted_mode_result, permission_urls_config, permission_urls_set_unrestricted_mode_params, ping_request, ping_result, plan_read_result, plan_read_sql_todos_result, plan_read_sql_todos_with_dependencies_result, plan_sql_todo_dependency, plan_sql_todos_row, plan_update_request, plugin, plugin_install_result, plugin_list, plugin_list_result, plugins_builtin_set_request, plugins_disable_request, plugins_enable_request, plugins_install_request, plugins_marketplaces_add_request, plugins_marketplaces_browse_request, plugins_marketplaces_refresh_request, plugins_marketplaces_remove_request, plugins_reload_request, plugins_uninstall_request, plugins_update_request, plugin_update_all_entry, plugin_update_all_result, plugin_update_result, protocol_external_tool_defer, protocol_external_tool_definition, provider_add_request, provider_add_result, provider_config, provider_config_azure, provider_config_transport, provider_config_type, provider_config_wire_api, provider_endpoint, provider_endpoint_transport, provider_endpoint_type, provider_endpoint_wire_api, provider_get_endpoint_request, provider_model_config, provider_session_token, provider_token_acquire_request, provider_token_acquire_result, push_attachment, push_attachment_blob, push_attachment_directory, push_attachment_file, push_attachment_file_line_range, push_attachment_git_hub_actions_job, push_attachment_git_hub_commit, push_attachment_git_hub_file, push_attachment_git_hub_file_diff, push_attachment_git_hub_file_diff_side, push_attachment_git_hub_reference, push_attachment_git_hub_reference_type, push_attachment_git_hub_release, push_attachment_git_hub_repository, push_attachment_git_hub_snippet, push_attachment_git_hub_tree_comparison, push_attachment_git_hub_tree_comparison_side, push_attachment_git_hub_url, push_attachment_selection, push_attachment_selection_details, push_attachment_selection_details_end, push_attachment_selection_details_start, push_git_hub_repo_ref, queue_begin_deferred_idle_drain_request, queue_begin_deferred_idle_drain_result, queue_consume_system_notifications_request, queued_command_handled, queued_command_not_handled, queued_command_result, queue_defer_session_idle_request, queue_duplicate_at_request, queue_duplicate_at_result, queue_enqueue_resume_pending_result, queue_finish_deferred_idle_drain_request, queue_finish_deferred_idle_drain_result, queue_has_pending_result, queue_insert_at_request, queue_insert_at_result, queue_insert_message, queue_move_item_request, queue_move_item_result, queue_pending_items, queue_pending_items_kind, queue_pending_items_result, queue_remove_at_request, queue_remove_at_result, queue_remove_most_recent_result, queue_send_now_request, queue_send_now_result, queue_set_drain_paused_request, queue_snapshot_result, queue_update_text_request, queue_update_text_result, register_event_interest_params, register_event_interest_result, register_extension_tools_params, register_extension_tools_result, release_event_interest_params, remote_control_config, remote_control_config_existing_mc_session, remote_control_status, remote_control_status_active, remote_control_status_connecting, remote_control_status_error, remote_control_status_off, remote_control_status_result, remote_control_stop_result, remote_control_transfer_result, remote_enable_request, remote_enable_result, remote_notify_steerable_changed_request, remote_notify_steerable_changed_result, remote_session_connection_result, remote_session_host_status, remote_session_metadata_repository, remote_session_metadata_task_type, remote_session_metadata_value, remote_session_mode, remote_session_repository, run_options, sandbox_config, sandbox_config_auth, sandbox_config_source, sandbox_config_user_policy, sandbox_config_user_policy_experimental, sandbox_config_user_policy_experimental_seatbelt, sandbox_config_user_policy_filesystem, sandbox_config_user_policy_network, sandbox_config_user_policy_network_proxy, sandbox_config_user_policy_seatbelt, schedule_add_at_request, schedule_add_cron_request, schedule_add_request, schedule_add_result, schedule_add_self_paced_request, schedule_entry, schedule_has_self_paced_result, schedule_list, schedule_rearm_self_paced_request, schedule_stop_request, schedule_stop_result, secrets_add_filter_values_request, secrets_add_filter_values_result, send_agent_mode, send_attachments_to_message_params, send_message_item, send_messages_request, send_messages_result, send_mode, send_request, send_result, send_system_notification_request, server_agent_list, server_instruction_source_list, server_skill, server_skill_list, session_activity, session_agent_list_request, session_auth_login_request, session_auth_logout_user_request, session_auth_status, session_auth_switch_request, session_bulk_delete_result, session_cancel_all_background_agents_result, session_capability, session_commands_list_request, session_completion_item, session_context, session_context_host_type, session_enrich_metadata_result, session_fs_append_file_request, session_fs_error, session_fs_error_code, session_fs_exists_request, session_fs_exists_result, session_fs_mkdir_request, session_fs_readdir_request, session_fs_readdir_result, session_fs_readdir_with_types_entry, session_fs_readdir_with_types_entry_type, session_fs_readdir_with_types_request, session_fs_readdir_with_types_result, session_fs_read_file_request, session_fs_read_file_result, session_fs_rename_request, session_fs_rm_request, session_fs_set_provider_capabilities, session_fs_set_provider_conventions, session_fs_set_provider_request, session_fs_set_provider_result, session_fs_sqlite_exists_request, session_fs_sqlite_exists_result, session_fs_sqlite_query_request, session_fs_sqlite_query_result, session_fs_sqlite_query_type, session_fs_sqlite_transaction_error, session_fs_sqlite_transaction_error_class, session_fs_sqlite_transaction_request, session_fs_sqlite_transaction_result, session_fs_sqlite_transaction_statement, session_fs_stat_request, session_fs_stat_result, session_fs_write_file_request, session_git_hub_auth_get_all_auth_available_result, session_git_hub_auth_logout_result, session_git_hub_auth_logout_user_result, session_history_compact_request, session_installed_plugin, session_installed_plugin_source, session_installed_plugin_source_git_hub, session_installed_plugin_source_local, session_installed_plugin_source_url, session_limit_prediction_baseline_data, session_limit_prediction_client_type, session_limit_prediction_details, session_limit_prediction_predict_request, session_limit_prediction_request, session_limit_prediction_result, session_limit_prediction_source, session_limit_prediction_tier, session_limit_prediction_tier_option, session_limit_prediction_unavailable_reason, session_list, session_list_entry, session_list_filter, session_load_deferred_repo_hooks_result, session_log_level, session_managed_permissions, session_managed_settings, session_mcp_apps_call_tool_result, session_metadata_snapshot, session_mode, session_model_list, session_model_list_request, session_model_price_category, session_open_options, session_open_options_additional_content_exclusion_policy, session_open_options_additional_content_exclusion_policy_rule, session_open_options_additional_content_exclusion_policy_rule_source, session_open_options_additional_content_exclusion_policy_scope, session_open_options_env_value_mode, session_open_options_reasoning_summary, session_open_params, session_open_result, session_plugins_reload_request, session_provider_get_endpoint_request, session_prune_result, sessions_bulk_delete_request, sessions_check_in_use_request, sessions_check_in_use_result, sessions_close_request, sessions_close_result, sessions_delete_request, sessions_enrich_metadata_request, session_set_credentials_params, session_set_credentials_result, session_settings_built_in_tool_availability_snapshot, session_settings_evaluate_predicate_request, session_settings_evaluate_predicate_result, session_settings_job_snapshot, session_settings_model_snapshot, session_settings_online_evaluation_snapshot, session_settings_predicate_name, session_settings_repo_snapshot, session_settings_snapshot, session_settings_validation_snapshot, sessions_find_by_prefix_request, sessions_find_by_prefix_result, sessions_find_by_task_id_request, sessions_find_by_task_id_result, sessions_fork_request, sessions_fork_result, sessions_get_board_entry_count_request, sessions_get_board_entry_count_result, sessions_get_event_file_path_request, sessions_get_event_file_path_result, sessions_get_last_for_context_request, sessions_get_last_for_context_result, sessions_get_metadata_request, sessions_get_metadata_result, sessions_get_persisted_remote_steerable_request, sessions_get_persisted_remote_steerable_result, session_sizes, sessions_list_non_empty_session_ids_request, sessions_list_non_empty_session_ids_result, sessions_list_request, sessions_load_deferred_repo_hooks_request, sessions_open_attach, sessions_open_cloud, sessions_open_create, sessions_open_handoff, sessions_open_handoff_task_type, sessions_open_progress, sessions_open_progress_status, sessions_open_progress_step, sessions_open_remote, sessions_open_resume, sessions_open_resume_last, sessions_open_status, session_source, sessions_prune_old_request, sessions_register_extension_tools_on_session_options, sessions_release_lock_request, sessions_release_lock_result, sessions_reload_plugin_hooks_request, sessions_reload_plugin_hooks_result, sessions_save_request, sessions_save_result, sessions_set_additional_plugins_request, sessions_set_additional_plugins_result, sessions_set_remote_control_steering_request, sessions_start_remote_control_request, sessions_stop_remote_control_request, sessions_transfer_remote_control_request, session_telemetry_engagement, session_update_options_params, session_update_options_result, session_visibility_status, session_working_directory_context, session_working_directory_context_host_type, settable_auth_info, settable_token_auth_info, shell_cancel_user_requested_request, shell_credentials, shell_exec_request, shell_exec_result, shell_execute_user_requested_request, shell_init_profile, shell_init_script, shell_init_script_shell, shell_kill_request, shell_kill_result, shell_kill_signal, shell_options, shutdown_request, skill, skill_discovery_path, skill_discovery_path_list, skill_discovery_scope, skill_list, skills_config_set_disabled_skills_request, skills_config_set_skill_disabled_request, skills_disable_request, skills_discover_request, skills_enable_request, skills_get_discovery_paths_request, skills_get_invoked_result, skills_invoked_skill, skills_load_diagnostics, slash_command_add_timeline_entry_result, slash_command_agent_prompt_result, slash_command_completed_result, slash_command_info, slash_command_input, slash_command_input_choice, slash_command_input_completion, slash_command_invocation_result, slash_command_kind, slash_command_model_picker_dialog, slash_command_select_subcommand_option, slash_command_select_subcommand_result, slash_command_set_model_result, slash_command_set_plan_model_result, slash_command_show_dialog_result, slash_command_text_result, slash_command_timeline_entry, subagent_settings_entry, subagent_settings_entry_context_tier, task_agent_info, task_agent_progress, task_complete_data, task_completion_decision, task_execution_mode, task_info, task_list, task_progress_line, tasks_cancel_request, tasks_cancel_result, tasks_get_current_promotable_result, tasks_get_progress_request, tasks_get_progress_result, task_shell_info, task_shell_info_attachment_mode, task_shell_progress, tasks_promote_current_to_background_result, tasks_promote_to_background_request, tasks_promote_to_background_result, tasks_refresh_result, tasks_remove_request, tasks_remove_result, tasks_send_message_request, tasks_send_message_result, tasks_start_agent_request, tasks_start_agent_result, task_status, tasks_wait_for_pending_result, telemetry_set_feature_overrides_request, token_auth_info, token_provider_auth_info, tool, tool_list, tool_result, tool_result_expanded, tool_result_new_message, tool_result_type, tools_execute_request, tools_get_builtin_descriptors_request, tools_get_builtin_descriptors_result, tools_get_current_metadata_result, tools_initialize_and_validate_result, tools_list_request, tools_set_request, tools_set_result, tools_shell_descriptor_config, tools_task_complete_event_data_request, tools_update_subagent_settings_result, ui_auto_mode_switch_response, ui_elicitation_array_any_of_field, ui_elicitation_array_any_of_field_items, ui_elicitation_array_any_of_field_items_any_of, ui_elicitation_array_enum_field, ui_elicitation_array_enum_field_items, ui_elicitation_field_value, ui_elicitation_request, ui_elicitation_response, ui_elicitation_response_action, ui_elicitation_response_content, ui_elicitation_result, ui_elicitation_schema, ui_elicitation_schema_property, ui_elicitation_schema_property_boolean, ui_elicitation_schema_property_number, ui_elicitation_schema_property_number_type, ui_elicitation_schema_property_string, ui_elicitation_schema_property_string_format, ui_elicitation_string_enum_field, ui_elicitation_string_one_of_field, ui_elicitation_string_one_of_field_one_of, ui_ephemeral_query_request, ui_ephemeral_query_result, ui_exit_plan_mode_action, ui_exit_plan_mode_response, ui_handle_pending_auto_mode_switch_request, ui_handle_pending_elicitation_request, ui_handle_pending_exit_plan_mode_request, ui_handle_pending_result, ui_handle_pending_sampling_request, ui_handle_pending_sampling_response, ui_handle_pending_session_limits_exhausted_request, ui_handle_pending_user_input_request, ui_register_direct_auto_mode_switch_handler_result, ui_session_limits_exhausted_response, ui_session_limits_exhausted_response_action, ui_unregister_direct_auto_mode_switch_handler_request, ui_unregister_direct_auto_mode_switch_handler_result, ui_user_input_response, update_subagent_settings_request, usage_get_metrics_result, usage_metrics_agent_metric, usage_metrics_code_changes, usage_metrics_model_metric, usage_metrics_model_metric_requests, usage_metrics_model_metric_token_detail, usage_metrics_model_metric_usage, usage_metrics_token_detail, user_auth_info, user_requested_shell_command_result, user_setting_metadata, user_settings_get_result, user_settings_set_request, user_settings_set_result, visibility_get_result, visibility_set_request, visibility_set_result, workspace_diff_file_change, workspace_diff_file_change_type, workspace_diff_mode, workspace_diff_result, workspaces_add_summary_request, workspaces_add_summary_result, workspaces_autopilot_objective_exists_result, workspaces_checkpoints, workspaces_create_file_request, workspaces_delete_autopilot_objective_result, workspaces_diff_request, workspaces_ensure_request, workspaces_get_workspace_result, workspaces_list_checkpoints_result, workspaces_list_files_result, workspaces_read_autopilot_objective_result, workspaces_read_checkpoint_request, workspaces_read_checkpoint_result, workspaces_read_file_request, workspaces_read_file_result, workspaces_save_large_paste_request, workspaces_save_large_paste_result, workspaces_truncate_summaries_request, workspace_summary_host_type, workspaces_update_metadata_request, workspaces_workspace_details_host_type, workspaces_write_autopilot_objective_request, workspaces_write_autopilot_objective_result, session_auth_info_result, session_context_attribution, session_context_info, subagent_settings, task_progress, workspace_summary)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -30384,13 +37338,21 @@ def to_dict(self) -> dict:
         result["AgentSelectResult"] = to_class(AgentSelectResult, self.agent_select_result)
         result["AgentSetPromptRequest"] = to_class(AgentSetPromptRequest, self.agent_set_prompt_request)
         result["AgentsGetDiscoveryPathsRequest"] = to_class(AgentsGetDiscoveryPathsRequest, self.agents_get_discovery_paths_request)
-        result["AllowAllPermissionSetResult"] = to_class(AllowAllPermissionSetResult, self.allow_all_permission_set_result)
-        result["AllowAllPermissionState"] = to_class(AllowAllPermissionState, self.allow_all_permission_state)
         result["ApiKeyAuthInfo"] = to_class(APIKeyAuthInfo, self.api_key_auth_info)
+        result["AuthIdentity"] = to_class(AuthIdentity, self.auth_identity)
         result["AuthInfo"] = (self.auth_info).to_dict()
         result["AuthInfoType"] = to_enum(AuthInfoType, self.auth_info_type)
+        result["AuthValidationError"] = to_class(AuthValidationError, self.auth_validation_error)
+        result["AuthValidationErrors"] = from_list(lambda x: to_class(AuthValidationError, x), self.auth_validation_errors)
         result["BuiltInModelCatalog"] = to_class(BuiltInModelCatalog, self.built_in_model_catalog)
         result["BuiltInModelCatalogEntry"] = to_class(BuiltInModelCatalogEntry, self.built_in_model_catalog_entry)
+        result["BuiltinToolDescriptor"] = to_class(BuiltinToolDescriptor, self.builtin_tool_descriptor)
+        result["BuiltinToolFormat"] = to_class(BuiltinToolFormat, self.builtin_tool_format)
+        result["BuiltinToolFormatType"] = to_enum(BuiltinToolFormatType, self.builtin_tool_format_type)
+        result["BuiltinToolInputSchema"] = to_class(BuiltinToolInputSchema, self.builtin_tool_input_schema)
+        result["BuiltinToolInputSchemaType"] = to_enum(BuiltinToolInputSchemaType, self.builtin_tool_input_schema_type)
+        result["BuiltinToolSafeForTelemetry"] = from_union([from_bool, lambda x: to_class(BuiltinToolSafeTelemetryFields, x)], self.builtin_tool_safe_for_telemetry)
+        result["BuiltinToolSafeTelemetryFields"] = to_class(BuiltinToolSafeTelemetryFields, self.builtin_tool_safe_telemetry_fields)
         result["CancelUserRequestedShellCommandResult"] = to_class(CancelUserRequestedShellCommandResult, self.cancel_user_requested_shell_command_result)
         result["CanvasAction"] = to_class(CanvasAction, self.canvas_action)
         result["CanvasActionInvokeRequest"] = to_class(CanvasActionInvokeRequest, self.canvas_action_invoke_request)
@@ -30406,11 +37368,63 @@ def to_dict(self) -> dict:
         result["CanvasProviderInvokeActionRequest"] = to_class(CanvasProviderInvokeActionRequest, self.canvas_provider_invoke_action_request)
         result["CanvasProviderOpenRequest"] = to_class(CanvasProviderOpenRequest, self.canvas_provider_open_request)
         result["CanvasProviderOpenResult"] = to_class(CanvasProviderOpenResult, self.canvas_provider_open_result)
+        result["CanvasProviderRegisterRequest"] = to_class(CanvasProviderRegisterRequest, self.canvas_provider_register_request)
+        result["CanvasProviderUnregisterRequest"] = to_class(CanvasProviderUnregisterRequest, self.canvas_provider_unregister_request)
         result["CanvasSessionContext"] = to_class(CanvasSessionContext, self.canvas_session_context)
         result["CapiSessionOptions"] = to_class(CapiSessionOptions, self.capi_session_options)
+        result["CardDigest"] = to_class(CardDigest, self.card_digest)
+        result["CardDigestAlgorithm"] = to_enum(CardDigestAlgorithm, self.card_digest_algorithm)
+        result["CardDigestValue"] = from_str(self.card_digest_value)
+        result["CatalogAiSkillCandidate"] = to_class(CatalogAISkillCandidate, self.catalog_ai_skill_candidate)
+        result["CatalogAiSkillCandidateProvenance"] = to_class(CatalogAISkillCandidateProvenance, self.catalog_ai_skill_candidate_provenance)
+        result["CatalogAuthenticationRequiredError"] = to_class(CatalogAuthenticationRequiredError, self.catalog_authentication_required_error)
+        result["CatalogAuthenticationRequiredReason"] = to_enum(CatalogAuthenticationRequiredReason, self.catalog_authentication_required_reason)
+        result["CatalogCandidate"] = to_class(CatalogCandidate, self.catalog_candidate)
+        result["CatalogCandidateKind"] = to_enum(CatalogCandidateKind, self.catalog_candidate_kind)
+        result["CatalogCandidateSource"] = (self.catalog_candidate_source).to_dict()
+        result["CatalogCandidateSourceEmbedded"] = to_class(CatalogCandidateSourceEmbedded, self.catalog_candidate_source_embedded)
+        result["CatalogCandidateSourceUrl"] = to_class(CatalogCandidateSourceURL, self.catalog_candidate_source_url)
+        result["CatalogCapability"] = to_enum(CatalogCapability, self.catalog_capability)
+        result["CatalogCapabilityId"] = from_str(self.catalog_capability_id)
+        result["CatalogClientContract"] = to_class(CatalogClientContract, self.catalog_client_contract)
+        result["CatalogContractViolationError"] = to_class(CatalogContractViolationError, self.catalog_contract_violation_error)
+        result["CatalogContractViolationReason"] = to_enum(CatalogContractViolationReason, self.catalog_contract_violation_reason)
+        result["CatalogHandleRejectedError"] = to_class(CatalogHandleRejectedError, self.catalog_handle_rejected_error)
+        result["CatalogHandleRejectionReason"] = to_enum(CatalogHandleRejectionReason, self.catalog_handle_rejection_reason)
+        result["CatalogHandleType"] = to_enum(CatalogHandleType, self.catalog_handle_type)
+        result["CatalogInvalidRequestError"] = to_class(CatalogInvalidRequestError, self.catalog_invalid_request_error)
+        result["CatalogInvalidRequestField"] = to_enum(CatalogInvalidRequestField, self.catalog_invalid_request_field)
+        result["CatalogMalformedCardError"] = to_class(CatalogMalformedCardError, self.catalog_malformed_card_error)
+        result["CatalogMalformedCardReason"] = to_enum(CatalogMalformedCardReason, self.catalog_malformed_card_reason)
+        result["CatalogMcpServerCandidate"] = to_class(CatalogMCPServerCandidate, self.catalog_mcp_server_candidate)
+        result["CatalogMcpServerCandidateProvenance"] = to_class(CatalogMCPServerCandidateProvenance, self.catalog_mcp_server_candidate_provenance)
+        result["CatalogMcpServerInstallability"] = to_enum(CatalogMCPServerInstallabilityEnum, self.catalog_mcp_server_installability)
+        result["CatalogMediaType"] = to_enum(CatalogMediaType, self.catalog_media_type)
+        result["CatalogNegotiatedContract"] = to_class(CatalogNegotiatedContract, self.catalog_negotiated_contract)
+        result["CatalogNegotiationRefusedError"] = to_class(CatalogNegotiationRefusedError, self.catalog_negotiation_refused_error)
+        result["CatalogNegotiationRefusedReason"] = to_enum(CatalogNegotiationRefusedReason, self.catalog_negotiation_refused_reason)
+        result["CatalogNetworkFailureError"] = to_class(CatalogNetworkFailureError, self.catalog_network_failure_error)
+        result["CatalogNetworkFailureReason"] = to_enum(CatalogNetworkFailureReason, self.catalog_network_failure_reason)
+        result["CatalogNotInstallableError"] = to_class(CatalogNotInstallableError, self.catalog_not_installable_error)
+        result["CatalogNotInstallableReason"] = to_enum(CatalogNotInstallableReason, self.catalog_not_installable_reason)
+        result["CatalogPolicyRejectedError"] = to_class(CatalogPolicyRejectedError, self.catalog_policy_rejected_error)
+        result["CatalogSearchRequest"] = to_class(CatalogSearchRequest, self.catalog_search_request)
+        result["CatalogSearchResult"] = (self.catalog_search_result).to_dict()
+        result["CatalogSearchSucceeded"] = to_class(CatalogSearchSucceeded, self.catalog_search_succeeded)
+        result["CatalogUnavailableError"] = to_class(CatalogUnavailableError, self.catalog_unavailable_error)
+        result["CatalogUnavailableReason"] = to_enum(CatalogUnavailableReason, self.catalog_unavailable_reason)
+        result["CatalogUnavailableTransportError"] = to_class(CatalogUnavailableTransportError, self.catalog_unavailable_transport_error)
+        result["CatalogUnavailableTransportReason"] = to_enum(CatalogUnavailableTransportReason, self.catalog_unavailable_transport_reason)
+        result["CatalogUnsafeRetrievalError"] = to_class(CatalogUnsafeRetrievalError, self.catalog_unsafe_retrieval_error)
+        result["CatalogUnsafeRetrievalReason"] = to_enum(CatalogUnsafeRetrievalReason, self.catalog_unsafe_retrieval_reason)
+        result["CatalogUnsupportedKindError"] = to_class(CatalogUnsupportedKindError, self.catalog_unsupported_kind_error)
         result["CommandList"] = to_class(CommandList, self.command_list)
+        result["CommandsFinalizeInvocationEffectRequest"] = to_class(CommandsFinalizeInvocationEffectRequest, self.commands_finalize_invocation_effect_request)
+        result["CommandsFinalizeInvocationEffectResult"] = to_class(CommandsFinalizeInvocationEffectResult, self.commands_finalize_invocation_effect_result)
         result["CommandsHandlePendingCommandRequest"] = to_class(CommandsHandlePendingCommandRequest, self.commands_handle_pending_command_request)
         result["CommandsHandlePendingCommandResult"] = to_class(CommandsHandlePendingCommandResult, self.commands_handle_pending_command_result)
+        result["CommandsInvocationEffectOutcome"] = to_enum(CommandsInvocationEffectOutcome, self.commands_invocation_effect_outcome)
+        result["CommandsInvocationOrigin"] = to_enum(CommandsInvocationOrigin, self.commands_invocation_origin)
         result["CommandsInvokeRequest"] = to_class(CommandsInvokeRequest, self.commands_invoke_request)
         result["CommandsListRequest"] = self.commands_list_request
         result["CommandsRespondToQueuedCommandRequest"] = to_class(CommandsRespondToQueuedCommandRequest, self.commands_respond_to_queued_command_request)
@@ -30419,6 +37433,7 @@ def to_dict(self) -> dict:
         result["CompletionsRequestRequest"] = to_class(CompletionsRequestRequest, self.completions_request_request)
         result["CompletionsRequestResult"] = to_class(CompletionsRequestResult, self.completions_request_result)
         result["ConfigureSessionExtensionsParams"] = to_class(_ConfigureSessionExtensionsParams, self.configure_session_extensions_params)
+        result["ConnectClientInfo"] = to_class(_ConnectClientInfo, self.connect_client_info)
         result["ConnectedRemoteSessionMetadata"] = to_class(ConnectedRemoteSessionMetadata, self.connected_remote_session_metadata)
         result["ConnectedRemoteSessionMetadataKind"] = to_enum(ConnectedRemoteSessionMetadataKind, self.connected_remote_session_metadata_kind)
         result["ConnectedRemoteSessionMetadataRepository"] = to_class(ConnectedRemoteSessionMetadataRepository, self.connected_remote_session_metadata_repository)
@@ -30475,6 +37490,9 @@ def to_dict(self) -> dict:
         result["ExecuteCommandResult"] = to_class(ExecuteCommandResult, self.execute_command_result)
         result["Extension"] = to_class(Extension, self.extension)
         result["ExtensionContextPushInput"] = to_class(ExtensionContextPushInput, self.extension_context_push_input)
+        result["ExtensionLaunchProfile"] = to_class(ExtensionLaunchProfile, self.extension_launch_profile)
+        result["ExtensionLaunchProviderResolveRequest"] = to_class(ExtensionLaunchProviderResolveRequest, self.extension_launch_provider_resolve_request)
+        result["ExtensionLaunchProviderResolveResult"] = to_class(ExtensionLaunchProviderResolveResult, self.extension_launch_provider_resolve_result)
         result["ExtensionList"] = to_class(ExtensionList, self.extension_list)
         result["ExtensionsDisableRequest"] = to_class(ExtensionsDisableRequest, self.extensions_disable_request)
         result["ExtensionsEnableRequest"] = to_class(ExtensionsEnableRequest, self.extensions_enable_request)
@@ -30543,6 +37561,9 @@ def to_dict(self) -> dict:
         result["GitHubTelemetryClientInfo"] = to_class(GitHubTelemetryClientInfo, self.git_hub_telemetry_client_info)
         result["GitHubTelemetryEvent"] = to_class(GitHubTelemetryEvent, self.git_hub_telemetry_event)
         result["GitHubTelemetryNotification"] = to_class(GitHubTelemetryNotification, self.git_hub_telemetry_notification)
+        result["GitHubTokenAcquireReason"] = to_enum(GitHubTokenAcquireReason, self.git_hub_token_acquire_reason)
+        result["GitHubTokenAcquireRequest"] = to_class(GitHubTokenAcquireRequest, self.git_hub_token_acquire_request)
+        result["GitHubTokenAcquireResult"] = to_class(GitHubTokenAcquireResult, self.git_hub_token_acquire_result)
         result["HandlePendingToolCallRequest"] = to_class(HandlePendingToolCallRequest, self.handle_pending_tool_call_request)
         result["HandlePendingToolCallResult"] = to_class(HandlePendingToolCallResult, self.handle_pending_tool_call_result)
         result["HistoryAbortManualCompactionResult"] = to_class(HistoryAbortManualCompactionResult, self.history_abort_manual_compaction_result)
@@ -30606,6 +37627,7 @@ def to_dict(self) -> dict:
         result["LogRequest"] = to_class(LogRequest, self.log_request)
         result["LogResult"] = to_class(LogResult, self.log_result)
         result["LspInitializeRequest"] = to_class(LspInitializeRequest, self.lsp_initialize_request)
+        result["ManagedSettingsReadResult"] = to_class(ManagedSettingsReadResult, self.managed_settings_read_result)
         result["MarketplaceAddResult"] = to_class(MarketplaceAddResult, self.marketplace_add_result)
         result["MarketplaceBrowseResult"] = to_class(MarketplaceBrowseResult, self.marketplace_browse_result)
         result["MarketplaceInfo"] = to_class(MarketplaceInfo, self.marketplace_info)
@@ -30650,15 +37672,18 @@ def to_dict(self) -> dict:
         result["McpDisableRequest"] = to_class(MCPDisableRequest, self.mcp_disable_request)
         result["McpDiscoverRequest"] = to_class(MCPDiscoverRequest, self.mcp_discover_request)
         result["McpDiscoverResult"] = to_class(MCPDiscoverResult, self.mcp_discover_result)
+        result["McpElicitationFormMode"] = to_enum(MCPElicitationFormMode, self.mcp_elicitation_form_mode)
         result["McpEnableRequest"] = to_class(MCPEnableRequest, self.mcp_enable_request)
         result["McpExecuteSamplingParams"] = to_class(MCPExecuteSamplingParams, self.mcp_execute_sampling_params)
         result["McpExecuteSamplingRequest"] = from_dict(lambda x: x, self.mcp_execute_sampling_request)
         result["McpExecuteSamplingResult"] = from_dict(lambda x: x, self.mcp_execute_sampling_result)
+        result["McpFailedServer"] = to_class(MCPFailedServer, self.mcp_failed_server)
         result["McpFilteredServer"] = to_class(MCPFilteredServer, self.mcp_filtered_server)
         result["McpHeadersHandlePendingHeadersRefreshRequest"] = to_class(MCPHeadersHandlePendingHeadersRefreshRequest, self.mcp_headers_handle_pending_headers_refresh_request)
         result["McpHeadersHandlePendingHeadersRefreshRequestRequest"] = to_class(MCPHeadersHandlePendingHeadersRefreshRequestRequest, self.mcp_headers_handle_pending_headers_refresh_request_request)
         result["McpHeadersHandlePendingHeadersRefreshRequestResult"] = to_class(MCPHeadersHandlePendingHeadersRefreshRequestResult, self.mcp_headers_handle_pending_headers_refresh_request_result)
         result["McpHostState"] = to_class(MCPHostState, self.mcp_host_state)
+        result["McpInstallPlan"] = to_class(MCPInstallPlan, self.mcp_install_plan)
         result["McpIsServerRunningRequest"] = to_class(MCPIsServerRunningRequest, self.mcp_is_server_running_request)
         result["McpIsServerRunningResult"] = to_class(MCPIsServerRunningResult, self.mcp_is_server_running_result)
         result["McpListToolsRequest"] = to_class(MCPListToolsRequest, self.mcp_list_tools_request)
@@ -30670,9 +37695,47 @@ def to_dict(self) -> dict:
         result["McpOauthLoginRequest"] = to_class(MCPOauthLoginRequest, self.mcp_oauth_login_request)
         result["McpOauthLoginResult"] = to_class(MCPOauthLoginResult, self.mcp_oauth_login_result)
         result["McpOauthPendingRequestResponse"] = to_class(MCPOauthPendingRequestResponse, self.mcp_oauth_pending_request_response)
+        result["McpOauthProbeNeedsAuthReason"] = to_enum(MCPOauthProbeNeedsAuthReason, self.mcp_oauth_probe_needs_auth_reason)
+        result["McpOauthProbeRequest"] = to_class(MCPOauthProbeRequest, self.mcp_oauth_probe_request)
+        result["McpOauthProbeResult"] = to_class(MCPOauthProbeResult, self.mcp_oauth_probe_result)
         result["McpOauthRespondRequest"] = to_class(MCPOauthRespondRequest, self.mcp_oauth_respond_request)
         result["McpOauthRespondResult"] = to_class(MCPOauthRespondResult, self.mcp_oauth_respond_result)
+        result["McpPlanConfigurationChange"] = to_class(MCPPlanConfigurationChange, self.mcp_plan_configuration_change)
+        result["McpPlanConfigurationOperation"] = to_enum(MCPPlanConfigurationOperation, self.mcp_plan_configuration_operation)
+        result["McpPlanEnumValueType"] = to_enum(MCPPlan, self.mcp_plan_enum_value_type)
+        result["McpPlanInstallPlanned"] = to_class(MCPPlanInstallPlanned, self.mcp_plan_install_planned)
+        result["McpPlanInstallRequest"] = to_class(MCPPlanInstallRequest, self.mcp_plan_install_request)
+        result["McpPlanInstallResult"] = (self.mcp_plan_install_result).to_dict()
+        result["McpPlanInstallSource"] = (self.mcp_plan_install_source).to_dict()
+        result["McpPlanInstallSourceCandidate"] = to_class(MCPPlanInstallSourceCandidate, self.mcp_plan_install_source_candidate)
+        result["McpPlanInstallSourceCandidateKind"] = to_enum(MCPPlanInstallSourceCandidateKind, self.mcp_plan_install_source_candidate_kind)
+        result["McpPlanInstallSourceCard"] = to_class(MCPPlanInstallSourceCard, self.mcp_plan_install_source_card)
+        result["McpPlanInstallSourceCardKind"] = to_enum(MCPPlanInstallSourceCardKind, self.mcp_plan_install_source_card_kind)
+        result["McpPlanPackageInstallMethod"] = to_enum(MCPPlanPackageInstallMethod, self.mcp_plan_package_install_method)
+        result["McpPlanPackageTransport"] = to_enum(MCPPlanPackageTransport, self.mcp_plan_package_transport)
+        result["McpPlanPolicyDecision"] = to_enum(MCPPlanPolicyDecision, self.mcp_plan_policy_decision)
+        result["McpPlanPolicyResult"] = to_class(MCPPlanPolicyResult, self.mcp_plan_policy_result)
+        result["McpPlanPolicySource"] = to_enum(MCPPlanPolicySource, self.mcp_plan_policy_source)
+        result["McpPlanProvenance"] = to_class(MCPPlanProvenance, self.mcp_plan_provenance)
+        result["McpPlanRemoteInstallMethod"] = to_enum(MCPPlanRemoteInstallMethod, self.mcp_plan_remote_install_method)
+        result["McpPlanRemoteTransport"] = to_enum(MCPPlanRemoteTransport, self.mcp_plan_remote_transport)
+        result["McpPlanRequiredValue"] = (self.mcp_plan_required_value).to_dict()
+        result["McpPlanRequiredValueEnum"] = to_class(MCPPlanRequiredValueEnum, self.mcp_plan_required_value_enum)
+        result["McpPlanRequiredValueEnumKind"] = to_enum(MCPPlan, self.mcp_plan_required_value_enum_kind)
+        result["McpPlanRequiredValueScalar"] = to_class(MCPPlanRequiredValueScalar, self.mcp_plan_required_value_scalar)
+        result["McpPlanRequiredValueScalarKind"] = to_enum(MCPPlanRequiredValueScalarKind, self.mcp_plan_required_value_scalar_kind)
+        result["McpPlanResourceIdentity"] = to_class(MCPPlanResourceIdentity, self.mcp_plan_resource_identity)
+        result["McpPlanScalarValueType"] = to_enum(MCPPlanScalarValueTypeEnum, self.mcp_plan_scalar_value_type)
+        result["McpPlanScope"] = to_enum(MCPPlanScope, self.mcp_plan_scope)
+        result["McpPlanSecretPlaceholder"] = to_class(MCPPlanSecretPlaceholder, self.mcp_plan_secret_placeholder)
+        result["McpPlanSecretReference"] = from_str(self.mcp_plan_secret_reference)
+        result["McpPlanTarget"] = to_class(MCPPlanTarget, self.mcp_plan_target)
+        result["McpPlanTransportChoice"] = (self.mcp_plan_transport_choice).to_dict()
+        result["McpPlanTransportChoicePackage"] = to_class(MCPPlanTransportChoicePackage, self.mcp_plan_transport_choice_package)
+        result["McpPlanTransportChoiceRemote"] = to_class(MCPPlanTransportChoiceRemote, self.mcp_plan_transport_choice_remote)
+        result["McpPlanValueCategory"] = to_enum(MCPPlanValueCategory, self.mcp_plan_value_category)
         result["McpRegisterExternalClientRequest"] = to_class(MCPRegisterExternalClientRequest, self.mcp_register_external_client_request)
+        result["McpReloadConfig"] = to_class(MCPReloadConfig, self.mcp_reload_config)
         result["McpReloadWithConfigRequest"] = to_class(MCPReloadWithConfigRequest, self.mcp_reload_with_config_request)
         result["McpRemoveGitHubResult"] = to_class(MCPRemoveGitHubResult, self.mcp_remove_git_hub_result)
         result["McpResource"] = to_class(MCPResource, self.mcp_resource)
@@ -30687,17 +37750,29 @@ def to_dict(self) -> dict:
         result["McpResourcesReadResult"] = to_class(MCPResourcesReadResult, self.mcp_resources_read_result)
         result["McpResourceTemplate"] = to_class(MCPResourceTemplate, self.mcp_resource_template)
         result["McpRestartServerRequest"] = to_class(MCPRestartServerRequest, self.mcp_restart_server_request)
+        result["McpSafeForTelemetry"] = from_union([from_bool, lambda x: to_class(MCPSafeForTelemetryFields, x)], self.mcp_safe_for_telemetry)
+        result["McpSafeForTelemetryFields"] = to_class(MCPSafeForTelemetryFields, self.mcp_safe_for_telemetry_fields)
         result["McpSamplingExecutionAction"] = to_enum(MCPSamplingExecutionAction, self.mcp_sampling_execution_action)
         result["McpSamplingExecutionResult"] = to_class(MCPSamplingExecutionResult, self.mcp_sampling_execution_result)
+        result["McpSerializableServerConfig"] = to_class(MCPSerializableServerConfig, self.mcp_serializable_server_config)
         result["McpServer"] = to_class(MCPServer, self.mcp_server)
         result["McpServerAuthConfig"] = from_union([from_bool, lambda x: to_class(MCPServerAuthConfigRedirectPort, x)], self.mcp_server_auth_config)
         result["McpServerAuthConfigRedirectPort"] = to_class(MCPServerAuthConfigRedirectPort, self.mcp_server_auth_config_redirect_port)
+        result["McpServerCardEmbedded"] = to_class(MCPServerCardEmbedded, self.mcp_server_card_embedded)
+        result["McpServerCardEmbeddedKind"] = to_enum(MCPServerCardEmbeddedKind, self.mcp_server_card_embedded_kind)
+        result["McpServerCardMediaType"] = to_enum(MCPServerCardMediaType, self.mcp_server_card_media_type)
+        result["McpServerCardReference"] = (self.mcp_server_card_reference).to_dict()
+        result["McpServerCardUrl"] = to_class(MCPServerCardURL, self.mcp_server_card_url)
+        result["McpServerCardUrlKind"] = to_enum(MCPServerCardURLKind, self.mcp_server_card_url_kind)
         result["McpServerConfig"] = to_class(MCPServerConfig, self.mcp_server_config)
         result["McpServerConfigDeferTools"] = to_enum(MCPServerConfigDeferTools, self.mcp_server_config_defer_tools)
         result["McpServerConfigHttp"] = to_class(MCPServerConfigHTTP, self.mcp_server_config_http)
         result["McpServerConfigHttpOauthGrantType"] = to_enum(MCPGrantType, self.mcp_server_config_http_oauth_grant_type)
         result["McpServerConfigHttpType"] = to_enum(MCPServerConfigHTTPType, self.mcp_server_config_http_type)
+        result["McpServerConfigMemory"] = to_class(MCPServerConfigMemory, self.mcp_server_config_memory)
+        result["McpServerConfigMemoryType"] = to_enum(MCPServerConfigMemoryType, self.mcp_server_config_memory_type)
         result["McpServerConfigStdio"] = to_class(MCPServerConfigStdio, self.mcp_server_config_stdio)
+        result["McpServerConfigStdioType"] = to_enum(MCPServerConfigStdioType, self.mcp_server_config_stdio_type)
         result["McpServerFailureInfo"] = to_class(MCPServerFailureInfo, self.mcp_server_failure_info)
         result["McpServerList"] = to_class(MCPServerList, self.mcp_server_list)
         result["McpServerNeedsAuthInfo"] = to_class(MCPServerNeedsAuthInfo, self.mcp_server_needs_auth_info)
@@ -30707,6 +37782,7 @@ def to_dict(self) -> dict:
         result["McpStartServerRequest"] = to_class(MCPStartServerRequest, self.mcp_start_server_request)
         result["McpStartServersResult"] = to_class(MCPStartServersResult, self.mcp_start_servers_result)
         result["McpStopServerRequest"] = to_class(MCPStopServerRequest, self.mcp_stop_server_request)
+        result["McpTaskMetadata"] = to_class(MCPTaskMetadata, self.mcp_task_metadata)
         result["McpTools"] = to_class(MCPTools, self.mcp_tools)
         result["McpToolUi"] = to_class(MCPToolUI, self.mcp_tool_ui)
         result["McpToolUiVisibility"] = to_enum(MCPToolUIVisibility, self.mcp_tool_ui_visibility)
@@ -30729,6 +37805,7 @@ def to_dict(self) -> dict:
         result["MetadataSnapshotRemoteMetadataRepository"] = to_class(MetadataSnapshotRemoteMetadataRepository, self.metadata_snapshot_remote_metadata_repository)
         result["MetadataSnapshotRemoteMetadataTaskType"] = to_enum(TaskType, self.metadata_snapshot_remote_metadata_task_type)
         result["Model"] = to_class(Model, self.model)
+        result["ModelApplyStartupOverlayRequest"] = to_class(ModelApplyStartupOverlayRequest, self.model_apply_startup_overlay_request)
         result["ModelBilling"] = to_class(ModelBilling, self.model_billing)
         result["ModelBillingPromo"] = to_class(ModelBillingPromo, self.model_billing_promo)
         result["ModelBillingTokenPrices"] = to_class(ModelBillingTokenPrices, self.model_billing_token_prices)
@@ -30743,16 +37820,23 @@ def to_dict(self) -> dict:
         result["ModelCapabilitiesSupports"] = to_class(ModelCapabilitiesSupports, self.model_capabilities_supports)
         result["ModelList"] = to_class(ModelList, self.model_list)
         result["ModelListRequest"] = self.model_list_request
+        result["ModelMessage"] = to_class(ModelMessage, self.model_message)
         result["ModelPickerCategory"] = to_enum(ModelPickerCategory, self.model_picker_category)
+        result["ModelPickerPersistenceRequest"] = to_class(ModelPickerPersistenceRequest, self.model_picker_persistence_request)
         result["ModelPickerPriceCategory"] = to_enum(ModelPickerPriceCategory, self.model_picker_price_category)
+        result["ModelPickerSettingsContext"] = to_class(ModelPickerSettingsContext, self.model_picker_settings_context)
         result["ModelPolicy"] = to_class(ModelPolicy, self.model_policy)
         result["ModelPolicyState"] = to_enum(ModelPolicyState, self.model_policy_state)
         result["ModelSetReasoningEffortRequest"] = to_class(ModelSetReasoningEffortRequest, self.model_set_reasoning_effort_request)
         result["ModelSetReasoningEffortResult"] = to_class(ModelSetReasoningEffortResult, self.model_set_reasoning_effort_result)
         result["ModelsListRequest"] = to_class(ModelsListRequest, self.models_list_request)
+        result["ModelSwitchConfirmation"] = to_class(ModelSwitchConfirmation, self.model_switch_confirmation)
         result["ModelSwitchToRequest"] = to_class(ModelSwitchToRequest, self.model_switch_to_request)
         result["ModelSwitchToResult"] = to_class(ModelSwitchToResult, self.model_switch_to_result)
+        result["ModelWarningText"] = to_class(ModelWarningText, self.model_warning_text)
         result["ModeSetRequest"] = to_class(ModeSetRequest, self.mode_set_request)
+        result["ModeSetResult"] = to_class(ModeSetResult, self.mode_set_result)
+        result["MoveMcpLoadingToBackgroundResult"] = to_class(MoveMCPLoadingToBackgroundResult, self.move_mcp_loading_to_background_result)
         result["NamedProviderConfig"] = to_class(NamedProviderConfig, self.named_provider_config)
         result["NameGetResult"] = to_class(NameGetResult, self.name_get_result)
         result["NameSetAutoRequest"] = to_class(NameSetAutoRequest, self.name_set_auto_request)
@@ -30777,6 +37861,7 @@ def to_dict(self) -> dict:
         result["PermissionDecisionApproveForLocationApproval"] = (self.permission_decision_approve_for_location_approval).to_dict()
         result["PermissionDecisionApproveForLocationApprovalCommands"] = to_class(PermissionDecisionApproveForLocationApprovalCommands, self.permission_decision_approve_for_location_approval_commands)
         result["PermissionDecisionApproveForLocationApprovalCustomTool"] = to_class(PermissionDecisionApproveForLocationApprovalCustomTool, self.permission_decision_approve_for_location_approval_custom_tool)
+        result["PermissionDecisionApproveForLocationApprovalExtensionEnvAccess"] = to_class(PermissionDecisionApproveForLocationApprovalExtensionEnvAccess, self.permission_decision_approve_for_location_approval_extension_env_access)
         result["PermissionDecisionApproveForLocationApprovalExtensionManagement"] = to_class(PermissionDecisionApproveForLocationApprovalExtensionManagement, self.permission_decision_approve_for_location_approval_extension_management)
         result["PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess"] = to_class(PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess, self.permission_decision_approve_for_location_approval_extension_permission_access)
         result["PermissionDecisionApproveForLocationApprovalFactory"] = to_class(PermissionDecisionApproveForLocationApprovalFactory, self.permission_decision_approve_for_location_approval_factory)
@@ -30789,6 +37874,7 @@ def to_dict(self) -> dict:
         result["PermissionDecisionApproveForSessionApproval"] = (self.permission_decision_approve_for_session_approval).to_dict()
         result["PermissionDecisionApproveForSessionApprovalCommands"] = to_class(PermissionDecisionApproveForSessionApprovalCommands, self.permission_decision_approve_for_session_approval_commands)
         result["PermissionDecisionApproveForSessionApprovalCustomTool"] = to_class(PermissionDecisionApproveForSessionApprovalCustomTool, self.permission_decision_approve_for_session_approval_custom_tool)
+        result["PermissionDecisionApproveForSessionApprovalExtensionEnvAccess"] = to_class(PermissionDecisionApproveForSessionApprovalExtensionEnvAccess, self.permission_decision_approve_for_session_approval_extension_env_access)
         result["PermissionDecisionApproveForSessionApprovalExtensionManagement"] = to_class(PermissionDecisionApproveForSessionApprovalExtensionManagement, self.permission_decision_approve_for_session_approval_extension_management)
         result["PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess"] = to_class(PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess, self.permission_decision_approve_for_session_approval_extension_permission_access)
         result["PermissionDecisionApproveForSessionApprovalFactory"] = to_class(PermissionDecisionApproveForSessionApprovalFactory, self.permission_decision_approve_for_session_approval_factory)
@@ -30800,13 +37886,17 @@ def to_dict(self) -> dict:
         result["PermissionDecisionApproveOnce"] = to_class(PermissionDecisionApproveOnce, self.permission_decision_approve_once)
         result["PermissionDecisionApprovePermanently"] = to_class(PermissionDecisionApprovePermanently, self.permission_decision_approve_permanently)
         result["PermissionDecisionCancelled"] = to_class(PermissionDecisionCancelled, self.permission_decision_cancelled)
+        result["PermissionDecisionContext"] = to_class(PermissionDecisionContext, self.permission_decision_context)
         result["PermissionDecisionDeniedByContentExclusionPolicy"] = to_class(PermissionDecisionDeniedByContentExclusionPolicy, self.permission_decision_denied_by_content_exclusion_policy)
         result["PermissionDecisionDeniedByPermissionRequestHook"] = to_class(PermissionDecisionDeniedByPermissionRequestHook, self.permission_decision_denied_by_permission_request_hook)
         result["PermissionDecisionDeniedByRules"] = to_class(PermissionDecisionDeniedByRules, self.permission_decision_denied_by_rules)
         result["PermissionDecisionDeniedInteractivelyByUser"] = to_class(PermissionDecisionDeniedInteractivelyByUser, self.permission_decision_denied_interactively_by_user)
         result["PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser"] = to_class(PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser, self.permission_decision_denied_no_approval_rule_and_could_not_request_from_user)
+        result["PermissionDecisionOutcome"] = to_enum(PermissionDecisionOutcome, self.permission_decision_outcome)
         result["PermissionDecisionReject"] = to_class(PermissionDecisionReject, self.permission_decision_reject)
         result["PermissionDecisionRequest"] = to_class(PermissionDecisionRequest, self.permission_decision_request)
+        result["PermissionDecisionSource"] = to_enum(PermissionDecisionSource, self.permission_decision_source)
+        result["PermissionDecisionSurface"] = to_enum(PermissionDecisionSurface, self.permission_decision_surface)
         result["PermissionDecisionUserNotAvailable"] = to_class(PermissionDecisionUserNotAvailable, self.permission_decision_user_not_available)
         result["PermissionLocationAddToolApprovalParams"] = to_class(PermissionLocationAddToolApprovalParams, self.permission_location_add_tool_approval_params)
         result["PermissionLocationApplyParams"] = to_class(PermissionLocationApplyParams, self.permission_location_apply_params)
@@ -30814,6 +37904,7 @@ def to_dict(self) -> dict:
         result["PermissionLocationResolveParams"] = to_class(PermissionLocationResolveParams, self.permission_location_resolve_params)
         result["PermissionLocationResolveResult"] = to_class(PermissionLocationResolveResult, self.permission_location_resolve_result)
         result["PermissionLocationType"] = to_enum(PermissionLocationType, self.permission_location_type)
+        result["PermissionModeSource"] = to_enum(PermissionSource, self.permission_mode_source)
         result["PermissionPathsAddParams"] = to_class(PermissionPathsAddParams, self.permission_paths_add_params)
         result["PermissionPathsAllowedCheckParams"] = to_class(PermissionPathsAllowedCheckParams, self.permission_paths_allowed_check_params)
         result["PermissionPathsAllowedCheckResult"] = to_class(PermissionPathsAllowedCheckResult, self.permission_paths_allowed_check_result)
@@ -30824,8 +37915,8 @@ def to_dict(self) -> dict:
         result["PermissionPathsWorkspaceCheckResult"] = to_class(PermissionPathsWorkspaceCheckResult, self.permission_paths_workspace_check_result)
         result["PermissionPromptShownNotification"] = to_class(PermissionPromptShownNotification, self.permission_prompt_shown_notification)
         result["PermissionRequestResult"] = to_class(PermissionRequestResult, self.permission_request_result)
+        result["PermissionResponseCapability"] = to_enum(PermissionResponseCapability, self.permission_response_capability)
         result["PermissionRulesSet"] = to_class(PermissionRulesSet, self.permission_rules_set)
-        result["PermissionsAllowAllMode"] = to_enum(PermissionsAllowAllMode, self.permissions_allow_all_mode)
         result["PermissionsConfigureAdditionalContentExclusionPolicy"] = to_class(PermissionsConfigureAdditionalContentExclusionPolicy, self.permissions_configure_additional_content_exclusion_policy)
         result["PermissionsConfigureAdditionalContentExclusionPolicyRule"] = to_class(PermissionsConfigureAdditionalContentExclusionPolicyRule, self.permissions_configure_additional_content_exclusion_policy_rule)
         result["PermissionsConfigureAdditionalContentExclusionPolicyRuleSource"] = to_class(PermissionsConfigureAdditionalContentExclusionPolicyRuleSource, self.permissions_configure_additional_content_exclusion_policy_rule_source)
@@ -30833,10 +37924,12 @@ def to_dict(self) -> dict:
         result["PermissionsConfigureParams"] = to_class(PermissionsConfigureParams, self.permissions_configure_params)
         result["PermissionsConfigureResult"] = to_class(PermissionsConfigureResult, self.permissions_configure_result)
         result["PermissionsFolderTrustAddTrustedResult"] = to_class(PermissionsFolderTrustAddTrustedResult, self.permissions_folder_trust_add_trusted_result)
-        result["PermissionsGetAllowAllRequest"] = to_class(PermissionsGetAllowAllRequest, self.permissions_get_allow_all_request)
+        result["PermissionsGetModeRequest"] = to_class(PermissionsGetModeRequest, self.permissions_get_mode_request)
+        result["PermissionsGetModeResult"] = to_class(PermissionsGetModeResult, self.permissions_get_mode_result)
         result["PermissionsLocationsAddToolApprovalDetails"] = (self.permissions_locations_add_tool_approval_details).to_dict()
         result["PermissionsLocationsAddToolApprovalDetailsCommands"] = to_class(PermissionsLocationsAddToolApprovalDetailsCommands, self.permissions_locations_add_tool_approval_details_commands)
         result["PermissionsLocationsAddToolApprovalDetailsCustomTool"] = to_class(PermissionsLocationsAddToolApprovalDetailsCustomTool, self.permissions_locations_add_tool_approval_details_custom_tool)
+        result["PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess"] = to_class(PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess, self.permissions_locations_add_tool_approval_details_extension_env_access)
         result["PermissionsLocationsAddToolApprovalDetailsExtensionManagement"] = to_class(PermissionsLocationsAddToolApprovalDetailsExtensionManagement, self.permissions_locations_add_tool_approval_details_extension_management)
         result["PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess"] = to_class(PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess, self.permissions_locations_add_tool_approval_details_extension_permission_access)
         result["PermissionsLocationsAddToolApprovalDetailsFactory"] = to_class(PermissionsLocationsAddToolApprovalDetailsFactory, self.permissions_locations_add_tool_approval_details_factory)
@@ -30856,11 +37949,11 @@ def to_dict(self) -> dict:
         result["PermissionsPendingRequestsRequest"] = to_class(PermissionsPendingRequestsRequest, self.permissions_pending_requests_request)
         result["PermissionsResetSessionApprovalsRequest"] = to_class(PermissionsResetSessionApprovalsRequest, self.permissions_reset_session_approvals_request)
         result["PermissionsResetSessionApprovalsResult"] = to_class(PermissionsResetSessionApprovalsResult, self.permissions_reset_session_approvals_result)
-        result["PermissionsSetAllowAllRequest"] = to_class(PermissionsSetAllowAllRequest, self.permissions_set_allow_all_request)
-        result["PermissionsSetAllowAllSource"] = to_enum(PermissionsSetAAllSource, self.permissions_set_allow_all_source)
         result["PermissionsSetApproveAllRequest"] = to_class(PermissionsSetApproveAllRequest, self.permissions_set_approve_all_request)
         result["PermissionsSetApproveAllResult"] = to_class(PermissionsSetApproveAllResult, self.permissions_set_approve_all_result)
-        result["PermissionsSetApproveAllSource"] = to_enum(PermissionsSetAAllSource, self.permissions_set_approve_all_source)
+        result["PermissionsSetApproveAllSource"] = to_enum(PermissionSource, self.permissions_set_approve_all_source)
+        result["PermissionsSetModeRequest"] = to_class(PermissionsSetModeRequest, self.permissions_set_mode_request)
+        result["PermissionsSetModeResult"] = to_class(PermissionsSetModeResult, self.permissions_set_mode_result)
         result["PermissionsSetRequiredRequest"] = to_class(PermissionsSetRequiredRequest, self.permissions_set_required_request)
         result["PermissionsSetRequiredResult"] = to_class(PermissionsSetRequiredResult, self.permissions_set_required_result)
         result["PermissionsUrlsSetUnrestrictedModeResult"] = to_class(PermissionsUrlsSetUnrestrictedModeResult, self.permissions_urls_set_unrestricted_mode_result)
@@ -30878,6 +37971,7 @@ def to_dict(self) -> dict:
         result["PluginInstallResult"] = to_class(PluginInstallResult, self.plugin_install_result)
         result["PluginList"] = to_class(PluginList, self.plugin_list)
         result["PluginListResult"] = to_class(PluginListResult, self.plugin_list_result)
+        result["PluginsBuiltinSetRequest"] = to_class(PluginsBuiltinSetRequest, self.plugins_builtin_set_request)
         result["PluginsDisableRequest"] = to_class(PluginsDisableRequest, self.plugins_disable_request)
         result["PluginsEnableRequest"] = to_class(PluginsEnableRequest, self.plugins_enable_request)
         result["PluginsInstallRequest"] = to_class(PluginsInstallRequest, self.plugins_install_request)
@@ -30891,6 +37985,8 @@ def to_dict(self) -> dict:
         result["PluginUpdateAllEntry"] = to_class(PluginUpdateAllEntry, self.plugin_update_all_entry)
         result["PluginUpdateAllResult"] = to_class(PluginUpdateAllResult, self.plugin_update_all_result)
         result["PluginUpdateResult"] = to_class(PluginUpdateResult, self.plugin_update_result)
+        result["ProtocolExternalToolDefer"] = to_enum(MCPServerConfigDeferTools, self.protocol_external_tool_defer)
+        result["ProtocolExternalToolDefinition"] = to_class(ProtocolExternalToolDefinition, self.protocol_external_tool_definition)
         result["ProviderAddRequest"] = to_class(ProviderAddRequest, self.provider_add_request)
         result["ProviderAddResult"] = to_class(ProviderAddResult, self.provider_add_result)
         result["ProviderConfig"] = to_class(ProviderConfig, self.provider_config)
@@ -30980,6 +38076,7 @@ def to_dict(self) -> dict:
         result["RemoteNotifySteerableChangedRequest"] = to_class(RemoteNotifySteerableChangedRequest, self.remote_notify_steerable_changed_request)
         result["RemoteNotifySteerableChangedResult"] = to_class(RemoteNotifySteerableChangedResult, self.remote_notify_steerable_changed_result)
         result["RemoteSessionConnectionResult"] = to_class(RemoteSessionConnectionResult, self.remote_session_connection_result)
+        result["RemoteSessionHostStatus"] = to_enum(RemoteSessionHostStatus, self.remote_session_host_status)
         result["RemoteSessionMetadataRepository"] = to_class(RemoteSessionMetadataRepository, self.remote_session_metadata_repository)
         result["RemoteSessionMetadataTaskType"] = to_enum(TaskType, self.remote_session_metadata_task_type)
         result["RemoteSessionMetadataValue"] = to_class(RemoteSessionMetadataValue, self.remote_session_metadata_value)
@@ -30987,6 +38084,8 @@ def to_dict(self) -> dict:
         result["RemoteSessionRepository"] = to_class(RemoteSessionRepository, self.remote_session_repository)
         result["RunOptions"] = to_class(RunOptions, self.run_options)
         result["SandboxConfig"] = to_class(SandboxConfig, self.sandbox_config)
+        result["SandboxConfigAuth"] = to_class(SandboxConfigAuth, self.sandbox_config_auth)
+        result["SandboxConfigSource"] = to_enum(_SandboxConfigSource, self.sandbox_config_source)
         result["SandboxConfigUserPolicy"] = to_class(SandboxConfigUserPolicy, self.sandbox_config_user_policy)
         result["SandboxConfigUserPolicyExperimental"] = to_class(SandboxConfigUserPolicyExperimental, self.sandbox_config_user_policy_experimental)
         result["SandboxConfigUserPolicyExperimentalSeatbelt"] = to_class(SandboxConfigUserPolicyExperimentalSeatbelt, self.sandbox_config_user_policy_experimental_seatbelt)
@@ -31022,7 +38121,10 @@ def to_dict(self) -> dict:
         result["ServerSkillList"] = to_class(ServerSkillList, self.server_skill_list)
         result["SessionActivity"] = to_class(SessionActivity, self.session_activity)
         result["SessionAgentListRequest"] = to_class(SessionAgentListRequest, self.session_agent_list_request)
+        result["SessionAuthLoginRequest"] = to_class(SessionAuthLoginRequest, self.session_auth_login_request)
+        result["SessionAuthLogoutUserRequest"] = to_class(SessionAuthLogoutUserRequest, self.session_auth_logout_user_request)
         result["SessionAuthStatus"] = to_class(SessionAuthStatus, self.session_auth_status)
+        result["SessionAuthSwitchRequest"] = to_class(SessionAuthSwitchRequest, self.session_auth_switch_request)
         result["SessionBulkDeleteResult"] = to_class(SessionBulkDeleteResult, self.session_bulk_delete_result)
         result["SessionCancelAllBackgroundAgentsResult"] = from_int(self.session_cancel_all_background_agents_result)
         result["SessionCapability"] = to_enum(SessionCapability, self.session_capability)
@@ -31064,6 +38166,9 @@ def to_dict(self) -> dict:
         result["SessionFsStatRequest"] = to_class(SessionFSStatRequest, self.session_fs_stat_request)
         result["SessionFsStatResult"] = to_class(SessionFSStatResult, self.session_fs_stat_result)
         result["SessionFsWriteFileRequest"] = to_class(SessionFSWriteFileRequest, self.session_fs_write_file_request)
+        result["SessionGitHubAuthGetAllAuthAvailableResult"] = from_list(lambda x: to_class(SessionAuthStatus, x), self.session_git_hub_auth_get_all_auth_available_result)
+        result["SessionGitHubAuthLogoutResult"] = from_bool(self.session_git_hub_auth_logout_result)
+        result["SessionGitHubAuthLogoutUserResult"] = from_bool(self.session_git_hub_auth_logout_user_result)
         result["SessionHistoryCompactRequest"] = to_class(SessionHistoryCompactRequest, self.session_history_compact_request)
         result["SessionInstalledPlugin"] = to_class(SessionInstalledPlugin, self.session_installed_plugin)
         result["SessionInstalledPluginSource"] = from_union([lambda x: to_class(SessionInstalledPluginSource, x), from_str], self.session_installed_plugin_source)
@@ -31085,6 +38190,8 @@ def to_dict(self) -> dict:
         result["SessionListFilter"] = to_class(SessionListFilter, self.session_list_filter)
         result["SessionLoadDeferredRepoHooksResult"] = to_class(SessionLoadDeferredRepoHooksResult, self.session_load_deferred_repo_hooks_result)
         result["SessionLogLevel"] = to_enum(SessionLogLevel, self.session_log_level)
+        result["SessionManagedPermissions"] = to_class(SessionManagedPermissions, self.session_managed_permissions)
+        result["SessionManagedSettings"] = to_class(SessionManagedSettings, self.session_managed_settings)
         result["SessionMcpAppsCallToolResult"] = from_dict(lambda x: x, self.session_mcp_apps_call_tool_result)
         result["SessionMetadataSnapshot"] = to_class(SessionMetadataSnapshot, self.session_metadata_snapshot)
         result["SessionMode"] = to_enum(SessionMode, self.session_mode)
@@ -31176,7 +38283,10 @@ def to_dict(self) -> dict:
         result["SessionVisibilityStatus"] = to_enum(SessionVisibilityStatus, self.session_visibility_status)
         result["SessionWorkingDirectoryContext"] = to_class(SessionWorkingDirectoryContext, self.session_working_directory_context)
         result["SessionWorkingDirectoryContextHostType"] = to_enum(HostType, self.session_working_directory_context_host_type)
+        result["SettableAuthInfo"] = (self.settable_auth_info).to_dict()
+        result["SettableTokenAuthInfo"] = to_class(SettableTokenAuthInfo, self.settable_token_auth_info)
         result["ShellCancelUserRequestedRequest"] = to_class(ShellCancelUserRequestedRequest, self.shell_cancel_user_requested_request)
+        result["ShellCredentials"] = to_class(ShellCredentials, self.shell_credentials)
         result["ShellExecRequest"] = to_class(ShellExecRequest, self.shell_exec_request)
         result["ShellExecResult"] = to_class(ShellExecResult, self.shell_exec_result)
         result["ShellExecuteUserRequestedRequest"] = to_class(ShellExecuteUserRequestedRequest, self.shell_execute_user_requested_request)
@@ -31194,6 +38304,7 @@ def to_dict(self) -> dict:
         result["SkillDiscoveryScope"] = to_enum(SkillDiscoveryScope, self.skill_discovery_scope)
         result["SkillList"] = to_class(SkillList, self.skill_list)
         result["SkillsConfigSetDisabledSkillsRequest"] = to_class(SkillsConfigSetDisabledSkillsRequest, self.skills_config_set_disabled_skills_request)
+        result["SkillsConfigSetSkillDisabledRequest"] = to_class(SkillsConfigSetSkillDisabledRequest, self.skills_config_set_skill_disabled_request)
         result["SkillsDisableRequest"] = to_class(SkillsDisableRequest, self.skills_disable_request)
         result["SkillsDiscoverRequest"] = to_class(SkillsDiscoverRequest, self.skills_discover_request)
         result["SkillsEnableRequest"] = to_class(SkillsEnableRequest, self.skills_enable_request)
@@ -31201,6 +38312,7 @@ def to_dict(self) -> dict:
         result["SkillsGetInvokedResult"] = to_class(SkillsGetInvokedResult, self.skills_get_invoked_result)
         result["SkillsInvokedSkill"] = to_class(SkillsInvokedSkill, self.skills_invoked_skill)
         result["SkillsLoadDiagnostics"] = to_class(SkillsLoadDiagnostics, self.skills_load_diagnostics)
+        result["SlashCommandAddTimelineEntryResult"] = to_class(SlashCommandAddTimelineEntryResult, self.slash_command_add_timeline_entry_result)
         result["SlashCommandAgentPromptResult"] = to_class(SlashCommandAgentPromptResult, self.slash_command_agent_prompt_result)
         result["SlashCommandCompletedResult"] = to_class(SlashCommandCompletedResult, self.slash_command_completed_result)
         result["SlashCommandInfo"] = to_class(SlashCommandInfo, self.slash_command_info)
@@ -31209,13 +38321,20 @@ def to_dict(self) -> dict:
         result["SlashCommandInputCompletion"] = to_enum(SlashCommandInputCompletion, self.slash_command_input_completion)
         result["SlashCommandInvocationResult"] = (self.slash_command_invocation_result).to_dict()
         result["SlashCommandKind"] = to_enum(SlashCommandKind, self.slash_command_kind)
+        result["SlashCommandModelPickerDialog"] = to_class(SlashCommandModelPickerDialog, self.slash_command_model_picker_dialog)
         result["SlashCommandSelectSubcommandOption"] = to_class(SlashCommandSelectSubcommandOption, self.slash_command_select_subcommand_option)
         result["SlashCommandSelectSubcommandResult"] = to_class(SlashCommandSelectSubcommandResult, self.slash_command_select_subcommand_result)
+        result["SlashCommandSetModelResult"] = to_class(SlashCommandSetModelResult, self.slash_command_set_model_result)
+        result["SlashCommandSetPlanModelResult"] = to_class(SlashCommandSetPlanModelResult, self.slash_command_set_plan_model_result)
+        result["SlashCommandShowDialogResult"] = to_class(SlashCommandShowDialogResult, self.slash_command_show_dialog_result)
         result["SlashCommandTextResult"] = to_class(SlashCommandTextResult, self.slash_command_text_result)
+        result["SlashCommandTimelineEntry"] = to_class(SlashCommandTimelineEntry, self.slash_command_timeline_entry)
         result["SubagentSettingsEntry"] = to_class(SubagentSettingsEntry, self.subagent_settings_entry)
         result["SubagentSettingsEntryContextTier"] = to_enum(SubagentSettingsEntryContextTier, self.subagent_settings_entry_context_tier)
         result["TaskAgentInfo"] = to_class(TaskAgentInfo, self.task_agent_info)
         result["TaskAgentProgress"] = to_class(TaskAgentProgress, self.task_agent_progress)
+        result["TaskCompleteData"] = to_class(TaskCompleteData, self.task_complete_data)
+        result["TaskCompletionDecision"] = to_class(TaskCompletionDecision, self.task_completion_decision)
         result["TaskExecutionMode"] = to_enum(TaskExecutionMode, self.task_execution_mode)
         result["TaskInfo"] = (self.task_info).to_dict()
         result["TaskList"] = to_class(TaskList, self.task_list)
@@ -31242,11 +38361,23 @@ def to_dict(self) -> dict:
         result["TasksWaitForPendingResult"] = to_class(TasksWaitForPendingResult, self.tasks_wait_for_pending_result)
         result["TelemetrySetFeatureOverridesRequest"] = to_class(TelemetrySetFeatureOverridesRequest, self.telemetry_set_feature_overrides_request)
         result["TokenAuthInfo"] = to_class(TokenAuthInfo, self.token_auth_info)
+        result["TokenProviderAuthInfo"] = to_class(TokenProviderAuthInfo, self.token_provider_auth_info)
         result["Tool"] = to_class(Tool, self.tool)
         result["ToolList"] = to_class(ToolList, self.tool_list)
+        result["ToolResult"] = from_union([lambda x: to_class(ToolResultExpanded, x), from_str], self.tool_result)
+        result["ToolResultExpanded"] = to_class(ToolResultExpanded, self.tool_result_expanded)
+        result["ToolResultNewMessage"] = to_class(ToolResultNewMessage, self.tool_result_new_message)
+        result["ToolResultType"] = to_enum(ToolResultType, self.tool_result_type)
+        result["ToolsExecuteRequest"] = to_class(ToolsExecuteRequest, self.tools_execute_request)
+        result["ToolsGetBuiltinDescriptorsRequest"] = to_class(ToolsGetBuiltinDescriptorsRequest, self.tools_get_builtin_descriptors_request)
+        result["ToolsGetBuiltinDescriptorsResult"] = to_class(ToolsGetBuiltinDescriptorsResult, self.tools_get_builtin_descriptors_result)
         result["ToolsGetCurrentMetadataResult"] = to_class(ToolsGetCurrentMetadataResult, self.tools_get_current_metadata_result)
         result["ToolsInitializeAndValidateResult"] = to_class(ToolsInitializeAndValidateResult, self.tools_initialize_and_validate_result)
         result["ToolsListRequest"] = to_class(ToolsListRequest, self.tools_list_request)
+        result["ToolsSetRequest"] = to_class(ToolsSetRequest, self.tools_set_request)
+        result["ToolsSetResult"] = to_class(ToolsSetResult, self.tools_set_result)
+        result["ToolsShellDescriptorConfig"] = to_class(ToolsShellDescriptorConfig, self.tools_shell_descriptor_config)
+        result["ToolsTaskCompleteEventDataRequest"] = to_class(ToolsTaskCompleteEventDataRequest, self.tools_task_complete_event_data_request)
         result["ToolsUpdateSubagentSettingsResult"] = to_class(ToolsUpdateSubagentSettingsResult, self.tools_update_subagent_settings_result)
         result["UIAutoModeSwitchResponse"] = to_enum(UIAutoModeSwitchResponse, self.ui_auto_mode_switch_response)
         result["UIElicitationArrayAnyOfField"] = to_class(UIElicitationArrayAnyOfField, self.ui_elicitation_array_any_of_field)
@@ -31290,6 +38421,7 @@ def to_dict(self) -> dict:
         result["UIUserInputResponse"] = to_class(UIUserInputResponse, self.ui_user_input_response)
         result["UpdateSubagentSettingsRequest"] = to_class(UpdateSubagentSettingsRequest, self.update_subagent_settings_request)
         result["UsageGetMetricsResult"] = to_class(UsageGetMetricsResult, self.usage_get_metrics_result)
+        result["UsageMetricsAgentMetric"] = to_class(UsageMetricsAgentMetric, self.usage_metrics_agent_metric)
         result["UsageMetricsCodeChanges"] = to_class(UsageMetricsCodeChanges, self.usage_metrics_code_changes)
         result["UsageMetricsModelMetric"] = to_class(UsageMetricsModelMetric, self.usage_metrics_model_metric)
         result["UsageMetricsModelMetricRequests"] = to_class(UsageMetricsModelMetricRequests, self.usage_metrics_model_metric_requests)
@@ -31333,6 +38465,7 @@ def to_dict(self) -> dict:
         result["WorkspacesWorkspaceDetailsHostType"] = to_enum(HostType, self.workspaces_workspace_details_host_type)
         result["WorkspacesWriteAutopilotObjectiveRequest"] = to_class(WorkspacesWriteAutopilotObjectiveRequest, self.workspaces_write_autopilot_objective_request)
         result["WorkspacesWriteAutopilotObjectiveResult"] = to_class(WorkspacesWriteAutopilotObjectiveResult, self.workspaces_write_autopilot_objective_result)
+        result["SessionAuthInfoResult"] = from_union([lambda x: to_class(AuthIdentity, x), from_none], self.session_auth_info_result)
         result["SessionContextAttribution"] = from_union([lambda x: to_class(SessionContextAttribution, x), from_none], self.session_context_attribution)
         result["SessionContextInfo"] = from_union([lambda x: to_class(SessionContextInfo, x), from_none], self.session_context_info)
         result["SubagentSettings"] = from_union([lambda x: to_class(SubagentSettings, x), from_none], self.subagent_settings)
@@ -31359,8 +38492,8 @@ def _load_AgentRegistrySpawnResult(obj: Any) -> "AgentRegistrySpawnResult":
         case "validation-error": return AgentRegistrySpawnValidationError.from_dict(obj)
         case _: raise ValueError(f"Unknown AgentRegistrySpawnResult kind: {kind!r}")
 
-# Initial authentication info for the session.
-AuthInfo = HMACAuthInfo | EnvAuthInfo | TokenAuthInfo | CopilotAPITokenAuthInfo | UserAuthInfo | GhCLIAuthInfo | APIKeyAuthInfo
+# Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.
+AuthInfo = HMACAuthInfo | EnvAuthInfo | TokenAuthInfo | TokenProviderAuthInfo | CopilotAPITokenAuthInfo | UserAuthInfo | GhCLIAuthInfo | APIKeyAuthInfo
 
 def _load_AuthInfo(obj: Any) -> "AuthInfo":
     assert isinstance(obj, dict)
@@ -31369,12 +38502,44 @@ def _load_AuthInfo(obj: Any) -> "AuthInfo":
         case "hmac": return HMACAuthInfo.from_dict(obj)
         case "env": return EnvAuthInfo.from_dict(obj)
         case "token": return TokenAuthInfo.from_dict(obj)
+        case "token-provider": return TokenProviderAuthInfo.from_dict(obj)
         case "copilot-api-token": return CopilotAPITokenAuthInfo.from_dict(obj)
         case "user": return UserAuthInfo.from_dict(obj)
         case "gh-cli": return GhCLIAuthInfo.from_dict(obj)
         case "api-key": return APIKeyAuthInfo.from_dict(obj)
         case _: raise ValueError(f"Unknown AuthInfo type: {kind!r}")
 
+# Where a candidate's card came from. Exactly one of a URL or embedded data: the union has no variant carrying both, and no variant carrying neither, so the rule holds structurally rather than by validation.
+CatalogCandidateSource = CatalogCandidateSourceURL | CatalogCandidateSourceEmbedded
+
+def _load_CatalogCandidateSource(obj: Any) -> "CatalogCandidateSource":
+    assert isinstance(obj, dict)
+    kind = obj.get("kind")
+    match kind:
+        case "url": return CatalogCandidateSourceURL.from_dict(obj)
+        case "embedded": return CatalogCandidateSourceEmbedded.from_dict(obj)
+        case _: raise ValueError(f"Unknown CatalogCandidateSource kind: {kind!r}")
+
+# Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
+CatalogSearchResult = CatalogSearchSucceeded | CatalogNegotiationRefusedError | CatalogUnsupportedKindError | CatalogInvalidRequestError | CatalogAuthenticationRequiredError | CatalogPolicyRejectedError | CatalogNetworkFailureError | CatalogUnsafeRetrievalError | CatalogMalformedCardError | CatalogContractViolationError | CatalogUnavailableError
+
+def _load_CatalogSearchResult(obj: Any) -> "CatalogSearchResult":
+    assert isinstance(obj, dict)
+    kind = obj.get("kind")
+    match kind:
+        case "succeeded": return CatalogSearchSucceeded.from_dict(obj)
+        case "negotiation-refused": return CatalogNegotiationRefusedError.from_dict(obj)
+        case "unsupported-kind": return CatalogUnsupportedKindError.from_dict(obj)
+        case "invalid-request": return CatalogInvalidRequestError.from_dict(obj)
+        case "authentication-required": return CatalogAuthenticationRequiredError.from_dict(obj)
+        case "policy-rejected": return CatalogPolicyRejectedError.from_dict(obj)
+        case "network-failure": return CatalogNetworkFailureError.from_dict(obj)
+        case "unsafe-retrieval": return CatalogUnsafeRetrievalError.from_dict(obj)
+        case "malformed-card": return CatalogMalformedCardError.from_dict(obj)
+        case "contract-violation": return CatalogContractViolationError.from_dict(obj)
+        case "unavailable": return CatalogUnavailableError.from_dict(obj)
+        case _: raise ValueError(f"Unknown CatalogSearchResult kind: {kind!r}")
+
 # A content block within a tool result, which may be text, terminal output, image, audio, or a resource
 ExternalToolTextResultForLlmContent = ExternalToolTextResultForLlmContentText | ExternalToolTextResultForLlmContentTerminal | ExternalToolTextResultForLlmContentShellExit | ExternalToolTextResultForLlmContentImage | ExternalToolTextResultForLlmContentAudio | ExternalToolTextResultForLlmContentResourceLink | ExternalToolTextResultForLlmContentResource
 
@@ -31391,6 +38556,72 @@ def _load_ExternalToolTextResultForLlmContent(obj: Any) -> "ExternalToolTextResu
         case "resource": return ExternalToolTextResultForLlmContentResource.from_dict(obj)
         case _: raise ValueError(f"Unknown ExternalToolTextResultForLlmContent type: {kind!r}")
 
+# Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.
+MCPPlanInstallResult = MCPPlanInstallPlanned | CatalogNegotiationRefusedError | CatalogHandleRejectedError | CatalogInvalidRequestError | CatalogAuthenticationRequiredError | CatalogPolicyRejectedError | CatalogNetworkFailureError | CatalogUnsafeRetrievalError | CatalogMalformedCardError | CatalogContractViolationError | CatalogUnavailableTransportError | CatalogNotInstallableError | CatalogUnavailableError
+
+def _load_MCPPlanInstallResult(obj: Any) -> "MCPPlanInstallResult":
+    assert isinstance(obj, dict)
+    kind = obj.get("kind")
+    match kind:
+        case "planned": return MCPPlanInstallPlanned.from_dict(obj)
+        case "negotiation-refused": return CatalogNegotiationRefusedError.from_dict(obj)
+        case "handle-rejected": return CatalogHandleRejectedError.from_dict(obj)
+        case "invalid-request": return CatalogInvalidRequestError.from_dict(obj)
+        case "authentication-required": return CatalogAuthenticationRequiredError.from_dict(obj)
+        case "policy-rejected": return CatalogPolicyRejectedError.from_dict(obj)
+        case "network-failure": return CatalogNetworkFailureError.from_dict(obj)
+        case "unsafe-retrieval": return CatalogUnsafeRetrievalError.from_dict(obj)
+        case "malformed-card": return CatalogMalformedCardError.from_dict(obj)
+        case "contract-violation": return CatalogContractViolationError.from_dict(obj)
+        case "unavailable-transport": return CatalogUnavailableTransportError.from_dict(obj)
+        case "not-installable": return CatalogNotInstallableError.from_dict(obj)
+        case "unavailable": return CatalogUnavailableError.from_dict(obj)
+        case _: raise ValueError(f"Unknown MCPPlanInstallResult kind: {kind!r}")
+
+# What an install plan is computed from: a candidate handle from a previous search, or a card supplied directly.
+MCPPlanInstallSource = MCPPlanInstallSourceCandidate | MCPPlanInstallSourceCard
+
+def _load_MCPPlanInstallSource(obj: Any) -> "MCPPlanInstallSource":
+    assert isinstance(obj, dict)
+    kind = obj.get("kind")
+    match kind:
+        case "candidate": return MCPPlanInstallSourceCandidate.from_dict(obj)
+        case "card": return MCPPlanInstallSourceCard.from_dict(obj)
+        case _: raise ValueError(f"Unknown MCPPlanInstallSource kind: {kind!r}")
+
+# One non-secret value a transport choice needs, represented as a scalar or enumerated variant so enum values cannot be missing or attached to another type.
+MCPPlanRequiredValue = MCPPlanRequiredValueScalar | MCPPlanRequiredValueEnum
+
+def _load_MCPPlanRequiredValue(obj: Any) -> "MCPPlanRequiredValue":
+    assert isinstance(obj, dict)
+    kind = obj.get("kind")
+    match kind:
+        case "scalar": return MCPPlanRequiredValueScalar.from_dict(obj)
+        case "enum": return MCPPlanRequiredValueEnum.from_dict(obj)
+        case _: raise ValueError(f"Unknown MCPPlanRequiredValue kind: {kind!r}")
+
+# One eligible way to run the server, represented as a tagged package or remote variant so package identity and endpoint states cannot contradict the install method.
+MCPPlanTransportChoice = MCPPlanTransportChoicePackage | MCPPlanTransportChoiceRemote
+
+def _load_MCPPlanTransportChoice(obj: Any) -> "MCPPlanTransportChoice":
+    assert isinstance(obj, dict)
+    kind = obj.get("installMethod")
+    match kind:
+        case "package": return MCPPlanTransportChoicePackage.from_dict(obj)
+        case "remote": return MCPPlanTransportChoiceRemote.from_dict(obj)
+        case _: raise ValueError(f"Unknown MCPPlanTransportChoice installMethod: {kind!r}")
+
+# A card supplied directly by the caller. Exactly one of a URL or embedded data, encoded structurally so neither both nor neither can be expressed.
+MCPServerCardReference = MCPServerCardURL | MCPServerCardEmbedded
+
+def _load_MCPServerCardReference(obj: Any) -> "MCPServerCardReference":
+    assert isinstance(obj, dict)
+    kind = obj.get("kind")
+    match kind:
+        case "url": return MCPServerCardURL.from_dict(obj)
+        case "embedded": return MCPServerCardEmbedded.from_dict(obj)
+        case _: raise ValueError(f"Unknown MCPServerCardReference kind: {kind!r}")
+
 # The client's response to the pending permission prompt
 PermissionDecision = PermissionDecisionApproveOnce | PermissionDecisionApproveForSession | PermissionDecisionApproveForLocation | PermissionDecisionApprovePermanently | PermissionDecisionReject | PermissionDecisionUserNotAvailable | PermissionDecisionApproved | PermissionDecisionApprovedForSession | PermissionDecisionApprovedForLocation | PermissionDecisionCancelled | PermissionDecisionDeniedByRules | PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser | PermissionDecisionDeniedInteractivelyByUser | PermissionDecisionDeniedByContentExclusionPolicy | PermissionDecisionDeniedByPermissionRequestHook
 
@@ -31416,7 +38647,7 @@ def _load_PermissionDecision(obj: Any) -> "PermissionDecision":
         case _: raise ValueError(f"Unknown PermissionDecision kind: {kind!r}")
 
 # Approval to persist for this location
-PermissionDecisionApproveForLocationApproval = PermissionDecisionApproveForLocationApprovalCommands | PermissionDecisionApproveForLocationApprovalRead | PermissionDecisionApproveForLocationApprovalWrite | PermissionDecisionApproveForLocationApprovalMCP | PermissionDecisionApproveForLocationApprovalMCPSampling | PermissionDecisionApproveForLocationApprovalMemory | PermissionDecisionApproveForLocationApprovalCustomTool | PermissionDecisionApproveForLocationApprovalExtensionManagement | PermissionDecisionApproveForLocationApprovalFactory | PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess
+PermissionDecisionApproveForLocationApproval = PermissionDecisionApproveForLocationApprovalCommands | PermissionDecisionApproveForLocationApprovalRead | PermissionDecisionApproveForLocationApprovalWrite | PermissionDecisionApproveForLocationApprovalMCP | PermissionDecisionApproveForLocationApprovalMCPSampling | PermissionDecisionApproveForLocationApprovalMemory | PermissionDecisionApproveForLocationApprovalCustomTool | PermissionDecisionApproveForLocationApprovalExtensionManagement | PermissionDecisionApproveForLocationApprovalFactory | PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess | PermissionDecisionApproveForLocationApprovalExtensionEnvAccess
 
 def _load_PermissionDecisionApproveForLocationApproval(obj: Any) -> "PermissionDecisionApproveForLocationApproval":
     assert isinstance(obj, dict)
@@ -31432,10 +38663,11 @@ def _load_PermissionDecisionApproveForLocationApproval(obj: Any) -> "PermissionD
         case "extension-management": return PermissionDecisionApproveForLocationApprovalExtensionManagement.from_dict(obj)
         case "factory": return PermissionDecisionApproveForLocationApprovalFactory.from_dict(obj)
         case "extension-permission-access": return PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess.from_dict(obj)
+        case "extension-env-access": return PermissionDecisionApproveForLocationApprovalExtensionEnvAccess.from_dict(obj)
         case _: raise ValueError(f"Unknown PermissionDecisionApproveForLocationApproval kind: {kind!r}")
 
 # Session-scoped approval to remember (tool prompts only; omitted for path/url prompts)
-PermissionDecisionApproveForSessionApproval = PermissionDecisionApproveForSessionApprovalCommands | PermissionDecisionApproveForSessionApprovalRead | PermissionDecisionApproveForSessionApprovalWrite | PermissionDecisionApproveForSessionApprovalMCP | PermissionDecisionApproveForSessionApprovalMCPSampling | PermissionDecisionApproveForSessionApprovalMemory | PermissionDecisionApproveForSessionApprovalCustomTool | PermissionDecisionApproveForSessionApprovalExtensionManagement | PermissionDecisionApproveForSessionApprovalFactory | PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess
+PermissionDecisionApproveForSessionApproval = PermissionDecisionApproveForSessionApprovalCommands | PermissionDecisionApproveForSessionApprovalRead | PermissionDecisionApproveForSessionApprovalWrite | PermissionDecisionApproveForSessionApprovalMCP | PermissionDecisionApproveForSessionApprovalMCPSampling | PermissionDecisionApproveForSessionApprovalMemory | PermissionDecisionApproveForSessionApprovalCustomTool | PermissionDecisionApproveForSessionApprovalExtensionManagement | PermissionDecisionApproveForSessionApprovalFactory | PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess | PermissionDecisionApproveForSessionApprovalExtensionEnvAccess
 
 def _load_PermissionDecisionApproveForSessionApproval(obj: Any) -> "PermissionDecisionApproveForSessionApproval":
     assert isinstance(obj, dict)
@@ -31451,10 +38683,11 @@ def _load_PermissionDecisionApproveForSessionApproval(obj: Any) -> "PermissionDe
         case "extension-management": return PermissionDecisionApproveForSessionApprovalExtensionManagement.from_dict(obj)
         case "factory": return PermissionDecisionApproveForSessionApprovalFactory.from_dict(obj)
         case "extension-permission-access": return PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess.from_dict(obj)
+        case "extension-env-access": return PermissionDecisionApproveForSessionApprovalExtensionEnvAccess.from_dict(obj)
         case _: raise ValueError(f"Unknown PermissionDecisionApproveForSessionApproval kind: {kind!r}")
 
 # Tool approval to persist and apply
-PermissionsLocationsAddToolApprovalDetails = PermissionsLocationsAddToolApprovalDetailsCommands | PermissionsLocationsAddToolApprovalDetailsRead | PermissionsLocationsAddToolApprovalDetailsWrite | PermissionsLocationsAddToolApprovalDetailsMCP | PermissionsLocationsAddToolApprovalDetailsMCPSampling | PermissionsLocationsAddToolApprovalDetailsMemory | PermissionsLocationsAddToolApprovalDetailsCustomTool | PermissionsLocationsAddToolApprovalDetailsExtensionManagement | PermissionsLocationsAddToolApprovalDetailsFactory | PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess
+PermissionsLocationsAddToolApprovalDetails = PermissionsLocationsAddToolApprovalDetailsCommands | PermissionsLocationsAddToolApprovalDetailsRead | PermissionsLocationsAddToolApprovalDetailsWrite | PermissionsLocationsAddToolApprovalDetailsMCP | PermissionsLocationsAddToolApprovalDetailsMCPSampling | PermissionsLocationsAddToolApprovalDetailsMemory | PermissionsLocationsAddToolApprovalDetailsCustomTool | PermissionsLocationsAddToolApprovalDetailsExtensionManagement | PermissionsLocationsAddToolApprovalDetailsFactory | PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess | PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess
 
 def _load_PermissionsLocationsAddToolApprovalDetails(obj: Any) -> "PermissionsLocationsAddToolApprovalDetails":
     assert isinstance(obj, dict)
@@ -31470,6 +38703,7 @@ def _load_PermissionsLocationsAddToolApprovalDetails(obj: Any) -> "PermissionsLo
         case "extension-management": return PermissionsLocationsAddToolApprovalDetailsExtensionManagement.from_dict(obj)
         case "factory": return PermissionsLocationsAddToolApprovalDetailsFactory.from_dict(obj)
         case "extension-permission-access": return PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess.from_dict(obj)
+        case "extension-env-access": return PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess.from_dict(obj)
         case _: raise ValueError(f"Unknown PermissionsLocationsAddToolApprovalDetails kind: {kind!r}")
 
 # Attachment union accepted by push input, covering files, directories, GitHub objects, blobs, snippets, and extension context.
@@ -31547,8 +38781,24 @@ def _load_SessionOpenParams(obj: Any) -> "SessionOpenParams":
         case "handoff": return SessionsOpenHandoff.from_dict(obj)
         case _: raise ValueError(f"Unknown SessionOpenParams kind: {kind!r}")
 
+# Authentication credentials accepted by session.gitHubAuth.setCredentials. Session-owned token-provider identities cannot be installed through this method.
+SettableAuthInfo = HMACAuthInfo | EnvAuthInfo | SettableTokenAuthInfo | CopilotAPITokenAuthInfo | UserAuthInfo | GhCLIAuthInfo | APIKeyAuthInfo
+
+def _load_SettableAuthInfo(obj: Any) -> "SettableAuthInfo":
+    assert isinstance(obj, dict)
+    kind = obj.get("type")
+    match kind:
+        case "hmac": return HMACAuthInfo.from_dict(obj)
+        case "env": return EnvAuthInfo.from_dict(obj)
+        case "token": return SettableTokenAuthInfo.from_dict(obj)
+        case "copilot-api-token": return CopilotAPITokenAuthInfo.from_dict(obj)
+        case "user": return UserAuthInfo.from_dict(obj)
+        case "gh-cli": return GhCLIAuthInfo.from_dict(obj)
+        case "api-key": return APIKeyAuthInfo.from_dict(obj)
+        case _: raise ValueError(f"Unknown SettableAuthInfo type: {kind!r}")
+
 # Result of invoking the slash command (text output, prompt to send to the agent, completion, or subcommand selection).
-SlashCommandInvocationResult = SlashCommandTextResult | SlashCommandAgentPromptResult | SlashCommandCompletedResult | SlashCommandSelectSubcommandResult
+SlashCommandInvocationResult = SlashCommandTextResult | SlashCommandAgentPromptResult | SlashCommandCompletedResult | SlashCommandSelectSubcommandResult | SlashCommandAddTimelineEntryResult | SlashCommandShowDialogResult | SlashCommandSetModelResult | SlashCommandSetPlanModelResult
 
 def _load_SlashCommandInvocationResult(obj: Any) -> "SlashCommandInvocationResult":
     assert isinstance(obj, dict)
@@ -31558,6 +38808,10 @@ def _load_SlashCommandInvocationResult(obj: Any) -> "SlashCommandInvocationResul
         case "agent-prompt": return SlashCommandAgentPromptResult.from_dict(obj)
         case "completed": return SlashCommandCompletedResult.from_dict(obj)
         case "select-subcommand": return SlashCommandSelectSubcommandResult.from_dict(obj)
+        case "add-timeline-entry": return SlashCommandAddTimelineEntryResult.from_dict(obj)
+        case "show-dialog": return SlashCommandShowDialogResult.from_dict(obj)
+        case "set-model": return SlashCommandSetModelResult.from_dict(obj)
+        case "set-plan-model": return SlashCommandSetPlanModelResult.from_dict(obj)
         case _: raise ValueError(f"Unknown SlashCommandInvocationResult kind: {kind!r}")
 
 # Tracked task union returned by task APIs, containing either an agent task or a shell task.
@@ -31574,8 +38828,13 @@ def _load_TaskInfo(obj: Any) -> "TaskInfo":
 
 AccountGetAllUsersResult = list
 AgentListRequest = Any
+AuthValidationErrors = list
+BuiltinToolSafeForTelemetry = bool
 CanvasActionInvokeResult = Any
 CanvasJsonSchema = Any
+CardDigestValue = str
+CatalogCapabilityId = str
+CatalogMcpServerInstallability = CatalogMCPServerInstallabilityEnum
 CommandsListRequest = Any
 ExternalToolResult = ExternalToolTextResultForLlm
 ExternalToolTextResultForLlmContentResourceLinkIconTheme = Theme
@@ -31595,17 +38854,28 @@ def _load_TaskInfo(obj: Any) -> "TaskInfo":
 McpExecuteSamplingRequest = dict
 McpExecuteSamplingResult = dict
 McpOauthLoginGrantType = MCPGrantType
+McpPlanEnumValueType = MCPPlan
+McpPlanInstallResult = MCPPlanInstallResult
+McpPlanInstallSource = MCPPlanInstallSource
+McpPlanRequiredValue = MCPPlanRequiredValue
+McpPlanRequiredValueEnumKind = MCPPlan
+McpPlanScalarValueType = MCPPlanScalarValueTypeEnum
+McpPlanSecretReference = str
+McpPlanTransportChoice = MCPPlanTransportChoice
+McpSafeForTelemetry = bool
 McpServerAuthConfig = bool
+McpServerCardReference = MCPServerCardReference
 McpServerConfigHttpOauthGrantType = MCPGrantType
 MetadataSnapshotRemoteMetadataTaskType = TaskType
 ModelListRequest = Any
 OptionsUpdateAdditionalContentExclusionPolicyScope = AdditionalContentExclusionPolicyScope
 OptionsUpdateEnvValueMode = MCPSetEnvValueModeDetails
 OptionsUpdateReasoningSummary = ReasoningSummary
+PermissionModeSource = PermissionSource
 PermissionsConfigureAdditionalContentExclusionPolicyScope = AdditionalContentExclusionPolicyScope
-PermissionsSetAllowAllSource = PermissionsSetAAllSource
-PermissionsSetApproveAllSource = PermissionsSetAAllSource
+PermissionsSetApproveAllSource = PermissionSource
 PluginsReloadRequest = Any
+ProtocolExternalToolDefer = MCPServerConfigDeferTools
 ProviderConfigTransport = ProviderTransport
 ProviderConfigType = ProviderType
 ProviderConfigWireApi = ProviderWireAPI
@@ -31614,9 +38884,13 @@ def _load_TaskInfo(obj: Any) -> "TaskInfo":
 ProviderEndpointWireApi = ProviderWireAPI
 ProviderGetEndpointRequest = Any
 RemoteSessionMetadataTaskType = TaskType
+SessionAuthInfoResult = AuthIdentity
 SessionCancelAllBackgroundAgentsResult = int
 SessionContextHostType = HostType
 SessionFsReaddirWithTypesEntryType = DebugCollectLogsEntryKind
+SessionGitHubAuthGetAllAuthAvailableResult = list
+SessionGitHubAuthLogoutResult = bool
+SessionGitHubAuthLogoutUserResult = bool
 SessionLimitPredictionRequest = Any
 SessionMcpAppsCallToolResult = dict
 SessionOpenOptionsAdditionalContentExclusionPolicyScope = AdditionalContentExclusionPolicyScope
@@ -31626,6 +38900,7 @@ def _load_TaskInfo(obj: Any) -> "TaskInfo":
 SessionWorkingDirectoryContextHostType = HostType
 TaskInfoExecutionMode = TaskExecutionMode
 TaskInfoStatus = TaskStatus
+ToolResult = ToolResultExpanded
 WorkspaceSummaryHostType = HostType
 WorkspacesWorkspaceDetailsHostType = HostType
 
@@ -31663,7 +38938,7 @@ def __init__(self, client: "JsonRpcClient"):
         self._client = client
 
     async def list(self, params: ModelsListRequest, *, timeout: float | None = None) -> ModelList:
-        "Lists Copilot models available to the authenticated user.\n\nArgs:\n    params: Optional GitHub token used to list models for a specific user instead of the global auth context.\n\nReturns:\n    List of Copilot models available to the resolved user, including capabilities and billing metadata."
+        "Lists Copilot models available to the authenticated user.\n\nArgs:\n    params: Optional opaque account selection or compatibility GitHub token used to list models.\n\nReturns:\n    List of Copilot models available to the resolved user, including capabilities and billing metadata."
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         return ModelList.from_dict(_patch_model_capabilities(await self._client.request("models.list", params_dict, **_timeout_kwargs(timeout))))
 
@@ -31689,7 +38964,7 @@ def __init__(self, client: "JsonRpcClient"):
         self._client = client
 
     async def get_quota(self, params: AccountGetQuotaRequest, *, timeout: float | None = None) -> AccountGetQuotaResult:
-        "Gets Copilot quota usage for the authenticated user or supplied GitHub token.\n\nArgs:\n    params: Optional GitHub token used to look up quota for a specific user instead of the global auth context.\n\nReturns:\n    Quota usage snapshots for the resolved user, keyed by quota type."
+        "Gets Copilot quota usage for the current or opaquely selected authenticated user.\n\nArgs:\n    params: Optional opaque account selection or compatibility GitHub token used to look up quota.\n\nReturns:\n    Quota usage snapshots for the resolved user, keyed by quota type."
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         return AccountGetQuotaResult.from_dict(await self._client.request("account.getQuota", params_dict, **_timeout_kwargs(timeout)))
 
@@ -31702,7 +38977,7 @@ async def get_all_users(self, *, timeout: float | None = None) -> list:
         return list(await self._client.request("account.getAllUsers", {}, **_timeout_kwargs(timeout)))
 
     async def login(self, params: AccountLoginRequest, *, timeout: float | None = None) -> AccountLoginResult:
-        "Stores authentication credentials after successful login (e.g., device code flow).\n\nArgs:\n    params: Credentials to store after successful authentication\n\nReturns:\n    Result of a successful login; throws on failure"
+        "Validates and stores authentication credentials. When login is omitted, resolves the authenticated user from the token before persistence.\n\nArgs:\n    params: Credentials to validate and store. Omit login to resolve the authenticated user from the token.\n\nReturns:\n    Result of a successful login; throws on failure"
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         return AccountLoginResult.from_dict(await self._client.request("account.login", params_dict, **_timeout_kwargs(timeout)))
 
@@ -31773,6 +39048,11 @@ async def discover(self, params: MCPDiscoverRequest, *, timeout: float | None =
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         return MCPDiscoverResult.from_dict(await self._client.request("mcp.discover", params_dict, **_timeout_kwargs(timeout)))
 
+    async def plan_install(self, params: MCPPlanInstallRequest, *, timeout: float | None = None) -> MCPPlanInstallResult:
+        "Requests a side-effect-free MCP install plan from a catalog candidate handle or a caller-supplied card. This host-implemented server method is available through SDK/TUI hosts; standalone and C-ABI runtimes whose host does not implement server-method dispatch return JSON-RPC MethodNotFound. A runtime with planning available returns a normalised plan and opaque single-use plan handle; a runtime without it returns the typed planning-unavailable result. A completed plan reports resource identity, provenance, eligible transport choices, the user-scope target, required typed values and secret placeholders, the policy result, the configuration changes installing would make, and whether a reload would be needed. Planning never writes configuration, stores a secret, or reloads MCP servers, so abandoning a plan needs no call and leaves nothing behind.\n\nArgs:\n    params: A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.\n\nReturns:\n    Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return _load_MCPPlanInstallResult(await self._client.request("mcp.planInstall", params_dict, **_timeout_kwargs(timeout)))
+
 
 # Experimental: this API group is experimental and may change or be removed.
 class ServerExtensionsApi:
@@ -31794,6 +39074,28 @@ async def disable(self, params: DiscoveredExtensionsDisableRequest, *, timeout:
         await self._client.request("extensions.disable", params_dict, **_timeout_kwargs(timeout))
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class ServerCatalogApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def search(self, params: CatalogSearchRequest, *, timeout: float | None = None) -> CatalogSearchResult:
+        "Requests a bounded catalog search. This host-implemented server method is available through SDK/TUI hosts; standalone and C-ABI runtimes whose host does not implement server-method dispatch return JSON-RPC MethodNotFound. A runtime with search available returns inert candidate summaries, each with an opaque single-use handle scoped to this runtime instance; a runtime without it returns the typed search-unavailable result. Public authorities may be searched anonymously, while an authority that requires credentials yields the typed authentication-required result. All returned text, URLs, and package metadata are untrusted external data and can never trigger instructions, tools, or installation. Read-only: nothing is installed, configured, or persisted.\n\nArgs:\n    params: A bounded catalog search. Both the query length and the result count are capped by the schema so a caller cannot request an unbounded scan.\n\nReturns:\n    Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return _load_CatalogSearchResult(await self._client.request("catalog.search", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class ServerPluginsBuiltinApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def set(self, params: PluginsBuiltinSetRequest, *, timeout: float | None = None) -> None:
+        "Replaces this server's trusted built-in plugin directories while no sessions are active.\n\nArgs:\n    params: Trusted built-in plugin directories to use for this runtime process."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        await self._client.request("plugins.builtin.set", params_dict, **_timeout_kwargs(timeout))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class ServerPluginsMarketplacesApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -31828,6 +39130,7 @@ async def refresh(self, params: PluginsMarketplacesRefreshRequest, *, timeout: f
 class ServerPluginsApi:
     def __init__(self, client: "JsonRpcClient"):
         self._client = client
+        self.builtin = ServerPluginsBuiltinApi(client)
         self.marketplaces = ServerPluginsMarketplacesApi(client)
 
     async def list(self, *, timeout: float | None = None) -> PluginListResult:
@@ -31874,6 +39177,11 @@ async def set_disabled_skills(self, params: SkillsConfigSetDisabledSkillsRequest
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         await self._client.request("skills.config.setDisabledSkills", params_dict, **_timeout_kwargs(timeout))
 
+    async def set_skill_disabled(self, params: SkillsConfigSetSkillDisabledRequest, *, timeout: float | None = None) -> None:
+        "Atomically adds or removes one skill from the disabled list.\n\nArgs:\n    params: Adds or removes a single skill from the global disabled list, leaving every other entry untouched."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        await self._client.request("skills.config.setSkillDisabled", params_dict, **_timeout_kwargs(timeout))
+
 
 # Experimental: this API group is experimental and may change or be removed.
 class ServerSkillsApi:
@@ -31960,6 +39268,16 @@ def __init__(self, client: "JsonRpcClient"):
         self.settings = ServerUserSettingsApi(client)
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class ServerManagedSettingsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def read(self, *, timeout: float | None = None) -> ManagedSettingsReadResult:
+        "Discovers device-managed settings from production MDM and managed-file sources, validates them against the runtime-owned managed-settings schema, and returns the canonical JSON without requiring a session.\n\nReturns:\n    Validated device-managed settings discovered before a session exists."
+        return ManagedSettingsReadResult.from_dict(await self._client.request("managedSettings.read", {}, **_timeout_kwargs(timeout)))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class ServerRuntimeApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -32141,12 +39459,14 @@ def __init__(self, client: "JsonRpcClient"):
         self.secrets = ServerSecretsApi(client)
         self.mcp = ServerMcpApi(client)
         self.extensions = ServerExtensionsApi(client)
+        self.catalog = ServerCatalogApi(client)
         self.plugins = ServerPluginsApi(client)
         self.skills = ServerSkillsApi(client)
         self.agents = ServerAgentsApi(client)
         self.instructions = ServerInstructionsApi(client)
         self.commands = ServerCommandsApi(client)
         self.user = ServerUserApi(client)
+        self.managed_settings = ServerManagedSettingsApi(client)
         self.runtime = ServerRuntimeApi(client)
         self.session_fs = ServerSessionFsApi(client)
         self.llm_inference = ServerLlmInferenceApi(client)
@@ -32158,6 +39478,10 @@ async def ping(self, params: PingRequest, *, timeout: float | None = None) -> Pi
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         return PingResult.from_dict(await self._client.request("ping", params_dict, **_timeout_kwargs(timeout)))
 
+    async def register_extension_launch_provider(self, *, timeout: float | None = None) -> None:
+        "Registers the calling SDK client as the per-entrypoint extension launch provider. Call before creating any sessions. When omitted, the runtime temporarily falls back to its built-in Node launcher for backward compatibility.\n\n.. warning:: This API is experimental and may change or be removed in future versions."
+        await self._client.request("registerExtensionLaunchProvider", {}, **_timeout_kwargs(timeout))
+
 
 # Experimental: this API group is experimental and may change or be removed.
 class _InternalServerSessionsApi:
@@ -32212,7 +39536,7 @@ def __init__(self, client: "JsonRpcClient"):
         self.sessions = _InternalServerSessionsApi(client)
 
     async def _connect(self, params: _ConnectRequest, *, timeout: float | None = None) -> _ConnectResult:
-        "Performs the SDK server connection handshake and validates the optional connection token. Marked internal because this is JSON-RPC transport plumbing invoked automatically by an SDK client's own `connect()` wrapper, not a user-facing method. Stays internal as long as the SDK client owns the handshake; would only become public if the SDK ever exposed the raw schema surface to consumers without a connection wrapper.\n\nArgs:\n    params: Parameters for the `server.connect` handshake: an optional connection token and optional connection-level opt-ins (e.g. GitHub telemetry forwarding).\n\nReturns:\n    Handshake result reporting the server's protocol version and package version on success.\n\n.. warning:: This API is experimental and may change or be removed in future versions.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        "Performs the SDK server connection handshake and validates the optional connection token. Marked internal because this is JSON-RPC transport plumbing invoked automatically by an SDK client's own `connect()` wrapper, not a user-facing method. Stays internal as long as the SDK client owns the handshake; would only become public if the SDK ever exposed the raw schema surface to consumers without a connection wrapper.\n\nArgs:\n    params: Connection-level opt-ins for the `server.connect` handshake. Transport authentication is consumed by the native protocol boundary before dispatch.\n\nReturns:\n    Handshake result reporting the server's protocol version and package version on success.\n\n.. warning:: This API is experimental and may change or be removed in future versions.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         return _ConnectResult.from_dict(await self._client.request("connect", params_dict, **_timeout_kwargs(timeout)))
 
@@ -32332,9 +39656,11 @@ async def get_run(self, params: FactoryGetRunRequest, *, timeout: float | None =
         params_dict["sessionId"] = self._session_id
         return FactoryRunResult.from_dict(await self._client.request("session.factory.getRun", params_dict, **_timeout_kwargs(timeout)))
 
-    async def list_runs(self, *, timeout: float | None = None) -> FactoryListRunsResult:
-        "Lists durable factory runs for this session in creation order.\n\nReturns:\n    Factory runs in durable creation order."
-        return FactoryListRunsResult.from_dict(await self._client.request("session.factory.listRuns", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+    async def list_runs(self, params: FactoryListRunsRequest, *, timeout: float | None = None) -> FactoryListRunsResult:
+        "Lists durable factory runs for this session in creation order.\n\nArgs:\n    params: Parameters for paging factory runs.\n\nReturns:\n    A page of factory runs in durable creation order."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return FactoryListRunsResult.from_dict(await self._client.request("session.factory.listRuns", params_dict, **_timeout_kwargs(timeout)))
 
     async def get_run_detail(self, params: FactoryGetRunRequest, *, timeout: float | None = None) -> FactoryRunDetail:
         "Gets durable and live observability detail for one factory run.\n\nArgs:\n    params: Parameters for retrieving a factory run.\n\nReturns:\n    Full factory run observability detail."
@@ -32406,11 +39732,11 @@ async def get(self, *, timeout: float | None = None) -> SessionMode:
         "Gets the current agent interaction mode.\n\nReturns:\n    The session mode the agent is operating in"
         return SessionMode(await self._client.request("session.mode.get", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
 
-    async def set(self, params: ModeSetRequest, *, timeout: float | None = None) -> None:
-        "Sets the current agent interaction mode.\n\nArgs:\n    params: Agent interaction mode to apply to the session."
+    async def set(self, params: ModeSetRequest, *, timeout: float | None = None) -> ModeSetResult:
+        "Sets the current agent interaction mode.\n\nArgs:\n    params: Agent interaction mode to apply to the session.\n\nReturns:\n    Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
         params_dict["sessionId"] = self._session_id
-        await self._client.request("session.mode.set", params_dict, **_timeout_kwargs(timeout))
+        return ModeSetResult.from_dict(await self._client.request("session.mode.set", params_dict, **_timeout_kwargs(timeout)))
 
 
 # Experimental: this API group is experimental and may change or be removed.
@@ -32756,6 +40082,12 @@ async def login(self, params: MCPOauthLoginRequest, *, timeout: float | None = N
         params_dict["sessionId"] = self._session_id
         return MCPOauthLoginResult.from_dict(await self._client.request("session.mcp.oauth.login", params_dict, **_timeout_kwargs(timeout)))
 
+    async def probe(self, params: MCPOauthProbeRequest, *, timeout: float | None = None) -> MCPOauthProbeResult:
+        "Passively probes a configured remote MCP server to classify whether OAuth is required or a cached/override token is accepted. Does not start OAuth, emit pending OAuth requests, or mutate MCP connection state.\n\nArgs:\n    params: Remote MCP server name for a passive OAuth status probe.\n\nReturns:\n    Passive MCP OAuth probe result. `authenticated` means the server accepted the probe request while an OAuth-origin access token was attached; it does not prove the server required or independently validated that token. The probe does not make a second unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are reserved for API-call failures."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return MCPOauthProbeResult.from_dict(await self._client.request("session.mcp.oauth.probe", params_dict, **_timeout_kwargs(timeout)))
+
     async def respond(self, params: MCPOauthRespondRequest, *, timeout: float | None = None) -> MCPOauthRespondResult:
         "Responds to a pending MCP OAuth authorization request by its request id.\n\nArgs:\n    params: Pending MCP OAuth request id to respond to.\n\nReturns:\n    Indicates whether the pending MCP OAuth response was accepted."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
@@ -32878,6 +40210,10 @@ async def reload(self, *, timeout: float | None = None) -> None:
         "Reloads MCP server connections for the session."
         await self._client.request("session.mcp.reload", {"sessionId": self._session_id}, **_timeout_kwargs(timeout))
 
+    async def move_loading_to_background(self, *, timeout: float | None = None) -> MoveMCPLoadingToBackgroundResult:
+        "Releases any turns waiting on an in-flight MCP load without cancelling the load, letting the agent proceed while MCP servers finish connecting in the background. No-op when no MCP load is in flight or waiting turns were already released.\n\nReturns:\n    Result of moving in-flight MCP loading to the background."
+        return MoveMCPLoadingToBackgroundResult.from_dict(await self._client.request("session.mcp.moveLoadingToBackground", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
     async def execute_sampling(self, params: MCPExecuteSamplingParams, *, timeout: float | None = None) -> MCPSamplingExecutionResult:
         "Runs an MCP sampling inference on behalf of an MCP server.\n\nArgs:\n    params: Identifiers and raw MCP CreateMessageRequest params used to run a sampling inference.\n\nReturns:\n    Outcome of an MCP sampling execution: success result, failure error, or cancellation."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
@@ -33026,6 +40362,24 @@ def __init__(self, client: "JsonRpcClient", session_id: str):
         self._client = client
         self._session_id = session_id
 
+    async def execute(self, params: ToolsExecuteRequest, *, timeout: float | None = None) -> ToolResultExpanded:
+        "Executes one tool from the session's currently offered tool set through the native invocation pipeline.\n\nArgs:\n    params: A tool name and arguments to execute through the session's native invocation pipeline.\n\nReturns:\n    Canonical result returned by a session tool."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return await self._client.request("session.tools.execute", params_dict, **_timeout_kwargs(timeout))
+
+    async def get_builtin_descriptors(self, params: ToolsGetBuiltinDescriptorsRequest, *, timeout: float | None = None) -> ToolsGetBuiltinDescriptorsResult:
+        "Returns the Rust-owned built-in tool descriptors used to construct the session's offered tool set.\n\nArgs:\n    params: Options controlling how Rust-owned built-in tool descriptors are materialized.\n\nReturns:\n    Rust-owned built-in tool descriptors for the session."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return ToolsGetBuiltinDescriptorsResult.from_dict(await self._client.request("session.tools.getBuiltinDescriptors", params_dict, **_timeout_kwargs(timeout)))
+
+    async def task_complete_event_data(self, params: ToolsTaskCompleteEventDataRequest, *, timeout: float | None = None) -> TaskCompleteData:
+        "Projects a completed task_complete tool call into its label-safe session event payload.\n\nArgs:\n    params: Task-completion tool arguments and final result used to build a label-safe session event payload.\n\nReturns:\n    Task completion notification with summary from the agent"
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return TaskCompleteData.from_dict(await self._client.request("session.tools.taskCompleteEventData", params_dict, **_timeout_kwargs(timeout)))
+
     async def handle_pending_tool_call(self, params: HandlePendingToolCallRequest, *, timeout: float | None = None) -> HandlePendingToolCallResult:
         "Provides the result for a pending external tool call.\n\nArgs:\n    params: Pending external tool call request ID, with the tool result or an error describing why it failed.\n\nReturns:\n    Indicates whether the external tool call result was handled successfully."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
@@ -33040,6 +40394,12 @@ async def get_current_metadata(self, *, timeout: float | None = None) -> ToolsGe
         "Returns lightweight metadata for the session's currently initialized tools.\n\nReturns:\n    Current lightweight tool metadata snapshot for the session."
         return ToolsGetCurrentMetadataResult.from_dict(await self._client.request("session.tools.getCurrentMetadata", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
 
+    async def set(self, params: ToolsSetRequest, *, timeout: float | None = None) -> ToolsSetResult:
+        "Atomically replaces the complete externally implemented tool list supplied by the calling connection. Built-in, MCP/plugin, extension-discovered, subagent, and tools supplied by other connections remain unchanged.\n\nArgs:\n    params: Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.\n\nReturns:\n    Empty result after replacing the calling connection's externally implemented tools."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return ToolsSetResult.from_dict(await self._client.request("session.tools.set", params_dict, **_timeout_kwargs(timeout)))
+
     async def update_subagent_settings(self, params: UpdateSubagentSettingsRequest, *, timeout: float | None = None) -> ToolsUpdateSubagentSettingsResult:
         "Updates the current session's live subagent settings after user settings change. The persisted user settings remain the source of truth for future sessions.\n\nArgs:\n    params: Subagent settings to apply to the current session\n\nReturns:\n    Empty result after applying subagent settings"
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
@@ -33114,7 +40474,7 @@ def __init__(self, client: "JsonRpcClient", session_id: str):
         self._session_id = session_id
 
     async def ephemeral_query(self, params: UIEphemeralQueryRequest, *, timeout: float | None = None) -> UIEphemeralQueryResult:
-        "Runs a transient no-tools model query against the current conversation context.\n\nArgs:\n    params: Transient question to answer without adding it to conversation history.\n\nReturns:\n    Transient answer generated from current conversation context."
+        "Runs a transient no-tools model query against the current conversation context.\n\nArgs:\n    params: Transient question to answer without adding it to conversation history.\n\nReturns:\n    Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
         params_dict["sessionId"] = self._session_id
         return UIEphemeralQueryResult.from_dict(await self._client.request("session.ui.ephemeralQuery", params_dict, **_timeout_kwargs(timeout)))
@@ -33183,7 +40543,7 @@ async def list(self, *, timeout: float | None = None) -> PermissionPathsList:
         return PermissionPathsList.from_dict(await self._client.request("session.permissions.paths.list", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
 
     async def add(self, params: PermissionPathsAddParams, *, timeout: float | None = None) -> PermissionsPathsAddResult:
-        "Adds a directory to the session's allow-list.\n\nArgs:\n    params: Directory path to add to the session's allowed directories.\n\nReturns:\n    Indicates whether the operation succeeded."
+        "Adds a directory to the session's allow-list and activates conventional skill and agent definitions under it.\n\nArgs:\n    params: Directory path to add to the session's allowed directories.\n\nReturns:\n    Indicates whether the operation succeeded."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
         params_dict["sessionId"] = self._session_id
         return PermissionsPathsAddResult.from_dict(await self._client.request("session.permissions.paths.add", params_dict, **_timeout_kwargs(timeout)))
@@ -33296,15 +40656,15 @@ async def set_approve_all(self, params: PermissionsSetApproveAllRequest, *, time
         params_dict["sessionId"] = self._session_id
         return PermissionsSetApproveAllResult.from_dict(await self._client.request("session.permissions.setApproveAll", params_dict, **_timeout_kwargs(timeout)))
 
-    async def set_allow_all(self, params: PermissionsSetAllowAllRequest, *, timeout: float | None = None) -> AllowAllPermissionSetResult:
-        "Sets the allow-all permission mode for the session. Used by attach-mode clients (e.g. LocalRpcSession's `/allow-all` forwarder) to flip the target session's permission state. The `on` mode swaps in unrestricted path and URL managers and emits `session.permissions_changed` on transition; the `auto` mode keeps normal prompt paths active while attaching LLM safety recommendations. The result returns the authoritative post-mutation state so callers can update their local mirrors without racing the `session.permissions_changed` notification on the same wire.\n\nArgs:\n    params: Allow-all mode to apply for the session.\n\nReturns:\n    Indicates whether the operation succeeded and reports the post-mutation state."
+    async def set_mode(self, params: PermissionsSetModeRequest, *, timeout: float | None = None) -> PermissionsSetModeResult:
+        "Sets the permission mode for the session. `manual` follows the normal approval flow, `assisted` attaches LLM safety recommendations, and `allow-all` automatically approves permission requests. The result returns the authoritative post-mutation mode so callers can update local state without racing the `session.permissions_changed` notification.\n\nArgs:\n    params: Permission mode to apply for the session.\n\nReturns:\n    Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
         params_dict["sessionId"] = self._session_id
-        return AllowAllPermissionSetResult.from_dict(await self._client.request("session.permissions.setAllowAll", params_dict, **_timeout_kwargs(timeout)))
+        return PermissionsSetModeResult.from_dict(await self._client.request("session.permissions.setMode", params_dict, **_timeout_kwargs(timeout)))
 
-    async def get_allow_all(self, *, timeout: float | None = None) -> AllowAllPermissionState:
-        "Returns the current allow-all permission mode for the session.\n\nReturns:\n    Current allow-all permission mode."
-        return AllowAllPermissionState.from_dict(await self._client.request("session.permissions.getAllowAll", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+    async def get_mode(self, *, timeout: float | None = None) -> PermissionsGetModeResult:
+        "Returns the current permission mode for the session.\n\nReturns:\n    Current permission mode."
+        return PermissionsGetModeResult.from_dict(await self._client.request("session.permissions.getMode", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
 
     async def modify_rules(self, params: PermissionsModifyRulesParams, *, timeout: float | None = None) -> PermissionsModifyRulesResult:
         "Adds or removes session-scoped or location-scoped permission rules.\n\nArgs:\n    params: Scope and add/remove instructions for modifying session- or location-scoped permission rules.\n\nReturns:\n    Indicates whether the operation succeeded."
@@ -33740,6 +41100,93 @@ async def log(self, params: LogRequest, *, timeout: float | None = None) -> LogR
         return LogResult.from_dict(await self._client.request("session.log", params_dict, **_timeout_kwargs(timeout)))
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalGitHubAuthApi:
+    def __init__(self, client: "JsonRpcClient", session_id: str):
+        self._client = client
+        self._session_id = session_id
+
+    async def _get_current_auth_info(self, *, timeout: float | None = None) -> AuthIdentity | None:
+        "Gets the current authentication information for internal session hosts.\n\nReturns:\n    Current authentication information, or null when no authentication is active.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        _result = await self._client.request("session.gitHubAuth.getCurrentAuthInfo", {"sessionId": self._session_id}, **_timeout_kwargs(timeout))
+        return AuthIdentity(_result) if _result is not None else None
+
+    async def _get_all_auth_available(self, *, timeout: float | None = None) -> list:
+        "Gets all authentication accounts available to the internal session host.\n\nReturns:\n    Authentication accounts available to the internal session host.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return list(await self._client.request("session.gitHubAuth.getAllAuthAvailable", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
+    async def _refresh_copilot_user(self, *, timeout: float | None = None) -> AuthIdentity | None:
+        "Refreshes Copilot account metadata for the current authentication.\n\nReturns:\n    Current authentication information, or null when no authentication is active.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        _result = await self._client.request("session.gitHubAuth.refreshCopilotUser", {"sessionId": self._session_id}, **_timeout_kwargs(timeout))
+        return AuthIdentity(_result) if _result is not None else None
+
+    async def _login(self, params: SessionAuthLoginRequest, *, timeout: float | None = None) -> AuthInfo:
+        "Logs in a GitHub user through the internal session host.\n\nArgs:\n    params: Internal GitHub login parameters.\n\nReturns:\n    Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return _load_AuthInfo(await self._client.request("session.gitHubAuth.login", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _switch_to_auth(self, params: SessionAuthSwitchRequest, *, timeout: float | None = None) -> None:
+        "Switches the session to another available authentication.\n\nArgs:\n    params: Parameters for switching the session's active authentication.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        await self._client.request("session.gitHubAuth.switchToAuth", params_dict, **_timeout_kwargs(timeout))
+
+    async def _logout(self, *, timeout: float | None = None) -> bool:
+        "Logs out the session's current GitHub authentication.\n\nReturns:\n    Whether the current authentication was logged out.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return bool(await self._client.request("session.gitHubAuth.logout", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
+    async def _logout_user(self, params: SessionAuthLogoutUserRequest, *, timeout: float | None = None) -> bool:
+        "Logs out a specific GitHub authentication.\n\nArgs:\n    params: Parameters identifying a GitHub authentication to log out.\n\nReturns:\n    Whether the requested authentication was logged out.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return bool(await self._client.request("session.gitHubAuth.logoutUser", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _last_auth_errors(self, *, timeout: float | None = None) -> list:
+        "Gets validation errors from the most recent authentication attempt.\n\nReturns:\n    Validation errors from the most recent authentication attempt.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return list(await self._client.request("session.gitHubAuth.lastAuthErrors", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalCanvasProviderApi:
+    def __init__(self, client: "JsonRpcClient", session_id: str):
+        self._client = client
+        self._session_id = session_id
+
+    async def _register(self, params: CanvasProviderRegisterRequest, *, timeout: float | None = None) -> None:
+        "Registers an internal canvas provider connection and its contributions.\n\nArgs:\n    params: Internal canvas provider registration parameters.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        await self._client.request("session.canvas.provider.register", params_dict, **_timeout_kwargs(timeout))
+
+    async def _unregister(self, params: CanvasProviderUnregisterRequest, *, timeout: float | None = None) -> None:
+        "Unregisters an internal canvas provider connection.\n\nArgs:\n    params: Internal canvas provider unregistration parameters.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        await self._client.request("session.canvas.provider.unregister", params_dict, **_timeout_kwargs(timeout))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalCanvasApi:
+    def __init__(self, client: "JsonRpcClient", session_id: str):
+        self._client = client
+        self._session_id = session_id
+        self.provider = _InternalCanvasProviderApi(client, session_id)
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalModelApi:
+    def __init__(self, client: "JsonRpcClient", session_id: str):
+        self._client = client
+        self._session_id = session_id
+
+    async def _apply_startup_overlay(self, params: ModelApplyStartupOverlayRequest, *, timeout: float | None = None) -> ModelSwitchToResult:
+        "Resolves and applies organization-managed and repository model overlays.\n\nArgs:\n    params: Managed, repository, and CLI model overrides to overlay onto the session at startup.\n\nReturns:\n    The model identifier active on the session after the switch.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return ModelSwitchToResult.from_dict(await self._client.request("session.model.applyStartupOverlay", params_dict, **_timeout_kwargs(timeout)))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class _InternalMcpApi:
     def __init__(self, client: "JsonRpcClient", session_id: str):
@@ -33753,7 +41200,7 @@ async def _reload_with_config(self, params: MCPReloadWithConfigRequest, *, timeo
         return MCPStartServersResult.from_dict(await self._client.request("session.mcp.reloadWithConfig", params_dict, **_timeout_kwargs(timeout)))
 
     async def _configure_git_hub(self, params: MCPConfigureGitHubRequest, *, timeout: float | None = None) -> MCPConfigureGitHubResult:
-        "Configures the built-in GitHub MCP server for the session's current auth context.\n\nArgs:\n    params: Opaque auth info used to configure GitHub MCP.\n\nReturns:\n    Result of configuring GitHub MCP.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        "Configures the built-in GitHub MCP server for the session's current auth context.\n\nArgs:\n    params: Credential-free authentication identity used to configure GitHub MCP.\n\nReturns:\n    Result of configuring GitHub MCP.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
         params_dict["sessionId"] = self._session_id
         return MCPConfigureGitHubResult.from_dict(await self._client.request("session.mcp.configureGitHub", params_dict, **_timeout_kwargs(timeout)))
@@ -33771,6 +41218,19 @@ async def _unregister_external_client(self, params: MCPUnregisterExternalClientR
         await self._client.request("session.mcp.unregisterExternalClient", params_dict, **_timeout_kwargs(timeout))
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalCommandsApi:
+    def __init__(self, client: "JsonRpcClient", session_id: str):
+        self._client = client
+        self._session_id = session_id
+
+    async def _finalize_invocation_effect(self, params: CommandsFinalizeInvocationEffectRequest, *, timeout: float | None = None) -> CommandsFinalizeInvocationEffectResult:
+        "Finalizes persistence associated with a client-applied slash-command effect.\n\nArgs:\n    params: The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.\n\nReturns:\n    Whether finalizing the invocation effect succeeded, and the failure reason when it did not.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return CommandsFinalizeInvocationEffectResult.from_dict(await self._client.request("session.commands.finalizeInvocationEffect", params_dict, **_timeout_kwargs(timeout)))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class _InternalSettingsApi:
     def __init__(self, client: "JsonRpcClient", session_id: str):
@@ -33885,7 +41345,11 @@ class _InternalSessionRpc:
     def __init__(self, client: "JsonRpcClient", session_id: str):
         self._client = client
         self._session_id = session_id
+        self.git_hub_auth = _InternalGitHubAuthApi(client, session_id)
+        self.canvas = _InternalCanvasApi(client, session_id)
+        self.model = _InternalModelApi(client, session_id)
         self.mcp = _InternalMcpApi(client, session_id)
+        self.commands = _InternalCommandsApi(client, session_id)
         self.settings = _InternalSettingsApi(client, session_id)
         self.queue = _InternalQueueApi(client, session_id)
         self.schedule = _InternalScheduleApi(client, session_id)
@@ -34118,6 +41582,12 @@ async def invoke(self, params: _HookInvokeRequest) -> _HookInvokeResponse:
         "Dispatches one SDK callback hook from the runtime to the connection that registered it. Internal transport plumbing: clients opt in through session initialization and the Rust hook processor owns ordering, policy, timeout, and callback routing.\n\nArgs:\n    params: Runtime-owned wire payload for a server-to-client hook callback invocation.\n\nReturns:\n    Optional output returned by an SDK callback hook."
         pass
 
+# Experimental: this API group is experimental and may change or be removed.
+class ExtensionLaunchProviderHandler(Protocol):
+    async def resolve(self, params: ExtensionLaunchProviderResolveRequest) -> ExtensionLaunchProviderResolveResult:
+        "Asks the registered SDK client to resolve an opaque process launch profile for one discovered extension entrypoint immediately before launch or reload. The provider must respond within 15 seconds.\n\nArgs:\n    params: A discovered extension entrypoint that the registered integrator may classify and resolve to an opaque launch profile.\n\nReturns:\n    The launch profile for a supported entrypoint. Omit launch when the provider does not support the entrypoint."
+        pass
+
 # Experimental: this API group is experimental and may change or be removed.
 class LlmInferenceHandler(Protocol):
     async def http_request_start(self, params: LlmInferenceHTTPRequestStartRequest) -> LlmInferenceHTTPRequestStartResult:
@@ -34133,11 +41603,19 @@ async def event(self, params: GitHubTelemetryNotification) -> None:
         "Forwards a single GitHub telemetry event to a host connection that opted into telemetry forwarding during the `server.connect` handshake. Opted-in connections receive every event the runtime emits after the handshake — across all sessions, plus sessionless events (for example, `server.sendTelemetry` calls with no session id).\n\nArgs:\n    params: Payload for a `gitHubTelemetry.event` notification: a single GitHub telemetry event the runtime forwards to a host connection that opted into telemetry forwarding during the `server.connect` handshake."
         pass
 
+# Experimental: this API group is experimental and may change or be removed.
+class GitHubTokenHandler(Protocol):
+    async def get_token(self, params: GitHubTokenAcquireRequest) -> GitHubTokenAcquireResult:
+        "Asks the SDK client to mint a GitHub access token for a session whose configuration supplied a GitHub token provider. The runtime acquires the initial token during bootstrap and refreshes it during expiry preflight when one hour or less remains.\n\nArgs:\n    params: Asks the SDK client to acquire a GitHub access token from an opaque callback registration.\n\nReturns:\n    SDK host response to a GitHub credential request."
+        pass
+
 @dataclass
 class ClientGlobalApiHandlers:
     hooks: HooksHandler | None = None
+    extension_launch_provider: ExtensionLaunchProviderHandler | None = None
     llm_inference: LlmInferenceHandler | None = None
     git_hub_telemetry: GitHubTelemetryHandler | None = None
+    git_hub_token: GitHubTokenHandler | None = None
 
 def register_client_global_api_handlers(
     client: "JsonRpcClient",
@@ -34156,6 +41634,13 @@ async def handle_hooks_invoke(params: dict) -> dict | None:
         result = await handler.invoke(request)
         return result.to_dict()
     client.set_request_handler("hooks.invoke", handle_hooks_invoke)
+    async def handle_extension_launch_provider_resolve(params: dict) -> dict | None:
+        request = ExtensionLaunchProviderResolveRequest.from_dict(params)
+        handler = handlers.extension_launch_provider
+        if handler is None: raise RuntimeError("No extension_launch_provider client-global handler registered")
+        result = await handler.resolve(request)
+        return result.to_dict()
+    client.set_request_handler("extensionLaunchProvider.resolve", handle_extension_launch_provider_resolve)
     async def handle_llm_inference_http_request_start(params: dict) -> dict | None:
         request = LlmInferenceHTTPRequestStartRequest.from_dict(params)
         handler = handlers.llm_inference
@@ -34177,6 +41662,13 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
         await handler.event(request)
         return None
     client.set_notification_method_handler("gitHubTelemetry.event", handle_git_hub_telemetry_event)
+    async def handle_git_hub_token_get_token(params: dict) -> dict | None:
+        request = GitHubTokenAcquireRequest.from_dict(params)
+        handler = handlers.git_hub_token
+        if handler is None: raise RuntimeError("No git_hub_token client-global handler registered")
+        result = await handler.get_token(request)
+        return result.value if hasattr(result, 'value') else result
+    client.set_request_handler("gitHubToken.getToken", handle_git_hub_token_get_token)
 
 __all__ = [
     "APIKeyAuthInfo",
@@ -34231,13 +41723,21 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "AgentSetPromptRequest",
     "AgentsDiscoverRequest",
     "AgentsGetDiscoveryPathsRequest",
-    "AllowAllPermissionSetResult",
-    "AllowAllPermissionState",
     "ApprovalKind",
+    "AuthIdentity",
     "AuthInfo",
     "AuthInfoType",
+    "AuthValidationError",
+    "AuthValidationErrors",
     "BuiltInModelCatalog",
     "BuiltInModelCatalogEntry",
+    "BuiltinToolDescriptor",
+    "BuiltinToolFormat",
+    "BuiltinToolFormatType",
+    "BuiltinToolInputSchema",
+    "BuiltinToolInputSchemaType",
+    "BuiltinToolSafeForTelemetry",
+    "BuiltinToolSafeTelemetryFields",
     "CancelUserRequestedShellCommandResult",
     "CanvasAction",
     "CanvasActionApi",
@@ -34256,14 +41756,89 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "CanvasProviderInvokeActionRequest",
     "CanvasProviderOpenRequest",
     "CanvasProviderOpenResult",
+    "CanvasProviderRegisterRequest",
+    "CanvasProviderUnregisterRequest",
     "CanvasSessionContext",
     "CapiSessionOptions",
+    "CardDigest",
+    "CardDigestAlgorithm",
+    "CardDigestValue",
+    "CatalogAISkillCandidate",
+    "CatalogAISkillCandidateKind",
+    "CatalogAISkillCandidateProvenance",
+    "CatalogAuthenticationRequiredError",
+    "CatalogAuthenticationRequiredErrorKind",
+    "CatalogAuthenticationRequiredReason",
+    "CatalogCandidate",
+    "CatalogCandidateInstallability",
+    "CatalogCandidateKind",
+    "CatalogCandidateProvenance",
+    "CatalogCandidateSource",
+    "CatalogCandidateSourceEmbedded",
+    "CatalogCandidateSourceKind",
+    "CatalogCandidateSourceURL",
+    "CatalogCapability",
+    "CatalogCapabilityId",
+    "CatalogClientContract",
+    "CatalogContractViolationError",
+    "CatalogContractViolationErrorKind",
+    "CatalogContractViolationReason",
+    "CatalogHandleRejectedError",
+    "CatalogHandleRejectedErrorKind",
+    "CatalogHandleRejectionReason",
+    "CatalogHandleType",
+    "CatalogInvalidRequestError",
+    "CatalogInvalidRequestErrorKind",
+    "CatalogInvalidRequestField",
+    "CatalogMCPServerCandidate",
+    "CatalogMCPServerCandidateKind",
+    "CatalogMCPServerCandidateProvenance",
+    "CatalogMCPServerInstallabilityEnum",
+    "CatalogMalformedCardError",
+    "CatalogMalformedCardErrorKind",
+    "CatalogMalformedCardReason",
+    "CatalogMcpServerInstallability",
+    "CatalogMediaType",
+    "CatalogNegotiatedContract",
+    "CatalogNegotiationRefusedError",
+    "CatalogNegotiationRefusedErrorKind",
+    "CatalogNegotiationRefusedReason",
+    "CatalogNetworkFailureError",
+    "CatalogNetworkFailureErrorKind",
+    "CatalogNetworkFailureReason",
+    "CatalogNotInstallableError",
+    "CatalogNotInstallableErrorKind",
+    "CatalogNotInstallableReason",
+    "CatalogPolicyRejectedError",
+    "CatalogPolicyRejectedErrorKind",
+    "CatalogSearchRequest",
+    "CatalogSearchResult",
+    "CatalogSearchResultKind",
+    "CatalogSearchResultReason",
+    "CatalogSearchSucceeded",
+    "CatalogSearchSucceededKind",
+    "CatalogUnavailableError",
+    "CatalogUnavailableErrorKind",
+    "CatalogUnavailableReason",
+    "CatalogUnavailableTransportError",
+    "CatalogUnavailableTransportErrorKind",
+    "CatalogUnavailableTransportReason",
+    "CatalogUnsafeRetrievalError",
+    "CatalogUnsafeRetrievalErrorKind",
+    "CatalogUnsafeRetrievalReason",
+    "CatalogUnsupportedKindError",
+    "CatalogUnsupportedKindErrorKind",
+    "Categories",
     "ClientGlobalApiHandlers",
     "ClientSessionApiHandlers",
     "CommandList",
     "CommandsApi",
+    "CommandsFinalizeInvocationEffectRequest",
+    "CommandsFinalizeInvocationEffectResult",
     "CommandsHandlePendingCommandRequest",
     "CommandsHandlePendingCommandResult",
+    "CommandsInvocationEffectOutcome",
+    "CommandsInvocationOrigin",
     "CommandsInvokeRequest",
     "CommandsListRequest",
     "CommandsRespondToQueuedCommandRequest",
@@ -34334,12 +41909,17 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "Extension",
     "ExtensionContextPushInput",
     "ExtensionContextPushInputType",
+    "ExtensionLaunchProfile",
+    "ExtensionLaunchProviderHandler",
+    "ExtensionLaunchProviderResolveRequest",
+    "ExtensionLaunchProviderResolveResult",
     "ExtensionList",
     "ExtensionSource",
     "ExtensionStatus",
     "ExtensionsApi",
     "ExtensionsDisableRequest",
     "ExtensionsEnableRequest",
+    "ExternalRefMCPOauthHTTPResponse",
     "ExternalToolResult",
     "ExternalToolTextResultForLlm",
     "ExternalToolTextResultForLlmBinaryResultsForLlm",
@@ -34419,6 +41999,11 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "GitHubTelemetryEvent",
     "GitHubTelemetryHandler",
     "GitHubTelemetryNotification",
+    "GitHubTokenAcquireReason",
+    "GitHubTokenAcquireRequest",
+    "GitHubTokenAcquireResult",
+    "GitHubTokenAcquireResultKind",
+    "GitHubTokenHandler",
     "HMACAuthInfo",
     "HMACAuthInfoType",
     "HandlePendingToolCallRequest",
@@ -34450,12 +42035,15 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "HooksHandler",
     "Host",
     "HostType",
+    "InstallMethod",
+    "Installability",
     "InstalledPlugin",
     "InstalledPluginInfo",
     "InstalledPluginSource",
     "InstalledPluginSourceGitHub",
     "InstalledPluginSourceLocal",
     "InstalledPluginSourceURL",
+    "InstalledPluginSourceURLSource",
     "InstructionDiscoveryPath",
     "InstructionDiscoveryPathKind",
     "InstructionDiscoveryPathList",
@@ -34520,8 +42108,10 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "MCPDisableRequest",
     "MCPDiscoverRequest",
     "MCPDiscoverResult",
+    "MCPElicitationFormMode",
     "MCPEnableRequest",
     "MCPExecuteSamplingParams",
+    "MCPFailedServer",
     "MCPFilteredServer",
     "MCPGrantType",
     "MCPHeadersHandlePendingHeadersRefreshRequest",
@@ -34529,6 +42119,7 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "MCPHeadersHandlePendingHeadersRefreshRequestRequest",
     "MCPHeadersHandlePendingHeadersRefreshRequestResult",
     "MCPHostState",
+    "MCPInstallPlan",
     "MCPIsServerRunningRequest",
     "MCPIsServerRunningResult",
     "MCPListToolsRequest",
@@ -34539,10 +42130,52 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "MCPOauthLoginRequest",
     "MCPOauthLoginResult",
     "MCPOauthPendingRequestResponse",
-    "MCPOauthPendingRequestResponseKind",
+    "MCPOauthProbeNeedsAuthReason",
+    "MCPOauthProbeRequest",
+    "MCPOauthProbeResult",
     "MCPOauthRespondRequest",
     "MCPOauthRespondResult",
+    "MCPPlan",
+    "MCPPlanConfigurationChange",
+    "MCPPlanConfigurationOperation",
+    "MCPPlanETransport",
+    "MCPPlanInstallPlanned",
+    "MCPPlanInstallPlannedKind",
+    "MCPPlanInstallRequest",
+    "MCPPlanInstallResult",
+    "MCPPlanInstallResultKind",
+    "MCPPlanInstallResultReason",
+    "MCPPlanInstallSource",
+    "MCPPlanInstallSourceCandidate",
+    "MCPPlanInstallSourceCandidateKind",
+    "MCPPlanInstallSourceCard",
+    "MCPPlanInstallSourceCardKind",
+    "MCPPlanInstallSourceKind",
+    "MCPPlanPackageInstallMethod",
+    "MCPPlanPackageTransport",
+    "MCPPlanPolicyDecision",
+    "MCPPlanPolicyResult",
+    "MCPPlanPolicySource",
+    "MCPPlanProvenance",
+    "MCPPlanRemoteInstallMethod",
+    "MCPPlanRemoteTransport",
+    "MCPPlanRequiredValue",
+    "MCPPlanRequiredValueEnum",
+    "MCPPlanRequiredValueKind",
+    "MCPPlanRequiredValueScalar",
+    "MCPPlanRequiredValueScalarKind",
+    "MCPPlanRequiredValueValueType",
+    "MCPPlanResourceIdentity",
+    "MCPPlanScalarValueTypeEnum",
+    "MCPPlanScope",
+    "MCPPlanSecretPlaceholder",
+    "MCPPlanTarget",
+    "MCPPlanTransportChoice",
+    "MCPPlanTransportChoicePackage",
+    "MCPPlanTransportChoiceRemote",
+    "MCPPlanValueCategory",
     "MCPRegisterExternalClientRequest",
+    "MCPReloadConfig",
     "MCPReloadWithConfigRequest",
     "MCPRemoveGitHubResult",
     "MCPResource",
@@ -34557,15 +42190,28 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "MCPResourcesReadRequest",
     "MCPResourcesReadResult",
     "MCPRestartServerRequest",
+    "MCPSafeForTelemetryFields",
     "MCPSamplingExecutionAction",
     "MCPSamplingExecutionResult",
+    "MCPSerializableServerConfig",
+    "MCPSerializableServerConfigType",
     "MCPServer",
     "MCPServerAuthConfigRedirectPort",
+    "MCPServerCardEmbedded",
+    "MCPServerCardEmbeddedKind",
+    "MCPServerCardMediaType",
+    "MCPServerCardReference",
+    "MCPServerCardURL",
+    "MCPServerCardURLKind",
     "MCPServerConfig",
     "MCPServerConfigDeferTools",
     "MCPServerConfigHTTP",
     "MCPServerConfigHTTPType",
+    "MCPServerConfigMemory",
+    "MCPServerConfigMemoryType",
     "MCPServerConfigStdio",
+    "MCPServerConfigStdioType",
+    "MCPServerConfigType",
     "MCPServerFailureInfo",
     "MCPServerList",
     "MCPServerNeedsAuthInfo",
@@ -34575,10 +42221,12 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "MCPStartServerRequest",
     "MCPStartServersResult",
     "MCPStopServerRequest",
+    "MCPTaskMetadata",
     "MCPToolUI",
     "MCPToolUIVisibility",
     "MCPTools",
     "MCPUnregisterExternalClientRequest",
+    "ManagedSettingsReadResult",
     "MarketplaceAddResult",
     "MarketplaceBrowseResult",
     "MarketplaceInfo",
@@ -34601,9 +42249,20 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "McpHeadersApi",
     "McpOauthApi",
     "McpOauthLoginGrantType",
+    "McpPlanEnumValueType",
+    "McpPlanInstallResult",
+    "McpPlanInstallSource",
+    "McpPlanRequiredValue",
+    "McpPlanRequiredValueEnumKind",
+    "McpPlanScalarValueType",
+    "McpPlanSecretReference",
+    "McpPlanTransportChoice",
     "McpResourcesApi",
+    "McpSafeForTelemetry",
     "McpServerAuthConfig",
+    "McpServerCardReference",
     "McpServerConfigHttpOauthGrantType",
+    "MediaType",
     "MemoryConfiguration",
     "MetadataApi",
     "MetadataContextAttributionResult",
@@ -34624,8 +42283,10 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "MetadataSnapshotRemoteMetadataTaskType",
     "ModeApi",
     "ModeSetRequest",
+    "ModeSetResult",
     "Model",
     "ModelApi",
+    "ModelApplyStartupOverlayRequest",
     "ModelBilling",
     "ModelBillingPromo",
     "ModelBillingTokenPrices",
@@ -34640,15 +42301,21 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "ModelCapabilitiesSupports",
     "ModelList",
     "ModelListRequest",
+    "ModelMessage",
     "ModelPickerCategory",
+    "ModelPickerPersistenceRequest",
     "ModelPickerPriceCategory",
+    "ModelPickerSettingsContext",
     "ModelPolicy",
     "ModelPolicyState",
     "ModelSetReasoningEffortRequest",
     "ModelSetReasoningEffortResult",
+    "ModelSwitchConfirmation",
     "ModelSwitchToRequest",
     "ModelSwitchToResult",
+    "ModelWarningText",
     "ModelsListRequest",
+    "MoveMCPLoadingToBackgroundResult",
     "NameApi",
     "NameGetResult",
     "NameSetAutoRequest",
@@ -34674,6 +42341,8 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PermissionDecisionApproveForLocationApprovalCommandsKind",
     "PermissionDecisionApproveForLocationApprovalCustomTool",
     "PermissionDecisionApproveForLocationApprovalCustomToolKind",
+    "PermissionDecisionApproveForLocationApprovalExtensionEnvAccess",
+    "PermissionDecisionApproveForLocationApprovalExtensionEnvAccessKind",
     "PermissionDecisionApproveForLocationApprovalExtensionManagement",
     "PermissionDecisionApproveForLocationApprovalExtensionManagementKind",
     "PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess",
@@ -34685,7 +42354,6 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PermissionDecisionApproveForLocationApprovalMCPSampling",
     "PermissionDecisionApproveForLocationApprovalMCPSamplingKind",
     "PermissionDecisionApproveForLocationApprovalMemory",
-    "PermissionDecisionApproveForLocationApprovalMemoryKind",
     "PermissionDecisionApproveForLocationApprovalRead",
     "PermissionDecisionApproveForLocationApprovalReadKind",
     "PermissionDecisionApproveForLocationApprovalWrite",
@@ -34695,6 +42363,7 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PermissionDecisionApproveForSessionApproval",
     "PermissionDecisionApproveForSessionApprovalCommands",
     "PermissionDecisionApproveForSessionApprovalCustomTool",
+    "PermissionDecisionApproveForSessionApprovalExtensionEnvAccess",
     "PermissionDecisionApproveForSessionApprovalExtensionManagement",
     "PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess",
     "PermissionDecisionApproveForSessionApprovalFactory",
@@ -34716,6 +42385,7 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PermissionDecisionApprovedKind",
     "PermissionDecisionCancelled",
     "PermissionDecisionCancelledKind",
+    "PermissionDecisionContext",
     "PermissionDecisionDeniedByContentExclusionPolicy",
     "PermissionDecisionDeniedByContentExclusionPolicyKind",
     "PermissionDecisionDeniedByPermissionRequestHook",
@@ -34727,9 +42397,12 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser",
     "PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUserKind",
     "PermissionDecisionKind",
+    "PermissionDecisionOutcome",
     "PermissionDecisionReject",
     "PermissionDecisionRejectKind",
     "PermissionDecisionRequest",
+    "PermissionDecisionSource",
+    "PermissionDecisionSurface",
     "PermissionDecisionUserNotAvailable",
     "PermissionDecisionUserNotAvailableKind",
     "PermissionLocationAddToolApprovalParams",
@@ -34738,6 +42411,7 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PermissionLocationResolveParams",
     "PermissionLocationResolveResult",
     "PermissionLocationType",
+    "PermissionModeSource",
     "PermissionPathsAddParams",
     "PermissionPathsAllowedCheckParams",
     "PermissionPathsAllowedCheckResult",
@@ -34748,10 +42422,11 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PermissionPathsWorkspaceCheckResult",
     "PermissionPromptShownNotification",
     "PermissionRequestResult",
+    "PermissionResponseCapability",
     "PermissionRulesSet",
+    "PermissionSource",
     "PermissionUrlsConfig",
     "PermissionUrlsSetUnrestrictedModeParams",
-    "PermissionsAllowAllMode",
     "PermissionsApi",
     "PermissionsConfigureAdditionalContentExclusionPolicy",
     "PermissionsConfigureAdditionalContentExclusionPolicyRule",
@@ -34761,10 +42436,12 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PermissionsConfigureResult",
     "PermissionsFolderTrustAddTrustedResult",
     "PermissionsFolderTrustApi",
-    "PermissionsGetAllowAllRequest",
+    "PermissionsGetModeRequest",
+    "PermissionsGetModeResult",
     "PermissionsLocationsAddToolApprovalDetails",
     "PermissionsLocationsAddToolApprovalDetailsCommands",
     "PermissionsLocationsAddToolApprovalDetailsCustomTool",
+    "PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess",
     "PermissionsLocationsAddToolApprovalDetailsExtensionManagement",
     "PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess",
     "PermissionsLocationsAddToolApprovalDetailsFactory",
@@ -34786,12 +42463,11 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PermissionsPendingRequestsRequest",
     "PermissionsResetSessionApprovalsRequest",
     "PermissionsResetSessionApprovalsResult",
-    "PermissionsSetAAllSource",
-    "PermissionsSetAllowAllRequest",
-    "PermissionsSetAllowAllSource",
     "PermissionsSetApproveAllRequest",
     "PermissionsSetApproveAllResult",
     "PermissionsSetApproveAllSource",
+    "PermissionsSetModeRequest",
+    "PermissionsSetModeResult",
     "PermissionsSetRequiredRequest",
     "PermissionsSetRequiredResult",
     "PermissionsUrlsApi",
@@ -34813,6 +42489,7 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PluginUpdateAllResult",
     "PluginUpdateResult",
     "PluginsApi",
+    "PluginsBuiltinSetRequest",
     "PluginsDisableRequest",
     "PluginsEnableRequest",
     "PluginsInstallRequest",
@@ -34823,6 +42500,8 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "PluginsReloadRequest",
     "PluginsUninstallRequest",
     "PluginsUpdateRequest",
+    "ProtocolExternalToolDefer",
+    "ProtocolExternalToolDefinition",
     "ProviderAddRequest",
     "ProviderAddResult",
     "ProviderApi",
@@ -34938,6 +42617,7 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "RemoteNotifySteerableChangedRequest",
     "RemoteNotifySteerableChangedResult",
     "RemoteSessionConnectionResult",
+    "RemoteSessionHostStatus",
     "RemoteSessionMetadataRepository",
     "RemoteSessionMetadataTaskType",
     "RemoteSessionMetadataValue",
@@ -34945,6 +42625,7 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "RemoteSessionRepository",
     "RunOptions",
     "SandboxConfig",
+    "SandboxConfigAuth",
     "SandboxConfigUserPolicy",
     "SandboxConfigUserPolicyExperimental",
     "SandboxConfigUserPolicyExperimentalSeatbelt",
@@ -34980,15 +42661,18 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "ServerAgentList",
     "ServerAgentRegistryApi",
     "ServerAgentsApi",
+    "ServerCatalogApi",
     "ServerCommandsApi",
     "ServerExtensionsApi",
     "ServerInstructionSourceList",
     "ServerInstructionsApi",
     "ServerLlmInferenceApi",
+    "ServerManagedSettingsApi",
     "ServerMcpApi",
     "ServerMcpConfigApi",
     "ServerModelsApi",
     "ServerPluginsApi",
+    "ServerPluginsBuiltinApi",
     "ServerPluginsMarketplacesApi",
     "ServerRpc",
     "ServerRuntimeApi",
@@ -35004,7 +42688,11 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "ServerUserSettingsApi",
     "SessionActivity",
     "SessionAgentListRequest",
+    "SessionAuthInfoResult",
+    "SessionAuthLoginRequest",
+    "SessionAuthLogoutUserRequest",
     "SessionAuthStatus",
+    "SessionAuthSwitchRequest",
     "SessionBulkDeleteResult",
     "SessionCancelAllBackgroundAgentsResult",
     "SessionCapability",
@@ -35049,6 +42737,9 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "SessionFSWriteFileRequest",
     "SessionFsHandler",
     "SessionFsReaddirWithTypesEntryType",
+    "SessionGitHubAuthGetAllAuthAvailableResult",
+    "SessionGitHubAuthLogoutResult",
+    "SessionGitHubAuthLogoutUserResult",
     "SessionHistoryCompactRequest",
     "SessionInstalledPlugin",
     "SessionInstalledPluginSource",
@@ -35071,6 +42762,8 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "SessionListFilter",
     "SessionLoadDeferredRepoHooksResult",
     "SessionLogLevel",
+    "SessionManagedPermissions",
+    "SessionManagedSettings",
     "SessionMcpAppsCallToolResult",
     "SessionMetadataSnapshot",
     "SessionModelList",
@@ -35150,7 +42843,6 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "SessionsOpenProgressStatus",
     "SessionsOpenProgressStep",
     "SessionsOpenRemote",
-    "SessionsOpenRemoteKind",
     "SessionsOpenResume",
     "SessionsOpenResumeKind",
     "SessionsOpenResumeLast",
@@ -35170,8 +42862,13 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "SessionsStartRemoteControlRequest",
     "SessionsStopRemoteControlRequest",
     "SessionsTransferRemoteControlRequest",
+    "SettableAuthInfo",
+    "SettableAuthInfoType",
+    "SettableTokenAuthInfo",
+    "SettableTokenAuthInfoType",
     "ShellApi",
     "ShellCancelUserRequestedRequest",
+    "ShellCredentials",
     "ShellExecRequest",
     "ShellExecResult",
     "ShellExecuteUserRequestedRequest",
@@ -35190,6 +42887,7 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "SkillList",
     "SkillsApi",
     "SkillsConfigSetDisabledSkillsRequest",
+    "SkillsConfigSetSkillDisabledRequest",
     "SkillsDisableRequest",
     "SkillsDiscoverRequest",
     "SkillsEnableRequest",
@@ -35197,6 +42895,8 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "SkillsGetInvokedResult",
     "SkillsInvokedSkill",
     "SkillsLoadDiagnostics",
+    "SlashCommandAddTimelineEntryResult",
+    "SlashCommandAddTimelineEntryResultKind",
     "SlashCommandAgentPromptResult",
     "SlashCommandAgentPromptResultKind",
     "SlashCommandCompletedResult",
@@ -35208,17 +42908,28 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "SlashCommandInvocationResult",
     "SlashCommandInvocationResultKind",
     "SlashCommandKind",
+    "SlashCommandModelPickerDialog",
+    "SlashCommandModelPickerDialogKind",
     "SlashCommandSelectSubcommandOption",
     "SlashCommandSelectSubcommandResult",
     "SlashCommandSelectSubcommandResultKind",
+    "SlashCommandSetModelResult",
+    "SlashCommandSetModelResultKind",
+    "SlashCommandSetPlanModelResult",
+    "SlashCommandSetPlanModelResultKind",
+    "SlashCommandShowDialogResult",
+    "SlashCommandShowDialogResultKind",
     "SlashCommandTextResult",
-    "StickySource",
+    "SlashCommandTimelineEntry",
+    "Status",
     "SubagentSettings",
     "SubagentSettingsEntry",
     "SubagentSettingsEntryContextTier",
     "TaskAgentInfo",
     "TaskAgentInfoType",
     "TaskAgentProgress",
+    "TaskCompleteData",
+    "TaskCompletionDecision",
     "TaskExecutionMode",
     "TaskInfo",
     "TaskInfoExecutionMode",
@@ -35252,16 +42963,27 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "TasksWaitForPendingResult",
     "TelemetryApi",
     "TelemetrySetFeatureOverridesRequest",
-    "TentacledSource",
     "Theme",
     "TokenAuthInfo",
-    "TokenAuthInfoType",
+    "TokenProviderAuthInfo",
+    "TokenProviderAuthInfoType",
     "Tool",
     "ToolList",
+    "ToolResult",
+    "ToolResultExpanded",
+    "ToolResultNewMessage",
+    "ToolResultType",
     "ToolsApi",
+    "ToolsExecuteRequest",
+    "ToolsGetBuiltinDescriptorsRequest",
+    "ToolsGetBuiltinDescriptorsResult",
     "ToolsGetCurrentMetadataResult",
     "ToolsInitializeAndValidateResult",
     "ToolsListRequest",
+    "ToolsSetRequest",
+    "ToolsSetResult",
+    "ToolsShellDescriptorConfig",
+    "ToolsTaskCompleteEventDataRequest",
     "ToolsUpdateSubagentSettingsResult",
     "Trigger",
     "UIAutoModeSwitchResponse",
@@ -35286,7 +43008,6 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "UIElicitationSchemaPropertyString",
     "UIElicitationSchemaPropertyStringFormat",
     "UIElicitationSchemaPropertyType",
-    "UIElicitationSchemaType",
     "UIElicitationStringEnumField",
     "UIElicitationStringOneOfField",
     "UIElicitationStringOneOfFieldOneOf",
@@ -35311,6 +43032,7 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "UpdateSubagentSettingsRequest",
     "UsageApi",
     "UsageGetMetricsResult",
+    "UsageMetricsAgentMetric",
     "UsageMetricsCodeChanges",
     "UsageMetricsModelMetric",
     "UsageMetricsModelMetricRequests",
@@ -35318,7 +43040,6 @@ async def handle_git_hub_telemetry_event(params: dict) -> None:
     "UsageMetricsModelMetricUsage",
     "UsageMetricsTokenDetail",
     "UserAuthInfo",
-    "UserAuthInfoType",
     "UserRequestedShellCommandResult",
     "UserSettingMetadata",
     "UserSettingsGetResult",
diff --git a/python/copilot/generated/session_events.py b/python/copilot/generated/session_events.py
index 6978a5a6d6..d4af5f2735 100644
--- a/python/copilot/generated/session_events.py
+++ b/python/copilot/generated/session_events.py
@@ -24,8 +24,9 @@ def from_str(x: Any) -> str:
 
 
 def from_int(x: Any) -> int:
-    assert isinstance(x, int) and not isinstance(x, bool)
-    return x
+    assert isinstance(x, (int, float)) and not isinstance(x, bool)
+    assert not isinstance(x, float) or x.is_integer()
+    return int(x)
 
 
 def to_int(x: Any) -> int:
@@ -137,6 +138,7 @@ class SessionEventType(Enum):
     SESSION_MODEL_CHANGE = "session.model_change"
     SESSION_MODE_CHANGED = "session.mode_changed"
     SESSION_SESSION_LIMITS_CHANGED = "session.session_limits_changed"
+    # Experimental: this event is part of an experimental API and may change or be removed.
     SESSION_PERMISSIONS_CHANGED = "session.permissions_changed"
     SESSION_PLAN_CHANGED = "session.plan_changed"
     SESSION_TODOS_CHANGED = "session.todos_changed"
@@ -156,6 +158,7 @@ class SessionEventType(Enum):
     PENDING_MESSAGES_MODIFIED = "pending_messages.modified"
     ASSISTANT_TURN_START = "assistant.turn_start"
     ASSISTANT_TURN_RETRY = "assistant.turn_retry"
+    AGENT_INTERRUPTED = "agent.interrupted"
     ASSISTANT_INTENT = "assistant.intent"
     ASSISTANT_SERVER_TOOL_PROGRESS = "assistant.server_tool_progress"
     ASSISTANT_REASONING = "assistant.reasoning"
@@ -168,7 +171,9 @@ class SessionEventType(Enum):
     ASSISTANT_TURN_END = "assistant.turn_end"
     ASSISTANT_IDLE = "assistant.idle"
     ASSISTANT_USAGE = "assistant.usage"
+    PROMPT_CACHE_BREAK = "prompt_cache_break"
     MODEL_CALL_FAILURE = "model.call_failure"
+    MODEL_CALL_FINISHED = "model.call_finished"
     MODEL_CALL_START = "model.call_start"
     ABORT = "abort"
     TOOL_USER_REQUESTED = "tool.user_requested"
@@ -178,6 +183,7 @@ class SessionEventType(Enum):
     TOOL_EXECUTION_COMPLETE = "tool.execution_complete"
     TOOL_SEARCH_ACTIVATED = "tool_search.activated"
     SKILL_INVOKED = "skill.invoked"
+    SANDBOX_DECISION = "sandbox.decision"
     SUBAGENT_STARTED = "subagent.started"
     SUBAGENT_COMPLETED = "subagent.completed"
     SUBAGENT_FAILED = "subagent.failed"
@@ -203,6 +209,8 @@ class SessionEventType(Enum):
     MCP_HEADERS_REFRESH_REQUIRED = "mcp.headers_refresh_required"
     MCP_HEADERS_REFRESH_COMPLETED = "mcp.headers_refresh_completed"
     SESSION_CUSTOM_NOTIFICATION = "session.custom_notification"
+    # Experimental: this event is part of an experimental API and may change or be removed.
+    UI_EPHEMERAL_QUERY = "ui.ephemeral_query"
     EXTERNAL_TOOL_REQUESTED = "external_tool.requested"
     EXTERNAL_TOOL_COMPLETED = "external_tool.completed"
     COMMAND_QUEUED = "command.queued"
@@ -226,6 +234,10 @@ class SessionEventType(Enum):
     SESSION_BACKGROUND_TASKS_CHANGED = "session.background_tasks_changed"
     # Experimental: this event is part of an experimental API and may change or be removed.
     FACTORY_RUN_UPDATED = "factory.run_updated"
+    # Experimental: this event is part of an experimental API and may change or be removed.
+    FACTORY_RUN_STARTED = "factory.run_started"
+    # Experimental: this event is part of an experimental API and may change or be removed.
+    FACTORY_RUN_SETTLED = "factory.run_settled"
     SESSION_SKILLS_LOADED = "session.skills_loaded"
     SESSION_CUSTOM_AGENTS_UPDATED = "session.custom_agents_updated"
     SESSION_MCP_SERVERS_LOADED = "session.mcp_servers_loaded"
@@ -370,6 +382,31 @@ def to_dict(self) -> dict:
         return result
 
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class AssistantMessageReasoningBlocks:
+    "Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping"
+    provider: str
+    blocks: list[Any] | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "AssistantMessageReasoningBlocks":
+        assert isinstance(obj, dict)
+        provider = from_str(obj.get("provider"))
+        blocks = from_union([from_none, lambda x: from_list(lambda x: x, x)], obj.get("blocks"))
+        return AssistantMessageReasoningBlocks(
+            provider=provider,
+            blocks=blocks,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["provider"] = from_str(self.provider)
+        if self.blocks is not None:
+            result["blocks"] = from_union([from_none, lambda x: from_list(lambda x: x, x)], self.blocks)
+        return result
+
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class AssistantMessageServerTools:
@@ -777,6 +814,75 @@ def to_dict(self) -> dict:
         return result
 
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class FactoryRunSettledData:
+    "Ephemeral signal that a factory run reached a terminal status."
+    consumed_nano_aiu: int
+    consumed_subagents: int
+    elapsed_ms: int
+    run_id: str
+    status: FactoryRunSettledStatus
+    failure_type: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "FactoryRunSettledData":
+        assert isinstance(obj, dict)
+        consumed_nano_aiu = from_int(obj.get("consumedNanoAiu"))
+        consumed_subagents = from_int(obj.get("consumedSubagents"))
+        elapsed_ms = from_int(obj.get("elapsedMs"))
+        run_id = from_str(obj.get("runId"))
+        status = parse_enum(FactoryRunSettledStatus, obj.get("status"))
+        failure_type = from_union([from_none, from_str], obj.get("failureType"))
+        return FactoryRunSettledData(
+            consumed_nano_aiu=consumed_nano_aiu,
+            consumed_subagents=consumed_subagents,
+            elapsed_ms=elapsed_ms,
+            run_id=run_id,
+            status=status,
+            failure_type=failure_type,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["consumedNanoAiu"] = to_int(self.consumed_nano_aiu)
+        result["consumedSubagents"] = to_int(self.consumed_subagents)
+        result["elapsedMs"] = to_int(self.elapsed_ms)
+        result["runId"] = from_str(self.run_id)
+        result["status"] = to_enum(FactoryRunSettledStatus, self.status)
+        if self.failure_type is not None:
+            result["failureType"] = from_union([from_none, from_str], self.failure_type)
+        return result
+
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class FactoryRunStartedData:
+    "Ephemeral signal that a factory run attempt began executing."
+    attempt: int
+    factory_name: str
+    run_id: str
+
+    @staticmethod
+    def from_dict(obj: Any) -> "FactoryRunStartedData":
+        assert isinstance(obj, dict)
+        attempt = from_int(obj.get("attempt"))
+        factory_name = from_str(obj.get("factoryName"))
+        run_id = from_str(obj.get("runId"))
+        return FactoryRunStartedData(
+            attempt=attempt,
+            factory_name=factory_name,
+            run_id=run_id,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["attempt"] = to_int(self.attempt)
+        result["factoryName"] = from_str(self.factory_name)
+        result["runId"] = from_str(self.run_id)
+        return result
+
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class FactoryRunUpdatedData:
@@ -845,21 +951,21 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class PermissionAutoApproval:
-    "Auto-approval judge information attached to a permission request. Present (non-null) only when the session's allow-all mode is \"auto\"; its absence means auto mode was off and the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request."
-    recommendation: AutoApprovalRecommendation
-    failure_reason: AutoApprovalJudgeFailureReason | None = None
+class PermissionAssistedApproval:
+    "Assisted-approval judge information attached to a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request."
+    recommendation: AssistedApprovalRecommendation
+    failure_reason: AssistedApprovalJudgeFailureReason | None = None
     model: str | None = None
     reason: str | None = None
 
     @staticmethod
-    def from_dict(obj: Any) -> "PermissionAutoApproval":
+    def from_dict(obj: Any) -> "PermissionAssistedApproval":
         assert isinstance(obj, dict)
-        recommendation = parse_enum(AutoApprovalRecommendation, obj.get("recommendation"))
-        failure_reason = from_union([from_none, lambda x: parse_enum(AutoApprovalJudgeFailureReason, x)], obj.get("failureReason"))
+        recommendation = parse_enum(AssistedApprovalRecommendation, obj.get("recommendation"))
+        failure_reason = from_union([from_none, lambda x: parse_enum(AssistedApprovalJudgeFailureReason, x)], obj.get("failureReason"))
         model = from_union([from_none, from_str], obj.get("model"))
         reason = from_union([from_none, from_str], obj.get("reason"))
-        return PermissionAutoApproval(
+        return PermissionAssistedApproval(
             recommendation=recommendation,
             failure_reason=failure_reason,
             model=model,
@@ -868,9 +974,9 @@ def from_dict(obj: Any) -> "PermissionAutoApproval":
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["recommendation"] = to_enum(AutoApprovalRecommendation, self.recommendation)
+        result["recommendation"] = to_enum(AssistedApprovalRecommendation, self.recommendation)
         if self.failure_reason is not None:
-            result["failureReason"] = from_union([from_none, lambda x: to_enum(AutoApprovalJudgeFailureReason, x)], self.failure_reason)
+            result["failureReason"] = from_union([from_none, lambda x: to_enum(AssistedApprovalJudgeFailureReason, x)], self.failure_reason)
         if self.model is not None:
             result["model"] = from_union([from_none, from_str], self.model)
         if self.reason is not None:
@@ -1208,14 +1314,16 @@ def to_dict(self) -> dict:
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionManagedSettingsResolvedData:
-    "Enterprise managed-settings resolution: the effective managed settings the session applied and where they came from, so SDK clients can show users what is enterprise-managed and by which authority. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted; for a session-independent pull, use the SDK `getManagedSettings()` API, which returns the identical payload. Managed settings have a single authoritative source, so the highest-authority present layer (server > device) wins wholesale; `bypassPermissionsDisabled` is deny-wins across layers. Marked experimental while the managed-settings surface stabilizes."
+    "Enterprise managed-settings resolution: the effective managed settings the session applied and which channels contributed, so SDK clients can show users what is enterprise-managed. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted. Device values take precedence over server values per ordinary key, while permissions compose restrictively across device, server, and SDK-client layers. The account-scoped `getManagedSettings()` API does not include session-local client injection. Marked experimental while the managed-settings surface stabilizes."
     bypass_permissions_disabled: bool
     device_managed: bool
     fail_closed: bool
     managed_keys: list[str]
     server_managed: bool
     source: ManagedSettingsResolvedSource
+    client_managed: bool | None = None
     permissions_allow_intersected: bool | None = None
+    sandbox_enabled_by_undetermined_policy: bool | None = None
     settings: Any = None
 
     @staticmethod
@@ -1227,7 +1335,9 @@ def from_dict(obj: Any) -> "SessionManagedSettingsResolvedData":
         managed_keys = from_list(from_str, obj.get("managedKeys"))
         server_managed = from_bool(obj.get("serverManaged"))
         source = parse_enum(ManagedSettingsResolvedSource, obj.get("source"))
+        client_managed = from_union([from_none, from_bool], obj.get("clientManaged"))
         permissions_allow_intersected = from_union([from_none, from_bool], obj.get("permissionsAllowIntersected"))
+        sandbox_enabled_by_undetermined_policy = from_union([from_none, from_bool], obj.get("sandboxEnabledByUndeterminedPolicy"))
         settings = obj.get("settings")
         return SessionManagedSettingsResolvedData(
             bypass_permissions_disabled=bypass_permissions_disabled,
@@ -1236,7 +1346,9 @@ def from_dict(obj: Any) -> "SessionManagedSettingsResolvedData":
             managed_keys=managed_keys,
             server_managed=server_managed,
             source=source,
+            client_managed=client_managed,
             permissions_allow_intersected=permissions_allow_intersected,
+            sandbox_enabled_by_undetermined_policy=sandbox_enabled_by_undetermined_policy,
             settings=settings,
         )
 
@@ -1248,13 +1360,88 @@ def to_dict(self) -> dict:
         result["managedKeys"] = from_list(from_str, self.managed_keys)
         result["serverManaged"] = from_bool(self.server_managed)
         result["source"] = to_enum(ManagedSettingsResolvedSource, self.source)
+        if self.client_managed is not None:
+            result["clientManaged"] = from_union([from_none, from_bool], self.client_managed)
         if self.permissions_allow_intersected is not None:
             result["permissionsAllowIntersected"] = from_union([from_none, from_bool], self.permissions_allow_intersected)
+        if self.sandbox_enabled_by_undetermined_policy is not None:
+            result["sandboxEnabledByUndeterminedPolicy"] = from_union([from_none, from_bool], self.sandbox_enabled_by_undetermined_policy)
         if self.settings is not None:
             result["settings"] = self.settings
         return result
 
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionPermissionsChangedData:
+    "Permission-mode transition details."
+    # Experimental: this field is part of an experimental API and may change or be removed.
+    mode: PermissionMode
+    # Experimental: this field is part of an experimental API and may change or be removed.
+    previous_mode: PermissionMode
+    # Experimental: this field is part of an experimental API and may change or be removed.
+    assisted_approval_model: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "SessionPermissionsChangedData":
+        assert isinstance(obj, dict)
+        mode = parse_enum(PermissionMode, obj.get("mode"))
+        previous_mode = parse_enum(PermissionMode, obj.get("previousMode"))
+        assisted_approval_model = from_union([from_none, from_str], obj.get("assistedApprovalModel"))
+        return SessionPermissionsChangedData(
+            mode=mode,
+            previous_mode=previous_mode,
+            assisted_approval_model=assisted_approval_model,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["mode"] = to_enum(PermissionMode, self.mode)
+        result["previousMode"] = to_enum(PermissionMode, self.previous_mode)
+        if self.assisted_approval_model is not None:
+            result["assistedApprovalModel"] = from_union([from_none, from_str], self.assisted_approval_model)
+        return result
+
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UiEphemeralQueryData:
+    "Ordered output and terminal state for a transient query that does not modify conversation history."
+    phase: UIEphemeralQueryPhase
+    request_id: str
+    answer: str | None = None
+    chunk: str | None = None
+    error: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UiEphemeralQueryData":
+        assert isinstance(obj, dict)
+        phase = parse_enum(UIEphemeralQueryPhase, obj.get("phase"))
+        request_id = from_str(obj.get("requestId"))
+        answer = from_union([from_none, from_str], obj.get("answer"))
+        chunk = from_union([from_none, from_str], obj.get("chunk"))
+        error = from_union([from_none, from_str], obj.get("error"))
+        return UiEphemeralQueryData(
+            phase=phase,
+            request_id=request_id,
+            answer=answer,
+            chunk=chunk,
+            error=error,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["phase"] = to_enum(UIEphemeralQueryPhase, self.phase)
+        result["requestId"] = from_str(self.request_id)
+        if self.answer is not None:
+            result["answer"] = from_union([from_none, from_str], self.answer)
+        if self.chunk is not None:
+            result["chunk"] = from_union([from_none, from_str], self.chunk)
+        if self.error is not None:
+            result["error"] = from_union([from_none, from_str], self.error)
+        return result
+
+
 @dataclass
 class AbortData:
     "Turn abort information including the reason for termination"
@@ -1274,6 +1461,83 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class AgentInterruptedData:
+    "Metadata for work the user interrupted while the agent was running"
+    activity: AgentInterruptedActivity
+    elapsed: timedelta
+    turn: int
+    api_endpoint: str | None = None
+    cancel_phase: AgentInterruptedCancelPhase | None = None
+    interrupted_agent_count: int | None = None
+    model: str | None = None
+    output_ttft: timedelta | None = None
+    reasoning_effort: str | None = None
+    safe_tool_names: list[str] | None = None
+    tool_call_ids: list[str] | None = None
+    tool_names: list[str] | None = None
+    transport: ModelCallFailureTransport | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "AgentInterruptedData":
+        assert isinstance(obj, dict)
+        activity = parse_enum(AgentInterruptedActivity, obj.get("activity"))
+        elapsed = from_timedelta(obj.get("elapsedMs"))
+        turn = from_int(obj.get("turn"))
+        api_endpoint = from_union([from_none, from_str], obj.get("apiEndpoint"))
+        cancel_phase = from_union([from_none, lambda x: parse_enum(AgentInterruptedCancelPhase, x)], obj.get("cancelPhase"))
+        interrupted_agent_count = from_union([from_none, from_int], obj.get("interruptedAgentCount"))
+        model = from_union([from_none, from_str], obj.get("model"))
+        output_ttft = from_union([from_none, from_timedelta], obj.get("outputTtftMs"))
+        reasoning_effort = from_union([from_none, from_str], obj.get("reasoningEffort"))
+        safe_tool_names = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("safeToolNames"))
+        tool_call_ids = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("toolCallIds"))
+        tool_names = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("toolNames"))
+        transport = from_union([from_none, lambda x: parse_enum(ModelCallFailureTransport, x)], obj.get("transport"))
+        return AgentInterruptedData(
+            activity=activity,
+            elapsed=elapsed,
+            turn=turn,
+            api_endpoint=api_endpoint,
+            cancel_phase=cancel_phase,
+            interrupted_agent_count=interrupted_agent_count,
+            model=model,
+            output_ttft=output_ttft,
+            reasoning_effort=reasoning_effort,
+            safe_tool_names=safe_tool_names,
+            tool_call_ids=tool_call_ids,
+            tool_names=tool_names,
+            transport=transport,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["activity"] = to_enum(AgentInterruptedActivity, self.activity)
+        result["elapsedMs"] = to_timedelta(self.elapsed)
+        result["turn"] = to_int(self.turn)
+        if self.api_endpoint is not None:
+            result["apiEndpoint"] = from_union([from_none, from_str], self.api_endpoint)
+        if self.cancel_phase is not None:
+            result["cancelPhase"] = from_union([from_none, lambda x: to_enum(AgentInterruptedCancelPhase, x)], self.cancel_phase)
+        if self.interrupted_agent_count is not None:
+            result["interruptedAgentCount"] = from_union([from_none, to_int], self.interrupted_agent_count)
+        if self.model is not None:
+            result["model"] = from_union([from_none, from_str], self.model)
+        if self.output_ttft is not None:
+            result["outputTtftMs"] = from_union([from_none, to_timedelta], self.output_ttft)
+        if self.reasoning_effort is not None:
+            result["reasoningEffort"] = from_union([from_none, from_str], self.reasoning_effort)
+        if self.safe_tool_names is not None:
+            result["safeToolNames"] = from_union([from_none, lambda x: from_list(from_str, x)], self.safe_tool_names)
+        if self.tool_call_ids is not None:
+            result["toolCallIds"] = from_union([from_none, lambda x: from_list(from_str, x)], self.tool_call_ids)
+        if self.tool_names is not None:
+            result["toolNames"] = from_union([from_none, lambda x: from_list(from_str, x)], self.tool_names)
+        if self.transport is not None:
+            result["transport"] = from_union([from_none, lambda x: to_enum(ModelCallFailureTransport, x)], self.transport)
+        return result
+
+
 @dataclass
 class AssistantIdleData:
     "Payload emitted whenever the main agent's processing loop goes idle, including while related background work (running agents or in-flight attached shell commands) is still pending and the session-level idle event is therefore deferred"
@@ -1331,6 +1595,7 @@ class AssistantMessageData:
     # Deprecated: this field is deprecated.
     parent_tool_call_id: str | None = None
     phase: str | None = None
+    reasoning_blocks: AssistantMessageReasoningBlocks | None = None
     reasoning_opaque: str | None = None
     reasoning_text: str | None = None
     reasoning_wire_field: str | None = None
@@ -1357,6 +1622,7 @@ def from_dict(obj: Any) -> "AssistantMessageData":
         output_tokens = from_union([from_none, from_int], obj.get("outputTokens"))
         parent_tool_call_id = from_union([from_none, from_str], obj.get("parentToolCallId"))
         phase = from_union([from_none, from_str], obj.get("phase"))
+        reasoning_blocks = from_union([from_none, AssistantMessageReasoningBlocks.from_dict], obj.get("reasoningBlocks"))
         reasoning_opaque = from_union([from_none, from_str], obj.get("reasoningOpaque"))
         reasoning_text = from_union([from_none, from_str], obj.get("reasoningText"))
         reasoning_wire_field = from_union([from_none, from_str], obj.get("reasoningWireField"))
@@ -1380,6 +1646,7 @@ def from_dict(obj: Any) -> "AssistantMessageData":
             output_tokens=output_tokens,
             parent_tool_call_id=parent_tool_call_id,
             phase=phase,
+            reasoning_blocks=reasoning_blocks,
             reasoning_opaque=reasoning_opaque,
             reasoning_text=reasoning_text,
             reasoning_wire_field=reasoning_wire_field,
@@ -1417,6 +1684,8 @@ def to_dict(self) -> dict:
             result["parentToolCallId"] = from_union([from_none, from_str], self.parent_tool_call_id)
         if self.phase is not None:
             result["phase"] = from_union([from_none, from_str], self.phase)
+        if self.reasoning_blocks is not None:
+            result["reasoningBlocks"] = from_union([from_none, lambda x: to_class(AssistantMessageReasoningBlocks, x)], self.reasoning_blocks)
         if self.reasoning_opaque is not None:
             result["reasoningOpaque"] = from_union([from_none, from_str], self.reasoning_opaque)
         if self.reasoning_text is not None:
@@ -1816,12 +2085,17 @@ def to_dict(self) -> dict:
 class AssistantUsageData:
     "LLM API call usage metrics including tokens, costs, quotas, and billing information"
     model: str
+    accepted_prediction_tokens: int | None = None
     api_call_id: str | None = None
     api_endpoint: AssistantUsageApiEndpoint | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
     _available_tool_count: int | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _cache_details_reported: bool | None = None
     cache_expires_at: datetime | None = None
     cache_read_tokens: int | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _cache_ttl_seconds: int | None = None
     cache_write_tokens: int | None = None
     content_filter_triggered: bool | None = None
     copilot_usage: AssistantUsageCopilotUsage | None = None
@@ -1829,20 +2103,29 @@ class AssistantUsageData:
     cost: float | None = None
     duration: timedelta | None = None
     finish_reason: str | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _frontier_source: str | None = None
     initiator: str | None = None
     input_tokens: int | None = None
     interaction_type: str | None = None
     inter_token_latency: timedelta | None = None
+    is_auto: bool | None = None
+    is_byok: bool | None = None
+    max_output_tokens: int | None = None
+    max_prompt_tokens: int | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
     _num_tool_calls: int | None = None
     output_tokens: int | None = None
+    output_ttft: timedelta | None = None
     # Deprecated: this field is deprecated.
     parent_tool_call_id: str | None = None
     provider_call_id: str | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
     _quota_snapshots: dict[str, _AssistantUsageQuotaSnapshot] | None = None
     reasoning_effort: str | None = None
+    reasoning_summary: ReasoningSummary | None = None
     reasoning_tokens: int | None = None
+    rejected_prediction_tokens: int | None = None
     rte: bool | None = None
     service_request_id: str | None = None
     time_to_first_token: timedelta | None = None
@@ -1850,82 +2133,113 @@ class AssistantUsageData:
     _tool_counts: dict[str, int] | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
     _tool_token_count: int | None = None
+    transport: AssistantUsageTransport | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "AssistantUsageData":
         assert isinstance(obj, dict)
         model = from_str(obj.get("model"))
+        accepted_prediction_tokens = from_union([from_none, from_int], obj.get("acceptedPredictionTokens"))
         api_call_id = from_union([from_none, from_str], obj.get("apiCallId"))
         api_endpoint = from_union([from_none, lambda x: parse_enum(AssistantUsageApiEndpoint, x)], obj.get("apiEndpoint"))
         _available_tool_count = from_union([from_none, from_int], obj.get("availableToolCount"))
+        _cache_details_reported = from_union([from_none, from_bool], obj.get("cacheDetailsReported"))
         cache_expires_at = from_union([from_none, from_datetime], obj.get("cacheExpiresAt"))
         cache_read_tokens = from_union([from_none, from_int], obj.get("cacheReadTokens"))
+        _cache_ttl_seconds = from_union([from_none, from_int], obj.get("cacheTtlSeconds"))
         cache_write_tokens = from_union([from_none, from_int], obj.get("cacheWriteTokens"))
         content_filter_triggered = from_union([from_none, from_bool], obj.get("contentFilterTriggered"))
         copilot_usage = from_union([from_none, AssistantUsageCopilotUsage.from_dict], obj.get("copilotUsage"))
         cost = from_union([from_none, from_float], obj.get("cost"))
         duration = from_union([from_none, from_timedelta], obj.get("duration"))
         finish_reason = from_union([from_none, from_str], obj.get("finishReason"))
+        _frontier_source = from_union([from_none, from_str], obj.get("frontierSource"))
         initiator = from_union([from_none, from_str], obj.get("initiator"))
         input_tokens = from_union([from_none, from_int], obj.get("inputTokens"))
         interaction_type = from_union([from_none, from_str], obj.get("interactionType"))
         inter_token_latency = from_union([from_none, from_timedelta], obj.get("interTokenLatencyMs"))
+        is_auto = from_union([from_none, from_bool], obj.get("isAuto"))
+        is_byok = from_union([from_none, from_bool], obj.get("isByok"))
+        max_output_tokens = from_union([from_none, from_int], obj.get("maxOutputTokens"))
+        max_prompt_tokens = from_union([from_none, from_int], obj.get("maxPromptTokens"))
         _num_tool_calls = from_union([from_none, from_int], obj.get("numToolCalls"))
         output_tokens = from_union([from_none, from_int], obj.get("outputTokens"))
+        output_ttft = from_union([from_none, from_timedelta], obj.get("outputTtftMs"))
         parent_tool_call_id = from_union([from_none, from_str], obj.get("parentToolCallId"))
         provider_call_id = from_union([from_none, from_str], obj.get("providerCallId"))
         _quota_snapshots = from_union([from_none, lambda x: from_dict(_AssistantUsageQuotaSnapshot.from_dict, x)], obj.get("quotaSnapshots"))
         reasoning_effort = from_union([from_none, from_str], obj.get("reasoningEffort"))
+        reasoning_summary = from_union([from_none, lambda x: parse_enum(ReasoningSummary, x)], obj.get("reasoningSummary"))
         reasoning_tokens = from_union([from_none, from_int], obj.get("reasoningTokens"))
+        rejected_prediction_tokens = from_union([from_none, from_int], obj.get("rejectedPredictionTokens"))
         rte = from_union([from_none, from_bool], obj.get("rte"))
         service_request_id = from_union([from_none, from_str], obj.get("serviceRequestId"))
         time_to_first_token = from_union([from_none, from_timedelta], obj.get("timeToFirstTokenMs"))
         _tool_counts = from_union([from_none, lambda x: from_dict(from_int, x)], obj.get("toolCounts"))
         _tool_token_count = from_union([from_none, from_int], obj.get("toolTokenCount"))
+        transport = from_union([from_none, lambda x: parse_enum(AssistantUsageTransport, x)], obj.get("transport"))
         return AssistantUsageData(
             model=model,
+            accepted_prediction_tokens=accepted_prediction_tokens,
             api_call_id=api_call_id,
             api_endpoint=api_endpoint,
             _available_tool_count=_available_tool_count,
+            _cache_details_reported=_cache_details_reported,
             cache_expires_at=cache_expires_at,
             cache_read_tokens=cache_read_tokens,
+            _cache_ttl_seconds=_cache_ttl_seconds,
             cache_write_tokens=cache_write_tokens,
             content_filter_triggered=content_filter_triggered,
             copilot_usage=copilot_usage,
             cost=cost,
             duration=duration,
             finish_reason=finish_reason,
+            _frontier_source=_frontier_source,
             initiator=initiator,
             input_tokens=input_tokens,
             interaction_type=interaction_type,
             inter_token_latency=inter_token_latency,
+            is_auto=is_auto,
+            is_byok=is_byok,
+            max_output_tokens=max_output_tokens,
+            max_prompt_tokens=max_prompt_tokens,
             _num_tool_calls=_num_tool_calls,
             output_tokens=output_tokens,
+            output_ttft=output_ttft,
             parent_tool_call_id=parent_tool_call_id,
             provider_call_id=provider_call_id,
             _quota_snapshots=_quota_snapshots,
             reasoning_effort=reasoning_effort,
+            reasoning_summary=reasoning_summary,
             reasoning_tokens=reasoning_tokens,
+            rejected_prediction_tokens=rejected_prediction_tokens,
             rte=rte,
             service_request_id=service_request_id,
             time_to_first_token=time_to_first_token,
             _tool_counts=_tool_counts,
             _tool_token_count=_tool_token_count,
+            transport=transport,
         )
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["model"] = from_str(self.model)
+        if self.accepted_prediction_tokens is not None:
+            result["acceptedPredictionTokens"] = from_union([from_none, to_int], self.accepted_prediction_tokens)
         if self.api_call_id is not None:
             result["apiCallId"] = from_union([from_none, from_str], self.api_call_id)
         if self.api_endpoint is not None:
             result["apiEndpoint"] = from_union([from_none, lambda x: to_enum(AssistantUsageApiEndpoint, x)], self.api_endpoint)
         if self._available_tool_count is not None:
             result["availableToolCount"] = from_union([from_none, to_int], self._available_tool_count)
+        if self._cache_details_reported is not None:
+            result["cacheDetailsReported"] = from_union([from_none, from_bool], self._cache_details_reported)
         if self.cache_expires_at is not None:
             result["cacheExpiresAt"] = from_union([from_none, to_datetime], self.cache_expires_at)
         if self.cache_read_tokens is not None:
             result["cacheReadTokens"] = from_union([from_none, to_int], self.cache_read_tokens)
+        if self._cache_ttl_seconds is not None:
+            result["cacheTtlSeconds"] = from_union([from_none, to_int], self._cache_ttl_seconds)
         if self.cache_write_tokens is not None:
             result["cacheWriteTokens"] = from_union([from_none, to_int], self.cache_write_tokens)
         if self.content_filter_triggered is not None:
@@ -1938,6 +2252,8 @@ def to_dict(self) -> dict:
             result["duration"] = from_union([from_none, to_timedelta_int], self.duration)
         if self.finish_reason is not None:
             result["finishReason"] = from_union([from_none, from_str], self.finish_reason)
+        if self._frontier_source is not None:
+            result["frontierSource"] = from_union([from_none, from_str], self._frontier_source)
         if self.initiator is not None:
             result["initiator"] = from_union([from_none, from_str], self.initiator)
         if self.input_tokens is not None:
@@ -1946,10 +2262,20 @@ def to_dict(self) -> dict:
             result["interactionType"] = from_union([from_none, from_str], self.interaction_type)
         if self.inter_token_latency is not None:
             result["interTokenLatencyMs"] = from_union([from_none, to_timedelta], self.inter_token_latency)
+        if self.is_auto is not None:
+            result["isAuto"] = from_union([from_none, from_bool], self.is_auto)
+        if self.is_byok is not None:
+            result["isByok"] = from_union([from_none, from_bool], self.is_byok)
+        if self.max_output_tokens is not None:
+            result["maxOutputTokens"] = from_union([from_none, to_int], self.max_output_tokens)
+        if self.max_prompt_tokens is not None:
+            result["maxPromptTokens"] = from_union([from_none, to_int], self.max_prompt_tokens)
         if self._num_tool_calls is not None:
             result["numToolCalls"] = from_union([from_none, to_int], self._num_tool_calls)
         if self.output_tokens is not None:
             result["outputTokens"] = from_union([from_none, to_int], self.output_tokens)
+        if self.output_ttft is not None:
+            result["outputTtftMs"] = from_union([from_none, to_timedelta], self.output_ttft)
         if self.parent_tool_call_id is not None:
             result["parentToolCallId"] = from_union([from_none, from_str], self.parent_tool_call_id)
         if self.provider_call_id is not None:
@@ -1958,8 +2284,12 @@ def to_dict(self) -> dict:
             result["quotaSnapshots"] = from_union([from_none, lambda x: from_dict(lambda x: to_class(_AssistantUsageQuotaSnapshot, x), x)], self._quota_snapshots)
         if self.reasoning_effort is not None:
             result["reasoningEffort"] = from_union([from_none, from_str], self.reasoning_effort)
+        if self.reasoning_summary is not None:
+            result["reasoningSummary"] = from_union([from_none, lambda x: to_enum(ReasoningSummary, x)], self.reasoning_summary)
         if self.reasoning_tokens is not None:
             result["reasoningTokens"] = from_union([from_none, to_int], self.reasoning_tokens)
+        if self.rejected_prediction_tokens is not None:
+            result["rejectedPredictionTokens"] = from_union([from_none, to_int], self.rejected_prediction_tokens)
         if self.rte is not None:
             result["rte"] = from_union([from_none, from_bool], self.rte)
         if self.service_request_id is not None:
@@ -1970,6 +2300,8 @@ def to_dict(self) -> dict:
             result["toolCounts"] = from_union([from_none, lambda x: from_dict(to_int, x)], self._tool_counts)
         if self._tool_token_count is not None:
             result["toolTokenCount"] = from_union([from_none, to_int], self._tool_token_count)
+        if self.transport is not None:
+            result["transport"] = from_union([from_none, lambda x: to_enum(AssistantUsageTransport, x)], self.transport)
         return result
 
 
@@ -3309,6 +3641,7 @@ class ExitPlanModeRequestedData:
     recommended_action: ExitPlanModeAction
     request_id: str
     summary: str
+    model: str | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "ExitPlanModeRequestedData":
@@ -3318,12 +3651,14 @@ def from_dict(obj: Any) -> "ExitPlanModeRequestedData":
         recommended_action = parse_enum(ExitPlanModeAction, obj.get("recommendedAction"))
         request_id = from_str(obj.get("requestId"))
         summary = from_str(obj.get("summary"))
+        model = from_union([from_none, from_str], obj.get("model"))
         return ExitPlanModeRequestedData(
             actions=actions,
             plan_content=plan_content,
             recommended_action=recommended_action,
             request_id=request_id,
             summary=summary,
+            model=model,
         )
 
     def to_dict(self) -> dict:
@@ -3333,6 +3668,8 @@ def to_dict(self) -> dict:
         result["recommendedAction"] = to_enum(ExitPlanModeAction, self.recommended_action)
         result["requestId"] = from_str(self.request_id)
         result["summary"] = from_str(self.summary)
+        if self.model is not None:
+            result["model"] = from_union([from_none, from_str], self.model)
         return result
 
 
@@ -3394,6 +3731,7 @@ class ExternalToolRequestedData:
     tool_call_id: str
     tool_name: str
     arguments: Any = None
+    provider_id: str | None = None
     traceparent: str | None = None
     tracestate: str | None = None
     working_directory: str | None = None
@@ -3406,6 +3744,7 @@ def from_dict(obj: Any) -> "ExternalToolRequestedData":
         tool_call_id = from_str(obj.get("toolCallId"))
         tool_name = from_str(obj.get("toolName"))
         arguments = obj.get("arguments")
+        provider_id = from_union([from_none, from_str], obj.get("providerId"))
         traceparent = from_union([from_none, from_str], obj.get("traceparent"))
         tracestate = from_union([from_none, from_str], obj.get("tracestate"))
         working_directory = from_union([from_none, from_str], obj.get("workingDirectory"))
@@ -3415,6 +3754,7 @@ def from_dict(obj: Any) -> "ExternalToolRequestedData":
             tool_call_id=tool_call_id,
             tool_name=tool_name,
             arguments=arguments,
+            provider_id=provider_id,
             traceparent=traceparent,
             tracestate=tracestate,
             working_directory=working_directory,
@@ -3428,6 +3768,8 @@ def to_dict(self) -> dict:
         result["toolName"] = from_str(self.tool_name)
         if self.arguments is not None:
             result["arguments"] = self.arguments
+        if self.provider_id is not None:
+            result["providerId"] = from_union([from_none, from_str], self.provider_id)
         if self.traceparent is not None:
             result["traceparent"] = from_union([from_none, from_str], self.traceparent)
         if self.tracestate is not None:
@@ -4146,6 +4488,7 @@ class ModelCallFailureData:
     error_type: str | None = None
     failure_kind: ModelCallFailureKind | None = None
     initiator: str | None = None
+    interaction_type: str | None = None
     is_auto: bool | None = None
     is_byok: bool | None = None
     max_output_tokens: int | None = None
@@ -4174,6 +4517,7 @@ def from_dict(obj: Any) -> "ModelCallFailureData":
         error_type = from_union([from_none, from_str], obj.get("errorType"))
         failure_kind = from_union([from_none, lambda x: parse_enum(ModelCallFailureKind, x)], obj.get("failureKind"))
         initiator = from_union([from_none, from_str], obj.get("initiator"))
+        interaction_type = from_union([from_none, from_str], obj.get("interactionType"))
         is_auto = from_union([from_none, from_bool], obj.get("isAuto"))
         is_byok = from_union([from_none, from_bool], obj.get("isByok"))
         max_output_tokens = from_union([from_none, from_int], obj.get("maxOutputTokens"))
@@ -4198,6 +4542,7 @@ def from_dict(obj: Any) -> "ModelCallFailureData":
             error_type=error_type,
             failure_kind=failure_kind,
             initiator=initiator,
+            interaction_type=interaction_type,
             is_auto=is_auto,
             is_byok=is_byok,
             max_output_tokens=max_output_tokens,
@@ -4234,6 +4579,8 @@ def to_dict(self) -> dict:
             result["failureKind"] = from_union([from_none, lambda x: to_enum(ModelCallFailureKind, x)], self.failure_kind)
         if self.initiator is not None:
             result["initiator"] = from_union([from_none, from_str], self.initiator)
+        if self.interaction_type is not None:
+            result["interactionType"] = from_union([from_none, from_str], self.interaction_type)
         if self.is_auto is not None:
             result["isAuto"] = from_union([from_none, from_bool], self.is_auto)
         if self.is_byok is not None:
@@ -4307,6 +4654,47 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class ModelCallFinishedData:
+    "Final lifecycle outcome for one logical model dispatch. A logical dispatch may include internal reconnect or fallback work, so event count is not provider HTTP-request count."
+    dispatch_duration: timedelta
+    edit_classifier_version: int
+    outcome: ModelCallFinishedOutcome
+    turn_id: str
+    contains_built_in_file_edit_request: bool | None = None
+    interaction_id: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "ModelCallFinishedData":
+        assert isinstance(obj, dict)
+        dispatch_duration = from_timedelta(obj.get("dispatchDurationMs"))
+        edit_classifier_version = from_int(obj.get("editClassifierVersion"))
+        outcome = parse_enum(ModelCallFinishedOutcome, obj.get("outcome"))
+        turn_id = from_str(obj.get("turnId"))
+        contains_built_in_file_edit_request = from_union([from_none, from_bool], obj.get("containsBuiltInFileEditRequest"))
+        interaction_id = from_union([from_none, from_str], obj.get("interactionId"))
+        return ModelCallFinishedData(
+            dispatch_duration=dispatch_duration,
+            edit_classifier_version=edit_classifier_version,
+            outcome=outcome,
+            turn_id=turn_id,
+            contains_built_in_file_edit_request=contains_built_in_file_edit_request,
+            interaction_id=interaction_id,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["dispatchDurationMs"] = to_timedelta(self.dispatch_duration)
+        result["editClassifierVersion"] = to_int(self.edit_classifier_version)
+        result["outcome"] = to_enum(ModelCallFinishedOutcome, self.outcome)
+        result["turnId"] = from_str(self.turn_id)
+        if self.contains_built_in_file_edit_request is not None:
+            result["containsBuiltInFileEditRequest"] = from_union([from_none, from_bool], self.contains_built_in_file_edit_request)
+        if self.interaction_id is not None:
+            result["interactionId"] = from_union([from_none, from_str], self.interaction_id)
+        return result
+
+
 @dataclass
 class ModelCallStartData:
     "Model API dispatch metadata for internal telemetry"
@@ -4353,16 +4741,21 @@ def to_dict(self) -> dict:
 class PermissionApproved:
     "Permission response variant indicating the request was approved without persisting an approval rule."
     kind: ClassVar[str] = "approved"
+    managed_approval_handled: bool | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "PermissionApproved":
         assert isinstance(obj, dict)
+        managed_approval_handled = from_union([from_none, from_bool], obj.get("managedApprovalHandled"))
         return PermissionApproved(
+            managed_approval_handled=managed_approval_handled,
         )
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["kind"] = self.kind
+        if self.managed_approval_handled is not None:
+            result["managedApprovalHandled"] = from_union([from_none, from_bool], self.managed_approval_handled)
         return result
 
 
@@ -4372,15 +4765,18 @@ class PermissionApprovedForLocation:
     approval: UserToolSessionApproval
     kind: ClassVar[str] = "approved-for-location"
     location_key: str
+    managed_approval_handled: bool | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "PermissionApprovedForLocation":
         assert isinstance(obj, dict)
         approval = _load_UserToolSessionApproval(obj.get("approval"))
         location_key = from_str(obj.get("locationKey"))
+        managed_approval_handled = from_union([from_none, from_bool], obj.get("managedApprovalHandled"))
         return PermissionApprovedForLocation(
             approval=approval,
             location_key=location_key,
+            managed_approval_handled=managed_approval_handled,
         )
 
     def to_dict(self) -> dict:
@@ -4388,6 +4784,8 @@ def to_dict(self) -> dict:
         result["approval"] = self.approval.to_dict()
         result["kind"] = self.kind
         result["locationKey"] = from_str(self.location_key)
+        if self.managed_approval_handled is not None:
+            result["managedApprovalHandled"] = from_union([from_none, from_bool], self.managed_approval_handled)
         return result
 
 
@@ -4396,19 +4794,24 @@ class PermissionApprovedForSession:
     "Permission response variant that approves a request and remembers the provided approval for the rest of the session."
     approval: UserToolSessionApproval
     kind: ClassVar[str] = "approved-for-session"
+    managed_approval_handled: bool | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "PermissionApprovedForSession":
         assert isinstance(obj, dict)
         approval = _load_UserToolSessionApproval(obj.get("approval"))
+        managed_approval_handled = from_union([from_none, from_bool], obj.get("managedApprovalHandled"))
         return PermissionApprovedForSession(
             approval=approval,
+            managed_approval_handled=managed_approval_handled,
         )
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["approval"] = self.approval.to_dict()
         result["kind"] = self.kind
+        if self.managed_approval_handled is not None:
+            result["managedApprovalHandled"] = from_union([from_none, from_bool], self.managed_approval_handled)
         return result
 
 
@@ -4588,7 +4991,7 @@ class PermissionPromptRequestCommands:
     intention: str
     kind: ClassVar[str] = "commands"
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     managed_approval_required: bool | None = None
     tool_call_id: str | None = None
     warning: str | None = None
@@ -4600,7 +5003,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestCommands":
         command_identifiers = from_list(from_str, obj.get("commandIdentifiers"))
         full_command_text = from_str(obj.get("fullCommandText"))
         intention = from_str(obj.get("intention"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         warning = from_union([from_none, from_str], obj.get("warning"))
@@ -4609,7 +5012,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestCommands":
             command_identifiers=command_identifiers,
             full_command_text=full_command_text,
             intention=intention,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             managed_approval_required=managed_approval_required,
             tool_call_id=tool_call_id,
             warning=warning,
@@ -4622,8 +5025,8 @@ def to_dict(self) -> dict:
         result["fullCommandText"] = from_str(self.full_command_text)
         result["intention"] = from_str(self.intention)
         result["kind"] = self.kind
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.managed_approval_required is not None:
             result["managedApprovalRequired"] = from_union([from_none, from_bool], self.managed_approval_required)
         if self.tool_call_id is not None:
@@ -4641,7 +5044,7 @@ class PermissionPromptRequestCustomTool:
     tool_name: str
     args: Any = None
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     tool_call_id: str | None = None
 
     @staticmethod
@@ -4650,13 +5053,13 @@ def from_dict(obj: Any) -> "PermissionPromptRequestCustomTool":
         tool_description = from_str(obj.get("toolDescription"))
         tool_name = from_str(obj.get("toolName"))
         args = obj.get("args")
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         return PermissionPromptRequestCustomTool(
             tool_description=tool_description,
             tool_name=tool_name,
             args=args,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             tool_call_id=tool_call_id,
         )
 
@@ -4667,8 +5070,44 @@ def to_dict(self) -> dict:
         result["toolName"] = from_str(self.tool_name)
         if self.args is not None:
             result["args"] = self.args
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
+        if self.tool_call_id is not None:
+            result["toolCallId"] = from_union([from_none, from_str], self.tool_call_id)
+        return result
+
+
+@dataclass
+class PermissionPromptRequestExtensionEnvAccess:
+    "Extension sensitive environment variable access prompt"
+    environment_variables: list[str]
+    extension_name: str
+    kind: ClassVar[str] = "extension-env-access"
+    # Experimental: this field is part of an experimental API and may change or be removed.
+    assisted_approval: PermissionAssistedApproval | None = None
+    tool_call_id: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "PermissionPromptRequestExtensionEnvAccess":
+        assert isinstance(obj, dict)
+        environment_variables = from_list(from_str, obj.get("environmentVariables"))
+        extension_name = from_str(obj.get("extensionName"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
+        tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
+        return PermissionPromptRequestExtensionEnvAccess(
+            environment_variables=environment_variables,
+            extension_name=extension_name,
+            assisted_approval=assisted_approval,
+            tool_call_id=tool_call_id,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environmentVariables"] = from_list(from_str, self.environment_variables)
+        result["extensionName"] = from_str(self.extension_name)
+        result["kind"] = self.kind
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.tool_call_id is not None:
             result["toolCallId"] = from_union([from_none, from_str], self.tool_call_id)
         return result
@@ -4680,7 +5119,7 @@ class PermissionPromptRequestExtensionManagement:
     kind: ClassVar[str] = "extension-management"
     operation: str
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     extension_name: str | None = None
     tool_call_id: str | None = None
 
@@ -4688,12 +5127,12 @@ class PermissionPromptRequestExtensionManagement:
     def from_dict(obj: Any) -> "PermissionPromptRequestExtensionManagement":
         assert isinstance(obj, dict)
         operation = from_str(obj.get("operation"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         extension_name = from_union([from_none, from_str], obj.get("extensionName"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         return PermissionPromptRequestExtensionManagement(
             operation=operation,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             extension_name=extension_name,
             tool_call_id=tool_call_id,
         )
@@ -4702,8 +5141,8 @@ def to_dict(self) -> dict:
         result: dict = {}
         result["kind"] = self.kind
         result["operation"] = from_str(self.operation)
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.extension_name is not None:
             result["extensionName"] = from_union([from_none, from_str], self.extension_name)
         if self.tool_call_id is not None:
@@ -4718,7 +5157,7 @@ class PermissionPromptRequestExtensionPermissionAccess:
     extension_name: str
     kind: ClassVar[str] = "extension-permission-access"
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     tool_call_id: str | None = None
 
     @staticmethod
@@ -4726,12 +5165,12 @@ def from_dict(obj: Any) -> "PermissionPromptRequestExtensionPermissionAccess":
         assert isinstance(obj, dict)
         capabilities = from_list(from_str, obj.get("capabilities"))
         extension_name = from_str(obj.get("extensionName"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         return PermissionPromptRequestExtensionPermissionAccess(
             capabilities=capabilities,
             extension_name=extension_name,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             tool_call_id=tool_call_id,
         )
 
@@ -4740,8 +5179,8 @@ def to_dict(self) -> dict:
         result["capabilities"] = from_list(from_str, self.capabilities)
         result["extensionName"] = from_str(self.extension_name)
         result["kind"] = self.kind
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.tool_call_id is not None:
             result["toolCallId"] = from_union([from_none, from_str], self.tool_call_id)
         return result
@@ -4758,7 +5197,7 @@ class PermissionPromptRequestFactory:
     operation: FactoryPermissionOperation
     phases: list[FactoryPermissionPhase]
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     declared_max_ai_credits: float | None = None
     declared_max_concurrent_subagents: int | None = None
     declared_max_total_subagents: int | None = None
@@ -4779,7 +5218,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestFactory":
         name = from_str(obj.get("name"))
         operation = parse_enum(FactoryPermissionOperation, obj.get("operation"))
         phases = from_list(FactoryPermissionPhase.from_dict, obj.get("phases"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         declared_max_ai_credits = from_union([from_none, from_float], obj.get("declaredMaxAiCredits"))
         declared_max_concurrent_subagents = from_union([from_none, from_int], obj.get("declaredMaxConcurrentSubagents"))
         declared_max_total_subagents = from_union([from_none, from_int], obj.get("declaredMaxTotalSubagents"))
@@ -4797,7 +5236,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestFactory":
             name=name,
             operation=operation,
             phases=phases,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             declared_max_ai_credits=declared_max_ai_credits,
             declared_max_concurrent_subagents=declared_max_concurrent_subagents,
             declared_max_total_subagents=declared_max_total_subagents,
@@ -4819,8 +5258,8 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         result["operation"] = to_enum(FactoryPermissionOperation, self.operation)
         result["phases"] = from_list(lambda x: to_class(FactoryPermissionPhase, x), self.phases)
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.declared_max_ai_credits is not None:
             result["declaredMaxAiCredits"] = from_union([from_none, to_float], self.declared_max_ai_credits)
         if self.declared_max_concurrent_subagents is not None:
@@ -4850,7 +5289,7 @@ class PermissionPromptRequestHook:
     kind: ClassVar[str] = "hook"
     tool_name: str
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     hook_message: str | None = None
     tool_args: Any = None
     tool_call_id: str | None = None
@@ -4859,13 +5298,13 @@ class PermissionPromptRequestHook:
     def from_dict(obj: Any) -> "PermissionPromptRequestHook":
         assert isinstance(obj, dict)
         tool_name = from_str(obj.get("toolName"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         hook_message = from_union([from_none, from_str], obj.get("hookMessage"))
         tool_args = obj.get("toolArgs")
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         return PermissionPromptRequestHook(
             tool_name=tool_name,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             hook_message=hook_message,
             tool_args=tool_args,
             tool_call_id=tool_call_id,
@@ -4875,8 +5314,8 @@ def to_dict(self) -> dict:
         result: dict = {}
         result["kind"] = self.kind
         result["toolName"] = from_str(self.tool_name)
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.hook_message is not None:
             result["hookMessage"] = from_union([from_none, from_str], self.hook_message)
         if self.tool_args is not None:
@@ -4895,7 +5334,10 @@ class PermissionPromptRequestMcp:
     tool_title: str
     args: Any = None
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
+    can_offer_server_wide_approval: bool | None = None
+    # Experimental: this field is part of an experimental API and may change or be removed.
+    permission_recommendation: PermissionRecommendation | None = None
     tool_call_id: str | None = None
 
     @staticmethod
@@ -4905,14 +5347,18 @@ def from_dict(obj: Any) -> "PermissionPromptRequestMcp":
         tool_name = from_str(obj.get("toolName"))
         tool_title = from_str(obj.get("toolTitle"))
         args = obj.get("args")
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
+        can_offer_server_wide_approval = from_union([from_none, from_bool], obj.get("canOfferServerWideApproval"))
+        permission_recommendation = from_union([from_none, lambda x: parse_enum(PermissionRecommendation, x)], obj.get("permissionRecommendation"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         return PermissionPromptRequestMcp(
             server_name=server_name,
             tool_name=tool_name,
             tool_title=tool_title,
             args=args,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
+            can_offer_server_wide_approval=can_offer_server_wide_approval,
+            permission_recommendation=permission_recommendation,
             tool_call_id=tool_call_id,
         )
 
@@ -4924,8 +5370,12 @@ def to_dict(self) -> dict:
         result["toolTitle"] = from_str(self.tool_title)
         if self.args is not None:
             result["args"] = self.args
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
+        if self.can_offer_server_wide_approval is not None:
+            result["canOfferServerWideApproval"] = from_union([from_none, from_bool], self.can_offer_server_wide_approval)
+        if self.permission_recommendation is not None:
+            result["permissionRecommendation"] = from_union([from_none, lambda x: to_enum(PermissionRecommendation, x)], self.permission_recommendation)
         if self.tool_call_id is not None:
             result["toolCallId"] = from_union([from_none, from_str], self.tool_call_id)
         return result
@@ -4938,7 +5388,7 @@ class PermissionPromptRequestMemory:
     kind: ClassVar[str] = "memory"
     action: PermissionRequestMemoryAction | None = None
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     citations: str | None = None
     direction: PermissionRequestMemoryDirection | None = None
     reason: str | None = None
@@ -4950,7 +5400,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestMemory":
         assert isinstance(obj, dict)
         fact = from_str(obj.get("fact"))
         action = from_union([from_none, lambda x: parse_enum(PermissionRequestMemoryAction, x)], obj.get("action"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         citations = from_union([from_none, from_str], obj.get("citations"))
         direction = from_union([from_none, lambda x: parse_enum(PermissionRequestMemoryDirection, x)], obj.get("direction"))
         reason = from_union([from_none, from_str], obj.get("reason"))
@@ -4959,7 +5409,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestMemory":
         return PermissionPromptRequestMemory(
             fact=fact,
             action=action,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             citations=citations,
             direction=direction,
             reason=reason,
@@ -4973,8 +5423,8 @@ def to_dict(self) -> dict:
         result["kind"] = self.kind
         if self.action is not None:
             result["action"] = from_union([from_none, lambda x: to_enum(PermissionRequestMemoryAction, x)], self.action)
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.citations is not None:
             result["citations"] = from_union([from_none, from_str], self.citations)
         if self.direction is not None:
@@ -4995,7 +5445,7 @@ class PermissionPromptRequestPath:
     kind: ClassVar[str] = "path"
     paths: list[str]
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     tool_call_id: str | None = None
 
     @staticmethod
@@ -5003,12 +5453,12 @@ def from_dict(obj: Any) -> "PermissionPromptRequestPath":
         assert isinstance(obj, dict)
         access_kind = parse_enum(PermissionPromptRequestPathAccessKind, obj.get("accessKind"))
         paths = from_list(from_str, obj.get("paths"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         return PermissionPromptRequestPath(
             access_kind=access_kind,
             paths=paths,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             tool_call_id=tool_call_id,
         )
 
@@ -5017,8 +5467,8 @@ def to_dict(self) -> dict:
         result["accessKind"] = to_enum(PermissionPromptRequestPathAccessKind, self.access_kind)
         result["kind"] = self.kind
         result["paths"] = from_list(from_str, self.paths)
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.tool_call_id is not None:
             result["toolCallId"] = from_union([from_none, from_str], self.tool_call_id)
         return result
@@ -5031,7 +5481,7 @@ class PermissionPromptRequestRead:
     kind: ClassVar[str] = "read"
     path: str
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     managed_approval_required: bool | None = None
     tool_call_id: str | None = None
 
@@ -5040,13 +5490,13 @@ def from_dict(obj: Any) -> "PermissionPromptRequestRead":
         assert isinstance(obj, dict)
         intention = from_str(obj.get("intention"))
         path = from_str(obj.get("path"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         return PermissionPromptRequestRead(
             intention=intention,
             path=path,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             managed_approval_required=managed_approval_required,
             tool_call_id=tool_call_id,
         )
@@ -5056,8 +5506,8 @@ def to_dict(self) -> dict:
         result["intention"] = from_str(self.intention)
         result["kind"] = self.kind
         result["path"] = from_str(self.path)
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.managed_approval_required is not None:
             result["managedApprovalRequired"] = from_union([from_none, from_bool], self.managed_approval_required)
         if self.tool_call_id is not None:
@@ -5072,7 +5522,7 @@ class PermissionPromptRequestUrl:
     kind: ClassVar[str] = "url"
     url: str
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     managed_approval_required: bool | None = None
     redirected_from: str | None = None
     request_sandbox_bypass: bool | None = None
@@ -5084,7 +5534,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestUrl":
         assert isinstance(obj, dict)
         intention = from_str(obj.get("intention"))
         url = from_str(obj.get("url"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
         redirected_from = from_union([from_none, from_str], obj.get("redirectedFrom"))
         request_sandbox_bypass = from_union([from_none, from_bool], obj.get("requestSandboxBypass"))
@@ -5093,7 +5543,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestUrl":
         return PermissionPromptRequestUrl(
             intention=intention,
             url=url,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             managed_approval_required=managed_approval_required,
             redirected_from=redirected_from,
             request_sandbox_bypass=request_sandbox_bypass,
@@ -5106,8 +5556,8 @@ def to_dict(self) -> dict:
         result["intention"] = from_str(self.intention)
         result["kind"] = self.kind
         result["url"] = from_str(self.url)
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.managed_approval_required is not None:
             result["managedApprovalRequired"] = from_union([from_none, from_bool], self.managed_approval_required)
         if self.redirected_from is not None:
@@ -5130,7 +5580,7 @@ class PermissionPromptRequestWrite:
     intention: str
     kind: ClassVar[str] = "write"
     # Experimental: this field is part of an experimental API and may change or be removed.
-    auto_approval: PermissionAutoApproval | None = None
+    assisted_approval: PermissionAssistedApproval | None = None
     managed_approval_required: bool | None = None
     new_file_contents: str | None = None
     tool_call_id: str | None = None
@@ -5142,7 +5592,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestWrite":
         diff = from_str(obj.get("diff"))
         file_name = from_str(obj.get("fileName"))
         intention = from_str(obj.get("intention"))
-        auto_approval = from_union([from_none, PermissionAutoApproval.from_dict], obj.get("autoApproval"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
         new_file_contents = from_union([from_none, from_str], obj.get("newFileContents"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
@@ -5151,7 +5601,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestWrite":
             diff=diff,
             file_name=file_name,
             intention=intention,
-            auto_approval=auto_approval,
+            assisted_approval=assisted_approval,
             managed_approval_required=managed_approval_required,
             new_file_contents=new_file_contents,
             tool_call_id=tool_call_id,
@@ -5164,8 +5614,8 @@ def to_dict(self) -> dict:
         result["fileName"] = from_str(self.file_name)
         result["intention"] = from_str(self.intention)
         result["kind"] = self.kind
-        if self.auto_approval is not None:
-            result["autoApproval"] = from_union([from_none, lambda x: to_class(PermissionAutoApproval, x)], self.auto_approval)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.managed_approval_required is not None:
             result["managedApprovalRequired"] = from_union([from_none, from_bool], self.managed_approval_required)
         if self.new_file_contents is not None:
@@ -5184,6 +5634,7 @@ class PermissionRequestCustomTool:
     args: Any = None
     tool_call_id: str | None = None
     managed_approval_required: bool | None = None
+    skip_permission: bool | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "PermissionRequestCustomTool":
@@ -5193,12 +5644,14 @@ def from_dict(obj: Any) -> "PermissionRequestCustomTool":
         args = obj.get("args")
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
+        skip_permission = from_union([from_none, from_bool], obj.get("skipPermission"))
         return PermissionRequestCustomTool(
             tool_description=tool_description,
             tool_name=tool_name,
             args=args,
             tool_call_id=tool_call_id,
             managed_approval_required=managed_approval_required,
+            skip_permission=skip_permission,
         )
 
     def to_dict(self) -> dict:
@@ -5208,6 +5661,43 @@ def to_dict(self) -> dict:
         result["toolName"] = from_str(self.tool_name)
         if self.args is not None:
             result["args"] = self.args
+        if self.tool_call_id is not None:
+            result["toolCallId"] = from_union([from_none, from_str], self.tool_call_id)
+        if self.managed_approval_required is not None:
+            result["managedApprovalRequired"] = from_union([from_none, from_bool], self.managed_approval_required)
+        if self.skip_permission is not None:
+            result["skipPermission"] = from_union([from_none, from_bool], self.skip_permission)
+        return result
+
+
+@dataclass
+class PermissionRequestExtensionEnvAccess:
+    "Extension sensitive environment variable access request"
+    environment_variables: list[str]
+    extension_name: str
+    kind: ClassVar[str] = "extension-env-access"
+    tool_call_id: str | None = None
+    managed_approval_required: bool | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "PermissionRequestExtensionEnvAccess":
+        assert isinstance(obj, dict)
+        environment_variables = from_list(from_str, obj.get("environmentVariables"))
+        extension_name = from_str(obj.get("extensionName"))
+        tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
+        managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
+        return PermissionRequestExtensionEnvAccess(
+            environment_variables=environment_variables,
+            extension_name=extension_name,
+            tool_call_id=tool_call_id,
+            managed_approval_required=managed_approval_required,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environmentVariables"] = from_list(from_str, self.environment_variables)
+        result["extensionName"] = from_str(self.extension_name)
+        result["kind"] = self.kind
         if self.tool_call_id is not None:
             result["toolCallId"] = from_union([from_none, from_str], self.tool_call_id)
         if self.managed_approval_required is not None:
@@ -5427,6 +5917,8 @@ class PermissionRequestMcp:
     tool_name: str
     tool_title: str
     args: Any = None
+    # Experimental: this field is part of an experimental API and may change or be removed.
+    permission_recommendation: PermissionRecommendation | None = None
     tool_call_id: str | None = None
     managed_approval_required: bool | None = None
 
@@ -5438,6 +5930,7 @@ def from_dict(obj: Any) -> "PermissionRequestMcp":
         tool_name = from_str(obj.get("toolName"))
         tool_title = from_str(obj.get("toolTitle"))
         args = obj.get("args")
+        permission_recommendation = from_union([from_none, lambda x: parse_enum(PermissionRecommendation, x)], obj.get("permissionRecommendation"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
         return PermissionRequestMcp(
@@ -5446,6 +5939,7 @@ def from_dict(obj: Any) -> "PermissionRequestMcp":
             tool_name=tool_name,
             tool_title=tool_title,
             args=args,
+            permission_recommendation=permission_recommendation,
             tool_call_id=tool_call_id,
             managed_approval_required=managed_approval_required,
         )
@@ -5459,6 +5953,8 @@ def to_dict(self) -> dict:
         result["toolTitle"] = from_str(self.tool_title)
         if self.args is not None:
             result["args"] = self.args
+        if self.permission_recommendation is not None:
+            result["permissionRecommendation"] = from_union([from_none, lambda x: to_enum(PermissionRecommendation, x)], self.permission_recommendation)
         if self.tool_call_id is not None:
             result["toolCallId"] = from_union([from_none, from_str], self.tool_call_id)
         if self.managed_approval_required is not None:
@@ -5472,9 +5968,13 @@ class PermissionRequestMemory:
     fact: str
     kind: ClassVar[str] = "memory"
     action: PermissionRequestMemoryAction | None = None
+    # Experimental: this field is part of an experimental API and may change or be removed.
+    assisted_approval: PermissionAssistedApproval | None = None
     citations: str | None = None
     direction: PermissionRequestMemoryDirection | None = None
     reason: str | None = None
+    repo_nwo: str | None = None
+    scope: PermissionRequestMemoryScope | None = None
     subject: str | None = None
     tool_call_id: str | None = None
     managed_approval_required: bool | None = None
@@ -5484,18 +5984,24 @@ def from_dict(obj: Any) -> "PermissionRequestMemory":
         assert isinstance(obj, dict)
         fact = from_str(obj.get("fact"))
         action = from_union([from_none, lambda x: parse_enum(PermissionRequestMemoryAction, x)], obj.get("action"))
+        assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
         citations = from_union([from_none, from_str], obj.get("citations"))
         direction = from_union([from_none, lambda x: parse_enum(PermissionRequestMemoryDirection, x)], obj.get("direction"))
         reason = from_union([from_none, from_str], obj.get("reason"))
+        repo_nwo = from_union([from_none, from_str], obj.get("repoNwo"))
+        scope = from_union([from_none, lambda x: parse_enum(PermissionRequestMemoryScope, x)], obj.get("scope"))
         subject = from_union([from_none, from_str], obj.get("subject"))
         tool_call_id = from_union([from_none, from_str], obj.get("toolCallId"))
         managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
         return PermissionRequestMemory(
             fact=fact,
             action=action,
+            assisted_approval=assisted_approval,
             citations=citations,
             direction=direction,
             reason=reason,
+            repo_nwo=repo_nwo,
+            scope=scope,
             subject=subject,
             tool_call_id=tool_call_id,
             managed_approval_required=managed_approval_required,
@@ -5507,12 +6013,18 @@ def to_dict(self) -> dict:
         result["kind"] = self.kind
         if self.action is not None:
             result["action"] = from_union([from_none, lambda x: to_enum(PermissionRequestMemoryAction, x)], self.action)
+        if self.assisted_approval is not None:
+            result["assistedApproval"] = from_union([from_none, lambda x: to_class(PermissionAssistedApproval, x)], self.assisted_approval)
         if self.citations is not None:
             result["citations"] = from_union([from_none, from_str], self.citations)
         if self.direction is not None:
             result["direction"] = from_union([from_none, lambda x: to_enum(PermissionRequestMemoryDirection, x)], self.direction)
         if self.reason is not None:
             result["reason"] = from_union([from_none, from_str], self.reason)
+        if self.repo_nwo is not None:
+            result["repoNwo"] = from_union([from_none, from_str], self.repo_nwo)
+        if self.scope is not None:
+            result["scope"] = from_union([from_none, lambda x: to_enum(PermissionRequestMemoryScope, x)], self.scope)
         if self.subject is not None:
             result["subject"] = from_union([from_none, from_str], self.subject)
         if self.tool_call_id is not None:
@@ -5913,6 +6425,147 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class PromptCacheBreakData:
+    "A detected loss of a previously cached prompt prefix"
+    contributing_reasons: list[str]
+    frontier_tokens: int
+    primary_reason: str
+    retention_ratio: float
+    shortfall_tokens: int
+    survived_tokens: int
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _after_request: Any = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _agent_name: str | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _before_request: Any = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _cache_config_changed_fields: list[str] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _model_from: str | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _model_to: str | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _rewrite_message_index: int | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _rewrite_shape: str | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _rewrite_source: list[str] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _system_segments_changed: list[str] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _tools_added: list[str] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _tools_added_raw: list[str] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _tools_redefined: list[str] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _tools_redefined_raw: list[str] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _tools_removed: list[str] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _tools_removed_raw: list[str] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _tools_reordered: bool | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "PromptCacheBreakData":
+        assert isinstance(obj, dict)
+        contributing_reasons = from_list(from_str, obj.get("contributingReasons"))
+        frontier_tokens = from_int(obj.get("frontierTokens"))
+        primary_reason = from_str(obj.get("primaryReason"))
+        retention_ratio = from_float(obj.get("retentionRatio"))
+        shortfall_tokens = from_int(obj.get("shortfallTokens"))
+        survived_tokens = from_int(obj.get("survivedTokens"))
+        _after_request = obj.get("afterRequest")
+        _agent_name = from_union([from_none, from_str], obj.get("agentName"))
+        _before_request = obj.get("beforeRequest")
+        _cache_config_changed_fields = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("cacheConfigChangedFields"))
+        _model_from = from_union([from_none, from_str], obj.get("modelFrom"))
+        _model_to = from_union([from_none, from_str], obj.get("modelTo"))
+        _rewrite_message_index = from_union([from_none, from_int], obj.get("rewriteMessageIndex"))
+        _rewrite_shape = from_union([from_none, from_str], obj.get("rewriteShape"))
+        _rewrite_source = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("rewriteSource"))
+        _system_segments_changed = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("systemSegmentsChanged"))
+        _tools_added = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("toolsAdded"))
+        _tools_added_raw = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("toolsAddedRaw"))
+        _tools_redefined = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("toolsRedefined"))
+        _tools_redefined_raw = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("toolsRedefinedRaw"))
+        _tools_removed = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("toolsRemoved"))
+        _tools_removed_raw = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("toolsRemovedRaw"))
+        _tools_reordered = from_union([from_none, from_bool], obj.get("toolsReordered"))
+        return PromptCacheBreakData(
+            contributing_reasons=contributing_reasons,
+            frontier_tokens=frontier_tokens,
+            primary_reason=primary_reason,
+            retention_ratio=retention_ratio,
+            shortfall_tokens=shortfall_tokens,
+            survived_tokens=survived_tokens,
+            _after_request=_after_request,
+            _agent_name=_agent_name,
+            _before_request=_before_request,
+            _cache_config_changed_fields=_cache_config_changed_fields,
+            _model_from=_model_from,
+            _model_to=_model_to,
+            _rewrite_message_index=_rewrite_message_index,
+            _rewrite_shape=_rewrite_shape,
+            _rewrite_source=_rewrite_source,
+            _system_segments_changed=_system_segments_changed,
+            _tools_added=_tools_added,
+            _tools_added_raw=_tools_added_raw,
+            _tools_redefined=_tools_redefined,
+            _tools_redefined_raw=_tools_redefined_raw,
+            _tools_removed=_tools_removed,
+            _tools_removed_raw=_tools_removed_raw,
+            _tools_reordered=_tools_reordered,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["contributingReasons"] = from_list(from_str, self.contributing_reasons)
+        result["frontierTokens"] = to_int(self.frontier_tokens)
+        result["primaryReason"] = from_str(self.primary_reason)
+        result["retentionRatio"] = to_float(self.retention_ratio)
+        result["shortfallTokens"] = to_int(self.shortfall_tokens)
+        result["survivedTokens"] = to_int(self.survived_tokens)
+        if self._after_request is not None:
+            result["afterRequest"] = self._after_request
+        if self._agent_name is not None:
+            result["agentName"] = from_union([from_none, from_str], self._agent_name)
+        if self._before_request is not None:
+            result["beforeRequest"] = self._before_request
+        if self._cache_config_changed_fields is not None:
+            result["cacheConfigChangedFields"] = from_union([from_none, lambda x: from_list(from_str, x)], self._cache_config_changed_fields)
+        if self._model_from is not None:
+            result["modelFrom"] = from_union([from_none, from_str], self._model_from)
+        if self._model_to is not None:
+            result["modelTo"] = from_union([from_none, from_str], self._model_to)
+        if self._rewrite_message_index is not None:
+            result["rewriteMessageIndex"] = from_union([from_none, to_int], self._rewrite_message_index)
+        if self._rewrite_shape is not None:
+            result["rewriteShape"] = from_union([from_none, from_str], self._rewrite_shape)
+        if self._rewrite_source is not None:
+            result["rewriteSource"] = from_union([from_none, lambda x: from_list(from_str, x)], self._rewrite_source)
+        if self._system_segments_changed is not None:
+            result["systemSegmentsChanged"] = from_union([from_none, lambda x: from_list(from_str, x)], self._system_segments_changed)
+        if self._tools_added is not None:
+            result["toolsAdded"] = from_union([from_none, lambda x: from_list(from_str, x)], self._tools_added)
+        if self._tools_added_raw is not None:
+            result["toolsAddedRaw"] = from_union([from_none, lambda x: from_list(from_str, x)], self._tools_added_raw)
+        if self._tools_redefined is not None:
+            result["toolsRedefined"] = from_union([from_none, lambda x: from_list(from_str, x)], self._tools_redefined)
+        if self._tools_redefined_raw is not None:
+            result["toolsRedefinedRaw"] = from_union([from_none, lambda x: from_list(from_str, x)], self._tools_redefined_raw)
+        if self._tools_removed is not None:
+            result["toolsRemoved"] = from_union([from_none, lambda x: from_list(from_str, x)], self._tools_removed)
+        if self._tools_removed_raw is not None:
+            result["toolsRemovedRaw"] = from_union([from_none, lambda x: from_list(from_str, x)], self._tools_removed_raw)
+        if self._tools_reordered is not None:
+            result["toolsReordered"] = from_union([from_none, from_bool], self._tools_reordered)
+        return result
+
+
 @dataclass
 class SamplingCompletedData:
     "Sampling request completion notification signaling UI dismissal"
@@ -5959,6 +6612,18 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class SandboxDecisionData:
+    "Payload of `sandbox.decision`, a bounded governance record of what the process sandbox was configured to do and whether it took effect. Discriminated by `kind`."
+    @staticmethod
+    def from_dict(obj: Any) -> "SandboxDecisionData":
+        assert isinstance(obj, dict)
+        return SandboxDecisionData()
+
+    def to_dict(self) -> dict:
+        return {}
+
+
 @dataclass
 class SessionAutopilotObjectiveChangedData:
     "Autopilot objective state file operation details indicating what changed"
@@ -6504,19 +7169,24 @@ def to_dict(self) -> dict:
 class SessionIdleData:
     "Payload indicating the session is idle with no background agents or attached shell commands in flight"
     aborted: bool | None = None
+    mode: SessionMode | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "SessionIdleData":
         assert isinstance(obj, dict)
         aborted = from_union([from_none, from_bool], obj.get("aborted"))
+        mode = from_union([from_none, lambda x: parse_enum(SessionMode, x)], obj.get("mode"))
         return SessionIdleData(
             aborted=aborted,
+            mode=mode,
         )
 
     def to_dict(self) -> dict:
         result: dict = {}
         if self.aborted is not None:
             result["aborted"] = from_union([from_none, from_bool], self.aborted)
+        if self.mode is not None:
+            result["mode"] = from_union([from_none, lambda x: to_enum(SessionMode, x)], self.mode)
         return result
 
 
@@ -6734,6 +7404,7 @@ class SessionModelChangeData:
     previous_verbosity: Verbosity | None = None
     reasoning_effort: str | None = None
     reasoning_summary: ReasoningSummary | None = None
+    source: ModelChangeSource | None = None
     verbosity: Verbosity | None = None
 
     @staticmethod
@@ -6748,6 +7419,7 @@ def from_dict(obj: Any) -> "SessionModelChangeData":
         previous_verbosity = from_union([from_none, lambda x: parse_enum(Verbosity, x)], obj.get("previousVerbosity"))
         reasoning_effort = from_union([from_none, from_str], obj.get("reasoningEffort"))
         reasoning_summary = from_union([from_none, lambda x: parse_enum(ReasoningSummary, x)], obj.get("reasoningSummary"))
+        source = from_union([from_none, lambda x: parse_enum(ModelChangeSource, x)], obj.get("source"))
         verbosity = from_union([from_none, lambda x: parse_enum(Verbosity, x)], obj.get("verbosity"))
         return SessionModelChangeData(
             new_model=new_model,
@@ -6759,6 +7431,7 @@ def from_dict(obj: Any) -> "SessionModelChangeData":
             previous_verbosity=previous_verbosity,
             reasoning_effort=reasoning_effort,
             reasoning_summary=reasoning_summary,
+            source=source,
             verbosity=verbosity,
         )
 
@@ -6781,46 +7454,13 @@ def to_dict(self) -> dict:
             result["reasoningEffort"] = from_union([from_none, from_str], self.reasoning_effort)
         if self.reasoning_summary is not None:
             result["reasoningSummary"] = from_union([from_none, lambda x: to_enum(ReasoningSummary, x)], self.reasoning_summary)
+        if self.source is not None:
+            result["source"] = from_union([from_none, lambda x: to_enum(ModelChangeSource, x)], self.source)
         if self.verbosity is not None:
             result["verbosity"] = from_union([from_none, lambda x: to_enum(Verbosity, x)], self.verbosity)
         return result
 
 
-@dataclass
-class SessionPermissionsChangedData:
-    "Permissions change details carrying the aggregate allow-all transition."
-    allow_all_permissions: bool
-    previous_allow_all_permissions: bool
-    # Experimental: this field is part of an experimental API and may change or be removed.
-    allow_all_permission_mode: PermissionAllowAllMode | None = None
-    # Experimental: this field is part of an experimental API and may change or be removed.
-    previous_allow_all_permission_mode: PermissionAllowAllMode | None = None
-
-    @staticmethod
-    def from_dict(obj: Any) -> "SessionPermissionsChangedData":
-        assert isinstance(obj, dict)
-        allow_all_permissions = from_bool(obj.get("allowAllPermissions"))
-        previous_allow_all_permissions = from_bool(obj.get("previousAllowAllPermissions"))
-        allow_all_permission_mode = from_union([from_none, lambda x: parse_enum(PermissionAllowAllMode, x)], obj.get("allowAllPermissionMode"))
-        previous_allow_all_permission_mode = from_union([from_none, lambda x: parse_enum(PermissionAllowAllMode, x)], obj.get("previousAllowAllPermissionMode"))
-        return SessionPermissionsChangedData(
-            allow_all_permissions=allow_all_permissions,
-            previous_allow_all_permissions=previous_allow_all_permissions,
-            allow_all_permission_mode=allow_all_permission_mode,
-            previous_allow_all_permission_mode=previous_allow_all_permission_mode,
-        )
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["allowAllPermissions"] = from_bool(self.allow_all_permissions)
-        result["previousAllowAllPermissions"] = from_bool(self.previous_allow_all_permissions)
-        if self.allow_all_permission_mode is not None:
-            result["allowAllPermissionMode"] = from_union([from_none, lambda x: to_enum(PermissionAllowAllMode, x)], self.allow_all_permission_mode)
-        if self.previous_allow_all_permission_mode is not None:
-            result["previousAllowAllPermissionMode"] = from_union([from_none, lambda x: to_enum(PermissionAllowAllMode, x)], self.previous_allow_all_permission_mode)
-        return result
-
-
 @dataclass
 class SessionPlanChangedData:
     "Plan file operation details indicating what changed"
@@ -7074,6 +7714,7 @@ class SessionShutdownData:
     session_start_time: int
     shutdown_type: ShutdownType
     total_api_duration: timedelta
+    agent_metrics: dict[str, ShutdownAgentMetric] | None = None
     conversation_tokens: int | None = None
     current_model: str | None = None
     current_tokens: int | None = None
@@ -7095,6 +7736,7 @@ def from_dict(obj: Any) -> "SessionShutdownData":
         session_start_time = from_int(obj.get("sessionStartTime"))
         shutdown_type = parse_enum(ShutdownType, obj.get("shutdownType"))
         total_api_duration = from_timedelta(obj.get("totalApiDurationMs"))
+        agent_metrics = from_union([from_none, lambda x: from_dict(ShutdownAgentMetric.from_dict, x)], obj.get("agentMetrics"))
         conversation_tokens = from_union([from_none, from_int], obj.get("conversationTokens"))
         current_model = from_union([from_none, from_str], obj.get("currentModel"))
         current_tokens = from_union([from_none, from_int], obj.get("currentTokens"))
@@ -7111,6 +7753,7 @@ def from_dict(obj: Any) -> "SessionShutdownData":
             session_start_time=session_start_time,
             shutdown_type=shutdown_type,
             total_api_duration=total_api_duration,
+            agent_metrics=agent_metrics,
             conversation_tokens=conversation_tokens,
             current_model=current_model,
             current_tokens=current_tokens,
@@ -7130,6 +7773,8 @@ def to_dict(self) -> dict:
         result["sessionStartTime"] = to_int(self.session_start_time)
         result["shutdownType"] = to_enum(ShutdownType, self.shutdown_type)
         result["totalApiDurationMs"] = to_timedelta_int(self.total_api_duration)
+        if self.agent_metrics is not None:
+            result["agentMetrics"] = from_union([from_none, lambda x: from_dict(lambda x: to_class(ShutdownAgentMetric, x), x)], self.agent_metrics)
         if self.conversation_tokens is not None:
             result["conversationTokens"] = from_union([from_none, to_int], self.conversation_tokens)
         if self.current_model is not None:
@@ -7429,6 +8074,8 @@ class SessionUsageCheckpointData:
     # Internal: this field is an internal SDK API and is not part of the public surface.
     _model_cache_state: list[_UsageCheckpointModelCacheState] | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
+    _prompt_cache_break_state: list[Any] | None = None
+    # Internal: this field is an internal SDK API and is not part of the public surface.
     _total_premium_requests: float | None = None
 
     @staticmethod
@@ -7436,10 +8083,12 @@ def from_dict(obj: Any) -> "SessionUsageCheckpointData":
         assert isinstance(obj, dict)
         total_nano_aiu = from_float(obj.get("totalNanoAiu"))
         _model_cache_state = from_union([from_none, lambda x: from_list(_UsageCheckpointModelCacheState.from_dict, x)], obj.get("modelCacheState"))
+        _prompt_cache_break_state = from_union([from_none, lambda x: from_list(lambda x: x, x)], obj.get("promptCacheBreakState"))
         _total_premium_requests = from_union([from_none, from_float], obj.get("totalPremiumRequests"))
         return SessionUsageCheckpointData(
             total_nano_aiu=total_nano_aiu,
             _model_cache_state=_model_cache_state,
+            _prompt_cache_break_state=_prompt_cache_break_state,
             _total_premium_requests=_total_premium_requests,
         )
 
@@ -7448,6 +8097,8 @@ def to_dict(self) -> dict:
         result["totalNanoAiu"] = to_float(self.total_nano_aiu)
         if self._model_cache_state is not None:
             result["modelCacheState"] = from_union([from_none, lambda x: from_list(lambda x: to_class(_UsageCheckpointModelCacheState, x), x)], self._model_cache_state)
+        if self._prompt_cache_break_state is not None:
+            result["promptCacheBreakState"] = from_union([from_none, lambda x: from_list(lambda x: x, x)], self._prompt_cache_break_state)
         if self._total_premium_requests is not None:
             result["totalPremiumRequests"] = from_union([from_none, to_float], self._total_premium_requests)
         return result
@@ -7551,6 +8202,43 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class ShutdownAgentMetric:
+    "Usage attributed to one agent instance at session shutdown."
+    model_metrics: dict[str, ShutdownModelMetric]
+    total_api_duration: timedelta
+    total_nano_aiu: float
+    agent_display_name: str | None = None
+    agent_name: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "ShutdownAgentMetric":
+        assert isinstance(obj, dict)
+        model_metrics = from_dict(ShutdownModelMetric.from_dict, obj.get("modelMetrics"))
+        total_api_duration = from_timedelta(obj.get("totalApiDurationMs"))
+        total_nano_aiu = from_float(obj.get("totalNanoAiu"))
+        agent_display_name = from_union([from_none, from_str], obj.get("agentDisplayName"))
+        agent_name = from_union([from_none, from_str], obj.get("agentName"))
+        return ShutdownAgentMetric(
+            model_metrics=model_metrics,
+            total_api_duration=total_api_duration,
+            total_nano_aiu=total_nano_aiu,
+            agent_display_name=agent_display_name,
+            agent_name=agent_name,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["modelMetrics"] = from_dict(lambda x: to_class(ShutdownModelMetric, x), self.model_metrics)
+        result["totalApiDurationMs"] = to_timedelta_int(self.total_api_duration)
+        result["totalNanoAiu"] = to_float(self.total_nano_aiu)
+        if self.agent_display_name is not None:
+            result["agentDisplayName"] = from_union([from_none, from_str], self.agent_display_name)
+        if self.agent_name is not None:
+            result["agentName"] = from_union([from_none, from_str], self.agent_name)
+        return result
+
+
 @dataclass
 class ShutdownCodeChanges:
     "Aggregate code change metrics for the session"
@@ -7784,6 +8472,7 @@ class SkillsLoadedSkill:
     source: SkillSource
     user_invocable: bool
     argument_hint: str | None = None
+    command_name: str | None = None
     path: str | None = None
 
     @staticmethod
@@ -7795,6 +8484,7 @@ def from_dict(obj: Any) -> "SkillsLoadedSkill":
         source = parse_enum(SkillSource, obj.get("source"))
         user_invocable = from_bool(obj.get("userInvocable"))
         argument_hint = from_union([from_none, from_str], obj.get("argumentHint"))
+        command_name = from_union([from_none, from_str], obj.get("commandName"))
         path = from_union([from_none, from_str], obj.get("path"))
         return SkillsLoadedSkill(
             description=description,
@@ -7803,6 +8493,7 @@ def from_dict(obj: Any) -> "SkillsLoadedSkill":
             source=source,
             user_invocable=user_invocable,
             argument_hint=argument_hint,
+            command_name=command_name,
             path=path,
         )
 
@@ -7815,6 +8506,8 @@ def to_dict(self) -> dict:
         result["userInvocable"] = from_bool(self.user_invocable)
         if self.argument_hint is not None:
             result["argumentHint"] = from_union([from_none, from_str], self.argument_hint)
+        if self.command_name is not None:
+            result["commandName"] = from_union([from_none, from_str], self.command_name)
         if self.path is not None:
             result["path"] = from_union([from_none, from_str], self.path)
         return result
@@ -7826,7 +8519,13 @@ class SubagentCompletedData:
     agent_display_name: str
     agent_name: str
     tool_call_id: str
+    cancelled: bool | None = None
+    configured_model_matches_actual: bool | None = None
+    configured_model_preference: str | None = None
     duration: timedelta | None = None
+    explicit_model_matches_preference: bool | None = None
+    explicit_model_override: str | None = None
+    first_dispatched_model: str | None = None
     model: str | None = None
     total_tokens: int | None = None
     total_tool_calls: int | None = None
@@ -7837,7 +8536,13 @@ def from_dict(obj: Any) -> "SubagentCompletedData":
         agent_display_name = from_str(obj.get("agentDisplayName"))
         agent_name = from_str(obj.get("agentName"))
         tool_call_id = from_str(obj.get("toolCallId"))
+        cancelled = from_union([from_none, from_bool], obj.get("cancelled"))
+        configured_model_matches_actual = from_union([from_none, from_bool], obj.get("configuredModelMatchesActual"))
+        configured_model_preference = from_union([from_none, from_str], obj.get("configuredModelPreference"))
         duration = from_union([from_none, from_timedelta], obj.get("durationMs"))
+        explicit_model_matches_preference = from_union([from_none, from_bool], obj.get("explicitModelMatchesPreference"))
+        explicit_model_override = from_union([from_none, from_str], obj.get("explicitModelOverride"))
+        first_dispatched_model = from_union([from_none, from_str], obj.get("firstDispatchedModel"))
         model = from_union([from_none, from_str], obj.get("model"))
         total_tokens = from_union([from_none, from_int], obj.get("totalTokens"))
         total_tool_calls = from_union([from_none, from_int], obj.get("totalToolCalls"))
@@ -7845,7 +8550,13 @@ def from_dict(obj: Any) -> "SubagentCompletedData":
             agent_display_name=agent_display_name,
             agent_name=agent_name,
             tool_call_id=tool_call_id,
+            cancelled=cancelled,
+            configured_model_matches_actual=configured_model_matches_actual,
+            configured_model_preference=configured_model_preference,
             duration=duration,
+            explicit_model_matches_preference=explicit_model_matches_preference,
+            explicit_model_override=explicit_model_override,
+            first_dispatched_model=first_dispatched_model,
             model=model,
             total_tokens=total_tokens,
             total_tool_calls=total_tool_calls,
@@ -7856,8 +8567,20 @@ def to_dict(self) -> dict:
         result["agentDisplayName"] = from_str(self.agent_display_name)
         result["agentName"] = from_str(self.agent_name)
         result["toolCallId"] = from_str(self.tool_call_id)
+        if self.cancelled is not None:
+            result["cancelled"] = from_union([from_none, from_bool], self.cancelled)
+        if self.configured_model_matches_actual is not None:
+            result["configuredModelMatchesActual"] = from_union([from_none, from_bool], self.configured_model_matches_actual)
+        if self.configured_model_preference is not None:
+            result["configuredModelPreference"] = from_union([from_none, from_str], self.configured_model_preference)
         if self.duration is not None:
             result["durationMs"] = from_union([from_none, to_timedelta_int], self.duration)
+        if self.explicit_model_matches_preference is not None:
+            result["explicitModelMatchesPreference"] = from_union([from_none, from_bool], self.explicit_model_matches_preference)
+        if self.explicit_model_override is not None:
+            result["explicitModelOverride"] = from_union([from_none, from_str], self.explicit_model_override)
+        if self.first_dispatched_model is not None:
+            result["firstDispatchedModel"] = from_union([from_none, from_str], self.first_dispatched_model)
         if self.model is not None:
             result["model"] = from_union([from_none, from_str], self.model)
         if self.total_tokens is not None:
@@ -7886,7 +8609,12 @@ class SubagentFailedData:
     agent_name: str
     error: str
     tool_call_id: str
+    configured_model_matches_actual: bool | None = None
+    configured_model_preference: str | None = None
     duration: timedelta | None = None
+    explicit_model_matches_preference: bool | None = None
+    explicit_model_override: str | None = None
+    first_dispatched_model: str | None = None
     model: str | None = None
     total_tokens: int | None = None
     total_tool_calls: int | None = None
@@ -7898,7 +8626,12 @@ def from_dict(obj: Any) -> "SubagentFailedData":
         agent_name = from_str(obj.get("agentName"))
         error = from_str(obj.get("error"))
         tool_call_id = from_str(obj.get("toolCallId"))
+        configured_model_matches_actual = from_union([from_none, from_bool], obj.get("configuredModelMatchesActual"))
+        configured_model_preference = from_union([from_none, from_str], obj.get("configuredModelPreference"))
         duration = from_union([from_none, from_timedelta], obj.get("durationMs"))
+        explicit_model_matches_preference = from_union([from_none, from_bool], obj.get("explicitModelMatchesPreference"))
+        explicit_model_override = from_union([from_none, from_str], obj.get("explicitModelOverride"))
+        first_dispatched_model = from_union([from_none, from_str], obj.get("firstDispatchedModel"))
         model = from_union([from_none, from_str], obj.get("model"))
         total_tokens = from_union([from_none, from_int], obj.get("totalTokens"))
         total_tool_calls = from_union([from_none, from_int], obj.get("totalToolCalls"))
@@ -7907,7 +8640,12 @@ def from_dict(obj: Any) -> "SubagentFailedData":
             agent_name=agent_name,
             error=error,
             tool_call_id=tool_call_id,
+            configured_model_matches_actual=configured_model_matches_actual,
+            configured_model_preference=configured_model_preference,
             duration=duration,
+            explicit_model_matches_preference=explicit_model_matches_preference,
+            explicit_model_override=explicit_model_override,
+            first_dispatched_model=first_dispatched_model,
             model=model,
             total_tokens=total_tokens,
             total_tool_calls=total_tool_calls,
@@ -7919,8 +8657,18 @@ def to_dict(self) -> dict:
         result["agentName"] = from_str(self.agent_name)
         result["error"] = from_str(self.error)
         result["toolCallId"] = from_str(self.tool_call_id)
+        if self.configured_model_matches_actual is not None:
+            result["configuredModelMatchesActual"] = from_union([from_none, from_bool], self.configured_model_matches_actual)
+        if self.configured_model_preference is not None:
+            result["configuredModelPreference"] = from_union([from_none, from_str], self.configured_model_preference)
         if self.duration is not None:
             result["durationMs"] = from_union([from_none, to_timedelta_int], self.duration)
+        if self.explicit_model_matches_preference is not None:
+            result["explicitModelMatchesPreference"] = from_union([from_none, from_bool], self.explicit_model_matches_preference)
+        if self.explicit_model_override is not None:
+            result["explicitModelOverride"] = from_union([from_none, from_str], self.explicit_model_override)
+        if self.first_dispatched_model is not None:
+            result["firstDispatchedModel"] = from_union([from_none, from_str], self.first_dispatched_model)
         if self.model is not None:
             result["model"] = from_union([from_none, from_str], self.model)
         if self.total_tokens is not None:
@@ -7964,6 +8712,7 @@ class SubagentStartedData:
     agent_display_name: str
     agent_name: str
     tool_call_id: str
+    factory_run_id: str | None = None
     model: str | None = None
 
     @staticmethod
@@ -7973,12 +8722,14 @@ def from_dict(obj: Any) -> "SubagentStartedData":
         agent_display_name = from_str(obj.get("agentDisplayName"))
         agent_name = from_str(obj.get("agentName"))
         tool_call_id = from_str(obj.get("toolCallId"))
+        factory_run_id = from_union([from_none, from_str], obj.get("factoryRunId"))
         model = from_union([from_none, from_str], obj.get("model"))
         return SubagentStartedData(
             agent_description=agent_description,
             agent_display_name=agent_display_name,
             agent_name=agent_name,
             tool_call_id=tool_call_id,
+            factory_run_id=factory_run_id,
             model=model,
         )
 
@@ -7988,6 +8739,8 @@ def to_dict(self) -> dict:
         result["agentDisplayName"] = from_str(self.agent_display_name)
         result["agentName"] = from_str(self.agent_name)
         result["toolCallId"] = from_str(self.tool_call_id)
+        if self.factory_run_id is not None:
+            result["factoryRunId"] = from_union([from_none, from_str], self.factory_run_id)
         if self.model is not None:
             result["model"] = from_union([from_none, from_str], self.model)
         return result
@@ -8064,6 +8817,7 @@ class SystemNotificationAgentCompleted:
     status: SystemNotificationAgentCompletedStatus
     type: ClassVar[str] = "agent_completed"
     description: str | None = None
+    display_name: str | None = None
     prompt: str | None = None
 
     @staticmethod
@@ -8073,12 +8827,14 @@ def from_dict(obj: Any) -> "SystemNotificationAgentCompleted":
         agent_type = from_str(obj.get("agentType"))
         status = parse_enum(SystemNotificationAgentCompletedStatus, obj.get("status"))
         description = from_union([from_none, from_str], obj.get("description"))
+        display_name = from_union([from_none, from_str], obj.get("displayName"))
         prompt = from_union([from_none, from_str], obj.get("prompt"))
         return SystemNotificationAgentCompleted(
             agent_id=agent_id,
             agent_type=agent_type,
             status=status,
             description=description,
+            display_name=display_name,
             prompt=prompt,
         )
 
@@ -8090,6 +8846,8 @@ def to_dict(self) -> dict:
         result["type"] = self.type
         if self.description is not None:
             result["description"] = from_union([from_none, from_str], self.description)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_none, from_str], self.display_name)
         if self.prompt is not None:
             result["prompt"] = from_union([from_none, from_str], self.prompt)
         return result
@@ -8102,6 +8860,7 @@ class SystemNotificationAgentIdle:
     agent_type: str
     type: ClassVar[str] = "agent_idle"
     description: str | None = None
+    display_name: str | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "SystemNotificationAgentIdle":
@@ -8109,10 +8868,12 @@ def from_dict(obj: Any) -> "SystemNotificationAgentIdle":
         agent_id = from_str(obj.get("agentId"))
         agent_type = from_str(obj.get("agentType"))
         description = from_union([from_none, from_str], obj.get("description"))
+        display_name = from_union([from_none, from_str], obj.get("displayName"))
         return SystemNotificationAgentIdle(
             agent_id=agent_id,
             agent_type=agent_type,
             description=description,
+            display_name=display_name,
         )
 
     def to_dict(self) -> dict:
@@ -8122,6 +8883,8 @@ def to_dict(self) -> dict:
         result["type"] = self.type
         if self.description is not None:
             result["description"] = from_union([from_none, from_str], self.description)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_none, from_str], self.display_name)
         return result
 
 
@@ -9404,6 +10167,7 @@ class UserMessageData:
     source: str | None = None
     supported_native_document_mime_types: list[str] | None = None
     transformed_content: str | None = None
+    turn_id: str | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "UserMessageData":
@@ -9419,6 +10183,7 @@ def from_dict(obj: Any) -> "UserMessageData":
         source = from_union([from_none, from_str], obj.get("source"))
         supported_native_document_mime_types = from_union([from_none, lambda x: from_list(from_str, x)], obj.get("supportedNativeDocumentMimeTypes"))
         transformed_content = from_union([from_none, from_str], obj.get("transformedContent"))
+        turn_id = from_union([from_none, from_str], obj.get("turnId"))
         return UserMessageData(
             content=content,
             agent_mode=agent_mode,
@@ -9431,6 +10196,7 @@ def from_dict(obj: Any) -> "UserMessageData":
             source=source,
             supported_native_document_mime_types=supported_native_document_mime_types,
             transformed_content=transformed_content,
+            turn_id=turn_id,
         )
 
     def to_dict(self) -> dict:
@@ -9456,6 +10222,8 @@ def to_dict(self) -> dict:
             result["supportedNativeDocumentMimeTypes"] = from_union([from_none, lambda x: from_list(from_str, x)], self.supported_native_document_mime_types)
         if self.transformed_content is not None:
             result["transformedContent"] = from_union([from_none, from_str], self.transformed_content)
+        if self.turn_id is not None:
+            result["turnId"] = from_union([from_none, from_str], self.turn_id)
         return result
 
 
@@ -9501,6 +10269,31 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class UserToolSessionApprovalExtensionEnvAccess:
+    "Session-scoped tool-approval rule for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names."
+    environment_variables: list[str]
+    extension_name: str
+    kind: ClassVar[str] = "extension-env-access"
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UserToolSessionApprovalExtensionEnvAccess":
+        assert isinstance(obj, dict)
+        environment_variables = from_list(from_str, obj.get("environmentVariables"))
+        extension_name = from_str(obj.get("extensionName"))
+        return UserToolSessionApprovalExtensionEnvAccess(
+            environment_variables=environment_variables,
+            extension_name=extension_name,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environmentVariables"] = from_list(from_str, self.environment_variables)
+        result["extensionName"] = from_str(self.extension_name)
+        result["kind"] = self.kind
+        return result
+
+
 @dataclass
 class UserToolSessionApprovalExtensionManagement:
     "Session-scoped tool-approval rule for extension-management operations, optionally narrowed by operation."
@@ -9749,6 +10542,7 @@ def _load_PermissionPromptRequest(obj: Any) -> "PermissionPromptRequest":
         case "extension-management": return PermissionPromptRequestExtensionManagement.from_dict(obj)
         case "factory": return PermissionPromptRequestFactory.from_dict(obj)
         case "extension-permission-access": return PermissionPromptRequestExtensionPermissionAccess.from_dict(obj)
+        case "extension-env-access": return PermissionPromptRequestExtensionEnvAccess.from_dict(obj)
         case _: raise ValueError(f"Unknown PermissionPromptRequest kind: {kind!r}")
 
 
@@ -9767,6 +10561,7 @@ def _load_PermissionRequest(obj: Any) -> "PermissionRequest":
         case "extension-management": return PermissionRequestExtensionManagement.from_dict(obj)
         case "factory": return PermissionRequestFactory.from_dict(obj)
         case "extension-permission-access": return PermissionRequestExtensionPermissionAccess.from_dict(obj)
+        case "extension-env-access": return PermissionRequestExtensionEnvAccess.from_dict(obj)
         case _: raise ValueError(f"Unknown PermissionRequest kind: {kind!r}")
 
 
@@ -9828,6 +10623,7 @@ def _load_UserToolSessionApproval(obj: Any) -> "UserToolSessionApproval":
         case "extension-management": return UserToolSessionApprovalExtensionManagement.from_dict(obj)
         case "factory": return UserToolSessionApprovalFactory.from_dict(obj)
         case "extension-permission-access": return UserToolSessionApprovalExtensionPermissionAccess.from_dict(obj)
+        case "extension-env-access": return UserToolSessionApprovalExtensionEnvAccess.from_dict(obj)
         case _: raise ValueError(f"Unknown UserToolSessionApproval kind: {kind!r}")
 
 
@@ -9844,11 +10640,11 @@ def _load_UserToolSessionApproval(obj: Any) -> "UserToolSessionApproval":
 
 
 # Derived user-facing permission prompt details for UI consumers
-PermissionPromptRequest = PermissionPromptRequestCommands | PermissionPromptRequestWrite | PermissionPromptRequestRead | PermissionPromptRequestMcp | PermissionPromptRequestUrl | PermissionPromptRequestMemory | PermissionPromptRequestCustomTool | PermissionPromptRequestPath | PermissionPromptRequestHook | PermissionPromptRequestExtensionManagement | PermissionPromptRequestFactory | PermissionPromptRequestExtensionPermissionAccess
+PermissionPromptRequest = PermissionPromptRequestCommands | PermissionPromptRequestWrite | PermissionPromptRequestRead | PermissionPromptRequestMcp | PermissionPromptRequestUrl | PermissionPromptRequestMemory | PermissionPromptRequestCustomTool | PermissionPromptRequestPath | PermissionPromptRequestHook | PermissionPromptRequestExtensionManagement | PermissionPromptRequestFactory | PermissionPromptRequestExtensionPermissionAccess | PermissionPromptRequestExtensionEnvAccess
 
 
 # Details of the permission being requested
-PermissionRequest = PermissionRequestShell | PermissionRequestWrite | PermissionRequestRead | PermissionRequestMcp | PermissionRequestUrl | PermissionRequestMemory | PermissionRequestCustomTool | PermissionRequestHook | PermissionRequestExtensionManagement | PermissionRequestFactory | PermissionRequestExtensionPermissionAccess
+PermissionRequest = PermissionRequestShell | PermissionRequestWrite | PermissionRequestRead | PermissionRequestMcp | PermissionRequestUrl | PermissionRequestMemory | PermissionRequestCustomTool | PermissionRequestHook | PermissionRequestExtensionManagement | PermissionRequestFactory | PermissionRequestExtensionPermissionAccess | PermissionRequestExtensionEnvAccess
 
 
 # Location within a cited source (character, page, or content-block range) that supports a span.
@@ -9860,7 +10656,7 @@ def _load_UserToolSessionApproval(obj: Any) -> "UserToolSessionApproval":
 
 
 # The approval to add as a session-scoped rule
-UserToolSessionApproval = UserToolSessionApprovalCommands | UserToolSessionApprovalRead | UserToolSessionApprovalWrite | UserToolSessionApprovalMcp | UserToolSessionApprovalMemory | UserToolSessionApprovalCustomTool | UserToolSessionApprovalExtensionManagement | UserToolSessionApprovalFactory | UserToolSessionApprovalExtensionPermissionAccess
+UserToolSessionApproval = UserToolSessionApprovalCommands | UserToolSessionApprovalRead | UserToolSessionApprovalWrite | UserToolSessionApprovalMcp | UserToolSessionApprovalMemory | UserToolSessionApprovalCustomTool | UserToolSessionApprovalExtensionManagement | UserToolSessionApprovalFactory | UserToolSessionApprovalExtensionPermissionAccess | UserToolSessionApprovalExtensionEnvAccess
 
 
 # The embedded resource contents, either text or base64-encoded binary
@@ -9872,8 +10668,8 @@ def _load_UserToolSessionApproval(obj: Any) -> "UserToolSessionApproval":
 
 
 # Experimental: this enum is part of an experimental API and may change or be removed.
-class AutoApprovalJudgeFailureReason(Enum):
-    "Why the auto-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs."
+class AssistedApprovalJudgeFailureReason(Enum):
+    "Why the assisted-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs."
     # The judge model call exceeded its deadline.
     TIMEOUT = "timeout"
     # The judge model call was cancelled before it returned.
@@ -9887,13 +10683,13 @@ class AutoApprovalJudgeFailureReason(Enum):
 
 
 # Experimental: this enum is part of an experimental API and may change or be removed.
-class AutoApprovalRecommendation(Enum):
-    "Outcome of the auto-approval safety judge for a permission request. Present only when auto mode is enabled; its absence means the judge did not evaluate the request (auto mode was off)."
+class AssistedApprovalRecommendation(Enum):
+    "Outcome of the assisted-approval safety judge for a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request."
     # The judge evaluated the request and recommends automatically approving it.
     APPROVE = "approve"
-    # The judge evaluated the request and does not recommend auto-approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision.
+    # The judge evaluated the request and does not recommend automatically approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision.
     REQUIRE_APPROVAL = "requireApproval"
-    # Auto mode is enabled, but this request category is never auto-approvable (for example, sandbox-bypass requests), so the judge was not consulted.
+    # Assisted mode is enabled, but this request category is never automatically approvable (for example, sandbox-bypass requests), so the judge was not consulted.
     EXCLUDED = "excluded"
     # The judge was consulted but did not return a usable recommendation, so the request requires explicit approval.
     ERROR = "error"
@@ -9911,14 +10707,36 @@ class CitationProvider(Enum):
 
 
 # Experimental: this enum is part of an experimental API and may change or be removed.
-class PermissionAllowAllMode(Enum):
-    "Allow-all mode for the session."
+class PermissionMode(Enum):
+    "Permission mode for the session."
     # Permission requests follow the normal approval flow.
-    OFF = "off"
+    MANUAL = "manual"
+    # Permission requests include an LLM safety recommendation; clients may automatically approve requests judged acceptable.
+    ASSISTED = "assisted"
     # Tool, path, and URL permission requests are automatically approved.
-    ON = "on"
-    # Permission requests follow the normal approval flow with an LLM advisory recommendation attached; clients may choose to auto-approve requests the judge evaluated as acceptable.
-    AUTO = "auto"
+    ALLOW_ALL = "allow-all"
+
+
+# Experimental: this enum is part of an experimental API and may change or be removed.
+class PermissionRecommendation(Enum):
+    "Advisory recommendation the runtime attaches to a permission request whose origin it can vouch for by construction. Unlike the auto-approval judge this does not depend on auto mode and does not evaluate what the tool call does; its absence simply means the runtime has no opinion and the request follows the host's normal approval flow."
+    # The runtime vouches for the request's origin and recommends approving it without prompting. The host still owns the decision and may deny it; deny rules, managed policy, and the auto-approval safety judge all outrank this recommendation.
+    APPROVE = "approve"
+
+
+# Experimental: this enum is part of an experimental API and may change or be removed.
+class UIEphemeralQueryPhase(Enum):
+    "Lifecycle phase for a Rust-owned ephemeral query stream."
+    # The ephemeral query stream has begun.
+    STARTED = "started"
+    # A partial result chunk was produced by the stream.
+    CHUNK = "chunk"
+    # The ephemeral query stream finished successfully.
+    COMPLETED = "completed"
+    # The ephemeral query stream ended with an error.
+    FAILED = "failed"
+    # The ephemeral query stream was cancelled before completing.
+    ABORTED = "aborted"
 
 
 class AbortReason(Enum):
@@ -9933,6 +10751,26 @@ class AbortReason(Enum):
     AUTOPILOT_CREDIT_LIMIT = "autopilot_credit_limit"
 
 
+class AgentInterruptedActivity(Enum):
+    "What the agent was doing when the user interrupted it."
+    # A request to the model was open.
+    MODEL_CALL = "model_call"
+    # The turn was sleeping between retry attempts.
+    RETRY_BACKOFF = "retry_backoff"
+    # One or more tools were executing.
+    TOOL_CALL = "tool_call"
+    # Background sub-agents were running while the main loop was idle.
+    BACKGROUND_AGENT = "background_agent"
+
+
+class AgentInterruptedCancelPhase(Enum):
+    "Where the interruption landed relative to the first streamed token."
+    # No output had been produced when the request was cancelled.
+    PRE_FIRST_TOKEN = "pre_first_token"
+    # The response was already streaming when the request was cancelled.
+    MID_STREAM = "mid_stream"
+
+
 class AssistantMessageToolRequestType(Enum):
     "Tool call type: \"function\" for standard tool calls, \"custom\" for grammar-based tool calls. Defaults to \"function\" when absent."
     # Standard function-style tool call.
@@ -9953,6 +10791,14 @@ class AssistantUsageApiEndpoint(Enum):
     WS_RESPONSES = "ws:/responses"
 
 
+class AssistantUsageTransport(Enum):
+    "Transport used for a successful model call"
+    # HTTP transport, including SSE streams.
+    HTTP = "http"
+    # WebSocket transport.
+    WEBSOCKET = "websocket"
+
+
 class AttachmentGitHubReferenceType(Enum):
     "Type of GitHub reference"
     # GitHub issue reference.
@@ -10105,6 +10951,18 @@ class FactoryPermissionOperation(Enum):
     AUTHOR = "author"
 
 
+class FactoryRunSettledStatus(Enum):
+    "Terminal status a factory run committed. A settled run is never `pending` or `running`, so those two members of the run-status domain are deliberately absent."
+    # The factory body resolved and its result was committed.
+    COMPLETED = "completed"
+    # The run was stopped by a limit, an approval refusal or another policy decision.
+    HALTED = "halted"
+    # The run was cancelled by its caller or by session disposal.
+    CANCELLED = "cancelled"
+    # The run failed, with `failureType` carrying the class when it has one.
+    ERROR = "error"
+
+
 class HandoffSourceType(Enum):
     "Origin type of the session being handed off"
     # The handoff originated from a remote session.
@@ -10121,25 +10979,31 @@ class ManagedSettingsEnforcedAction(Enum):
 
 class ManagedSettingsEnforcedEscalation(Enum):
     "For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused"
-    # Full allow-all ("/allow-all on") permissions — auto-approving tools, paths, and URLs.
+    # Full allow-all permissions — automatically approving tools, paths, and URLs.
     ALLOW_ALL = "allow_all"
-    # Auto-approval of all tool permission requests.
+    # Automatic approval of all tool permission requests.
     APPROVE_ALL = "approve_all"
-    # Advisory auto-approval ("/allow-all auto") mode — keeps normal prompt paths and adds LLM-advised approval, distinct from full allow-all.
-    AUTO_APPROVAL = "auto_approval"
+    # Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all.
+    ASSISTED_APPROVAL = "assisted_approval"
     # Unrestricted filesystem access outside the session's allowed directories.
     UNRESTRICTED_PATHS = "unrestricted_paths"
     # Unrestricted URL fetch access.
     UNRESTRICTED_URLS = "unrestricted_urls"
+    # A server-wide MCP "Always Allow" (or `--allow-tool <server>`) blanket that would auto-approve every tool from an MCP server. Capped to per-tool approval; each tool still prompts.
+    SERVER_WIDE_MCP_APPROVAL = "server_wide_mcp_approval"
 
 
 class ManagedSettingsResolvedSource(Enum):
-    "Which channel supplied the effective enterprise managed settings (highest-authority present layer wins wholesale)"
-    # Account/org policy self-fetched from the GitHub managed-settings endpoint (higher authority).
+    "Summary of which managed-settings channels contributed to the effective session policy. Use the per-channel booleans for exact provenance."
+    # Only the server/account channel contributed.
     SERVER = "server"
-    # Device-level MDM policy discovered from plist/registry/file (lower authority).
+    # Only the device MDM/plist/registry/file channel contributed.
     DEVICE = "device"
-    # No managed policy is in force (no layer contributed).
+    # Only session-local SDK-host injection contributed.
+    CLIENT = "client"
+    # More than one channel contributed. Ordinary keys resolve device over server per key, while permissions compose restrictively across all present layers.
+    MIXED = "mixed"
+    # No managed policy is in force (no channel contributed).
     NONE = "none"
 
 
@@ -10259,6 +11123,44 @@ class ModelCallFailureTransport(Enum):
     WEBSOCKET = "websocket"
 
 
+class ModelCallFinishedOutcome(Enum):
+    "Final outcome of one logical model dispatch after response acceptance processing"
+    # The provider response was accepted for continued agent processing.
+    SUCCESS = "success"
+    # The dispatch ended with a provider or transport error.
+    ERROR = "error"
+    # The dispatch was cancelled before an accepted response was produced.
+    CANCELLED = "cancelled"
+    # The provider response was rejected during post-response acceptance processing.
+    REJECTED = "rejected"
+
+
+class ModelChangeSource(Enum):
+    "Origin of an effective session model change."
+    # The user selected a model directly with `/model <id>`.
+    MODEL_COMMAND = "model_command"
+    # The user selected the model with `/settings`.
+    SETTINGS_COMMAND = "settings_command"
+    # The user selected the model with the `/config` alias.
+    CONFIG_COMMAND = "config_command"
+    # The user selected the model in the model picker, including the picker opened by bare `/model`.
+    MODEL_PICKER = "model_picker"
+    # Organization-managed settings selected the model.
+    MANAGED_SETTINGS = "managed_settings"
+    # Repository settings selected the model.
+    REPO_SETTINGS = "repo_settings"
+    # Startup model resolution selected the model.
+    STARTUP = "startup"
+    # Selecting an agent selected its configured model.
+    AGENT = "agent"
+    # Entering, leaving, or reconfiguring plan mode selected the model.
+    PLAN_MODE = "plan_mode"
+    # The runtime selected the model automatically, such as rate-limit recovery or refusal fallback.
+    AUTOMATIC = "automatic"
+    # An SDK or RPC caller selected the model.
+    SDK = "sdk"
+
+
 class OmittedBinaryOmittedReason(Enum):
     "Why the binary data is absent: it exceeded the inline size limit, or its asset was unavailable"
     # Bytes exceeded the session's inline size limit.
@@ -10301,6 +11203,14 @@ class PermissionRequestMemoryDirection(Enum):
     DOWNVOTE = "downvote"
 
 
+class PermissionRequestMemoryScope(Enum):
+    "Scope of a stored memory."
+    # Store the memory for the current repository.
+    REPOSITORY = "repository"
+    # Store the memory for the current user.
+    USER = "user"
+
+
 class PersistedBinaryImageType(Enum):
     "Binary result type discriminator. Use \"image\" for images and \"resource\" for other binary data."
     # Binary image data.
@@ -10505,7 +11415,7 @@ class WorkspaceFileChangedOperation(Enum):
     UPDATE = "update"
 
 
-SessionEventData = SessionStartData | SessionResumeData | SessionRemoteSteerableChangedData | SessionErrorData | SessionIdleData | SessionTitleChangedData | SessionScheduleCreatedData | SessionScheduleCancelledData | SessionScheduleRearmedData | SessionAutopilotObjectiveChangedData | SessionInfoData | SessionWarningData | SessionModelChangeData | SessionModeChangedData | SessionSessionLimitsChangedData | SessionPermissionsChangedData | SessionPlanChangedData | SessionTodosChangedData | SessionWorkspaceFileChangedData | SessionHandoffData | SessionTruncationData | SessionSnapshotRewindData | SessionShutdownData | SessionUsageCheckpointData | SessionContextChangedData | SessionUsageInfoData | SessionContextClearedData | SessionCompactionStartData | SessionCompactionCompleteData | SessionTaskCompleteData | UserMessageData | PendingMessagesModifiedData | AssistantTurnStartData | AssistantTurnRetryData | AssistantIntentData | AssistantServerToolProgressData | AssistantReasoningData | AssistantReasoningDeltaData | AssistantToolCallDeltaData | AssistantStreamingDeltaData | AssistantMessageData | AssistantMessageStartData | AssistantMessageDeltaData | AssistantTurnEndData | AssistantIdleData | AssistantUsageData | ModelCallFailureData | ModelCallStartData | AbortData | ToolUserRequestedData | ToolExecutionStartData | ToolExecutionPartialResultData | ToolExecutionProgressData | ToolExecutionCompleteData | ToolSearchActivatedData | SkillInvokedData | SubagentStartedData | SubagentCompletedData | SubagentFailedData | SubagentSelectedData | SubagentDeselectedData | HookStartData | HookEndData | HookProgressData | SessionBinaryAssetData | SystemMessageData | SystemNotificationData | PermissionRequestedData | PermissionCompletedData | UserInputRequestedData | UserInputCompletedData | ElicitationRequestedData | ElicitationCompletedData | SamplingRequestedData | SamplingCompletedData | McpOauthRequiredData | McpOauthCompletedData | McpHeadersRefreshRequiredData | McpHeadersRefreshCompletedData | SessionCustomNotificationData | ExternalToolRequestedData | ExternalToolCompletedData | CommandQueuedData | CommandExecuteData | CommandCompletedData | AutoModeSwitchRequestedData | AutoModeSwitchCompletedData | SessionLimitsExhaustedRequestedData | SessionLimitsExhaustedCompletedData | SessionAutoModeResolvedData | SessionManagedSettingsResolvedData | SessionManagedSettingsEnforcedData | CommandsChangedData | CapabilitiesChangedData | ExitPlanModeRequestedData | ExitPlanModeCompletedData | SessionToolsUpdatedData | SessionBackgroundTasksChangedData | FactoryRunUpdatedData | SessionSkillsLoadedData | SessionCustomAgentsUpdatedData | SessionMcpServersLoadedData | SessionMcpServerStatusChangedData | McpToolsListChangedData | McpResourcesListChangedData | McpPromptsListChangedData | SessionExtensionsLoadedData | SessionCanvasOpenedData | SessionCanvasRegistryChangedData | SessionCanvasClosedData | SessionCanvasUnavailableData | SessionCanvasRecordedData | SessionCanvasRemovedData | SessionExtensionsAttachmentsPushedData | McpAppToolCallCompleteData | RawSessionEventData | Data
+SessionEventData = SessionStartData | SessionResumeData | SessionRemoteSteerableChangedData | SessionErrorData | SessionIdleData | SessionTitleChangedData | SessionScheduleCreatedData | SessionScheduleCancelledData | SessionScheduleRearmedData | SessionAutopilotObjectiveChangedData | SessionInfoData | SessionWarningData | SessionModelChangeData | SessionModeChangedData | SessionSessionLimitsChangedData | SessionPermissionsChangedData | SessionPlanChangedData | SessionTodosChangedData | SessionWorkspaceFileChangedData | SessionHandoffData | SessionTruncationData | SessionSnapshotRewindData | SessionShutdownData | SessionUsageCheckpointData | SessionContextChangedData | SessionUsageInfoData | SessionContextClearedData | SessionCompactionStartData | SessionCompactionCompleteData | SessionTaskCompleteData | UserMessageData | PendingMessagesModifiedData | AssistantTurnStartData | AssistantTurnRetryData | AgentInterruptedData | AssistantIntentData | AssistantServerToolProgressData | AssistantReasoningData | AssistantReasoningDeltaData | AssistantToolCallDeltaData | AssistantStreamingDeltaData | AssistantMessageData | AssistantMessageStartData | AssistantMessageDeltaData | AssistantTurnEndData | AssistantIdleData | AssistantUsageData | PromptCacheBreakData | ModelCallFailureData | ModelCallFinishedData | ModelCallStartData | AbortData | ToolUserRequestedData | ToolExecutionStartData | ToolExecutionPartialResultData | ToolExecutionProgressData | ToolExecutionCompleteData | ToolSearchActivatedData | SkillInvokedData | SandboxDecisionData | SubagentStartedData | SubagentCompletedData | SubagentFailedData | SubagentSelectedData | SubagentDeselectedData | HookStartData | HookEndData | HookProgressData | SessionBinaryAssetData | SystemMessageData | SystemNotificationData | PermissionRequestedData | PermissionCompletedData | UserInputRequestedData | UserInputCompletedData | ElicitationRequestedData | ElicitationCompletedData | SamplingRequestedData | SamplingCompletedData | McpOauthRequiredData | McpOauthCompletedData | McpHeadersRefreshRequiredData | McpHeadersRefreshCompletedData | SessionCustomNotificationData | UiEphemeralQueryData | ExternalToolRequestedData | ExternalToolCompletedData | CommandQueuedData | CommandExecuteData | CommandCompletedData | AutoModeSwitchRequestedData | AutoModeSwitchCompletedData | SessionLimitsExhaustedRequestedData | SessionLimitsExhaustedCompletedData | SessionAutoModeResolvedData | SessionManagedSettingsResolvedData | SessionManagedSettingsEnforcedData | CommandsChangedData | CapabilitiesChangedData | ExitPlanModeRequestedData | ExitPlanModeCompletedData | SessionToolsUpdatedData | SessionBackgroundTasksChangedData | FactoryRunUpdatedData | FactoryRunStartedData | FactoryRunSettledData | SessionSkillsLoadedData | SessionCustomAgentsUpdatedData | SessionMcpServersLoadedData | SessionMcpServerStatusChangedData | McpToolsListChangedData | McpResourcesListChangedData | McpPromptsListChangedData | SessionExtensionsLoadedData | SessionCanvasOpenedData | SessionCanvasRegistryChangedData | SessionCanvasClosedData | SessionCanvasUnavailableData | SessionCanvasRecordedData | SessionCanvasRemovedData | SessionExtensionsAttachmentsPushedData | McpAppToolCallCompleteData | RawSessionEventData | Data
 
 
 @dataclass
@@ -10565,6 +11475,7 @@ def from_dict(obj: Any) -> "SessionEvent":
             case SessionEventType.PENDING_MESSAGES_MODIFIED: data = PendingMessagesModifiedData.from_dict(data_obj)
             case SessionEventType.ASSISTANT_TURN_START: data = AssistantTurnStartData.from_dict(data_obj)
             case SessionEventType.ASSISTANT_TURN_RETRY: data = AssistantTurnRetryData.from_dict(data_obj)
+            case SessionEventType.AGENT_INTERRUPTED: data = AgentInterruptedData.from_dict(data_obj)
             case SessionEventType.ASSISTANT_INTENT: data = AssistantIntentData.from_dict(data_obj)
             case SessionEventType.ASSISTANT_SERVER_TOOL_PROGRESS: data = AssistantServerToolProgressData.from_dict(data_obj)
             case SessionEventType.ASSISTANT_REASONING: data = AssistantReasoningData.from_dict(data_obj)
@@ -10577,7 +11488,9 @@ def from_dict(obj: Any) -> "SessionEvent":
             case SessionEventType.ASSISTANT_TURN_END: data = AssistantTurnEndData.from_dict(data_obj)
             case SessionEventType.ASSISTANT_IDLE: data = AssistantIdleData.from_dict(data_obj)
             case SessionEventType.ASSISTANT_USAGE: data = AssistantUsageData.from_dict(data_obj)
+            case SessionEventType.PROMPT_CACHE_BREAK: data = PromptCacheBreakData.from_dict(data_obj)
             case SessionEventType.MODEL_CALL_FAILURE: data = ModelCallFailureData.from_dict(data_obj)
+            case SessionEventType.MODEL_CALL_FINISHED: data = ModelCallFinishedData.from_dict(data_obj)
             case SessionEventType.MODEL_CALL_START: data = ModelCallStartData.from_dict(data_obj)
             case SessionEventType.ABORT: data = AbortData.from_dict(data_obj)
             case SessionEventType.TOOL_USER_REQUESTED: data = ToolUserRequestedData.from_dict(data_obj)
@@ -10587,6 +11500,7 @@ def from_dict(obj: Any) -> "SessionEvent":
             case SessionEventType.TOOL_EXECUTION_COMPLETE: data = ToolExecutionCompleteData.from_dict(data_obj)
             case SessionEventType.TOOL_SEARCH_ACTIVATED: data = ToolSearchActivatedData.from_dict(data_obj)
             case SessionEventType.SKILL_INVOKED: data = SkillInvokedData.from_dict(data_obj)
+            case SessionEventType.SANDBOX_DECISION: data = SandboxDecisionData.from_dict(data_obj)
             case SessionEventType.SUBAGENT_STARTED: data = SubagentStartedData.from_dict(data_obj)
             case SessionEventType.SUBAGENT_COMPLETED: data = SubagentCompletedData.from_dict(data_obj)
             case SessionEventType.SUBAGENT_FAILED: data = SubagentFailedData.from_dict(data_obj)
@@ -10611,6 +11525,7 @@ def from_dict(obj: Any) -> "SessionEvent":
             case SessionEventType.MCP_HEADERS_REFRESH_REQUIRED: data = McpHeadersRefreshRequiredData.from_dict(data_obj)
             case SessionEventType.MCP_HEADERS_REFRESH_COMPLETED: data = McpHeadersRefreshCompletedData.from_dict(data_obj)
             case SessionEventType.SESSION_CUSTOM_NOTIFICATION: data = SessionCustomNotificationData.from_dict(data_obj)
+            case SessionEventType.UI_EPHEMERAL_QUERY: data = UiEphemeralQueryData.from_dict(data_obj)
             case SessionEventType.EXTERNAL_TOOL_REQUESTED: data = ExternalToolRequestedData.from_dict(data_obj)
             case SessionEventType.EXTERNAL_TOOL_COMPLETED: data = ExternalToolCompletedData.from_dict(data_obj)
             case SessionEventType.COMMAND_QUEUED: data = CommandQueuedData.from_dict(data_obj)
@@ -10630,6 +11545,8 @@ def from_dict(obj: Any) -> "SessionEvent":
             case SessionEventType.SESSION_TOOLS_UPDATED: data = SessionToolsUpdatedData.from_dict(data_obj)
             case SessionEventType.SESSION_BACKGROUND_TASKS_CHANGED: data = SessionBackgroundTasksChangedData.from_dict(data_obj)
             case SessionEventType.FACTORY_RUN_UPDATED: data = FactoryRunUpdatedData.from_dict(data_obj)
+            case SessionEventType.FACTORY_RUN_STARTED: data = FactoryRunStartedData.from_dict(data_obj)
+            case SessionEventType.FACTORY_RUN_SETTLED: data = FactoryRunSettledData.from_dict(data_obj)
             case SessionEventType.SESSION_SKILLS_LOADED: data = SessionSkillsLoadedData.from_dict(data_obj)
             case SessionEventType.SESSION_CUSTOM_AGENTS_UPDATED: data = SessionCustomAgentsUpdatedData.from_dict(data_obj)
             case SessionEventType.SESSION_MCP_SERVERS_LOADED: data = SessionMcpServersLoadedData.from_dict(data_obj)
@@ -10682,10 +11599,14 @@ def session_event_to_dict(x: SessionEvent) -> Any:
 __all__ = [
     "AbortData",
     "AbortReason",
+    "AgentInterruptedActivity",
+    "AgentInterruptedCancelPhase",
+    "AgentInterruptedData",
     "AssistantIdleData",
     "AssistantIntentData",
     "AssistantMessageData",
     "AssistantMessageDeltaData",
+    "AssistantMessageReasoningBlocks",
     "AssistantMessageServerTools",
     "AssistantMessageStartData",
     "AssistantMessageToolRequest",
@@ -10702,6 +11623,9 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "AssistantUsageCopilotUsage",
     "AssistantUsageCopilotUsageTokenDetail",
     "AssistantUsageData",
+    "AssistantUsageTransport",
+    "AssistedApprovalJudgeFailureReason",
+    "AssistedApprovalRecommendation",
     "Attachment",
     "AttachmentBlob",
     "AttachmentDirectory",
@@ -10725,8 +11649,6 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "AttachmentSelectionDetails",
     "AttachmentSelectionDetailsEnd",
     "AttachmentSelectionDetailsStart",
-    "AutoApprovalJudgeFailureReason",
-    "AutoApprovalRecommendation",
     "AutoModeResolvedReasoningBucket",
     "AutoModeSwitchCompletedData",
     "AutoModeSwitchRequestedData",
@@ -10778,6 +11700,9 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "ExternalToolRequestedData",
     "FactoryPermissionOperation",
     "FactoryPermissionPhase",
+    "FactoryRunSettledData",
+    "FactoryRunSettledStatus",
+    "FactoryRunStartedData",
     "FactoryRunUpdatedData",
     "GitHubMcpToolConfig",
     "GitHubRepoRef",
@@ -10819,16 +11744,18 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "ModelCallFailureRequestFingerprint",
     "ModelCallFailureSource",
     "ModelCallFailureTransport",
+    "ModelCallFinishedData",
+    "ModelCallFinishedOutcome",
     "ModelCallStartData",
+    "ModelChangeSource",
     "OmittedBinaryOmittedReason",
     "OmittedBinaryResult",
     "OmittedBinaryType",
     "PendingMessagesModifiedData",
-    "PermissionAllowAllMode",
     "PermissionApproved",
     "PermissionApprovedForLocation",
     "PermissionApprovedForSession",
-    "PermissionAutoApproval",
+    "PermissionAssistedApproval",
     "PermissionCancelled",
     "PermissionCompletedData",
     "PermissionDeniedByContentExclusionPolicy",
@@ -10836,9 +11763,11 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "PermissionDeniedByRules",
     "PermissionDeniedInteractivelyByUser",
     "PermissionDeniedNoApprovalRuleAndCouldNotRequestFromUser",
+    "PermissionMode",
     "PermissionPromptRequest",
     "PermissionPromptRequestCommands",
     "PermissionPromptRequestCustomTool",
+    "PermissionPromptRequestExtensionEnvAccess",
     "PermissionPromptRequestExtensionManagement",
     "PermissionPromptRequestExtensionPermissionAccess",
     "PermissionPromptRequestFactory",
@@ -10850,8 +11779,10 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "PermissionPromptRequestRead",
     "PermissionPromptRequestUrl",
     "PermissionPromptRequestWrite",
+    "PermissionRecommendation",
     "PermissionRequest",
     "PermissionRequestCustomTool",
+    "PermissionRequestExtensionEnvAccess",
     "PermissionRequestExtensionManagement",
     "PermissionRequestExtensionPermissionAccess",
     "PermissionRequestFactory",
@@ -10860,6 +11791,7 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "PermissionRequestMemory",
     "PermissionRequestMemoryAction",
     "PermissionRequestMemoryDirection",
+    "PermissionRequestMemoryScope",
     "PermissionRequestRead",
     "PermissionRequestShell",
     "PermissionRequestShellCommand",
@@ -10874,10 +11806,12 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "PersistedBinaryImageType",
     "PersistedBinaryResult",
     "PlanChangedOperation",
+    "PromptCacheBreakData",
     "RawSessionEventData",
     "ReasoningSummary",
     "SamplingCompletedData",
     "SamplingRequestedData",
+    "SandboxDecisionData",
     "ScheduleOrigin",
     "SessionAutoModeResolvedData",
     "SessionAutopilotObjectiveChangedData",
@@ -10937,6 +11871,7 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "SessionUsageInfoData",
     "SessionWarningData",
     "SessionWorkspaceFileChangedData",
+    "ShutdownAgentMetric",
     "ShutdownCodeChanges",
     "ShutdownModelMetric",
     "ShutdownModelMetricRequests",
@@ -11006,6 +11941,8 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "ToolExecutionStartToolDescriptionMetaUIVisibility",
     "ToolSearchActivatedData",
     "ToolUserRequestedData",
+    "UIEphemeralQueryPhase",
+    "UiEphemeralQueryData",
     "UserInputCompletedData",
     "UserInputRequestedData",
     "UserMessageAgentMode",
@@ -11014,6 +11951,7 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "UserToolSessionApproval",
     "UserToolSessionApprovalCommands",
     "UserToolSessionApprovalCustomTool",
+    "UserToolSessionApprovalExtensionEnvAccess",
     "UserToolSessionApprovalExtensionManagement",
     "UserToolSessionApprovalExtensionPermissionAccess",
     "UserToolSessionApprovalFactory",
diff --git a/python/copilot/rpc.py b/python/copilot/rpc.py
index 73c3d976d3..5585d8ce7a 100644
--- a/python/copilot/rpc.py
+++ b/python/copilot/rpc.py
@@ -7,7 +7,12 @@
 """
 
 from .generated.rpc import *  # noqa: F401, F403
+from .generated.rpc import (
+    BuiltinToolInputSchemaType as UIElicitationSchemaType,  # noqa: F401
+)
 from .generated.rpc import (
     SessionFsReaddirWithTypesEntryType as SessionFSReaddirWithTypesEntryType,  # noqa: F401
 )
-from .generated.rpc import __all__  # noqa: F401
+from .generated.rpc import __all__ as _generated_all
+
+__all__ = [*_generated_all, "UIElicitationSchemaType"]
diff --git a/python/copilot/session.py b/python/copilot/session.py
index 92c24bdd84..78afdde139 100644
--- a/python/copilot/session.py
+++ b/python/copilot/session.py
@@ -27,23 +27,22 @@
 from ._telemetry import get_trace_context, trace_context
 from .canvas import CanvasError, CanvasHandler, OpenCanvasInstance
 from .generated.rpc import (
-    CanvasHandler as RpcCanvasHandler,
-)
-from .generated.rpc import (
+    BuiltinToolInputSchemaType,
     CanvasProviderCloseRequest,
     CanvasProviderInvokeActionRequest,
     CanvasProviderOpenRequest,
     CanvasProviderOpenResult,
     ClientSessionApiHandlers,
     CommandsHandlePendingCommandRequest,
+    GitHubTokenAcquireResultKind,
     HandlePendingToolCallRequest,
     LogRequest,
     MCPOauthHandlePendingRequest,
     MCPOauthPendingRequestResponse,
-    MCPOauthPendingRequestResponseKind,
     ModelSwitchToRequest,
     PermissionDecision,
     PermissionDecisionApproveOnce,
+    PermissionDecisionContext,
     PermissionDecisionRequest,
     PermissionDecisionUserNotAvailable,
     ProviderTokenAcquireRequest,
@@ -56,9 +55,11 @@
     UIElicitationSchema,
     UIElicitationSchemaProperty,
     UIElicitationSchemaPropertyType,
-    UIElicitationSchemaType,
     UIHandlePendingElicitationRequest,
 )
+from .generated.rpc import (
+    CanvasHandler as RpcCanvasHandler,
+)
 from .generated.rpc import (
     ContextTier as _RpcContextTier,
 )
@@ -77,6 +78,7 @@
     SessionErrorData,
     SessionEvent,
     SessionIdleData,
+    SessionMode,
     session_event_from_dict,
 )
 from .generated.session_events import (
@@ -367,6 +369,44 @@ class PermissionNoResult:
 PermissionRequestResult = PermissionDecision | PermissionNoResult
 
 
+@dataclass
+class AttributedPermissionResult:
+    """A permission result annotated with the context describing how it was reached.
+
+    The Copilot runtime emits an ``auto_approval_decision`` telemetry event only
+    when a client supplies an explicit :class:`PermissionDecisionContext` alongside
+    its permission reply. Wrapping a :data:`PermissionRequestResult` with this class
+    forwards that context to the runtime as a sibling of the decision on the wire.
+
+    The context is informational only — it never changes permission behavior. Build
+    instances via :func:`create_attributed_permission_result` rather than constructing
+    directly, so re-attributing an already-wrapped result replaces the context instead
+    of nesting.
+    """
+
+    result: PermissionRequestResult
+    """The underlying permission decision (or :class:`PermissionNoResult`)."""
+
+    decision_context: PermissionDecisionContext
+    """Context describing how and where the decision was reached."""
+
+
+def create_attributed_permission_result(
+    result: PermissionRequestResult | AttributedPermissionResult,
+    decision_context: PermissionDecisionContext,
+) -> AttributedPermissionResult:
+    """Annotate a permission result with the context describing how it was reached.
+
+    Returns an :class:`AttributedPermissionResult` carrying ``result`` and
+    ``decision_context`` as siblings. If ``result`` is already an
+    :class:`AttributedPermissionResult`, its underlying decision is preserved and the
+    context is *replaced* — attribution never nests.
+    """
+    if isinstance(result, AttributedPermissionResult):
+        result = result.result
+    return AttributedPermissionResult(result=result, decision_context=decision_context)
+
+
 class PermissionInvocation(TypedDict, total=False):
     session_id: Required[str]
     managed_settings_enabled: NotRequired[bool]
@@ -374,7 +414,9 @@ class PermissionInvocation(TypedDict, total=False):
 
 _PermissionHandlerFn = Callable[
     [PermissionRequest, PermissionInvocation],
-    PermissionRequestResult | Awaitable[PermissionRequestResult],
+    PermissionRequestResult
+    | AttributedPermissionResult
+    | Awaitable[PermissionRequestResult | AttributedPermissionResult],
 ]
 
 
@@ -720,7 +762,7 @@ async def confirm(self, message: str) -> bool:
             UIElicitationRequest(
                 message=message,
                 requested_schema=UIElicitationSchema(
-                    type=UIElicitationSchemaType.OBJECT,
+                    type=BuiltinToolInputSchemaType.OBJECT,
                     properties={
                         "confirmed": UIElicitationSchemaProperty(
                             type=UIElicitationSchemaPropertyType.BOOLEAN,
@@ -755,7 +797,7 @@ async def select(self, message: str, options: list[str]) -> str | None:
             UIElicitationRequest(
                 message=message,
                 requested_schema=UIElicitationSchema(
-                    type=UIElicitationSchemaType.OBJECT,
+                    type=BuiltinToolInputSchemaType.OBJECT,
                     properties={
                         "selection": UIElicitationSchemaProperty(
                             type=UIElicitationSchemaPropertyType.STRING,
@@ -1507,6 +1549,7 @@ def __init__(
         client: Any,
         workspace_path: os.PathLike[str] | str | None = None,
         managed_settings_enabled: bool = False,
+        on_disconnect: Callable[[], None] | None = None,
     ):
         """
         Initialize a new CopilotSession.
@@ -1559,6 +1602,17 @@ def __init__(
         self._open_canvases_lock = threading.Lock()
         self._rpc: SessionRpc | None = None
         self._destroyed = False
+        self._on_disconnect = on_disconnect
+
+    def _set_disconnect_callback(self, callback: Callable[[], None]) -> None:
+        """Set the client-owned cleanup callback before the session becomes active."""
+        self._on_disconnect = callback
+
+    def _run_disconnect_callback(self) -> None:
+        callback = self._on_disconnect
+        self._on_disconnect = None
+        if callback is not None:
+            callback()
 
     @property
     def rpc(self) -> SessionRpc:
@@ -1740,7 +1794,7 @@ def handler(event: SessionEventTypeAlias) -> None:
                             total_start,
                             session_id=self.session_id,
                         )
-                case SessionIdleData():
+                case SessionIdleData() as data if data.mode != SessionMode.AUTOPILOT:
                     log_timing(
                         logger,
                         logging.DEBUG,
@@ -2174,7 +2228,11 @@ async def _execute_permission_and_respond(
                 request_id=request_id,
             )
 
-            result = cast(PermissionRequestResult, result)
+            result = cast("PermissionRequestResult | AttributedPermissionResult", result)
+            decision_context: PermissionDecisionContext | None = None
+            if isinstance(result, AttributedPermissionResult):
+                decision_context = result.decision_context
+                result = result.result
             if isinstance(result, PermissionNoResult):
                 return
 
@@ -2183,6 +2241,7 @@ async def _execute_permission_and_respond(
                 PermissionDecisionRequest(
                     request_id=request_id,
                     result=result,
+                    decision_context=decision_context,
                 )
             )
             log_timing(
@@ -2233,14 +2292,14 @@ async def _execute_mcp_auth_and_respond(
 
             if result and result.get("kind", "token") == "token":
                 rpc_result = MCPOauthPendingRequestResponse(
-                    kind=MCPOauthPendingRequestResponseKind.TOKEN,
+                    kind=GitHubTokenAcquireResultKind.TOKEN,
                     access_token=result["accessToken"],
                     expires_in=result.get("expiresIn"),
                     token_type=result.get("tokenType"),
                 )
             else:
                 rpc_result = MCPOauthPendingRequestResponse(
-                    kind=MCPOauthPendingRequestResponseKind.CANCELLED
+                    kind=GitHubTokenAcquireResultKind.CANCELLED
                 )
             await self.rpc.mcp.oauth.handle_pending_request(
                 MCPOauthHandlePendingRequest(
@@ -2254,7 +2313,7 @@ async def _execute_mcp_auth_and_respond(
                     MCPOauthHandlePendingRequest(
                         request_id=request_id,
                         result=MCPOauthPendingRequestResponse(
-                            kind=MCPOauthPendingRequestResponseKind.CANCELLED
+                            kind=GitHubTokenAcquireResultKind.CANCELLED
                         ),
                     )
                 )
@@ -2927,6 +2986,7 @@ async def disconnect(self) -> None:
         try:
             await self._client.request("session.destroy", {"sessionId": self.session_id})
         finally:
+            self._run_disconnect_callback()
             # Clear handlers even if the request fails.
             with self._event_handlers_lock:
                 self._event_handlers.clear()
diff --git a/python/copilot/tools.py b/python/copilot/tools.py
index de81fe7fd8..ad0bcb41bd 100644
--- a/python/copilot/tools.py
+++ b/python/copilot/tools.py
@@ -11,7 +11,11 @@
 import json
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass, field
+from datetime import date, datetime, time
+from decimal import Decimal
+from enum import Enum
 from typing import TYPE_CHECKING, Any, Literal, TypeVar, get_type_hints, overload
+from uuid import UUID
 
 from pydantic import BaseModel, ValidationError
 
@@ -82,6 +86,11 @@ class Tool:
     skip_permission: bool = False
     defer: Literal["auto", "never"] | None = None
     metadata: dict[str, Any] | None = None
+    #: When true, a successful call to this tool ends the agent turn: the
+    #: runtime halts instead of feeding the result back to the model for
+    #: another round. A failed call leaves the loop running so the model can
+    #: read the error and retry.
+    is_terminal: bool = False
 
 
 T = TypeVar("T", bound=BaseModel)
@@ -97,6 +106,7 @@ def define_tool(
     skip_permission: bool = False,
     defer: Literal["auto", "never"] | None = None,
     metadata: dict[str, Any] | None = None,
+    is_terminal: bool = False,
 ) -> Callable[[Callable[..., Any]], Tool]:
     pass
 
@@ -112,6 +122,7 @@ def define_tool(
     skip_permission: bool = False,
     defer: Literal["auto", "never"] | None = None,
     metadata: dict[str, Any] | None = None,
+    is_terminal: bool = False,
 ) -> Tool:
     pass
 
@@ -127,6 +138,7 @@ def define_tool(
     skip_permission: bool = False,
     defer: Literal["auto", "never"] | None = None,
     metadata: dict[str, Any] | None = None,
+    is_terminal: bool = False,
 ) -> Tool:
     pass
 
@@ -141,6 +153,7 @@ def define_tool(
     skip_permission: bool = False,
     defer: Literal["auto", "never"] | None = None,
     metadata: dict[str, Any] | None = None,
+    is_terminal: bool = False,
 ) -> Tool | Callable[[Callable[[Any, ToolInvocation], Any]], Tool]:
     """
     Define a tool with automatic JSON schema generation from Pydantic models.
@@ -193,6 +206,10 @@ def lookup_issue(params: LookupIssueParams) -> str:
                     Keys are namespaced and not part of the stable public API; values
                     are not interpreted and may be recognized to inform host-specific
                     behavior. Unknown keys are preserved.
+        is_terminal: When True, a successful call to this tool ends the agent turn:
+                    the runtime halts instead of feeding the result back to the model
+                    for another round. A failed call leaves the loop running so the
+                    model can read the error and retry.
 
     Returns:
         A Tool instance
@@ -288,6 +305,7 @@ async def wrapped_handler(invocation: ToolInvocation) -> ToolResult:
             skip_permission=skip_permission,
             defer=defer,
             metadata=metadata,
+            is_terminal=is_terminal,
         )
 
     # If handler is provided, call decorator immediately
@@ -308,6 +326,7 @@ async def wrapped_handler(invocation: ToolInvocation) -> ToolResult:
             skip_permission=skip_permission,
             defer=defer,
             metadata=metadata,
+            is_terminal=is_terminal,
         )
 
     # Otherwise return decorator for @define_tool(...) usage
@@ -348,10 +367,18 @@ def _normalize_result(result: Any) -> ToolResult:
             result_type="success",
         )
 
-    # Everything else gets JSON-serialized (with Pydantic model support)
+    # Everything else gets JSON-serialized (with common Python and Pydantic values)
     def default(obj: Any) -> Any:
         if isinstance(obj, BaseModel):
             return obj.model_dump(mode="json")
+        if isinstance(obj, (date, datetime, time)):
+            return obj.isoformat()
+        if isinstance(obj, (Decimal, UUID)):
+            return str(obj)
+        if isinstance(obj, Enum):
+            return obj.value
+        if isinstance(obj, set):
+            return list(obj)
         raise TypeError(f"Object of type {type(obj).__name__} is not JSON serializable")
 
     try:
diff --git a/python/e2e/test_mcp_and_agents_e2e.py b/python/e2e/test_mcp_and_agents_e2e.py
index e583dbdd78..6f443a970c 100644
--- a/python/e2e/test_mcp_and_agents_e2e.py
+++ b/python/e2e/test_mcp_and_agents_e2e.py
@@ -99,7 +99,6 @@ async def test_should_accept_mcp_server_configuration_on_session_resume(
             on_permission_request=PermissionHandler.approve_all
         )
         session_id = session1.session_id
-        await session1.send_and_wait("What is 1+1?")
 
         # Resume with MCP servers
         mcp_servers = _test_mcp_servers("test-server")
diff --git a/python/e2e/test_mcp_oauth_e2e.py b/python/e2e/test_mcp_oauth_e2e.py
index 9d70597c3e..76f1cbf721 100644
--- a/python/e2e/test_mcp_oauth_e2e.py
+++ b/python/e2e/test_mcp_oauth_e2e.py
@@ -8,11 +8,11 @@
 import pytest
 
 from copilot.generated.rpc import (
+    GitHubTokenAcquireResultKind,
     MCPAppsCallToolRequest,
     MCPListToolsRequest,
     MCPOauthHandlePendingRequest,
     MCPOauthPendingRequestResponse,
-    MCPOauthPendingRequestResponseKind,
 )
 from copilot.session import MCPServerConfig, PermissionHandler
 from copilot.session_events import McpServerStatus
@@ -206,7 +206,7 @@ async def on_mcp_auth_request(request, _invocation):
                         MCPOauthHandlePendingRequest(
                             request_id=request["requestId"],
                             result=MCPOauthPendingRequestResponse(
-                                kind=MCPOauthPendingRequestResponseKind.TOKEN,
+                                kind=GitHubTokenAcquireResultKind.TOKEN,
                                 access_token=EXPECTED_TOKEN,
                                 token_type="Bearer",
                                 expires_in=3600,
diff --git a/python/e2e/test_pending_work_resume_e2e.py b/python/e2e/test_pending_work_resume_e2e.py
index 64c06c0421..5b6d978f31 100644
--- a/python/e2e/test_pending_work_resume_e2e.py
+++ b/python/e2e/test_pending_work_resume_e2e.py
@@ -20,11 +20,12 @@
     HandlePendingToolCallRequest,
     PermissionDecisionRequest,
     PermissionDecisionUserNotAvailable,
+    SessionsCheckInUseRequest,
 )
 from copilot.session import PermissionHandler
 from copilot.tools import Tool, ToolInvocation, ToolResult
 
-from .testharness import DEFAULT_GITHUB_TOKEN, E2ETestContext
+from .testharness import DEFAULT_GITHUB_TOKEN, E2ETestContext, wait_for_condition
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
 
@@ -464,6 +465,7 @@ async def blocking_external_tool(args):
         await server.start()
         try:
             cli_url = f"localhost:{server.runtime_port}"
+            lock_observer: CopilotClient | None = None
 
             suspended_client = CopilotClient(
                 connection=RuntimeConnection.for_uri(
@@ -487,8 +489,41 @@ async def blocking_external_tool(args):
                 assert (await asyncio.wait_for(tool_started, PENDING_WORK_TIMEOUT)) == "beta"
 
                 if disconnect_original_client:
+                    # force_stop closes the local socket before the server necessarily
+                    # processes that disconnect. Observe the session lock from another
+                    # runtime so resume cannot race the server's active-session cleanup.
+                    lock_observer = _make_subprocess_client(ctx)
+                    await lock_observer.start()
+
+                    async def session_lock_is_held() -> bool:
+                        result = await lock_observer.rpc.sessions.check_in_use(
+                            SessionsCheckInUseRequest(session_ids=[session_id])
+                        )
+                        return session_id in result.in_use
+
+                    await wait_for_condition(
+                        session_lock_is_held,
+                        timeout=PENDING_WORK_TIMEOUT,
+                        timeout_message=(
+                            f"Timed out waiting for session '{session_id}' to acquire its lock."
+                        ),
+                    )
                     await suspended_client.force_stop()
 
+                    async def session_lock_is_released() -> bool:
+                        result = await lock_observer.rpc.sessions.check_in_use(
+                            SessionsCheckInUseRequest(session_ids=[session_id])
+                        )
+                        return session_id not in result.in_use
+
+                    await wait_for_condition(
+                        session_lock_is_released,
+                        timeout=PENDING_WORK_TIMEOUT,
+                        timeout_message=(
+                            f"Timed out waiting for session '{session_id}' to release its lock."
+                        ),
+                    )
+
                 resumed_client = CopilotClient(
                     connection=RuntimeConnection.for_uri(
                         cli_url, connection_token="py-tcp-shared-test-token"
@@ -550,6 +585,8 @@ async def resumed_external_tool(args):
                 if not release_original.done():
                     release_original.set_result("ORIGINAL_SHOULD_NOT_WIN")
                 await _safe_force_stop(suspended_client)
+                if lock_observer is not None:
+                    await _safe_force_stop(lock_observer)
         finally:
             await _safe_force_stop(server)
 
diff --git a/python/e2e/test_rewind_e2e.py b/python/e2e/test_rewind_e2e.py
new file mode 100644
index 0000000000..179d9c2db4
--- /dev/null
+++ b/python/e2e/test_rewind_e2e.py
@@ -0,0 +1,93 @@
+"""E2E coverage for rewinding tracked files and conversation history."""
+
+from __future__ import annotations
+
+import asyncio
+import os
+from pathlib import Path
+
+import pytest
+
+from copilot.rpc import (
+    HistoryPreviewRewindRequest,
+    HistoryRewindMode,
+    HistoryRewindOutcome,
+    HistoryRewindRequest,
+)
+from copilot.session import PermissionHandler
+
+from .testharness import E2ETestContext
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+
+FILE_NAME = "rewind-sdk.txt"
+FILE_CONTENT = "SDK rewind content"
+
+
+def _same_path(left: str | Path, right: str | Path) -> bool:
+    return os.path.normcase(os.path.abspath(left)) == os.path.normcase(os.path.abspath(right))
+
+
+class TestRewind:
+    async def test_should_restore_tracked_file_and_conversation(self, ctx: E2ETestContext):
+        file_path = Path(ctx.work_dir) / FILE_NAME
+        session = await ctx.client.create_session(
+            model="claude-sonnet-4.5",
+            enable_file_change_tracking=True,
+            on_permission_request=PermissionHandler.approve_all,
+        )
+
+        try:
+            response = await session.send_and_wait(
+                f"Use the create tool to create {FILE_NAME} containing exactly {FILE_CONTENT}. "
+                "After the tool succeeds, reply with exactly SDK_REWIND_DONE."
+            )
+
+            assert response is not None
+            assert response.data.content == "SDK_REWIND_DONE"
+            assert file_path.read_text(encoding="utf-8") == FILE_CONTENT
+
+            # File change capture settles asynchronously after the turn completes, so a
+            # rewind point can briefly report zero restorable files. Poll until the
+            # capture lands instead of sampling once; the assertions below still run if
+            # it never does.
+            rewind_points = await session.rpc.history.list_rewind_points()
+            deadline = asyncio.get_running_loop().time() + 10
+            while asyncio.get_running_loop().time() < deadline and not (
+                rewind_points.unavailable_reason is None
+                and rewind_points.points
+                and rewind_points.points[0].can_restore_files
+            ):
+                await asyncio.sleep(0.1)
+                rewind_points = await session.rpc.history.list_rewind_points()
+
+            assert rewind_points.unavailable_reason is None
+            assert rewind_points.file_change_tracking_enabled
+            assert len(rewind_points.points) == 1
+            rewind_point = rewind_points.points[0]
+            assert rewind_point.can_restore_files
+            assert rewind_point.file_count == 1
+
+            preview = await session.rpc.history.preview_rewind(
+                HistoryPreviewRewindRequest(event_id=rewind_point.event_id)
+            )
+            assert preview.available
+            assert len(preview.files) == 1
+            assert _same_path(preview.files[0].path, file_path)
+
+            rewind = await session.rpc.history.rewind(
+                HistoryRewindRequest(
+                    event_id=rewind_point.event_id,
+                    mode=HistoryRewindMode.CONVERSATION_AND_FILES,
+                )
+            )
+            assert rewind.outcome == HistoryRewindOutcome.SUCCESS
+            assert rewind.events_removed is not None and rewind.events_removed > 0
+            assert len(rewind.restored_files) == 1
+            assert _same_path(rewind.restored_files[0], file_path)
+            assert not file_path.exists()
+
+            events = await session.get_events()
+            assert all(str(event.id) != rewind_point.event_id for event in events)
+        finally:
+            await session.disconnect()
diff --git a/python/e2e/test_rpc_mcp_config_e2e.py b/python/e2e/test_rpc_mcp_config_e2e.py
index efa41cda2d..db605e07d6 100644
--- a/python/e2e/test_rpc_mcp_config_e2e.py
+++ b/python/e2e/test_rpc_mcp_config_e2e.py
@@ -18,8 +18,8 @@
     MCPConfigRemoveRequest,
     MCPConfigUpdateRequest,
     MCPGrantType,
-    MCPServerConfig,
-    MCPServerConfigHTTPType,
+    MCPSerializableServerConfig,
+    MCPSerializableServerConfigType,
 )
 
 from .testharness import E2ETestContext
@@ -27,7 +27,7 @@
 pytestmark = pytest.mark.asyncio(loop_scope="module")
 
 
-def _server_config(servers: dict, name: str) -> MCPServerConfig:
+def _server_config(servers: dict, name: str) -> MCPSerializableServerConfig:
     assert name in servers, f"Expected MCP server '{name}' to be present."
     return servers[name]
 
@@ -37,8 +37,8 @@ async def test_should_call_server_mcp_config_rpcs(self, ctx: E2ETestContext):
         await ctx.client.start()
 
         server_name = f"sdk-test-{uuid.uuid4().hex}"
-        config = MCPServerConfig(command="node", args=[])
-        updated_config = MCPServerConfig(command="node", args=["--version"])
+        config = MCPSerializableServerConfig(command="node", args=[])
+        updated_config = MCPSerializableServerConfig(command="node", args=["--version"])
 
         initial = await ctx.client.rpc.mcp.config.list()
         assert server_name not in initial.servers
@@ -70,8 +70,8 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
         await ctx.client.start()
 
         server_name = f"sdk-http-oauth-{uuid.uuid4().hex}"
-        config = MCPServerConfig(
-            type=MCPServerConfigHTTPType.HTTP,
+        config = MCPSerializableServerConfig(
+            type=MCPSerializableServerConfigType.HTTP,
             url="https://example.com/mcp",
             headers={"Authorization": "Bearer token"},
             oauth_client_id="client-id",
@@ -80,8 +80,8 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
             tools=["*"],
             timeout=3000,
         )
-        updated_config = MCPServerConfig(
-            type=MCPServerConfigHTTPType.HTTP,
+        updated_config = MCPSerializableServerConfig(
+            type=MCPSerializableServerConfigType.HTTP,
             url="https://example.com/updated-mcp",
             oauth_client_id="updated-client-id",
             oauth_public_client=True,
@@ -96,7 +96,7 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
             )
             after_add = await ctx.client.rpc.mcp.config.list()
             added = _server_config(after_add.servers, server_name)
-            assert added.type == MCPServerConfigHTTPType.HTTP
+            assert added.type == MCPSerializableServerConfigType.HTTP
             assert added.url == "https://example.com/mcp"
             assert added.headers is not None
             assert added.headers["Authorization"] == "Bearer token"
diff --git a/python/e2e/test_rpc_session_state_extras_e2e.py b/python/e2e/test_rpc_session_state_extras_e2e.py
index 5d0d881a00..7523059c7b 100644
--- a/python/e2e/test_rpc_session_state_extras_e2e.py
+++ b/python/e2e/test_rpc_session_state_extras_e2e.py
@@ -19,7 +19,7 @@
     MetadataContextHeaviestMessagesRequest,
     ModelSwitchToRequest,
     NamedProviderConfig,
-    PermissionsSetAllowAllRequest,
+    PermissionsSetModeRequest,
     ProviderAddRequest,
     ProviderModelConfig,
     ProviderType,
@@ -32,6 +32,7 @@
     VisibilitySetRequest,
 )
 from copilot.session import PermissionHandler
+from copilot.session_events import PermissionMode
 
 from .testharness import E2ETestContext
 
@@ -185,26 +186,26 @@ async def test_should_get_and_set_allowall_permissions(self, ctx: E2ETestContext
             on_permission_request=PermissionHandler.approve_all,
         ) as session:
             try:
-                initial = await session.rpc.permissions.get_allow_all()
-                assert initial.enabled is False
+                initial = await session.rpc.permissions.get_mode()
+                assert initial.mode is PermissionMode.MANUAL
 
-                enable = await session.rpc.permissions.set_allow_all(
-                    PermissionsSetAllowAllRequest(enabled=True)
+                enable = await session.rpc.permissions.set_mode(
+                    PermissionsSetModeRequest(mode=PermissionMode.ALLOW_ALL)
                 )
                 assert enable.success is True
-                assert enable.enabled is True
-                assert (await session.rpc.permissions.get_allow_all()).enabled is True
+                assert enable.mode is PermissionMode.ALLOW_ALL
+                assert (await session.rpc.permissions.get_mode()).mode is PermissionMode.ALLOW_ALL
 
-                disable = await session.rpc.permissions.set_allow_all(
-                    PermissionsSetAllowAllRequest(enabled=False)
+                disable = await session.rpc.permissions.set_mode(
+                    PermissionsSetModeRequest(mode=PermissionMode.MANUAL)
                 )
                 assert disable.success is True
-                assert disable.enabled is False
-                assert (await session.rpc.permissions.get_allow_all()).enabled is False
+                assert disable.mode is PermissionMode.MANUAL
+                assert (await session.rpc.permissions.get_mode()).mode is PermissionMode.MANUAL
             finally:
                 with contextlib.suppress(Exception):
-                    await session.rpc.permissions.set_allow_all(
-                        PermissionsSetAllowAllRequest(enabled=False)
+                    await session.rpc.permissions.set_mode(
+                        PermissionsSetModeRequest(mode=PermissionMode.MANUAL)
                     )
 
     async def test_should_get_context_attribution_and_heaviest_messages_after_turn(
diff --git a/python/e2e/test_rpc_shell_and_fleet_e2e.py b/python/e2e/test_rpc_shell_and_fleet_e2e.py
index d5a88456ab..422feab520 100644
--- a/python/e2e/test_rpc_shell_and_fleet_e2e.py
+++ b/python/e2e/test_rpc_shell_and_fleet_e2e.py
@@ -37,11 +37,10 @@
 
 def _write_file_command(marker_path: Path, marker: str) -> str:
     if sys.platform == "win32":
-        return (
-            f"powershell -NoLogo -NoProfile -Command "
-            f"\"Set-Content -LiteralPath '{marker_path}' -Value '{marker}'\""
-        )
-    return f"sh -c \"printf '%s' '{marker}' > '{marker_path}'\""
+        # shell.exec already runs through cmd.exe on Windows. Use its built-in echo
+        # instead of spawning a nested PowerShell process just to write the marker.
+        return f'echo {marker}>"{marker_path.name}"'
+    return f"sh -c \"printf '%s' '{marker}' > '{marker_path.name}'\""
 
 
 async def _wait_for_file_text(path: Path, expected: str, *, timeout: float = 30.0) -> None:
@@ -57,19 +56,21 @@ async def _wait_for_file_text(path: Path, expected: str, *, timeout: float = 30.
 
 class TestRpcShellAndFleet:
     async def test_should_execute_shell_command(self, ctx: E2ETestContext):
-        session = await ctx.client.create_session(
+        async with await ctx.client.create_session(
             on_permission_request=PermissionHandler.approve_all,
-        )
-        marker_path = Path(ctx.work_dir) / f"shell-rpc-{uuid.uuid4().hex}.txt"
-        marker = "copilot-sdk-shell-rpc"
-
-        result = await session.rpc.shell.exec(
-            ShellExecRequest(command=_write_file_command(marker_path, marker), cwd=ctx.work_dir)
-        )
-        assert (result.process_id or "").strip()
-        await _wait_for_file_text(marker_path, marker)
-
-        await session.disconnect()
+        ) as session:
+            command_dir = Path(ctx.work_dir) / f"shell-rpc-{uuid.uuid4().hex}"
+            command_dir.mkdir()
+            marker_path = command_dir / "marker.txt"
+            marker = "copilot-sdk-shell-rpc"
+
+            result = await session.rpc.shell.exec(
+                ShellExecRequest(
+                    command=_write_file_command(marker_path, marker), cwd=str(command_dir)
+                )
+            )
+            assert (result.process_id or "").strip()
+            await _wait_for_file_text(marker_path, marker)
 
     async def test_should_kill_shell_process(self, ctx: E2ETestContext):
         session = await ctx.client.create_session(
diff --git a/python/e2e/test_rpc_ui_ephemeral_query_e2e.py b/python/e2e/test_rpc_ui_ephemeral_query_e2e.py
index 117fe083d2..b7f3b94d22 100644
--- a/python/e2e/test_rpc_ui_ephemeral_query_e2e.py
+++ b/python/e2e/test_rpc_ui_ephemeral_query_e2e.py
@@ -18,6 +18,12 @@
 
 
 class TestRpcUiEphemeralQuery:
+    # TODO(cli-1.0.81-2): CLI 1.0.81-5 still fails session.ui.ephemeralQuery against the
+    # recorded snapshot on macOS ("Failed to get response from the AI model"). Re-enable
+    # once the runtime fix ships.
+    @pytest.mark.skip(
+        reason="blocked on CLI 1.0.81-5 session.ui.ephemeralQuery regression on macOS"
+    )
     async def test_should_answer_ephemeral_query(self, ctx: E2ETestContext):
         async with await ctx.client.create_session(
             on_permission_request=PermissionHandler.approve_all,
diff --git a/python/e2e/test_session_e2e.py b/python/e2e/test_session_e2e.py
index b6f173f759..08413f228f 100644
--- a/python/e2e/test_session_e2e.py
+++ b/python/e2e/test_session_e2e.py
@@ -16,6 +16,7 @@
     E2ETestContext,
     get_final_assistant_message,
     get_next_event_of_type,
+    wait_for_condition,
 )
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
@@ -396,19 +397,26 @@ async def test_should_delete_session(self, ctx: E2ETestContext):
             )
 
     async def test_should_get_session_metadata(self, ctx: E2ETestContext):
-        import asyncio
-
         # Create a session and send a message to persist it
         session = await ctx.client.create_session(
             on_permission_request=PermissionHandler.approve_all
         )
         await session.send_and_wait("Say hello")
 
-        # Small delay to ensure session file is written to disk
-        await asyncio.sleep(0.2)
+        metadata = None
+
+        async def metadata_is_available() -> bool:
+            nonlocal metadata
+            metadata = await ctx.client.get_session_metadata(session.session_id)
+            return metadata is not None
+
+        await wait_for_condition(
+            metadata_is_available,
+            timeout=10.0,
+            timeout_message="Timed out waiting for session metadata to persist.",
+        )
 
         # Get metadata for the session we just created
-        metadata = await ctx.client.get_session_metadata(session.session_id)
         assert metadata is not None
         assert metadata.session_id == session.session_id
         assert isinstance(metadata.start_time, datetime)
diff --git a/python/e2e/test_session_fs_e2e.py b/python/e2e/test_session_fs_e2e.py
index bb6e47af7b..035db125ba 100644
--- a/python/e2e/test_session_fs_e2e.py
+++ b/python/e2e/test_session_fs_e2e.py
@@ -174,6 +174,9 @@ def get_big_string() -> str:
         messages = await session.get_events()
         tool_result = find_tool_call_result(messages, "get_big_string")
         assert tool_result is not None
+        # The CLI joins the temp path using the host separator, so normalize before
+        # matching to keep the assertion valid on Windows.
+        tool_result = tool_result.replace("\\", "/")
         assert f"{SESSION_STATE_PATH}/temp/" in tool_result
         match = re.search(rf"({re.escape(SESSION_STATE_PATH)}/temp/[^\s]+)", tool_result)
         assert match is not None
diff --git a/python/e2e/test_tool_results_e2e.py b/python/e2e/test_tool_results_e2e.py
index b7b05b7af5..41d1967bc9 100644
--- a/python/e2e/test_tool_results_e2e.py
+++ b/python/e2e/test_tool_results_e2e.py
@@ -184,10 +184,11 @@ def on_event(event):
 
         unsubscribe = session.on(on_event)
         try:
-            asyncio.ensure_future(
-                session.send(
+            send_task = asyncio.create_task(
+                session.send_and_wait(
                     "Use access_secret to get the API key."
-                    " If access is denied, tell me it was 'access denied'."
+                    " If access is denied, tell me it was 'access denied'.",
+                    timeout=60.0,
                 )
             )
             tool_evt = await asyncio.wait_for(tool_complete_future, timeout=60.0)
@@ -201,7 +202,7 @@ def on_event(event):
             error_msg = error if isinstance(error, str) else getattr(error, "message", None)
             assert "Access denied" in (error_msg or "")
 
-            answer = await get_final_assistant_message(session, timeout=60.0)
+            answer = await send_task
             assert answer is not None
         finally:
             unsubscribe()
diff --git a/python/test_client.py b/python/test_client.py
index 0bba1ccd7f..a33f0ecd60 100644
--- a/python/test_client.py
+++ b/python/test_client.py
@@ -6,6 +6,7 @@
 
 import asyncio
 import inspect
+import os
 from datetime import UTC, datetime
 from tempfile import TemporaryDirectory
 from unittest.mock import AsyncMock, Mock, patch
@@ -16,6 +17,7 @@
     CanvasProviderIdentity,
     CapiSessionOptions,
     CopilotClient,
+    DisableBypassPermissionsModes,
     ExtensionInfo,
     ModelBillingTokenPrices,
     ModelBillingTokenPricesLongContext,
@@ -28,6 +30,8 @@
     CloudSessionRepository,
     CopilotExpAssignmentResponse,
     ExpConfigEntry,
+    ManagedSettings,
+    ManagedSettingsPermissions,
     ModelBilling,
     ModelCapabilities,
     ModelInfo,
@@ -55,6 +59,50 @@ def test_inprocess_connection_has_no_child_process_options():
     assert not hasattr(connection, "args")
 
 
+class TestBuiltinPluginDirectories:
+    @staticmethod
+    async def _start_client(paths=None):
+        client = CopilotClient(
+            connection=RuntimeConnection.for_uri("localhost:1234"),
+            builtin_plugin_directories=paths,
+        )
+        client._connect_to_server = AsyncMock()
+        client._verify_protocol_version = AsyncMock()
+        client._client = Mock()
+        client._client.request = AsyncMock(return_value={})
+
+        await client.start()
+        return client
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("paths", [None, []])
+    async def test_default_or_empty_does_not_call_rpc(self, paths):
+        client = await self._start_client(paths)
+
+        client._client.request.assert_not_awaited()
+
+    @pytest.mark.asyncio
+    async def test_configured_paths_call_rpc_once_before_start_completes(self):
+        paths = [
+            os.path.abspath("plugins/core"),
+            os.path.abspath("plugins/github"),
+        ]
+
+        client = await self._start_client(paths)
+
+        client._client.request.assert_awaited_once_with(
+            "plugins.builtin.set",
+            {"paths": paths},
+        )
+
+    def test_relative_path_is_rejected(self):
+        with pytest.raises(ValueError, match="builtin_plugin_directories.*absolute paths"):
+            CopilotClient(
+                connection=RuntimeConnection.for_uri("localhost:1234"),
+                builtin_plugin_directories=["plugins/core"],
+            )
+
+
 class TestClientShutdown:
     @pytest.mark.asyncio
     async def test_stop_requests_runtime_shutdown_for_owned_process(self):
@@ -651,6 +699,81 @@ async def mock_request(method, params, **kwargs):
         finally:
             await client.force_stop()
 
+    @pytest.mark.asyncio
+    async def test_create_and_resume_session_forward_managed_settings(self):
+        client = CopilotClient(connection=RuntimeConnection.for_stdio(path=CLI_PATH))
+        await client.start()
+        try:
+            captured = {}
+
+            async def mock_request(method, params, **kwargs):
+                captured[method] = params
+                if method in ("session.create", "session.resume"):
+                    result = {"sessionId": params.get("sessionId") or "session-1"}
+                    callback = kwargs.get("on_response_inline")
+                    if callback is not None:
+                        callback(result)
+                    return result
+                return {}
+
+            client._client.request = mock_request
+            session = await client.create_session(
+                on_permission_request=PermissionHandler.approve_all,
+                enable_managed_settings=True,
+                managed_settings=ManagedSettings(
+                    permissions=ManagedSettingsPermissions(
+                        disable_bypass_permissions_mode=DisableBypassPermissionsModes.ALLOW_AUTO_ONLY,
+                        deny=["Shell(git push)"],
+                        ask=["Domain(publish.example)"],
+                        allow=["Read(**)"],
+                    )
+                ),
+            )
+            resumed_session = await client.resume_session(
+                session.session_id,
+                on_permission_request=PermissionHandler.approve_all,
+                managed_settings=ManagedSettings(
+                    permissions=ManagedSettingsPermissions(
+                        disable_bypass_permissions_mode="future-fail-closed-mode",
+                        ask=["Domain(publish.example)"],
+                    )
+                ),
+            )
+
+            assert session._managed_settings_enabled is True
+            assert resumed_session._managed_settings_enabled is True
+            assert captured["session.create"]["enableManagedSettings"] is True
+            assert captured["session.create"]["managedSettings"] == {
+                "permissions": {
+                    "disableBypassPermissionsMode": "allow-auto-only",
+                    "deny": ["Shell(git push)"],
+                    "ask": ["Domain(publish.example)"],
+                    "allow": ["Read(**)"],
+                }
+            }
+            assert captured["session.resume"]["managedSettings"] == {
+                "permissions": {
+                    "disableBypassPermissionsMode": "future-fail-closed-mode",
+                    "ask": ["Domain(publish.example)"],
+                }
+            }
+
+            await client.create_session(
+                on_permission_request=PermissionHandler.approve_all,
+                managed_settings=ManagedSettings(
+                    permissions=ManagedSettingsPermissions(
+                        disable_bypass_permissions_mode=DisableBypassPermissionsModes.DISABLE,
+                    )
+                ),
+            )
+            assert captured["session.create"]["managedSettings"] == {
+                "permissions": {
+                    "disableBypassPermissionsMode": "disable",
+                }
+            }
+        finally:
+            await client.force_stop()
+
     @pytest.mark.asyncio
     async def test_create_and_resume_session_default_enable_experimental_mode_by_mode(self):
         with TemporaryDirectory() as base_directory:
@@ -691,6 +814,7 @@ async def mock_request(method, params, **kwargs):
             finally:
                 await client.force_stop()
 
+    async def test_managed_settings_omitted_when_not_supplied(self):
         client = CopilotClient(connection=RuntimeConnection.for_stdio(path=CLI_PATH))
         await client.start()
         try:
@@ -698,7 +822,7 @@ async def mock_request(method, params, **kwargs):
 
             async def mock_request(method, params, **kwargs):
                 captured[method] = params
-                if method in ("session.create", "session.resume"):
+                if method == "session.create":
                     result = {"sessionId": params.get("sessionId") or "session-1"}
                     callback = kwargs.get("on_response_inline")
                     if callback is not None:
@@ -707,16 +831,42 @@ async def mock_request(method, params, **kwargs):
                 return {}
 
             client._client.request = mock_request
-            session = await client.create_session(
+            await client.create_session(
                 on_permission_request=PermissionHandler.approve_all,
             )
-            await client.resume_session(
-                session.session_id,
+
+            assert "managedSettings" not in captured["session.create"]
+        finally:
+            await client.force_stop()
+
+    @pytest.mark.asyncio
+    async def test_managed_settings_preserves_empty_arrays(self):
+        client = CopilotClient(connection=RuntimeConnection.for_stdio(path=CLI_PATH))
+        await client.start()
+        try:
+            captured = {}
+
+            async def mock_request(method, params, **kwargs):
+                captured[method] = params
+                if method == "session.create":
+                    result = {"sessionId": params.get("sessionId") or "session-1"}
+                    callback = kwargs.get("on_response_inline")
+                    if callback is not None:
+                        callback(result)
+                    return result
+                return {}
+
+            client._client.request = mock_request
+            await client.create_session(
                 on_permission_request=PermissionHandler.approve_all,
+                managed_settings=ManagedSettings(
+                    permissions=ManagedSettingsPermissions(deny=[], ask=[], allow=[])
+                ),
             )
 
-            assert "isExperimentalMode" not in captured["session.create"]
-            assert "isExperimentalMode" not in captured["session.resume"]
+            assert captured["session.create"]["managedSettings"] == {
+                "permissions": {"deny": [], "ask": [], "allow": []}
+            }
         finally:
             await client.force_stop()
 
@@ -793,6 +943,45 @@ async def mock_request(method, params, **kwargs):
         finally:
             await client.force_stop()
 
+    @pytest.mark.asyncio
+    async def test_create_and_resume_session_forward_tool_is_terminal(self):
+        client = CopilotClient(connection=RuntimeConnection.for_stdio(path=CLI_PATH))
+        await client.start()
+        try:
+            captured = {}
+
+            async def mock_request(method, params, **kwargs):
+                captured[method] = params
+                if method in ("session.create", "session.resume"):
+                    result = {"sessionId": params.get("sessionId") or "session-1"}
+                    callback = kwargs.get("on_response_inline")
+                    if callback is not None:
+                        callback(result)
+                    return result
+                return {}
+
+            client._client.request = mock_request
+            tool = Tool(name="my_tool", description="a tool", is_terminal=True)
+            plain_tool = Tool(name="plain_tool", description="a tool")
+
+            session = await client.create_session(
+                on_permission_request=PermissionHandler.approve_all,
+                tools=[tool, plain_tool],
+            )
+            await client.resume_session(
+                session.session_id,
+                on_permission_request=PermissionHandler.approve_all,
+                tools=[tool],
+            )
+
+            create_tools = captured["session.create"]["tools"]
+            assert create_tools[0]["isTerminal"] is True
+            # Omitted when left at its default.
+            assert "isTerminal" not in create_tools[1]
+            assert captured["session.resume"]["tools"][0]["isTerminal"] is True
+        finally:
+            await client.force_stop()
+
     @pytest.mark.asyncio
     async def test_create_and_resume_session_forward_canvas_provider(self):
         client = CopilotClient(connection=RuntimeConnection.for_stdio(path=CLI_PATH))
@@ -857,6 +1046,7 @@ async def mock_request(method, params, **kwargs):
             session = await client.create_session(
                 on_permission_request=PermissionHandler.approve_all,
                 enable_citations=True,
+                enable_file_change_tracking=True,
                 excluded_builtin_agents=["explore"],
                 session_limits={"max_ai_credits": 30},
             )
@@ -864,14 +1054,17 @@ async def mock_request(method, params, **kwargs):
                 session.session_id,
                 on_permission_request=PermissionHandler.approve_all,
                 enable_citations=False,
+                enable_file_change_tracking=False,
                 excluded_builtin_agents=["task"],
                 session_limits={"max_ai_credits": 15},
             )
 
             assert captured["session.create"]["enableCitations"] is True
+            assert captured["session.create"]["enableFileChangeTracking"] is True
             assert captured["session.create"]["excludedBuiltinAgents"] == ["explore"]
             assert captured["session.create"]["sessionLimits"] == {"maxAiCredits": 30}
             assert captured["session.resume"]["enableCitations"] is False
+            assert captured["session.resume"]["enableFileChangeTracking"] is False
             assert captured["session.resume"]["excludedBuiltinAgents"] == ["task"]
             assert captured["session.resume"]["sessionLimits"] == {"maxAiCredits": 15}
         finally:
@@ -937,6 +1130,7 @@ async def mock_request(method, params, **kwargs):
             client._client.request = mock_request
 
             plugin_dirs = ["/tmp/plugins/a", "/tmp/plugins/b"]
+            disabled_mcp_servers = ["local-files", "remote-github"]
             large_output = {
                 "enabled": True,
                 "max_size_bytes": 1024,
@@ -951,19 +1145,45 @@ async def mock_request(method, params, **kwargs):
             session = await client.create_session(
                 on_permission_request=PermissionHandler.approve_all,
                 plugin_directories=plugin_dirs,
+                disabled_mcp_servers=disabled_mcp_servers,
                 large_output=large_output,
             )
             await client.resume_session(
                 session.session_id,
                 on_permission_request=PermissionHandler.approve_all,
                 plugin_directories=plugin_dirs,
+                disabled_mcp_servers=disabled_mcp_servers,
                 large_output=large_output,
             )
 
             assert captured["session.create"]["pluginDirectories"] == plugin_dirs
+            assert captured["session.create"]["disabledMcpServers"] == disabled_mcp_servers
             assert captured["session.create"]["largeOutput"] == expected_large_output_wire
             assert captured["session.resume"]["pluginDirectories"] == plugin_dirs
+            assert captured["session.resume"]["disabledMcpServers"] == disabled_mcp_servers
             assert captured["session.resume"]["largeOutput"] == expected_large_output_wire
+
+            empty_session = await client.create_session(
+                on_permission_request=PermissionHandler.approve_all,
+                disabled_mcp_servers=[],
+            )
+            await client.resume_session(
+                empty_session.session_id,
+                on_permission_request=PermissionHandler.approve_all,
+                disabled_mcp_servers=[],
+            )
+            assert captured["session.create"]["disabledMcpServers"] == []
+            assert captured["session.resume"]["disabledMcpServers"] == []
+
+            omitted_session = await client.create_session(
+                on_permission_request=PermissionHandler.approve_all,
+            )
+            await client.resume_session(
+                omitted_session.session_id,
+                on_permission_request=PermissionHandler.approve_all,
+            )
+            assert "disabledMcpServers" not in captured["session.create"]
+            assert "disabledMcpServers" not in captured["session.resume"]
         finally:
             await client.force_stop()
 
diff --git a/python/test_commands_and_elicitation.py b/python/test_commands_and_elicitation.py
index b1905b9350..5710d106bc 100644
--- a/python/test_commands_and_elicitation.py
+++ b/python/test_commands_and_elicitation.py
@@ -80,7 +80,7 @@ async def mock_request(method, params, **kwargs):
             payload = captured["session.create"]
             assert payload["commands"] == [
                 {"name": "deploy", "description": "Deploy the app"},
-                {"name": "rollback", "description": None},
+                {"name": "rollback", "description": ""},
             ]
         finally:
             await client.force_stop()
diff --git a/python/test_event_forward_compatibility.py b/python/test_event_forward_compatibility.py
index 1ffbd59c54..2e8015a97d 100644
--- a/python/test_event_forward_compatibility.py
+++ b/python/test_event_forward_compatibility.py
@@ -18,10 +18,12 @@
     ElicitationCompletedAction,
     ElicitationRequestedMode,
     ElicitationRequestedSchema,
+    ManagedSettingsResolvedSource,
     PermissionPromptRequestMemory,
     PermissionRequestMemory,
     PermissionRequestMemoryAction,
     SessionEventType,
+    SessionManagedSettingsResolvedData,
     SessionTaskCompleteData,
     UserMessageAgentMode,
     session_event_from_dict,
@@ -136,6 +138,42 @@ def test_explicit_generated_symbols_remain_available(self):
         )
         assert schema.to_dict()["type"] == "object"
 
+    def test_managed_settings_client_provenance_round_trips(self):
+        """Managed settings events should preserve truthful client provenance."""
+        assert [source.value for source in ManagedSettingsResolvedSource] == [
+            "server",
+            "device",
+            "client",
+            "mixed",
+            "none",
+        ]
+
+        client = SessionManagedSettingsResolvedData(
+            bypass_permissions_disabled=True,
+            client_managed=True,
+            device_managed=False,
+            fail_closed=False,
+            managed_keys=["permissions"],
+            server_managed=False,
+            source=ManagedSettingsResolvedSource.CLIENT,
+        )
+        serialized = client.to_dict()
+        assert serialized["source"] == "client"
+        assert serialized["clientManaged"] is True
+        assert SessionManagedSettingsResolvedData.from_dict(serialized) == client
+
+        mixed = SessionManagedSettingsResolvedData(
+            bypass_permissions_disabled=True,
+            device_managed=True,
+            fail_closed=False,
+            managed_keys=["permissions"],
+            server_managed=True,
+            source=ManagedSettingsResolvedSource.MIXED,
+        )
+        serialized = mixed.to_dict()
+        assert serialized["source"] == "mixed"
+        assert "clientManaged" not in serialized
+
     def test_data_shim_preserves_raw_mapping_values(self):
         """Compatibility Data should keep arbitrary nested mappings as plain dicts."""
         parsed = Data.from_dict(
diff --git a/python/test_github_token_provider.py b/python/test_github_token_provider.py
new file mode 100644
index 0000000000..5b203f3e34
--- /dev/null
+++ b/python/test_github_token_provider.py
@@ -0,0 +1,273 @@
+from __future__ import annotations
+
+import asyncio
+from typing import Any, cast
+
+import pytest
+
+from copilot import (
+    CopilotClient,
+    GitHubTokenAcquireReason,
+    RuntimeConnection,
+)
+from copilot._jsonrpc import JsonRpcClient, JsonRpcError
+from copilot.rpc import GitHubTokenAcquireRequest
+
+
+class FakeJsonRpcClient:
+    def __init__(self, *, fail_method: str | None = None) -> None:
+        self.fail_method = fail_method
+        self.requests: list[tuple[str, dict[str, Any]]] = []
+        self.request_handlers: dict[str, Any] = {}
+        self.notification_method_handlers: dict[str, Any] = {}
+
+    async def request(self, method: str, params: dict[str, Any], **kwargs: Any) -> dict[str, Any]:
+        self.requests.append((method, params))
+        if method == self.fail_method:
+            raise RuntimeError(f"{method} failed")
+        if method in {"session.create", "session.resume"}:
+            response = {"sessionId": params["sessionId"]}
+            callback = kwargs.get("on_response_inline")
+            if callback is not None:
+                callback(response)
+            return response
+        if method == "session.destroy":
+            return {}
+        if method == "session.delete":
+            return {"success": True}
+        raise RuntimeError(f"Unexpected method: {method}")
+
+    async def stop(self) -> None:
+        pass
+
+    def set_request_handler(self, method: str, handler: Any) -> None:
+        self.request_handlers[method] = handler
+
+    def set_notification_method_handler(self, method: str, handler: Any) -> None:
+        self.notification_method_handlers[method] = handler
+
+
+class ConcurrentResumeJsonRpcClient(FakeJsonRpcClient):
+    def __init__(self) -> None:
+        super().__init__()
+        self.resume_responses: list[asyncio.Future[dict[str, Any]]] = []
+
+    async def request(self, method: str, params: dict[str, Any], **kwargs: Any) -> dict[str, Any]:
+        self.requests.append((method, params))
+        if method == "session.create":
+            response = {"sessionId": params["sessionId"]}
+            callback = kwargs.get("on_response_inline")
+            if callback is not None:
+                callback(response)
+            return response
+        if method == "session.resume":
+            response = asyncio.get_running_loop().create_future()
+            self.resume_responses.append(response)
+            return await response
+        raise RuntimeError(f"Unexpected method: {method}")
+
+
+def make_client(fake: FakeJsonRpcClient) -> CopilotClient:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    client._client = cast(JsonRpcClient, fake)
+    return client
+
+
+class TestGitHubTokenProvider:
+    async def test_mutual_exclusion(self) -> None:
+        client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+
+        with pytest.raises(
+            ValueError, match="github_token and github_token_provider are mutually exclusive"
+        ):
+            await client.create_session(
+                github_token="static",
+                github_token_provider=lambda _: {"kind": "cancelled"},
+            )
+
+    async def test_wire_mapping_token_and_cancelled(self) -> None:
+        fake = FakeJsonRpcClient()
+        client = make_client(fake)
+        observed: list[dict[str, Any]] = []
+
+        async def provider(args):
+            observed.append(dict(args))
+            if len(observed) == 1:
+                return {
+                    "kind": "token",
+                    "accessToken": "secret-token",
+                    "tokenType": "Bearer",
+                    "expiresIn": 28_800,
+                }
+            return {"kind": "cancelled"}
+
+        await client.create_session(
+            session_id="python-session",
+            github_token_provider=provider,
+        )
+        create_payload = fake.requests[0][1]
+        registration_id = create_payload["gitHubTokenProviderRegistrationId"]
+        assert "github_token_provider" not in create_payload
+        assert "gitHubToken" not in create_payload
+        client._register_client_global_handlers()
+        get_token = fake.request_handlers["gitHubToken.getToken"]
+
+        token = await get_token(
+            {
+                "registrationId": registration_id,
+                "host": "github.example.com",
+                "reason": "initial",
+            }
+        )
+        cancelled = await get_token(
+            {
+                "registrationId": registration_id,
+                "host": "github.example.com",
+                "reason": "refresh",
+                "sessionId": "python-session",
+            }
+        )
+
+        assert token == {
+            "kind": "token",
+            "accessToken": "secret-token",
+            "tokenType": "Bearer",
+            "expiresIn": 28_800,
+        }
+        assert cancelled == {"kind": "cancelled"}
+        assert observed == [
+            {
+                "host": "github.example.com",
+                "session_id": "python-session",
+                "reason": GitHubTokenAcquireReason.INITIAL,
+            },
+            {
+                "host": "github.example.com",
+                "session_id": "python-session",
+                "reason": GitHubTokenAcquireReason.REFRESH,
+            },
+        ]
+
+    async def test_callback_and_unknown_registration_errors(self) -> None:
+        fake = FakeJsonRpcClient()
+        client = make_client(fake)
+        failure = RuntimeError("credential broker failed")
+
+        def provider(_args):
+            raise failure
+
+        await client.create_session(
+            session_id="error-session",
+            github_token_provider=provider,
+        )
+        registration_id = fake.requests[0][1]["gitHubTokenProviderRegistrationId"]
+
+        with pytest.raises(RuntimeError, match="credential broker failed") as exc:
+            await client._github_token_provider_adapter.get_token(
+                GitHubTokenAcquireRequest(
+                    registration_id=registration_id,
+                    host="github.com",
+                    reason=GitHubTokenAcquireReason.INITIAL,
+                )
+            )
+        assert exc.value is failure
+
+        with pytest.raises(JsonRpcError, match="No GitHub token provider registered"):
+            await client._github_token_provider_adapter.get_token(
+                GitHubTokenAcquireRequest(
+                    registration_id="unknown",
+                    host="github.com",
+                    reason=GitHubTokenAcquireReason.REFRESH,
+                )
+            )
+
+    async def test_failure_session_close_and_client_close_cleanup(self) -> None:
+        failing = make_client(FakeJsonRpcClient(fail_method="session.create"))
+        with pytest.raises(RuntimeError, match="session.create failed"):
+            await failing.create_session(github_token_provider=lambda _: {"kind": "cancelled"})
+        assert failing._github_token_providers == {}
+
+        fake = FakeJsonRpcClient()
+        client = make_client(fake)
+        first = await client.create_session(
+            session_id="first",
+            github_token_provider=lambda _: {"kind": "cancelled"},
+        )
+        await client.create_session(
+            session_id="second",
+            github_token_provider=lambda _: {"kind": "cancelled"},
+        )
+        assert len(client._github_token_providers) == 2
+
+        await first.disconnect()
+        assert len(client._github_token_providers) == 1
+        await client.delete_session("second")
+        assert client._github_token_providers == {}
+        await client.force_stop()
+        assert client._github_token_providers == {}
+
+    async def test_resume_rotates_provider(self) -> None:
+        fake = FakeJsonRpcClient()
+        client = make_client(fake)
+        calls: list[str] = []
+
+        await client.create_session(
+            session_id="resumed",
+            github_token_provider=lambda _: calls.append("first") or {"kind": "cancelled"},
+        )
+        first_registration = fake.requests[0][1]["gitHubTokenProviderRegistrationId"]
+        await client.resume_session(
+            "resumed",
+            github_token_provider=lambda _: calls.append("second") or {"kind": "cancelled"},
+        )
+        second_registration = fake.requests[1][1]["gitHubTokenProviderRegistrationId"]
+
+        with pytest.raises(JsonRpcError):
+            await client._github_token_provider_adapter.get_token(
+                GitHubTokenAcquireRequest(
+                    registration_id=first_registration,
+                    host="github.com",
+                    reason=GitHubTokenAcquireReason.REFRESH,
+                )
+            )
+        assert await client._github_token_provider_adapter.get_token(
+            GitHubTokenAcquireRequest(
+                registration_id=second_registration,
+                host="github.com",
+                reason=GitHubTokenAcquireReason.REFRESH,
+            )
+        ) == {"kind": "cancelled"}
+        assert calls == ["second"]
+
+    async def test_concurrent_resume_keeps_pending_registration(self) -> None:
+        fake = ConcurrentResumeJsonRpcClient()
+        client = make_client(fake)
+        await client.create_session(
+            session_id="concurrent",
+            github_token_provider=lambda _: {"kind": "cancelled"},
+        )
+
+        first_resume = asyncio.create_task(
+            client.resume_session(
+                "concurrent",
+                github_token_provider=lambda _: {"kind": "cancelled"},
+            )
+        )
+        second_resume = asyncio.create_task(
+            client.resume_session(
+                "concurrent",
+                github_token_provider=lambda _: {"kind": "cancelled"},
+            )
+        )
+        while len(fake.resume_responses) < 2:
+            await asyncio.sleep(0)
+
+        fake.resume_responses[0].set_result({"sessionId": "concurrent"})
+        await first_resume
+        assert len(client._github_token_providers) == 2
+
+        fake.resume_responses[1].set_result({"sessionId": "concurrent"})
+        await second_resume
+        assert len(client._github_token_providers) == 1
+        second_registration = fake.requests[2][1]["gitHubTokenProviderRegistrationId"]
+        assert second_registration in client._github_token_providers
diff --git a/python/test_jsonrpc.py b/python/test_jsonrpc.py
index 56ce44e374..2f2ecafce9 100644
--- a/python/test_jsonrpc.py
+++ b/python/test_jsonrpc.py
@@ -5,6 +5,7 @@
 of large payloads and short reads from pipes.
 """
 
+import asyncio
 import io
 import json
 import os
@@ -13,7 +14,7 @@
 
 import pytest
 
-from copilot._jsonrpc import JsonRpcClient
+from copilot._jsonrpc import JsonRpcClient, ProcessExitedError
 
 
 class MockProcess:
@@ -162,6 +163,29 @@ def test_read_exact_partial_data_raises_eof(self):
             client._read_exact(100)
 
 
+@pytest.mark.asyncio
+async def test_process_exit_waits_for_stderr_reader():
+    process = MockProcess()
+    process.returncode = 1
+    client = JsonRpcClient(process)
+    future = asyncio.get_running_loop().create_future()
+    client.pending_requests["request-id"] = future
+
+    def capture_stderr():
+        time.sleep(0.01)
+        with client._stderr_lock:
+            client._stderr_output.append("unsupported argument\n")
+
+    client._stderr_thread = threading.Thread(target=capture_stderr)
+    client._stderr_thread.start()
+
+    client._fail_pending_requests()
+
+    await asyncio.sleep(0)
+    with pytest.raises(ProcessExitedError, match=r"stderr: unsupported argument"):
+        future.result()
+
+
 class TestReadMessageWithLargePayloads:
     """Tests for _read_message() with large JSON-RPC messages"""
 
diff --git a/python/test_permission_decision_context.py b/python/test_permission_decision_context.py
new file mode 100644
index 0000000000..70b3a74de5
--- /dev/null
+++ b/python/test_permission_decision_context.py
@@ -0,0 +1,104 @@
+from unittest.mock import AsyncMock, MagicMock
+
+from copilot import PermissionResponseCapability
+from copilot.rpc import (
+    PermissionDecisionApproveOnce,
+    PermissionDecisionContext,
+    PermissionDecisionOutcome,
+    PermissionDecisionSource,
+    PermissionDecisionSurface,
+)
+from copilot.session import (
+    AttributedPermissionResult,
+    CopilotSession,
+    PermissionNoResult,
+    create_attributed_permission_result,
+)
+from copilot.session_events import PermissionRequestRead
+
+
+def test_permission_response_capability_is_exported_from_package_root() -> None:
+    assert PermissionResponseCapability.INTERACTIVE.value == "interactive"
+
+
+def _context() -> PermissionDecisionContext:
+    return PermissionDecisionContext(
+        outcome=PermissionDecisionOutcome.AUTO_APPROVED,
+        source=PermissionDecisionSource.HOST_POLICY,
+        surface=PermissionDecisionSurface.SDK,
+    )
+
+
+def _session_with_captured_rpc() -> tuple[CopilotSession, AsyncMock]:
+    session = CopilotSession("session-1", client=None)
+    handle = AsyncMock()
+    rpc = MagicMock()
+    rpc.permissions.handle_pending_permission_request = handle
+    session._rpc = rpc
+    return session, handle
+
+
+async def test_decision_context_serialized_as_sibling_of_result() -> None:
+    session, handle = _session_with_captured_rpc()
+    request = PermissionRequestRead(intention="Read", path="/workspace/file.txt")
+
+    def handler(_request, _invocation):
+        return create_attributed_permission_result(PermissionDecisionApproveOnce(), _context())
+
+    await session._execute_permission_and_respond("permission-1", request, handler)
+
+    handle.assert_awaited_once()
+    sent = handle.await_args.args[0]
+    params = sent.to_dict()
+
+    assert params["decisionContext"] == {
+        "outcome": "auto_approved",
+        "source": "host_policy",
+        "surface": "sdk",
+    }
+    assert "decisionContext" not in params["result"]
+    assert params["result"]["kind"] == "approve-once"
+
+
+async def test_no_context_omits_decision_context_key() -> None:
+    session, handle = _session_with_captured_rpc()
+    request = PermissionRequestRead(intention="Read", path="/workspace/file.txt")
+
+    def handler(_request, _invocation):
+        return PermissionDecisionApproveOnce()
+
+    await session._execute_permission_and_respond("permission-1", request, handler)
+
+    handle.assert_awaited_once()
+    params = handle.await_args.args[0].to_dict()
+
+    assert "decisionContext" not in params
+    assert params["result"]["kind"] == "approve-once"
+
+
+def test_attributed_result_replaces_rather_than_nests() -> None:
+    first = PermissionDecisionContext(
+        outcome=PermissionDecisionOutcome.PROMPTED_USER,
+        source=PermissionDecisionSource.HUMAN_RESPONSE,
+        surface=PermissionDecisionSurface.TUI,
+    )
+    second = _context()
+
+    once_wrapped = create_attributed_permission_result(PermissionDecisionApproveOnce(), first)
+    twice_wrapped = create_attributed_permission_result(once_wrapped, second)
+
+    assert isinstance(twice_wrapped, AttributedPermissionResult)
+    assert isinstance(twice_wrapped.result, PermissionDecisionApproveOnce)
+    assert twice_wrapped.decision_context is second
+
+
+async def test_no_result_with_context_still_suppresses_response() -> None:
+    session, handle = _session_with_captured_rpc()
+    request = PermissionRequestRead(intention="Read", path="/workspace/file.txt")
+
+    def handler(_request, _invocation):
+        return create_attributed_permission_result(PermissionNoResult(), _context())
+
+    await session._execute_permission_and_respond("permission-1", request, handler)
+
+    handle.assert_not_awaited()
diff --git a/python/test_rpc_generated.py b/python/test_rpc_generated.py
index 5556a77c38..a23173727a 100644
--- a/python/test_rpc_generated.py
+++ b/python/test_rpc_generated.py
@@ -6,6 +6,7 @@
 import pytest
 
 from copilot.rpc import (
+    BuiltinToolInputSchemaType,
     CommandsApi,
     CommandsInvokeRequest,
     CommandsRespondToQueuedCommandRequest,
@@ -17,6 +18,8 @@
     RemoteSessionMetadataValue,
     SessionList,
     SlashCommandTextResult,
+    TaskAgentInfo,
+    UIElicitationSchemaType,
 )
 
 
@@ -41,6 +44,10 @@ def test_remote_control_status_deserializes_string_discriminated_union():
     assert result.status.to_dict() == {"state": "off"}
 
 
+def test_ui_elicitation_schema_type_preserves_public_alias():
+    assert UIElicitationSchemaType is BuiltinToolInputSchemaType
+
+
 def test_session_list_deserializes_boolean_discriminated_entries():
     payload = {
         "sessions": [
@@ -73,6 +80,25 @@ def test_session_list_deserializes_boolean_discriminated_entries():
     assert remote.repository.owner == "github"
 
 
+def test_task_agent_info_deserializes_integral_float_milliseconds():
+    task = TaskAgentInfo.from_dict(
+        {
+            "agentType": "general-purpose",
+            "description": "Example task",
+            "id": "agent-1",
+            "prompt": "Do the task",
+            "startedAt": "2026-08-19T12:00:00Z",
+            "status": "running",
+            "toolCallId": "tool-1",
+            "type": "agent",
+            "activeTimeMs": 43.0,
+        }
+    )
+
+    assert task.active_time_ms == 43
+    assert task.to_dict()["activeTimeMs"] == 43
+
+
 @pytest.mark.parametrize(
     ("handled", "expected_type"),
     [(True, QueuedCommandHandled), (False, QueuedCommandNotHandled)],
diff --git a/python/test_rpc_timeout.py b/python/test_rpc_timeout.py
index 7e85729cab..6a1535c301 100644
--- a/python/test_rpc_timeout.py
+++ b/python/test_rpc_timeout.py
@@ -54,7 +54,7 @@ async def test_custom_timeout_forwarded(self):
     @pytest.mark.asyncio
     async def test_timeout_on_session_params_method(self):
         client = AsyncMock()
-        client.request = AsyncMock(return_value={"mode": "plan"})
+        client.request = AsyncMock(return_value={"modelChanged": False, "status": "completed"})
         api = ModeApi(client, "sess-1")
 
         await api.set(ModeSetRequest(mode=SessionMode.PLAN), timeout=120.0)
diff --git a/python/test_session.py b/python/test_session.py
new file mode 100644
index 0000000000..dd2d0a72f6
--- /dev/null
+++ b/python/test_session.py
@@ -0,0 +1,69 @@
+"""CopilotSession unit tests."""
+
+import asyncio
+from datetime import UTC, datetime
+from unittest.mock import AsyncMock, Mock
+from uuid import uuid4
+
+import pytest
+
+from copilot.session import CopilotSession
+from copilot.session_events import (
+    AssistantMessageData,
+    SessionEvent,
+    SessionEventType,
+    SessionIdleData,
+    SessionMode,
+)
+
+
+def _event(data, event_type: SessionEventType) -> SessionEvent:
+    return SessionEvent(
+        data=data,
+        id=uuid4(),
+        timestamp=datetime.now(UTC),
+        type=event_type,
+    )
+
+
+@pytest.mark.asyncio
+async def test_send_and_wait_skips_autopilot_continuation_idle():
+    client = Mock()
+    client.request = AsyncMock(return_value={"messageId": "message-1"})
+    session = CopilotSession("session-1", client)
+
+    pending = asyncio.create_task(session.send_and_wait("keep going"))
+    await asyncio.sleep(0)
+    client.request.assert_awaited_once()
+
+    session._dispatch_event(
+        _event(
+            AssistantMessageData(content="intermediate", message_id="assistant-1"),
+            SessionEventType.ASSISTANT_MESSAGE,
+        )
+    )
+    session._dispatch_event(
+        _event(
+            SessionIdleData(mode=SessionMode.AUTOPILOT),
+            SessionEventType.SESSION_IDLE,
+        )
+    )
+    assert not pending.done()
+
+    session._dispatch_event(
+        _event(
+            AssistantMessageData(content="final", message_id="assistant-2"),
+            SessionEventType.ASSISTANT_MESSAGE,
+        )
+    )
+    session._dispatch_event(
+        _event(
+            SessionIdleData(mode=SessionMode.INTERACTIVE),
+            SessionEventType.SESSION_IDLE,
+        )
+    )
+
+    result = await asyncio.wait_for(pending, timeout=1)
+    assert result is not None
+    assert isinstance(result.data, AssistantMessageData)
+    assert result.data.content == "final"
diff --git a/python/test_tool_set.py b/python/test_tool_set.py
index 0674b488a2..3468ccee34 100644
--- a/python/test_tool_set.py
+++ b/python/test_tool_set.py
@@ -248,6 +248,7 @@ def test_empty_mode_defaults(self):
             "coauthorEnabled": False,
             "manageScheduleEnabled": False,
             "installedPlugins": [],
+            "includedBuiltinSkills": [],
         }
 
     def test_empty_mode_caller_wins(self):
@@ -258,14 +259,105 @@ def test_empty_mode_caller_wins(self):
             "coauthorEnabled": True,
             "manageScheduleEnabled": True,
             "installedPlugins": [],
+            "includedBuiltinSkills": [],
         }
 
+    def test_empty_mode_preserves_explicit_builtin_skill_allowlist(self):
+        patch = _post_create_options_patch("empty", None, None, None, None, ["code-review"])
+        assert patch is not None
+        assert patch["includedBuiltinSkills"] == ["code-review"]
+
     def test_copilot_cli_returns_none_when_unset(self):
         assert _post_create_options_patch("copilot-cli", None, None, None, None) is None
+        # Non-empty mode never injects the built-in skill restriction.
+        assert "includedBuiltinSkills" not in (
+            _post_create_options_patch("copilot-cli", True, None, False, None) or {}
+        )
 
     def test_copilot_cli_passes_through_explicit_values(self):
-        patch = _post_create_options_patch("copilot-cli", True, None, False, None)
-        assert patch == {"skipCustomInstructions": True, "coauthorEnabled": False}
+        patch = _post_create_options_patch("copilot-cli", True, None, False, None, ["code-review"])
+        assert patch == {
+            "skipCustomInstructions": True,
+            "coauthorEnabled": False,
+            "includedBuiltinSkills": ["code-review"],
+        }
+
+
+class _CapturingOptions:
+    """Captures the params passed to ``session.rpc.options.update``."""
+
+    def __init__(self) -> None:
+        self.captured: list = []
+
+    async def update(self, params) -> None:
+        self.captured.append(params)
+
+
+class _CapturingRpc:
+    def __init__(self) -> None:
+        self.options = _CapturingOptions()
+
+
+class _FakeSession:
+    def __init__(self, session_id: str = "sid-1") -> None:
+        self.session_id = session_id
+        self.rpc = _CapturingRpc()
+
+    async def disconnect(self) -> None:
+        pass
+
+
+class TestApplyPostCreateOptionsPatch:
+    """Guards the translation from the patch dict to ``SessionUpdateOptionsParams``.
+
+    This covers the wire request emitted on both create and resume, which both
+    funnel through ``_apply_post_create_options_patch``.
+    """
+
+    def _make_client(self):
+        return CopilotClient(
+            mode="empty",
+            connection=UriRuntimeConnection(url="http://localhost:1234"),
+        )
+
+    async def test_empty_mode_sends_included_builtin_skills_empty(self):
+        client = self._make_client()
+        session = _FakeSession()
+        await client._apply_post_create_options_patch(session, "empty", None, None, None, None)
+        assert len(session.rpc.options.captured) == 1
+        params = session.rpc.options.captured[0]
+        # The Empty post-patch must reach the wire request as an empty list, not
+        # be silently dropped during translation.
+        assert params.included_builtin_skills == []
+        assert params.installed_plugins == []
+
+    async def test_empty_mode_explicit_allowlist_reaches_wire(self):
+        client = self._make_client()
+        session = _FakeSession()
+        await client._apply_post_create_options_patch(
+            session, "empty", False, False, True, True, ["code-review"]
+        )
+        params = session.rpc.options.captured[0]
+        assert params.included_builtin_skills == ["code-review"]
+
+    async def test_copilot_cli_mode_omits_included_builtin_skills(self):
+        client = self._make_client()
+        session = _FakeSession()
+        # Non-empty mode with no overrides sends no patch at all.
+        await client._apply_post_create_options_patch(
+            session, "copilot-cli", None, None, None, None
+        )
+        assert session.rpc.options.captured == []
+
+    async def test_copilot_cli_mode_never_sets_included_builtin_skills(self):
+        client = self._make_client()
+        session = _FakeSession()
+        await client._apply_post_create_options_patch(
+            session, "copilot-cli", True, None, False, None
+        )
+        params = session.rpc.options.captured[0]
+        # copilot-cli mode must not inject the built-in skill restriction.
+        assert params.included_builtin_skills is None
 
 
 class TestClientConstruction:
diff --git a/python/test_tools.py b/python/test_tools.py
index 97de41df42..031f68c053 100644
--- a/python/test_tools.py
+++ b/python/test_tools.py
@@ -427,6 +427,39 @@ class Record(BaseModel):
         assert set(parsed["tags"]) == {"python", "sdk"}
         assert result.result_type == "success"
 
+    def test_plain_dict_with_non_primitive_fields_is_serialized(self):
+        from datetime import date, datetime, time
+        from decimal import Decimal
+        from enum import Enum
+        from uuid import UUID
+
+        class Status(Enum):
+            ACTIVE = "active"
+
+        result = _normalize_result(
+            {
+                "id": UUID("12345678-1234-5678-1234-567812345678"),
+                "created": datetime(2026, 1, 15, 10, 30, 0),
+                "day": date(2026, 1, 15),
+                "at": time(10, 30, 0),
+                "score": Decimal("99.5"),
+                "status": Status.ACTIVE,
+                "tags": {"python", "sdk"},
+            }
+        )
+        parsed = json.loads(result.text_result_for_llm)
+        assert parsed == {
+            "id": "12345678-1234-5678-1234-567812345678",
+            "created": "2026-01-15T10:30:00",
+            "day": "2026-01-15",
+            "at": "10:30:00",
+            "score": "99.5",
+            "status": "active",
+            "tags": parsed["tags"],
+        }
+        assert set(parsed["tags"]) == {"python", "sdk"}
+        assert result.result_type == "success"
+
     def test_raises_for_unserializable_value(self):
         # Functions cannot be JSON serialized
         with pytest.raises(TypeError, match="Failed to serialize"):
diff --git a/rust/README.md b/rust/README.md
index 3140900447..323d525d37 100644
--- a/rust/README.md
+++ b/rust/README.md
@@ -4,7 +4,7 @@ A Rust SDK for programmatic access to the GitHub Copilot CLI.
 
 See [github/copilot-sdk](https://github.com/github/copilot-sdk) for the equivalent SDKs in TypeScript, Python, Go, .NET, and Java. The Rust SDK seeks parity with those SDKs; see [Differences From Other SDKs](#differences-from-other-sdks) below for the small set of intentional divergences.
 
-**Releases:** [github.com/github/copilot-sdk/releases?q=rust%2F](https://github.com/github/copilot-sdk/releases?q=rust%2F) — per-version release notes for the Rust crate.
+**Releases:** [github.com/github/copilot-sdk/releases](https://github.com/github/copilot-sdk/releases) — combined release notes for all SDK languages.
 
 ## Prerequisites
 
@@ -274,6 +274,34 @@ let config = SessionConfig {
 let session = client.create_session(config).await?;
 ```
 
+For rotating per-session GitHub credentials, install a `GitHubTokenProvider`
+instead of setting `github_token`:
+
+```rust,ignore
+use github_copilot_sdk::{
+    GitHubToken, GitHubTokenProviderArgs, GitHubTokenProviderResult, SessionConfig,
+};
+
+let provider = Arc::new(|args: GitHubTokenProviderArgs| async move {
+    let access_token = acquire_for_host(&args.host).await?;
+    Ok(GitHubTokenProviderResult::Token(GitHubToken::new(
+        access_token,
+        8 * 60 * 60,
+    )))
+});
+let config = SessionConfig::default().with_github_token_provider(provider);
+```
+
+The remaining lifetime is required and must be positive when the callback
+completes; production GitHub tokens typically last eight hours. Static
+`github_token` and a provider are mutually exclusive. The same provider API is
+available on `ResumeSessionConfig`.
+
+Initial acquisition runs during session creation or resume. Cancellation,
+provider errors, and invalid token responses reject that operation instead of
+falling back to ambient authentication. Idle sessions refresh only before their
+next credential-consuming operation; there is no background refresh timer.
+
 ### Session Hooks
 
 Hooks intercept CLI behavior at lifecycle points — tool use, prompt submission, session start/end, and errors. Install a `SessionHooks` impl with [`SessionConfig::with_hooks`] — the SDK auto-enables `hooks` in `SessionConfig` when one is set.
diff --git a/rust/RELEASING.md b/rust/RELEASING.md
index de0252de8b..06e362f54e 100644
--- a/rust/RELEASING.md
+++ b/rust/RELEASING.md
@@ -1,8 +1,7 @@
 # Releasing `github-copilot-sdk`
 
-The Rust crate ships through the same unified `publish.yml` workflow
-as the Node, .NET, and Python SDKs. There is no Rust-specific release
-workflow.
+The Rust crate ships through the unified `publish.yml` workflow
+alongside the other SDKs. There is no Rust-specific release workflow.
 
 ## TL;DR
 
@@ -16,9 +15,11 @@ workflow.
      prerelease version requirement to install it.
    - `unstable` — skipped for Rust (Cargo doesn't have a clean
      equivalent of npm's `unstable` dist-tag).
-4. The workflow publishes all four SDKs at the shared computed
-   version, tags `rust/vX.Y.Z`, and creates a Rust-scoped GitHub
-   Release with auto-generated notes since the previous Rust tag.
+4. For `latest` and `prerelease`, the workflow publishes all SDKs at
+   the shared computed version, tags `rust/vX.Y.Z` for source
+   traceability, and creates one combined `vX.Y.Z` GitHub Release.
+   The `unstable` channel publishes only the Node.js SDK and does not
+   create a GitHub Release.
 
 ## Version, tag, and release notes
 
@@ -26,14 +27,11 @@ workflow.
   as a placeholder. CI overrides it at publish time with the version
   computed by `publish.yml` (or an explicit `version` workflow input).
 - **Tag:** `rust/vX.Y.Z` (matches the `go/vX.Y.Z` style used elsewhere
-  in this repo). The historical `rust-v0.1.0` tag from the
-  release-plz era stays valid as a starting point for auto-generated
-  release notes.
-- **Release notes:** auto-generated by `gh release --generate-notes`
-  from PR titles between the previous Rust tag and the new one.
-  Write descriptive PR titles for any change that touches the Rust
-  surface; that's the only place those changes will be visible to
-  Rust users.
+  in this repo). The tag identifies the source used for that crate
+  version.
+- **Release notes:** generated for the combined `vX.Y.Z` GitHub
+  Release. Write descriptive PR titles for changes that touch the Rust
+  surface so they are represented accurately in the shared notes.
 
 ## Cargo prerelease semantics
 
@@ -59,8 +57,8 @@ cargo yank --version X.Y.Z github-copilot-sdk
 
 Yanking does *not* delete the version — existing `Cargo.lock` files
 keep working — but it stops new resolutions from picking it. Follow
-up with a patch release that fixes the bug, and add a note to the
-yanked version's GitHub Release explaining why.
+up with a patch release that fixes the bug, and update the combined
+GitHub Release notes to explain why.
 
 Reverse with `cargo yank --undo --version X.Y.Z github-copilot-sdk`
 if the yank was a mistake.
@@ -90,6 +88,5 @@ git push origin rust/vX.Y.Z
 perl -i -pe 's/^version = ".*"$/version = "0.0.0-dev"/' Cargo.toml
 ```
 
-Manual publishes skip the auto-generated GitHub Release. Run
-`gh release create rust/vX.Y.Z --generate-notes` after pushing the
-tag.
+Manual publishes skip the combined GitHub Release. Create or update the
+matching `vX.Y.Z` release after pushing the tag.
diff --git a/rust/examples/manual_tool_resume.rs b/rust/examples/manual_tool_resume.rs
index 85add798a1..ad8ad5a044 100644
--- a/rust/examples/manual_tool_resume.rs
+++ b/rust/examples/manual_tool_resume.rs
@@ -113,6 +113,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .rpc()
         .permissions()
         .handle_pending_permission_request(PermissionDecisionRequest {
+            decision_context: None,
             request_id: permission.request_id,
             result: PermissionDecision::ApproveOnce(PermissionDecisionApproveOnce {
                 approved_interactively: None,
diff --git a/rust/src/errors.rs b/rust/src/errors.rs
index 6e05bbfae1..70f4c14ff1 100644
--- a/rust/src/errors.rs
+++ b/rust/src/errors.rs
@@ -218,6 +218,8 @@ pub enum ErrorKind {
     },
     /// Invalid combination of options or configuration.
     InvalidConfig,
+    /// A session-scoped GitHub token provider failed or returned invalid data.
+    GitHubTokenProvider,
 }
 
 impl fmt::Display for ErrorKind {
@@ -238,6 +240,7 @@ impl fmt::Display for ErrorKind {
                 write!(f, "binary not found: {name}")
             }
             ErrorKind::InvalidConfig => write!(f, "invalid configuration"),
+            ErrorKind::GitHubTokenProvider => write!(f, "GitHub token provider error"),
         }
     }
 }
diff --git a/rust/src/generated/api_types.rs b/rust/src/generated/api_types.rs
index b64a13c4a5..bdf291e599 100644
--- a/rust/src/generated/api_types.rs
+++ b/rust/src/generated/api_types.rs
@@ -10,9 +10,10 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 
 use super::session_events::{
-    AbortReason, ContextTier, McpServerSource, McpServerStatus, PermissionPromptRequest,
-    PermissionRule, ReasoningSummary, SessionLimitsConfig, SessionMode, ShutdownType, SkillSource,
-    UserToolSessionApproval, Verbosity,
+    AbortReason, ContextTier, McpOauthHttpResponse, McpOauthWWWAuthenticateParams, McpServerSource,
+    McpServerStatus, ModelChangeSource, OmittedBinaryOmittedReason, PermissionMode,
+    PermissionPromptRequest, PermissionRule, ReasoningSummary, SessionLimitsConfig, SessionMode,
+    ShutdownType, SkillSource, TaskCompletionOutcome, UserToolSessionApproval, Verbosity,
 };
 use crate::types::{RequestId, SessionEvent, SessionId};
 
@@ -56,12 +57,18 @@ pub mod rpc_methods {
     pub const MCP_CONFIG_RELOAD: &str = "mcp.config.reload";
     /// `mcp.discover`
     pub const MCP_DISCOVER: &str = "mcp.discover";
+    /// `mcp.planInstall`
+    pub const MCP_PLANINSTALL: &str = "mcp.planInstall";
     /// `extensions.discover`
     pub const EXTENSIONS_DISCOVER: &str = "extensions.discover";
     /// `extensions.enable`
     pub const EXTENSIONS_ENABLE: &str = "extensions.enable";
     /// `extensions.disable`
     pub const EXTENSIONS_DISABLE: &str = "extensions.disable";
+    /// `registerExtensionLaunchProvider`
+    pub const REGISTEREXTENSIONLAUNCHPROVIDER: &str = "registerExtensionLaunchProvider";
+    /// `catalog.search`
+    pub const CATALOG_SEARCH: &str = "catalog.search";
     /// `plugins.list`
     pub const PLUGINS_LIST: &str = "plugins.list";
     /// `plugins.install`
@@ -76,6 +83,8 @@ pub mod rpc_methods {
     pub const PLUGINS_ENABLE: &str = "plugins.enable";
     /// `plugins.disable`
     pub const PLUGINS_DISABLE: &str = "plugins.disable";
+    /// `plugins.builtin.set`
+    pub const PLUGINS_BUILTIN_SET: &str = "plugins.builtin.set";
     /// `plugins.marketplaces.list`
     pub const PLUGINS_MARKETPLACES_LIST: &str = "plugins.marketplaces.list";
     /// `plugins.marketplaces.add`
@@ -88,6 +97,8 @@ pub mod rpc_methods {
     pub const PLUGINS_MARKETPLACES_REFRESH: &str = "plugins.marketplaces.refresh";
     /// `skills.config.setDisabledSkills`
     pub const SKILLS_CONFIG_SETDISABLEDSKILLS: &str = "skills.config.setDisabledSkills";
+    /// `skills.config.setSkillDisabled`
+    pub const SKILLS_CONFIG_SETSKILLDISABLED: &str = "skills.config.setSkillDisabled";
     /// `skills.discover`
     pub const SKILLS_DISCOVER: &str = "skills.discover";
     /// `skills.getDiscoveryPaths`
@@ -108,6 +119,8 @@ pub mod rpc_methods {
     pub const USER_SETTINGS_GET: &str = "user.settings.get";
     /// `user.settings.set`
     pub const USER_SETTINGS_SET: &str = "user.settings.set";
+    /// `managedSettings.read`
+    pub const MANAGEDSETTINGS_READ: &str = "managedSettings.read";
     /// `runtime.shutdown`
     pub const RUNTIME_SHUTDOWN: &str = "runtime.shutdown";
     /// `sessionFs.setProvider`
@@ -203,6 +216,23 @@ pub mod rpc_methods {
     pub const SESSION_GITHUBAUTH_GETSTATUS: &str = "session.gitHubAuth.getStatus";
     /// `session.gitHubAuth.setCredentials`
     pub const SESSION_GITHUBAUTH_SETCREDENTIALS: &str = "session.gitHubAuth.setCredentials";
+    /// `session.gitHubAuth.getCurrentAuthInfo`
+    pub const SESSION_GITHUBAUTH_GETCURRENTAUTHINFO: &str = "session.gitHubAuth.getCurrentAuthInfo";
+    /// `session.gitHubAuth.getAllAuthAvailable`
+    pub const SESSION_GITHUBAUTH_GETALLAUTHAVAILABLE: &str =
+        "session.gitHubAuth.getAllAuthAvailable";
+    /// `session.gitHubAuth.refreshCopilotUser`
+    pub const SESSION_GITHUBAUTH_REFRESHCOPILOTUSER: &str = "session.gitHubAuth.refreshCopilotUser";
+    /// `session.gitHubAuth.login`
+    pub const SESSION_GITHUBAUTH_LOGIN: &str = "session.gitHubAuth.login";
+    /// `session.gitHubAuth.switchToAuth`
+    pub const SESSION_GITHUBAUTH_SWITCHTOAUTH: &str = "session.gitHubAuth.switchToAuth";
+    /// `session.gitHubAuth.logout`
+    pub const SESSION_GITHUBAUTH_LOGOUT: &str = "session.gitHubAuth.logout";
+    /// `session.gitHubAuth.logoutUser`
+    pub const SESSION_GITHUBAUTH_LOGOUTUSER: &str = "session.gitHubAuth.logoutUser";
+    /// `session.gitHubAuth.lastAuthErrors`
+    pub const SESSION_GITHUBAUTH_LASTAUTHERRORS: &str = "session.gitHubAuth.lastAuthErrors";
     /// `session.debug.collectLogs`
     pub const SESSION_DEBUG_COLLECTLOGS: &str = "session.debug.collectLogs";
     /// `session.canvas.list`
@@ -215,6 +245,10 @@ pub mod rpc_methods {
     pub const SESSION_CANVAS_CLOSE: &str = "session.canvas.close";
     /// `session.canvas.action.invoke`
     pub const SESSION_CANVAS_ACTION_INVOKE: &str = "session.canvas.action.invoke";
+    /// `session.canvas.provider.register`
+    pub const SESSION_CANVAS_PROVIDER_REGISTER: &str = "session.canvas.provider.register";
+    /// `session.canvas.provider.unregister`
+    pub const SESSION_CANVAS_PROVIDER_UNREGISTER: &str = "session.canvas.provider.unregister";
     /// `session.factory.run`
     pub const SESSION_FACTORY_RUN: &str = "session.factory.run";
     /// `session.factory.resume`
@@ -241,6 +275,8 @@ pub mod rpc_methods {
     pub const SESSION_MODEL_GETCURRENT: &str = "session.model.getCurrent";
     /// `session.model.switchTo`
     pub const SESSION_MODEL_SWITCHTO: &str = "session.model.switchTo";
+    /// `session.model.applyStartupOverlay`
+    pub const SESSION_MODEL_APPLYSTARTUPOVERLAY: &str = "session.model.applyStartupOverlay";
     /// `session.model.setReasoningEffort`
     pub const SESSION_MODEL_SETREASONINGEFFORT: &str = "session.model.setReasoningEffort";
     /// `session.model.list`
@@ -368,6 +404,8 @@ pub mod rpc_methods {
     pub const SESSION_MCP_DISABLE: &str = "session.mcp.disable";
     /// `session.mcp.reload`
     pub const SESSION_MCP_RELOAD: &str = "session.mcp.reload";
+    /// `session.mcp.moveLoadingToBackground`
+    pub const SESSION_MCP_MOVELOADINGTOBACKGROUND: &str = "session.mcp.moveLoadingToBackground";
     /// `session.mcp.reloadWithConfig`
     pub const SESSION_MCP_RELOADWITHCONFIG: &str = "session.mcp.reloadWithConfig";
     /// `session.mcp.executeSampling`
@@ -400,6 +438,8 @@ pub mod rpc_methods {
         "session.mcp.oauth.authenticationStateChanged";
     /// `session.mcp.oauth.login`
     pub const SESSION_MCP_OAUTH_LOGIN: &str = "session.mcp.oauth.login";
+    /// `session.mcp.oauth.probe`
+    pub const SESSION_MCP_OAUTH_PROBE: &str = "session.mcp.oauth.probe";
     /// `session.mcp.oauth.respond`
     pub const SESSION_MCP_OAUTH_RESPOND: &str = "session.mcp.oauth.respond";
     /// `session.mcp.headers.handlePendingHeadersRefreshRequest`
@@ -446,18 +486,29 @@ pub mod rpc_methods {
     /// `session.extensions.sendAttachmentsToMessage`
     pub const SESSION_EXTENSIONS_SENDATTACHMENTSTOMESSAGE: &str =
         "session.extensions.sendAttachmentsToMessage";
+    /// `session.tools.execute`
+    pub const SESSION_TOOLS_EXECUTE: &str = "session.tools.execute";
+    /// `session.tools.getBuiltinDescriptors`
+    pub const SESSION_TOOLS_GETBUILTINDESCRIPTORS: &str = "session.tools.getBuiltinDescriptors";
+    /// `session.tools.taskCompleteEventData`
+    pub const SESSION_TOOLS_TASKCOMPLETEEVENTDATA: &str = "session.tools.taskCompleteEventData";
     /// `session.tools.handlePendingToolCall`
     pub const SESSION_TOOLS_HANDLEPENDINGTOOLCALL: &str = "session.tools.handlePendingToolCall";
     /// `session.tools.initializeAndValidate`
     pub const SESSION_TOOLS_INITIALIZEANDVALIDATE: &str = "session.tools.initializeAndValidate";
     /// `session.tools.getCurrentMetadata`
     pub const SESSION_TOOLS_GETCURRENTMETADATA: &str = "session.tools.getCurrentMetadata";
+    /// `session.tools.set`
+    pub const SESSION_TOOLS_SET: &str = "session.tools.set";
     /// `session.tools.updateSubagentSettings`
     pub const SESSION_TOOLS_UPDATESUBAGENTSETTINGS: &str = "session.tools.updateSubagentSettings";
     /// `session.commands.list`
     pub const SESSION_COMMANDS_LIST: &str = "session.commands.list";
     /// `session.commands.invoke`
     pub const SESSION_COMMANDS_INVOKE: &str = "session.commands.invoke";
+    /// `session.commands.finalizeInvocationEffect`
+    pub const SESSION_COMMANDS_FINALIZEINVOCATIONEFFECT: &str =
+        "session.commands.finalizeInvocationEffect";
     /// `session.commands.handlePendingCommand`
     pub const SESSION_COMMANDS_HANDLEPENDINGCOMMAND: &str = "session.commands.handlePendingCommand";
     /// `session.commands.execute`
@@ -504,10 +555,10 @@ pub mod rpc_methods {
     pub const SESSION_PERMISSIONS_PENDINGREQUESTS: &str = "session.permissions.pendingRequests";
     /// `session.permissions.setApproveAll`
     pub const SESSION_PERMISSIONS_SETAPPROVEALL: &str = "session.permissions.setApproveAll";
-    /// `session.permissions.setAllowAll`
-    pub const SESSION_PERMISSIONS_SETALLOWALL: &str = "session.permissions.setAllowAll";
-    /// `session.permissions.getAllowAll`
-    pub const SESSION_PERMISSIONS_GETALLOWALL: &str = "session.permissions.getAllowAll";
+    /// `session.permissions.setMode`
+    pub const SESSION_PERMISSIONS_SETMODE: &str = "session.permissions.setMode";
+    /// `session.permissions.getMode`
+    pub const SESSION_PERMISSIONS_GETMODE: &str = "session.permissions.getMode";
     /// `session.permissions.modifyRules`
     pub const SESSION_PERMISSIONS_MODIFYRULES: &str = "session.permissions.modifyRules";
     /// `session.permissions.setRequired`
@@ -753,7 +804,7 @@ pub struct AbortResult {
     pub success: bool,
 }
 
-/// Authenticated account entry returned by `account.getAllUsers`, with auth info and an optional associated token.
+/// Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough.
 ///
 /// <div class="warning">
 ///
@@ -763,50 +814,25 @@ pub struct AbortResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AccountAllUsers {
-    /// Authentication information for this user
-    pub auth_info: serde_json::Value,
-    /// Associated token, if available
+pub struct CopilotUserResponseEndpoints {
+    /// Copilot API endpoint URL.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub token: Option<String>,
-}
-
-/// Current authentication state
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AccountGetCurrentAuthResult {
-    /// Authentication errors from the last auth attempt, if any
+    pub api: Option<String>,
+    /// Experimental-service endpoint URL.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auth_errors: Option<Vec<String>>,
-    /// Current authentication information, if authenticated
+    pub exp: Option<String>,
+    /// Origin-tracker endpoint URL.
+    #[serde(rename = "origin-tracker", skip_serializing_if = "Option::is_none")]
+    pub origin_tracker: Option<String>,
+    /// Copilot proxy endpoint URL.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auth_info: Option<serde_json::Value>,
-}
-
-/// Optional GitHub token used to look up quota for a specific user instead of the global auth context.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AccountGetQuotaRequest {
-    /// GitHub token for per-user quota lookup. When provided, resolves this token to determine the user's quota instead of using the global auth.
+    pub proxy: Option<String>,
+    /// Copilot telemetry endpoint URL.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub git_hub_token: Option<String>,
+    pub telemetry: Option<String>,
 }
 
-/// Quota usage snapshot for a Copilot quota type, including entitlement, used requests, overage, reset date, and remaining percentage.
+/// Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
 ///
 /// <div class="warning">
 ///
@@ -816,61 +842,49 @@ pub struct AccountGetQuotaRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AccountQuotaSnapshot {
-    /// Number of requests included in the entitlement, or -1 for unlimited entitlements
-    pub entitlement_requests: i64,
-    /// Whether the user has an unlimited usage entitlement
-    pub is_unlimited_entitlement: bool,
-    /// Number of additional usage requests made this period
-    pub overage: f64,
-    /// Whether additional usage is allowed when quota is exhausted
-    pub overage_allowed_with_exhausted_quota: bool,
-    /// Percentage of entitlement remaining
-    pub remaining_percentage: f64,
-    /// Date when the quota resets (ISO 8601 string)
+pub struct CopilotUserResponseQuotaSnapshotsChat {
+    /// Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reset_date: Option<String>,
-    /// Whether usage is still permitted after quota exhaustion
-    pub usage_allowed_with_exhausted_quota: bool,
-    /// Number of requests used so far this period
-    pub used_requests: i64,
-}
-
-/// Quota usage snapshots for the resolved user, keyed by quota type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AccountGetQuotaResult {
-    /// Quota snapshots keyed by type (e.g., chat, completions, premium_interactions)
-    pub quota_snapshots: HashMap<String, AccountQuotaSnapshot>,
-}
-
-/// Credentials to store after successful authentication
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AccountLoginRequest {
-    /// GitHub host URL
-    pub host: String,
-    /// User login/username
-    pub login: String,
-    /// GitHub authentication token
-    pub token: String,
+    pub entitlement: Option<f64>,
+    /// Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.
+    #[serde(rename = "has_quota", skip_serializing_if = "Option::is_none")]
+    pub has_quota: Option<bool>,
+    /// Count of additional pay-per-request usage consumed this period beyond the entitlement.
+    #[serde(rename = "overage_count", skip_serializing_if = "Option::is_none")]
+    pub overage_count: Option<f64>,
+    /// Whether usage may continue at pay-per-request rates once the entitlement is exhausted.
+    #[serde(rename = "overage_permitted", skip_serializing_if = "Option::is_none")]
+    pub overage_permitted: Option<bool>,
+    /// Percentage of the entitlement remaining at the snapshot timestamp.
+    #[serde(rename = "percent_remaining", skip_serializing_if = "Option::is_none")]
+    pub percent_remaining: Option<f64>,
+    /// Identifier of the quota bucket this snapshot describes.
+    #[serde(rename = "quota_id", skip_serializing_if = "Option::is_none")]
+    pub quota_id: Option<String>,
+    /// Amount of quota remaining at the snapshot timestamp.
+    #[serde(rename = "quota_remaining", skip_serializing_if = "Option::is_none")]
+    pub quota_remaining: Option<f64>,
+    /// Unix epoch time, in seconds, when this quota next resets.
+    #[serde(rename = "quota_reset_at", skip_serializing_if = "Option::is_none")]
+    pub quota_reset_at: Option<f64>,
+    /// Remaining entitlement/quota amount at the snapshot timestamp.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remaining: Option<f64>,
+    /// UTC timestamp when this snapshot was captured.
+    #[serde(rename = "timestamp_utc", skip_serializing_if = "Option::is_none")]
+    pub timestamp_utc: Option<String>,
+    /// Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.
+    #[serde(
+        rename = "token_based_billing",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub token_based_billing: Option<bool>,
+    /// Whether the entitlement for this category is unlimited.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub unlimited: Option<bool>,
 }
 
-/// Result of a successful login; throws on failure
+/// Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
 ///
 /// <div class="warning">
 ///
@@ -880,12 +894,49 @@ pub struct AccountLoginRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AccountLoginResult {
-    /// Whether the credential was persisted to a secure store (system keychain, or the config file when plaintext storage is enabled). False when no secure store was available and the token was not saved, so the consumer can decide how to proceed.
-    pub stored_in_vault: bool,
+pub struct CopilotUserResponseQuotaSnapshotsCompletions {
+    /// Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entitlement: Option<f64>,
+    /// Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.
+    #[serde(rename = "has_quota", skip_serializing_if = "Option::is_none")]
+    pub has_quota: Option<bool>,
+    /// Count of additional pay-per-request usage consumed this period beyond the entitlement.
+    #[serde(rename = "overage_count", skip_serializing_if = "Option::is_none")]
+    pub overage_count: Option<f64>,
+    /// Whether usage may continue at pay-per-request rates once the entitlement is exhausted.
+    #[serde(rename = "overage_permitted", skip_serializing_if = "Option::is_none")]
+    pub overage_permitted: Option<bool>,
+    /// Percentage of the entitlement remaining at the snapshot timestamp.
+    #[serde(rename = "percent_remaining", skip_serializing_if = "Option::is_none")]
+    pub percent_remaining: Option<f64>,
+    /// Identifier of the quota bucket this snapshot describes.
+    #[serde(rename = "quota_id", skip_serializing_if = "Option::is_none")]
+    pub quota_id: Option<String>,
+    /// Amount of quota remaining at the snapshot timestamp.
+    #[serde(rename = "quota_remaining", skip_serializing_if = "Option::is_none")]
+    pub quota_remaining: Option<f64>,
+    /// Unix epoch time, in seconds, when this quota next resets.
+    #[serde(rename = "quota_reset_at", skip_serializing_if = "Option::is_none")]
+    pub quota_reset_at: Option<f64>,
+    /// Remaining entitlement/quota amount at the snapshot timestamp.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remaining: Option<f64>,
+    /// UTC timestamp when this snapshot was captured.
+    #[serde(rename = "timestamp_utc", skip_serializing_if = "Option::is_none")]
+    pub timestamp_utc: Option<String>,
+    /// Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.
+    #[serde(
+        rename = "token_based_billing",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub token_based_billing: Option<bool>,
+    /// Whether the entitlement for this category is unlimited.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub unlimited: Option<bool>,
 }
 
-/// User to log out
+/// Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
 ///
 /// <div class="warning">
 ///
@@ -895,12 +946,49 @@ pub struct AccountLoginResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AccountLogoutRequest {
-    /// Authentication information for the user to log out
-    pub auth_info: serde_json::Value,
+pub struct CopilotUserResponseQuotaSnapshotsPremiumInteractions {
+    /// Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entitlement: Option<f64>,
+    /// Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.
+    #[serde(rename = "has_quota", skip_serializing_if = "Option::is_none")]
+    pub has_quota: Option<bool>,
+    /// Count of additional pay-per-request usage consumed this period beyond the entitlement.
+    #[serde(rename = "overage_count", skip_serializing_if = "Option::is_none")]
+    pub overage_count: Option<f64>,
+    /// Whether usage may continue at pay-per-request rates once the entitlement is exhausted.
+    #[serde(rename = "overage_permitted", skip_serializing_if = "Option::is_none")]
+    pub overage_permitted: Option<bool>,
+    /// Percentage of the entitlement remaining at the snapshot timestamp.
+    #[serde(rename = "percent_remaining", skip_serializing_if = "Option::is_none")]
+    pub percent_remaining: Option<f64>,
+    /// Identifier of the quota bucket this snapshot describes.
+    #[serde(rename = "quota_id", skip_serializing_if = "Option::is_none")]
+    pub quota_id: Option<String>,
+    /// Amount of quota remaining at the snapshot timestamp.
+    #[serde(rename = "quota_remaining", skip_serializing_if = "Option::is_none")]
+    pub quota_remaining: Option<f64>,
+    /// Unix epoch time, in seconds, when this quota next resets.
+    #[serde(rename = "quota_reset_at", skip_serializing_if = "Option::is_none")]
+    pub quota_reset_at: Option<f64>,
+    /// Remaining entitlement/quota amount at the snapshot timestamp.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remaining: Option<f64>,
+    /// UTC timestamp when this snapshot was captured.
+    #[serde(rename = "timestamp_utc", skip_serializing_if = "Option::is_none")]
+    pub timestamp_utc: Option<String>,
+    /// Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.
+    #[serde(
+        rename = "token_based_billing",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub token_based_billing: Option<bool>,
+    /// Whether the entitlement for this category is unlimited.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub unlimited: Option<bool>,
 }
 
-/// Logout result indicating if more users remain
+/// Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries.
 ///
 /// <div class="warning">
 ///
@@ -910,12 +998,22 @@ pub struct AccountLogoutRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AccountLogoutResult {
-    /// Whether other authenticated users remain after logout
-    pub has_more_users: bool,
+pub struct CopilotUserResponseQuotaSnapshots {
+    /// Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub chat: Option<CopilotUserResponseQuotaSnapshotsChat>,
+    /// Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub completions: Option<CopilotUserResponseQuotaSnapshotsCompletions>,
+    /// Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+    #[serde(
+        rename = "premium_interactions",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub premium_interactions: Option<CopilotUserResponseQuotaSnapshotsPremiumInteractions>,
 }
 
-/// Canonical directory where custom agents can be discovered or created, with scope, preference, and optional project path.
+/// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
 ///
 /// <div class="warning">
 ///
@@ -925,34 +1023,146 @@ pub struct AccountLogoutResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentDiscoveryPath {
-    /// Absolute path of the search/create directory (may not exist on disk yet)
-    pub path: String,
-    /// Whether this is the canonical directory to create a new agent in its tier. At most one entry per tier is preferred.
-    pub preferred_for_creation: bool,
-    /// The input project path this directory was derived from (only for project scope)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_path: Option<String>,
-    /// Which tier this directory belongs to
-    pub scope: AgentDiscoveryPathScope,
-}
-
-/// Canonical locations where custom agents can be created so the runtime will recognize them.
-///
-/// <div class="warning">
-///
+pub struct CopilotUserResponse {
+    /// Copilot access SKU identifier (e.g. `free_limited_copilot`, `copilot_for_business_seat_quota`) used to gate model and feature access.
+    #[serde(rename = "access_type_sku", skip_serializing_if = "Option::is_none")]
+    pub access_type_sku: Option<String>,
+    /// Opaque analytics tracking identifier for the user, forwarded from the Copilot API.
+    #[serde(
+        rename = "analytics_tracking_id",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub analytics_tracking_id: Option<String>,
+    /// Date the Copilot seat was assigned to the user, if applicable.
+    #[serde(rename = "assigned_date", skip_serializing_if = "Option::is_none")]
+    pub assigned_date: Option<serde_json::Value>,
+    /// Whether the user is eligible to sign up for the free/limited Copilot tier.
+    #[serde(
+        rename = "can_signup_for_limited",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub can_signup_for_limited: Option<bool>,
+    /// Whether the user is able to upgrade their Copilot plan.
+    #[serde(rename = "can_upgrade_plan", skip_serializing_if = "Option::is_none")]
+    pub can_upgrade_plan: Option<bool>,
+    /// Whether Copilot chat is enabled for the user.
+    #[serde(rename = "chat_enabled", skip_serializing_if = "Option::is_none")]
+    pub chat_enabled: Option<bool>,
+    /// Whether CLI remote control is enabled for the user.
+    #[serde(
+        rename = "cli_remote_control_enabled",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub cli_remote_control_enabled: Option<bool>,
+    /// Whether cloud session storage is enabled for the user.
+    #[serde(
+        rename = "cloud_session_storage_enabled",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub cloud_session_storage_enabled: Option<bool>,
+    /// Whether the Codex agent is enabled for the user.
+    #[serde(
+        rename = "codex_agent_enabled",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub codex_agent_enabled: Option<bool>,
+    /// Copilot plan name for the user (e.g. `individual`, `business`, `enterprise`).
+    #[serde(rename = "copilot_plan", skip_serializing_if = "Option::is_none")]
+    pub copilot_plan: Option<String>,
+    /// Whether `.copilotignore` content-exclusion support is enabled for the user.
+    #[serde(
+        rename = "copilotignore_enabled",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub copilotignore_enabled: Option<bool>,
+    /// Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub endpoints: Option<CopilotUserResponseEndpoints>,
+    /// Whether MCP (Model Context Protocol) support is enabled for the user.
+    #[serde(rename = "is_mcp_enabled", skip_serializing_if = "Option::is_none")]
+    pub is_mcp_enabled: Option<serde_json::Value>,
+    /// Whether the user is a GitHub/Microsoft staff member.
+    #[serde(rename = "is_staff", skip_serializing_if = "Option::is_none")]
+    pub is_staff: Option<bool>,
+    /// Per-category quota allotments for free/limited-tier users, keyed by quota category.
+    #[serde(
+        rename = "limited_user_quotas",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub limited_user_quotas: Option<HashMap<String, f64>>,
+    /// Date the free/limited-tier user's quotas next reset, as a raw string from the Copilot API.
+    #[serde(
+        rename = "limited_user_reset_date",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub limited_user_reset_date: Option<String>,
+    /// GitHub login of the authenticated user.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub login: Option<String>,
+    /// Per-category monthly quota allotments, keyed by quota category.
+    #[serde(rename = "monthly_quotas", skip_serializing_if = "Option::is_none")]
+    pub monthly_quotas: Option<HashMap<String, f64>>,
+    /// Organizations the user belongs to, each with an optional login and display name.
+    #[serde(rename = "organization_list", skip_serializing_if = "Option::is_none")]
+    pub organization_list: Option<serde_json::Value>,
+    /// Logins of the organizations the user belongs to.
+    #[serde(
+        rename = "organization_login_list",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub organization_login_list: Option<Vec<String>>,
+    /// Date the user's usage quota next resets, as a raw string from the Copilot API; see `quota_reset_date_utc` for the UTC-normalized value.
+    #[serde(rename = "quota_reset_date", skip_serializing_if = "Option::is_none")]
+    pub quota_reset_date: Option<String>,
+    /// UTC-normalized form of `quota_reset_date` (the date the user's usage quota next resets).
+    #[serde(
+        rename = "quota_reset_date_utc",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub quota_reset_date_utc: Option<String>,
+    /// Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries.
+    #[serde(rename = "quota_snapshots", skip_serializing_if = "Option::is_none")]
+    pub quota_snapshots: Option<CopilotUserResponseQuotaSnapshots>,
+    /// Whether the user's telemetry is subject to restricted-data handling.
+    #[serde(
+        rename = "restricted_telemetry",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub restricted_telemetry: Option<bool>,
+    /// Raw passthrough of the Copilot API `te` flag for the user (an opaque server-side eligibility signal surfaced in telemetry); not otherwise interpreted by the runtime.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub te: Option<bool>,
+    /// Whether the account is on usage-based (token/AI-credit) billing rather than a fixed premium-request quota.
+    #[serde(
+        rename = "token_based_billing",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub token_based_billing: Option<bool>,
+}
+
+/// Authentication-info input variant for GitHub-internal HMAC auth, carrying the public GitHub host and HMAC secret.
+///
+/// <div class="warning">
+///
 /// **Experimental.** This type is part of an experimental wire-protocol surface
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentDiscoveryPathList {
-    /// Canonical agent create/discovery directories, in priority order
-    pub paths: Vec<AgentDiscoveryPath>,
+pub struct HMACAuthInfo {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// HMAC secret used to sign requests.
+    pub hmac: String,
+    /// Authentication host. HMAC auth always targets the public GitHub host.
+    pub host: HMACAuthInfoHost,
+    /// HMAC-based authentication used by GitHub-internal services.
+    pub r#type: HMACAuthInfoType,
 }
 
-/// Agent metadata, including identifiers, display details, source, tools, model, MCP servers, skills, and file path.
+/// Authentication-info input variant for a token sourced from an environment variable, with host, optional login, token, and env var name.
 ///
 /// <div class="warning">
 ///
@@ -962,49 +1172,49 @@ pub struct AgentDiscoveryPathList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentInfo {
-    /// Description of the agent's purpose
-    pub description: String,
-    /// Human-readable display name
-    pub display_name: String,
-    /// Stable identifier for selection. For most agents this is the same as `name`; for plugin/builtin agents it may differ. Always populated; defaults to `name` when no distinct id was assigned.
-    pub id: String,
-    /// MCP server configurations attached to this agent, keyed by server name. Server config shape mirrors the MCP `mcpServers` schema.
-    ///
-    /// <div class="warning">
-    ///
-    /// **Experimental.** This type is part of an experimental wire-protocol surface
-    /// and may change or be removed in future SDK or CLI releases.
-    ///
-    /// </div>
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mcp_servers: Option<HashMap<String, serde_json::Value>>,
-    /// Authored preferred model id for this agent. Runtime model selection may choose a different model; omitted means no authored preference.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Name of the agent. Use `id` as the stable selection identifier.
-    pub name: String,
-    /// Absolute local file path of the agent definition. Only set for file-based agents loaded from disk; remote agents do not have a path.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// Authored base prompt for the agent. Runtime prompt assembly may add dynamic context at invocation time. Omitted from `session.agent.list` unless `includePrompt` is true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub prompt: Option<String>,
-    /// Skill names preloaded into this agent's context. Omitted means none.
+pub struct EnvAuthInfo {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub skills: Option<Vec<String>>,
-    /// Where the agent definition was loaded from
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Name of the environment variable the token was sourced from.
+    pub env_var: String,
+    /// Authentication host (e.g. https://github.com or a GHES host).
+    pub host: String,
+    /// User login associated with the token. Undefined for server-to-server tokens (those starting with `ghs_`).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub source: Option<AgentInfoSource>,
-    /// Allowed tool names for this agent. Empty array means none; omitted means inherit defaults.
+    pub login: Option<String>,
+    /// The token value itself. Treat as a secret.
+    pub token: String,
+    /// Personal access token (PAT) or server-to-server token sourced from an environment variable.
+    pub r#type: EnvAuthInfoType,
+}
+
+/// Authentication-info input variant for SDK-configured token authentication, carrying host and the secret token value.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TokenAuthInfo {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub tools: Option<Vec<String>>,
-    /// Whether the agent can be selected directly by the user. Agents marked `false` are subagent-only.
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Authentication host.
+    pub host: String,
+    /// Opaque native GitHub credential registration backing this token identity, when applicable.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub user_invocable: Option<bool>,
+    pub registration_id: Option<String>,
+    /// The token value itself. Treat as a secret.
+    pub token: String,
+    /// SDK-side token authentication; the host configured the token directly via the SDK.
+    pub r#type: TokenAuthInfoType,
 }
 
-/// The currently selected custom agent, or null when using the default agent.
+/// Authentication-info variant backed by an SDK GitHub token callback. It carries routing metadata but never a plaintext token.
 ///
 /// <div class="warning">
 ///
@@ -1014,12 +1224,19 @@ pub struct AgentInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentGetCurrentResult {
-    /// Currently selected custom agent, or null if using the default agent
-    pub agent: AgentInfo,
+pub struct TokenProviderAuthInfo {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Authentication host.
+    pub host: String,
+    /// Opaque SDK callback registration identifier.
+    pub registration_id: String,
+    /// SDK callback-backed GitHub token authentication.
+    pub r#type: TokenProviderAuthInfoType,
 }
 
-/// Agents available to the session.
+/// Authentication-info variant for direct Copilot API token auth sourced from environment variables, with public GitHub host.
 ///
 /// <div class="warning">
 ///
@@ -1029,12 +1246,17 @@ pub struct AgentGetCurrentResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentList {
-    /// Available agents
-    pub agents: Vec<AgentInfo>,
+pub struct CopilotApiTokenAuthInfo {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Authentication host (always the public GitHub host).
+    pub host: CopilotApiTokenAuthInfoHost,
+    /// Direct Copilot API authentication via the `GITHUB_COPILOT_API_TOKEN` + `COPILOT_API_URL` environment-variable pair. The token itself is read from the environment by the runtime, not carried in this struct.
+    pub r#type: CopilotApiTokenAuthInfoType,
 }
 
-/// Controls whether built-in agents and authored prompt text are included.
+/// Authentication-info variant for OAuth user auth, with host and login; the token remains in the runtime secret store.
 ///
 /// <div class="warning">
 ///
@@ -1044,16 +1266,19 @@ pub struct AgentList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentListRequest {
-    /// When true, request the session's configured built-in agents alongside custom agents. Listing applies feature, context, inclusion, exclusion, and user-disabled-agent policy, but does not evaluate transient invocation requirements such as model availability. Built-in metadata may be omitted when the session cannot project it, such as a relay session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_built_in_agents: Option<bool>,
-    /// When true, request authored base prompt text on each AgentInfo. Prompt text may be omitted when unavailable, such as for agents projected through a relay session.
+pub struct UserAuthInfo {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_prompt: Option<bool>,
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Authentication host.
+    pub host: String,
+    /// OAuth user login.
+    pub login: String,
+    /// OAuth user authentication. The token itself is held in the runtime's secret token store (keyed by host+login) and is NOT carried in this struct.
+    pub r#type: UserAuthInfoType,
 }
 
-/// Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).
+/// Authentication-info input variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.
 ///
 /// <div class="warning">
 ///
@@ -1063,57 +1288,21 @@ pub struct AgentListRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentRegistryLiveTargetEntry {
-    /// Kind of attention required when status === "attention". Meaningful only when status === "attention".
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub attention_kind: Option<AgentRegistryLiveTargetEntryAttentionKind>,
-    /// Git branch of the session (when known)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    /// Copilot CLI version that wrote the entry
-    pub copilot_version: String,
-    /// Working directory of the session (when known)
+pub struct GhCliAuthInfo {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    /// Bind host for the entry's JSON-RPC server
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Authentication host.
     pub host: String,
-    /// Process kind tag for the registry entry
-    pub kind: AgentRegistryLiveTargetEntryKind,
-    /// Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness)
-    pub last_seen_ms: i64,
-    /// How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub last_terminal_event: Option<AgentRegistryLiveTargetEntryLastTerminalEvent>,
-    /// Model identifier currently selected for the session
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Operating-system pid of the process owning this entry
-    pub pid: i64,
-    /// TCP port the entry's JSON-RPC server is listening on
-    pub port: i64,
-    /// Registry entry schema version (1 = ui-server, 2 = managed-server)
-    pub schema_version: i64,
-    /// Session ID of the foreground session for this entry
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
-    /// Friendly session name (when set)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_name: Option<String>,
-    /// ISO 8601 timestamp captured at registration
-    pub started_at: String,
-    /// Coarse lifecycle status of the foreground session
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<AgentRegistryLiveTargetEntryStatus>,
-    /// Monotonic per-publisher revision counter incremented on every status update. Lets watchers detect transient flips.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status_revision: Option<i64>,
-    /// Connection token (null when the target is unauthenticated)
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) token: Option<String>,
+    /// User login as reported by `gh auth status`.
+    pub login: String,
+    /// The token returned by `gh auth token`. Treat as a secret.
+    pub token: String,
+    /// Authentication via the `gh` CLI's saved credentials.
+    pub r#type: GhCliAuthInfoType,
 }
 
-/// Per-spawn log-capture outcome; populated from spawnLiveTarget.
+/// Authentication-info input variant for API-key authentication to a non-GitHub LLM provider, carrying the secret `apiKey` and host.
 ///
 /// <div class="warning">
 ///
@@ -1123,21 +1312,19 @@ pub struct AgentRegistryLiveTargetEntry {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentRegistryLogCapture {
-    /// Whether per-spawn log capture is on (false when env-disabled or open failed)
-    pub enabled: bool,
-    /// Human-readable open failure message (only set when enabled === false AND the env-disable opt-out was NOT used)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub open_error: Option<String>,
-    /// Categorized reason for log-open failure
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub open_error_reason: Option<AgentRegistryLogCaptureOpenErrorReason>,
-    /// Absolute path to the per-spawn log file (only set when enabled)
+pub struct ApiKeyAuthInfo {
+    /// The API key. Treat as a secret.
+    pub api_key: String,
+    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Authentication host.
+    pub host: String,
+    /// API-key authentication for non-GitHub LLM providers (e.g. when running BYOM-style).
+    pub r#type: ApiKeyAuthInfoType,
 }
 
-/// `child_process.spawn` itself failed before the child entered the registry.
+/// Authenticated account entry returned by `account.getAllUsers`.
 ///
 /// <div class="warning">
 ///
@@ -1145,39 +1332,20 @@ pub struct AgentRegistryLogCapture {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentRegistrySpawnError {
-    /// Underlying errno code (e.g. ENOENT, EACCES) when available
+pub struct AccountAllUsers {
+    /// Authentication information for this user
+    pub auth_info: AuthInfo,
+    /// Opaque identifier accepted by account and model selection APIs
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub code: Option<String>,
-    /// Discriminator: child_process.spawn itself failed
-    pub kind: AgentRegistrySpawnErrorKind,
-    /// Human-readable error message
-    pub message: String,
-}
-
-/// Spawn succeeded but the child did not publish a matching managed-server entry within the timeout.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AgentRegistrySpawnRegistryTimeout {
-    /// Process ID of the orphaned child (so the caller can offer 'kill the pid' guidance)
-    pub child_pid: i64,
-    /// Discriminator: spawn succeeded but child never registered
-    pub kind: AgentRegistrySpawnRegistryTimeoutKind,
-    /// Per-spawn log-capture outcome; populated from spawnLiveTarget.
+    pub selection_id: Option<String>,
+    /// Associated token, if available
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub log_capture: Option<AgentRegistryLogCapture>,
+    pub token: Option<String>,
 }
 
-/// Inputs to spawn a managed-server child via the controller's spawn delegate.
+/// Current authentication state
 ///
 /// <div class="warning">
 ///
@@ -1187,27 +1355,16 @@ pub struct AgentRegistrySpawnRegistryTimeout {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentRegistrySpawnRequest {
-    /// Custom or built-in agent name (e.g. 'explore'). When omitted, the child uses its own default.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_name: Option<String>,
-    /// Working directory for the spawned child (must be an existing directory)
-    pub cwd: String,
-    /// Optional first user message. Forwarded to the caller (the CLI's spawn wrapper sends it post-attach via the standard LocalRpcSession.send path).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub initial_prompt: Option<String>,
-    /// Model identifier to apply to the new session
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Friendly session name. Must satisfy validateSessionName: non-empty, no leading/trailing whitespace, <=100 chars, no control chars, no double quotes.
+pub struct AccountGetCurrentAuthResult {
+    /// Authentication errors from the last auth attempt, if any
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.
+    pub auth_errors: Option<Vec<String>>,
+    /// Current authentication information, if authenticated
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub permission_mode: Option<AgentRegistrySpawnPermissionMode>,
+    pub auth_info: Option<AuthInfo>,
 }
 
-/// Managed-server child was spawned and registered successfully.
+/// Optional opaque account selection or compatibility GitHub token used to look up quota.
 ///
 /// <div class="warning">
 ///
@@ -1217,23 +1374,16 @@ pub struct AgentRegistrySpawnRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentRegistrySpawnSpawned {
-    /// Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).
-    pub entry: AgentRegistryLiveTargetEntry,
-    /// If the delegate attempted to send the initial prompt and failed, the categorized error message.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub initial_prompt_error: Option<String>,
-    /// Whether the delegate already sent the initial prompt. Always omitted in the current wiring: the controller sends the prompt post-attach via the standard LocalRpcSession.send path.
+pub struct AccountGetQuotaRequest {
+    /// GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub initial_prompt_sent: Option<bool>,
-    /// Discriminator: managed-server child spawned successfully
-    pub kind: AgentRegistrySpawnSpawnedKind,
-    /// Per-spawn log-capture outcome; populated from spawnLiveTarget.
+    pub git_hub_token: Option<String>,
+    /// Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub log_capture: Option<AgentRegistryLogCapture>,
+    pub selection_id: Option<String>,
 }
 
-/// Synchronous pre-validation rejected the spawn request.
+/// Quota usage snapshot for a Copilot quota type, including entitlement, used requests, overage, reset date, and remaining percentage.
 ///
 /// <div class="warning">
 ///
@@ -1243,19 +1393,27 @@ pub struct AgentRegistrySpawnSpawned {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentRegistrySpawnValidationError {
-    /// Which parameter field was invalid. Omitted when the rejection is not field-specific.
+pub struct AccountQuotaSnapshot {
+    /// Number of requests included in the entitlement, or -1 for unlimited entitlements
+    pub entitlement_requests: i64,
+    /// Whether the user has an unlimited usage entitlement
+    pub is_unlimited_entitlement: bool,
+    /// Number of additional usage requests made this period
+    pub overage: f64,
+    /// Whether additional usage is allowed when quota is exhausted
+    pub overage_allowed_with_exhausted_quota: bool,
+    /// Percentage of entitlement remaining
+    pub remaining_percentage: f64,
+    /// Date when the quota resets (ISO 8601 string)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub field: Option<AgentRegistrySpawnValidationErrorField>,
-    /// Discriminator: synchronous pre-validation rejected the request
-    pub kind: AgentRegistrySpawnValidationErrorKind,
-    /// Human-readable explanation; safe to surface in the UI banner. Never logged to unrestricted telemetry.
-    pub message: String,
-    /// Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.
-    pub reason: AgentRegistrySpawnValidationErrorReason,
+    pub reset_date: Option<String>,
+    /// Whether usage is still permitted after quota exhaustion
+    pub usage_allowed_with_exhausted_quota: bool,
+    /// Number of requests used so far this period
+    pub used_requests: i64,
 }
 
-/// Custom agents available to the session after reloading definitions from disk.
+/// Quota usage snapshots for the resolved user, keyed by quota type.
 ///
 /// <div class="warning">
 ///
@@ -1265,12 +1423,12 @@ pub struct AgentRegistrySpawnValidationError {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentReloadResult {
-    /// Reloaded custom agents
-    pub agents: Vec<AgentInfo>,
+pub struct AccountGetQuotaResult {
+    /// Quota snapshots keyed by type (e.g., chat, completions, premium_interactions)
+    pub quota_snapshots: HashMap<String, AccountQuotaSnapshot>,
 }
 
-/// Optional project paths to include in agent discovery.
+/// Credentials to validate and store. Omit login to resolve the authenticated user from the token.
 ///
 /// <div class="warning">
 ///
@@ -1280,16 +1438,17 @@ pub struct AgentReloadResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentsDiscoverRequest {
-    /// When true, omit the host's agents (the user-level agent directory and all plugin agents), leaving only project and remote agents. For multitenant deployments.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exclude_host_agents: Option<bool>,
-    /// Optional list of project directory paths to scan for project-scoped agents. When omitted or empty, only user/plugin/remote-independent agents are returned (no project scan).
+pub struct AccountLoginRequest {
+    /// GitHub host URL
+    pub host: String,
+    /// User login/username. When omitted, the runtime validates the token and resolves the login from GitHub.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_paths: Option<Vec<String>>,
+    pub login: Option<String>,
+    /// GitHub authentication token
+    pub token: String,
 }
 
-/// Name of the custom agent to select for subsequent turns.
+/// Result of a successful login; throws on failure
 ///
 /// <div class="warning">
 ///
@@ -1299,12 +1458,12 @@ pub struct AgentsDiscoverRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentSelectRequest {
-    /// Name of the custom agent to select
-    pub name: String,
+pub struct AccountLoginResult {
+    /// Whether the credential was persisted to a secure store (system keychain, or the config file when plaintext storage is enabled). False when no secure store was available and the token was not saved, so the consumer can decide how to proceed.
+    pub stored_in_vault: bool,
 }
 
-/// The newly selected custom agent.
+/// User to log out
 ///
 /// <div class="warning">
 ///
@@ -1314,12 +1473,16 @@ pub struct AgentSelectRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentSelectResult {
-    /// The newly selected custom agent
-    pub agent: AgentInfo,
+pub struct AccountLogoutRequest {
+    /// Authentication information for the user to log out
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_info: Option<AuthInfo>,
+    /// Opaque account identifier returned by `account.getAllUsers`
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub selection_id: Option<String>,
 }
 
-/// An in-memory authored prompt override for an available agent.
+/// Logout result indicating if more users remain
 ///
 /// <div class="warning">
 ///
@@ -1329,14 +1492,12 @@ pub struct AgentSelectResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentSetPromptRequest {
-    /// Stable effective agent id. Plugin namespace separators are normalized.
-    pub id: String,
-    /// Replacement authored prompt. Empty text is valid.
-    pub prompt: String,
+pub struct AccountLogoutResult {
+    /// Whether other authenticated users remain after logout
+    pub has_more_users: bool,
 }
 
-/// Optional project paths to include when enumerating agent discovery directories.
+/// Canonical directory where custom agents can be discovered or created, with scope, preference, and optional project path.
 ///
 /// <div class="warning">
 ///
@@ -1346,16 +1507,19 @@ pub struct AgentSetPromptRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentsGetDiscoveryPathsRequest {
-    /// When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exclude_host_agents: Option<bool>,
-    /// Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.
+pub struct AgentDiscoveryPath {
+    /// Absolute path of the search/create directory (may not exist on disk yet)
+    pub path: String,
+    /// Whether this is the canonical directory to create a new agent in its tier. At most one entry per tier is preferred.
+    pub preferred_for_creation: bool,
+    /// The input project path this directory was derived from (only for project scope)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_paths: Option<Vec<String>>,
+    pub project_path: Option<String>,
+    /// Which tier this directory belongs to
+    pub scope: AgentDiscoveryPathScope,
 }
 
-/// Indicates whether the operation succeeded and reports the post-mutation state.
+/// Canonical locations where custom agents can be created so the runtime will recognize them.
 ///
 /// <div class="warning">
 ///
@@ -1365,17 +1529,12 @@ pub struct AgentsGetDiscoveryPathsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AllowAllPermissionSetResult {
-    /// Authoritative full allow-all state after the mutation
-    pub enabled: bool,
-    /// Authoritative allow-all mode after the mutation
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<PermissionsAllowAllMode>,
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct AgentDiscoveryPathList {
+    /// Canonical agent create/discovery directories, in priority order
+    pub paths: Vec<AgentDiscoveryPath>,
 }
 
-/// Current allow-all permission mode.
+/// Agent metadata, including identifiers, display details, source, tools, model, MCP servers, skills, and file path.
 ///
 /// <div class="warning">
 ///
@@ -1385,17 +1544,51 @@ pub struct AllowAllPermissionSetResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AllowAllPermissionState {
-    /// Whether full allow-all permissions are currently active
-    pub enabled: bool,
-    /// Current allow-all mode
+pub struct AgentInfo {
+    /// Description of the agent's purpose
+    pub description: String,
+    /// Human-readable display name
+    pub display_name: String,
+    /// Stable identifier for selection. For most agents this is the same as `name`; for plugin/builtin agents it may differ. Always populated; defaults to `name` when no distinct id was assigned.
+    pub id: String,
+    /// MCP server configurations attached to this agent, keyed by server name. Server config shape mirrors the MCP `mcpServers` schema.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<PermissionsAllowAllMode>,
-}
-
-/// Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough.
-///
-/// <div class="warning">
+    pub mcp_servers: Option<HashMap<String, serde_json::Value>>,
+    /// Authored preferred model id for this agent. Runtime model selection may choose a different model; omitted means no authored preference.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Name of the agent. Use `id` as the stable selection identifier.
+    pub name: String,
+    /// Absolute local file path of the agent definition. Only set for file-based agents loaded from disk; remote agents do not have a path.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<String>,
+    /// Authored base prompt for the agent. Runtime prompt assembly may add dynamic context at invocation time. Omitted from `session.agent.list` unless `includePrompt` is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub prompt: Option<String>,
+    /// Skill names preloaded into this agent's context. Omitted means none.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skills: Option<Vec<String>>,
+    /// Where the agent definition was loaded from
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<AgentInfoSource>,
+    /// Allowed tool names for this agent. Empty array means none; omitted means inherit defaults.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tools: Option<Vec<String>>,
+    /// Whether the agent can be selected directly by the user. Agents marked `false` are subagent-only.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub user_invocable: Option<bool>,
+}
+
+/// The currently selected custom agent, or null when using the default agent.
+///
+/// <div class="warning">
 ///
 /// **Experimental.** This type is part of an experimental wire-protocol surface
 /// and may change or be removed in future SDK or CLI releases.
@@ -1403,20 +1596,12 @@ pub struct AllowAllPermissionState {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CopilotUserResponseEndpoints {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub api: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exp: Option<String>,
-    #[serde(rename = "origin-tracker", skip_serializing_if = "Option::is_none")]
-    pub origin_tracker: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub proxy: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub telemetry: Option<String>,
+pub struct AgentGetCurrentResult {
+    /// Currently selected custom agent, or null if using the default agent
+    pub agent: AgentInfo,
 }
 
-/// Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+/// Agents available to the session.
 ///
 /// <div class="warning">
 ///
@@ -1426,49 +1611,12 @@ pub struct CopilotUserResponseEndpoints {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CopilotUserResponseQuotaSnapshotsChat {
-    /// Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entitlement: Option<f64>,
-    /// Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.
-    #[serde(rename = "has_quota", skip_serializing_if = "Option::is_none")]
-    pub has_quota: Option<bool>,
-    /// Count of additional pay-per-request usage consumed this period beyond the entitlement.
-    #[serde(rename = "overage_count", skip_serializing_if = "Option::is_none")]
-    pub overage_count: Option<f64>,
-    /// Whether usage may continue at pay-per-request rates once the entitlement is exhausted.
-    #[serde(rename = "overage_permitted", skip_serializing_if = "Option::is_none")]
-    pub overage_permitted: Option<bool>,
-    /// Percentage of the entitlement remaining at the snapshot timestamp.
-    #[serde(rename = "percent_remaining", skip_serializing_if = "Option::is_none")]
-    pub percent_remaining: Option<f64>,
-    /// Identifier of the quota bucket this snapshot describes.
-    #[serde(rename = "quota_id", skip_serializing_if = "Option::is_none")]
-    pub quota_id: Option<String>,
-    /// Amount of quota remaining at the snapshot timestamp.
-    #[serde(rename = "quota_remaining", skip_serializing_if = "Option::is_none")]
-    pub quota_remaining: Option<f64>,
-    /// Unix epoch time, in seconds, when this quota next resets.
-    #[serde(rename = "quota_reset_at", skip_serializing_if = "Option::is_none")]
-    pub quota_reset_at: Option<f64>,
-    /// Remaining entitlement/quota amount at the snapshot timestamp.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub remaining: Option<f64>,
-    /// UTC timestamp when this snapshot was captured.
-    #[serde(rename = "timestamp_utc", skip_serializing_if = "Option::is_none")]
-    pub timestamp_utc: Option<String>,
-    /// Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.
-    #[serde(
-        rename = "token_based_billing",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub token_based_billing: Option<bool>,
-    /// Whether the entitlement for this category is unlimited.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub unlimited: Option<bool>,
+pub struct AgentList {
+    /// Available agents
+    pub agents: Vec<AgentInfo>,
 }
 
-/// Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+/// Controls whether built-in agents and authored prompt text are included.
 ///
 /// <div class="warning">
 ///
@@ -1478,49 +1626,16 @@ pub struct CopilotUserResponseQuotaSnapshotsChat {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CopilotUserResponseQuotaSnapshotsCompletions {
-    /// Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entitlement: Option<f64>,
-    /// Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.
-    #[serde(rename = "has_quota", skip_serializing_if = "Option::is_none")]
-    pub has_quota: Option<bool>,
-    /// Count of additional pay-per-request usage consumed this period beyond the entitlement.
-    #[serde(rename = "overage_count", skip_serializing_if = "Option::is_none")]
-    pub overage_count: Option<f64>,
-    /// Whether usage may continue at pay-per-request rates once the entitlement is exhausted.
-    #[serde(rename = "overage_permitted", skip_serializing_if = "Option::is_none")]
-    pub overage_permitted: Option<bool>,
-    /// Percentage of the entitlement remaining at the snapshot timestamp.
-    #[serde(rename = "percent_remaining", skip_serializing_if = "Option::is_none")]
-    pub percent_remaining: Option<f64>,
-    /// Identifier of the quota bucket this snapshot describes.
-    #[serde(rename = "quota_id", skip_serializing_if = "Option::is_none")]
-    pub quota_id: Option<String>,
-    /// Amount of quota remaining at the snapshot timestamp.
-    #[serde(rename = "quota_remaining", skip_serializing_if = "Option::is_none")]
-    pub quota_remaining: Option<f64>,
-    /// Unix epoch time, in seconds, when this quota next resets.
-    #[serde(rename = "quota_reset_at", skip_serializing_if = "Option::is_none")]
-    pub quota_reset_at: Option<f64>,
-    /// Remaining entitlement/quota amount at the snapshot timestamp.
+pub struct AgentListRequest {
+    /// When true, request the session's configured built-in agents alongside custom agents. Listing applies feature, context, inclusion, exclusion, and user-disabled-agent policy, but does not evaluate transient invocation requirements such as model availability. Built-in metadata may be omitted when the session cannot project it, such as a relay session.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub remaining: Option<f64>,
-    /// UTC timestamp when this snapshot was captured.
-    #[serde(rename = "timestamp_utc", skip_serializing_if = "Option::is_none")]
-    pub timestamp_utc: Option<String>,
-    /// Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.
-    #[serde(
-        rename = "token_based_billing",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub token_based_billing: Option<bool>,
-    /// Whether the entitlement for this category is unlimited.
+    pub include_built_in_agents: Option<bool>,
+    /// When true, request authored base prompt text on each AgentInfo. Prompt text may be omitted when unavailable, such as for agents projected through a relay session.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub unlimited: Option<bool>,
+    pub include_prompt: Option<bool>,
 }
 
-/// Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+/// Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).
 ///
 /// <div class="warning">
 ///
@@ -1530,49 +1645,57 @@ pub struct CopilotUserResponseQuotaSnapshotsCompletions {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CopilotUserResponseQuotaSnapshotsPremiumInteractions {
-    /// Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.
+pub struct AgentRegistryLiveTargetEntry {
+    /// Kind of attention required when status === "attention". Meaningful only when status === "attention".
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub entitlement: Option<f64>,
-    /// Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.
-    #[serde(rename = "has_quota", skip_serializing_if = "Option::is_none")]
-    pub has_quota: Option<bool>,
-    /// Count of additional pay-per-request usage consumed this period beyond the entitlement.
-    #[serde(rename = "overage_count", skip_serializing_if = "Option::is_none")]
-    pub overage_count: Option<f64>,
-    /// Whether usage may continue at pay-per-request rates once the entitlement is exhausted.
-    #[serde(rename = "overage_permitted", skip_serializing_if = "Option::is_none")]
-    pub overage_permitted: Option<bool>,
-    /// Percentage of the entitlement remaining at the snapshot timestamp.
-    #[serde(rename = "percent_remaining", skip_serializing_if = "Option::is_none")]
-    pub percent_remaining: Option<f64>,
-    /// Identifier of the quota bucket this snapshot describes.
-    #[serde(rename = "quota_id", skip_serializing_if = "Option::is_none")]
-    pub quota_id: Option<String>,
-    /// Amount of quota remaining at the snapshot timestamp.
-    #[serde(rename = "quota_remaining", skip_serializing_if = "Option::is_none")]
-    pub quota_remaining: Option<f64>,
-    /// Unix epoch time, in seconds, when this quota next resets.
-    #[serde(rename = "quota_reset_at", skip_serializing_if = "Option::is_none")]
-    pub quota_reset_at: Option<f64>,
-    /// Remaining entitlement/quota amount at the snapshot timestamp.
+    pub attention_kind: Option<AgentRegistryLiveTargetEntryAttentionKind>,
+    /// Git branch of the session (when known)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub remaining: Option<f64>,
-    /// UTC timestamp when this snapshot was captured.
-    #[serde(rename = "timestamp_utc", skip_serializing_if = "Option::is_none")]
-    pub timestamp_utc: Option<String>,
-    /// Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.
-    #[serde(
-        rename = "token_based_billing",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub token_based_billing: Option<bool>,
-    /// Whether the entitlement for this category is unlimited.
+    pub branch: Option<String>,
+    /// Copilot CLI version that wrote the entry
+    pub copilot_version: String,
+    /// Working directory of the session (when known)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub unlimited: Option<bool>,
+    pub cwd: Option<String>,
+    /// Bind host for the entry's JSON-RPC server
+    pub host: String,
+    /// Process kind tag for the registry entry
+    pub kind: AgentRegistryLiveTargetEntryKind,
+    /// Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness)
+    pub last_seen_ms: i64,
+    /// How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub last_terminal_event: Option<AgentRegistryLiveTargetEntryLastTerminalEvent>,
+    /// Model identifier currently selected for the session
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Operating-system pid of the process owning this entry
+    pub pid: i64,
+    /// TCP port the entry's JSON-RPC server is listening on
+    pub port: i64,
+    /// Registry entry schema version (1 = ui-server, 2 = managed-server)
+    pub schema_version: i64,
+    /// Session ID of the foreground session for this entry
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+    /// Friendly session name (when set)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_name: Option<String>,
+    /// ISO 8601 timestamp captured at registration
+    pub started_at: String,
+    /// Coarse lifecycle status of the foreground session
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<AgentRegistryLiveTargetEntryStatus>,
+    /// Monotonic per-publisher revision counter incremented on every status update. Lets watchers detect transient flips.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_revision: Option<i64>,
+    /// Connection token (null when the target is unauthenticated)
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) token: Option<String>,
 }
 
-/// Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries.
+/// Per-spawn log-capture outcome; populated from spawnLiveTarget.
 ///
 /// <div class="warning">
 ///
@@ -1582,22 +1705,21 @@ pub struct CopilotUserResponseQuotaSnapshotsPremiumInteractions {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CopilotUserResponseQuotaSnapshots {
-    /// Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+pub struct AgentRegistryLogCapture {
+    /// Whether per-spawn log capture is on (false when env-disabled or open failed)
+    pub enabled: bool,
+    /// Human-readable open failure message (only set when enabled === false AND the env-disable opt-out was NOT used)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub chat: Option<CopilotUserResponseQuotaSnapshotsChat>,
-    /// Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
+    pub open_error: Option<String>,
+    /// Categorized reason for log-open failure
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub completions: Option<CopilotUserResponseQuotaSnapshotsCompletions>,
-    /// Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.
-    #[serde(
-        rename = "premium_interactions",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub premium_interactions: Option<CopilotUserResponseQuotaSnapshotsPremiumInteractions>,
+    pub open_error_reason: Option<AgentRegistryLogCaptureOpenErrorReason>,
+    /// Absolute path to the per-spawn log file (only set when enabled)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<String>,
 }
 
-/// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
+/// `child_process.spawn` itself failed before the child entered the registry.
 ///
 /// <div class="warning">
 ///
@@ -1607,124 +1729,17 @@ pub struct CopilotUserResponseQuotaSnapshots {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CopilotUserResponse {
-    /// Copilot access SKU identifier (e.g. `free_limited_copilot`, `copilot_for_business_seat_quota`) used to gate model and feature access.
-    #[serde(rename = "access_type_sku", skip_serializing_if = "Option::is_none")]
-    pub access_type_sku: Option<String>,
-    /// Opaque analytics tracking identifier for the user, forwarded from the Copilot API.
-    #[serde(
-        rename = "analytics_tracking_id",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub analytics_tracking_id: Option<String>,
-    /// Date the Copilot seat was assigned to the user, if applicable.
-    #[serde(rename = "assigned_date", skip_serializing_if = "Option::is_none")]
-    pub assigned_date: Option<serde_json::Value>,
-    /// Whether the user is eligible to sign up for the free/limited Copilot tier.
-    #[serde(
-        rename = "can_signup_for_limited",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub can_signup_for_limited: Option<bool>,
-    /// Whether the user is able to upgrade their Copilot plan.
-    #[serde(rename = "can_upgrade_plan", skip_serializing_if = "Option::is_none")]
-    pub can_upgrade_plan: Option<bool>,
-    /// Whether Copilot chat is enabled for the user.
-    #[serde(rename = "chat_enabled", skip_serializing_if = "Option::is_none")]
-    pub chat_enabled: Option<bool>,
-    /// Whether CLI remote control is enabled for the user.
-    #[serde(
-        rename = "cli_remote_control_enabled",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub cli_remote_control_enabled: Option<bool>,
-    /// Whether cloud session storage is enabled for the user.
-    #[serde(
-        rename = "cloud_session_storage_enabled",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub cloud_session_storage_enabled: Option<bool>,
-    /// Whether the Codex agent is enabled for the user.
-    #[serde(
-        rename = "codex_agent_enabled",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub codex_agent_enabled: Option<bool>,
-    /// Copilot plan name for the user (e.g. `individual`, `business`, `enterprise`).
-    #[serde(rename = "copilot_plan", skip_serializing_if = "Option::is_none")]
-    pub copilot_plan: Option<String>,
-    /// Whether `.copilotignore` content-exclusion support is enabled for the user.
-    #[serde(
-        rename = "copilotignore_enabled",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub copilotignore_enabled: Option<bool>,
-    /// Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub endpoints: Option<CopilotUserResponseEndpoints>,
-    /// Whether MCP (Model Context Protocol) support is enabled for the user.
-    #[serde(rename = "is_mcp_enabled", skip_serializing_if = "Option::is_none")]
-    pub is_mcp_enabled: Option<serde_json::Value>,
-    /// Whether the user is a GitHub/Microsoft staff member.
-    #[serde(rename = "is_staff", skip_serializing_if = "Option::is_none")]
-    pub is_staff: Option<bool>,
-    /// Per-category quota allotments for free/limited-tier users, keyed by quota category.
-    #[serde(
-        rename = "limited_user_quotas",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub limited_user_quotas: Option<HashMap<String, f64>>,
-    /// Date the free/limited-tier user's quotas next reset, as a raw string from the Copilot API.
-    #[serde(
-        rename = "limited_user_reset_date",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub limited_user_reset_date: Option<String>,
-    /// GitHub login of the authenticated user.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub login: Option<String>,
-    /// Per-category monthly quota allotments, keyed by quota category.
-    #[serde(rename = "monthly_quotas", skip_serializing_if = "Option::is_none")]
-    pub monthly_quotas: Option<HashMap<String, f64>>,
-    /// Organizations the user belongs to, each with an optional login and display name.
-    #[serde(rename = "organization_list", skip_serializing_if = "Option::is_none")]
-    pub organization_list: Option<serde_json::Value>,
-    /// Logins of the organizations the user belongs to.
-    #[serde(
-        rename = "organization_login_list",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub organization_login_list: Option<Vec<String>>,
-    /// Date the user's usage quota next resets, as a raw string from the Copilot API; see `quota_reset_date_utc` for the UTC-normalized value.
-    #[serde(rename = "quota_reset_date", skip_serializing_if = "Option::is_none")]
-    pub quota_reset_date: Option<String>,
-    /// UTC-normalized form of `quota_reset_date` (the date the user's usage quota next resets).
-    #[serde(
-        rename = "quota_reset_date_utc",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub quota_reset_date_utc: Option<String>,
-    /// Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries.
-    #[serde(rename = "quota_snapshots", skip_serializing_if = "Option::is_none")]
-    pub quota_snapshots: Option<CopilotUserResponseQuotaSnapshots>,
-    /// Whether the user's telemetry is subject to restricted-data handling.
-    #[serde(
-        rename = "restricted_telemetry",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub restricted_telemetry: Option<bool>,
-    /// Raw passthrough of the Copilot API `te` flag for the user (an opaque server-side eligibility signal surfaced in telemetry); not otherwise interpreted by the runtime.
+pub struct AgentRegistrySpawnError {
+    /// Underlying errno code (e.g. ENOENT, EACCES) when available
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub te: Option<bool>,
-    /// Whether the account is on usage-based (token/AI-credit) billing rather than a fixed premium-request quota.
-    #[serde(
-        rename = "token_based_billing",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub token_based_billing: Option<bool>,
+    pub code: Option<String>,
+    /// Discriminator: child_process.spawn itself failed
+    pub kind: AgentRegistrySpawnErrorKind,
+    /// Human-readable error message
+    pub message: String,
 }
 
-/// Authentication-info variant for API-key authentication to a non-GitHub LLM provider, carrying the secret `apiKey` and host.
+/// Spawn succeeded but the child did not publish a matching managed-server entry within the timeout.
 ///
 /// <div class="warning">
 ///
@@ -1734,19 +1749,17 @@ pub struct CopilotUserResponse {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ApiKeyAuthInfo {
-    /// The API key. Treat as a secret.
-    pub api_key: String,
-    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
+pub struct AgentRegistrySpawnRegistryTimeout {
+    /// Process ID of the orphaned child (so the caller can offer 'kill the pid' guidance)
+    pub child_pid: i64,
+    /// Discriminator: spawn succeeded but child never registered
+    pub kind: AgentRegistrySpawnRegistryTimeoutKind,
+    /// Per-spawn log-capture outcome; populated from spawnLiveTarget.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_user: Option<CopilotUserResponse>,
-    /// Authentication host.
-    pub host: String,
-    /// API-key authentication for non-GitHub LLM providers (e.g. when running BYOM-style).
-    pub r#type: ApiKeyAuthInfoType,
+    pub log_capture: Option<AgentRegistryLogCapture>,
 }
 
-/// Blob attachment with inline base64-encoded data
+/// Inputs to spawn a managed-server child via the controller's spawn delegate.
 ///
 /// <div class="warning">
 ///
@@ -1756,29 +1769,27 @@ pub struct ApiKeyAuthInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AttachmentBlob {
-    /// Internal: content-addressed id of the session.binary_asset event holding this attachment's model-facing bytes (e.g. "sha256:..."). Absent externally.
+pub struct AgentRegistrySpawnRequest {
+    /// Custom or built-in agent name (e.g. 'explore'). When omitted, the child uses its own default.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub asset_id: Option<String>,
-    /// Internal: decoded byte length of the attachment's model-facing bytes. Absent externally.
+    pub agent_name: Option<String>,
+    /// Working directory for the spawned child (must be an existing directory)
+    pub cwd: String,
+    /// Optional first user message. Forwarded to the caller (the CLI's spawn wrapper sends it post-attach via the standard LocalRpcSession.send path).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub byte_length: Option<i64>,
-    /// Base64-encoded content. Present on input and for external consumers; replaced by an internal `assetId` reference in persisted events when interned to a content-addressed asset.
+    pub initial_prompt: Option<String>,
+    /// Model identifier to apply to the new session
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub data: Option<String>,
-    /// User-facing display name for the attachment
+    pub model: Option<String>,
+    /// Friendly session name. Must satisfy validateSessionName: non-empty, no leading/trailing whitespace, <=100 chars, no control chars, no double quotes.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_name: Option<String>,
-    /// MIME type of the inline data
-    pub mime_type: String,
-    /// Internal: why model-facing bytes are absent from persistence. Absent externally.
+    pub name: Option<String>,
+    /// Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub omitted_reason: Option<OmittedBinaryOmittedReason>,
-    /// Attachment type discriminator
-    pub r#type: AttachmentBlobType,
+    pub permission_mode: Option<AgentRegistrySpawnPermissionMode>,
 }
 
-/// Directory attachment
+/// Managed-server child was spawned and registered successfully.
 ///
 /// <div class="warning">
 ///
@@ -1788,19 +1799,23 @@ pub struct AttachmentBlob {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AttachmentDirectory {
-    /// User-facing display name for the attachment
-    pub display_name: String,
-    /// Absolute directory path
-    pub path: String,
-    /// Frozen rendered line this attachment contributed to the <tagged_files> prompt block (e.g. "* /path (12 items)"). Captured at send time so resumed history reproduces the exact text the model saw, independent of later filesystem changes.
+pub struct AgentRegistrySpawnSpawned {
+    /// Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).
+    pub entry: AgentRegistryLiveTargetEntry,
+    /// If the delegate attempted to send the initial prompt and failed, the categorized error message.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub tagged_files_entry: Option<String>,
-    /// Attachment type discriminator
-    pub r#type: AttachmentDirectoryType,
+    pub initial_prompt_error: Option<String>,
+    /// Whether the delegate already sent the initial prompt. Always omitted in the current wiring: the controller sends the prompt post-attach via the standard LocalRpcSession.send path.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub initial_prompt_sent: Option<bool>,
+    /// Discriminator: managed-server child spawned successfully
+    pub kind: AgentRegistrySpawnSpawnedKind,
+    /// Per-spawn log-capture outcome; populated from spawnLiveTarget.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub log_capture: Option<AgentRegistryLogCapture>,
 }
 
-/// Structured context contributed by an extension. Composer pills displayed in the host are forwarded back through session.send.attachments, then rendered into the model prompt as an <extension_context> XML block.
+/// Synchronous pre-validation rejected the spawn request.
 ///
 /// <div class="warning">
 ///
@@ -1810,27 +1825,19 @@ pub struct AttachmentDirectory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AttachmentExtensionContext {
-    /// Provider-local canvas identifier when the push was bound to a canvas instance
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub canvas_id: Option<String>,
-    /// ISO 8601 timestamp captured by the runtime when the push was accepted
-    pub captured_at: String,
-    /// Owning extension identifier. Runtime-derived from the caller's connection when produced via session.extensions.sendAttachmentsToMessage; preserved verbatim on subsequent transports.
-    pub extension_id: String,
-    /// Open canvas instance identifier when the push was bound to a canvas instance
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub instance_id: Option<String>,
-    /// Caller-supplied JSON payload
+pub struct AgentRegistrySpawnValidationError {
+    /// Which parameter field was invalid. Omitted when the rejection is not field-specific.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub payload: Option<serde_json::Value>,
-    /// Human-readable composer pill label
-    pub title: String,
-    /// Attachment type discriminator
-    pub r#type: AttachmentExtensionContextType,
+    pub field: Option<AgentRegistrySpawnValidationErrorField>,
+    /// Discriminator: synchronous pre-validation rejected the request
+    pub kind: AgentRegistrySpawnValidationErrorKind,
+    /// Human-readable explanation; safe to surface in the UI banner. Never logged to unrestricted telemetry.
+    pub message: String,
+    /// Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.
+    pub reason: AgentRegistrySpawnValidationErrorReason,
 }
 
-/// Optional line range to scope the attachment to a specific section of the file
+/// Custom agents available to the session after reloading definitions from disk.
 ///
 /// <div class="warning">
 ///
@@ -1840,14 +1847,12 @@ pub struct AttachmentExtensionContext {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AttachmentFileLineRange {
-    /// End line number (1-based, inclusive)
-    pub end: i64,
-    /// Start line number (1-based)
-    pub start: i64,
+pub struct AgentReloadResult {
+    /// Reloaded custom agents
+    pub agents: Vec<AgentInfo>,
 }
 
-/// File attachment
+/// Optional project paths to include in agent discovery.
 ///
 /// <div class="warning">
 ///
@@ -1857,34 +1862,16 @@ pub struct AttachmentFileLineRange {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AttachmentFile {
-    /// Internal: content-addressed id of the session.binary_asset event holding this attachment's model-facing bytes (e.g. "sha256:..."). Absent externally.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub asset_id: Option<String>,
-    /// Internal: decoded byte length of the attachment's model-facing bytes. Absent externally.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub byte_length: Option<i64>,
-    /// User-facing display name for the attachment
-    pub display_name: String,
-    /// Optional line range to scope the attachment to a specific section of the file
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub line_range: Option<AttachmentFileLineRange>,
-    /// Internal: MIME type of the file's model-facing bytes (post-resize for images). Set when the file's bytes are interned to an asset. Absent externally.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    /// Internal: why model-facing bytes are absent from persistence. Absent externally.
+pub struct AgentsDiscoverRequest {
+    /// When true, omit the host's agents (the user-level agent directory and all plugin agents), leaving only project and remote agents. For multitenant deployments.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub omitted_reason: Option<OmittedBinaryOmittedReason>,
-    /// Absolute file path
-    pub path: String,
-    /// Frozen rendered line this attachment contributed to the <tagged_files> prompt block (e.g. "* /path (123 lines)"). Captured at send time so resumed history reproduces the exact text the model saw, independent of later filesystem changes. Present only for attachments routed to <tagged_files> (mutually exclusive with assetId, which marks bytes sent natively).
+    pub exclude_host_agents: Option<bool>,
+    /// Optional list of project directory paths to scan for project-scoped agents. When omitted or empty, only user/plugin/remote-independent agents are returned (no project scan).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub tagged_files_entry: Option<String>,
-    /// Attachment type discriminator
-    pub r#type: AttachmentFileType,
+    pub project_paths: Option<Vec<String>>,
 }
 
-/// Pointer to a GitHub repository.
+/// Name of the custom agent to select for subsequent turns.
 ///
 /// <div class="warning">
 ///
@@ -1894,13 +1881,217 @@ pub struct AttachmentFile {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct GitHubRepoRef {
-    /// Numeric GitHub repository id
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub id: Option<i64>,
-    /// Repository name (without owner)
+pub struct AgentSelectRequest {
+    /// Name of the custom agent to select
     pub name: String,
-    /// Repository owner login (user or organization)
+}
+
+/// The newly selected custom agent.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AgentSelectResult {
+    /// The newly selected custom agent
+    pub agent: AgentInfo,
+}
+
+/// An in-memory authored prompt override for an available agent.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AgentSetPromptRequest {
+    /// Stable effective agent id. Plugin namespace separators are normalized.
+    pub id: String,
+    /// Replacement authored prompt. Empty text is valid.
+    pub prompt: String,
+}
+
+/// Optional project paths to include when enumerating agent discovery directories.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AgentsGetDiscoveryPathsRequest {
+    /// When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exclude_host_agents: Option<bool>,
+    /// Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub project_paths: Option<Vec<String>>,
+}
+
+/// Blob attachment with inline base64-encoded data
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AttachmentBlob {
+    /// Internal: content-addressed id of the session.binary_asset event holding this attachment's model-facing bytes (e.g. "sha256:..."). Absent externally.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub asset_id: Option<String>,
+    /// Internal: decoded byte length of the attachment's model-facing bytes. Absent externally.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub byte_length: Option<i64>,
+    /// Base64-encoded content. Present on input and for external consumers; replaced by an internal `assetId` reference in persisted events when interned to a content-addressed asset.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub data: Option<String>,
+    /// User-facing display name for the attachment
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_name: Option<String>,
+    /// MIME type of the inline data
+    pub mime_type: String,
+    /// Internal: why model-facing bytes are absent from persistence. Absent externally.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub omitted_reason: Option<OmittedBinaryOmittedReason>,
+    /// Attachment type discriminator
+    pub r#type: AttachmentBlobType,
+}
+
+/// Directory attachment
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AttachmentDirectory {
+    /// User-facing display name for the attachment
+    pub display_name: String,
+    /// Absolute directory path
+    pub path: String,
+    /// Frozen rendered line this attachment contributed to the <tagged_files> prompt block (e.g. "* /path (12 items)"). Captured at send time so resumed history reproduces the exact text the model saw, independent of later filesystem changes.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tagged_files_entry: Option<String>,
+    /// Attachment type discriminator
+    pub r#type: AttachmentDirectoryType,
+}
+
+/// Structured context contributed by an extension. Composer pills displayed in the host are forwarded back through session.send.attachments, then rendered into the model prompt as an <extension_context> XML block.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AttachmentExtensionContext {
+    /// Provider-local canvas identifier when the push was bound to a canvas instance
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub canvas_id: Option<String>,
+    /// ISO 8601 timestamp captured by the runtime when the push was accepted
+    pub captured_at: String,
+    /// Owning extension identifier. Runtime-derived from the caller's connection when produced via session.extensions.sendAttachmentsToMessage; preserved verbatim on subsequent transports.
+    pub extension_id: String,
+    /// Open canvas instance identifier when the push was bound to a canvas instance
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub instance_id: Option<String>,
+    /// Caller-supplied JSON payload
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub payload: Option<serde_json::Value>,
+    /// Human-readable composer pill label
+    pub title: String,
+    /// Attachment type discriminator
+    pub r#type: AttachmentExtensionContextType,
+}
+
+/// Optional line range to scope the attachment to a specific section of the file
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AttachmentFileLineRange {
+    /// End line number (1-based, inclusive)
+    pub end: i64,
+    /// Start line number (1-based)
+    pub start: i64,
+}
+
+/// File attachment
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AttachmentFile {
+    /// Internal: content-addressed id of the session.binary_asset event holding this attachment's model-facing bytes (e.g. "sha256:..."). Absent externally.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub asset_id: Option<String>,
+    /// Internal: decoded byte length of the attachment's model-facing bytes. Absent externally.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub byte_length: Option<i64>,
+    /// User-facing display name for the attachment
+    pub display_name: String,
+    /// Optional line range to scope the attachment to a specific section of the file
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub line_range: Option<AttachmentFileLineRange>,
+    /// Internal: MIME type of the file's model-facing bytes (post-resize for images). Set when the file's bytes are interned to an asset. Absent externally.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mime_type: Option<String>,
+    /// Internal: why model-facing bytes are absent from persistence. Absent externally.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub omitted_reason: Option<OmittedBinaryOmittedReason>,
+    /// Absolute file path
+    pub path: String,
+    /// Frozen rendered line this attachment contributed to the <tagged_files> prompt block (e.g. "* /path (123 lines)"). Captured at send time so resumed history reproduces the exact text the model saw, independent of later filesystem changes. Present only for attachments routed to <tagged_files> (mutually exclusive with assetId, which marks bytes sent natively).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tagged_files_entry: Option<String>,
+    /// Attachment type discriminator
+    pub r#type: AttachmentFileType,
+}
+
+/// Pointer to a GitHub repository.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GitHubRepoRef {
+    /// Numeric GitHub repository id
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub id: Option<i64>,
+    /// Repository name (without owner)
+    pub name: String,
+    /// Repository owner login (user or organization)
     pub owner: String,
 }
 
@@ -2247,7 +2438,7 @@ pub struct AttachmentSelection {
     pub r#type: AttachmentSelectionType,
 }
 
-/// A well-known model in the runtime's built-in catalog.
+/// Credential-free authentication identity safe to expose to hosts and user interfaces.
 ///
 /// <div class="warning">
 ///
@@ -2257,12 +2448,26 @@ pub struct AttachmentSelection {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct BuiltInModelCatalogEntry {
-    /// Well-known runtime model ID suitable for `ProviderConfig.modelId` or `ProviderModelConfig.modelId`. This is not necessarily the provider-facing deployment or model name and does not indicate CAPI entitlement or provider availability.
-    pub id: String,
+pub struct AuthIdentity {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Name of the environment variable that supplied the credential, when applicable
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub env_var: Option<String>,
+    /// Authentication host
+    pub host: String,
+    /// Authenticated login, when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub login: Option<String>,
+    /// Opaque SDK GitHub credential registration backing this identity. Routing metadata only; never a credential.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub registration_id: Option<String>,
+    /// Authentication type
+    pub r#type: AuthInfoType,
 }
 
-/// The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
+/// Validation error from an authentication attempt.
 ///
 /// <div class="warning">
 ///
@@ -2272,12 +2477,15 @@ pub struct BuiltInModelCatalogEntry {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct BuiltInModelCatalog {
-    /// Built-in model entries.
-    pub models: Vec<BuiltInModelCatalogEntry>,
+pub struct AuthValidationError {
+    /// Optional message returned by GitHub
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub github_message: Option<String>,
+    /// Authentication validation error message
+    pub message: String,
 }
 
-/// Cancellation result for a user-requested shell command.
+/// A well-known model in the runtime's built-in catalog.
 ///
 /// <div class="warning">
 ///
@@ -2287,12 +2495,12 @@ pub struct BuiltInModelCatalog {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CancelUserRequestedShellCommandResult {
-    /// Whether an in-flight execution was found and signalled to cancel
-    pub cancelled: bool,
+pub struct BuiltInModelCatalogEntry {
+    /// Well-known runtime model ID suitable for provider or provider-model metadata. This is not necessarily the provider-facing deployment or model name and does not indicate CAPI entitlement or provider availability.
+    pub id: String,
 }
 
-/// Canvas action that the agent or host can invoke. To discover the input schema for a particular action, call the list_canvas_capabilities tool.
+/// The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
 ///
 /// <div class="warning">
 ///
@@ -2302,18 +2510,12 @@ pub struct CancelUserRequestedShellCommandResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CanvasAction {
-    /// Description of the action
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// JSON Schema for the action input
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub input_schema: Option<serde_json::Value>,
-    /// Action name exposed by the canvas provider
-    pub name: String,
+pub struct BuiltInModelCatalog {
+    /// Built-in model entries.
+    pub models: Vec<BuiltInModelCatalogEntry>,
 }
 
-/// Canvas action invocation parameters.
+/// Custom grammar input format accepted by a built-in tool.
 ///
 /// <div class="warning">
 ///
@@ -2323,17 +2525,139 @@ pub struct CanvasAction {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CanvasActionInvokeRequest {
-    /// Action name to invoke
-    pub action_name: String,
-    /// Action input
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub input: Option<serde_json::Value>,
-    /// Open canvas instance identifier
-    pub instance_id: String,
+pub struct BuiltinToolFormat {
+    /// Grammar definition accepted by the tool.
+    pub definition: String,
+    /// Grammar syntax used by the format definition.
+    pub syntax: String,
+    /// Custom input-format discriminator.
+    pub r#type: BuiltinToolFormatType,
 }
 
-/// Canvas action invocation result.
+/// JSON Schema object accepted by a built-in tool.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct BuiltinToolInputSchema {
+    /// Root type of the tool input schema.
+    pub r#type: BuiltinToolInputSchemaType,
+}
+
+/// Rust-owned metadata and input schema for a built-in tool.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct BuiltinToolDescriptor {
+    /// Model-facing description of the tool's behavior.
+    pub description: String,
+    /// Optional custom input format used instead of a JSON Schema.
+    pub format: Option<BuiltinToolFormat>,
+    /// Whether the tool provides a specialized intention summary.
+    pub has_summarise_intention: bool,
+    /// JSON Schema for the tool input, or null when the tool uses a custom format.
+    pub input_schema: Option<BuiltinToolInputSchema>,
+    /// Optional supplemental usage instructions for the tool.
+    pub instructions: Option<String>,
+    /// Whether the tool executes commands in a terminal.
+    pub is_terminal: bool,
+    /// Stable name used to invoke the built-in tool.
+    pub name: String,
+    /// Policy describing which tool metadata may be recorded without obfuscation.
+    pub safe_for_telemetry: serde_json::Value,
+    /// Optional human-readable title for the tool.
+    pub title: Option<String>,
+    /// Optional tool category discriminator.
+    pub r#type: Option<String>,
+}
+
+/// Per-field telemetry-safety policy for a built-in tool.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct BuiltinToolSafeTelemetryFields {
+    /// Whether tool input names may be included in telemetry without obfuscation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub inputs_names: Option<bool>,
+    /// Whether the tool name may be included in telemetry without obfuscation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<bool>,
+}
+
+/// Cancellation result for a user-requested shell command.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CancelUserRequestedShellCommandResult {
+    /// Whether an in-flight execution was found and signalled to cancel
+    pub cancelled: bool,
+}
+
+/// Canvas action that the agent or host can invoke. To discover the input schema for a particular action, call the list_canvas_capabilities tool.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CanvasAction {
+    /// Description of the action
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// JSON Schema for the action input
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input_schema: Option<serde_json::Value>,
+    /// Action name exposed by the canvas provider
+    pub name: String,
+}
+
+/// Canvas action invocation parameters.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CanvasActionInvokeRequest {
+    /// Action name to invoke
+    pub action_name: String,
+    /// Action input
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input: Option<serde_json::Value>,
+    /// Open canvas instance identifier
+    pub instance_id: String,
+}
+
+/// Canvas action invocation result.
 ///
 /// <div class="warning">
 ///
@@ -2646,7 +2970,7 @@ pub struct CanvasProviderOpenResult {
     pub url: Option<String>,
 }
 
-/// Options scoped to the built-in CAPI (Copilot API) provider.
+/// Internal canvas provider registration parameters.
 ///
 /// <div class="warning">
 ///
@@ -2656,13 +2980,16 @@ pub struct CanvasProviderOpenResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CapiSessionOptions {
-    /// Whether to use WebSocket transport for the CAPI Responses API. Enabled by default when the model advertises `ws:/responses` support; set to `false` to force the HTTP Responses transport in environments where WebSockets are blocked (e.g. behind a proxy). Setting this to `false` is equivalent to the `COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES` environment variable.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_web_socket_responses: Option<bool>,
+pub struct CanvasProviderRegisterRequest {
+    /// Canvas contributions supplied by the provider
+    pub canvases: Vec<serde_json::Value>,
+    /// Connection identifier for callback routing
+    pub connection_id: String,
+    /// Provider metadata supplied by the host
+    pub info: serde_json::Value,
 }
 
-/// A literal choice the command input accepts, with a human-facing description
+/// Internal canvas provider unregistration parameters.
 ///
 /// <div class="warning">
 ///
@@ -2672,14 +2999,12 @@ pub struct CapiSessionOptions {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SlashCommandInputChoice {
-    /// Human-readable description shown alongside the choice
-    pub description: String,
-    /// The literal choice value (e.g. 'on', 'off', 'show')
-    pub name: String,
+pub struct CanvasProviderUnregisterRequest {
+    /// Connection identifier to unregister
+    pub connection_id: String,
 }
 
-/// Optional unstructured input hint
+/// Options scoped to the built-in CAPI (Copilot API) provider.
 ///
 /// <div class="warning">
 ///
@@ -2689,24 +3014,13 @@ pub struct SlashCommandInputChoice {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SlashCommandInput {
-    /// Optional literal choices the input accepts, each with a human-facing description; clients may render these as selectable options
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub choices: Option<Vec<SlashCommandInputChoice>>,
-    /// Optional completion hint for the input (e.g. 'directory' for filesystem path completion)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub completion: Option<SlashCommandInputCompletion>,
-    /// Hint to display when command input has not been provided
-    pub hint: String,
-    /// When true, clients should pass the full text after the command name as a single argument rather than splitting on whitespace
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub preserve_multiline_input: Option<bool>,
-    /// When true, the command requires non-empty input; clients should render the input hint as required
+pub struct CapiSessionOptions {
+    /// Whether to use WebSocket transport for the CAPI Responses API. Enabled by default when the model advertises `ws:/responses` support; set to `false` to force the HTTP Responses transport in environments where WebSockets are blocked (e.g. behind a proxy). Setting this to `false` is equivalent to the `COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES` environment variable.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub required: Option<bool>,
+    pub enable_web_socket_responses: Option<bool>,
 }
 
-/// Slash-command metadata with name, aliases, description, kind, input hint, execution allowance, and schedulability.
+/// Semantic digest of a strictly parsed and schema-validated JSON MCP card. Both URL-backed and embedded cards are canonicalised with RFC 8785 JSON Canonicalization Scheme, encoded as UTF-8, and hashed with SHA-256.
 ///
 /// <div class="warning">
 ///
@@ -2716,30 +3030,14 @@ pub struct SlashCommandInput {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SlashCommandInfo {
-    /// Canonical aliases without leading slashes
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub aliases: Option<Vec<String>>,
-    /// Whether the command may run while an agent turn is active
-    pub allow_during_agent_execution: bool,
-    /// Human-readable command description
-    pub description: String,
-    /// Whether the command is experimental
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub experimental: Option<bool>,
-    /// Optional unstructured input hint
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub input: Option<SlashCommandInput>,
-    /// Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command
-    pub kind: SlashCommandKind,
-    /// Canonical command name without a leading slash
-    pub name: String,
-    /// Whether the command may be the target of `/every` / `/after` schedules. Resolution happens at every tick, so only set this when the command is safe to re-invoke and produces an agent prompt.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub schedulable: Option<bool>,
+pub struct CardDigest {
+    /// Digest algorithm and canonical representation
+    pub algorithm: CardDigestAlgorithm,
+    /// SHA-256 digest of the RFC 8785 canonical UTF-8 bytes, encoded as exactly 64 lowercase hexadecimal characters.
+    pub value: String,
 }
 
-/// Slash commands available in the session, after applying any include/exclude filters.
+/// Where and when an AI skill catalog reference was observed. Discovery provenance deliberately carries no content digest because search does not establish the exact validated content a later plan will bind.
 ///
 /// <div class="warning">
 ///
@@ -2749,12 +3047,16 @@ pub struct SlashCommandInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CommandList {
-    /// Commands available in this session
-    pub commands: Vec<SlashCommandInfo>,
+pub struct CatalogAiSkillCandidateProvenance {
+    /// Host of the catalog authority that advertised the reference, without path, query, or credentials. Inert untrusted data.
+    pub authority: String,
+    /// Media type advertised for the referenced AI skill card
+    pub media_type: CatalogAiSkillCandidateProvenanceMediaType,
+    /// ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a retrieval or validation timestamp.
+    pub observed_at: String,
 }
 
-/// Pending command request ID and an optional error if the client handler failed.
+/// Candidate whose card is retrieved from a URL through the runtime's hardened fetch boundary.
 ///
 /// <div class="warning">
 ///
@@ -2764,15 +3066,14 @@ pub struct CommandList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CommandsHandlePendingCommandRequest {
-    /// Error message if the command handler failed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Request ID from the command invocation event
-    pub request_id: RequestId,
+pub struct CatalogCandidateSourceUrl {
+    /// Discriminator: the card is URL-backed, and carries no embedded data
+    pub kind: CatalogCandidateSourceUrlKind,
+    /// Card URL as advertised. Inert untrusted data: the runtime retrieves it only through its own hardened boundary, and it is never logged.
+    pub url: String,
 }
 
-/// Indicates whether the pending client-handled command was completed successfully.
+/// Candidate whose card reference arrived inline. The document and its content-derived properties stay behind the runtime boundary.
 ///
 /// <div class="warning">
 ///
@@ -2782,12 +3083,12 @@ pub struct CommandsHandlePendingCommandRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CommandsHandlePendingCommandResult {
-    /// Whether the command was handled successfully
-    pub success: bool,
+pub struct CatalogCandidateSourceEmbedded {
+    /// Discriminator: the card is embedded, and carries no URL
+    pub kind: CatalogCandidateSourceEmbeddedKind,
 }
 
-/// Slash command name and optional raw input string to invoke.
+/// An inert AI skill catalog result. AI skills are discovery-only and cannot be represented as installable through this surface.
 ///
 /// <div class="warning">
 ///
@@ -2795,17 +3096,34 @@ pub struct CommandsHandlePendingCommandResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CommandsInvokeRequest {
-    /// Raw input after the command name
+pub struct CatalogAiSkillCandidate {
+    /// Description taken verbatim from the card. Inert untrusted text.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub input: Option<String>,
-    /// Command name. Leading slashes are stripped and the name is matched case-insensitively.
-    pub name: String,
+    pub description: Option<String>,
+    /// Display name taken verbatim from the card. Inert untrusted text.
+    pub display_name: String,
+    /// Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries no readable information and is rejected when stale, replayed, or presented to a different runtime instance. Never logged.
+    pub handle: String,
+    /// ISO 8601 timestamp after which the handle is stale and will be rejected.
+    pub handle_expires_at: String,
+    /// AI skills are discovery-only and cannot be installed through this surface
+    pub installability: CatalogAiSkillCandidateInstallability,
+    /// Discriminator: this candidate describes an AI skill
+    pub kind: CatalogAiSkillCandidateKind,
+    /// Media type of the underlying AI skill card
+    pub media_type: CatalogAiSkillCandidateMediaType,
+    /// Where the catalog reference was observed, without the card itself or any content digest.
+    pub provenance: CatalogAiSkillCandidateProvenance,
+    /// Publisher taken verbatim from the card. Inert untrusted text.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub publisher: Option<String>,
+    /// Where the card came from: exactly one of a URL or embedded data, encoded as a tagged union so neither both nor neither can be represented.
+    pub source: CatalogCandidateSource,
 }
 
-/// Optional filters controlling which command sources to include in the listing.
+/// An optional catalog authentication exchange did not establish the caller's identity. Anonymous search remains supported; this refusal is reserved for an operation that cannot continue after the attempted exchange. It is distinct from `policy-rejected` and from a network failure, and the reason identifies the recovery action.
 ///
 /// <div class="warning">
 ///
@@ -2815,19 +3133,16 @@ pub struct CommandsInvokeRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CommandsListRequest {
-    /// Include runtime built-in commands
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_builtins: Option<bool>,
-    /// Include commands registered by protocol clients, including SDK clients and extensions
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_client_commands: Option<bool>,
-    /// Include enabled user-invocable skills and commands
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_skills: Option<bool>,
+pub struct CatalogAuthenticationRequiredError {
+    /// Discriminator: the caller is not authenticated
+    pub kind: CatalogAuthenticationRequiredErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains a credential or token, nor a query, URL, handle, or secret.
+    pub message: String,
+    /// Why authentication failed. Only an expired credential justifies attempting a silent refresh; an absent or rejected credential requires sign-in.
+    pub reason: CatalogAuthenticationRequiredReason,
 }
 
-/// Queued-command request ID and the result indicating whether the host executed it (and whether to stop processing further queued commands).
+/// Where and when an MCP server catalog reference was observed. Discovery provenance deliberately carries no content digest because search does not establish the exact validated content a later plan will bind.
 ///
 /// <div class="warning">
 ///
@@ -2837,14 +3152,16 @@ pub struct CommandsListRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CommandsRespondToQueuedCommandRequest {
-    /// Request ID from the `command.queued` event the host is responding to.
-    pub request_id: RequestId,
-    /// Result of the queued command execution.
-    pub result: serde_json::Value,
+pub struct CatalogMcpServerCandidateProvenance {
+    /// Host of the catalog authority that advertised the reference, without path, query, or credentials. Inert untrusted data.
+    pub authority: String,
+    /// JSON MCP media type advertised for the referenced card.
+    pub media_type: McpServerCardMediaType,
+    /// ISO 8601 timestamp at which the runtime observed the catalog reference. This is not a retrieval or validation timestamp.
+    pub observed_at: String,
 }
 
-/// Indicates whether the queued-command response was matched to a pending request.
+/// An inert MCP server catalog result. Every free-text field is untrusted external data and must never be treated as an instruction, and the handle is the only way to refer to the candidate in a later operation.
 ///
 /// <div class="warning">
 ///
@@ -2852,14 +3169,34 @@ pub struct CommandsRespondToQueuedCommandRequest {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CommandsRespondToQueuedCommandResult {
-    /// Whether a pending queued command with the given request ID was found and resolved. False when the request was already resolved, cancelled, or unknown.
-    pub success: bool,
+pub struct CatalogMcpServerCandidate {
+    /// Description taken verbatim from the card. Inert untrusted text.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Display name taken verbatim from the card. Inert untrusted text.
+    pub display_name: String,
+    /// Opaque, runtime-instance scoped, TTL-bound, single-use handle for this candidate. Carries no readable information and is rejected when stale, replayed, or presented to a different runtime instance. Never logged.
+    pub handle: String,
+    /// ISO 8601 timestamp after which the handle is stale and will be rejected.
+    pub handle_expires_at: String,
+    /// Whether this MCP server can be planned for installation, and if policy prevents it.
+    pub installability: CatalogMcpServerInstallability,
+    /// Discriminator: this candidate describes an MCP server
+    pub kind: CatalogMcpServerCandidateKind,
+    /// JSON MCP media type of the underlying card.
+    pub media_type: McpServerCardMediaType,
+    /// Where the catalog reference was observed, without the card itself or any content digest.
+    pub provenance: CatalogMcpServerCandidateProvenance,
+    /// Publisher taken verbatim from the card. Inert untrusted text.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub publisher: Option<String>,
+    /// Where the card came from: exactly one of a URL or embedded data, encoded as a tagged union so neither both nor neither can be represented.
+    pub source: CatalogCandidateSource,
 }
 
-/// Characters that, when typed in the composer, should trigger a `completions.request`. Empty when the session has no host-driven completions (e.g. local sessions, or a relay host that does not advertise `completionTriggerCharacters`).
+/// The protocol version and capability set a caller requires, supplied on every catalog request so negotiation cannot be skipped by omission.
 ///
 /// <div class="warning">
 ///
@@ -2869,12 +3206,14 @@ pub struct CommandsRespondToQueuedCommandResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CompletionsGetTriggerCharactersResult {
-    /// Trigger characters advertised by the host (e.g. `["@", "#"]`). Empty disables host-driven completions for the session.
-    pub trigger_characters: Vec<String>,
+pub struct CatalogClientContract {
+    /// SDK protocol version the caller was generated against. A caller below the runtime's minimum supported version is refused rather than served a partial result.
+    pub protocol_version: i64,
+    /// Wire features the caller requires the runtime to understand. Identifiers are bounded but extensible so a newer caller can negotiate with an older runtime. Requiring an unknown feature yields a typed refusal listing what is understood, never a partial grant. A grant does not promise that a deployment has enabled the operation; typed unavailable results report that separately.
+    pub required_capabilities: Vec<String>,
 }
 
-/// Request host-driven completions for the current composer input.
+/// An upstream catalog response broke the wire contract. Most importantly, every result must carry exactly one of a URL or embedded data: a result carrying both, or neither, is refused here rather than being guessed at.
 ///
 /// <div class="warning">
 ///
@@ -2884,14 +3223,16 @@ pub struct CompletionsGetTriggerCharactersResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CompletionsRequestRequest {
-    /// Cursor offset within `text`, in UTF-16 code units.
-    pub offset: i64,
-    /// The full composed composer input.
-    pub text: String,
+pub struct CatalogContractViolationError {
+    /// Discriminator: the upstream response broke the contract
+    pub kind: CatalogContractViolationErrorKind,
+    /// Human-readable explanation, safe to surface. Never echoes response content, nor a query, URL, handle, or secret.
+    pub message: String,
+    /// Which rule the response broke.
+    pub reason: CatalogContractViolationReason,
 }
 
-/// A single host-driven completion. Accepting an item replaces `[rangeStart, rangeEnd)` (UTF-16 code units) in the composer with `insertText`; when the range is absent, the active token around the cursor is replaced.
+/// A presented handle was not accepted. Handles are runtime-instance scoped, TTL-bound, and single-use, so each way of failing is reported distinctly.
 ///
 /// <div class="warning">
 ///
@@ -2901,24 +3242,18 @@ pub struct CompletionsRequestRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCompletionItem {
-    /// Text spliced into the composer when the item is accepted.
-    pub insert_text: String,
-    /// Render-kind hint for the picker row (e.g. `"document"`, `"directory"`), derived from the host's display kind.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub kind: Option<String>,
-    /// Primary display label for the picker row. Falls back to `insertText` when absent.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub label: Option<String>,
-    /// End (exclusive) of the replacement range in `text`, in UTF-16 code units.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub range_end: Option<i64>,
-    /// Start of the replacement range in `text`, in UTF-16 code units.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub range_start: Option<i64>,
+pub struct CatalogHandleRejectedError {
+    /// Which kind of handle was presented.
+    pub handle_type: CatalogHandleType,
+    /// Discriminator: a handle was rejected
+    pub kind: CatalogHandleRejectedErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains the handle itself, nor a query, URL, or secret.
+    pub message: String,
+    /// Why the handle was rejected.
+    pub reason: CatalogHandleRejectionReason,
 }
 
-/// Host-driven completion items for the current composer input. Empty when the host returns no items or does not support completions.
+/// The request was rejected before any work was done, because a bounded field fell outside its permitted range or a required field was unusable.
 ///
 /// <div class="warning">
 ///
@@ -2928,12 +3263,16 @@ pub struct SessionCompletionItem {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CompletionsRequestResult {
-    /// Completion items in host-ranked order.
-    pub items: Vec<SessionCompletionItem>,
+pub struct CatalogInvalidRequestError {
+    /// Which request field was rejected.
+    pub field: CatalogInvalidRequestField,
+    /// Discriminator: the request itself was invalid
+    pub kind: CatalogInvalidRequestErrorKind,
+    /// Human-readable explanation, safe to surface. Never echoes the offending value, nor a query, URL, handle, or secret.
+    pub message: String,
 }
 
-/// Params to attach or detach an in-process ExtensionController delegate.
+/// A card could not be parsed or did not satisfy its declared media type's schema.
 ///
 /// <div class="warning">
 ///
@@ -2943,16 +3282,19 @@ pub struct CompletionsRequestResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct ConfigureSessionExtensionsParams {
-    /// In-process ExtensionController delegate (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. The post-SDK extension surface exposes list/enable/disable/reload via dedicated RPCs served by the runtime.
-    #[doc(hidden)]
+pub struct CatalogMalformedCardError {
+    /// Discriminator: the card was malformed
+    pub kind: CatalogMalformedCardErrorKind,
+    /// Media type the card was interpreted as, when it declared one this runtime recognises.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) controller: Option<serde_json::Value>,
-    /// Session to attach the extension controller delegate to.
-    pub session_id: SessionId,
+    pub media_type: Option<CatalogMediaType>,
+    /// Human-readable explanation, safe to surface. Never echoes card content, nor a query, URL, handle, or secret.
+    pub message: String,
+    /// How the card failed validation.
+    pub reason: CatalogMalformedCardReason,
 }
 
-/// Repository associated with the connected remote session.
+/// The protocol version and capability set the runtime actually honoured for a successful catalog operation.
 ///
 /// <div class="warning">
 ///
@@ -2962,16 +3304,14 @@ pub(crate) struct ConfigureSessionExtensionsParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ConnectedRemoteSessionMetadataRepository {
-    /// Branch associated with the remote session.
-    pub branch: String,
-    /// Repository name.
-    pub name: String,
-    /// Repository owner or organization login.
-    pub owner: String,
+pub struct CatalogNegotiatedContract {
+    /// Wire features the runtime understood for this operation. Always a superset of the caller's required features, because any shortfall is a refusal instead. Operation availability remains a separate typed result.
+    pub granted_capabilities: Vec<CatalogCapability>,
+    /// Protocol version of the runtime that served the request.
+    pub runtime_protocol_version: i64,
 }
 
-/// Metadata for a connected remote session.
+/// The caller's protocol version or required capabilities cannot be honoured. Returned instead of a partial or ambiguous success.
 ///
 /// <div class="warning">
 ///
@@ -2981,38 +3321,24 @@ pub struct ConnectedRemoteSessionMetadataRepository {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ConnectedRemoteSessionMetadata {
-    /// Neutral SDK discriminator for the connected remote session kind.
-    pub kind: ConnectedRemoteSessionMetadataKind,
-    /// Last session update time as an ISO 8601 string.
-    pub modified_time: String,
-    /// Optional friendly session name.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Pull request number associated with the session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub pull_request_number: Option<i64>,
-    /// Repository associated with the connected remote session.
-    pub repository: ConnectedRemoteSessionMetadataRepository,
-    /// Original remote resource identifier.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub resource_id: Option<String>,
-    /// SDK session ID for the connected remote session.
-    pub session_id: SessionId,
-    /// Remote session staleness deadline as an ISO 8601 string.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stale_at: Option<String>,
-    /// Session start time as an ISO 8601 string.
-    pub start_time: String,
-    /// Remote session state returned by the backing service.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub state: Option<String>,
-    /// Optional session summary.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary: Option<String>,
+pub struct CatalogNegotiationRefusedError {
+    /// Discriminator: capability or protocol-version negotiation failed
+    pub kind: CatalogNegotiationRefusedErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+    pub message: String,
+    /// Lowest caller protocol version this runtime will serve.
+    pub minimum_supported_protocol_version: i64,
+    /// Whether the version or the capability set was the problem.
+    pub reason: CatalogNegotiationRefusedReason,
+    /// Protocol version of the runtime that refused the request.
+    pub runtime_protocol_version: i64,
+    /// Every wire feature this runtime understands, so the caller can retry within that contract. This list does not imply that every deployment has enabled every operation.
+    pub supported_capabilities: Vec<CatalogCapability>,
+    /// The subset of the caller's bounded extensible capability identifiers this runtime cannot honour.
+    pub unsupported_capabilities: Vec<String>,
 }
 
-/// Remote session connection parameters.
+/// The runtime could not reach the catalog authority or retrieve a card. Covers being offline as well as transport-level failure.
 ///
 /// <div class="warning">
 ///
@@ -3022,12 +3348,19 @@ pub struct ConnectedRemoteSessionMetadata {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ConnectRemoteSessionParams {
-    /// Session ID to connect to.
-    pub session_id: SessionId,
+pub struct CatalogNetworkFailureError {
+    /// Discriminator: the network operation failed
+    pub kind: CatalogNetworkFailureErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+    pub message: String,
+    /// Categorised failure, low cardinality so it can be aggregated without carrying a URL.
+    pub reason: CatalogNetworkFailureReason,
+    /// HTTP status code, when the failure was a rejected response.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_code: Option<i32>,
 }
 
-/// Parameters for the `server.connect` handshake: an optional connection token and optional connection-level opt-ins (e.g. GitHub telemetry forwarding).
+/// The candidate is discoverable but cannot be installed. `application/ai-skill` resolves here, because it stays searchable while remaining typed non-installable.
 ///
 /// <div class="warning">
 ///
@@ -3037,16 +3370,16 @@ pub struct ConnectRemoteSessionParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct ConnectRequest {
-    /// Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the runtime forwards every internal telemetry event it emits — across all sessions, plus sessionless events — to this connection over the `gitHubTelemetry.event` notification. Regular events are also written to the runtime's normal GitHub/CTS path (dual-write); host-only compatibility events are forward-only and intentionally skip that path. Intended for first-party hosts that re-emit the events into their own telemetry stores. Both unrestricted and restricted events are forwarded, each tagged with a `restricted` discriminator; a backstop drops restricted events when restricted telemetry is disabled — using the process-global gate for ordinary events and an explicit session-scoped decision for host-only events.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_git_hub_telemetry_forwarding: Option<bool>,
-    /// Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub token: Option<String>,
+pub struct CatalogNotInstallableError {
+    /// Discriminator: the candidate cannot be installed
+    pub kind: CatalogNotInstallableErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+    pub message: String,
+    /// Why the candidate cannot be installed.
+    pub reason: CatalogNotInstallableReason,
 }
 
-/// Handshake result reporting the server's protocol version and package version on success.
+/// Registry or enterprise policy refused the operation.
 ///
 /// <div class="warning">
 ///
@@ -3056,16 +3389,16 @@ pub(crate) struct ConnectRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct ConnectResult {
-    /// Always true on success
-    pub ok: bool,
-    /// Server protocol version number
-    pub protocol_version: i64,
-    /// Server package version
-    pub version: String,
+pub struct CatalogPolicyRejectedError {
+    /// Discriminator: policy refused the operation
+    pub kind: CatalogPolicyRejectedErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+    pub message: String,
+    /// Which authority produced the decision.
+    pub source: McpPlanPolicySource,
 }
 
-/// Local file system absolute paths within the session working directory to check against its content-exclusion policy.
+/// A bounded catalog search. Both the query length and the result count are capped by the schema so a caller cannot request an unbounded scan.
 ///
 /// <div class="warning">
 ///
@@ -3075,12 +3408,20 @@ pub(crate) struct ConnectResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ContentExclusionCheckPathsRequest {
-    /// Local file system absolute paths within the session working directory to check. Results are returned in the same order, including duplicates.
-    pub paths: Vec<String>,
+pub struct CatalogSearchRequest {
+    /// Protocol version and capabilities the caller requires.
+    pub contract: CatalogClientContract,
+    /// Restrict results to these candidate kinds. When omitted, every kind the runtime supports is searched.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub kinds: Option<Vec<CatalogCandidateKind>>,
+    /// Maximum number of candidates to return. Defaults to 10 when omitted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub limit: Option<i32>,
+    /// Free-text search query. Never written to logs or telemetry.
+    pub query: String,
 }
 
-/// Content-exclusion decision for one requested path.
+/// A completed catalog search: inert candidate summaries, each carrying a single-use handle.
 ///
 /// <div class="warning">
 ///
@@ -3090,14 +3431,20 @@ pub struct ContentExclusionCheckPathsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ContentExclusionPathCheck {
-    /// Whether the session's complete content-exclusion policy excludes the path.
-    pub excluded: bool,
-    /// The path supplied by the caller.
-    pub path: String,
+pub struct CatalogSearchSucceeded {
+    /// Matching candidates, never more than the requested limit. All text is inert untrusted data.
+    pub candidates: Vec<CatalogCandidate>,
+    /// Discriminator: the search completed
+    pub kind: CatalogSearchSucceededKind,
+    /// Protocol version and capabilities the runtime honoured.
+    pub negotiated: CatalogNegotiatedContract,
+    /// Pseudonymous identifier for this search, issued by the runtime or by the catalog authority it queried and never by the caller, so it cannot be forged or replayed to attribute an install to a search that never happened. Always present on a success, so a result set can be tied to the installs it leads to. It identifies a search rather than a person: it is derived from no user, account, device, or query data, and must never be joined with user identity to re-identify anyone.
+    pub search_id: String,
+    /// Whether further matches existed beyond the requested limit.
+    pub truncated: bool,
 }
 
-/// Batch content-exclusion result. Callers must fail closed when policy evaluation is unavailable.
+/// The request asked for a candidate kind this runtime does not serve.
 ///
 /// <div class="warning">
 ///
@@ -3107,14 +3454,18 @@ pub struct ContentExclusionPathCheck {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ContentExclusionCheckPathsResult {
-    /// Whether the session's policy service was available for the complete batch. When false, checks is empty and callers must treat every requested path as excluded.
-    pub available: bool,
-    /// Per-path decisions in request order. Empty when available is false.
-    pub checks: Vec<ContentExclusionPathCheck>,
+pub struct CatalogUnsupportedKindError {
+    /// Discriminator: an unsupported candidate kind was requested
+    pub kind: CatalogUnsupportedKindErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+    pub message: String,
+    /// The kinds from the request that are not supported.
+    pub requested_kinds: Vec<CatalogCandidateKind>,
+    /// Every candidate kind this runtime can serve.
+    pub supported_kinds: Vec<CatalogCandidateKind>,
 }
 
-/// A single large message currently in context.
+/// Retrieval was refused by the runtime's hardened fetch boundary before any request left the process, or before a redirect was followed.
 ///
 /// <div class="warning">
 ///
@@ -3124,18 +3475,16 @@ pub struct ContentExclusionCheckPathsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ContextHeaviestMessage {
-    /// Stable identifier for this message within the snapshot.
-    pub id: String,
-    /// Human-readable source label, e.g. `tool: bash` or `skill: tmux`. Presentation-only.
-    pub label: String,
-    /// Role of the chat message (`user`, `assistant`, or `tool`).
-    pub role: String,
-    /// Token count currently in context for this individual message.
-    pub tokens: i64,
+pub struct CatalogUnsafeRetrievalError {
+    /// Discriminator: retrieval was refused as unsafe
+    pub kind: CatalogUnsafeRetrievalErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains the refused URL, nor a query, handle, or secret.
+    pub message: String,
+    /// Which control refused the retrieval, low cardinality so it can be aggregated without carrying a URL.
+    pub reason: CatalogUnsafeRetrievalReason,
 }
 
-/// Authentication-info variant for direct Copilot API token auth sourced from environment variables, with public GitHub host.
+/// The operation is not available on this runtime. Distinct from a network failure: nothing was attempted.
 ///
 /// <div class="warning">
 ///
@@ -3145,17 +3494,16 @@ pub struct ContextHeaviestMessage {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CopilotApiTokenAuthInfo {
-    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_user: Option<CopilotUserResponse>,
-    /// Authentication host (always the public GitHub host).
-    pub host: CopilotApiTokenAuthInfoHost,
-    /// Direct Copilot API authentication via the `GITHUB_COPILOT_API_TOKEN` + `COPILOT_API_URL` environment-variable pair. The token itself is read from the environment by the runtime, not carried in this struct.
-    pub r#type: CopilotApiTokenAuthInfoType,
+pub struct CatalogUnavailableError {
+    /// Discriminator: the operation is not available
+    pub kind: CatalogUnavailableErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+    pub message: String,
+    /// Why the operation is unavailable.
+    pub reason: CatalogUnavailableReason,
 }
 
-/// The currently selected model, reasoning effort, and context tier for the session. The context tier reflects `Session.getContextTier()`, restored from the session journal on resume.
+/// No transport this runtime can use is available for the requested server.
 ///
 /// <div class="warning">
 ///
@@ -3165,19 +3513,16 @@ pub struct CopilotApiTokenAuthInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CurrentModel {
-    /// Context tier for models that support multiple context-window sizes.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_tier: Option<ContextTier>,
-    /// Currently active model identifier
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_id: Option<String>,
-    /// Reasoning effort level currently applied to the active model, when one is set. Reads `Session.getReasoningEffort()` synchronously after `getSelectedModel()` resolves so the two values are reported as a snapshot.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_effort: Option<String>,
+pub struct CatalogUnavailableTransportError {
+    /// Discriminator: no usable transport is available
+    pub kind: CatalogUnavailableTransportErrorKind,
+    /// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
+    pub message: String,
+    /// Why no transport could be offered.
+    pub reason: CatalogUnavailableTransportReason,
 }
 
-/// Lightweight metadata for a currently initialized session tool
+/// A literal choice the command input accepts, with a human-facing description
 ///
 /// <div class="warning">
 ///
@@ -3187,29 +3532,14 @@ pub struct CurrentModel {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CurrentToolMetadata {
-    /// Whether the tool is loaded on demand via tool search
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub defer_loading: Option<bool>,
-    /// Tool description
+pub struct SlashCommandInputChoice {
+    /// Human-readable description shown alongside the choice
     pub description: String,
-    /// JSON Schema for tool input
-    #[serde(rename = "input_schema", skip_serializing_if = "Option::is_none")]
-    pub input_schema: Option<HashMap<String, serde_json::Value>>,
-    /// MCP server name for MCP-backed tools
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mcp_server_name: Option<String>,
-    /// Raw MCP tool name for MCP-backed tools
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mcp_tool_name: Option<String>,
-    /// Model-facing tool name
+    /// The literal choice value (e.g. 'on', 'off', 'show')
     pub name: String,
-    /// Optional MCP/config namespaced tool name
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub namespaced_name: Option<String>,
 }
 
-/// A file included in the redacted debug bundle.
+/// Optional unstructured input hint
 ///
 /// <div class="warning">
 ///
@@ -3219,35 +3549,24 @@ pub struct CurrentToolMetadata {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DebugCollectLogsCollectedEntry {
-    /// Relative path of the file in the staged bundle/archive.
-    pub bundle_path: String,
-    /// Redacted output size in bytes.
-    pub size_bytes: i64,
-    /// Source category for this entry.
-    pub source: DebugCollectLogsSource,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct DebugCollectLogsDestinationArchive {
-    pub kind: DebugCollectLogsDestinationArchiveKind,
-    /// When true, create the archive atomically without overwriting an existing file by appending ` (N)` before the extension as needed. Defaults to false.
+pub struct SlashCommandInput {
+    /// Optional literal choices the input accepts, each with a human-facing description; clients may render these as selectable options
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub no_overwrite: Option<bool>,
-    /// Absolute or server-relative path for the .tgz archive to create.
-    pub output_path: String,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct DebugCollectLogsDestinationDirectory {
-    pub kind: DebugCollectLogsDestinationDirectoryKind,
-    /// Directory where redacted files should be staged. The directory is created if needed.
-    pub output_directory: String,
+    pub choices: Option<Vec<SlashCommandInputChoice>>,
+    /// Optional completion hint for the input (e.g. 'directory' for filesystem path completion)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub completion: Option<SlashCommandInputCompletion>,
+    /// Hint to display when command input has not been provided
+    pub hint: String,
+    /// When true, clients should pass the full text after the command name as a single argument rather than splitting on whitespace
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub preserve_multiline_input: Option<bool>,
+    /// When true, the command requires non-empty input; clients should render the input hint as required
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub required: Option<bool>,
 }
 
-/// A caller-provided server-local file or directory to include in the debug bundle.
+/// Slash-command metadata with name, aliases, description, kind, input hint, execution allowance, and schedulability.
 ///
 /// <div class="warning">
 ///
@@ -3257,22 +3576,30 @@ pub struct DebugCollectLogsDestinationDirectory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DebugCollectLogsEntry {
-    /// Relative path to use inside the staged bundle/archive.
-    pub bundle_path: String,
-    /// Kind of source path to include.
-    pub kind: DebugCollectLogsEntryKind,
-    /// Server-local source path to read.
-    pub path: String,
-    /// How text content from this entry should be redacted. Defaults to plain-text.
+pub struct SlashCommandInfo {
+    /// Canonical aliases without leading slashes
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub redaction: Option<DebugCollectLogsRedaction>,
-    /// When true, collection fails if this entry cannot be read. Defaults to false, which records the entry in `skippedEntries`.
+    pub aliases: Option<Vec<String>>,
+    /// Whether the command may run while an agent turn is active
+    pub allow_during_agent_execution: bool,
+    /// Human-readable command description
+    pub description: String,
+    /// Whether the command is experimental
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub required: Option<bool>,
+    pub experimental: Option<bool>,
+    /// Optional unstructured input hint
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input: Option<SlashCommandInput>,
+    /// Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command
+    pub kind: SlashCommandKind,
+    /// Canonical command name without a leading slash
+    pub name: String,
+    /// Whether the command may be the target of `/every` / `/after` schedules. Resolution happens at every tick, so only set this when the command is safe to re-invoke and produces an agent prompt.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub schedulable: Option<bool>,
 }
 
-/// Built-in session diagnostics to include in the bundle. Omitted fields default to true.
+/// Slash commands available in the session, after applying any include/exclude filters.
 ///
 /// <div class="warning">
 ///
@@ -3282,31 +3609,12 @@ pub struct DebugCollectLogsEntry {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DebugCollectLogsInclude {
-    /// Server-local path to the current process log. When set, it is included as `process.log` and its directory is searched for prior logs from the same session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub current_process_log_path: Option<String>,
-    /// Include the session event log (`events.jsonl`). Defaults to true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub events: Option<bool>,
-    /// Server-local path to the session's events.jsonl file. Internal callers normally omit this and let the runtime derive it from the session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub events_path: Option<String>,
-    /// Maximum number of previous process logs to include. Defaults to 5.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub previous_process_log_limit: Option<i64>,
-    /// Server-local process log directory to search when `currentProcessLogPath` is unavailable, useful for collecting logs for inactive sessions.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub process_log_directory: Option<String>,
-    /// Include process logs for the session. Defaults to true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub process_logs: Option<bool>,
-    /// Include interactive shell logs written under the session's `shell-logs` directory. Defaults to true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub shell_logs: Option<bool>,
+pub struct CommandList {
+    /// Commands available in this session
+    pub commands: Vec<SlashCommandInfo>,
 }
 
-/// Options for collecting a redacted session debug bundle.
+/// The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.
 ///
 /// <div class="warning">
 ///
@@ -3314,20 +3622,16 @@ pub struct DebugCollectLogsInclude {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DebugCollectLogsRequest {
-    /// Caller-provided server-local files or directories to include in addition to the runtime's built-in session diagnostics. This lets host applications add their own diagnostics without changing the API shape.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_entries: Option<Vec<DebugCollectLogsEntry>>,
-    /// Where the redacted bundle should be written. Use `archive` to produce a .tgz, or `directory` to stage redacted files for caller-managed upload/post-processing.
-    pub destination: DebugCollectLogsDestination,
-    /// Which built-in session diagnostics to include. Omitted fields default to true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include: Option<DebugCollectLogsInclude>,
+pub struct CommandsFinalizeInvocationEffectRequest {
+    /// The slash-command result object that produced the pending effect, echoed back unchanged.
+    pub effect: serde_json::Value,
+    /// Whether the host applied or cancelled the pending invocation effect.
+    pub outcome: CommandsInvocationEffectOutcome,
 }
 
-/// An optional debug bundle entry that could not be included.
+/// Whether finalizing the invocation effect succeeded, and the failure reason when it did not.
 ///
 /// <div class="warning">
 ///
@@ -3337,17 +3641,15 @@ pub struct DebugCollectLogsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DebugCollectLogsSkippedEntry {
-    /// Relative path requested for this bundle entry.
-    pub bundle_path: String,
-    /// Server-local source path that could not be read.
+pub struct CommandsFinalizeInvocationEffectResult {
+    /// Failure reason when the invocation effect could not be finalized.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// Reason the entry was skipped.
-    pub reason: String,
+    pub error: Option<String>,
+    /// Whether the pending invocation effect was finalized successfully.
+    pub success: bool,
 }
 
-/// Result of collecting a redacted debug bundle.
+/// Pending command request ID and an optional error if the client handler failed.
 ///
 /// <div class="warning">
 ///
@@ -3357,19 +3659,15 @@ pub struct DebugCollectLogsSkippedEntry {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DebugCollectLogsResult {
-    /// Files included in the redacted bundle.
-    pub entries: Vec<DebugCollectLogsCollectedEntry>,
-    /// Destination kind that was written.
-    pub kind: DebugCollectLogsResultKind,
-    /// Actual archive path or staging directory path written. This may differ from the requested path when no-overwrite suffixing or fallback-to-temp-directory was needed.
-    pub path: String,
-    /// Optional files or directories that could not be included.
+pub struct CommandsHandlePendingCommandRequest {
+    /// Error message if the command handler failed
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub skipped_entries: Option<Vec<DebugCollectLogsSkippedEntry>>,
+    pub error: Option<String>,
+    /// Request ID from the command invocation event
+    pub request_id: RequestId,
 }
 
-/// Installed plugin that contributes a discovered extension.
+/// Indicates whether the pending client-handled command was completed successfully.
 ///
 /// <div class="warning">
 ///
@@ -3379,12 +3677,12 @@ pub struct DebugCollectLogsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DiscoveredExtensionPlugin {
-    /// Installed plugin name
-    pub name: String,
+pub struct CommandsHandlePendingCommandResult {
+    /// Whether the command was handled successfully
+    pub success: bool,
 }
 
-/// Discovered extension metadata and persistent enablement state.
+/// Slash command name and optional raw input string to invoke.
 ///
 /// <div class="warning">
 ///
@@ -3394,23 +3692,18 @@ pub struct DiscoveredExtensionPlugin {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DiscoveredExtension {
-    /// Whether this extension's persistent per-ID preference is enabled
-    pub enabled: bool,
-    /// Source-qualified ID accepted by both server and session extension enablement methods
-    pub id: String,
-    /// Human-readable extension name
+pub struct CommandsInvokeRequest {
+    /// Raw input after the command name
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input: Option<String>,
+    /// Command name. Leading slashes are stripped and the name is matched case-insensitively.
     pub name: String,
-    /// Absolute path to the extension entry module, suitable for revealing it in a file manager
-    pub path: String,
-    /// Containing plugin metadata for plugin-contributed extensions
+    /// Optional client surface that initiated the invocation
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub plugin: Option<DiscoveredExtensionPlugin>,
-    /// Discovery source
-    pub source: DiscoveredExtensionSource,
+    pub origin: Option<CommandsInvocationOrigin>,
 }
 
-/// Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.
+/// Optional filters controlling which command sources to include in the listing.
 ///
 /// <div class="warning">
 ///
@@ -3420,14 +3713,19 @@ pub struct DiscoveredExtension {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DiscoveredExtensions {
-    /// Discovered user and enabled installed-plugin extensions from persisted Copilot home state
-    pub extensions: Vec<DiscoveredExtension>,
-    /// Effective extension loading mode. Defaults to load_and_augment when unset.
-    pub mode: DiscoveredExtensionMode,
+pub struct CommandsListRequest {
+    /// Include runtime built-in commands
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_builtins: Option<bool>,
+    /// Include commands registered by protocol clients, including SDK clients and extensions
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_client_commands: Option<bool>,
+    /// Include enabled user-invocable skills and commands
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_skills: Option<bool>,
 }
 
-/// Source-qualified extension identifiers to persistently disable for future sessions.
+/// Queued-command request ID and the result indicating whether the host executed it (and whether to stop processing further queued commands).
 ///
 /// <div class="warning">
 ///
@@ -3437,12 +3735,14 @@ pub struct DiscoveredExtensions {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DiscoveredExtensionsDisableRequest {
-    /// Source-qualified user or plugin extension IDs to disable
-    pub ids: Vec<String>,
+pub struct CommandsRespondToQueuedCommandRequest {
+    /// Request ID from the `command.queued` event the host is responding to.
+    pub request_id: RequestId,
+    /// Result of the queued command execution.
+    pub result: serde_json::Value,
 }
 
-/// Source-qualified extension identifiers to persistently enable for future sessions.
+/// Indicates whether the queued-command response was matched to a pending request.
 ///
 /// <div class="warning">
 ///
@@ -3452,12 +3752,12 @@ pub struct DiscoveredExtensionsDisableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DiscoveredExtensionsEnableRequest {
-    /// Source-qualified user or plugin extension IDs to enable
-    pub ids: Vec<String>,
+pub struct CommandsRespondToQueuedCommandResult {
+    /// Whether a pending queued command with the given request ID was found and resolved. False when the request was already resolved, cancelled, or unknown.
+    pub success: bool,
 }
 
-/// MCP server discovered by `mcp.discover`, with config source, optional plugin source, transport type, and enabled state.
+/// Characters that, when typed in the composer, should trigger a `completions.request`. Empty when the session has no host-driven completions (e.g. local sessions, or a relay host that does not advertise `completionTriggerCharacters`).
 ///
 /// <div class="warning">
 ///
@@ -3467,25 +3767,12 @@ pub struct DiscoveredExtensionsEnableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct DiscoveredMcpServer {
-    /// Whether the server is enabled (not in the disabled list)
-    pub enabled: bool,
-    /// Server name (config key)
-    pub name: String,
-    /// Configuration source: user, workspace, plugin, or builtin
-    pub source: McpServerSource,
-    /// Plugin name that provided this server, when source is plugin.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source_plugin: Option<String>,
-    /// Plugin version that provided this server, when source is plugin.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source_plugin_version: Option<String>,
-    /// Server transport type: stdio, http, sse (deprecated), or memory
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#type: Option<DiscoveredMcpServerType>,
+pub struct CompletionsGetTriggerCharactersResult {
+    /// Trigger characters advertised by the host (e.g. `["@", "#"]`). Empty disables host-driven completions for the session.
+    pub trigger_characters: Vec<String>,
 }
 
-/// Slash-prefixed command string to enqueue for FIFO processing.
+/// Request host-driven completions for the current composer input.
 ///
 /// <div class="warning">
 ///
@@ -3495,12 +3782,14 @@ pub struct DiscoveredMcpServer {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct EnqueueCommandParams {
-    /// Slash-prefixed command string to enqueue, e.g. '/compact' or '/model gpt-4'. Queued FIFO with any in-flight items; if the session is idle, processing kicks off immediately.
-    pub command: String,
+pub struct CompletionsRequestRequest {
+    /// Cursor offset within `text`, in UTF-16 code units.
+    pub offset: i64,
+    /// The full composed composer input.
+    pub text: String,
 }
 
-/// Indicates whether the command was accepted into the local execution queue.
+/// A single host-driven completion. Accepting an item replaces `[rangeStart, rangeEnd)` (UTF-16 code units) in the composer with `insertText`; when the range is absent, the active token around the cursor is replaced.
 ///
 /// <div class="warning">
 ///
@@ -3510,12 +3799,24 @@ pub struct EnqueueCommandParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct EnqueueCommandResult {
-    /// True when the command was accepted into the local execution queue. False when the call targets a session that does not support local command queueing (e.g. remote sessions).
-    pub queued: bool,
+pub struct SessionCompletionItem {
+    /// Text spliced into the composer when the item is accepted.
+    pub insert_text: String,
+    /// Render-kind hint for the picker row (e.g. `"document"`, `"directory"`), derived from the host's display kind.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub kind: Option<String>,
+    /// Primary display label for the picker row. Falls back to `insertText` when absent.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub label: Option<String>,
+    /// End (exclusive) of the replacement range in `text`, in UTF-16 code units.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub range_end: Option<i64>,
+    /// Start of the replacement range in `text`, in UTF-16 code units.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub range_start: Option<i64>,
 }
 
-/// Authentication-info variant for a token sourced from an environment variable, with host, optional login, token, and env var name.
+/// Host-driven completion items for the current composer input. Empty when the host returns no items or does not support completions.
 ///
 /// <div class="warning">
 ///
@@ -3525,24 +3826,12 @@ pub struct EnqueueCommandResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct EnvAuthInfo {
-    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_user: Option<CopilotUserResponse>,
-    /// Name of the environment variable the token was sourced from.
-    pub env_var: String,
-    /// Authentication host (e.g. https://github.com or a GHES host).
-    pub host: String,
-    /// User login associated with the token. Undefined for server-to-server tokens (those starting with `ghs_`).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub login: Option<String>,
-    /// The token value itself. Treat as a secret.
-    pub token: String,
-    /// Personal access token (PAT) or server-to-server token sourced from an environment variable.
-    pub r#type: EnvAuthInfoType,
+pub struct CompletionsRequestResult {
+    /// Completion items in host-ranked order.
+    pub items: Vec<SessionCompletionItem>,
 }
 
-/// Cursor, batch size, and optional long-poll/filter parameters for reading session events.
+/// Params to attach or detach an in-process ExtensionController delegate.
 ///
 /// <div class="warning">
 ///
@@ -3552,34 +3841,16 @@ pub struct EnvAuthInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct EventLogReadRequest {
-    /// Optional non-empty list of subagent identifiers. When provided, only events owned by one of these agents are returned; ownership recognizes the event envelope's agentId plus legacy data.agentId and data.parentToolCallId markers. This filter takes precedence over agentScope.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_ids: Option<Vec<String>>,
-    /// Agent-scope filter: 'primary' returns only main-agent events plus events whose type starts with 'subagent.' (matching the typed-subscription default behavior); 'all' returns events from all agents (matching wildcard-subscription behavior). Default is 'all' to preserve wildcard semantics for catch-up callers.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_scope: Option<EventsAgentScope>,
-    /// Opaque cursor returned by a previous read. Omit on the first call to start from the beginning of the session's persisted history.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cursor: Option<String>,
-    /// Direction to page through the session's persisted event history. 'forward' (default) pages from the cursor toward newer events (or from the start of history when no cursor is given). 'backward' enables tail-first reads: with no cursor it returns the NEWEST `max` events, and the returned cursor pages toward OLDER events on subsequent backward reads. Events within a returned batch are always in chronological (oldest-to-newest) order, even for a backward read. Backward reads cover PERSISTED history only; ephemeral events are never returned by a backward read. `direction` selects the INITIAL read only: the returned cursor is self-describing, so a continuation read pages in the cursor's own direction regardless of the `direction` passed alongside it — a forward cursor always pages forward and a backward cursor always pages backward. Pass the direction that matches the cursor to avoid confusion.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub direction: Option<EventsReadDirection>,
-    /// When false, skip ephemeral events entirely and return only durable (persisted) events. History-backfill callers that discard ephemerals anyway should set this so the read is bounded by the durable log length instead of racing the ephemeral ring on a busy session. Defaults to true (ephemerals are interleaved with durable events in creation order). Ignored by backward reads, which always cover persisted history only.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_ephemeral: Option<bool>,
-    /// Maximum number of events to return in this batch (1–1000, default 200).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max: Option<i64>,
-    /// Either '*' to receive all event types, or a non-empty list of event types to receive
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub types: Option<serde_json::Value>,
-    /// Milliseconds to wait for new events when the cursor is at the tail of history. 0 (default) returns immediately even if no events are available. Capped at 30000ms. Ephemeral events that arrive during the wait are delivered in this batch but are NOT replayable on a subsequent read (use a non-zero waitMs in your next call to capture future ephemerals as they happen). This applies to forward reads only: a backward read always returns immediately and ignores `waitMs`, because backward paging covers persisted history only while new events append at the tail (the opposite end from a backward page), so no blocking or ephemeral delivery can occur.
+pub(crate) struct ConfigureSessionExtensionsParams {
+    /// In-process ExtensionController delegate (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. The post-SDK extension surface exposes list/enable/disable/reload via dedicated RPCs served by the runtime.
+    #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub wait_ms: Option<i32>,
+    pub(crate) controller: Option<serde_json::Value>,
+    /// Session to attach the extension controller delegate to.
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the operation succeeded.
+/// Identity of the integrating host, declared once on the `server.connect` handshake so telemetry from this connection is attributed to a single, consistent surface. All fields are optional; omit them to keep the default attribution.
 ///
 /// <div class="warning">
 ///
@@ -3589,12 +3860,22 @@ pub struct EventLogReadRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct EventLogReleaseInterestResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub(crate) struct ConnectClientInfo {
+    /// Name of the host editor, e.g. `"vscode"`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub editor_name: Option<String>,
+    /// Version of the host editor, e.g. `"1.124.2"`. Ignored unless it looks like a version string.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub editor_version: Option<String>,
+    /// Name of the Copilot extension within the host, e.g. `"copilot-chat"`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub extension_name: Option<String>,
+    /// Version of the Copilot extension within the host, e.g. `"0.54.0"`. Ignored unless it looks like a version string.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub extension_version: Option<String>,
 }
 
-/// Snapshot of the current tail cursor without returning any events. Use this when a consumer wants to subscribe to live events going forward without first paginating through the entire persisted history (which would happen if `read` were called without a cursor on a long-lived session).
+/// Repository associated with the connected remote session.
 ///
 /// <div class="warning">
 ///
@@ -3604,12 +3885,16 @@ pub struct EventLogReleaseInterestResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct EventLogTailResult {
-    /// Opaque cursor pointing at the current tail of the session's persisted-events history. Pass back to `read` to receive only events that arrive AFTER this snapshot. When the session has no events, this returns the same sentinel as an unset cursor (i.e. equivalent to omitting the cursor on a first read).
-    pub cursor: String,
+pub struct ConnectedRemoteSessionMetadataRepository {
+    /// Branch associated with the remote session.
+    pub branch: String,
+    /// Repository name.
+    pub name: String,
+    /// Repository owner or organization login.
+    pub owner: String,
 }
 
-/// Batch of session events returned by a read, with cursor and continuation metadata.
+/// Metadata for a connected remote session.
 ///
 /// <div class="warning">
 ///
@@ -3619,18 +3904,38 @@ pub struct EventLogTailResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct EventsReadResult {
-    /// Opaque cursor for the next read. Pass back unchanged in the next read.cursor to continue from where this read left off. Always present, even when no events were returned. For a backward read this cursor pages toward OLDER events; keep passing `direction: backward` with it (the cursor is also self-describing, so backward paging continues correctly).
-    pub cursor: String,
-    /// Cursor status: 'ok' means the cursor was applied successfully; 'expired' means the cursor referred to an event that no longer exists in history (e.g. truncated or compacted away) and the read fell back to a boundary of the remaining history. For a forward read the fallback starts from the beginning of the remaining history; for a backward read it falls back to the tail (the newest window). Because the fallback page is a fresh boundary snapshot rather than a continuation of the requested cursor, it may overlap events the consumer has already rendered — a backward fallback to the tail in particular can repeat the newest window. On 'expired', consumers should reset or rebase their local pagination state (or deduplicate by event id) before continuing from the returned cursor rather than blindly appending/prepending the fallback page.
-    pub cursor_status: EventsCursorStatus,
-    /// Session events for this batch, merged into a single stream in creation order: durable (persisted) events and ephemeral events interleave exactly as they were emitted. Set `includeEphemeral: false` to receive only durable events. Ephemeral events are never replayable once pruned from the in-memory ring, so a consumer that needs them should keep reading with a non-zero `waitMs`. For a backward (tail-first) read, the returned window contains persisted events only, still in chronological (oldest-to-newest) append order.
-    pub events: Vec<SessionEvent>,
-    /// True when more events are available in the read's direction. For a forward read, true means the batch returned `max` events and more are available immediately. For a backward read, true means older persisted events remain before the returned window.
-    pub has_more: bool,
+pub struct ConnectedRemoteSessionMetadata {
+    /// Neutral SDK discriminator for the connected remote session kind.
+    pub kind: ConnectedRemoteSessionMetadataKind,
+    /// Last session update time as an ISO 8601 string.
+    pub modified_time: String,
+    /// Optional friendly session name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Pull request number associated with the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub pull_request_number: Option<i64>,
+    /// Repository associated with the connected remote session.
+    pub repository: ConnectedRemoteSessionMetadataRepository,
+    /// Original remote resource identifier.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub resource_id: Option<String>,
+    /// SDK session ID for the connected remote session.
+    pub session_id: SessionId,
+    /// Remote session staleness deadline as an ISO 8601 string.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stale_at: Option<String>,
+    /// Session start time as an ISO 8601 string.
+    pub start_time: String,
+    /// Remote session state returned by the backing service.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub state: Option<String>,
+    /// Optional session summary.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary: Option<String>,
 }
 
-/// Slash command name and argument string to execute synchronously.
+/// Remote session connection parameters.
 ///
 /// <div class="warning">
 ///
@@ -3640,14 +3945,12 @@ pub struct EventsReadResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExecuteCommandParams {
-    /// Argument string to pass to the command (empty string if none).
-    pub args: String,
-    /// Name of the slash command to invoke (without the leading '/').
-    pub command_name: String,
+pub struct ConnectRemoteSessionParams {
+    /// Session ID to connect to.
+    pub session_id: SessionId,
 }
 
-/// Error message produced while executing the command, if any.
+/// Connection-level opt-ins for the `server.connect` handshake. Transport authentication is consumed by the native protocol boundary before dispatch.
 ///
 /// <div class="warning">
 ///
@@ -3657,13 +3960,20 @@ pub struct ExecuteCommandParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExecuteCommandResult {
-    /// Error message produced while executing the command, if any. Omitted when the handler succeeded.
+pub(crate) struct ConnectRequest {
+    /// Identity of the integrating host. Optional; omit it to keep the default attribution.
+    #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-}
-
-/// Discovered extension metadata, including source-qualified ID, name, discovery source, status, and optional process ID.
+    pub(crate) client_info: Option<ConnectClientInfo>,
+    /// Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the runtime forwards every internal telemetry event it emits — across all sessions, plus sessionless events — to this connection over the `gitHubTelemetry.event` notification. Regular events are also written to the runtime's normal GitHub/CTS path (dual-write); host-only compatibility events are forward-only and intentionally skip that path. Intended for first-party hosts that re-emit the events into their own telemetry stores. Both unrestricted and restricted events are forwarded, each tagged with a `restricted` discriminator; a backstop drops restricted events when restricted telemetry is disabled — using the process-global gate for ordinary events and an explicit session-scoped decision for host-only events.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_git_hub_telemetry_forwarding: Option<bool>,
+    /// Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub token: Option<String>,
+}
+
+/// Handshake result reporting the server's protocol version and package version on success.
 ///
 /// <div class="warning">
 ///
@@ -3673,21 +3983,16 @@ pub struct ExecuteCommandResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct Extension {
-    /// Source-qualified ID (e.g., 'project:my-ext', 'user:auth-helper', 'plugin:my-plugin:my-ext')
-    pub id: String,
-    /// Extension name (directory name)
-    pub name: String,
-    /// Process ID if the extension is running
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub pid: Option<i64>,
-    /// Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin (installed plugin), or session (session-state/<id>/extensions/)
-    pub source: ExtensionSource,
-    /// Current status: running, disabled, failed, or starting
-    pub status: ExtensionStatus,
+pub(crate) struct ConnectResult {
+    /// Always true on success
+    pub ok: bool,
+    /// Server protocol version number
+    pub protocol_version: i64,
+    /// Server package version
+    pub version: String,
 }
 
-/// Slim input shape for extension_context attachments; identity fields are runtime-derived.
+/// Local file system absolute paths within the session working directory to check against its content-exclusion policy.
 ///
 /// <div class="warning">
 ///
@@ -3697,16 +4002,12 @@ pub struct Extension {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExtensionContextPushInput {
-    /// Caller-supplied JSON payload (required, may be null but not undefined)
-    pub payload: serde_json::Value,
-    /// Human-readable composer pill label
-    pub title: String,
-    /// Attachment type discriminator
-    pub r#type: ExtensionContextPushInputType,
+pub struct ContentExclusionCheckPathsRequest {
+    /// Local file system absolute paths within the session working directory to check. Results are returned in the same order, including duplicates.
+    pub paths: Vec<String>,
 }
 
-/// Extensions discovered for the session, with their current status.
+/// Content-exclusion decision for one requested path.
 ///
 /// <div class="warning">
 ///
@@ -3716,12 +4017,14 @@ pub struct ExtensionContextPushInput {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExtensionList {
-    /// Discovered extensions and their current status
-    pub extensions: Vec<Extension>,
+pub struct ContentExclusionPathCheck {
+    /// Whether the session's complete content-exclusion policy excludes the path.
+    pub excluded: bool,
+    /// The path supplied by the caller.
+    pub path: String,
 }
 
-/// Source-qualified extension identifier to disable for the session.
+/// Batch content-exclusion result. Callers must fail closed when policy evaluation is unavailable.
 ///
 /// <div class="warning">
 ///
@@ -3731,12 +4034,14 @@ pub struct ExtensionList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExtensionsDisableRequest {
-    /// Source-qualified extension ID to disable
-    pub id: String,
+pub struct ContentExclusionCheckPathsResult {
+    /// Whether the session's policy service was available for the complete batch. When false, checks is empty and callers must treat every requested path as excluded.
+    pub available: bool,
+    /// Per-path decisions in request order. Empty when available is false.
+    pub checks: Vec<ContentExclusionPathCheck>,
 }
 
-/// Source-qualified extension identifier to enable for the session.
+/// A single large message currently in context.
 ///
 /// <div class="warning">
 ///
@@ -3746,12 +4051,18 @@ pub struct ExtensionsDisableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExtensionsEnableRequest {
-    /// Source-qualified extension ID to enable
+pub struct ContextHeaviestMessage {
+    /// Stable identifier for this message within the snapshot.
     pub id: String,
+    /// Human-readable source label, e.g. `tool: bash` or `skill: tmux`. Presentation-only.
+    pub label: String,
+    /// Role of the chat message (`user`, `assistant`, or `tool`).
+    pub role: String,
+    /// Token count currently in context for this individual message.
+    pub tokens: i64,
 }
 
-/// Binary result returned by a tool for the model
+/// The currently selected model, reasoning effort, and context tier for the session. The context tier reflects `Session.getContextTier()`, restored from the session journal on resume.
 ///
 /// <div class="warning">
 ///
@@ -3761,22 +4072,19 @@ pub struct ExtensionsEnableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlmBinaryResultsForLlm {
-    /// Base64-encoded binary data
-    pub data: String,
-    /// Human-readable description of the binary data
+pub struct CurrentModel {
+    /// Context tier for models that support multiple context-window sizes.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Optional metadata from the producing tool.
+    pub context_tier: Option<ContextTier>,
+    /// Currently active model identifier
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub metadata: Option<HashMap<String, serde_json::Value>>,
-    /// MIME type of the binary data
-    pub mime_type: String,
-    /// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
-    pub r#type: ExternalToolTextResultForLlmBinaryResultsForLlmType,
+    pub model_id: Option<String>,
+    /// Reasoning effort level currently applied to the active model, when one is set. Reads `Session.getReasoningEffort()` synchronously after `getSelectedModel()` resolves so the two values are reported as a snapshot.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<String>,
 }
 
-/// Expanded external tool result payload
+/// Lightweight metadata for a currently initialized session tool
 ///
 /// <div class="warning">
 ///
@@ -3786,33 +4094,29 @@ pub struct ExternalToolTextResultForLlmBinaryResultsForLlm {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlm {
-    /// Base64-encoded binary results returned to the model
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub binary_results_for_llm: Option<Vec<ExternalToolTextResultForLlmBinaryResultsForLlm>>,
-    /// Structured content blocks from the tool
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub contents: Option<Vec<serde_json::Value>>,
-    /// Optional error message for failed executions
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Execution outcome classification. Optional for back-compat; normalized to 'success' (or 'failure' when error is present) when missing or unrecognized.
+pub struct CurrentToolMetadata {
+    /// Whether the tool is loaded on demand via tool search
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub result_type: Option<String>,
-    /// Detailed log content for timeline display
+    pub defer_loading: Option<bool>,
+    /// Tool description
+    pub description: String,
+    /// JSON Schema for tool input
+    #[serde(rename = "input_schema", skip_serializing_if = "Option::is_none")]
+    pub input_schema: Option<HashMap<String, serde_json::Value>>,
+    /// MCP server name for MCP-backed tools
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_log: Option<String>,
-    /// Text result returned to the model
-    pub text_result_for_llm: String,
-    /// Tool references returned by a tool-search override: names of deferred tools to surface to the model. When set, the tool result is materialized as `tool_reference` content blocks (rather than plain text) so the model knows which deferred tools are now available.
+    pub mcp_server_name: Option<String>,
+    /// Raw MCP tool name for MCP-backed tools
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_references: Option<Vec<String>>,
-    /// Optional tool-specific telemetry
+    pub mcp_tool_name: Option<String>,
+    /// Model-facing tool name
+    pub name: String,
+    /// Optional MCP/config namespaced tool name
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_telemetry: Option<HashMap<String, serde_json::Value>>,
+    pub namespaced_name: Option<String>,
 }
 
-/// Audio content block with base64-encoded data
+/// A file included in the redacted debug bundle.
 ///
 /// <div class="warning">
 ///
@@ -3822,52 +4126,37 @@ pub struct ExternalToolTextResultForLlm {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlmContentAudio {
-    /// Base64-encoded audio data
-    pub data: String,
-    /// MIME type of the audio (e.g., audio/wav, audio/mpeg)
-    pub mime_type: String,
-    /// Content block type discriminator
-    pub r#type: ExternalToolTextResultForLlmContentAudioType,
+pub struct DebugCollectLogsCollectedEntry {
+    /// Relative path of the file in the staged bundle/archive.
+    pub bundle_path: String,
+    /// Redacted output size in bytes.
+    pub size_bytes: i64,
+    /// Source category for this entry.
+    pub source: DebugCollectLogsSource,
 }
 
-/// Image content block with base64-encoded data
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlmContentImage {
-    /// Base64-encoded image data
-    pub data: String,
-    /// MIME type of the image (e.g., image/png, image/jpeg)
-    pub mime_type: String,
-    /// Content block type discriminator
-    pub r#type: ExternalToolTextResultForLlmContentImageType,
+pub struct DebugCollectLogsDestinationArchive {
+    /// Destination variant discriminator.
+    pub kind: DebugCollectLogsDestinationArchiveKind,
+    /// When true, create the archive atomically without overwriting an existing file by appending ` (N)` before the extension as needed. Defaults to false.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub no_overwrite: Option<bool>,
+    /// Absolute or server-relative path for the .tgz archive to create.
+    pub output_path: String,
 }
 
-/// Embedded resource content block with inline text or binary data
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlmContentResource {
-    /// The embedded resource contents, either text or base64-encoded binary
-    pub resource: serde_json::Value,
-    /// Content block type discriminator
-    pub r#type: ExternalToolTextResultForLlmContentResourceType,
+pub struct DebugCollectLogsDestinationDirectory {
+    /// Destination variant discriminator.
+    pub kind: DebugCollectLogsDestinationDirectoryKind,
+    /// Directory where redacted files should be staged. The directory is created if needed.
+    pub output_directory: String,
 }
 
-/// Icon image for a resource
+/// A caller-provided server-local file or directory to include in the debug bundle.
 ///
 /// <div class="warning">
 ///
@@ -3877,21 +4166,22 @@ pub struct ExternalToolTextResultForLlmContentResource {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlmContentResourceLinkIcon {
-    /// MIME type of the icon image
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    /// Available icon sizes (e.g., ['16x16', '32x32'])
+pub struct DebugCollectLogsEntry {
+    /// Relative path to use inside the staged bundle/archive.
+    pub bundle_path: String,
+    /// Kind of source path to include.
+    pub kind: DebugCollectLogsEntryKind,
+    /// Server-local source path to read.
+    pub path: String,
+    /// How text content from this entry should be redacted. Defaults to plain-text.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub sizes: Option<Vec<String>>,
-    /// URL or path to the icon image
-    pub src: String,
-    /// Theme variant this icon is intended for
+    pub redaction: Option<DebugCollectLogsRedaction>,
+    /// When true, collection fails if this entry cannot be read. Defaults to false, which records the entry in `skippedEntries`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub theme: Option<ExternalToolTextResultForLlmContentResourceLinkIconTheme>,
+    pub required: Option<bool>,
 }
 
-/// Resource link content block referencing an external resource
+/// Built-in session diagnostics to include in the bundle. Omitted fields default to true.
 ///
 /// <div class="warning">
 ///
@@ -3901,31 +4191,31 @@ pub struct ExternalToolTextResultForLlmContentResourceLinkIcon {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlmContentResourceLink {
-    /// Human-readable description of the resource
+pub struct DebugCollectLogsInclude {
+    /// Server-local path to the current process log. When set, it is included as `process.log` and its directory is searched for prior logs from the same session.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Icons associated with this resource
+    pub current_process_log_path: Option<String>,
+    /// Include the session event log (`events.jsonl`). Defaults to true.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub icons: Option<Vec<ExternalToolTextResultForLlmContentResourceLinkIcon>>,
-    /// MIME type of the resource content
+    pub events: Option<bool>,
+    /// Server-local path to the session's events.jsonl file. Internal callers normally omit this and let the runtime derive it from the session.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    /// Resource name identifier
-    pub name: String,
-    /// Size of the resource in bytes
+    pub events_path: Option<String>,
+    /// Maximum number of previous process logs to include. Defaults to 5.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub size: Option<i64>,
-    /// Human-readable display title for the resource
+    pub previous_process_log_limit: Option<i64>,
+    /// Server-local process log directory to search when `currentProcessLogPath` is unavailable, useful for collecting logs for inactive sessions.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// Content block type discriminator
-    pub r#type: ExternalToolTextResultForLlmContentResourceLinkType,
-    /// URI identifying the resource
-    pub uri: String,
+    pub process_log_directory: Option<String>,
+    /// Include process logs for the session. Defaults to true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub process_logs: Option<bool>,
+    /// Include interactive shell logs written under the session's `shell-logs` directory. Defaults to true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell_logs: Option<bool>,
 }
 
-/// Shell command exit metadata with optional output preview
+/// Options for collecting a redacted session debug bundle.
 ///
 /// <div class="warning">
 ///
@@ -3933,27 +4223,20 @@ pub struct ExternalToolTextResultForLlmContentResourceLink {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlmContentShellExit {
-    /// Working directory where the shell command was executed
+pub struct DebugCollectLogsRequest {
+    /// Caller-provided server-local files or directories to include in addition to the runtime's built-in session diagnostics. This lets host applications add their own diagnostics without changing the API shape.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    /// Exit code from the completed shell command
-    pub exit_code: i64,
-    /// Output associated with this shell command, if available. May be partial, truncated, or a preview; not guaranteed to be full output.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub output_preview: Option<String>,
-    /// Whether outputPreview is known to be incomplete or truncated
+    pub additional_entries: Option<Vec<DebugCollectLogsEntry>>,
+    /// Where the redacted bundle should be written. Use `archive` to produce a .tgz, or `directory` to stage redacted files for caller-managed upload/post-processing.
+    pub destination: DebugCollectLogsDestination,
+    /// Which built-in session diagnostics to include. Omitted fields default to true.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub output_truncated: Option<bool>,
-    /// Shell id, as assigned by Copilot runtime
-    pub shell_id: String,
-    /// Content block type discriminator
-    pub r#type: ExternalToolTextResultForLlmContentShellExitType,
+    pub include: Option<DebugCollectLogsInclude>,
 }
 
-/// Terminal/shell output content block with optional exit code and working directory
+/// An optional debug bundle entry that could not be included.
 ///
 /// <div class="warning">
 ///
@@ -3963,20 +4246,17 @@ pub struct ExternalToolTextResultForLlmContentShellExit {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlmContentTerminal {
-    /// Working directory where the command was executed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    /// Process exit code, if the command has completed
+pub struct DebugCollectLogsSkippedEntry {
+    /// Relative path requested for this bundle entry.
+    pub bundle_path: String,
+    /// Server-local source path that could not be read.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub exit_code: Option<i64>,
-    /// Terminal/shell output text
-    pub text: String,
-    /// Content block type discriminator
-    pub r#type: ExternalToolTextResultForLlmContentTerminalType,
+    pub path: Option<String>,
+    /// Reason the entry was skipped.
+    pub reason: String,
 }
 
-/// Plain text content block
+/// Result of collecting a redacted debug bundle.
 ///
 /// <div class="warning">
 ///
@@ -3986,14 +4266,19 @@ pub struct ExternalToolTextResultForLlmContentTerminal {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExternalToolTextResultForLlmContentText {
-    /// The text content
-    pub text: String,
-    /// Content block type discriminator
-    pub r#type: ExternalToolTextResultForLlmContentTextType,
+pub struct DebugCollectLogsResult {
+    /// Files included in the redacted bundle.
+    pub entries: Vec<DebugCollectLogsCollectedEntry>,
+    /// Destination kind that was written.
+    pub kind: DebugCollectLogsResultKind,
+    /// Actual archive path or staging directory path written. This may differ from the requested path when no-overwrite suffixing or fallback-to-temp-directory was needed.
+    pub path: String,
+    /// Optional files or directories that could not be included.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skipped_entries: Option<Vec<DebugCollectLogsSkippedEntry>>,
 }
 
-/// Parameters for cooperatively aborting a factory body.
+/// Installed plugin that contributes a discovered extension.
 ///
 /// <div class="warning">
 ///
@@ -4003,14 +4288,12 @@ pub struct ExternalToolTextResultForLlmContentText {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryAbortRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Factory run identifier.
-    pub run_id: String,
+pub struct DiscoveredExtensionPlugin {
+    /// Installed plugin name
+    pub name: String,
 }
 
-/// Acknowledgement that a factory request was accepted.
+/// Discovered extension metadata and persistent enablement state.
 ///
 /// <div class="warning">
 ///
@@ -4020,9 +4303,23 @@ pub struct FactoryAbortRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryAckResult {}
+pub struct DiscoveredExtension {
+    /// Whether this extension's persistent per-ID preference is enabled
+    pub enabled: bool,
+    /// Source-qualified ID accepted by both server and session extension enablement methods
+    pub id: String,
+    /// Human-readable extension name
+    pub name: String,
+    /// Absolute path to the extension entry module, suitable for revealing it in a file manager
+    pub path: String,
+    /// Containing plugin metadata for plugin-contributed extensions
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plugin: Option<DiscoveredExtensionPlugin>,
+    /// Discovery source
+    pub source: DiscoveredExtensionSource,
+}
 
-/// Options for one factory-scoped subagent call.
+/// Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.
 ///
 /// <div class="warning">
 ///
@@ -4032,19 +4329,14 @@ pub struct FactoryAckResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryAgentOptions {
-    /// Optional label distinguishing otherwise identical memoized agent calls.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub label: Option<String>,
-    /// Optional model identifier for the subagent.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Optional JSON Schema for structured agent output.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub schema: Option<serde_json::Value>,
+pub struct DiscoveredExtensions {
+    /// Discovered user and enabled installed-plugin extensions from persisted Copilot home state
+    pub extensions: Vec<DiscoveredExtension>,
+    /// Effective extension loading mode. Defaults to load_and_augment when unset.
+    pub mode: DiscoveredExtensionMode,
 }
 
-/// Parameters for one factory-scoped subagent call.
+/// Source-qualified extension identifiers to persistently disable for future sessions.
 ///
 /// <div class="warning">
 ///
@@ -4054,18 +4346,12 @@ pub struct FactoryAgentOptions {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryAgentRequest {
-    /// Opaque token identifying the current factory execution attempt.
-    pub execution_token: String,
-    /// Factory run identifier that owns the subagent.
-    pub factory_run_id: String,
-    /// Subagent execution options.
-    pub opts: FactoryAgentOptions,
-    /// Prompt to send to the subagent.
-    pub prompt: String,
+pub struct DiscoveredExtensionsDisableRequest {
+    /// Source-qualified user or plugin extension IDs to disable
+    pub ids: Vec<String>,
 }
 
-/// Result of one factory-scoped subagent call.
+/// Source-qualified extension identifiers to persistently enable for future sessions.
 ///
 /// <div class="warning">
 ///
@@ -4075,13 +4361,12 @@ pub struct FactoryAgentRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryAgentResult {
-    /// Agent result, omitted when the agent produced no result.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<serde_json::Value>,
+pub struct DiscoveredExtensionsEnableRequest {
+    /// Source-qualified user or plugin extension IDs to enable
+    pub ids: Vec<String>,
 }
 
-/// Prompt-safe durable identity and live status for a direct factory agent.
+/// MCP server discovered by `mcp.discover`, with config source, optional plugin source, transport type, and enabled state.
 ///
 /// <div class="warning">
 ///
@@ -4091,28 +4376,25 @@ pub struct FactoryAgentResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryAgentSummary {
-    pub active_ms: i64,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub activity: Option<String>,
-    pub agent_id: String,
-    pub agent_type: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub completed_at: Option<i64>,
-    pub label: String,
-    pub phase_id: Option<String>,
+pub struct DiscoveredMcpServer {
+    /// Whether the server is enabled (not in the disabled list)
+    pub enabled: bool,
+    /// Server name (config key)
+    pub name: String,
+    /// Configuration source: user, workspace, plugin, or builtin
+    pub source: McpServerSource,
+    /// Plugin name that provided this server, when source is plugin.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub requested_model: Option<String>,
+    pub source_plugin: Option<String>,
+    /// Plugin version that provided this server, when source is plugin.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub resolved_model: Option<String>,
-    pub run_id: String,
+    pub source_plugin_version: Option<String>,
+    /// Server transport type: stdio, http, sse (deprecated), or memory
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub started_at: Option<i64>,
-    pub status: String,
-    pub tool_call_id: String,
+    pub r#type: Option<DiscoveredMcpServerType>,
 }
 
-/// Parameters for cancelling a factory run.
+/// Slash-prefixed command string to enqueue for FIFO processing.
 ///
 /// <div class="warning">
 ///
@@ -4122,12 +4404,12 @@ pub struct FactoryAgentSummary {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryCancelRequest {
-    /// Factory run identifier.
-    pub run_id: String,
+pub struct EnqueueCommandParams {
+    /// Slash-prefixed command string to enqueue, e.g. '/compact' or '/model gpt-4'. Queued FIFO with any in-flight items; if the session is idle, processing kicks off immediately.
+    pub command: String,
 }
 
-/// Current factory phase identity.
+/// Indicates whether the command was accepted into the local execution queue.
 ///
 /// <div class="warning">
 ///
@@ -4137,12 +4419,12 @@ pub struct FactoryCancelRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryCurrentPhase {
-    pub id: String,
-    pub ordinal: Option<i64>,
+pub struct EnqueueCommandResult {
+    /// True when the command was accepted into the local execution queue. False when the call targets a session that does not support local command queueing (e.g. remote sessions).
+    pub queued: bool,
 }
 
-/// Declared or approved factory resource ceilings.
+/// Cursor, batch size, and optional long-poll/filter parameters for reading session events.
 ///
 /// <div class="warning">
 ///
@@ -4152,18 +4434,34 @@ pub struct FactoryCurrentPhase {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryDeclaredLimits {
+pub struct EventLogReadRequest {
+    /// Optional non-empty list of subagent identifiers. When provided, only events owned by one of these agents are returned; ownership recognizes the event envelope's agentId plus legacy data.agentId and data.parentToolCallId markers. This filter takes precedence over agentScope.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_ai_credits: Option<f64>,
+    pub agent_ids: Option<Vec<String>>,
+    /// Agent-scope filter: 'primary' returns only main-agent events plus events whose type starts with 'subagent.' (matching the typed-subscription default behavior); 'all' returns events from all agents (matching wildcard-subscription behavior). Default is 'all' to preserve wildcard semantics for catch-up callers.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_concurrent_subagents: Option<i64>,
+    pub agent_scope: Option<EventsAgentScope>,
+    /// Opaque cursor returned by a previous read. Omit on the first call to start from the beginning of the session's persisted history.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_total_subagents: Option<i64>,
+    pub cursor: Option<String>,
+    /// Direction to page through the session's persisted event history. 'forward' (default) pages from the cursor toward newer events (or from the start of history when no cursor is given). 'backward' enables tail-first reads: with no cursor it returns the NEWEST `max` events, and the returned cursor pages toward OLDER events on subsequent backward reads. Events within a returned batch are always in chronological (oldest-to-newest) order, even for a backward read. Backward reads cover PERSISTED history only; ephemeral events are never returned by a backward read. `direction` selects the INITIAL read only: the returned cursor is self-describing, so a continuation read pages in the cursor's own direction regardless of the `direction` passed alongside it — a forward cursor always pages forward and a backward cursor always pages backward. Pass the direction that matches the cursor to avoid confusion.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout_seconds: Option<f64>,
+    pub direction: Option<EventsReadDirection>,
+    /// When false, skip ephemeral events entirely and return only durable (persisted) events. History-backfill callers that discard ephemerals anyway should set this so the read is bounded by the durable log length instead of racing the ephemeral ring on a busy session. Defaults to true (ephemerals are interleaved with durable events in creation order). Ignored by backward reads, which always cover persisted history only.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_ephemeral: Option<bool>,
+    /// Maximum number of events to return in this batch (1–1000, default 200).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max: Option<i64>,
+    /// Either '*' to receive all event types, or a non-empty list of event types to receive
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub types: Option<serde_json::Value>,
+    /// Milliseconds to wait for new events when the cursor is at the tail of history. 0 (default) returns immediately even if no events are available. Capped at 30000ms. Ephemeral events that arrive during the wait are delivered in this batch but are NOT replayable on a subsequent read (use a non-zero waitMs in your next call to capture future ephemerals as they happen). This applies to forward reads only: a backward read always returns immediately and ignores `waitMs`, because backward paging covers persisted history only while new events append at the tail (the opposite end from a backward page), so no blocking or ephemeral delivery can occur.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wait_ms: Option<i32>,
 }
 
-/// Parameters sent to the owning extension to execute a factory closure.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -4173,20 +4471,12 @@ pub struct FactoryDeclaredLimits {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryExecuteRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Registered factory name.
-    pub name: String,
-    /// Factory run identifier.
-    pub run_id: String,
-    /// Opaque token identifying this factory execution attempt.
-    pub execution_token: String,
-    /// Factory input value.
-    pub args: serde_json::Value,
+pub struct EventLogReleaseInterestResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Result returned by an extension factory closure.
+/// Snapshot of the current tail cursor without returning any events. Use this when a consumer wants to subscribe to live events going forward without first paginating through the entire persisted history (which would happen if `read` were called without a cursor on a long-lived session).
 ///
 /// <div class="warning">
 ///
@@ -4196,13 +4486,12 @@ pub struct FactoryExecuteRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryExecuteResult {
-    /// Factory result value.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<serde_json::Value>,
+pub struct EventLogTailResult {
+    /// Opaque cursor pointing at the current tail of the session's persisted-events history. Pass back to `read` to receive only events that arrive AFTER this snapshot. When the session has no events, this returns the same sentinel as an unset cursor (i.e. equivalent to omitting the cursor on a first read).
+    pub cursor: String,
 }
 
-/// Parameters for paging factory progress.
+/// Batch of session events returned by a read, with cursor and continuation metadata.
 ///
 /// <div class="warning">
 ///
@@ -4212,24 +4501,18 @@ pub struct FactoryExecuteResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryGetRunProgressRequest {
-    /// Exclusive forward cursor.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub after_seq: Option<i64>,
-    /// Exclusive backward cursor.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub before_seq: Option<i64>,
-    /// Maximum records to return. Defaults to 200 and is capped at 500.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub limit: Option<i32>,
-    /// Optional phase identifier used to scope records and cursors.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub phase_id: Option<String>,
-    /// Factory run identifier.
-    pub run_id: String,
+pub struct EventsReadResult {
+    /// Opaque cursor for the next read. Pass back unchanged in the next read.cursor to continue from where this read left off. Always present, even when no events were returned. For a backward read this cursor pages toward OLDER events; keep passing `direction: backward` with it (the cursor is also self-describing, so backward paging continues correctly).
+    pub cursor: String,
+    /// Cursor status: 'ok' means the cursor was applied successfully; 'expired' means the cursor referred to an event that no longer exists in history (e.g. truncated or compacted away) and the read fell back to a boundary of the remaining history. For a forward read the fallback starts from the beginning of the remaining history; for a backward read it falls back to the tail (the newest window). Because the fallback page is a fresh boundary snapshot rather than a continuation of the requested cursor, it may overlap events the consumer has already rendered — a backward fallback to the tail in particular can repeat the newest window. On 'expired', consumers should reset or rebase their local pagination state (or deduplicate by event id) before continuing from the returned cursor rather than blindly appending/prepending the fallback page.
+    pub cursor_status: EventsCursorStatus,
+    /// Session events for this batch, merged into a single stream in creation order: durable (persisted) events and ephemeral events interleave exactly as they were emitted. Set `includeEphemeral: false` to receive only durable events. Ephemeral events are never replayable once pruned from the in-memory ring, so a consumer that needs them should keep reading with a non-zero `waitMs`. For a backward (tail-first) read, the returned window contains persisted events only, still in chronological (oldest-to-newest) append order.
+    pub events: Vec<SessionEvent>,
+    /// True when more events are available in the read's direction. For a forward read, true means the batch returned `max` events and more are available immediately. For a backward read, true means older persisted events remain before the returned window.
+    pub has_more: bool,
 }
 
-/// Parameters for retrieving a factory run.
+/// Slash command name and argument string to execute synchronously.
 ///
 /// <div class="warning">
 ///
@@ -4239,12 +4522,14 @@ pub struct FactoryGetRunProgressRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryGetRunRequest {
-    /// Factory run identifier.
-    pub run_id: String,
+pub struct ExecuteCommandParams {
+    /// Argument string to pass to the command (empty string if none).
+    pub args: String,
+    /// Name of the slash command to invoke (without the leading '/').
+    pub command_name: String,
 }
 
-/// Parameters for reading a factory journal entry.
+/// Error message produced while executing the command, if any.
 ///
 /// <div class="warning">
 ///
@@ -4254,16 +4539,13 @@ pub struct FactoryGetRunRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryJournalGetRequest {
-    /// Opaque token identifying the current factory execution attempt.
-    pub execution_token: String,
-    /// Namespaced journal key.
-    pub key: String,
-    /// Factory run identifier.
-    pub run_id: String,
+pub struct ExecuteCommandResult {
+    /// Error message produced while executing the command, if any. Omitted when the handler succeeded.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
 }
 
-/// Result of reading a factory journal entry.
+/// Discovered extension metadata, including source-qualified ID, name, discovery source, status, and optional process ID.
 ///
 /// <div class="warning">
 ///
@@ -4273,15 +4555,21 @@ pub struct FactoryJournalGetRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryJournalGetResult {
-    /// Whether the journal contained the requested key.
-    pub hit: bool,
-    /// Cached JSON result. The hit field distinguishes a cached JSON null from a miss.
+pub struct Extension {
+    /// Source-qualified ID (e.g., 'project:my-ext', 'user:auth-helper', 'plugin:my-plugin:my-ext')
+    pub id: String,
+    /// Extension name (directory name)
+    pub name: String,
+    /// Process ID if the extension is running
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub result_json: Option<serde_json::Value>,
+    pub pid: Option<i64>,
+    /// Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin (installed plugin), or session (session-state/<id>/extensions/)
+    pub source: ExtensionSource,
+    /// Current status: running, disabled, failed, or starting
+    pub status: ExtensionStatus,
 }
 
-/// Parameters for storing a factory journal entry.
+/// Slim input shape for extension_context attachments; identity fields are runtime-derived.
 ///
 /// <div class="warning">
 ///
@@ -4291,18 +4579,16 @@ pub struct FactoryJournalGetResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryJournalPutRequest {
-    /// Opaque token identifying the current factory execution attempt.
-    pub execution_token: String,
-    /// Namespaced journal key.
-    pub key: String,
-    /// JSON result to memoize.
-    pub result_json: serde_json::Value,
-    /// Factory run identifier.
-    pub run_id: String,
+pub struct ExtensionContextPushInput {
+    /// Caller-supplied JSON payload (required, may be null but not undefined)
+    pub payload: serde_json::Value,
+    /// Human-readable composer pill label
+    pub title: String,
+    /// Attachment type discriminator
+    pub r#type: ExtensionContextPushInputType,
 }
 
-/// Empty parameters for listing factory runs.
+/// Opaque integrator-owned process launch profile for one extension entrypoint.
 ///
 /// <div class="warning">
 ///
@@ -4312,9 +4598,16 @@ pub struct FactoryJournalPutRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryListRunsRequest {}
+pub struct ExtensionLaunchProfile {
+    /// Opaque integrator-defined arguments passed to the executable. The runtime does not append the extension entrypoint.
+    pub args: Vec<String>,
+    /// Opaque integrator-defined environment variables. Runtime-owned COPILOT_SDK_PATH, SESSION_ID, and COPILOT_EXTENSION_PARENT_PID values take precedence.
+    pub env: HashMap<String, String>,
+    /// Executable used to launch the extension entrypoint.
+    pub executable: String,
+}
 
-/// Durable factory resource consumption.
+/// A discovered extension entrypoint that the registered integrator may classify and resolve to an opaque launch profile.
 ///
 /// <div class="warning">
 ///
@@ -4324,13 +4617,18 @@ pub struct FactoryListRunsRequest {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryRunConsumed {
-    pub active_ms: i64,
-    pub nano_aiu: i64,
-    pub subagents: i64,
+pub struct ExtensionLaunchProviderResolveRequest {
+    /// Source-qualified extension identifier.
+    pub id: String,
+    /// Absolute path to the discovered extension entrypoint.
+    pub module_path: String,
+    /// Human-readable extension name.
+    pub name: String,
+    /// Discovery source for the extension entrypoint.
+    pub source: ExtensionSource,
 }
 
-/// Prompt-safe terminal factory outcome.
+/// The launch profile for a supported entrypoint. Omit launch when the provider does not support the entrypoint.
 ///
 /// <div class="warning">
 ///
@@ -4340,18 +4638,13 @@ pub struct FactoryRunConsumed {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryRunTerminal {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub failure: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
+pub struct ExtensionLaunchProviderResolveResult {
+    /// Opaque launch profile, omitted when this provider does not support the entrypoint.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub result_preview: Option<String>,
+    pub launch: Option<ExtensionLaunchProfile>,
 }
 
-/// Durable factory run summary with read-time live overlays.
+/// Extensions discovered for the session, with their current status.
 ///
 /// <div class="warning">
 ///
@@ -4361,29 +4654,12 @@ pub struct FactoryRunTerminal {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryRunSummary {
-    pub active_segment_started_at: Option<i64>,
-    pub approved: Option<FactoryDeclaredLimits>,
-    pub completed_at: Option<i64>,
-    pub consumed: FactoryRunConsumed,
-    pub created_at: i64,
-    pub current_phase: Option<FactoryCurrentPhase>,
-    pub declared_limits: FactoryDeclaredLimits,
-    pub declared_phase_count: i64,
-    pub description: String,
-    pub factory_name: String,
-    pub live_agent_count: i64,
-    pub observed_at: i64,
-    pub revision: i64,
-    pub run_id: String,
-    pub started_at: Option<i64>,
-    pub status: FactoryRunStatus,
-    pub terminal: Option<FactoryRunTerminal>,
-    pub total_spawned_agent_count: i64,
-    pub updated_at: i64,
+pub struct ExtensionList {
+    /// Discovered extensions and their current status
+    pub extensions: Vec<Extension>,
 }
 
-/// Factory runs in durable creation order.
+/// Source-qualified extension identifier to disable for the session.
 ///
 /// <div class="warning">
 ///
@@ -4393,11 +4669,12 @@ pub struct FactoryRunSummary {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryListRunsResult {
-    pub runs: Vec<FactoryRunSummary>,
+pub struct ExtensionsDisableRequest {
+    /// Source-qualified extension ID to disable
+    pub id: String,
 }
 
-/// One ordered factory progress line.
+/// Source-qualified extension identifier to enable for the session.
 ///
 /// <div class="warning">
 ///
@@ -4407,16 +4684,12 @@ pub struct FactoryListRunsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryLogLine {
-    /// Progress line kind.
-    pub kind: FactoryLogLineKind,
-    /// Monotonic sequence number within the factory run.
-    pub seq: i64,
-    /// Progress text.
-    pub text: String,
+pub struct ExtensionsEnableRequest {
+    /// Source-qualified extension ID to enable
+    pub id: String,
 }
 
-/// Parameters for recording factory progress.
+/// Binary result returned by a tool for the model
 ///
 /// <div class="warning">
 ///
@@ -4426,16 +4699,22 @@ pub struct FactoryLogLine {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryLogRequest {
-    /// Opaque token identifying the current factory execution attempt.
-    pub execution_token: String,
-    /// Ordered progress lines to append.
-    pub lines: Vec<FactoryLogLine>,
-    /// Factory run identifier.
-    pub run_id: String,
+pub struct ExternalToolTextResultForLlmBinaryResultsForLlm {
+    /// Base64-encoded binary data
+    pub data: String,
+    /// Human-readable description of the binary data
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Optional metadata from the producing tool.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub metadata: Option<HashMap<String, serde_json::Value>>,
+    /// MIME type of the binary data
+    pub mime_type: String,
+    /// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+    pub r#type: ExternalToolTextResultForLlmBinaryResultsForLlmType,
 }
 
-/// Durable lifecycle and timing for one factory phase.
+/// Expanded external tool result payload
 ///
 /// <div class="warning">
 ///
@@ -4445,26 +4724,33 @@ pub struct FactoryLogRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryPhaseObservation {
-    pub accumulated_active_ms: i64,
+pub struct ExternalToolTextResultForLlm {
+    /// Base64-encoded binary results returned to the model
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub completed_at: Option<i64>,
-    pub current_active_ms: i64,
+    pub binary_results_for_llm: Option<Vec<ExternalToolTextResultForLlmBinaryResultsForLlm>>,
+    /// Structured content blocks from the tool
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub detail: Option<String>,
-    pub entry_count: i64,
-    pub id: String,
-    pub last_entered_run_attempt: i64,
-    pub live_agent_count: i64,
-    pub ordinal: Option<i64>,
+    pub contents: Option<Vec<serde_json::Value>>,
+    /// Optional error message for failed executions
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub started_at: Option<i64>,
-    pub status: FactoryPhaseStatus,
-    pub title: String,
-    pub total_agent_count: i64,
+    pub error: Option<String>,
+    /// Execution outcome classification. Optional for back-compat; normalized to 'success' (or 'failure' when error is present) when missing or unrecognized.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result_type: Option<String>,
+    /// Detailed log content for timeline display
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_log: Option<String>,
+    /// Text result returned to the model
+    pub text_result_for_llm: String,
+    /// Tool references returned by a tool-search override: names of deferred tools to surface to the model. When set, the tool result is materialized as `tool_reference` content blocks (rather than plain text) so the model knows which deferred tools are now available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_references: Option<Vec<String>>,
+    /// Optional tool-specific telemetry
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_telemetry: Option<HashMap<String, serde_json::Value>>,
 }
 
-/// One durable factory progress record.
+/// Audio content block with base64-encoded data
 ///
 /// <div class="warning">
 ///
@@ -4474,22 +4760,16 @@ pub struct FactoryPhaseObservation {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryProgressLine {
-    /// Resume attempt that emitted this record.
-    pub attempt: i64,
-    /// Progress record kind.
-    pub kind: FactoryLogLineKind,
-    /// Phase active when the record was emitted, or null before any phase.
-    pub phase_id: Option<String>,
-    /// Epoch milliseconds when the record was persisted.
-    pub recorded_at: i64,
-    /// Global monotonic sequence number within the run.
-    pub seq: i64,
-    /// Prompt-safe progress text.
-    pub text: String,
+pub struct ExternalToolTextResultForLlmContentAudio {
+    /// Base64-encoded audio data
+    pub data: String,
+    /// MIME type of the audio (e.g., audio/wav, audio/mpeg)
+    pub mime_type: String,
+    /// Content block type discriminator
+    pub r#type: ExternalToolTextResultForLlmContentAudioType,
 }
 
-/// A bidirectional page of factory progress.
+/// Image content block with base64-encoded data
 ///
 /// <div class="warning">
 ///
@@ -4499,17 +4779,16 @@ pub struct FactoryProgressLine {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryProgressPage {
-    pub has_more_newer: bool,
-    pub has_more_older: bool,
-    pub newest_seq: Option<i64>,
-    pub oldest_seq: Option<i64>,
-    pub records: Vec<FactoryProgressLine>,
-    /// Run revision reflected by this page.
-    pub revision: i64,
+pub struct ExternalToolTextResultForLlmContentImage {
+    /// Base64-encoded image data
+    pub data: String,
+    /// MIME type of the image (e.g., image/png, image/jpeg)
+    pub mime_type: String,
+    /// Content block type discriminator
+    pub r#type: ExternalToolTextResultForLlmContentImageType,
 }
 
-/// Wire-only per-invocation factory resource ceiling overrides.
+/// Embedded resource content block with inline text or binary data
 ///
 /// <div class="warning">
 ///
@@ -4519,22 +4798,14 @@ pub struct FactoryProgressPage {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryRunLimits {
-    /// Maximum AI credits consumed by factory subagents and their descendants. The post-paid ceiling is soft: parallel turns can settle beyond it before the run stops.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_ai_credits: Option<f64>,
-    /// Maximum number of factory subagents that may run concurrently.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_concurrent_subagents: Option<i64>,
-    /// Maximum total number of factory subagents that may be admitted.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_total_subagents: Option<i64>,
-    /// Maximum accumulated active-execution time in seconds. Active execution includes the entire extension body, subprocess waits, queued-agent waits, and sleeps; time between resumed attempts is not counted.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout_seconds: Option<f64>,
+pub struct ExternalToolTextResultForLlmContentResource {
+    /// The embedded resource contents, either text or base64-encoded binary
+    pub resource: serde_json::Value,
+    /// Content block type discriminator
+    pub r#type: ExternalToolTextResultForLlmContentResourceType,
 }
 
-/// Parameters for resuming a factory run from its persisted identity.
+/// Icon image for a resource
 ///
 /// <div class="warning">
 ///
@@ -4544,15 +4815,21 @@ pub struct FactoryRunLimits {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryResumeRequest {
-    /// Optional per-invocation resource ceiling overrides.
+pub struct ExternalToolTextResultForLlmContentResourceLinkIcon {
+    /// MIME type of the icon image
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub limits: Option<FactoryRunLimits>,
-    /// Factory run identifier.
-    pub run_id: String,
+    pub mime_type: Option<String>,
+    /// Available icon sizes (e.g., ['16x16', '32x32'])
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sizes: Option<Vec<String>>,
+    /// URL or path to the icon image
+    pub src: String,
+    /// Theme variant this icon is intended for
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub theme: Option<ExternalToolTextResultForLlmContentResourceLinkIconTheme>,
 }
 
-/// Complete current or terminal factory run envelope.
+/// Resource link content block referencing an external resource
 ///
 /// <div class="warning">
 ///
@@ -4562,29 +4839,31 @@ pub struct FactoryResumeRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryRunResult {
-    /// Error message for an errored run.
+pub struct ExternalToolTextResultForLlmContentResourceLink {
+    /// Human-readable description of the resource
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Machine-readable failure details for an errored run.
+    pub description: Option<String>,
+    /// Icons associated with this resource
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub failure: Option<serde_json::Value>,
-    /// Reason for a halted or cancelled run.
+    pub icons: Option<Vec<ExternalToolTextResultForLlmContentResourceLinkIcon>>,
+    /// MIME type of the resource content
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-    /// Completed factory result.
+    pub mime_type: Option<String>,
+    /// Resource name identifier
+    pub name: String,
+    /// Size of the resource in bytes
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<serde_json::Value>,
-    /// Factory run identifier.
-    pub run_id: String,
-    /// Partial journal and progress snapshot for a halted, cancelled, or errored run.
+    pub size: Option<i64>,
+    /// Human-readable display title for the resource
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub snapshot: Option<serde_json::Value>,
-    /// Current or terminal factory run status.
-    pub status: FactoryRunStatus,
+    pub title: Option<String>,
+    /// Content block type discriminator
+    pub r#type: ExternalToolTextResultForLlmContentResourceLinkType,
+    /// URI identifying the resource
+    pub uri: String,
 }
 
-/// Resolved persisted factory identity and resumed run envelope.
+/// Shell command exit metadata with optional output preview
 ///
 /// <div class="warning">
 ///
@@ -4594,14 +4873,25 @@ pub struct FactoryRunResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryResumeResult {
-    /// Persisted factory name resolved for the resumed run.
-    pub factory_name: String,
-    /// Terminal resumed run envelope.
-    pub run: FactoryRunResult,
+pub struct ExternalToolTextResultForLlmContentShellExit {
+    /// Working directory where the shell command was executed
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Exit code from the completed shell command
+    pub exit_code: i64,
+    /// Output associated with this shell command, if available. May be partial, truncated, or a preview; not guaranteed to be full output.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub output_preview: Option<String>,
+    /// Whether outputPreview is known to be incomplete or truncated
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub output_truncated: Option<bool>,
+    /// Shell id, as assigned by Copilot runtime
+    pub shell_id: String,
+    /// Content block type discriminator
+    pub r#type: ExternalToolTextResultForLlmContentShellExitType,
 }
 
-/// Full factory run observability detail.
+/// Terminal/shell output content block with optional exit code and working directory
 ///
 /// <div class="warning">
 ///
@@ -4611,32 +4901,20 @@ pub struct FactoryResumeResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryRunDetail {
-    pub active_segment_started_at: Option<i64>,
-    pub agents: Vec<FactoryAgentSummary>,
-    pub approved: Option<FactoryDeclaredLimits>,
-    pub completed_at: Option<i64>,
-    pub consumed: FactoryRunConsumed,
-    pub created_at: i64,
-    pub current_phase: Option<FactoryCurrentPhase>,
-    pub declared_limits: FactoryDeclaredLimits,
-    pub declared_phase_count: i64,
-    pub description: String,
-    pub factory_name: String,
-    pub live_agent_count: i64,
-    pub observed_at: i64,
-    pub phases: Vec<FactoryPhaseObservation>,
-    pub progress: FactoryProgressPage,
-    pub revision: i64,
-    pub run_id: String,
-    pub started_at: Option<i64>,
-    pub status: FactoryRunStatus,
-    pub terminal: Option<FactoryRunTerminal>,
-    pub total_spawned_agent_count: i64,
-    pub updated_at: i64,
+pub struct ExternalToolTextResultForLlmContentTerminal {
+    /// Working directory where the command was executed
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Process exit code, if the command has completed
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exit_code: Option<i64>,
+    /// Terminal/shell output text
+    pub text: String,
+    /// Content block type discriminator
+    pub r#type: ExternalToolTextResultForLlmContentTerminalType,
 }
 
-/// Options controlling factory invocation.
+/// Plain text content block
 ///
 /// <div class="warning">
 ///
@@ -4646,16 +4924,14 @@ pub struct FactoryRunDetail {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RunOptions {
-    /// Per-invocation resource ceiling overrides.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub limits: Option<FactoryRunLimits>,
-    /// Run identifier whose journal and progress should seed this resumed run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub resume_from_run_id: Option<String>,
+pub struct ExternalToolTextResultForLlmContentText {
+    /// The text content
+    pub text: String,
+    /// Content block type discriminator
+    pub r#type: ExternalToolTextResultForLlmContentTextType,
 }
 
-/// Parameters for invoking a registered factory.
+/// Parameters for cooperatively aborting a factory body.
 ///
 /// <div class="warning">
 ///
@@ -4665,17 +4941,14 @@ pub struct RunOptions {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FactoryRunRequest {
-    /// Factory input value.
-    pub args: serde_json::Value,
-    /// Registered factory name.
-    pub name: String,
-    /// Factory invocation options.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<RunOptions>,
+pub struct FactoryAbortRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Factory run identifier.
+    pub run_id: String,
 }
 
-/// Optional user prompt to combine with the fleet orchestration instructions.
+/// Acknowledgement that a factory request was accepted.
 ///
 /// <div class="warning">
 ///
@@ -4685,13 +4958,9 @@ pub struct FactoryRunRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FleetStartRequest {
-    /// Optional user prompt to combine with fleet instructions
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub prompt: Option<String>,
-}
+pub struct FactoryAckResult {}
 
-/// Indicates whether fleet mode was successfully activated.
+/// Options for one factory-scoped subagent call.
 ///
 /// <div class="warning">
 ///
@@ -4701,12 +4970,28 @@ pub struct FleetStartRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FleetStartResult {
-    /// Whether fleet mode was successfully activated
-    pub started: bool,
+pub struct FactoryAgentOptions {
+    /// Optional custom agent name for the subagent. This field is accepted but not yet honored.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent: Option<String>,
+    /// Optional context tier for the subagent. This field is accepted but not yet honored.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier: Option<ContextTier>,
+    /// Optional label distinguishing otherwise identical memoized agent calls.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub label: Option<String>,
+    /// Optional model identifier for the subagent.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Optional reasoning effort for the subagent. This field is accepted but not yet honored.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<String>,
+    /// Optional JSON Schema for structured agent output.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub schema: Option<serde_json::Value>,
 }
 
-/// Folder path to add to trusted folders.
+/// Parameters for one factory-scoped subagent call.
 ///
 /// <div class="warning">
 ///
@@ -4716,12 +5001,18 @@ pub struct FleetStartResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FolderTrustAddParams {
-    /// Folder path to mark as trusted
-    pub path: String,
+pub struct FactoryAgentRequest {
+    /// Opaque token identifying the current factory execution attempt.
+    pub execution_token: String,
+    /// Factory run identifier that owns the subagent.
+    pub factory_run_id: String,
+    /// Subagent execution options.
+    pub opts: FactoryAgentOptions,
+    /// Prompt to send to the subagent.
+    pub prompt: String,
 }
 
-/// Folder path to check for trust.
+/// Result of one factory-scoped subagent call.
 ///
 /// <div class="warning">
 ///
@@ -4731,12 +5022,13 @@ pub struct FolderTrustAddParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FolderTrustCheckParams {
-    /// Folder path to check
-    pub path: String,
+pub struct FactoryAgentResult {
+    /// Agent result, omitted when the agent produced no result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<serde_json::Value>,
 }
 
-/// Folder trust check result.
+/// Prompt-safe durable identity and live status for a direct factory agent.
 ///
 /// <div class="warning">
 ///
@@ -4746,12 +5038,44 @@ pub struct FolderTrustCheckParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FolderTrustCheckResult {
-    /// Whether the folder is trusted
-    pub trusted: bool,
+pub struct FactoryAgentSummary {
+    /// Accumulated active agent time in milliseconds.
+    pub active_ms: i64,
+    /// Prompt-safe live activity text.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub activity: Option<String>,
+    /// Stable direct-agent identifier.
+    pub agent_id: String,
+    /// Registered agent type.
+    pub agent_type: String,
+    /// Epoch milliseconds when the agent completed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub completed_at: Option<i64>,
+    /// Friendly, non-unique name intended for display
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_name: Option<String>,
+    /// Friendly, non-unique name intended for display
+    pub label: String,
+    /// Phase identifier active when the agent was launched, or null.
+    pub phase_id: Option<String>,
+    /// Model requested when the agent was launched.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub requested_model: Option<String>,
+    /// Concrete model resolved for the agent.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub resolved_model: Option<String>,
+    /// Owning factory run identifier.
+    pub run_id: String,
+    /// Epoch milliseconds when the agent started.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub started_at: Option<i64>,
+    /// Current durable or live agent status.
+    pub status: String,
+    /// Tool-call identifier that launched the agent.
+    pub tool_call_id: String,
 }
 
-/// Authentication-info variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.
+/// Parameters for cancelling a factory run.
 ///
 /// <div class="warning">
 ///
@@ -4761,21 +5085,12 @@ pub struct FolderTrustCheckResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct GhCliAuthInfo {
-    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_user: Option<CopilotUserResponse>,
-    /// Authentication host.
-    pub host: String,
-    /// User login as reported by `gh auth status`.
-    pub login: String,
-    /// The token returned by `gh auth token`. Treat as a secret.
-    pub token: String,
-    /// Authentication via the `gh` CLI's saved credentials.
-    pub r#type: GhCliAuthInfoType,
+pub struct FactoryCancelRequest {
+    /// Factory run identifier.
+    pub run_id: String,
 }
 
-/// Client environment metadata describing the process that produced a telemetry event.
+/// Current factory phase identity.
 ///
 /// <div class="warning">
 ///
@@ -4785,40 +5100,14 @@ pub struct GhCliAuthInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct GitHubTelemetryClientInfo {
-    /// Copilot CLI version string.
-    #[serde(rename = "cli_version")]
-    pub cli_version: String,
-    /// Name of the client application.
-    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    /// Type of client.
-    #[serde(rename = "client_type", skip_serializing_if = "Option::is_none")]
-    pub client_type: Option<String>,
-    /// Copilot subscription plan, when known.
-    #[serde(rename = "copilot_plan", skip_serializing_if = "Option::is_none")]
-    pub copilot_plan: Option<String>,
-    /// Stable machine identifier for the device.
-    #[serde(rename = "dev_device_id", skip_serializing_if = "Option::is_none")]
-    pub dev_device_id: Option<String>,
-    /// Whether the user is a GitHub/Microsoft staff member.
-    #[serde(rename = "is_staff", skip_serializing_if = "Option::is_none")]
-    pub is_staff: Option<bool>,
-    /// Node.js runtime version string.
-    #[serde(rename = "node_version")]
-    pub node_version: String,
-    /// Operating system architecture (e.g. arm64, x64).
-    #[serde(rename = "os_arch")]
-    pub os_arch: String,
-    /// Operating system platform (e.g. darwin, linux, win32).
-    #[serde(rename = "os_platform")]
-    pub os_platform: String,
-    /// Operating system version string.
-    #[serde(rename = "os_version")]
-    pub os_version: String,
+pub struct FactoryCurrentPhase {
+    /// Current phase identifier.
+    pub id: String,
+    /// Zero-based declared phase ordinal, or null for an undeclared phase.
+    pub ordinal: Option<i64>,
 }
 
-/// A single telemetry event in the runtime's native GitHub-shaped telemetry format, forwarded verbatim to opted-in hosts. The `restricted` flag on the enclosing GitHubTelemetryNotification distinguishes standard from restricted events; the payload shape is identical for both.
+/// Declared or approved factory resource ceilings.
 ///
 /// <div class="warning">
 ///
@@ -4828,43 +5117,22 @@ pub struct GitHubTelemetryClientInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct GitHubTelemetryEvent {
-    /// Client environment metadata.
+pub struct FactoryDeclaredLimits {
+    /// Maximum AI credits consumed by subagents and descendants.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub client: Option<GitHubTelemetryClientInfo>,
-    /// Copilot tracking ID for user-level attribution.
-    #[serde(
-        rename = "copilot_tracking_id",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub copilot_tracking_id: Option<String>,
-    /// Timestamp when the event was created (ISO 8601 format).
-    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
-    pub created_at: Option<String>,
-    /// Experiment assignment context.
-    #[serde(
-        rename = "exp_assignment_context",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub exp_assignment_context: Option<String>,
-    /// Feature flags enabled for this session, as a map from flag to value.
+    pub max_ai_credits: Option<f64>,
+    /// Maximum concurrently active subagents.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub features: Option<HashMap<String, String>>,
-    /// Event type/kind (e.g. get_completion_with_tools_turn, tool_call_executed).
-    pub kind: String,
-    /// Numeric metrics as a map from key to value.
-    pub metrics: HashMap<String, f64>,
-    /// Reference to the model call that produced this event.
-    #[serde(rename = "model_call_id", skip_serializing_if = "Option::is_none")]
-    pub model_call_id: Option<String>,
-    /// String-valued properties as a map from key to value.
-    pub properties: HashMap<String, String>,
-    /// Session identifier the event belongs to.
-    #[serde(rename = "session_id", skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<String>,
+    pub max_concurrent_subagents: Option<i64>,
+    /// Maximum total subagents spawned by the run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_total_subagents: Option<i64>,
+    /// Maximum accumulated active execution time in seconds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout_seconds: Option<f64>,
 }
 
-/// Payload for a `gitHubTelemetry.event` notification: a single GitHub telemetry event the runtime forwards to a host connection that opted into telemetry forwarding during the `server.connect` handshake.
+/// Parameters sent to the owning extension to execute a factory closure.
 ///
 /// <div class="warning">
 ///
@@ -4874,17 +5142,20 @@ pub struct GitHubTelemetryEvent {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct GitHubTelemetryNotification {
-    /// The telemetry event, in the runtime's native GitHub-shaped telemetry format.
-    pub event: GitHubTelemetryEvent,
-    /// Whether this is a restricted telemetry event (cli.restricted_telemetry). Hosts must route restricted events to first-party Microsoft stores only.
-    pub restricted: bool,
-    /// Session the telemetry event belongs to, when it is session-scoped. Omitted for sessionless events (for example, `server.sendTelemetry` calls with no session id), which are still forwarded to opted-in connections.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
+pub struct FactoryExecuteRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Registered factory name.
+    pub name: String,
+    /// Factory run identifier.
+    pub run_id: String,
+    /// Opaque token identifying this factory execution attempt.
+    pub execution_token: String,
+    /// Factory input value.
+    pub args: serde_json::Value,
 }
 
-/// Pending external tool call request ID, with the tool result or an error describing why it failed.
+/// Result returned by an extension factory closure.
 ///
 /// <div class="warning">
 ///
@@ -4894,18 +5165,13 @@ pub struct GitHubTelemetryNotification {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HandlePendingToolCallRequest {
-    /// Error message if the tool call failed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Request ID of the pending tool call
-    pub request_id: RequestId,
-    /// Tool call result (string or expanded result object)
+pub struct FactoryExecuteResult {
+    /// Factory result value.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub result: Option<serde_json::Value>,
 }
 
-/// Indicates whether the external tool call result was handled successfully.
+/// Parameters for paging factory progress.
 ///
 /// <div class="warning">
 ///
@@ -4915,12 +5181,24 @@ pub struct HandlePendingToolCallRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HandlePendingToolCallResult {
-    /// Whether the tool call result was handled successfully
-    pub success: bool,
+pub struct FactoryGetRunProgressRequest {
+    /// Exclusive forward cursor.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub after_seq: Option<i64>,
+    /// Exclusive backward cursor.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub before_seq: Option<i64>,
+    /// Maximum records to return. Defaults to 200 and is capped at 500.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub limit: Option<i32>,
+    /// Optional phase identifier used to scope records and cursors.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub phase_id: Option<String>,
+    /// Factory run identifier.
+    pub run_id: String,
 }
 
-/// Indicates whether an in-progress manual compaction was aborted.
+/// Parameters for retrieving a factory run.
 ///
 /// <div class="warning">
 ///
@@ -4930,12 +5208,12 @@ pub struct HandlePendingToolCallResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryAbortManualCompactionResult {
-    /// Whether an in-progress manual compaction was aborted. False when no manual compaction was running, when its abort controller was already aborted, or when the session is remote.
-    pub aborted: bool,
+pub struct FactoryGetRunRequest {
+    /// Factory run identifier.
+    pub run_id: String,
 }
 
-/// Indicates whether an in-progress background compaction was cancelled.
+/// Parameters for reading a factory journal entry.
 ///
 /// <div class="warning">
 ///
@@ -4945,12 +5223,16 @@ pub struct HistoryAbortManualCompactionResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryCancelBackgroundCompactionResult {
-    /// Whether an in-progress background compaction was cancelled. False when no compaction was running, when the session is remote, or when the underlying processor was unavailable.
-    pub cancelled: bool,
+pub struct FactoryJournalGetRequest {
+    /// Opaque token identifying the current factory execution attempt.
+    pub execution_token: String,
+    /// Namespaced journal key.
+    pub key: String,
+    /// Factory run identifier.
+    pub run_id: String,
 }
 
-/// Parameters for clearing the conversation and seeding the window that replaces it.
+/// Result of reading a factory journal entry.
 ///
 /// <div class="warning">
 ///
@@ -4960,12 +5242,15 @@ pub struct HistoryCancelBackgroundCompactionResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryClearContextRequest {
-    /// First user message of the fresh context window. Required: a cleared window holding only system and developer messages is not a conversation a model can answer, so every clear seeds the window it creates. Delivered by the enclosing turn driver once the agentic loop exits, which is why the call must be made from inside a tool handler.
-    pub prompt: String,
+pub struct FactoryJournalGetResult {
+    /// Whether the journal contained the requested key.
+    pub hit: bool,
+    /// Cached JSON result. The hit field distinguishes a cached JSON null from a miss.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result_json: Option<serde_json::Value>,
 }
 
-/// What a successful clear removed. A clear that could not be applied rejects instead of reporting a count.
+/// Parameters for storing a factory journal entry.
 ///
 /// <div class="warning">
 ///
@@ -4975,12 +5260,18 @@ pub struct HistoryClearContextRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryClearContextResult {
-    /// Number of non-system, non-developer messages that were removed from the conversation. Zero only when the window already held no conversation.
-    pub messages_cleared: i64,
+pub struct FactoryJournalPutRequest {
+    /// Opaque token identifying the current factory execution attempt.
+    pub execution_token: String,
+    /// Namespaced journal key.
+    pub key: String,
+    /// JSON result to memoize.
+    pub result_json: serde_json::Value,
+    /// Factory run identifier.
+    pub run_id: String,
 }
 
-/// Post-compaction context window usage breakdown
+/// Parameters for paging factory runs.
 ///
 /// <div class="warning">
 ///
@@ -4990,25 +5281,19 @@ pub struct HistoryClearContextResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryCompactContextWindow {
-    /// Token count from non-system messages (user, assistant, tool)
+pub struct FactoryListRunsRequest {
+    /// Exclusive forward cursor.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub conversation_tokens: Option<i64>,
-    /// Current total tokens in the context window (system + conversation + tool definitions)
-    pub current_tokens: i64,
-    /// Current number of messages in the conversation
-    pub messages_length: i64,
-    /// Token count from system message(s)
+    pub after_seq: Option<i64>,
+    /// Exclusive backward cursor.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub system_tokens: Option<i64>,
-    /// Maximum token count for the model's context window
-    pub token_limit: i64,
-    /// Token count from tool definitions
+    pub before_seq: Option<i64>,
+    /// Maximum terminal runs to return. Defaults to 200 and is capped at 500.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_definitions_tokens: Option<i64>,
+    pub limit: Option<i32>,
 }
 
-/// Optional compaction parameters.
+/// Durable factory resource consumption.
 ///
 /// <div class="warning">
 ///
@@ -5018,19 +5303,16 @@ pub struct HistoryCompactContextWindow {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryCompactRequest {
-    /// Optional user-provided instructions to focus the compaction summary
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub custom_instructions: Option<String>,
-    /// Context window token limit this compaction is targeting, recorded as the `tokenLimit` on the persisted `session.compaction_start` / `session.compaction_complete` events. Set it when the compaction targets a window other than the compacting model's own, e.g. switching to a model with a smaller context window: the compaction still runs on the current model, so the limit that motivated it would otherwise be lost. When absent, the events record the compacting model's own resolved limit. Attribution metadata only - it does not change how much the compaction removes.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub token_limit: Option<i64>,
-    /// What initiated this compaction request, recorded as the `trigger` on the persisted `session.compaction_start` / `session.compaction_complete` events. When absent, the compaction is persisted without trigger attribution (initiator unknown).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub trigger: Option<HistoryCompactRequestTrigger>,
+pub struct FactoryRunConsumed {
+    /// Accumulated active execution time in milliseconds.
+    pub active_ms: i64,
+    /// AI usage consumed by the run in nano-AIU.
+    pub nano_aiu: i64,
+    /// Total subagents spawned by the run.
+    pub subagents: i64,
 }
 
-/// Compaction outcome with the number of tokens and messages removed, summary text, and the resulting context window breakdown.
+/// Prompt-safe terminal factory outcome.
 ///
 /// <div class="warning">
 ///
@@ -5040,22 +5322,22 @@ pub struct HistoryCompactRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryCompactResult {
-    /// Post-compaction context window usage breakdown
+pub struct FactoryRunTerminal {
+    /// Human-readable terminal error.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_window: Option<HistoryCompactContextWindow>,
-    /// Number of messages removed during compaction
-    pub messages_removed: i64,
-    /// Whether compaction completed successfully
-    pub success: bool,
-    /// Summary text produced by compaction. Omitted when compaction did not produce a summary (e.g. failure path).
+    pub error: Option<String>,
+    /// Machine-readable terminal failure.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary_content: Option<String>,
-    /// Number of tokens freed by compaction
-    pub tokens_removed: i64,
+    pub failure: Option<serde_json::Value>,
+    /// Human-readable terminal reason.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Prompt-safe preview of the completed result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result_preview: Option<String>,
 }
 
-/// A root user turn that the session can rewind to.
+/// Durable factory run summary with read-time live overlays.
 ///
 /// <div class="warning">
 ///
@@ -5065,28 +5347,48 @@ pub struct HistoryCompactResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryRewindPoint {
-    /// Whether at least one file in this turn or a later turn can be restored.
-    pub can_restore_files: bool,
-    /// ID of the user.message event that begins the discarded suffix.
-    pub event_id: String,
-    /// Number of unique files in this turn and all later turns that have captured changes.
-    pub file_count: i64,
-    /// Whether this turn was an automatically injected autopilot continuation.
-    pub is_autopilot_continuation: bool,
-    /// Lines added by this turn's captured file changes.
-    pub lines_added: i64,
-    /// Lines removed by this turn's captured file changes.
-    pub lines_removed: i64,
-    /// ISO timestamp of the user turn.
-    pub timestamp: String,
-    /// Whether this turn itself captured any file changes.
-    pub turn_changed_files: bool,
-    /// User-visible message text for the turn.
-    pub user_message: String,
+pub struct FactoryRunSummary {
+    /// Epoch milliseconds when the current active segment started, or null while inactive.
+    pub active_segment_started_at: Option<i64>,
+    /// Approved effective resource ceilings, or null until approved.
+    pub approved: Option<FactoryDeclaredLimits>,
+    /// Epoch milliseconds when the run completed, or null while nonterminal.
+    pub completed_at: Option<i64>,
+    /// Durable resource consumption.
+    pub consumed: FactoryRunConsumed,
+    /// Epoch milliseconds when the run was created.
+    pub created_at: i64,
+    /// Current phase identity, or null before any phase is entered.
+    pub current_phase: Option<FactoryCurrentPhase>,
+    /// Resource ceilings declared by the factory.
+    pub declared_limits: FactoryDeclaredLimits,
+    /// Number of phases declared by the factory.
+    pub declared_phase_count: i64,
+    /// Human-readable factory description.
+    pub description: String,
+    /// Registered factory name.
+    pub factory_name: String,
+    /// Number of direct factory agents currently live.
+    pub live_agent_count: i64,
+    /// Epoch milliseconds when this live-overlay snapshot was observed.
+    pub observed_at: i64,
+    /// Monotonic durable run revision.
+    pub revision: i64,
+    /// Factory run identifier.
+    pub run_id: String,
+    /// Epoch milliseconds when execution first started, or null before start.
+    pub started_at: Option<i64>,
+    /// Current factory run status.
+    pub status: FactoryRunStatus,
+    /// Terminal run outcome, or null while nonterminal.
+    pub terminal: Option<FactoryRunTerminal>,
+    /// Total direct factory agents spawned across all attempts.
+    pub total_spawned_agent_count: i64,
+    /// Epoch milliseconds when the durable run was last updated.
+    pub updated_at: i64,
 }
 
-/// Rewind points and file-change-tracking availability for the session.
+/// A page of factory runs in durable creation order.
 ///
 /// <div class="warning">
 ///
@@ -5096,17 +5398,24 @@ pub struct HistoryRewindPoint {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryListRewindPointsResult {
-    /// Whether this session captured file changes from its first turn.
-    pub file_change_tracking_enabled: bool,
-    /// Root user turns in chronological order. Empty when `unavailableReason` is set.
-    pub points: Vec<HistoryRewindPoint>,
-    /// Why the listed points could not be produced, when applicable; the points list is empty whenever it is set. `unsupported-remote-session` is permanent for the session and comes with `fileChangeTrackingEnabled: false`. `session-busy` is transient and only ever reported by a session that *is* tracking (`fileChangeTrackingEnabled: true`), because the file-change captures cannot be read while work that may still mutate them is in flight; the same request succeeds once the session settles, so a client that wants points should retry rather than treat it as a failure. It is never `file-change-tracking-disabled`: an untracked local session still lists conversation-only points and reports that through `fileChangeTrackingEnabled: false`.
+pub struct FactoryListRunsResult {
+    /// Whether terminal runs newer than this page exist.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub unavailable_reason: Option<HistoryRewindUnavailableReason>,
+    pub has_more_newer: Option<bool>,
+    /// Newest terminal-run cursor in this page, or null when the terminal window is empty.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub newest_seq: Option<i64>,
+    /// Oldest terminal-run cursor in this page, or null when the terminal window is empty.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub oldest_seq: Option<i64>,
+    /// Number of terminal runs older than this page.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub omitted_older: Option<i64>,
+    /// Factory run summaries in durable creation order.
+    pub runs: Vec<FactoryRunSummary>,
 }
 
-/// Event boundary to preview for conversation-and-files rewind.
+/// One ordered factory progress line.
 ///
 /// <div class="warning">
 ///
@@ -5116,12 +5425,16 @@ pub struct HistoryListRewindPointsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryPreviewRewindRequest {
-    /// ID of the user.message event that begins the discarded suffix.
-    pub event_id: String,
+pub struct FactoryLogLine {
+    /// Progress line kind.
+    pub kind: FactoryLogLineKind,
+    /// Monotonic sequence number within the factory run.
+    pub seq: i64,
+    /// Progress text.
+    pub text: String,
 }
 
-/// A file that a conversation-and-files rewind would restore.
+/// Parameters for recording factory progress.
 ///
 /// <div class="warning">
 ///
@@ -5131,18 +5444,16 @@ pub struct HistoryPreviewRewindRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryRewindFilePreview {
-    /// Aggregate change made across the discarded turns.
-    pub change_type: HistoryRewindChangeType,
-    /// Lines added across the discarded turns.
-    pub lines_added: i64,
-    /// Lines removed across the discarded turns.
-    pub lines_removed: i64,
-    /// Absolute path of the captured file.
-    pub path: String,
+pub struct FactoryLogRequest {
+    /// Opaque token identifying the current factory execution attempt.
+    pub execution_token: String,
+    /// Ordered progress lines to append.
+    pub lines: Vec<FactoryLogLine>,
+    /// Factory run identifier.
+    pub run_id: String,
 }
 
-/// Files and aggregate changes for a prospective rewind.
+/// Durable lifecycle and timing for one factory phase.
 ///
 /// <div class="warning">
 ///
@@ -5152,19 +5463,39 @@ pub struct HistoryRewindFilePreview {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryPreviewRewindResult {
-    /// Whether file restore is available for this session. This is authoritative: switch on it and read `reason` only when it is false.
-    pub available: bool,
-    /// Number of unique files in the preview.
-    pub file_count: i64,
-    /// Files ordered by path.
-    pub files: Vec<HistoryRewindFilePreview>,
-    /// Why file restore is unavailable, when applicable. Populated only when `available` is false and never set when `available` is true.
+pub struct FactoryPhaseObservation {
+    /// Completed active time accumulated by this phase in milliseconds.
+    pub accumulated_active_ms: i64,
+    /// Epoch milliseconds when this phase completed; for a skipped phase, the synthetic skip timestamp (equal to `startedAt`).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<HistoryRewindUnavailableReason>,
+    pub completed_at: Option<i64>,
+    /// Current live active time for this phase in milliseconds.
+    pub current_active_ms: i64,
+    /// Optional human-readable phase detail.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub detail: Option<String>,
+    /// Number of times execution entered this phase.
+    pub entry_count: i64,
+    /// Phase identifier.
+    pub id: String,
+    /// Most recent run attempt that entered this phase, or `0` if the phase has never been entered.
+    pub last_entered_run_attempt: i64,
+    /// Direct agents in this phase that are currently live.
+    pub live_agent_count: i64,
+    /// Zero-based declared phase ordinal, or null for an undeclared phase.
+    pub ordinal: Option<i64>,
+    /// Epoch milliseconds when this phase first started; for a skipped phase, the synthetic skip timestamp (equal to `completedAt`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub started_at: Option<i64>,
+    /// Derived lifecycle state of the phase.
+    pub status: FactoryPhaseStatus,
+    /// Human-readable phase title.
+    pub title: String,
+    /// Total direct agents associated with this phase.
+    pub total_agent_count: i64,
 }
 
-/// Boundary and mode for rewinding session history.
+/// One durable factory progress record.
 ///
 /// <div class="warning">
 ///
@@ -5174,14 +5505,22 @@ pub struct HistoryPreviewRewindResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryRewindRequest {
-    /// ID of the user.message event that begins the discarded suffix.
-    pub event_id: String,
-    /// Whether to rewind only conversation history or also restore captured files.
-    pub mode: HistoryRewindMode,
+pub struct FactoryProgressLine {
+    /// Resume attempt that emitted this record.
+    pub attempt: i64,
+    /// Progress record kind.
+    pub kind: FactoryLogLineKind,
+    /// Phase active when the record was emitted, or null before any phase.
+    pub phase_id: Option<String>,
+    /// Epoch milliseconds when the record was persisted.
+    pub recorded_at: i64,
+    /// Global monotonic sequence number within the run.
+    pub seq: i64,
+    /// Prompt-safe progress text.
+    pub text: String,
 }
 
-/// A captured file that rewind intentionally left unchanged.
+/// A bidirectional page of factory progress.
 ///
 /// <div class="warning">
 ///
@@ -5191,14 +5530,22 @@ pub struct HistoryRewindRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistorySkippedFileRestore {
-    /// Absolute path of the skipped file.
-    pub path: String,
-    /// Reason the file was not restored.
-    pub reason: HistoryFileRestoreSkipReason,
+pub struct FactoryProgressPage {
+    /// Whether progress records newer than this page exist.
+    pub has_more_newer: bool,
+    /// Whether progress records older than this page exist.
+    pub has_more_older: bool,
+    /// Newest sequence number in this page, or null when empty.
+    pub newest_seq: Option<i64>,
+    /// Oldest sequence number in this page, or null when empty.
+    pub oldest_seq: Option<i64>,
+    /// Progress records in sequence order.
+    pub records: Vec<FactoryProgressLine>,
+    /// Run revision reflected by this page.
+    pub revision: i64,
 }
 
-/// Structured outcome of a rewind request.
+/// Wire-only per-invocation factory resource ceiling overrides.
 ///
 /// <div class="warning">
 ///
@@ -5208,22 +5555,22 @@ pub struct HistorySkippedFileRestore {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryRewindResult {
-    /// Failure detail. Set only for the failure and partial-failure outcomes (`files-rolled-back`, `rollback-incomplete`, `truncation-failed`, `checkpoint-cleanup-failed`, `snapshot-prune-failed`); omitted for `success` and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`).
+pub struct FactoryRunLimits {
+    /// Maximum AI credits consumed by factory subagents and their descendants. The post-paid ceiling is soft: parallel turns can settle beyond it before the run stops.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Number of persisted events removed by conversation truncation. Present only when truncation succeeded (outcomes `success`, `checkpoint-cleanup-failed`, and `snapshot-prune-failed`); omitted for every unavailable outcome (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`) and for `truncation-failed`, `files-rolled-back`, and `rollback-incomplete`.
+    pub max_ai_credits: Option<f64>,
+    /// Maximum number of factory subagents that may run concurrently.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub events_removed: Option<i64>,
-    /// Overall rewind outcome. This discriminates the result: it governs which of the remaining fields are populated, so consumers must switch on it before reading `eventsRemoved`, `restoredFiles`, `skippedFiles`, or `error`. See each field for the outcomes that populate it.
-    pub outcome: HistoryRewindOutcome,
-    /// Absolute paths restored to their captured preimages. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.
-    pub restored_files: Vec<String>,
-    /// Captured files intentionally left unchanged. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.
-    pub skipped_files: Vec<HistorySkippedFileRestore>,
+    pub max_concurrent_subagents: Option<i64>,
+    /// Maximum total number of factory subagents that may be admitted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_total_subagents: Option<i64>,
+    /// Maximum accumulated active-execution time in seconds. Active execution includes the entire extension body, subprocess waits, queued-agent waits, and sleeps; time between resumed attempts is not counted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout_seconds: Option<f64>,
 }
 
-/// Markdown summary of the conversation context (empty when not available).
+/// Parameters for resuming a factory run from its persisted identity.
 ///
 /// <div class="warning">
 ///
@@ -5233,12 +5580,15 @@ pub struct HistoryRewindResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistorySummarizeForHandoffResult {
-    /// Markdown summary of the conversation context produced by an LLM. Empty string when there are no messages or when the session does not support local summarization.
-    pub summary: String,
+pub struct FactoryResumeRequest {
+    /// Optional per-invocation resource ceiling overrides.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub limits: Option<FactoryRunLimits>,
+    /// Factory run identifier.
+    pub run_id: String,
 }
 
-/// Identifier of the event to truncate to; this event and all later events are removed.
+/// Complete current or terminal factory run envelope.
 ///
 /// <div class="warning">
 ///
@@ -5248,12 +5598,29 @@ pub struct HistorySummarizeForHandoffResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryTruncateRequest {
-    /// Event ID to truncate to. This event and all events after it are removed from the session.
-    pub event_id: String,
+pub struct FactoryRunResult {
+    /// Error message for an errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Machine-readable failure details for an errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub failure: Option<serde_json::Value>,
+    /// Reason for a halted or cancelled run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Completed factory result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<serde_json::Value>,
+    /// Factory run identifier.
+    pub run_id: String,
+    /// Partial journal and progress snapshot for a halted, cancelled, or errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub snapshot: Option<serde_json::Value>,
+    /// Current or terminal factory run status.
+    pub status: FactoryRunStatus,
 }
 
-/// Number of events that were removed by the truncation.
+/// Resolved persisted factory identity and resumed run envelope.
 ///
 /// <div class="warning">
 ///
@@ -5263,18 +5630,14 @@ pub struct HistoryTruncateRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HistoryTruncateResult {
-    /// Failure detail when checkpointCleanupFailed is true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub checkpoint_cleanup_error: Option<String>,
-    /// True when conversation truncation succeeded but post-truncation workspace checkpoint cleanup failed. History is already truncated; callers may still prune snapshots but should report a checkpoint-cleanup rather than a truncation failure.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub checkpoint_cleanup_failed: Option<bool>,
-    /// Number of events that were removed
-    pub events_removed: i64,
+pub struct FactoryResumeResult {
+    /// Persisted factory name resolved for the resumed run.
+    pub factory_name: String,
+    /// Terminal resumed run envelope.
+    pub run: FactoryRunResult,
 }
 
-/// Authentication-info variant for GitHub-internal HMAC auth, carrying the public GitHub host and HMAC secret.
+/// Full factory run observability detail.
 ///
 /// <div class="warning">
 ///
@@ -5284,37 +5647,54 @@ pub struct HistoryTruncateResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct HMACAuthInfo {
-    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_user: Option<CopilotUserResponse>,
-    /// HMAC secret used to sign requests.
-    pub hmac: String,
-    /// Authentication host. HMAC auth always targets the public GitHub host.
-    pub host: HMACAuthInfoHost,
-    /// HMAC-based authentication used by GitHub-internal services.
-    pub r#type: HMACAuthInfoType,
-}
-
-/// Runtime-owned wire payload for a server-to-client hook callback invocation.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct HookInvokeRequest {
-    #[doc(hidden)]
-    pub(crate) hook_type: HookType,
-    pub input: serde_json::Value,
-    pub session_id: SessionId,
-}
-
-/// Optional output returned by an SDK callback hook.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct HookInvokeResponse {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub output: Option<serde_json::Value>,
+pub struct FactoryRunDetail {
+    /// Epoch milliseconds when the current active segment started, or null while inactive.
+    pub active_segment_started_at: Option<i64>,
+    /// Durable identities and live statuses for direct factory agents.
+    pub agents: Vec<FactoryAgentSummary>,
+    /// Approved effective resource ceilings, or null until approved.
+    pub approved: Option<FactoryDeclaredLimits>,
+    /// Epoch milliseconds when the run completed, or null while nonterminal.
+    pub completed_at: Option<i64>,
+    /// Durable resource consumption.
+    pub consumed: FactoryRunConsumed,
+    /// Epoch milliseconds when the run was created.
+    pub created_at: i64,
+    /// Current phase identity, or null before any phase is entered.
+    pub current_phase: Option<FactoryCurrentPhase>,
+    /// Resource ceilings declared by the factory.
+    pub declared_limits: FactoryDeclaredLimits,
+    /// Number of phases declared by the factory.
+    pub declared_phase_count: i64,
+    /// Human-readable factory description.
+    pub description: String,
+    /// Registered factory name.
+    pub factory_name: String,
+    /// Number of direct factory agents currently live.
+    pub live_agent_count: i64,
+    /// Epoch milliseconds when this live-overlay snapshot was observed.
+    pub observed_at: i64,
+    /// Lifecycle and timing observations for each factory phase.
+    pub phases: Vec<FactoryPhaseObservation>,
+    /// Bidirectional page of durable factory progress.
+    pub progress: FactoryProgressPage,
+    /// Monotonic durable run revision.
+    pub revision: i64,
+    /// Factory run identifier.
+    pub run_id: String,
+    /// Epoch milliseconds when execution first started, or null before start.
+    pub started_at: Option<i64>,
+    /// Current factory run status.
+    pub status: FactoryRunStatus,
+    /// Terminal run outcome, or null while nonterminal.
+    pub terminal: Option<FactoryRunTerminal>,
+    /// Total direct factory agents spawned across all attempts.
+    pub total_spawned_agent_count: i64,
+    /// Epoch milliseconds when the durable run was last updated.
+    pub updated_at: i64,
 }
 
-/// Installed plugin record from global state, with marketplace, version, install time, enabled state, cache path, and source.
+/// Options controlling factory invocation.
 ///
 /// <div class="warning">
 ///
@@ -5324,31 +5704,16 @@ pub(crate) struct HookInvokeResponse {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstalledPlugin {
-    /// Path where the plugin is cached locally
-    #[serde(rename = "cache_path", skip_serializing_if = "Option::is_none")]
-    pub cache_path: Option<String>,
-    /// Whether the plugin is currently enabled
-    pub enabled: bool,
-    /// Installation timestamp
-    #[serde(rename = "installed_at")]
-    pub installed_at: String,
-    /// Marketplace the plugin came from (empty string for direct repo installs)
-    pub marketplace: String,
-    /// Plugin name
-    pub name: String,
-    /// Source for direct repo installs (when marketplace is empty)
+pub struct RunOptions {
+    /// Per-invocation resource ceiling overrides.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub source: Option<serde_json::Value>,
-    /// Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.
-    #[serde(rename = "source_sha", skip_serializing_if = "Option::is_none")]
-    pub source_sha: Option<String>,
-    /// Version installed (if available)
+    pub limits: Option<FactoryRunLimits>,
+    /// Run identifier whose journal and progress should seed this resumed run.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub version: Option<String>,
+    pub resume_from_run_id: Option<String>,
 }
 
-/// Information about an installed plugin tracked in global state.
+/// Parameters for invoking a registered factory.
 ///
 /// <div class="warning">
 ///
@@ -5358,22 +5723,17 @@ pub struct InstalledPlugin {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstalledPluginInfo {
-    /// Opaque, stable hash identifying a direct (non-marketplace) install source. Present only for direct repo / URL / local installs; absent for marketplace plugins. Same source yields the same id; distinct sources never collide.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub direct_source_id: Option<String>,
-    /// Whether the plugin is currently enabled for new sessions
-    pub enabled: bool,
-    /// Marketplace the plugin came from. Empty string ("") for direct repo / URL / local installs.
-    pub marketplace: String,
-    /// Plugin name
+pub struct FactoryRunRequest {
+    /// Factory input value.
+    pub args: serde_json::Value,
+    /// Registered factory name.
     pub name: String,
-    /// Installed version (when reported by the plugin manifest)
+    /// Factory invocation options.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub version: Option<String>,
+    pub options: Option<RunOptions>,
 }
 
-/// Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or full commit SHA, and optional subpath.
+/// Optional user prompt to combine with the fleet orchestration instructions.
 ///
 /// <div class="warning">
 ///
@@ -5383,20 +5743,13 @@ pub struct InstalledPluginInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstalledPluginSourceGitHub {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
+pub struct FleetStartRequest {
+    /// Optional user prompt to combine with fleet instructions
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#ref: Option<String>,
-    pub repo: String,
-    /// Optional full 40-character hexadecimal commit SHA.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sha: Option<String>,
-    /// Constant value. Always "github".
-    pub source: InstalledPluginSourceGitHubSource,
+    pub prompt: Option<String>,
 }
 
-/// Source descriptor for a direct local plugin install, with a local filesystem path.
+/// Indicates whether fleet mode was successfully activated.
 ///
 /// <div class="warning">
 ///
@@ -5406,13 +5759,12 @@ pub struct InstalledPluginSourceGitHub {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstalledPluginSourceLocal {
-    pub path: String,
-    /// Constant value. Always "local".
-    pub source: InstalledPluginSourceLocalSource,
+pub struct FleetStartResult {
+    /// Whether fleet mode was successfully activated
+    pub started: bool,
 }
 
-/// Source descriptor for a direct URL plugin install, with URL, optional ref or full commit SHA, and optional subpath.
+/// Folder path to add to trusted folders.
 ///
 /// <div class="warning">
 ///
@@ -5422,20 +5774,12 @@ pub struct InstalledPluginSourceLocal {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstalledPluginSourceUrl {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#ref: Option<String>,
-    /// Optional full 40-character hexadecimal commit SHA.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sha: Option<String>,
-    /// Constant value. Always "url".
-    pub source: InstalledPluginSourceUrlSource,
-    pub url: String,
+pub struct FolderTrustAddParams {
+    /// Folder path to mark as trusted
+    pub path: String,
 }
 
-/// Canonical file or directory where custom instructions can be discovered or created, with location, kind, preference, and project path.
+/// Folder path to check for trust.
 ///
 /// <div class="warning">
 ///
@@ -5445,21 +5789,12 @@ pub struct InstalledPluginSourceUrl {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstructionDiscoveryPath {
-    /// Whether the target is a single file or a directory of instruction files
-    pub kind: InstructionDiscoveryPathKind,
-    /// Which tier this target belongs to
-    pub location: InstructionDiscoveryPathLocation,
-    /// Absolute path of the file or directory (may not exist on disk yet)
+pub struct FolderTrustCheckParams {
+    /// Folder path to check
     pub path: String,
-    /// Whether this is the canonical target to create new instructions in its tier. At most one entry per tier is preferred.
-    pub preferred_for_creation: bool,
-    /// The input project path this target was derived from (only for repository targets)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_path: Option<String>,
 }
 
-/// Canonical files and directories where custom instructions can be created so the runtime will recognize them.
+/// Folder trust check result.
 ///
 /// <div class="warning">
 ///
@@ -5469,12 +5804,12 @@ pub struct InstructionDiscoveryPath {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstructionDiscoveryPathList {
-    /// Canonical instruction create/discovery files and directories, in priority order
-    pub paths: Vec<InstructionDiscoveryPath>,
+pub struct FolderTrustCheckResult {
+    /// Whether the folder is trusted
+    pub trusted: bool,
 }
 
-/// Optional project paths to include in instruction discovery.
+/// Client environment metadata describing the process that produced a telemetry event.
 ///
 /// <div class="warning">
 ///
@@ -5484,16 +5819,46 @@ pub struct InstructionDiscoveryPathList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstructionsDiscoverRequest {
-    /// When true, omit the host's instruction sources (user/home-level files and plugin rules), leaving only repository and working-directory sources. For multitenant deployments.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exclude_host_instructions: Option<bool>,
-    /// Optional list of project directory paths to scan for repository/working-directory instruction sources. When omitted or empty, only user-level and plugin instruction sources are returned (no project scan).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_paths: Option<Vec<String>>,
+pub struct GitHubTelemetryClientInfo {
+    /// Copilot CLI version string.
+    #[serde(rename = "cli_version")]
+    pub cli_version: String,
+    /// Name of the client application.
+    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Type of client.
+    #[serde(rename = "client_type", skip_serializing_if = "Option::is_none")]
+    pub client_type: Option<String>,
+    /// Copilot subscription plan, when known.
+    #[serde(rename = "copilot_plan", skip_serializing_if = "Option::is_none")]
+    pub copilot_plan: Option<String>,
+    /// Number of logical CPU cores on the host.
+    #[serde(rename = "cpu_count", skip_serializing_if = "Option::is_none")]
+    pub cpu_count: Option<i64>,
+    /// Distinct CPU model names for the host, comma-separated.
+    #[serde(rename = "cpu_model", skip_serializing_if = "Option::is_none")]
+    pub cpu_model: Option<String>,
+    /// Stable machine identifier for the device.
+    #[serde(rename = "dev_device_id", skip_serializing_if = "Option::is_none")]
+    pub dev_device_id: Option<String>,
+    /// Whether the user is a GitHub/Microsoft staff member.
+    #[serde(rename = "is_staff", skip_serializing_if = "Option::is_none")]
+    pub is_staff: Option<bool>,
+    /// Node.js runtime version string.
+    #[serde(rename = "node_version")]
+    pub node_version: String,
+    /// Operating system architecture (e.g. arm64, x64).
+    #[serde(rename = "os_arch")]
+    pub os_arch: String,
+    /// Operating system platform (e.g. darwin, linux, win32).
+    #[serde(rename = "os_platform")]
+    pub os_platform: String,
+    /// Operating system version string.
+    #[serde(rename = "os_version")]
+    pub os_version: String,
 }
 
-/// Optional project paths to include when enumerating instruction discovery targets.
+/// A single telemetry event in the runtime's native GitHub-shaped telemetry format, forwarded verbatim to opted-in hosts. The `restricted` flag on the enclosing GitHubTelemetryNotification distinguishes standard from restricted events; the payload shape is identical for both.
 ///
 /// <div class="warning">
 ///
@@ -5503,16 +5868,43 @@ pub struct InstructionsDiscoverRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstructionsGetDiscoveryPathsRequest {
-    /// When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).
+pub struct GitHubTelemetryEvent {
+    /// Client environment metadata.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub exclude_host_instructions: Option<bool>,
-    /// Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.
+    pub client: Option<GitHubTelemetryClientInfo>,
+    /// Copilot tracking ID for user-level attribution.
+    #[serde(
+        rename = "copilot_tracking_id",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub copilot_tracking_id: Option<String>,
+    /// Timestamp when the event was created (ISO 8601 format).
+    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Experiment assignment context.
+    #[serde(
+        rename = "exp_assignment_context",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub exp_assignment_context: Option<String>,
+    /// Feature flags enabled for this session, as a map from flag to value.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_paths: Option<Vec<String>>,
+    pub features: Option<HashMap<String, String>>,
+    /// Event type/kind (e.g. get_completion_with_tools_turn, tool_call_executed).
+    pub kind: String,
+    /// Numeric metrics as a map from key to value.
+    pub metrics: HashMap<String, f64>,
+    /// Reference to the model call that produced this event.
+    #[serde(rename = "model_call_id", skip_serializing_if = "Option::is_none")]
+    pub model_call_id: Option<String>,
+    /// String-valued properties as a map from key to value.
+    pub properties: HashMap<String, String>,
+    /// Session identifier the event belongs to.
+    #[serde(rename = "session_id", skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<String>,
 }
 
-/// Loaded instruction source for a session, including path, content, category, location, applicability, and optional description.
+/// Payload for a `gitHubTelemetry.event` notification: a single GitHub telemetry event the runtime forwards to a host connection that opted into telemetry forwarding during the `server.connect` handshake.
 ///
 /// <div class="warning">
 ///
@@ -5522,34 +5914,17 @@ pub struct InstructionsGetDiscoveryPathsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstructionSource {
-    /// Glob pattern(s) from frontmatter — when set, this instruction applies only to matching files
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub apply_to: Option<Vec<String>>,
-    /// Raw content of the instruction file
-    pub content: String,
-    /// When true, this source starts disabled and must be toggled on by the user
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default_disabled: Option<bool>,
-    /// Short description (body after frontmatter) for use in instruction tables
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Unique identifier for this source (used for toggling)
-    pub id: String,
-    /// Human-readable label
-    pub label: String,
-    /// Where this source lives — used for UI grouping
-    pub location: InstructionSourceLocation,
-    /// The project path this source was discovered from. Only set by sessionless discovery for repository, working-directory, and project-scoped plugin sources, where it disambiguates sources across multiple workspace roots. The session-scoped getSources leaves it unset.
+pub struct GitHubTelemetryNotification {
+    /// The telemetry event, in the runtime's native GitHub-shaped telemetry format.
+    pub event: GitHubTelemetryEvent,
+    /// Whether this is a restricted telemetry event (cli.restricted_telemetry). Hosts must route restricted events to first-party Microsoft stores only.
+    pub restricted: bool,
+    /// Session the telemetry event belongs to, when it is session-scoped. Omitted for sessionless events (for example, `server.sendTelemetry` calls with no session id), which are still forwarded to opted-in connections.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_path: Option<String>,
-    /// File path relative to repo or absolute for home
-    pub source_path: String,
-    /// Category of instruction source — used for merge logic
-    pub r#type: InstructionSourceType,
+    pub session_id: Option<SessionId>,
 }
 
-/// Instruction sources loaded for the session, in merge order.
+/// Asks the SDK client to acquire a GitHub access token from an opaque callback registration.
 ///
 /// <div class="warning">
 ///
@@ -5559,12 +5934,40 @@ pub struct InstructionSource {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstructionsGetSourcesResult {
-    /// Instruction sources for the session
-    pub sources: Vec<InstructionSource>,
+pub struct GitHubTokenAcquireRequest {
+    /// Effective GitHub host for which the callback must return a token.
+    pub host: String,
+    /// Why the runtime is requesting a GitHub credential.
+    pub reason: GitHubTokenAcquireReason,
+    /// Opaque identifier generated by the SDK for this callback registration.
+    pub registration_id: String,
+    /// Session receiving the token. Absent only before a cloud session has been assigned its id.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
 }
 
-/// Parameters for interrupting the main agent turn.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GitHubTokenAcquireResultToken {
+    /// GitHub access token acquired by the SDK host.
+    pub access_token: String,
+    /// Remaining token lifetime in seconds when callback execution completes. It must exceed the one-hour preflight refresh threshold.
+    pub expires_in: i64,
+    /// GitHub credential response variant discriminator.
+    pub kind: GitHubTokenAcquireResultTokenKind,
+    /// OAuth token type. Defaults to bearer when omitted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub token_type: Option<String>,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GitHubTokenAcquireResultCancelled {
+    /// GitHub credential response variant discriminator.
+    pub kind: GitHubTokenAcquireResultCancelledKind,
+}
+
+/// Pending external tool call request ID, with the tool result or an error describing why it failed.
 ///
 /// <div class="warning">
 ///
@@ -5574,13 +5977,18 @@ pub struct InstructionsGetSourcesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InterruptMainTurnRequest {
-    /// When true, the user's queued prompts are preserved and run as the next turn once the interrupted turn unwinds; when false (the default), the queue is cleared like a plain abort.
+pub struct HandlePendingToolCallRequest {
+    /// Error message if the tool call failed
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub flush_queued: Option<bool>,
+    pub error: Option<String>,
+    /// Request ID of the pending tool call
+    pub request_id: RequestId,
+    /// Tool call result (string or expanded result object)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<serde_json::Value>,
 }
 
-/// Result of interrupting the main agent turn.
+/// Indicates whether the external tool call result was handled successfully.
 ///
 /// <div class="warning">
 ///
@@ -5590,78 +5998,57 @@ pub struct InterruptMainTurnRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InterruptMainTurnResult {
-    /// Whether an in-flight main agent turn was interrupted. False when the main loop was not processing.
-    pub interrupted: bool,
+pub struct HandlePendingToolCallResult {
+    /// Whether the tool call result was handled successfully
+    pub success: bool,
 }
 
-/// A request body chunk or cancellation signal.
+/// Indicates whether an in-progress manual compaction was aborted.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LlmInferenceHttpRequestChunkRequest {
-    /// Identity of the agent invocation (one agentic loop) this body chunk belongs to, matching the `agentInvocationId` semantics on httpRequestStart. Carried per chunk so a persistent transport can attribute successive turns correctly: when a WebSocket connection is reused across turns, the httpRequestStart identity reflects only the turn that opened the connection, so each later turn stamps its own invocation id here. Absent when the runtime has no invocation context for the request, or on the plain-HTTP transport where every request has its own httpRequestStart.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_invocation_id: Option<String>,
-    /// When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub binary: Option<bool>,
-    /// When true, the runtime is cancelling the in-flight request (e.g. upstream consumer aborted). `data` is ignored. Implies end-of-request.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cancel: Option<bool>,
-    /// Optional human-readable reason for the cancellation, propagated for logging.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cancel_reason: Option<String>,
-    /// Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty.
-    pub data: String,
-    /// When true, this is the final body chunk for the request. The SDK may rely on having received an end-marked chunk before treating the request body as complete.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub end: Option<bool>,
-    /// Matches the requestId from the originating httpRequestStart frame.
-    pub request_id: RequestId,
+pub struct HistoryAbortManualCompactionResult {
+    /// Whether an in-progress manual compaction was aborted. False when no manual compaction was running, when its abort controller was already aborted, or when the session is remote.
+    pub aborted: bool,
 }
 
-/// Acknowledgement. The SDK is free to ignore the ack and treat chunk delivery as fire-and-forget.
+/// Indicates whether an in-progress background compaction was cancelled.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LlmInferenceHttpRequestChunkResult {}
+pub struct HistoryCancelBackgroundCompactionResult {
+    /// Whether an in-progress background compaction was cancelled. False when no compaction was running, when the session is remote, or when the underlying processor was unavailable.
+    pub cancelled: bool,
+}
 
-/// The head of an outbound model-layer HTTP request.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct LlmInferenceHttpRequestStartRequest {
-    /// Stable identity of the agent trajectory that issued this request. Present when the request originates from an agent turn; absent for requests outside any agent context. This is the same identity used by lifecycle and bridged session events and remains constant across turns and retries.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_id: Option<String>,
-    /// Identity of the agent invocation (one agentic loop) that issued this request. It remains fixed across physical retries within the invocation and is distinct from the stable trajectory `agentId`. A caller-supplied invocation id always takes precedence (this covers auxiliary calls that have no model call id). Otherwise, first-party CAPI requests fall back to the runtime's agent task id — the same value the runtime emits as the `X-Agent-Task-Id` header — while custom-provider requests fall back to the model call id.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_invocation_id: Option<String>,
-    pub headers: HashMap<String, Vec<String>>,
-    /// Coarse classification of the interaction that produced this request. Open string for forward-compatibility; known values include `conversation-agent`, `conversation-subagent`, `conversation-sampling`, `conversation-background`, `conversation-compaction`, and `conversation-user`. Absent when the runtime did not classify the request. Comes from the runtime's per-request agent context independently of transport; on the CAPI transport the runtime derives the upstream `X-Interaction-Type` header from this same context.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub interaction_type: Option<String>,
-    /// HTTP method, e.g. GET, POST.
-    pub method: String,
-    /// Stable identity of the immediate parent trajectory. Present for child trajectories such as subagents and conversation-sampling requests; absent for root-agent and non-agent requests.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub parent_agent_id: Option<String>,
-    /// Opaque runtime-minted id, unique per in-flight request. The SDK uses this to correlate httpRequestChunk frames and to address its httpResponseStart / httpResponseChunk replies back to the runtime.
-    pub request_id: RequestId,
-    /// Id of the runtime session that triggered this request, when one is in scope. Absent for requests issued outside any session (e.g. startup model-catalog or capability resolution). This is a payload field — not a dispatch key — because the client-global API is registered process-wide rather than per session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
-    /// Transport the runtime would otherwise use for this request. `http` (the default when absent) covers plain HTTP and SSE responses; `websocket` indicates a full-duplex message channel where each body chunk maps to one WebSocket message and the `binary` flag distinguishes text from binary frames. The SDK consumer uses this to decide whether to service the request with an HTTP client or a WebSocket client. It is the one piece of request metadata the consumer cannot reliably infer from the URL or headers alone.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub transport: Option<LlmInferenceHttpRequestStartTransport>,
-    /// Absolute request URL.
-    pub url: String,
-}
-
-/// Acknowledgement. Returning successfully simply means the SDK accepted the start frame; it does not imply the request will succeed.
+/// Parameters for clearing the conversation and seeding the window that replaces it.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LlmInferenceHttpRequestStartResult {}
+pub struct HistoryClearContextRequest {
+    /// First user message of the fresh context window. Required: a cleared window holding only system and developer messages is not a conversation a model can answer, so every clear seeds the window it creates. Delivered by the enclosing turn driver once the agentic loop exits, which is why the call must be made from inside a tool handler.
+    pub prompt: String,
+}
 
-/// Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.
+/// What a successful clear removed. A clear that could not be applied rejects instead of reporting a count.
 ///
 /// <div class="warning">
 ///
@@ -5671,15 +6058,12 @@ pub struct LlmInferenceHttpRequestStartResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LlmInferenceHttpResponseChunkError {
-    /// Optional machine-readable error code.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub code: Option<String>,
-    /// Human-readable failure description.
-    pub message: String,
+pub struct HistoryClearContextResult {
+    /// Number of non-system, non-developer messages that were removed from the conversation. Zero only when the window already held no conversation.
+    pub messages_cleared: i64,
 }
 
-/// A response body chunk or terminal error.
+/// Post-compaction context window usage breakdown
 ///
 /// <div class="warning">
 ///
@@ -5689,23 +6073,25 @@ pub struct LlmInferenceHttpResponseChunkError {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LlmInferenceHttpResponseChunkRequest {
-    /// When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.
+pub struct HistoryCompactContextWindow {
+    /// Token count from non-system messages (user, assistant, tool)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub binary: Option<bool>,
-    /// Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty (e.g. when the response body is empty: send a single chunk with empty data and end=true).
-    pub data: String,
-    /// When true, this is the final body chunk for the response. The runtime treats the response body as complete after receiving an end-marked chunk.
+    pub conversation_tokens: Option<i64>,
+    /// Current total tokens in the context window (system + conversation + tool definitions)
+    pub current_tokens: i64,
+    /// Current number of messages in the conversation
+    pub messages_length: i64,
+    /// Token count from system message(s)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub end: Option<bool>,
-    /// Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.
+    pub system_tokens: Option<i64>,
+    /// Maximum token count for the model's context window
+    pub token_limit: i64,
+    /// Token count from tool definitions
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<LlmInferenceHttpResponseChunkError>,
-    /// Matches the requestId from the originating httpRequestStart frame.
-    pub request_id: RequestId,
+    pub tool_definitions_tokens: Option<i64>,
 }
 
-/// Whether the chunk was accepted.
+/// Optional compaction parameters.
 ///
 /// <div class="warning">
 ///
@@ -5715,12 +6101,19 @@ pub struct LlmInferenceHttpResponseChunkRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LlmInferenceHttpResponseChunkResult {
-    /// True when the chunk was matched to a pending request; false when unknown.
-    pub accepted: bool,
+pub struct HistoryCompactRequest {
+    /// Optional user-provided instructions to focus the compaction summary
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub custom_instructions: Option<String>,
+    /// Context window token limit this compaction is targeting, recorded as the `tokenLimit` on the persisted `session.compaction_start` / `session.compaction_complete` events. Set it when the compaction targets a window other than the compacting model's own, e.g. switching to a model with a smaller context window: the compaction still runs on the current model, so the limit that motivated it would otherwise be lost. When absent, the events record the compacting model's own resolved limit. Attribution metadata only - it does not change how much the compaction removes.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub token_limit: Option<i64>,
+    /// What initiated this compaction request, recorded as the `trigger` on the persisted `session.compaction_start` / `session.compaction_complete` events. When absent, the compaction is persisted without trigger attribution (initiator unknown).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub trigger: Option<HistoryCompactRequestTrigger>,
 }
 
-/// Response head.
+/// Compaction outcome with the number of tokens and messages removed, summary text, and the resulting context window breakdown.
 ///
 /// <div class="warning">
 ///
@@ -5730,18 +6123,22 @@ pub struct LlmInferenceHttpResponseChunkResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LlmInferenceHttpResponseStartRequest {
-    pub headers: HashMap<String, Vec<String>>,
-    /// Matches the requestId from the originating httpRequestStart frame.
-    pub request_id: RequestId,
-    /// HTTP status code.
-    pub status: i64,
-    /// Optional HTTP status reason phrase.
+pub struct HistoryCompactResult {
+    /// Post-compaction context window usage breakdown
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub status_text: Option<String>,
+    pub context_window: Option<HistoryCompactContextWindow>,
+    /// Number of messages removed during compaction
+    pub messages_removed: i64,
+    /// Whether compaction completed successfully
+    pub success: bool,
+    /// Summary text produced by compaction. Omitted when compaction did not produce a summary (e.g. failure path).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary_content: Option<String>,
+    /// Number of tokens freed by compaction
+    pub tokens_removed: i64,
 }
 
-/// Whether the start frame was accepted.
+/// A root user turn that the session can rewind to.
 ///
 /// <div class="warning">
 ///
@@ -5751,12 +6148,28 @@ pub struct LlmInferenceHttpResponseStartRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LlmInferenceHttpResponseStartResult {
-    /// True when the response start was matched to a pending request; false when unknown.
-    pub accepted: bool,
+pub struct HistoryRewindPoint {
+    /// Whether at least one file in this turn or a later turn can be restored.
+    pub can_restore_files: bool,
+    /// ID of the user.message event that begins the discarded suffix.
+    pub event_id: String,
+    /// Number of unique files in this turn and all later turns that have captured changes.
+    pub file_count: i64,
+    /// Whether this turn was an automatically injected autopilot continuation.
+    pub is_autopilot_continuation: bool,
+    /// Lines added by this turn's captured file changes.
+    pub lines_added: i64,
+    /// Lines removed by this turn's captured file changes.
+    pub lines_removed: i64,
+    /// ISO timestamp of the user turn.
+    pub timestamp: String,
+    /// Whether this turn itself captured any file changes.
+    pub turn_changed_files: bool,
+    /// User-visible message text for the turn.
+    pub user_message: String,
 }
 
-/// Indicates whether the calling client was registered as the LLM inference provider.
+/// Rewind points and file-change-tracking availability for the session.
 ///
 /// <div class="warning">
 ///
@@ -5766,12 +6179,17 @@ pub struct LlmInferenceHttpResponseStartResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LlmInferenceSetProviderResult {
-    /// Whether the provider was set successfully
-    pub success: bool,
+pub struct HistoryListRewindPointsResult {
+    /// Whether this session captured file changes from its first turn.
+    pub file_change_tracking_enabled: bool,
+    /// Root user turns in chronological order. Empty when `unavailableReason` is set.
+    pub points: Vec<HistoryRewindPoint>,
+    /// Why the listed points could not be produced, when applicable; the points list is empty whenever it is set. `unsupported-remote-session` is permanent for the session and comes with `fileChangeTrackingEnabled: false`. `session-busy` is transient and only ever reported by a session that *is* tracking (`fileChangeTrackingEnabled: true`), because the file-change captures cannot be read while work that may still mutate them is in flight; the same request succeeds once the session settles, so a client that wants points should retry rather than treat it as a failure. It is never `file-change-tracking-disabled`: an untracked local session still lists conversation-only points and reports that through `fileChangeTrackingEnabled: false`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub unavailable_reason: Option<HistoryRewindUnavailableReason>,
 }
 
-/// Pre-resolved working-directory context for session startup.
+/// Event boundary to preview for conversation-and-files rewind.
 ///
 /// <div class="warning">
 ///
@@ -5781,24 +6199,12 @@ pub struct LlmInferenceSetProviderResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionContext {
-    /// Active git branch
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    /// Most recent working directory for this session
-    pub cwd: String,
-    /// Git repository root, if the cwd was inside a git repo
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Repository host type
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<SessionContextHostType>,
-    /// Repository slug in `owner/name` form, when known
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
+pub struct HistoryPreviewRewindRequest {
+    /// ID of the user.message event that begins the discarded suffix.
+    pub event_id: String,
 }
 
-/// Persisted local session metadata, including identifiers, timestamps, summary/name, client, context, detached state, and task ID.
+/// A file that a conversation-and-files rewind would restore.
 ///
 /// <div class="warning">
 ///
@@ -5808,36 +6214,18 @@ pub struct SessionContext {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LocalSessionMetadataValue {
-    /// Runtime client name that created/last resumed this session
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    /// Pre-resolved working-directory context for session startup.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context: Option<SessionContext>,
-    /// True for detached maintenance sessions that should be hidden from normal resume lists.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_detached: Option<bool>,
-    /// Always false for local sessions.
-    pub is_remote: bool,
-    /// GitHub task ID, when this local session is bound to one. Only present for local sessions exported to remote control.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mc_task_id: Option<String>,
-    /// Last-modified time of the session's persisted state, as ISO 8601
-    pub modified_time: String,
-    /// Optional human-friendly name set via /rename
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Stable session identifier
-    pub session_id: SessionId,
-    /// Session creation time as an ISO 8601 timestamp
-    pub start_time: String,
-    /// Short summary of the session, when one has been derived
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary: Option<String>,
+pub struct HistoryRewindFilePreview {
+    /// Aggregate change made across the discarded turns.
+    pub change_type: HistoryRewindChangeType,
+    /// Lines added across the discarded turns.
+    pub lines_added: i64,
+    /// Lines removed across the discarded turns.
+    pub lines_removed: i64,
+    /// Absolute path of the captured file.
+    pub path: String,
 }
 
-/// Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.
+/// Files and aggregate changes for a prospective rewind.
 ///
 /// <div class="warning">
 ///
@@ -5847,27 +6235,19 @@ pub struct LocalSessionMetadataValue {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LogRequest {
-    /// When true, the message is transient and not persisted to the session event log on disk
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ephemeral: Option<bool>,
-    /// Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub level: Option<SessionLogLevel>,
-    /// Human-readable message
-    pub message: String,
-    /// Optional actionable tip displayed alongside the message. Only honored on `level: "info"`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tip: Option<String>,
-    /// Domain category for this log entry (e.g., "mcp", "subscription", "policy", "model"). Maps to `infoType`/`warningType`/`errorType` on the emitted event. Defaults to "notification".
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#type: Option<String>,
-    /// Optional URL the user can open in their browser for more details
+pub struct HistoryPreviewRewindResult {
+    /// Whether file restore is available for this session. This is authoritative: switch on it and read `reason` only when it is false.
+    pub available: bool,
+    /// Number of unique files in the preview.
+    pub file_count: i64,
+    /// Files ordered by path.
+    pub files: Vec<HistoryRewindFilePreview>,
+    /// Why file restore is unavailable, when applicable. Populated only when `available` is false and never set when `available` is true.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub url: Option<String>,
+    pub reason: Option<HistoryRewindUnavailableReason>,
 }
 
-/// Identifier of the session event that was emitted for the log message.
+/// Boundary and mode for rewinding session history.
 ///
 /// <div class="warning">
 ///
@@ -5877,12 +6257,14 @@ pub struct LogRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LogResult {
-    /// The unique identifier of the emitted session event
+pub struct HistoryRewindRequest {
+    /// ID of the user.message event that begins the discarded suffix.
     pub event_id: String,
+    /// Whether to rewind only conversation history or also restore captured files.
+    pub mode: HistoryRewindMode,
 }
 
-/// Parameters for (re)loading the merged LSP configuration set.
+/// A captured file that rewind intentionally left unchanged.
 ///
 /// <div class="warning">
 ///
@@ -5892,19 +6274,14 @@ pub struct LogResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct LspInitializeRequest {
-    /// Force re-initialization even when LSP configs were already loaded for the working directory.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub force: Option<bool>,
-    /// Git root used as the boundary when traversing for project-level LSP configs (supports monorepos).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Working directory used to load project-level LSP configs. Defaults to the session working directory when omitted.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub working_directory: Option<String>,
+pub struct HistorySkippedFileRestore {
+    /// Absolute path of the skipped file.
+    pub path: String,
+    /// Reason the file was not restored.
+    pub reason: HistoryFileRestoreSkipReason,
 }
 
-/// Result of registering a new marketplace.
+/// Structured outcome of a rewind request.
 ///
 /// <div class="warning">
 ///
@@ -5914,12 +6291,22 @@ pub struct LspInitializeRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MarketplaceAddResult {
-    /// Final name of the marketplace as resolved from its manifest
-    pub name: String,
+pub struct HistoryRewindResult {
+    /// Failure detail. Set only for the failure and partial-failure outcomes (`files-rolled-back`, `rollback-incomplete`, `truncation-failed`, `checkpoint-cleanup-failed`, `snapshot-prune-failed`); omitted for `success` and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Number of persisted events removed by conversation truncation. Present only when truncation succeeded (outcomes `success`, `checkpoint-cleanup-failed`, and `snapshot-prune-failed`); omitted for every unavailable outcome (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`) and for `truncation-failed`, `files-rolled-back`, and `rollback-incomplete`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub events_removed: Option<i64>,
+    /// Overall rewind outcome. This discriminates the result: it governs which of the remaining fields are populated, so consumers must switch on it before reading `eventsRemoved`, `restoredFiles`, `skippedFiles`, or `error`. See each field for the outcomes that populate it.
+    pub outcome: HistoryRewindOutcome,
+    /// Absolute paths restored to their captured preimages. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.
+    pub restored_files: Vec<String>,
+    /// Captured files intentionally left unchanged. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.
+    pub skipped_files: Vec<HistorySkippedFileRestore>,
 }
 
-/// Plugin entry advertised by a marketplace.
+/// Markdown summary of the conversation context (empty when not available).
 ///
 /// <div class="warning">
 ///
@@ -5929,15 +6316,12 @@ pub struct MarketplaceAddResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MarketplacePluginInfo {
-    /// Short description from the marketplace catalog, when present
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Plugin name as listed in the marketplace catalog
-    pub name: String,
+pub struct HistorySummarizeForHandoffResult {
+    /// Markdown summary of the conversation context produced by an LLM. Empty string when there are no messages or when the session does not support local summarization.
+    pub summary: String,
 }
 
-/// Plugins advertised by the marketplace.
+/// Identifier of the event to truncate to; this event and all later events are removed.
 ///
 /// <div class="warning">
 ///
@@ -5947,12 +6331,12 @@ pub struct MarketplacePluginInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MarketplaceBrowseResult {
-    /// Plugins advertised by the marketplace
-    pub plugins: Vec<MarketplacePluginInfo>,
+pub struct HistoryTruncateRequest {
+    /// Event ID to truncate to. This event and all events after it are removed from the session.
+    pub event_id: String,
 }
 
-/// Registered marketplace summary.
+/// Number of events that were removed by the truncation.
 ///
 /// <div class="warning">
 ///
@@ -5962,32 +6346,36 @@ pub struct MarketplaceBrowseResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MarketplaceInfo {
-    /// True when this is a default marketplace shipped with the runtime. Defaults are not removable.
+pub struct HistoryTruncateResult {
+    /// Failure detail when checkpointCleanupFailed is true.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_default: Option<bool>,
-    /// Marketplace name (matches the @marketplace suffix in plugin specs)
-    pub name: String,
-    /// Human-readable description of where the marketplace data is fetched from (e.g. "GitHub: owner/repo").
-    pub source: String,
+    pub checkpoint_cleanup_error: Option<String>,
+    /// True when conversation truncation succeeded but post-truncation workspace checkpoint cleanup failed. History is already truncated; callers may still prune snapshots but should report a checkpoint-cleanup rather than a truncation failure.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub checkpoint_cleanup_failed: Option<bool>,
+    /// Number of events that were removed
+    pub events_removed: i64,
 }
 
-/// All registered marketplaces, including built-in defaults.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// Runtime-owned wire payload for a server-to-client hook callback invocation.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MarketplaceListResult {
-    /// Registered marketplaces
-    pub marketplaces: Vec<MarketplaceInfo>,
+pub(crate) struct HookInvokeRequest {
+    #[doc(hidden)]
+    pub(crate) hook_type: HookType,
+    pub input: serde_json::Value,
+    pub session_id: SessionId,
 }
 
-/// Per-marketplace refresh result, including marketplace name, success flag, and optional failure error.
+/// Optional output returned by an SDK callback hook.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct HookInvokeResponse {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub output: Option<serde_json::Value>,
+}
+
+/// Installed plugin record from global state, with marketplace, version, install time, enabled state, cache path, and source.
 ///
 /// <div class="warning">
 ///
@@ -5997,17 +6385,34 @@ pub struct MarketplaceListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MarketplaceRefreshEntry {
-    /// Error message (failure only)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Marketplace name that was refreshed
+pub struct InstalledPlugin {
+    /// Path where the plugin is cached locally
+    #[serde(rename = "cache_path", skip_serializing_if = "Option::is_none")]
+    pub cache_path: Option<String>,
+    /// Whether the plugin is currently enabled
+    pub enabled: bool,
+    /// Installation timestamp
+    #[serde(rename = "installed_at")]
+    pub installed_at: String,
+    /// Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — those synthesized at session start for a directory/local marketplace, whose cache_path points at the real plugin directory on disk rather than a copy under the installed-plugins cache. Its presence is what marks a record as live, and no record carrying it is ever written to the persisted installedPlugins key.
+    #[serde(rename = "installed_from", skip_serializing_if = "Option::is_none")]
+    pub installed_from: Option<String>,
+    /// Marketplace the plugin came from (empty string for direct repo installs)
+    pub marketplace: String,
+    /// Plugin name
     pub name: String,
-    /// Whether the refresh succeeded
-    pub success: bool,
+    /// Source for direct repo installs (when marketplace is empty)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<serde_json::Value>,
+    /// Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.
+    #[serde(rename = "source_sha", skip_serializing_if = "Option::is_none")]
+    pub source_sha: Option<String>,
+    /// Version installed (if available)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub version: Option<String>,
 }
 
-/// Result of refreshing one or more marketplace catalogs.
+/// Information about an installed plugin tracked in global state.
 ///
 /// <div class="warning">
 ///
@@ -6017,12 +6422,25 @@ pub struct MarketplaceRefreshEntry {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MarketplaceRefreshResult {
-    /// Per-marketplace refresh results in deterministic order.
-    pub results: Vec<MarketplaceRefreshEntry>,
+pub struct InstalledPluginInfo {
+    /// Opaque, stable hash identifying a direct (non-marketplace) install source. Present only for direct repo / URL / local installs; absent for marketplace plugins. Same source yields the same id; distinct sources never collide.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub direct_source_id: Option<String>,
+    /// Whether the plugin is currently enabled for new sessions
+    pub enabled: bool,
+    /// Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — a plugin belonging to a directory/local marketplace, which is loaded from its real directory on every pass instead of a copy under the installed-plugins cache. Its presence is what marks a listed plugin as live: such a plugin is always present on disk, so `enabled` is its only meaningful state and it is never "not installed".
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub installed_from: Option<String>,
+    /// Marketplace the plugin came from. Empty string ("") for direct repo / URL / local installs.
+    pub marketplace: String,
+    /// Plugin name
+    pub name: String,
+    /// Installed version (when reported by the plugin manifest)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub version: Option<String>,
 }
 
-/// Outcome of the remove attempt, including dependent-plugin info when applicable.
+/// Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or full commit SHA, and optional subpath.
 ///
 /// <div class="warning">
 ///
@@ -6032,15 +6450,23 @@ pub struct MarketplaceRefreshResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MarketplaceRemoveResult {
-    /// Names of installed plugins that prevented removal. Populated only when `removed=false`.
+pub struct InstalledPluginSourceGitHub {
+    /// Optional repository-relative path to the plugin.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub dependent_plugins: Option<Vec<String>>,
-    /// True when the marketplace was actually removed. False when removal was skipped because the marketplace has dependent plugins and `force` was not set.
-    pub removed: bool,
+    pub path: Option<String>,
+    /// Optional Git ref to resolve.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#ref: Option<String>,
+    /// GitHub repository in `owner/repo` form.
+    pub repo: String,
+    /// Optional full 40-character hexadecimal commit SHA.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sha: Option<String>,
+    /// Constant value. Always "github".
+    pub source: InstalledPluginSourceGitHubSource,
 }
 
-/// MCP server allowed by policy, with server name and optional PII-free explanatory note.
+/// Source descriptor for a direct local plugin install, with a local filesystem path.
 ///
 /// <div class="warning">
 ///
@@ -6050,15 +6476,14 @@ pub struct MarketplaceRemoveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAllowedServer {
-    /// Allowed server name
-    pub name: String,
-    /// PII-free note explaining why the server was allowed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub redacted_note: Option<String>,
+pub struct InstalledPluginSourceLocal {
+    /// Local filesystem path to the plugin.
+    pub path: String,
+    /// Constant value. Always "local".
+    pub source: InstalledPluginSourceLocalSource,
 }
 
-/// MCP server, tool name, and arguments to invoke from an MCP App view.
+/// Source descriptor for a direct URL plugin install, with URL, optional ref or full commit SHA, and optional subpath.
 ///
 /// <div class="warning">
 ///
@@ -6068,19 +6493,23 @@ pub struct McpAllowedServer {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsCallToolRequest {
-    /// Tool arguments
+pub struct InstalledPluginSourceUrl {
+    /// Optional source-relative path to the plugin.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub arguments: Option<HashMap<String, serde_json::Value>>,
-    /// **Required.** Server whose ui:// view issued the request. Per SEP-1865 ('callable by the app from this server only'), the call is rejected when this differs from `serverName`, and rejected outright when missing.
-    pub origin_server_name: String,
-    /// MCP server hosting the tool
-    pub server_name: String,
-    /// MCP tool name
-    pub tool_name: String,
+    pub path: Option<String>,
+    /// Optional Git ref to resolve.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#ref: Option<String>,
+    /// Optional full 40-character hexadecimal commit SHA.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sha: Option<String>,
+    /// Constant value. Always "url".
+    pub source: InstalledPluginSourceUrlSource,
+    /// URL of the plugin source.
+    pub url: String,
 }
 
-/// Capability negotiation snapshot
+/// Canonical file or directory where custom instructions can be discovered or created, with location, kind, preference, and project path.
 ///
 /// <div class="warning">
 ///
@@ -6090,16 +6519,21 @@ pub struct McpAppsCallToolRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsDiagnoseCapability {
-    /// Whether the runtime advertises `extensions.io.modelcontextprotocol/ui` to MCP servers
-    pub advertised: bool,
-    /// Whether the MCP_APPS feature flag (or COPILOT_MCP_APPS env override) is on
-    pub feature_flag_enabled: bool,
-    /// Whether the session has the `mcp-apps` capability
-    pub session_has_mcp_apps: bool,
+pub struct InstructionDiscoveryPath {
+    /// Whether the target is a single file or a directory of instruction files
+    pub kind: InstructionDiscoveryPathKind,
+    /// Which tier this target belongs to
+    pub location: InstructionDiscoveryPathLocation,
+    /// Absolute path of the file or directory (may not exist on disk yet)
+    pub path: String,
+    /// Whether this is the canonical target to create new instructions in its tier. At most one entry per tier is preferred.
+    pub preferred_for_creation: bool,
+    /// The input project path this target was derived from (only for repository targets)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub project_path: Option<String>,
 }
 
-/// MCP server to diagnose MCP Apps wiring for.
+/// Canonical files and directories where custom instructions can be created so the runtime will recognize them.
 ///
 /// <div class="warning">
 ///
@@ -6109,12 +6543,12 @@ pub struct McpAppsDiagnoseCapability {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsDiagnoseRequest {
-    /// MCP server to probe
-    pub server_name: String,
+pub struct InstructionDiscoveryPathList {
+    /// Canonical instruction create/discovery files and directories, in priority order
+    pub paths: Vec<InstructionDiscoveryPath>,
 }
 
-/// What the server returned for this session
+/// Optional project paths to include in instruction discovery.
 ///
 /// <div class="warning">
 ///
@@ -6124,18 +6558,16 @@ pub struct McpAppsDiagnoseRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsDiagnoseServer {
-    /// Whether the named server is currently connected
-    pub connected: bool,
-    /// Up to 5 tool names with `_meta.ui` for quick inspection
-    pub sample_tool_names: Vec<String>,
-    /// Total tools returned by the server's tools/list
-    pub tool_count: f64,
-    /// Tools whose `_meta.ui` is populated (resourceUri and/or visibility set)
-    pub tools_with_ui_meta: f64,
+pub struct InstructionsDiscoverRequest {
+    /// When true, omit the host's instruction sources (user/home-level files and plugin rules), leaving only repository and working-directory sources. For multitenant deployments.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exclude_host_instructions: Option<bool>,
+    /// Optional list of project directory paths to scan for repository/working-directory instruction sources. When omitted or empty, only user-level and plugin instruction sources are returned (no project scan).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub project_paths: Option<Vec<String>>,
 }
 
-/// Diagnostic snapshot of MCP Apps wiring for the named server.
+/// Optional project paths to include when enumerating instruction discovery targets.
 ///
 /// <div class="warning">
 ///
@@ -6145,14 +6577,16 @@ pub struct McpAppsDiagnoseServer {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsDiagnoseResult {
-    /// Capability negotiation snapshot
-    pub capability: McpAppsDiagnoseCapability,
-    /// What the server returned for this session
-    pub server: McpAppsDiagnoseServer,
+pub struct InstructionsGetDiscoveryPathsRequest {
+    /// When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exclude_host_instructions: Option<bool>,
+    /// Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub project_paths: Option<Vec<String>>,
 }
 
-/// Current host context
+/// Loaded instruction source for a session, including path, content, category, location, applicability, and optional description.
 ///
 /// <div class="warning">
 ///
@@ -6162,31 +6596,34 @@ pub struct McpAppsDiagnoseResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsHostContextDetails {
-    /// Display modes the host supports
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub available_display_modes: Option<Vec<McpAppsHostContextDetailsAvailableDisplayMode>>,
-    /// Current display mode (SEP-1865)
+pub struct InstructionSource {
+    /// Glob pattern(s) from frontmatter — when set, this instruction applies only to matching files
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_mode: Option<McpAppsHostContextDetailsDisplayMode>,
-    /// BCP-47 locale, e.g. 'en-US'
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub locale: Option<String>,
-    /// Platform type for responsive design
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub platform: Option<McpAppsHostContextDetailsPlatform>,
-    /// UI theme preference per SEP-1865
+    pub apply_to: Option<Vec<String>>,
+    /// Raw content of the instruction file
+    pub content: String,
+    /// When true, this source starts disabled and must be toggled on by the user
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub theme: Option<McpAppsHostContextDetailsTheme>,
-    /// IANA timezone, e.g. 'America/New_York'
+    pub default_disabled: Option<bool>,
+    /// Short description (body after frontmatter) for use in instruction tables
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub time_zone: Option<String>,
-    /// Host application identifier
+    pub description: Option<String>,
+    /// Unique identifier for this source (used for toggling)
+    pub id: String,
+    /// Human-readable label
+    pub label: String,
+    /// Where this source lives — used for UI grouping
+    pub location: InstructionSourceLocation,
+    /// The project path this source was discovered from. Only set by sessionless discovery for repository, working-directory, and project-scoped plugin sources, where it disambiguates sources across multiple workspace roots. The session-scoped getSources leaves it unset.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub user_agent: Option<String>,
+    pub project_path: Option<String>,
+    /// File path relative to repo or absolute for home
+    pub source_path: String,
+    /// Category of instruction source — used for merge logic
+    pub r#type: InstructionSourceType,
 }
 
-/// Current host context advertised to MCP App guests.
+/// Instruction sources loaded for the session, in merge order.
 ///
 /// <div class="warning">
 ///
@@ -6196,12 +6633,12 @@ pub struct McpAppsHostContextDetails {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsHostContext {
-    /// Current host context
-    pub context: McpAppsHostContextDetails,
+pub struct InstructionsGetSourcesResult {
+    /// Instruction sources for the session
+    pub sources: Vec<InstructionSource>,
 }
 
-/// MCP server to list app-callable tools for.
+/// Parameters for interrupting the main agent turn.
 ///
 /// <div class="warning">
 ///
@@ -6211,14 +6648,13 @@ pub struct McpAppsHostContext {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsListToolsRequest {
-    /// **Required.** Server whose ui:// view issued the request. Per SEP-1865 ('callable by the app from this server only'), the call is rejected when this differs from `serverName`, and rejected outright when missing.
-    pub origin_server_name: String,
-    /// MCP server hosting the app
-    pub server_name: String,
+pub struct InterruptMainTurnRequest {
+    /// When true, the user's queued prompts are preserved and run as the next turn once the interrupted turn unwinds; when false (the default), the queue is cleared like a plain abort.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub flush_queued: Option<bool>,
 }
 
-/// App-callable tools from the named MCP server.
+/// Result of interrupting the main agent turn.
 ///
 /// <div class="warning">
 ///
@@ -6228,56 +6664,79 @@ pub struct McpAppsListToolsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsListToolsResult {
-    /// App-callable tools from the server
-    pub tools: Vec<HashMap<String, serde_json::Value>>,
+pub struct InterruptMainTurnResult {
+    /// Whether an in-flight main agent turn was interrupted. False when the main loop was not processing.
+    pub interrupted: bool,
 }
 
-/// MCP server and resource URI to fetch.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// A request body chunk or cancellation signal.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsReadResourceRequest {
-    /// Name of the MCP server hosting the resource
-    pub server_name: String,
-    /// Resource URI (typically ui://...)
-    pub uri: String,
+pub struct LlmInferenceHttpRequestChunkRequest {
+    /// Identity of the agent invocation (one agentic loop) this body chunk belongs to, matching the `agentInvocationId` semantics on httpRequestStart. Carried per chunk so a persistent transport can attribute successive turns correctly: when a WebSocket connection is reused across turns, the httpRequestStart identity reflects only the turn that opened the connection, so each later turn stamps its own invocation id here. Absent when the runtime has no invocation context for the request, or on the plain-HTTP transport where every request has its own httpRequestStart.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_invocation_id: Option<String>,
+    /// When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub binary: Option<bool>,
+    /// When true, the runtime is cancelling the in-flight request (e.g. upstream consumer aborted). `data` is ignored. Implies end-of-request.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cancel: Option<bool>,
+    /// Optional human-readable reason for the cancellation, propagated for logging.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cancel_reason: Option<String>,
+    /// Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty.
+    pub data: String,
+    /// When true, this is the final body chunk for the request. The SDK may rely on having received an end-marked chunk before treating the request body as complete.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub end: Option<bool>,
+    /// Matches the requestId from the originating httpRequestStart frame.
+    pub request_id: RequestId,
 }
 
-/// MCP Apps resource content with URI, optional MIME type, text or base64 blob, and resource metadata.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// Acknowledgement. The SDK is free to ignore the ack and treat chunk delivery as fire-and-forget.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsResourceContent {
-    /// Resource-level metadata (CSP, permissions, etc.)
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-    /// Base64-encoded binary content
+pub struct LlmInferenceHttpRequestChunkResult {}
+
+/// The head of an outbound model-layer HTTP request.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LlmInferenceHttpRequestStartRequest {
+    /// Stable identity of the agent trajectory that issued this request. Present when the request originates from an agent turn; absent for requests outside any agent context. This is the same identity used by lifecycle and bridged session events and remains constant across turns and retries.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub blob: Option<String>,
-    /// MIME type of the content
+    pub agent_id: Option<String>,
+    /// Identity of the agent invocation (one agentic loop) that issued this request. It remains fixed across physical retries within the invocation and is distinct from the stable trajectory `agentId`. A caller-supplied invocation id always takes precedence (this covers auxiliary calls that have no model call id). Otherwise, first-party CAPI requests fall back to the runtime's agent task id — the same value the runtime emits as the `X-Agent-Task-Id` header — while custom-provider requests fall back to the model call id.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    /// Text content (e.g. HTML)
+    pub agent_invocation_id: Option<String>,
+    /// HTTP request headers, preserving multiple values per name.
+    pub headers: HashMap<String, Vec<String>>,
+    /// Coarse classification of the interaction that produced this request. Open string for forward-compatibility; known values include `conversation-agent`, `conversation-subagent`, `conversation-sampling`, `conversation-background`, `conversation-compaction`, and `conversation-user`. Absent when the runtime did not classify the request. Comes from the runtime's per-request agent context independently of transport; on the CAPI transport the runtime derives the upstream `X-Interaction-Type` header from this same context.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub text: Option<String>,
-    /// The resource URI (typically ui://...)
-    pub uri: String,
+    pub interaction_type: Option<String>,
+    /// HTTP method, e.g. GET, POST.
+    pub method: String,
+    /// Stable identity of the immediate parent trajectory. Present for child trajectories such as subagents and conversation-sampling requests; absent for root-agent and non-agent requests.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parent_agent_id: Option<String>,
+    /// Opaque runtime-minted id, unique per in-flight request. The SDK uses this to correlate httpRequestChunk frames and to address its httpResponseStart / httpResponseChunk replies back to the runtime.
+    pub request_id: RequestId,
+    /// Id of the runtime session that triggered this request, when one is in scope. Absent for requests issued outside any session (e.g. startup model-catalog or capability resolution). This is a payload field — not a dispatch key — because the client-global API is registered process-wide rather than per session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+    /// Transport the runtime would otherwise use for this request. `http` (the default when absent) covers plain HTTP and SSE responses; `websocket` indicates a full-duplex message channel where each body chunk maps to one WebSocket message and the `binary` flag distinguishes text from binary frames. The SDK consumer uses this to decide whether to service the request with an HTTP client or a WebSocket client. It is the one piece of request metadata the consumer cannot reliably infer from the URL or headers alone.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transport: Option<LlmInferenceHttpRequestStartTransport>,
+    /// Absolute request URL.
+    pub url: String,
 }
 
-/// Resource contents returned by the MCP server.
+/// Acknowledgement. Returning successfully simply means the SDK accepted the start frame; it does not imply the request will succeed.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LlmInferenceHttpRequestStartResult {}
+
+/// Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.
 ///
 /// <div class="warning">
 ///
@@ -6287,12 +6746,15 @@ pub struct McpAppsResourceContent {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsReadResourceResult {
-    /// Resource contents returned by the server
-    pub contents: Vec<McpAppsResourceContent>,
+pub struct LlmInferenceHttpResponseChunkError {
+    /// Optional machine-readable error code.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub code: Option<String>,
+    /// Human-readable failure description.
+    pub message: String,
 }
 
-/// Host context advertised to MCP App guests
+/// A response body chunk or terminal error.
 ///
 /// <div class="warning">
 ///
@@ -6302,31 +6764,23 @@ pub struct McpAppsReadResourceResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsSetHostContextDetails {
-    /// Display modes the host supports
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub available_display_modes: Option<Vec<McpAppsSetHostContextDetailsAvailableDisplayMode>>,
-    /// Current display mode (SEP-1865)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_mode: Option<McpAppsSetHostContextDetailsDisplayMode>,
-    /// BCP-47 locale, e.g. 'en-US'
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub locale: Option<String>,
-    /// Platform type for responsive design
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub platform: Option<McpAppsSetHostContextDetailsPlatform>,
-    /// UI theme preference per SEP-1865
+pub struct LlmInferenceHttpResponseChunkRequest {
+    /// When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub theme: Option<McpAppsSetHostContextDetailsTheme>,
-    /// IANA timezone, e.g. 'America/New_York'
+    pub binary: Option<bool>,
+    /// Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty (e.g. when the response body is empty: send a single chunk with empty data and end=true).
+    pub data: String,
+    /// When true, this is the final body chunk for the response. The runtime treats the response body as complete after receiving an end-marked chunk.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub time_zone: Option<String>,
-    /// Host application identifier
+    pub end: Option<bool>,
+    /// Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub user_agent: Option<String>,
+    pub error: Option<LlmInferenceHttpResponseChunkError>,
+    /// Matches the requestId from the originating httpRequestStart frame.
+    pub request_id: RequestId,
 }
 
-/// Host context to advertise to MCP App guests.
+/// Whether the chunk was accepted.
 ///
 /// <div class="warning">
 ///
@@ -6336,12 +6790,12 @@ pub struct McpAppsSetHostContextDetails {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpAppsSetHostContextRequest {
-    /// Host context advertised to MCP App guests
-    pub context: McpAppsSetHostContextDetails,
+pub struct LlmInferenceHttpResponseChunkResult {
+    /// True when the chunk was matched to a pending request; false when unknown.
+    pub accepted: bool,
 }
 
-/// The requestId previously passed to executeSampling that should be cancelled.
+/// Response head.
 ///
 /// <div class="warning">
 ///
@@ -6351,12 +6805,19 @@ pub struct McpAppsSetHostContextRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpCancelSamplingExecutionParams {
-    /// The requestId previously passed to executeSampling that should be cancelled
+pub struct LlmInferenceHttpResponseStartRequest {
+    /// HTTP response headers, preserving multiple values per name.
+    pub headers: HashMap<String, Vec<String>>,
+    /// Matches the requestId from the originating httpRequestStart frame.
     pub request_id: RequestId,
+    /// HTTP status code.
+    pub status: i64,
+    /// Optional HTTP status reason phrase.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_text: Option<String>,
 }
 
-/// Indicates whether an in-flight sampling execution with the given requestId was found and cancelled.
+/// Whether the start frame was accepted.
 ///
 /// <div class="warning">
 ///
@@ -6366,12 +6827,12 @@ pub struct McpCancelSamplingExecutionParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpCancelSamplingExecutionResult {
-    /// True if an in-flight execution with the given requestId was found and signalled to cancel. False when no such execution is in flight (already completed, never started, or cancelled by another caller).
-    pub cancelled: bool,
+pub struct LlmInferenceHttpResponseStartResult {
+    /// True when the response start was matched to a pending request; false when unknown.
+    pub accepted: bool,
 }
 
-/// MCP server name and configuration to add to user configuration.
+/// Indicates whether the calling client was registered as the LLM inference provider.
 ///
 /// <div class="warning">
 ///
@@ -6381,14 +6842,12 @@ pub struct McpCancelSamplingExecutionResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpConfigAddRequest {
-    /// MCP server configuration (stdio process or remote HTTP/SSE)
-    pub config: serde_json::Value,
-    /// Unique name for the MCP server
-    pub name: String,
+pub struct LlmInferenceSetProviderResult {
+    /// Whether the provider was set successfully
+    pub success: bool,
 }
 
-/// MCP server names to disable for new sessions.
+/// Pre-resolved working-directory context for session startup.
 ///
 /// <div class="warning">
 ///
@@ -6398,12 +6857,24 @@ pub struct McpConfigAddRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpConfigDisableRequest {
-    /// Names of MCP servers to disable. Each server is added to the persisted disabled list so new sessions skip it. Already-disabled names are ignored. Active sessions keep their current connections until they end.
-    pub names: Vec<String>,
+pub struct SessionContext {
+    /// Active git branch
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// Most recent working directory for this session
+    pub cwd: String,
+    /// Git repository root, if the cwd was inside a git repo
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Repository host type
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<SessionContextHostType>,
+    /// Repository slug in `owner/name` form, when known
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
 }
 
-/// MCP server names to enable for new sessions.
+/// Persisted local session metadata, including identifiers, timestamps, summary/name, client, context, detached state, and task ID.
 ///
 /// <div class="warning">
 ///
@@ -6413,14 +6884,38 @@ pub struct McpConfigDisableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpConfigEnableRequest {
-    /// Names of MCP servers to enable. Each server is removed from the persisted disabled list so new sessions spawn it. Unknown or already-enabled names are ignored.
-    pub names: Vec<String>,
-}
-
-/// User-configured MCP servers, keyed by server name.
-///
-/// <div class="warning">
+pub struct LocalSessionMetadataValue {
+    /// Runtime client name that created/last resumed this session
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Pre-resolved working-directory context for session startup.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context: Option<SessionContext>,
+    /// True for detached maintenance sessions that should be hidden from normal resume lists.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_detached: Option<bool>,
+    /// Always false for local sessions.
+    pub is_remote: bool,
+    /// GitHub task ID, when this local session is bound to one. Only present for local sessions exported to remote control.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mc_task_id: Option<String>,
+    /// Last-modified time of the session's persisted state, as ISO 8601
+    pub modified_time: String,
+    /// Optional human-friendly name set via /rename
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Stable session identifier
+    pub session_id: SessionId,
+    /// Session creation time as an ISO 8601 timestamp
+    pub start_time: String,
+    /// Short summary of the session, when one has been derived
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary: Option<String>,
+}
+
+/// Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.
+///
+/// <div class="warning">
 ///
 /// **Experimental.** This type is part of an experimental wire-protocol surface
 /// and may change or be removed in future SDK or CLI releases.
@@ -6428,12 +6923,27 @@ pub struct McpConfigEnableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpConfigList {
-    /// All MCP servers from user config, keyed by name
-    pub servers: HashMap<String, serde_json::Value>,
+pub struct LogRequest {
+    /// When true, the message is transient and not persisted to the session event log on disk
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ephemeral: Option<bool>,
+    /// Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub level: Option<SessionLogLevel>,
+    /// Human-readable message
+    pub message: String,
+    /// Optional actionable tip displayed alongside the message. Only honored on `level: "info"`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tip: Option<String>,
+    /// Domain category for this log entry (e.g., "mcp", "subscription", "policy", "model"). Maps to `infoType`/`warningType`/`errorType` on the emitted event. Defaults to "notification".
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#type: Option<String>,
+    /// Optional URL the user can open in their browser for more details
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub url: Option<String>,
 }
 
-/// MCP server name to remove from user configuration.
+/// Identifier of the session event that was emitted for the log message.
 ///
 /// <div class="warning">
 ///
@@ -6443,12 +6953,12 @@ pub struct McpConfigList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpConfigRemoveRequest {
-    /// Name of the MCP server to remove
-    pub name: String,
+pub struct LogResult {
+    /// The unique identifier of the emitted session event
+    pub event_id: String,
 }
 
-/// MCP server name and replacement configuration to write to user configuration.
+/// Parameters for (re)loading the merged LSP configuration set.
 ///
 /// <div class="warning">
 ///
@@ -6458,14 +6968,19 @@ pub struct McpConfigRemoveRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpConfigUpdateRequest {
-    /// MCP server configuration (stdio process or remote HTTP/SSE)
-    pub config: serde_json::Value,
-    /// Name of the MCP server to update
-    pub name: String,
+pub struct LspInitializeRequest {
+    /// Force re-initialization even when LSP configs were already loaded for the working directory.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub force: Option<bool>,
+    /// Git root used as the boundary when traversing for project-level LSP configs (supports monorepos).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Working directory used to load project-level LSP configs. Defaults to the session working directory when omitted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub working_directory: Option<String>,
 }
 
-/// Opaque auth info used to configure GitHub MCP.
+/// Validated device-managed settings discovered before a session exists.
 ///
 /// <div class="warning">
 ///
@@ -6475,13 +6990,16 @@ pub struct McpConfigUpdateRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct McpConfigureGitHubRequest {
-    /// Opaque runtime auth info for GitHub MCP configuration. Marked internal: an in-process runtime shape (configureGitHubMcp is a no-op over the wire).
-    #[doc(hidden)]
-    pub(crate) auth_info: serde_json::Value,
+pub struct ManagedSettingsReadResult {
+    /// Discovery or validation error text when managed settings could not be read safely.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error_message: Option<String>,
+    /// Validated, canonical managed-settings JSON. Omitted when no managed settings were discovered or when discovered settings failed validation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub settings_json: Option<serde_json::Value>,
 }
 
-/// Result of configuring GitHub MCP.
+/// Result of registering a new marketplace.
 ///
 /// <div class="warning">
 ///
@@ -6491,12 +7009,12 @@ pub(crate) struct McpConfigureGitHubRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpConfigureGitHubResult {
-    /// Whether GitHub MCP configuration changed.
-    pub changed: bool,
+pub struct MarketplaceAddResult {
+    /// Final name of the marketplace as resolved from its manifest
+    pub name: String,
 }
 
-/// Name of the MCP server to disable for the session.
+/// Plugin entry advertised by a marketplace.
 ///
 /// <div class="warning">
 ///
@@ -6506,12 +7024,15 @@ pub struct McpConfigureGitHubResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpDisableRequest {
-    /// Name of the MCP server to disable
-    pub server_name: String,
+pub struct MarketplacePluginInfo {
+    /// Short description from the marketplace catalog, when present
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Plugin name as listed in the marketplace catalog
+    pub name: String,
 }
 
-/// Optional working directory used as context for MCP server discovery.
+/// Plugins advertised by the marketplace.
 ///
 /// <div class="warning">
 ///
@@ -6521,13 +7042,12 @@ pub struct McpDisableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpDiscoverRequest {
-    /// Working directory used as context for discovery (e.g., plugin resolution)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub working_directory: Option<String>,
+pub struct MarketplaceBrowseResult {
+    /// Plugins advertised by the marketplace
+    pub plugins: Vec<MarketplacePluginInfo>,
 }
 
-/// MCP servers discovered from user, workspace, plugin, and built-in sources.
+/// Registered marketplace summary.
 ///
 /// <div class="warning">
 ///
@@ -6537,12 +7057,17 @@ pub struct McpDiscoverRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpDiscoverResult {
-    /// MCP servers discovered from all sources
-    pub servers: Vec<DiscoveredMcpServer>,
+pub struct MarketplaceInfo {
+    /// True when this is a default marketplace shipped with the runtime. Defaults are not removable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_default: Option<bool>,
+    /// Marketplace name (matches the @marketplace suffix in plugin specs)
+    pub name: String,
+    /// Human-readable description of where the marketplace data is fetched from (e.g. "GitHub: owner/repo").
+    pub source: String,
 }
 
-/// Name of the MCP server to enable for the session.
+/// All registered marketplaces, including built-in defaults.
 ///
 /// <div class="warning">
 ///
@@ -6552,12 +7077,12 @@ pub struct McpDiscoverResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpEnableRequest {
-    /// Name of the MCP server to enable
-    pub server_name: String,
+pub struct MarketplaceListResult {
+    /// Registered marketplaces
+    pub marketplaces: Vec<MarketplaceInfo>,
 }
 
-/// Raw MCP CreateMessageRequest params, as received in the `sampling.requested` event. Treated as opaque at the schema layer; the runtime converts the embedded MCP messages into the OpenAI chat-completion shape internally.
+/// Per-marketplace refresh result, including marketplace name, success flag, and optional failure error.
 ///
 /// <div class="warning">
 ///
@@ -6567,9 +7092,17 @@ pub struct McpEnableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpExecuteSamplingRequest {}
+pub struct MarketplaceRefreshEntry {
+    /// Error message (failure only)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Marketplace name that was refreshed
+    pub name: String,
+    /// Whether the refresh succeeded
+    pub success: bool,
+}
 
-/// Identifiers and raw MCP CreateMessageRequest params used to run a sampling inference.
+/// Result of refreshing one or more marketplace catalogs.
 ///
 /// <div class="warning">
 ///
@@ -6579,18 +7112,12 @@ pub struct McpExecuteSamplingRequest {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpExecuteSamplingParams {
-    /// The original MCP JSON-RPC request ID (string or number). Used by the runtime to correlate the inference with the originating MCP request for telemetry; this is distinct from `requestId` (which is the schema-level cancellation handle).
-    pub mcp_request_id: serde_json::Value,
-    /// Raw MCP CreateMessageRequest params, as received in the `sampling.requested` event. Treated as opaque at the schema layer; the runtime converts the embedded MCP messages into the OpenAI chat-completion shape internally.
-    pub request: McpExecuteSamplingRequest,
-    /// Caller-provided unique identifier for this sampling execution. Use this same ID with cancelSamplingExecution to cancel the in-flight call. Must be unique within the session for the lifetime of the call.
-    pub request_id: RequestId,
-    /// Name of the MCP server that initiated the sampling request
-    pub server_name: String,
+pub struct MarketplaceRefreshResult {
+    /// Per-marketplace refresh results in deterministic order.
+    pub results: Vec<MarketplaceRefreshEntry>,
 }
 
-/// MCP server filtered by policy, with name, reason, and optional redacted reason.
+/// Outcome of the remove attempt, including dependent-plugin info when applicable.
 ///
 /// <div class="warning">
 ///
@@ -6600,36 +7127,15 @@ pub struct McpExecuteSamplingParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpFilteredServer {
-    /// Deprecated. This field is no longer populated.
-    #[doc(hidden)]
-    #[deprecated]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enterprise_name: Option<String>,
-    /// Filtered server name
-    pub name: String,
-    /// Human-readable filter reason
-    pub reason: String,
-    /// PII-free filter reason
+pub struct MarketplaceRemoveResult {
+    /// Names of installed plugins that prevented removal. Populated only when `removed=false`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub redacted_reason: Option<String>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct McpHeadersHandlePendingHeadersRefreshRequestHeaders {
-    /// Headers to overlay onto the MCP request. Dynamic headers override static config headers but do not replace SDK-managed request headers.
-    pub headers: HashMap<String, String>,
-    pub kind: McpHeadersHandlePendingHeadersRefreshRequestHeadersKind,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct McpHeadersHandlePendingHeadersRefreshRequestNone {
-    pub kind: McpHeadersHandlePendingHeadersRefreshRequestNoneKind,
+    pub dependent_plugins: Option<Vec<String>>,
+    /// True when the marketplace was actually removed. False when removal was skipped because the marketplace has dependent plugins and `force` was not set.
+    pub removed: bool,
 }
 
-/// MCP headers refresh request id and the host response.
+/// MCP server allowed by policy, with server name and optional PII-free explanatory note.
 ///
 /// <div class="warning">
 ///
@@ -6637,16 +7143,17 @@ pub struct McpHeadersHandlePendingHeadersRefreshRequestNone {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpHeadersHandlePendingHeadersRefreshRequestRequest {
-    /// Headers refresh request identifier from mcp.headers_refresh_required
-    pub request_id: RequestId,
-    /// Host response: supply dynamic headers or decline this refresh.
-    pub result: McpHeadersHandlePendingHeadersRefreshRequest,
+pub struct McpAllowedServer {
+    /// Allowed server name
+    pub name: String,
+    /// PII-free note explaining why the server was allowed
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub redacted_note: Option<String>,
 }
 
-/// Indicates whether the pending MCP headers refresh response was accepted.
+/// MCP server, tool name, and arguments to invoke from an MCP App view.
 ///
 /// <div class="warning">
 ///
@@ -6656,12 +7163,19 @@ pub struct McpHeadersHandlePendingHeadersRefreshRequestRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpHeadersHandlePendingHeadersRefreshRequestResult {
-    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
-    pub success: bool,
+pub struct McpAppsCallToolRequest {
+    /// Tool arguments
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub arguments: Option<HashMap<String, serde_json::Value>>,
+    /// **Required.** Server whose ui:// view issued the request. Per SEP-1865 ('callable by the app from this server only'), the call is rejected when this differs from `serverName`, and rejected outright when missing.
+    pub origin_server_name: String,
+    /// MCP server hosting the tool
+    pub server_name: String,
+    /// MCP tool name
+    pub tool_name: String,
 }
 
-/// Recorded MCP server connection failure.
+/// Capability negotiation snapshot
 ///
 /// <div class="warning">
 ///
@@ -6671,14 +7185,16 @@ pub struct McpHeadersHandlePendingHeadersRefreshRequestResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpServerFailureInfo {
-    /// Failure message produced when the MCP server connection failed.
-    pub message: String,
-    /// epoch-ms timestamp at which the failure was recorded.
-    pub timestamp: i64,
+pub struct McpAppsDiagnoseCapability {
+    /// Whether the runtime advertises `extensions.io.modelcontextprotocol/ui` to MCP servers
+    pub advertised: bool,
+    /// Whether the MCP_APPS feature flag (or COPILOT_MCP_APPS env override) is on
+    pub feature_flag_enabled: bool,
+    /// Whether the session has the `mcp-apps` capability
+    pub session_has_mcp_apps: bool,
 }
 
-/// Recorded MCP server pending-auth state.
+/// MCP server to diagnose MCP Apps wiring for.
 ///
 /// <div class="warning">
 ///
@@ -6688,12 +7204,12 @@ pub struct McpServerFailureInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpServerNeedsAuthInfo {
-    /// epoch-ms timestamp at which the server signalled it needs authentication.
-    pub timestamp: i64,
+pub struct McpAppsDiagnoseRequest {
+    /// MCP server to probe
+    pub server_name: String,
 }
 
-/// Host-level state, omitted when no MCP host is initialized.
+/// What the server returned for this session
 ///
 /// <div class="warning">
 ///
@@ -6703,24 +7219,18 @@ pub struct McpServerNeedsAuthInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpHostState {
-    /// Names of currently-connected MCP clients.
-    pub clients: Vec<String>,
-    /// Configured servers that are explicitly disabled.
-    pub disabled_servers: Vec<String>,
-    /// Map of server name to recorded connection failure.
-    pub failed_servers: HashMap<String, McpServerFailureInfo>,
-    /// Configured servers filtered out by MCP server policy.
-    pub filtered_servers: Vec<String>,
-    /// Whether third-party MCP servers are policy-enabled for this session.
-    pub mcp3p_enabled: bool,
-    /// Map of server name to recorded pending-auth state.
-    pub needs_auth_servers: HashMap<String, McpServerNeedsAuthInfo>,
-    /// Names of servers with in-flight connection attempts.
-    pub pending_connections: Vec<String>,
+pub struct McpAppsDiagnoseServer {
+    /// Whether the named server is currently connected
+    pub connected: bool,
+    /// Up to 5 tool names with `_meta.ui` for quick inspection
+    pub sample_tool_names: Vec<String>,
+    /// Total tools returned by the server's tools/list
+    pub tool_count: f64,
+    /// Tools whose `_meta.ui` is populated (resourceUri and/or visibility set)
+    pub tools_with_ui_meta: f64,
 }
 
-/// Server name to check running status for.
+/// Diagnostic snapshot of MCP Apps wiring for the named server.
 ///
 /// <div class="warning">
 ///
@@ -6730,12 +7240,14 @@ pub struct McpHostState {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpIsServerRunningRequest {
-    /// Name of the MCP server to check
-    pub server_name: String,
+pub struct McpAppsDiagnoseResult {
+    /// Capability negotiation snapshot
+    pub capability: McpAppsDiagnoseCapability,
+    /// What the server returned for this session
+    pub server: McpAppsDiagnoseServer,
 }
 
-/// Whether the named MCP server is running.
+/// Current host context
 ///
 /// <div class="warning">
 ///
@@ -6745,12 +7257,31 @@ pub struct McpIsServerRunningRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpIsServerRunningResult {
-    /// True if the server has an active client and transport.
-    pub running: bool,
+pub struct McpAppsHostContextDetails {
+    /// Display modes the host supports
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub available_display_modes: Option<Vec<McpAppsHostContextDetailsAvailableDisplayMode>>,
+    /// Current display mode (SEP-1865)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_mode: Option<McpAppsHostContextDetailsDisplayMode>,
+    /// BCP-47 locale, e.g. 'en-US'
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub locale: Option<String>,
+    /// Platform type for responsive design
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub platform: Option<McpAppsHostContextDetailsPlatform>,
+    /// UI theme preference per SEP-1865
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub theme: Option<McpAppsHostContextDetailsTheme>,
+    /// IANA timezone, e.g. 'America/New_York'
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub time_zone: Option<String>,
+    /// Host application identifier
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub user_agent: Option<String>,
 }
 
-/// Server name whose tool list should be returned.
+/// Current host context advertised to MCP App guests.
 ///
 /// <div class="warning">
 ///
@@ -6760,12 +7291,12 @@ pub struct McpIsServerRunningResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpListToolsRequest {
-    /// Name of the connected MCP server whose tools to list.
-    pub server_name: String,
+pub struct McpAppsHostContext {
+    /// Current host context
+    pub context: McpAppsHostContextDetails,
 }
 
-/// Normalized MCP Apps discovery metadata from a tool's `_meta.ui` block.
+/// MCP server to list app-callable tools for.
 ///
 /// <div class="warning">
 ///
@@ -6775,16 +7306,14 @@ pub struct McpListToolsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpToolUi {
-    /// URI of the tool's MCP App resource, typically a `ui://` resource identifier. Use `session.mcp.resources.read` to fetch its HTML and resource metadata.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub resource_uri: Option<String>,
-    /// Tool visibility advertised by the server. When absent, MCP Apps defaults apply.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub visibility: Option<Vec<McpToolUiVisibility>>,
+pub struct McpAppsListToolsRequest {
+    /// **Required.** Server whose ui:// view issued the request. Per SEP-1865 ('callable by the app from this server only'), the call is rejected when this differs from `serverName`, and rejected outright when missing.
+    pub origin_server_name: String,
+    /// MCP server hosting the app
+    pub server_name: String,
 }
 
-/// MCP tool metadata with tool name, optional description, and normalized MCP Apps discovery metadata.
+/// App-callable tools from the named MCP server.
 ///
 /// <div class="warning">
 ///
@@ -6794,18 +7323,12 @@ pub struct McpToolUi {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpTools {
-    /// Tool description, when provided.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Tool name.
-    pub name: String,
-    /// Normalized MCP Apps discovery metadata. An empty object indicates that a valid `_meta.ui` block was present without recognized fields.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ui: Option<McpToolUi>,
+pub struct McpAppsListToolsResult {
+    /// App-callable tools from the server
+    pub tools: Vec<HashMap<String, serde_json::Value>>,
 }
 
-/// Tools exposed by the connected MCP server. Throws when the server is not connected.
+/// MCP server and resource URI to fetch.
 ///
 /// <div class="warning">
 ///
@@ -6815,12 +7338,14 @@ pub struct McpTools {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpListToolsResult {
-    /// Tools exposed by the server.
-    pub tools: Vec<McpTools>,
+pub struct McpAppsReadResourceRequest {
+    /// Name of the MCP server hosting the resource
+    pub server_name: String,
+    /// Resource URI (typically ui://...)
+    pub uri: String,
 }
 
-/// Identifies the MCP server whose persisted OAuth credentials were updated.
+/// MCP Apps resource content with URI, optional MIME type, text or base64 blob, and resource metadata.
 ///
 /// <div class="warning">
 ///
@@ -6830,53 +7355,24 @@ pub struct McpListToolsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpOauthAuthenticationStateChangedRequest {
-    /// Whether the target session must mint a session-scoped access token instead of reusing a shared access token persisted by another session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub refresh_session_token: Option<bool>,
-    /// Name of the MCP server whose OAuth credentials were updated. Omit only when the host cannot identify the server.
+pub struct McpAppsResourceContent {
+    /// Resource-level metadata (CSP, permissions, etc.)
+    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
+    pub meta: Option<HashMap<String, serde_json::Value>>,
+    /// Base64-encoded binary content
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub server_name: Option<String>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct McpOauthPendingRequestResponseToken {
-    /// Access token acquired by the SDK host
-    pub access_token: String,
-    /// Token lifetime in seconds, if known.
+    pub blob: Option<String>,
+    /// MIME type of the content
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub expires_in: Option<i64>,
-    pub kind: McpOauthPendingRequestResponseTokenKind,
-    /// OAuth token type. Defaults to Bearer when omitted.
+    pub mime_type: Option<String>,
+    /// Text content (e.g. HTML)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub token_type: Option<String>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct McpOauthPendingRequestResponseCancelled {
-    pub kind: McpOauthPendingRequestResponseCancelledKind,
-}
-
-/// Pending MCP OAuth request ID and host-provided token or cancellation response.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct McpOauthHandlePendingRequest {
-    /// OAuth request identifier from the mcp.oauth_required event
-    pub request_id: RequestId,
-    /// Host response to the pending OAuth request.
-    pub result: McpOauthPendingRequestResponse,
+    pub text: Option<String>,
+    /// The resource URI (typically ui://...)
+    pub uri: String,
 }
 
-/// Indicates whether the pending MCP OAuth response was accepted.
+/// Resource contents returned by the MCP server.
 ///
 /// <div class="warning">
 ///
@@ -6886,12 +7382,12 @@ pub struct McpOauthHandlePendingRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpOauthHandlePendingResult {
-    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
-    pub success: bool,
+pub struct McpAppsReadResourceResult {
+    /// Resource contents returned by the server
+    pub contents: Vec<McpAppsResourceContent>,
 }
 
-/// Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback success-page copy, and static OAuth client selection.
+/// Host context advertised to MCP App guests
 ///
 /// <div class="warning">
 ///
@@ -6901,33 +7397,31 @@ pub struct McpOauthHandlePendingResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpOauthLoginRequest {
-    /// Optional override for the body text shown on the OAuth loopback callback success page. When omitted, the runtime applies a neutral fallback; callers driving interactive auth should pass surface-specific copy telling the user where to return.
+pub struct McpAppsSetHostContextDetails {
+    /// Display modes the host supports
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub callback_success_message: Option<String>,
-    /// Optional OAuth client ID override for this login. When set, the runtime uses this pre-registered static client instead of dynamic client registration.
+    pub available_display_modes: Option<Vec<McpAppsSetHostContextDetailsAvailableDisplayMode>>,
+    /// Current display mode (SEP-1865)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_id: Option<String>,
-    /// Optional override for the OAuth client display name shown on the consent screen. Applies to newly registered dynamic clients only — existing registrations keep the name they were created with. When omitted, the runtime applies a neutral fallback; callers driving interactive auth should pass their own surface-specific label so the consent screen matches the product the user sees.
+    pub display_mode: Option<McpAppsSetHostContextDetailsDisplayMode>,
+    /// BCP-47 locale, e.g. 'en-US'
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    /// Optional OAuth client secret override for this login. The runtime treats this as an ephemeral host-owned secret, uses it for this authentication attempt and does not persist it.
+    pub locale: Option<String>,
+    /// Platform type for responsive design
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_secret: Option<String>,
-    /// When true, clears any cached OAuth token for the server and runs a full new authorization. Use when the user explicitly wants to switch accounts or believes their session is stuck.
+    pub platform: Option<McpAppsSetHostContextDetailsPlatform>,
+    /// UI theme preference per SEP-1865
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub force_reauth: Option<bool>,
-    /// Optional OAuth grant type override for this login. Defaults to the server configuration, or authorization_code when no grant type is specified.
+    pub theme: Option<McpAppsSetHostContextDetailsTheme>,
+    /// IANA timezone, e.g. 'America/New_York'
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub grant_type: Option<McpOauthLoginGrantType>,
-    /// Optional override indicating whether the static OAuth client is public. When false, the runtime treats it as confidential and uses the per-login clientSecret if provided, otherwise retrieving the client secret from the MCP OAuth secret store.
+    pub time_zone: Option<String>,
+    /// Host application identifier
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub public_client: Option<bool>,
-    /// Name of the remote MCP server to authenticate
-    pub server_name: String,
+    pub user_agent: Option<String>,
 }
 
-/// OAuth authorization URL the caller should open, or empty when cached tokens already authenticated the server.
+/// Host context to advertise to MCP App guests.
 ///
 /// <div class="warning">
 ///
@@ -6937,13 +7431,12 @@ pub struct McpOauthLoginRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpOauthLoginResult {
-    /// URL the caller should open in a browser to complete OAuth. Omitted when cached tokens were still valid and no browser interaction was needed — the server is already reconnected in that case. When present, the runtime starts the callback listener before returning and continues the flow in the background; completion is signaled via session.mcp_server_status_changed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub authorization_url: Option<String>,
+pub struct McpAppsSetHostContextRequest {
+    /// Host context advertised to MCP App guests
+    pub context: McpAppsSetHostContextDetails,
 }
 
-/// Pending MCP OAuth request id to respond to.
+/// The requestId previously passed to executeSampling that should be cancelled.
 ///
 /// <div class="warning">
 ///
@@ -6953,12 +7446,12 @@ pub struct McpOauthLoginResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpOauthRespondRequest {
-    /// OAuth request identifier from the mcp.oauth_required event
+pub struct McpCancelSamplingExecutionParams {
+    /// The requestId previously passed to executeSampling that should be cancelled
     pub request_id: RequestId,
 }
 
-/// Indicates whether the pending MCP OAuth response was accepted.
+/// Indicates whether an in-flight sampling execution with the given requestId was found and cancelled.
 ///
 /// <div class="warning">
 ///
@@ -6968,12 +7461,12 @@ pub struct McpOauthRespondRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpOauthRespondResult {
-    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
-    pub success: bool,
+pub struct McpCancelSamplingExecutionResult {
+    /// True if an in-flight execution with the given requestId was found and signalled to cancel. False when no such execution is in flight (already completed, never started, or cancelled by another caller).
+    pub cancelled: bool,
 }
 
-/// Registration parameters for an external MCP client.
+/// MCP server name and configuration to add to user configuration.
 ///
 /// <div class="warning">
 ///
@@ -6983,21 +7476,14 @@ pub struct McpOauthRespondResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct McpRegisterExternalClientRequest {
-    /// In-process MCP Client instance. Marked internal: cannot be serialized across the JSON-RPC boundary.
-    #[doc(hidden)]
-    pub(crate) client: serde_json::Value,
-    /// In-process server config (MCPServerConfig) paired with the in-process client/transport. Marked internal alongside its companions.
-    #[doc(hidden)]
-    pub(crate) config: serde_json::Value,
-    /// Logical server name for the external client
-    pub server_name: String,
-    /// In-process MCP Transport instance. Marked internal: cannot be serialized across the JSON-RPC boundary.
-    #[doc(hidden)]
-    pub(crate) transport: serde_json::Value,
+pub struct McpConfigAddRequest {
+    /// MCP server configuration (stdio process or remote HTTP/SSE)
+    pub config: serde_json::Value,
+    /// Unique name for the MCP server
+    pub name: String,
 }
 
-/// Opaque MCP reload configuration.
+/// MCP server names to disable for new sessions.
 ///
 /// <div class="warning">
 ///
@@ -7007,13 +7493,12 @@ pub(crate) struct McpRegisterExternalClientRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct McpReloadWithConfigRequest {
-    /// Opaque runtime MCP reload configuration. Marked internal: an in-process runtime shape (reloadMcpServers throws over the wire).
-    #[doc(hidden)]
-    pub(crate) config: serde_json::Value,
+pub struct McpConfigDisableRequest {
+    /// Names of MCP servers to disable. Each server is added to the persisted disabled list so new sessions skip it. Already-disabled names are ignored. Active sessions keep their current connections until they end.
+    pub names: Vec<String>,
 }
 
-/// Indicates whether the auto-managed `github` MCP server was removed (false when nothing to remove).
+/// MCP server names to enable for new sessions.
 ///
 /// <div class="warning">
 ///
@@ -7023,12 +7508,12 @@ pub(crate) struct McpReloadWithConfigRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpRemoveGitHubResult {
-    /// True when the auto-managed `github` MCP server was removed; false when no removal happened (e.g. user has explicitly configured a `github` server, or the server was not registered).
-    pub removed: bool,
+pub struct McpConfigEnableRequest {
+    /// Names of MCP servers to enable. Each server is removed from the persisted disabled list so new sessions spawn it. Unknown or already-enabled names are ignored.
+    pub names: Vec<String>,
 }
 
-/// Standard MCP resource annotations plus preserved non-standard annotation fields.
+/// User-configured MCP servers, keyed by server name.
 ///
 /// <div class="warning">
 ///
@@ -7038,22 +7523,12 @@ pub struct McpRemoveGitHubResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourceAnnotations {
-    /// Server-provided non-standard annotation fields preserved from the MCP response
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_properties: Option<HashMap<String, serde_json::Value>>,
-    /// Intended audience roles for this resource
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub audience: Option<Vec<String>>,
-    /// Last-modified timestamp hint
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub last_modified: Option<String>,
-    /// Priority hint for model/client use
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub priority: Option<f64>,
+pub struct McpConfigList {
+    /// All MCP servers from user config, keyed by name
+    pub servers: HashMap<String, serde_json::Value>,
 }
 
-/// A resource icon descriptor plus preserved non-standard icon fields.
+/// MCP server name to remove from user configuration.
 ///
 /// <div class="warning">
 ///
@@ -7063,24 +7538,12 @@ pub struct McpResourceAnnotations {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourceIcon {
-    /// Server-provided non-standard icon fields preserved from the MCP response
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_properties: Option<HashMap<String, serde_json::Value>>,
-    /// Icon MIME type, when known
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    /// Icon sizes hint
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sizes: Option<String>,
-    /// Icon URI
-    pub src: String,
-    /// Theme hint for this icon
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub theme: Option<String>,
+pub struct McpConfigRemoveRequest {
+    /// Name of the MCP server to remove
+    pub name: String,
 }
 
-/// An MCP resource descriptor (spec `Resource`): URI, name, and optional title, description, MIME type, size, icons, annotations, and metadata. Server-provided fields outside the standard descriptor shape are exposed under `additionalProperties`.
+/// MCP server name and replacement configuration to write to user configuration.
 ///
 /// <div class="warning">
 ///
@@ -7090,38 +7553,14 @@ pub struct McpResourceIcon {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResource {
-    /// Resource-level metadata
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-    /// Server-provided non-standard descriptor fields preserved from the MCP response
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_properties: Option<HashMap<String, serde_json::Value>>,
-    /// Model/client annotations associated with this resource
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub annotations: Option<McpResourceAnnotations>,
-    /// Optional description of what this resource represents
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Icons associated with this resource
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub icons: Option<Vec<McpResourceIcon>>,
-    /// MIME type of the resource, if known
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    /// The programmatic name of the resource
+pub struct McpConfigUpdateRequest {
+    /// MCP server configuration (stdio process or remote HTTP/SSE)
+    pub config: serde_json::Value,
+    /// Name of the MCP server to update
     pub name: String,
-    /// Resource size in bytes, when known
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub size: Option<i64>,
-    /// Optional human-readable display title
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// The resource URI (e.g. ui://... or file:///...)
-    pub uri: String,
 }
 
-/// MCP resource content with URI, optional MIME type, text or base64 blob, and resource metadata.
+/// Credential-free authentication identity used to configure GitHub MCP.
 ///
 /// <div class="warning">
 ///
@@ -7131,24 +7570,13 @@ pub struct McpResource {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourceContent {
-    /// Resource-level metadata (CSP, permissions, etc.)
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-    /// Base64-encoded binary content
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub blob: Option<String>,
-    /// MIME type of the content
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    /// Text content (e.g. HTML)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub text: Option<String>,
-    /// The resource URI
-    pub uri: String,
+pub(crate) struct McpConfigureGitHubRequest {
+    /// Opaque runtime auth info for GitHub MCP configuration. Marked internal: an in-process runtime shape (configureGitHubMcp is a no-op over the wire).
+    #[doc(hidden)]
+    pub(crate) auth_info: serde_json::Value,
 }
 
-/// MCP server whose resources to enumerate.
+/// Result of configuring GitHub MCP.
 ///
 /// <div class="warning">
 ///
@@ -7158,15 +7586,12 @@ pub struct McpResourceContent {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourcesListRequest {
-    /// Opaque MCP pagination cursor from a prior `nextCursor` value
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cursor: Option<String>,
-    /// Name of the MCP server whose resources to enumerate
-    pub server_name: String,
+pub struct McpConfigureGitHubResult {
+    /// Whether GitHub MCP configuration changed.
+    pub changed: bool,
 }
 
-/// One page of resources advertised by the named MCP server.
+/// Name of the MCP server to disable for the session.
 ///
 /// <div class="warning">
 ///
@@ -7176,15 +7601,12 @@ pub struct McpResourcesListRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourcesListResult {
-    /// Opaque cursor for the next page, if the server has more resources
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub next_cursor: Option<String>,
-    /// Resources advertised by the server (proxied MCP `resources/list`)
-    pub resources: Vec<McpResource>,
+pub struct McpDisableRequest {
+    /// Name of the MCP server to disable
+    pub server_name: String,
 }
 
-/// MCP server whose resource templates to enumerate.
+/// Optional working directory used as context for MCP server discovery.
 ///
 /// <div class="warning">
 ///
@@ -7194,15 +7616,13 @@ pub struct McpResourcesListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourcesListTemplatesRequest {
-    /// Opaque MCP pagination cursor from a prior `nextCursor` value
+pub struct McpDiscoverRequest {
+    /// Working directory used as context for discovery (e.g., plugin resolution)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cursor: Option<String>,
-    /// Name of the MCP server whose resource templates to enumerate
-    pub server_name: String,
+    pub working_directory: Option<String>,
 }
 
-/// An MCP resource template descriptor (spec `ResourceTemplate`): an RFC 6570 URI template, name, and optional title, description, MIME type, icons, annotations, and metadata. Server-provided fields outside the standard descriptor shape are exposed under `additionalProperties`.
+/// MCP servers discovered from user, workspace, plugin, and built-in sources.
 ///
 /// <div class="warning">
 ///
@@ -7212,35 +7632,12 @@ pub struct McpResourcesListTemplatesRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourceTemplate {
-    /// Resource-template-level metadata
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-    /// Server-provided non-standard descriptor fields preserved from the MCP response
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_properties: Option<HashMap<String, serde_json::Value>>,
-    /// Model/client annotations associated with this template
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub annotations: Option<McpResourceAnnotations>,
-    /// Optional description of what this template is for
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Icons associated with resources matching this template
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub icons: Option<Vec<McpResourceIcon>>,
-    /// MIME type for resources matching this template, if uniform
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    /// The programmatic name of the resource template
-    pub name: String,
-    /// Optional human-readable display title
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// An RFC 6570 URI template for constructing resource URIs
-    pub uri_template: String,
+pub struct McpDiscoverResult {
+    /// MCP servers discovered from all sources
+    pub servers: Vec<DiscoveredMcpServer>,
 }
 
-/// One page of resource templates advertised by the named MCP server.
+/// Name of the MCP server to enable for the session.
 ///
 /// <div class="warning">
 ///
@@ -7250,15 +7647,12 @@ pub struct McpResourceTemplate {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourcesListTemplatesResult {
-    /// Opaque cursor for the next page, if the server has more resource templates
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub next_cursor: Option<String>,
-    /// Resource templates advertised by the server (proxied MCP `resources/templates/list`)
-    pub resource_templates: Vec<McpResourceTemplate>,
+pub struct McpEnableRequest {
+    /// Name of the MCP server to enable
+    pub server_name: String,
 }
 
-/// MCP server and resource URI to fetch.
+/// Raw MCP CreateMessageRequest params, as received in the `sampling.requested` event. Treated as opaque at the schema layer; the runtime converts the embedded MCP messages into the OpenAI chat-completion shape internally.
 ///
 /// <div class="warning">
 ///
@@ -7268,14 +7662,9 @@ pub struct McpResourcesListTemplatesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourcesReadRequest {
-    /// Name of the MCP server hosting the resource
-    pub server_name: String,
-    /// Resource URI
-    pub uri: String,
-}
+pub struct McpExecuteSamplingRequest {}
 
-/// Resource contents returned by the MCP server.
+/// Identifiers and raw MCP CreateMessageRequest params used to run a sampling inference.
 ///
 /// <div class="warning">
 ///
@@ -7285,12 +7674,18 @@ pub struct McpResourcesReadRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpResourcesReadResult {
-    /// Resource contents returned by the server
-    pub contents: Vec<McpResourceContent>,
+pub struct McpExecuteSamplingParams {
+    /// The original MCP JSON-RPC request ID (string or number). Used by the runtime to correlate the inference with the originating MCP request for telemetry; this is distinct from `requestId` (which is the schema-level cancellation handle).
+    pub mcp_request_id: serde_json::Value,
+    /// Raw MCP CreateMessageRequest params, as received in the `sampling.requested` event. Treated as opaque at the schema layer; the runtime converts the embedded MCP messages into the OpenAI chat-completion shape internally.
+    pub request: McpExecuteSamplingRequest,
+    /// Caller-provided unique identifier for this sampling execution. Use this same ID with cancelSamplingExecution to cancel the in-flight call. Must be unique within the session for the lifetime of the call.
+    pub request_id: RequestId,
+    /// Name of the MCP server that initiated the sampling request
+    pub server_name: String,
 }
 
-/// Server name and optional replacement configuration for an individual MCP server restart. Omit `config` for a config-free restart-by-name of an already-configured server.
+/// MCP server whose connection attempt failed.
 ///
 /// <div class="warning">
 ///
@@ -7300,15 +7695,15 @@ pub struct McpResourcesReadResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpRestartServerRequest {
-    /// Replacement MCP server configuration (stdio process or remote HTTP/SSE). Omit to restart the server with its already-registered configuration (config-free restart-by-name).
+pub struct McpFailedServer {
+    /// The captured connection failure detail.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub config: Option<serde_json::Value>,
-    /// Name of the MCP server to restart
-    pub server_name: String,
+    pub error: Option<String>,
+    /// The config key of the server that failed to connect.
+    pub name: String,
 }
 
-/// Outcome of an MCP sampling execution: success result, failure error, or cancellation.
+/// MCP server filtered by policy, with name, reason, and optional redacted reason.
 ///
 /// <div class="warning">
 ///
@@ -7318,18 +7713,38 @@ pub struct McpRestartServerRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpSamplingExecutionResult {
-    /// Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.
-    pub action: McpSamplingExecutionAction,
-    /// Error description, present when action='failure'.
+pub struct McpFilteredServer {
+    /// Deprecated. This field is no longer populated.
+    #[doc(hidden)]
+    #[deprecated]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.
+    pub enterprise_name: Option<String>,
+    /// Filtered server name
+    pub name: String,
+    /// Human-readable filter reason
+    pub reason: String,
+    /// PII-free filter reason
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<McpExecuteSamplingResult>,
+    pub redacted_reason: Option<String>,
 }
 
-/// MCP server status entry, including config source/plugin source and any connection error.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpHeadersHandlePendingHeadersRefreshRequestHeaders {
+    /// Headers to overlay onto the MCP request. Dynamic headers override static config headers but do not replace SDK-managed request headers.
+    pub headers: HashMap<String, String>,
+    /// Headers-refresh response variant discriminator.
+    pub kind: McpHeadersHandlePendingHeadersRefreshRequestHeadersKind,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpHeadersHandlePendingHeadersRefreshRequestNone {
+    /// Headers-refresh response variant discriminator.
+    pub kind: McpHeadersHandlePendingHeadersRefreshRequestNoneKind,
+}
+
+/// MCP headers refresh request id and the host response.
 ///
 /// <div class="warning">
 ///
@@ -7337,28 +7752,16 @@ pub struct McpSamplingExecutionResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpServer {
-    /// Error message if the server failed to connect
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Server name (config key)
-    pub name: String,
-    /// Configuration source: user, workspace, plugin, or builtin
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source: Option<McpServerSource>,
-    /// Plugin name that provided this server, when source is plugin.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source_plugin: Option<String>,
-    /// Plugin version that provided this server, when source is plugin.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source_plugin_version: Option<String>,
-    /// Connection status: connected, failed, needs-auth, pending, disabled, stopped, or not_configured
-    pub status: McpServerStatus,
+pub struct McpHeadersHandlePendingHeadersRefreshRequestRequest {
+    /// Headers refresh request identifier from mcp.headers_refresh_required
+    pub request_id: RequestId,
+    /// Host response: supply dynamic headers or decline this refresh.
+    pub result: McpHeadersHandlePendingHeadersRefreshRequest,
 }
 
-/// Authentication settings with optional redirect port configuration.
+/// Indicates whether the pending MCP headers refresh response was accepted.
 ///
 /// <div class="warning">
 ///
@@ -7368,13 +7771,12 @@ pub struct McpServer {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpServerAuthConfigRedirectPort {
-    /// Fixed port for the OAuth redirect callback server.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub redirect_port: Option<i32>,
+pub struct McpHeadersHandlePendingHeadersRefreshRequestResult {
+    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
+    pub success: bool,
 }
 
-/// Remote MCP server configuration accessed over HTTP or SSE.
+/// Recorded MCP server connection failure.
 ///
 /// <div class="warning">
 ///
@@ -7384,51 +7786,14 @@ pub struct McpServerAuthConfigRedirectPort {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpServerConfigHttp {
-    /// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub auth: Option<serde_json::Value>,
-    /// Controls if tools provided by this server can be loaded on demand via tool search (auto) or always included in the initial tool list (never)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub defer_tools: Option<McpServerConfigDeferTools>,
-    /// Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery is unaffected.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub disable_tool_cache: Option<bool>,
-    /// Content filtering mode to apply to all tools, or a map of tool name to content filtering mode.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub filter_mapping: Option<serde_json::Value>,
-    /// HTTP headers to include in requests to the remote MCP server.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub headers: Option<HashMap<String, String>>,
-    /// Whether this server is a built-in fallback used when the user has not configured their own server.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_default_server: Option<bool>,
-    /// OAuth client ID for a pre-registered remote MCP OAuth client.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub oauth_client_id: Option<String>,
-    /// OAuth grant type to use when authenticating to the remote MCP server.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub oauth_grant_type: Option<McpServerConfigHttpOauthGrantType>,
-    /// Whether the configured OAuth client is public and does not require a client secret.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub oauth_public_client: Option<bool>,
-    /// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub oidc: Option<serde_json::Value>,
-    /// Timeout in milliseconds for tool calls to this server.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout: Option<i64>,
-    /// Tools to include. Defaults to all tools if not specified.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tools: Option<Vec<String>>,
-    /// Remote transport type. Defaults to "http" when omitted.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#type: Option<McpServerConfigHttpType>,
-    /// URL of the remote MCP server endpoint.
-    pub url: String,
+pub struct McpServerFailureInfo {
+    /// Failure message produced when the MCP server connection failed.
+    pub message: String,
+    /// epoch-ms timestamp at which the failure was recorded.
+    pub timestamp: i64,
 }
 
-/// Stdio MCP server configuration launched as a child process.
+/// Recorded MCP server pending-auth state.
 ///
 /// <div class="warning">
 ///
@@ -7438,45 +7803,12 @@ pub struct McpServerConfigHttp {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpServerConfigStdio {
-    /// Command-line arguments passed to the Stdio MCP server process.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub args: Option<Vec<String>>,
-    /// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub auth: Option<serde_json::Value>,
-    /// Executable command used to start the Stdio MCP server process.
-    pub command: String,
-    /// Working directory for the Stdio MCP server process.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    /// Controls if tools provided by this server can be loaded on demand via tool search (auto) or always included in the initial tool list (never)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub defer_tools: Option<McpServerConfigDeferTools>,
-    /// Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery is unaffected.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub disable_tool_cache: Option<bool>,
-    /// Environment variables to pass to the Stdio MCP server process.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub env: Option<HashMap<String, String>>,
-    /// Content filtering mode to apply to all tools, or a map of tool name to content filtering mode.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub filter_mapping: Option<serde_json::Value>,
-    /// Whether this server is a built-in fallback used when the user has not configured their own server.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_default_server: Option<bool>,
-    /// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub oidc: Option<serde_json::Value>,
-    /// Timeout in milliseconds for tool calls to this server.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout: Option<i64>,
-    /// Tools to include. Defaults to all tools if not specified.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tools: Option<Vec<String>>,
+pub struct McpServerNeedsAuthInfo {
+    /// epoch-ms timestamp at which the server signalled it needs authentication.
+    pub timestamp: i64,
 }
 
-/// MCP servers configured for the session, with their connection status and host-level state.
+/// Host-level state, omitted when no MCP host is initialized.
 ///
 /// <div class="warning">
 ///
@@ -7486,15 +7818,24 @@ pub struct McpServerConfigStdio {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpServerList {
-    /// Host-level state, omitted when no MCP host is initialized.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub host: Option<McpHostState>,
-    /// Configured MCP servers
-    pub servers: Vec<McpServer>,
+pub struct McpHostState {
+    /// Names of currently-connected MCP clients.
+    pub clients: Vec<String>,
+    /// Configured servers that are explicitly disabled.
+    pub disabled_servers: Vec<String>,
+    /// Map of server name to recorded connection failure.
+    pub failed_servers: HashMap<String, McpServerFailureInfo>,
+    /// Configured servers filtered out by MCP server policy.
+    pub filtered_servers: Vec<String>,
+    /// Whether third-party MCP servers are policy-enabled for this session.
+    pub mcp3p_enabled: bool,
+    /// Map of server name to recorded pending-auth state.
+    pub needs_auth_servers: HashMap<String, McpServerNeedsAuthInfo>,
+    /// Names of servers with in-flight connection attempts.
+    pub pending_connections: Vec<String>,
 }
 
-/// Mode controlling how MCP server env values are resolved (`direct` or `indirect`).
+/// One change applying the plan would make, described rather than serialised so the configuration payload stays behind the runtime boundary.
 ///
 /// <div class="warning">
 ///
@@ -7504,12 +7845,20 @@ pub struct McpServerList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpSetEnvValueModeParams {
-    /// How environment-variable values supplied to MCP servers are resolved. "direct" passes literal string values; "indirect" treats values as references (e.g. names of environment variables on the host) that the runtime resolves before launch. Defaults to the runtime's startup mode; clients that intentionally launch MCP servers with literal values (e.g. CLI prompt mode and ACP) set this to "direct".
-    pub mode: McpSetEnvValueModeDetails,
+pub struct McpPlanConfigurationChange {
+    /// Names of the configuration fields the change would set, without their values.
+    pub changed_fields: Vec<String>,
+    /// Configuration key the change applies to.
+    pub config_key: String,
+    /// Whether the change would create a new entry or modify an existing one.
+    pub operation: McpPlanConfigurationOperation,
+    /// Scope the change would be written to.
+    pub scope: McpPlanScope,
+    /// Secret placeholders the written configuration would reference. The constrained placeholder type cannot carry a literal secret value.
+    pub secret_references: Vec<String>,
 }
 
-/// Env-value mode recorded on the session after the update.
+/// Normalised identity of the MCP server a plan targets, independent of how the card spelled it.
 ///
 /// <div class="warning">
 ///
@@ -7519,12 +7868,20 @@ pub struct McpSetEnvValueModeParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpSetEnvValueModeResult {
-    /// Mode recorded on the session after the update
-    pub mode: McpSetEnvValueModeDetails,
+pub struct McpPlanResourceIdentity {
+    /// Canonical, normalised name of the server, for example `io.github.owner/server`.
+    pub canonical_name: String,
+    /// Registry identifier of the server, when it came from a registry.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub registry_id: Option<String>,
+    /// Local configuration key the server would be recorded under.
+    pub server_name: String,
+    /// Version advertised by the card, when it declares one.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub version: Option<String>,
 }
 
-/// Server name and optional configuration for an individual MCP server start. Omit `config` for a config-free start-by-name of an already-configured server.
+/// Outcome of evaluating the planned server against registry and enterprise policy. Evaluation is read-only.
 ///
 /// <div class="warning">
 ///
@@ -7534,15 +7891,17 @@ pub struct McpSetEnvValueModeResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpStartServerRequest {
-    /// MCP server configuration (stdio process or remote HTTP/SSE). Omit to start the server with its already-registered configuration (config-free start-by-name).
+pub struct McpPlanPolicyResult {
+    /// What policy decided for this server.
+    pub decision: McpPlanPolicyDecision,
+    /// Human-readable explanation, safe to surface. Never contains a query, URL, handle, or secret.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub config: Option<serde_json::Value>,
-    /// Name of the MCP server to start
-    pub server_name: String,
+    pub reason: Option<String>,
+    /// Which authority produced the decision.
+    pub source: McpPlanPolicySource,
 }
 
-/// MCP server startup filtering result.
+/// Provenance of the exact validated JSON MCP card content bound privately to a completed plan and its opaque handle.
 ///
 /// <div class="warning">
 ///
@@ -7552,15 +7911,18 @@ pub struct McpStartServerRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpStartServersResult {
-    /// Non-default servers allowed by policy
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub allowed_servers: Option<Vec<McpAllowedServer>>,
-    /// Servers filtered out before startup
-    pub filtered_servers: Vec<McpFilteredServer>,
+pub struct McpPlanProvenance {
+    /// Authority associated with the validated card, without path, query, or credentials. Inert untrusted data.
+    pub authority: String,
+    /// Semantic digest of the exact validated JSON content bound to the plan handle.
+    pub card_digest: CardDigest,
+    /// JSON MCP media type the validated card was interpreted as.
+    pub media_type: McpServerCardMediaType,
+    /// ISO 8601 timestamp at which the runtime completed strict parsing and schema validation of the card content.
+    pub validated_at: String,
 }
 
-/// Server name for an individual MCP server stop.
+/// Where a plan would be written.
 ///
 /// <div class="warning">
 ///
@@ -7570,12 +7932,14 @@ pub struct McpStartServersResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpStopServerRequest {
-    /// Name of the MCP server to stop
-    pub server_name: String,
+pub struct McpPlanTarget {
+    /// Configuration key the server would be recorded under within that scope.
+    pub config_key: String,
+    /// Configuration scope the plan targets.
+    pub scope: McpPlanScope,
 }
 
-/// Server name identifying the external client to remove.
+/// A normalised, inert description of what installing an MCP server would involve. Carries no raw card, no install specification, and no secret value.
 ///
 /// <div class="warning">
 ///
@@ -7585,12 +7949,33 @@ pub struct McpStopServerRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct McpUnregisterExternalClientRequest {
-    /// Server name of the external client to unregister
-    pub server_name: String,
+pub struct McpInstallPlan {
+    /// The configuration changes installing would make, described rather than serialised, so the mutable configuration payload stays behind the runtime boundary.
+    pub configuration_changes: Vec<McpPlanConfigurationChange>,
+    /// Normalised identity of the server the plan would install.
+    pub identity: McpPlanResourceIdentity,
+    /// Opaque, runtime-instance scoped, TTL-bound, single-use handle for this plan. Rejected when stale, replayed, or presented to a different runtime instance. Never logged.
+    pub plan_handle: String,
+    /// ISO 8601 timestamp after which the plan handle is stale and will be rejected. Abandoning a plan needs no call: an unused handle simply expires, so cancellation before commit is side-effect free.
+    pub plan_handle_expires_at: String,
+    /// Outcome of evaluating the server against registry and enterprise policy.
+    pub policy: McpPlanPolicyResult,
+    /// Origin and semantic digest of the exact validated JSON MCP card content bound to this plan.
+    pub provenance: McpPlanProvenance,
+    /// Identifier of the choice the runtime would pick by default. Omitted when there is no eligible transport, or when the runtime expresses no preference.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub recommended_transport_choice_id: Option<String>,
+    /// Whether applying this plan would require an MCP reload to take effect. Planning itself never reloads.
+    pub reload_required: bool,
+    /// Whether the plan cannot be applied without further input, because a required value has no default or a secret must be supplied.
+    pub requires_interactive_configuration: bool,
+    /// Configuration scope and key the plan would write to.
+    pub target: McpPlanTarget,
+    /// Every eligible transport, so a host can present an explicit choice. A completed plan always has at least one; when none is eligible, planning returns `CatalogUnavailableTransportError` instead.
+    pub transport_choices: Vec<serde_json::Value>,
 }
 
-/// Memory configuration for this session.
+/// Server name to check running status for.
 ///
 /// <div class="warning">
 ///
@@ -7600,51 +7985,42 @@ pub(crate) struct McpUnregisterExternalClientRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MemoryConfiguration {
-    /// Whether memory is enabled for the session.
-    pub enabled: bool,
-}
-
-/// Successful compaction history for the session.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MetadataContextAttributionResultContextAttributionCompactions {
-    /// Number of successful compactions in this session.
-    pub count: i64,
+pub struct McpIsServerRunningRequest {
+    /// Name of the MCP server to check
+    pub server_name: String,
 }
 
+/// Whether the named MCP server is running.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataContextAttributionResultContextAttributionEntriesItem {
-    /// Supplementary per-entry metadata (e.g. `messageCount`, `role`, `evictable`, `pluginSource`). Values are stringified; parse as needed and ignore unrecognized keys.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub attributes: Option<HashMap<String, String>>,
-    /// Identifier for this entry, formed by joining its `kind` and source name (e.g. `tool:bash`, `skill:tmux`, `toolDefinition:bash`); unique within the snapshot. Use it to match the same entry across snapshots, to correlate with other APIs (skill/agent/MCP registries), and as the `parentId` target for nesting. Distinct from the human-facing `label`.
-    pub id: String,
-    /// Source category for this entry. Not a closed set — tolerate unknown values. Known values today: `skill`, `subagent`, `mcpServer`, `tool`, `system`, `toolDefinition`, `plugin`.
-    pub kind: String,
-    /// Human-readable display label, e.g. `bash` or `skill: tmux`. Presentation-only; may be localized/reformatted without notice — do not key off it.
-    pub label: String,
-    /// Optional `id` of the parent entry: e.g. a `plugin` entry parenting its `skill`/`mcpServer` entries, or the `system` entry parenting `toolDefinition` entries. Omitted for top-level entries.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub parent_id: Option<String>,
-    /// Token count currently in context attributable to this entry.
-    pub tokens: i64,
+pub struct McpIsServerRunningResult {
+    /// True if the server has an active client and transport.
+    pub running: bool,
 }
 
-/// Per-source token attribution snapshot for the current context window. The heaviest individual messages are available separately via `metadata.getContextHeaviestMessages`.
+/// Server name whose tool list should be returned.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataContextAttributionResultContextAttribution {
-    /// Successful compaction history for the session.
-    pub compactions: MetadataContextAttributionResultContextAttributionCompactions,
-    /// Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`.
-    pub entries: Vec<MetadataContextAttributionResultContextAttributionEntriesItem>,
-    /// Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share.
-    pub total_tokens: i64,
+pub struct McpListToolsRequest {
+    /// Name of the connected MCP server whose tools to list.
+    pub server_name: String,
 }
 
-/// Per-source attribution breakdown for the session's current context window, or null if uninitialized.
+/// Normalized MCP Apps discovery metadata from a tool's `_meta.ui` block.
 ///
 /// <div class="warning">
 ///
@@ -7654,12 +8030,16 @@ pub struct MetadataContextAttributionResultContextAttribution {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataContextAttributionResult {
-    /// Per-source context-window attribution, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
-    pub context_attribution: Option<MetadataContextAttributionResultContextAttribution>,
+pub struct McpToolUi {
+    /// URI of the tool's MCP App resource, typically a `ui://` resource identifier. Use `session.mcp.resources.read` to fetch its HTML and resource metadata.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub resource_uri: Option<String>,
+    /// Tool visibility advertised by the server. When absent, MCP Apps defaults apply.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub visibility: Option<Vec<McpToolUiVisibility>>,
 }
 
-/// Parameters for the heaviest-messages query.
+/// MCP tool metadata with tool name, optional description, and normalized MCP Apps discovery metadata.
 ///
 /// <div class="warning">
 ///
@@ -7669,13 +8049,18 @@ pub struct MetadataContextAttributionResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataContextHeaviestMessagesRequest {
-    /// Maximum number of messages to return, most-expensive first. Omit for the server default.
+pub struct McpTools {
+    /// Tool description, when provided.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub limit: Option<i64>,
+    pub description: Option<String>,
+    /// Tool name.
+    pub name: String,
+    /// Normalized MCP Apps discovery metadata. An empty object indicates that a valid `_meta.ui` block was present without recognized fields.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ui: Option<McpToolUi>,
 }
 
-/// The heaviest individual messages in the session's context window, most-expensive first.
+/// Tools exposed by the connected MCP server. Throws when the server is not connected.
 ///
 /// <div class="warning">
 ///
@@ -7685,14 +8070,12 @@ pub struct MetadataContextHeaviestMessagesRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataContextHeaviestMessagesResult {
-    /// Heaviest messages, most-expensive first.
-    pub messages: Vec<ContextHeaviestMessage>,
-    /// Total token count of the current context window, so callers can compute each message's share without a second call.
-    pub total_tokens: i64,
+pub struct McpListToolsResult {
+    /// Tools exposed by the server.
+    pub tools: Vec<McpTools>,
 }
 
-/// Model identifier and token limits used to compute the context-info breakdown.
+/// Identifies the MCP server whose persisted OAuth credentials were updated.
 ///
 /// <div class="warning">
 ///
@@ -7702,43 +8085,38 @@ pub struct MetadataContextHeaviestMessagesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataContextInfoRequest {
-    /// Maximum output tokens allowed by the target model. Pass 0 if unknown.
-    pub output_token_limit: i64,
-    /// Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default.
-    pub prompt_token_limit: i64,
-    /// Model identifier used for tokenization. Omit to use the session default. Used both for token counting and to compute display values.
+pub struct McpOauthAuthenticationStateChangedRequest {
+    /// Whether the target session must mint a session-scoped access token instead of reusing a shared access token persisted by another session.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub selected_model: Option<String>,
+    pub refresh_session_token: Option<bool>,
+    /// Name of the MCP server whose OAuth credentials were updated. Omit only when the host cannot identify the server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_name: Option<String>,
 }
 
-/// Token-usage breakdown for the session's current context window
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataContextInfoResultContextInfo {
-    /// Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%)
-    pub buffer_tokens: i64,
-    /// Token count at which background compaction starts (configurable percentage of promptTokenLimit)
-    pub compaction_threshold: i64,
-    /// Tokens consumed by user/assistant/tool messages
-    pub conversation_tokens: i64,
-    /// Prompt token limit plus the model's full output token limit.
-    pub limit: i64,
-    /// Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools)
-    pub mcp_tools_tokens: i64,
-    /// The model used for token counting
-    pub model_name: String,
-    /// Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified)
-    pub prompt_token_limit: i64,
-    /// Tokens consumed by the system prompt
-    pub system_tokens: i64,
-    /// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
-    pub tool_definitions_tokens: i64,
-    /// Sum of system, conversation and tool-definition tokens
-    pub total_tokens: i64,
+pub struct McpOauthPendingRequestResponseToken {
+    /// Access token acquired by the SDK host
+    pub access_token: String,
+    /// Token lifetime in seconds, if known.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expires_in: Option<i64>,
+    /// OAuth response variant discriminator.
+    pub kind: McpOauthPendingRequestResponseTokenKind,
+    /// OAuth token type. Defaults to bearer when omitted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub token_type: Option<String>,
 }
 
-/// Token breakdown for the session's current context window, or null if uninitialized.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpOauthPendingRequestResponseCancelled {
+    /// OAuth response variant discriminator.
+    pub kind: McpOauthPendingRequestResponseCancelledKind,
+}
+
+/// Pending MCP OAuth request ID and host-provided token or cancellation response.
 ///
 /// <div class="warning">
 ///
@@ -7746,14 +8124,16 @@ pub struct MetadataContextInfoResultContextInfo {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataContextInfoResult {
-    /// Token breakdown for the current context window, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
-    pub context_info: Option<MetadataContextInfoResultContextInfo>,
+pub struct McpOauthHandlePendingRequest {
+    /// OAuth request identifier from the mcp.oauth_required event
+    pub request_id: RequestId,
+    /// Host response to the pending OAuth request.
+    pub result: McpOauthPendingRequestResponse,
 }
 
-/// Indicates whether the local session is currently processing a turn or background continuation.
+/// Indicates whether the pending MCP OAuth response was accepted.
 ///
 /// <div class="warning">
 ///
@@ -7763,12 +8143,12 @@ pub struct MetadataContextInfoResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataIsProcessingResult {
-    /// Whether the session is currently processing user/agent messages. False for non-local sessions (which don't run a local agentic loop). Reflects an in-flight turn or background continuation.
-    pub processing: bool,
+pub struct McpOauthHandlePendingResult {
+    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
+    pub success: bool,
 }
 
-/// Model identifier to use when re-tokenizing the session's existing messages.
+/// Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback success-page copy, and static OAuth client selection.
 ///
 /// <div class="warning">
 ///
@@ -7778,12 +8158,33 @@ pub struct MetadataIsProcessingResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataRecomputeContextTokensRequest {
-    /// Model identifier used for tokenization. The runtime token-counts both chat-context and system-context messages against this model.
-    pub model_id: String,
+pub struct McpOauthLoginRequest {
+    /// Optional override for the body text shown on the OAuth loopback callback success page. When omitted, the runtime applies a neutral fallback; callers driving interactive auth should pass surface-specific copy telling the user where to return.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub callback_success_message: Option<String>,
+    /// Optional OAuth client ID override for this login. When set, the runtime uses this pre-registered static client instead of dynamic client registration.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_id: Option<String>,
+    /// Optional override for the OAuth client display name shown on the consent screen. Applies to newly registered dynamic clients only — existing registrations keep the name they were created with. When omitted, the runtime applies a neutral fallback; callers driving interactive auth should pass their own surface-specific label so the consent screen matches the product the user sees.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Optional OAuth client secret override for this login. The runtime treats this as an ephemeral host-owned secret, uses it for this authentication attempt and does not persist it.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_secret: Option<String>,
+    /// When true, clears any cached OAuth token for the server and runs a full new authorization. Use when the user explicitly wants to switch accounts or believes their session is stuck.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub force_reauth: Option<bool>,
+    /// Optional OAuth grant type override for this login. Defaults to the server configuration, or authorization_code when no grant type is specified.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub grant_type: Option<McpOauthLoginGrantType>,
+    /// Optional override indicating whether the static OAuth client is public. When false, the runtime treats it as confidential and uses the per-login clientSecret if provided, otherwise retrieving the client secret from the MCP OAuth secret store.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub public_client: Option<bool>,
+    /// Name of the remote MCP server to authenticate
+    pub server_name: String,
 }
 
-/// Re-tokenize the session's existing messages against `modelId` and return the token totals. Useful for hosts that want an initial estimate of context usage on session resume, before the next agent turn fires `session.context_info_changed` events. Returns zeros for an empty session.
+/// OAuth authorization URL the caller should open, or empty when cached tokens already authenticated the server.
 ///
 /// <div class="warning">
 ///
@@ -7793,16 +8194,13 @@ pub struct MetadataRecomputeContextTokensRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataRecomputeContextTokensResult {
-    /// Tokens contributed by user/assistant/tool messages (excludes system/developer prompts).
-    pub messages_token_count: i64,
-    /// Tokens contributed by system/developer prompt snapshots.
-    pub system_token_count: i64,
-    /// Sum of tokens across chat-context and system-context messages currently held by the session.
-    pub total_tokens: i64,
+pub struct McpOauthLoginResult {
+    /// URL the caller should open in a browser to complete OAuth. Omitted when cached tokens were still valid and no browser interaction was needed — the server is already reconnected in that case. When present, the runtime starts the callback listener before returning and continues the flow in the background; completion is signaled via session.mcp_server_status_changed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub authorization_url: Option<String>,
 }
 
-/// Updated working directory and git context. Emitted as the new payload of `session.context_changed`.
+/// Remote MCP server name for a passive OAuth status probe.
 ///
 /// <div class="warning">
 ///
@@ -7812,33 +8210,56 @@ pub struct MetadataRecomputeContextTokensResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkingDirectoryContext {
-    /// Merge-base commit SHA (fork point from the remote default branch)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub base_commit: Option<String>,
-    /// Current git branch name
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    /// Current working directory path
-    pub cwd: String,
-    /// Root directory of the git repository, resolved via git rev-parse
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Head commit of the current git branch
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub head_commit: Option<String>,
-    /// Hosting platform type of the repository
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<SessionWorkingDirectoryContextHostType>,
-    /// Repository identifier derived from the git remote URL ("owner/name" for GitHub, "org/project/repo" for Azure DevOps)
+pub struct McpOauthProbeRequest {
+    /// Name of the configured remote MCP server to probe.
+    pub server_name: String,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpOauthProbeResultNoAuthRequired {
+    /// HTTP response returned by the server.
+    pub http_response: McpOauthHttpResponse,
+    /// Probe outcome variant discriminator.
+    pub status: McpOauthProbeResultNoAuthRequiredStatus,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpOauthProbeResultAuthenticated {
+    /// HTTP response returned by the server.
+    pub http_response: McpOauthHttpResponse,
+    /// Probe outcome variant discriminator.
+    pub status: McpOauthProbeResultAuthenticatedStatus,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpOauthProbeResultNeedsAuth {
+    /// HTTP 401 or 403 response returned by the server.
+    pub http_response: McpOauthHttpResponse,
+    /// Why authentication is needed.
+    pub reason: McpOauthProbeNeedsAuthReason,
+    /// Probe outcome variant discriminator.
+    pub status: McpOauthProbeResultNeedsAuthStatus,
+    /// Parsed WWW-Authenticate challenge parameters, when present and parseable.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
-    /// Raw host string from the git remote URL (e.g. "github.com", "dev.azure.com")
+    pub www_authenticate_params: Option<McpOauthWWWAuthenticateParams>,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpOauthProbeResultFailed {
+    /// Human-readable probe failure detail.
+    pub error: String,
+    /// HTTP response returned by the server, when the probe reached the server and captured the complete response.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository_host: Option<String>,
+    pub http_response: Option<McpOauthHttpResponse>,
+    /// Probe outcome variant discriminator.
+    pub status: McpOauthProbeResultFailedStatus,
 }
 
-/// Updated working-directory/git context to record on the session.
+/// Pending MCP OAuth request id to respond to.
 ///
 /// <div class="warning">
 ///
@@ -7848,12 +8269,12 @@ pub struct SessionWorkingDirectoryContext {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataRecordContextChangeRequest {
-    /// Updated working directory and git context. Emitted as the new payload of `session.context_changed`.
-    pub context: SessionWorkingDirectoryContext,
+pub struct McpOauthRespondRequest {
+    /// OAuth request identifier from the mcp.oauth_required event
+    pub request_id: RequestId,
 }
 
-/// Notify the session that its working directory context has changed. Emits a `session.context_changed` event so consumers (telemetry, OTel tracker, ACP, the timeline UI) can react. Use this when the host has detected a cwd/branch/repo change outside the session's normal lifecycle (e.g., after a shell command in interactive mode). For a local session, a report whose `cwd` diverges from the session's current working directory is ignored (the call still succeeds but records nothing and emits no event); move a local session's working directory via `metadata.setWorkingDirectory` instead.
+/// Indicates whether the pending MCP OAuth response was accepted.
 ///
 /// <div class="warning">
 ///
@@ -7863,9 +8284,12 @@ pub struct MetadataRecordContextChangeRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataRecordContextChangeResult {}
+pub struct McpOauthRespondResult {
+    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
+    pub success: bool,
+}
 
-/// Absolute path to set as the session's new working directory. For local sessions the path must be absolute and exist on disk: it is validated before any session state changes, and a failing validation rejects the call with nothing mutated, persisted, or emitted. Remote sessions record the path as-is.
+/// A computed MCP install plan. Nothing has been applied: the plan describes what installing would change, and the plan handle is what a later apply operation would consume.
 ///
 /// <div class="warning">
 ///
@@ -7875,12 +8299,16 @@ pub struct MetadataRecordContextChangeResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataSetWorkingDirectoryRequest {
-    /// Absolute path to set as the session's working directory. The runtime updates the session's recorded cwd so subsequent operations (shell tools, file lookups, telemetry) anchor to it.
-    pub working_directory: String,
+pub struct McpPlanInstallPlanned {
+    /// Discriminator: a plan was computed and nothing was changed
+    pub kind: McpPlanInstallPlannedKind,
+    /// Protocol version and capabilities the runtime honoured.
+    pub negotiated: CatalogNegotiatedContract,
+    /// The normalised plan.
+    pub plan: McpInstallPlan,
 }
 
-/// Update the session's working directory. Used by the host when the user explicitly changes cwd (e.g., the `/cd` slash command). The host is responsible for any related side-effects (file index, etc.); it does NOT change the process working directory (a session's cwd is per-session, not process-global). For local sessions the runtime validates the target first (an absolute path that exists on disk) and re-bases the permission primary directory; a rejected validation fails the call before anything is mutated, persisted, or emitted. Location-scoped permission rules are then re-keyed to the new directory (best-effort). Remote sessions only record the path.
+/// Plan from a candidate returned by a previous catalog search.
 ///
 /// <div class="warning">
 ///
@@ -7890,12 +8318,16 @@ pub struct MetadataSetWorkingDirectoryRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataSetWorkingDirectoryResult {
-    /// Working directory after the update
-    pub working_directory: String,
+pub struct McpPlanInstallSourceCandidate {
+    /// Single-use candidate handle. Consumed by this call, so a replay of the same handle is rejected.
+    pub candidate_handle: String,
+    /// Discriminator: plan from a previously returned candidate
+    pub kind: McpPlanInstallSourceCandidateKind,
+    /// The runtime- or authority-minted `searchId` returned with the search that produced this candidate. A search implementation binds it to private candidate-handle context; a planning implementation must verify that context before returning a plan. The unavailable planning implementation in this contract layer validates presence but does not claim the verification has occurred. It identifies a search rather than a person and must never be joined with user identity to re-identify anyone.
+    pub search_id: String,
 }
 
-/// The repository the remote session targets.
+/// An MCP server card to be retrieved from a URL through the runtime's hardened fetch boundary.
 ///
 /// <div class="warning">
 ///
@@ -7905,16 +8337,16 @@ pub struct MetadataSetWorkingDirectoryResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataSnapshotRemoteMetadataRepository {
-    /// The branch the remote session is operating on.
-    pub branch: String,
-    /// The GitHub repository name (without owner).
-    pub name: String,
-    /// The GitHub owner (user or organization) of the target repository.
-    pub owner: String,
+pub struct McpServerCardUrl {
+    /// Discriminator: the card is URL-backed, and carries no embedded data
+    pub kind: McpServerCardUrlKind,
+    /// Media type the card is expected to conform to.
+    pub media_type: McpServerCardMediaType,
+    /// Card URL. Retrieved only through the runtime's hardened boundary, with scheme, credential, address-range, redirect, timeout, and response-size controls applied. Never logged.
+    pub url: String,
 }
 
-/// Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.
+/// An MCP server card supplied inline as an inert document.
 ///
 /// <div class="warning">
 ///
@@ -7924,21 +8356,16 @@ pub struct MetadataSnapshotRemoteMetadataRepository {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct MetadataSnapshotRemoteMetadata {
-    /// The pull request number the remote session is associated with, if any.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub pull_request_number: Option<i64>,
-    /// The repository the remote session targets.
-    pub repository: MetadataSnapshotRemoteMetadataRepository,
-    /// The original resource identifier (task ID or PR node ID), preserved across event-replay reconstructions. Falls back to `sessionId` when absent.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub resource_id: Option<String>,
-    /// Whether the remote task originated from Copilot Coding Agent (cca) or a CLI `--remote` invocation.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub task_type: Option<MetadataSnapshotRemoteMetadataTaskType>,
+pub struct McpServerCardEmbedded {
+    /// The card document verbatim, treated as inert untrusted bytes. The runtime parses and validates it; the host is not expected to interpret it. Never logged.
+    pub data: String,
+    /// Discriminator: the card is embedded, and carries no URL
+    pub kind: McpServerCardEmbeddedKind,
+    /// Media type the card is expected to conform to.
+    pub media_type: McpServerCardMediaType,
 }
 
-/// Active server-driven promotion for a model, including its discount and optional expiry.
+/// Plan from a card supplied directly by the caller, without a preceding search.
 ///
 /// <div class="warning">
 ///
@@ -7946,24 +8373,36 @@ pub struct MetadataSnapshotRemoteMetadata {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelBillingPromo {
-    /// Percentage discount (0-100) applied while the promotion is active. May be fractional.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub discount_percent: Option<f64>,
-    /// UTC ISO 8601 timestamp marking when the promotion ends. Optional: an open-ended promotion omits this field. When present, the API only surfaces a promo whose expiry parses and is in the future, so consumers should treat a past value as expired.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ends_at: Option<String>,
-    /// Stable identifier for the promotion campaign.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
-    /// Human-readable promotion message. Does not include the expiry timestamp; consumers may format endsAt and append it when present.
+pub struct McpPlanInstallSourceCard {
+    /// The card to plan from: exactly one of a URL or embedded data.
+    pub card: McpServerCardReference,
+    /// Discriminator: plan from a caller-supplied card
+    pub kind: McpPlanInstallSourceCardKind,
+}
+
+/// A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpPlanInstallRequest {
+    /// Protocol version and capabilities the caller requires.
+    pub contract: CatalogClientContract,
+    /// Configuration scope the plan targets. Defaults to user scope when omitted.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub message: Option<String>,
+    pub scope: Option<McpPlanScope>,
+    /// What to plan: either a candidate handle from a previous search, or a card supplied directly.
+    pub source: McpPlanInstallSource,
 }
 
-/// Long context tier pricing (available for models with extended context windows)
+/// One non-secret scalar value a transport choice needs before it can be applied.
 ///
 /// <div class="warning">
 ///
@@ -7973,35 +8412,31 @@ pub struct ModelBillingPromo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelBillingTokenPricesLongContext {
-    /// Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
-    #[doc(hidden)]
-    #[deprecated]
+pub struct McpPlanRequiredValueScalar {
+    /// Where the value is applied when the server is launched.
+    pub category: McpPlanValueCategory,
+    /// Default supplied by the card, when the value can be resolved without input. Presence is the authoritative indication that a default exists. Inert untrusted data.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cache_price: Option<f64>,
-    /// AI Credits cost per billing batch of cached (read) tokens
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cache_read_price: Option<f64>,
-    /// AI Credits cost per billing batch of cache-write (cache creation) tokens.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cache_write_price: Option<f64>,
-    /// Use maxPromptTokens instead. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.
-    #[doc(hidden)]
-    #[deprecated]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_max: Option<i64>,
-    /// AI Credits cost per billing batch of input tokens
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub input_price: Option<f64>,
-    /// Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.
+    pub default_value: Option<String>,
+    /// Human-readable explanation from the card. Inert untrusted text.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_prompt_tokens: Option<i64>,
-    /// AI Credits cost per billing batch of output tokens
+    pub description: Option<String>,
+    /// Whether the value may be supplied more than once.
+    pub is_repeated: bool,
+    /// Key the value is supplied under. Inert untrusted data.
+    pub key: String,
+    /// Discriminator: this required value uses a scalar type.
+    pub kind: McpPlanRequiredValueScalarKind,
+    /// Whether the value must be present for the plan to be applicable.
+    pub required: bool,
+    /// Human-readable label from the card. Inert untrusted text.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub output_price: Option<f64>,
+    pub title: Option<String>,
+    /// Scalar type the value must conform to.
+    pub value_type: McpPlanScalarValueType,
 }
 
-/// Token-level pricing information for this model
+/// One enumerated non-secret value a transport choice needs before it can be applied. The permitted values are structurally required.
 ///
 /// <div class="warning">
 ///
@@ -8011,41 +8446,33 @@ pub struct ModelBillingTokenPricesLongContext {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelBillingTokenPrices {
-    /// Number of tokens per standard billing batch
+pub struct McpPlanRequiredValueEnum {
+    /// Where the value is applied when the server is launched.
+    pub category: McpPlanValueCategory,
+    /// Default supplied by the card, when the value can be resolved without input. Presence is the authoritative indication that a default exists. Inert untrusted data.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub batch_size: Option<i64>,
-    /// Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
-    #[doc(hidden)]
-    #[deprecated]
+    pub default_value: Option<String>,
+    /// Human-readable explanation from the card. Inert untrusted text.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cache_price: Option<f64>,
-    /// AI Credits cost per billing batch of cached (read) tokens
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cache_read_price: Option<f64>,
-    /// AI Credits cost per billing batch of cache-write (cache creation) tokens.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cache_write_price: Option<f64>,
-    /// Use maxPromptTokens instead. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.
-    #[doc(hidden)]
-    #[deprecated]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_max: Option<i64>,
-    /// AI Credits cost per billing batch of input tokens
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub input_price: Option<f64>,
-    /// Long context tier pricing (available for models with extended context windows)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub long_context: Option<ModelBillingTokenPricesLongContext>,
-    /// Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_prompt_tokens: Option<i64>,
-    /// AI Credits cost per billing batch of output tokens
+    pub description: Option<String>,
+    /// Non-empty permitted value set. Inert untrusted data.
+    pub enum_values: Vec<String>,
+    /// Whether the value may be supplied more than once.
+    pub is_repeated: bool,
+    /// Key the value is supplied under. Inert untrusted data.
+    pub key: String,
+    /// Discriminator: this required value uses a fixed enumeration.
+    pub kind: McpPlanRequiredValueEnumKind,
+    /// Whether the value must be present for the plan to be applicable.
+    pub required: bool,
+    /// Human-readable label from the card. Inert untrusted text.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub output_price: Option<f64>,
+    pub title: Option<String>,
+    /// Discriminator: the value must be one of `enumValues`.
+    pub value_type: McpPlanEnumValueType,
 }
 
-/// Billing information
+/// A secret a transport choice needs, referenced by placeholder. No secret value ever appears in a plan, and the placeholder resolves against the keychain only when a plan is applied.
 ///
 /// <div class="warning">
 ///
@@ -8055,22 +8482,17 @@ pub struct ModelBillingTokenPrices {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelBilling {
-    /// Whole-number percentage discount (0-100) applied to usage billed through this model. Populated for the synthetic `auto` model, where requests routed by auto-mode are billed at a reduced rate; absent for concrete models.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub discount_percent: Option<i32>,
-    /// Billing cost multiplier relative to the base rate
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub multiplier: Option<f64>,
-    /// Active server-driven promotion for this model, if any. Present when the model is being promoted with a discount, which may be time-boxed or open-ended.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub promo: Option<ModelBillingPromo>,
-    /// Token-level pricing information for this model
+pub struct McpPlanSecretPlaceholder {
+    /// Key the secret is supplied under. Inert untrusted data.
+    pub key: String,
+    /// The runtime-assigned `${secret:<id>}` placeholder written into configuration in place of the value.
+    pub placeholder: String,
+    /// Human-readable label from the card. Inert untrusted text.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub token_prices: Option<ModelBillingTokenPrices>,
+    pub title: Option<String>,
 }
 
-/// Vision-specific limits
+/// An eligible local-package transport choice. Package identity is required and a remote endpoint cannot be represented.
 ///
 /// <div class="warning">
 ///
@@ -8080,19 +8502,24 @@ pub struct ModelBilling {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelCapabilitiesLimitsVision {
-    /// Maximum image size in bytes
-    #[serde(rename = "max_prompt_image_size")]
-    pub max_prompt_image_size: i64,
-    /// Maximum number of images per prompt
-    #[serde(rename = "max_prompt_images")]
-    pub max_prompt_images: i64,
-    /// MIME types the model accepts
-    #[serde(rename = "supported_media_types")]
-    pub supported_media_types: Vec<String>,
+pub struct McpPlanTransportChoicePackage {
+    /// Stable identifier for this choice within the plan, used to select it when the plan is applied.
+    pub choice_id: String,
+    /// Discriminator: this choice runs a local package
+    pub install_method: McpPlanPackageInstallMethod,
+    /// Package identifier. Inert untrusted data.
+    pub package_identifier: String,
+    /// Packaging ecosystem, for example `oci` or `npm`.
+    pub package_type: String,
+    /// Typed values this choice requires, excluding secrets.
+    pub required_values: Vec<McpPlanRequiredValue>,
+    /// Secrets this choice requires, referenced by placeholder only.
+    pub secret_placeholders: Vec<McpPlanSecretPlaceholder>,
+    /// Local process transport this package choice would use.
+    pub transport: McpPlanPackageTransport,
 }
 
-/// Token limits for prompts, outputs, and context window
+/// An eligible remote-endpoint transport choice. The endpoint is required and package identity cannot be represented.
 ///
 /// <div class="warning">
 ///
@@ -8102,25 +8529,22 @@ pub struct ModelCapabilitiesLimitsVision {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelCapabilitiesLimits {
-    /// Maximum total context window size in tokens
-    #[serde(
-        rename = "max_context_window_tokens",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub max_context_window_tokens: Option<i64>,
-    /// Maximum number of output/completion tokens
-    #[serde(rename = "max_output_tokens", skip_serializing_if = "Option::is_none")]
-    pub max_output_tokens: Option<i64>,
-    /// Maximum number of prompt/input tokens
-    #[serde(rename = "max_prompt_tokens", skip_serializing_if = "Option::is_none")]
-    pub max_prompt_tokens: Option<i64>,
-    /// Vision-specific limits
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub vision: Option<ModelCapabilitiesLimitsVision>,
+pub struct McpPlanTransportChoiceRemote {
+    /// Stable identifier for this choice within the plan, used to select it when the plan is applied.
+    pub choice_id: String,
+    /// Endpoint URL. Inert untrusted data.
+    pub endpoint: String,
+    /// Discriminator: this choice connects to a remote endpoint
+    pub install_method: McpPlanRemoteInstallMethod,
+    /// Typed values this choice requires, excluding secrets.
+    pub required_values: Vec<McpPlanRequiredValue>,
+    /// Secrets this choice requires, referenced by placeholder only.
+    pub secret_placeholders: Vec<McpPlanSecretPlaceholder>,
+    /// Endpoint transport this remote choice would use.
+    pub transport: McpPlanRemoteTransport,
 }
 
-/// Feature flags indicating what the model supports
+/// Registration parameters for an external MCP client.
 ///
 /// <div class="warning">
 ///
@@ -8130,19 +8554,21 @@ pub struct ModelCapabilitiesLimits {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelCapabilitiesSupports {
-    /// Resolved Anthropic adaptive-thinking capability — unsupported / optional / required. 'required' models reject thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8).
-    #[serde(rename = "adaptive_thinking", skip_serializing_if = "Option::is_none")]
-    pub adaptive_thinking: Option<AdaptiveThinkingSupport>,
-    /// Whether this model supports reasoning effort configuration
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_effort: Option<bool>,
-    /// Whether this model supports vision/image input
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub vision: Option<bool>,
+pub(crate) struct McpRegisterExternalClientRequest {
+    /// In-process MCP Client instance. Marked internal: cannot be serialized across the JSON-RPC boundary.
+    #[doc(hidden)]
+    pub(crate) client: serde_json::Value,
+    /// In-process server config (MCPServerConfig) paired with the in-process client/transport. Marked internal alongside its companions.
+    #[doc(hidden)]
+    pub(crate) config: serde_json::Value,
+    /// Logical server name for the external client
+    pub server_name: String,
+    /// In-process MCP Transport instance. Marked internal: cannot be serialized across the JSON-RPC boundary.
+    #[doc(hidden)]
+    pub(crate) transport: serde_json::Value,
 }
 
-/// Model capabilities and limits
+/// In-process MCP reload configuration.
 ///
 /// <div class="warning">
 ///
@@ -8152,16 +8578,36 @@ pub struct ModelCapabilitiesSupports {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelCapabilities {
-    /// Token limits for prompts, outputs, and context window
+pub(crate) struct McpReloadConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub limits: Option<ModelCapabilitiesLimits>,
-    /// Feature flags indicating what the model supports
+    pub active_git_hub_token: Option<String>,
+    /// Server names the CLI enabled for this session via `--enable-mcp-server`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub supports: Option<ModelCapabilitiesSupports>,
+    pub cli_enabled_servers: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_filter: Option<serde_json::Value>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_servers: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enabled_servers: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub force_restart: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub github_mcp_tool_options: Option<serde_json::Value>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub github_mcp_user_override: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_workspace_sources: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mcp3p_enabled: Option<bool>,
+    pub mcp_servers: HashMap<String, serde_json::Value>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub secret_store: Option<serde_json::Value>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub use_cached_tool_snapshots: Option<bool>,
 }
 
-/// Policy state (if applicable)
+/// Opaque MCP reload configuration.
 ///
 /// <div class="warning">
 ///
@@ -8171,15 +8617,13 @@ pub struct ModelCapabilities {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelPolicy {
-    /// Current policy state for this model
-    pub state: ModelPolicyState,
-    /// Usage terms or conditions for this model
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub terms: Option<String>,
+pub(crate) struct McpReloadWithConfigRequest {
+    /// Opaque runtime MCP reload configuration. Marked internal: an in-process runtime shape (reloadMcpServers throws over the wire).
+    #[doc(hidden)]
+    pub(crate) config: serde_json::Value,
 }
 
-/// Copilot model metadata, including identifier, display name, capabilities, policy, billing, reasoning efforts, and picker categories.
+/// Indicates whether the auto-managed `github` MCP server was removed (false when nothing to remove).
 ///
 /// <div class="warning">
 ///
@@ -8189,31 +8633,12 @@ pub struct ModelPolicy {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct Model {
-    /// Billing information
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub billing: Option<ModelBilling>,
-    /// Model capabilities and limits
-    pub capabilities: ModelCapabilities,
-    /// Model identifier (e.g., "claude-sonnet-4.5")
-    pub id: String,
-    /// Model capability category for grouping in the model picker
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_picker_category: Option<ModelPickerCategory>,
-    /// Relative cost tier for token-based billing users
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_picker_price_category: Option<ModelPickerPriceCategory>,
-    /// Display name
-    pub name: String,
-    /// Policy state (if applicable)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub policy: Option<ModelPolicy>,
-    /// Supported reasoning effort levels (only present if model supports reasoning effort)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub supported_reasoning_efforts: Option<Vec<String>>,
+pub struct McpRemoveGitHubResult {
+    /// True when the auto-managed `github` MCP server was removed; false when no removal happened (e.g. user has explicitly configured a `github` server, or the server was not registered).
+    pub removed: bool,
 }
 
-/// Vision-specific limits
+/// Standard MCP resource annotations plus preserved non-standard annotation fields.
 ///
 /// <div class="warning">
 ///
@@ -8223,25 +8648,22 @@ pub struct Model {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelCapabilitiesOverrideLimitsVision {
-    /// Maximum image size in bytes
-    #[serde(
-        rename = "max_prompt_image_size",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub max_prompt_image_size: Option<i64>,
-    /// Maximum number of images per prompt
-    #[serde(rename = "max_prompt_images", skip_serializing_if = "Option::is_none")]
-    pub max_prompt_images: Option<i64>,
-    /// MIME types the model accepts
-    #[serde(
-        rename = "supported_media_types",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub supported_media_types: Option<Vec<String>>,
+pub struct McpResourceAnnotations {
+    /// Server-provided non-standard annotation fields preserved from the MCP response
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub additional_properties: Option<HashMap<String, serde_json::Value>>,
+    /// Intended audience roles for this resource
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub audience: Option<Vec<String>>,
+    /// Last-modified timestamp hint
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub last_modified: Option<String>,
+    /// Priority hint for model/client use
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub priority: Option<f64>,
 }
 
-/// Token limits for prompts, outputs, and context window
+/// A resource icon descriptor plus preserved non-standard icon fields.
 ///
 /// <div class="warning">
 ///
@@ -8251,25 +8673,24 @@ pub struct ModelCapabilitiesOverrideLimitsVision {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelCapabilitiesOverrideLimits {
-    /// Maximum total context window size in tokens
-    #[serde(
-        rename = "max_context_window_tokens",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub max_context_window_tokens: Option<i64>,
-    /// Maximum number of output/completion tokens
-    #[serde(rename = "max_output_tokens", skip_serializing_if = "Option::is_none")]
-    pub max_output_tokens: Option<i64>,
-    /// Maximum number of prompt/input tokens
-    #[serde(rename = "max_prompt_tokens", skip_serializing_if = "Option::is_none")]
-    pub max_prompt_tokens: Option<i64>,
-    /// Vision-specific limits
+pub struct McpResourceIcon {
+    /// Server-provided non-standard icon fields preserved from the MCP response
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub vision: Option<ModelCapabilitiesOverrideLimitsVision>,
+    pub additional_properties: Option<HashMap<String, serde_json::Value>>,
+    /// Icon MIME type, when known
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mime_type: Option<String>,
+    /// Icon sizes hint
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sizes: Option<String>,
+    /// Icon URI
+    pub src: String,
+    /// Theme hint for this icon
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub theme: Option<String>,
 }
 
-/// Feature flags indicating what the model supports
+/// An MCP resource descriptor (spec `Resource`): URI, name, and optional title, description, MIME type, size, icons, annotations, and metadata. Server-provided fields outside the standard descriptor shape are exposed under `additionalProperties`.
 ///
 /// <div class="warning">
 ///
@@ -8279,19 +8700,38 @@ pub struct ModelCapabilitiesOverrideLimits {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelCapabilitiesOverrideSupports {
-    /// Resolved Anthropic adaptive-thinking capability — unsupported / optional / required. 'required' models reject thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8).
-    #[serde(rename = "adaptive_thinking", skip_serializing_if = "Option::is_none")]
-    pub adaptive_thinking: Option<AdaptiveThinkingSupport>,
-    /// Whether this model supports reasoning effort configuration
+pub struct McpResource {
+    /// Resource-level metadata
+    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
+    pub meta: Option<HashMap<String, serde_json::Value>>,
+    /// Server-provided non-standard descriptor fields preserved from the MCP response
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_effort: Option<bool>,
-    /// Whether this model supports vision/image input
+    pub additional_properties: Option<HashMap<String, serde_json::Value>>,
+    /// Model/client annotations associated with this resource
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub vision: Option<bool>,
+    pub annotations: Option<McpResourceAnnotations>,
+    /// Optional description of what this resource represents
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Icons associated with this resource
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub icons: Option<Vec<McpResourceIcon>>,
+    /// MIME type of the resource, if known
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mime_type: Option<String>,
+    /// The programmatic name of the resource
+    pub name: String,
+    /// Resource size in bytes, when known
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub size: Option<i64>,
+    /// Optional human-readable display title
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    /// The resource URI (e.g. ui://... or file:///...)
+    pub uri: String,
 }
 
-/// Optional capability overrides (vision, tool_calls, reasoning, etc.).
+/// MCP resource content with URI, optional MIME type, text or base64 blob, and resource metadata.
 ///
 /// <div class="warning">
 ///
@@ -8301,47 +8741,24 @@ pub struct ModelCapabilitiesOverrideSupports {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelCapabilitiesOverride {
-    /// Token limits for prompts, outputs, and context window
+pub struct McpResourceContent {
+    /// Resource-level metadata (CSP, permissions, etc.)
+    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
+    pub meta: Option<HashMap<String, serde_json::Value>>,
+    /// Base64-encoded binary content
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub limits: Option<ModelCapabilitiesOverrideLimits>,
-    /// Feature flags indicating what the model supports
+    pub blob: Option<String>,
+    /// MIME type of the content
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub supports: Option<ModelCapabilitiesOverrideSupports>,
-}
-
-/// List of Copilot models available to the resolved user, including capabilities and billing metadata.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ModelList {
-    /// List of available models with full metadata
-    pub models: Vec<Model>,
-}
-
-/// Optional listing options.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ModelListRequest {
-    /// If true, bypasses the per-session model list cache and re-fetches from CAPI.
+    pub mime_type: Option<String>,
+    /// Text content (e.g. HTML)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub skip_cache: Option<bool>,
+    pub text: Option<String>,
+    /// The resource URI
+    pub uri: String,
 }
 
-/// Reasoning effort level to apply to the currently selected model.
+/// MCP server whose resources to enumerate.
 ///
 /// <div class="warning">
 ///
@@ -8351,12 +8768,15 @@ pub struct ModelListRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelSetReasoningEffortRequest {
-    /// Reasoning effort level to apply to the currently selected model. The host is responsible for validating the value against the model's supported levels before calling.
-    pub reasoning_effort: String,
+pub struct McpResourcesListRequest {
+    /// Opaque MCP pagination cursor from a prior `nextCursor` value
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cursor: Option<String>,
+    /// Name of the MCP server whose resources to enumerate
+    pub server_name: String,
 }
 
-/// Update the session's reasoning effort without changing the selected model. Use `switchTo` instead when you also need to change the model. The runtime stores the effort on the session and applies it to subsequent turns.
+/// One page of resources advertised by the named MCP server.
 ///
 /// <div class="warning">
 ///
@@ -8366,12 +8786,15 @@ pub struct ModelSetReasoningEffortRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelSetReasoningEffortResult {
-    /// Reasoning effort level recorded on the session after the update
-    pub reasoning_effort: String,
+pub struct McpResourcesListResult {
+    /// Opaque cursor for the next page, if the server has more resources
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub next_cursor: Option<String>,
+    /// Resources advertised by the server (proxied MCP `resources/list`)
+    pub resources: Vec<McpResource>,
 }
 
-/// Optional GitHub token used to list models for a specific user instead of the global auth context.
+/// MCP server whose resource templates to enumerate.
 ///
 /// <div class="warning">
 ///
@@ -8381,13 +8804,15 @@ pub struct ModelSetReasoningEffortResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelsListRequest {
-    /// GitHub token for per-user model listing. When provided, resolves this token to determine the user's Copilot plan and available models instead of using the global auth.
+pub struct McpResourcesListTemplatesRequest {
+    /// Opaque MCP pagination cursor from a prior `nextCursor` value
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub git_hub_token: Option<String>,
+    pub cursor: Option<String>,
+    /// Name of the MCP server whose resource templates to enumerate
+    pub server_name: String,
 }
 
-/// Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.
+/// An MCP resource template descriptor (spec `ResourceTemplate`): an RFC 6570 URI template, name, and optional title, description, MIME type, icons, annotations, and metadata. Server-provided fields outside the standard descriptor shape are exposed under `additionalProperties`.
 ///
 /// <div class="warning">
 ///
@@ -8397,30 +8822,35 @@ pub struct ModelsListRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelSwitchToRequest {
-    /// Explicit context tier for the selected model. `"default"` / `"long_context"` apply the requested tier; omit this field to use normal model behavior with no explicit tier.
+pub struct McpResourceTemplate {
+    /// Resource-template-level metadata
+    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
+    pub meta: Option<HashMap<String, serde_json::Value>>,
+    /// Server-provided non-standard descriptor fields preserved from the MCP response
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_tier: Option<ContextTier>,
-    /// When true, defer this switch (enqueue it) if another model change is already queued, even when no turn is active — so it drains last (FIFO) and wins over the already-queued change. Intended for genuine user-initiated model selections; internal restore/reapply switches omit it and apply immediately when no turn is active. When no other model change is queued this has no effect (a switch still applies immediately unless a turn is active).
+    pub additional_properties: Option<HashMap<String, serde_json::Value>>,
+    /// Model/client annotations associated with this template
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub defer_if_model_change_queued: Option<bool>,
-    /// Override individual model capabilities resolved by the runtime
+    pub annotations: Option<McpResourceAnnotations>,
+    /// Optional description of what this template is for
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_capabilities: Option<ModelCapabilitiesOverride>,
-    /// Model selection id to switch to, as returned by `list`. A bare id (e.g. `claude-sonnet-4.6`) names a Copilot (CAPI) model; a provider-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a registry BYOK model.
-    pub model_id: String,
-    /// Reasoning effort level to use for the model. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. "none" disables reasoning. When omitted, no effort override is applied.
+    pub description: Option<String>,
+    /// Icons associated with resources matching this template
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_effort: Option<String>,
-    /// Reasoning summary mode to request for supported model clients
+    pub icons: Option<Vec<McpResourceIcon>>,
+    /// MIME type for resources matching this template, if uniform
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_summary: Option<ReasoningSummary>,
-    /// Output verbosity level to request for supported models
+    pub mime_type: Option<String>,
+    /// The programmatic name of the resource template
+    pub name: String,
+    /// Optional human-readable display title
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub verbosity: Option<Verbosity>,
+    pub title: Option<String>,
+    /// An RFC 6570 URI template for constructing resource URIs
+    pub uri_template: String,
 }
 
-/// The model identifier active on the session after the switch.
+/// One page of resource templates advertised by the named MCP server.
 ///
 /// <div class="warning">
 ///
@@ -8430,16 +8860,15 @@ pub struct ModelSwitchToRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelSwitchToResult {
-    /// True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub deferred: Option<bool>,
-    /// Currently active model identifier after the switch
+pub struct McpResourcesListTemplatesResult {
+    /// Opaque cursor for the next page, if the server has more resource templates
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_id: Option<String>,
+    pub next_cursor: Option<String>,
+    /// Resource templates advertised by the server (proxied MCP `resources/templates/list`)
+    pub resource_templates: Vec<McpResourceTemplate>,
 }
 
-/// Agent interaction mode to apply to the session.
+/// MCP server and resource URI to fetch.
 ///
 /// <div class="warning">
 ///
@@ -8449,12 +8878,14 @@ pub struct ModelSwitchToResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModeSetRequest {
-    /// The session mode the agent is operating in
-    pub mode: SessionMode,
+pub struct McpResourcesReadRequest {
+    /// Name of the MCP server hosting the resource
+    pub server_name: String,
+    /// Resource URI
+    pub uri: String,
 }
 
-/// Azure-specific provider options.
+/// Resource contents returned by the MCP server.
 ///
 /// <div class="warning">
 ///
@@ -8464,13 +8895,12 @@ pub struct ModeSetRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderConfigAzure {
-    /// API version. When set, uses the versioned deployment route. When omitted, uses the GA versionless v1 route.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub api_version: Option<String>,
+pub struct McpResourcesReadResult {
+    /// Resource contents returned by the server
+    pub contents: Vec<McpResourceContent>,
 }
 
-/// A named BYOK provider connection (transport + credentials).
+/// Server name and optional replacement configuration for an individual MCP server restart. Omit `config` for a config-free restart-by-name of an already-configured server.
 ///
 /// <div class="warning">
 ///
@@ -8480,53 +8910,15 @@ pub struct ProviderConfigAzure {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct NamedProviderConfig {
-    /// API key. Optional for local providers like Ollama.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub api_key: Option<String>,
-    /// Azure-specific provider options.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub azure: Option<ProviderConfigAzure>,
-    /// API endpoint URL.
-    pub base_url: String,
-    /// Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub bearer_token: Option<String>,
-    /// When true, the SDK client supplies bearer tokens on demand: the runtime calls the client-session `providerToken.getToken` callback before each request and applies the returned token as an `Authorization: Bearer <token>` header. This is the bearer/OAuth scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens (including Anthropic's), not a provider-specific API-key header such as Anthropic's `x-api-key`. The token-acquiring function itself stays on the SDK side and is never serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`, the callback takes precedence: the runtime applies the token returned by `providerToken.getToken` as the `Authorization: Bearer` header for each request and does not send the static credential.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub has_bearer_token_provider: Option<bool>,
-    /// Custom HTTP headers to include in all outbound requests to the provider.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub headers: Option<HashMap<String, String>>,
-    /// Stable identifier referenced by BYOK model definitions. Must not contain '/'.
-    pub name: String,
-    /// Provider transport. Defaults to "http".
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub transport: Option<ProviderConfigTransport>,
-    /// Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#type: Option<ProviderConfigType>,
-    /// Wire API format (openai/azure only). Defaults to "completions".
+pub struct McpRestartServerRequest {
+    /// Replacement MCP server configuration (stdio process or remote HTTP/SSE). Omit to restart the server with its already-registered configuration (config-free restart-by-name).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub wire_api: Option<ProviderConfigWireApi>,
-}
-
-/// The session's friendly name, or null when not yet set.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct NameGetResult {
-    /// The session name (user-set or auto-generated), or null if not yet set
-    pub name: Option<String>,
+    pub config: Option<serde_json::Value>,
+    /// Name of the MCP server to restart
+    pub server_name: String,
 }
 
-/// Auto-generated session summary to apply as the session's name when no user-set name exists.
+/// Per-field MCP telemetry-obfuscation policy.
 ///
 /// <div class="warning">
 ///
@@ -8536,12 +8928,14 @@ pub struct NameGetResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct NameSetAutoRequest {
-    /// Auto-generated session summary. Empty/whitespace-only values are ignored; values are trimmed before persisting.
-    pub summary: String,
+pub struct McpSafeForTelemetryFields {
+    /// Whether MCP tool input names may be included in telemetry without obfuscation.
+    pub inputs_names: bool,
+    /// Whether the MCP tool name may be included in telemetry without obfuscation.
+    pub name: bool,
 }
 
-/// Indicates whether the auto-generated summary was applied as the session's name.
+/// Outcome of an MCP sampling execution: success result, failure error, or cancellation.
 ///
 /// <div class="warning">
 ///
@@ -8551,12 +8945,18 @@ pub struct NameSetAutoRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct NameSetAutoResult {
-    /// Whether the auto-generated summary was persisted. False if the session already has a user-set name, the summary normalized to empty, or the session does not have a workspace.
-    pub applied: bool,
+pub struct McpSamplingExecutionResult {
+    /// Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.
+    pub action: McpSamplingExecutionAction,
+    /// Error description, present when action='failure'.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<McpExecuteSamplingResult>,
 }
 
-/// New friendly name to apply to the session.
+/// MCP server status entry, including config source/plugin source and any connection error.
 ///
 /// <div class="warning">
 ///
@@ -8566,12 +8966,26 @@ pub struct NameSetAutoResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct NameSetRequest {
-    /// New session name (1–100 characters, trimmed of leading/trailing whitespace)
+pub struct McpServer {
+    /// Error message if the server failed to connect
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Server name (config key)
     pub name: String,
+    /// Configuration source: user, workspace, plugin, or builtin
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<McpServerSource>,
+    /// Plugin name that provided this server, when source is plugin.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin: Option<String>,
+    /// Plugin version that provided this server, when source is plugin.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin_version: Option<String>,
+    /// Connection status: connected, failed, needs-auth, pending, disabled, stopped, or not_configured
+    pub status: McpServerStatus,
 }
 
-/// Source descriptor for a `session.options.update` content-exclusion rule, with source name and type.
+/// Authentication settings with optional redirect port configuration.
 ///
 /// <div class="warning">
 ///
@@ -8581,12 +8995,13 @@ pub struct NameSetRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct OptionsUpdateAdditionalContentExclusionPolicyRuleSource {
-    pub name: String,
-    pub r#type: String,
+pub struct McpServerAuthConfigRedirectPort {
+    /// Fixed port for the OAuth redirect callback server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub redirect_port: Option<i32>,
 }
 
-/// Single content-exclusion rule supplied to `session.options.update`, with paths, match conditions, and source.
+/// Remote MCP server configuration accessed over HTTP or SSE.
 ///
 /// <div class="warning">
 ///
@@ -8596,35 +9011,90 @@ pub struct OptionsUpdateAdditionalContentExclusionPolicyRuleSource {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct OptionsUpdateAdditionalContentExclusionPolicyRule {
+pub struct McpServerConfigHttp {
+    /// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub if_any_match: Option<Vec<String>>,
+    pub auth: Option<serde_json::Value>,
+    /// Configuration warnings recorded while loading the server.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub if_none_match: Option<Vec<String>>,
-    pub paths: Vec<String>,
-    /// Source descriptor for a `session.options.update` content-exclusion rule, with source name and type.
-    pub source: OptionsUpdateAdditionalContentExclusionPolicyRuleSource,
-}
-
-/// Content-exclusion policy supplied to `session.options.update`, with rules, last-updated data, and scope.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct OptionsUpdateAdditionalContentExclusionPolicy {
-    #[serde(rename = "last_updated_at")]
-    pub last_updated_at: serde_json::Value,
-    pub rules: Vec<OptionsUpdateAdditionalContentExclusionPolicyRule>,
-    /// Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.
-    pub scope: OptionsUpdateAdditionalContentExclusionPolicyScope,
+    pub config_warnings: Option<Vec<String>>,
+    /// Controls if tools provided by this server can be loaded on demand via tool search (auto) or always included in the initial tool list (never)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub defer_tools: Option<McpServerConfigDeferTools>,
+    /// Whether secret masking is disabled for calls to this server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_secret_masking: Option<bool>,
+    /// Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery is unaffected.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_tool_cache: Option<bool>,
+    /// Optional human-readable server name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_name: Option<String>,
+    /// Event types this server receives as Copilot notifications.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub events: Option<Vec<String>>,
+    /// Tool names excluded after the include filter is applied.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exclude_tools: Option<Vec<String>>,
+    /// Content filtering mode to apply to all tools, or a map of tool name to content filtering mode.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub filter_mapping: Option<serde_json::Value>,
+    /// HTTP headers to include in requests to the remote MCP server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub headers: Option<HashMap<String, String>>,
+    /// Dynamic-header refresh cache lifetime in milliseconds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub headers_refresh_ttl_ms: Option<i64>,
+    /// Whether this server is a built-in fallback used when the user has not configured their own server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_default_server: Option<bool>,
+    /// Copilot notification types this server may send to the host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub notifications: Option<Vec<String>>,
+    /// OAuth client ID for a pre-registered remote MCP OAuth client.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub oauth_client_id: Option<String>,
+    /// OAuth grant type to use when authenticating to the remote MCP server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub oauth_grant_type: Option<McpServerConfigHttpOauthGrantType>,
+    /// Whether the configured OAuth client is public and does not require a client secret.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub oauth_public_client: Option<bool>,
+    /// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub oidc: Option<serde_json::Value>,
+    /// Telemetry-obfuscation policy for this server's tools.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub safe_for_telemetry: Option<serde_json::Value>,
+    /// The origin of this server configuration.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<McpServerSource>,
+    /// Source file path recorded while loading the config.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_path: Option<String>,
+    /// Plugin that provided this server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin: Option<String>,
+    /// Whether the providing plugin uses the Open Plugin Spec.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin_spec: Option<bool>,
+    /// Version of the plugin that provided this server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin_version: Option<String>,
+    /// Timeout in milliseconds for tool discovery and tool calls.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout: Option<i64>,
+    /// Tools to include. Defaults to all tools if not specified.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tools: Option<Vec<String>>,
+    /// Remote transport type. Defaults to "http" when omitted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#type: Option<McpServerConfigHttpType>,
+    /// URL of the remote MCP server endpoint.
+    pub url: String,
 }
 
-/// Pending permission prompt reconstructed from event history, with request ID and user-facing prompt details.
+/// In-process MCP server configuration used by embedded SDK clients.
 ///
 /// <div class="warning">
 ///
@@ -8632,16 +9102,74 @@ pub struct OptionsUpdateAdditionalContentExclusionPolicy {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PendingPermissionRequest {
-    /// The user-facing permission prompt details (commands, write, read, mcp, url, memory, custom-tool, path, hook)
-    pub request: PermissionPromptRequest,
-    /// Unique identifier for the pending permission request
-    pub request_id: RequestId,
+pub(crate) struct McpServerConfigMemory {
+    /// Configuration warnings recorded while loading the server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_warnings: Option<Vec<String>>,
+    /// Controls whether tools can be loaded on demand.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub defer_tools: Option<McpServerConfigDeferTools>,
+    /// Whether secret masking is disabled for calls to this server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_secret_masking: Option<bool>,
+    /// Whether persisted tool snapshots are disabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_tool_cache: Option<bool>,
+    /// Optional human-readable server name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_name: Option<String>,
+    /// Event types this server receives as Copilot notifications.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub events: Option<Vec<String>>,
+    /// Tool names excluded after the include filter is applied.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exclude_tools: Option<Vec<String>>,
+    /// Content filtering mode to apply to this server's tools.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub filter_mapping: Option<serde_json::Value>,
+    /// Whether this server is a built-in fallback.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_default_server: Option<bool>,
+    /// Copilot notification types this server may send to the host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub notifications: Option<Vec<String>>,
+    /// Set to `true` to use default OIDC settings.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub oidc: Option<serde_json::Value>,
+    /// Telemetry-obfuscation policy for this server's tools.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub safe_for_telemetry: Option<serde_json::Value>,
+    /// In-process MCP server instance. This value cannot cross a JSON-RPC boundary.
+    #[doc(hidden)]
+    pub(crate) server_instance: serde_json::Value,
+    /// The origin of this server configuration.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<McpServerSource>,
+    /// Source file path recorded while loading the config.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_path: Option<String>,
+    /// Plugin that provided this server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin: Option<String>,
+    /// Whether the providing plugin uses the Open Plugin Spec.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin_spec: Option<bool>,
+    /// Version of the plugin that provided this server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin_version: Option<String>,
+    /// Timeout in milliseconds for tool discovery and tool calls.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout: Option<i64>,
+    /// Tools to include. Defaults to all tools if not specified.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tools: Option<Vec<String>>,
+    #[doc(hidden)]
+    pub(crate) r#type: McpServerConfigMemoryType,
 }
 
-/// List of pending permission requests reconstructed from event history.
+/// Stdio MCP server configuration launched as a child process.
 ///
 /// <div class="warning">
 ///
@@ -8651,12 +9179,84 @@ pub struct PendingPermissionRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PendingPermissionRequestList {
-    /// Pending permission prompts reconstructed from the session's event history. Equivalent to the set of `permission.requested` events that have not yet been followed by a matching `permission.completed` event. Used by clients (e.g. the CLI) to hydrate UI for prompts that were emitted before the client attached to the session.
-    pub items: Vec<PendingPermissionRequest>,
+pub struct McpServerConfigStdio {
+    /// Command-line arguments passed to the Stdio MCP server process.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub args: Option<Vec<String>>,
+    /// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth: Option<serde_json::Value>,
+    /// Executable command used to start the Stdio MCP server process.
+    pub command: String,
+    /// Configuration warnings recorded while loading the server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_warnings: Option<Vec<String>>,
+    /// Working directory for the Stdio MCP server process.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Controls if tools provided by this server can be loaded on demand via tool search (auto) or always included in the initial tool list (never)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub defer_tools: Option<McpServerConfigDeferTools>,
+    /// Whether secret masking is disabled for calls to this server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_secret_masking: Option<bool>,
+    /// Set to true to disable persisted MCP tool snapshots for this server. Live tool discovery is unaffected.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_tool_cache: Option<bool>,
+    /// Optional human-readable server name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_name: Option<String>,
+    /// Environment variables to pass to the Stdio MCP server process.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub env: Option<HashMap<String, String>>,
+    /// Event types this server receives as Copilot notifications.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub events: Option<Vec<String>>,
+    /// Tool names excluded after the include filter is applied.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exclude_tools: Option<Vec<String>>,
+    /// Content filtering mode to apply to all tools, or a map of tool name to content filtering mode.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub filter_mapping: Option<serde_json::Value>,
+    /// Whether this server is a built-in fallback used when the user has not configured their own server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_default_server: Option<bool>,
+    /// Copilot notification types this server may send to the host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub notifications: Option<Vec<String>>,
+    /// Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub oidc: Option<serde_json::Value>,
+    /// Telemetry-obfuscation policy for this server's tools.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub safe_for_telemetry: Option<serde_json::Value>,
+    /// The origin of this server configuration.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<McpServerSource>,
+    /// Source file path recorded while loading the config.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_path: Option<String>,
+    /// Plugin that provided this server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin: Option<String>,
+    /// Whether the providing plugin uses the Open Plugin Spec.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin_spec: Option<bool>,
+    /// Version of the plugin that provided this server.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_plugin_version: Option<String>,
+    /// Timeout in milliseconds for tool discovery and tool calls.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout: Option<i64>,
+    /// Tools to include. Defaults to all tools if not specified.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tools: Option<Vec<String>>,
+    /// Local transport type. Defaults to stdio when omitted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#type: Option<McpServerConfigStdioType>,
 }
 
-/// Permission-decision request variant to approve only the current permission request.
+/// MCP servers configured for the session, with their connection status and host-level state.
 ///
 /// <div class="warning">
 ///
@@ -8666,15 +9266,15 @@ pub struct PendingPermissionRequestList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveOnce {
-    /// True only when a host surfaced this request to a user who approved it.
+pub struct McpServerList {
+    /// Host-level state, omitted when no MCP host is initialized.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub approved_interactively: Option<bool>,
-    /// Approve this single request only
-    pub kind: PermissionDecisionApproveOnceKind,
+    pub host: Option<McpHostState>,
+    /// Configured MCP servers
+    pub servers: Vec<McpServer>,
 }
 
-/// Session-scoped approval details for specific command identifiers.
+/// Mode controlling how MCP server env values are resolved (`direct` or `indirect`).
 ///
 /// <div class="warning">
 ///
@@ -8684,14 +9284,12 @@ pub struct PermissionDecisionApproveOnce {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalCommands {
-    /// Command identifiers covered by this approval.
-    pub command_identifiers: Vec<String>,
-    /// Approval scoped to specific command identifiers.
-    pub kind: PermissionDecisionApproveForSessionApprovalCommandsKind,
+pub struct McpSetEnvValueModeParams {
+    /// How environment-variable values supplied to MCP servers are resolved. "direct" passes literal string values; "indirect" treats values as references (e.g. names of environment variables on the host) that the runtime resolves before launch. Defaults to the runtime's startup mode; clients that intentionally launch MCP servers with literal values (e.g. CLI prompt mode and ACP) set this to "direct".
+    pub mode: McpSetEnvValueModeDetails,
 }
 
-/// Session-scoped approval details for read-only filesystem operations.
+/// Env-value mode recorded on the session after the update.
 ///
 /// <div class="warning">
 ///
@@ -8701,12 +9299,12 @@ pub struct PermissionDecisionApproveForSessionApprovalCommands {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalRead {
-    /// Approval covering read-only filesystem operations.
-    pub kind: PermissionDecisionApproveForSessionApprovalReadKind,
+pub struct McpSetEnvValueModeResult {
+    /// Mode recorded on the session after the update
+    pub mode: McpSetEnvValueModeDetails,
 }
 
-/// Session-scoped approval details for filesystem write operations.
+/// Server name and optional configuration for an individual MCP server start. Omit `config` for a config-free start-by-name of an already-configured server.
 ///
 /// <div class="warning">
 ///
@@ -8716,12 +9314,15 @@ pub struct PermissionDecisionApproveForSessionApprovalRead {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalWrite {
-    /// Approval covering filesystem write operations.
-    pub kind: PermissionDecisionApproveForSessionApprovalWriteKind,
+pub struct McpStartServerRequest {
+    /// MCP server configuration (stdio process or remote HTTP/SSE). Omit to start the server with its already-registered configuration (config-free start-by-name).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config: Option<serde_json::Value>,
+    /// Name of the MCP server to start
+    pub server_name: String,
 }
 
-/// Session-scoped approval details for an MCP server tool, or all tools on the server when `toolName` is null.
+/// MCP server startup filtering result.
 ///
 /// <div class="warning">
 ///
@@ -8731,16 +9332,18 @@ pub struct PermissionDecisionApproveForSessionApprovalWrite {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalMcp {
-    /// Approval covering an MCP tool.
-    pub kind: PermissionDecisionApproveForSessionApprovalMcpKind,
-    /// MCP server name.
-    pub server_name: String,
-    /// MCP tool name, or null to cover every tool on the server.
-    pub tool_name: Option<String>,
+pub struct McpStartServersResult {
+    /// Non-default servers allowed by policy
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub allowed_servers: Option<Vec<McpAllowedServer>>,
+    /// Servers whose connection attempt failed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub failed_servers: Option<Vec<McpFailedServer>>,
+    /// Servers filtered out before startup
+    pub filtered_servers: Vec<McpFilteredServer>,
 }
 
-/// Session-scoped approval details for MCP sampling requests from a server.
+/// Server name for an individual MCP server stop.
 ///
 /// <div class="warning">
 ///
@@ -8750,14 +9353,12 @@ pub struct PermissionDecisionApproveForSessionApprovalMcp {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalMcpSampling {
-    /// Approval covering MCP sampling requests for a server.
-    pub kind: PermissionDecisionApproveForSessionApprovalMcpSamplingKind,
-    /// MCP server name.
+pub struct McpStopServerRequest {
+    /// Name of the MCP server to stop
     pub server_name: String,
 }
 
-/// Session-scoped approval details for writes to long-term memory.
+/// Metadata controlling an MCP task's lifetime.
 ///
 /// <div class="warning">
 ///
@@ -8767,12 +9368,13 @@ pub struct PermissionDecisionApproveForSessionApprovalMcpSampling {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalMemory {
-    /// Approval covering writes to long-term memory.
-    pub kind: PermissionDecisionApproveForSessionApprovalMemoryKind,
+pub struct McpTaskMetadata {
+    /// Task time-to-live.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ttl: Option<i64>,
 }
 
-/// Session-scoped approval details for a custom tool, keyed by tool name.
+/// Server name identifying the external client to remove.
 ///
 /// <div class="warning">
 ///
@@ -8782,14 +9384,12 @@ pub struct PermissionDecisionApproveForSessionApprovalMemory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalCustomTool {
-    /// Approval covering a custom tool.
-    pub kind: PermissionDecisionApproveForSessionApprovalCustomToolKind,
-    /// Custom tool name.
-    pub tool_name: String,
+pub(crate) struct McpUnregisterExternalClientRequest {
+    /// Server name of the external client to unregister
+    pub server_name: String,
 }
 
-/// Session-scoped approval details for extension-management operations, optionally narrowed by operation.
+/// Memory configuration for this session.
 ///
 /// <div class="warning">
 ///
@@ -8799,33 +9399,85 @@ pub struct PermissionDecisionApproveForSessionApprovalCustomTool {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalExtensionManagement {
-    /// Approval covering extension lifecycle operations such as enable, disable, or reload.
-    pub kind: PermissionDecisionApproveForSessionApprovalExtensionManagementKind,
-    /// Optional operation identifier; when omitted, the approval covers all extension management operations.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub operation: Option<String>,
+pub struct MemoryConfiguration {
+    /// Whether memory is enabled for the session.
+    pub enabled: bool,
 }
 
-/// Session-scoped factory approval, optionally narrowed by approval key.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalFactory {
-    /// Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.
+pub struct MetadataContextAttributionResultContextAttributionCategories {
+    /// Output reserve plus post-blocking-threshold buffer.
+    pub buffer: i64,
+    /// Custom-instructions tokens (0 when none are configured).
+    pub custom_instructions: i64,
+    /// Remaining unused window capacity (clamped at 0).
+    pub free_space: i64,
+    /// MCP tool-definition tokens.
+    pub mcp_tools: i64,
+    /// Conversation (user/assistant/tool) message tokens.
+    pub messages: i64,
+    /// System prompt tokens, excluding custom instructions.
+    pub system_prompt: i64,
+    /// Non-MCP tool-definition tokens.
+    pub system_tools: i64,
+}
+
+/// Successful compaction history for the session.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MetadataContextAttributionResultContextAttributionCompactions {
+    /// Number of successful compactions in this session.
+    pub count: i64,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MetadataContextAttributionResultContextAttributionEntriesItem {
+    /// Supplementary per-entry metadata (e.g. `messageCount`, `role`, `evictable`, `pluginSource`). Values are stringified; parse as needed and ignore unrecognized keys.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub approval_key: Option<String>,
-    /// Approval covering factory operations.
-    pub kind: PermissionDecisionApproveForSessionApprovalFactoryKind,
+    pub attributes: Option<HashMap<String, String>>,
+    /// Identifier for this entry, formed by joining its `kind` and source name (e.g. `tool:bash`, `skill:tmux`, `toolDefinition:bash`); unique within the snapshot. Use it to match the same entry across snapshots, to correlate with other APIs (skill/agent/MCP registries), and as the `parentId` target for nesting. Distinct from the human-facing `label`.
+    pub id: String,
+    /// Source category for this entry. Not a closed set — tolerate unknown values. Known values today: `skill`, `subagent`, `mcpServer`, `tool`, `system`, `toolDefinition`, `plugin`.
+    pub kind: String,
+    /// Human-readable display label, e.g. `bash` or `skill: tmux`. Presentation-only; may be localized/reformatted without notice — do not key off it.
+    pub label: String,
+    /// Optional `id` of the parent entry: e.g. a `plugin` entry parenting its `skill`/`mcpServer` entries, or the `system` entry parenting `toolDefinition` entries. Omitted for top-level entries.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parent_id: Option<String>,
+    /// Token count currently in context attributable to this entry.
+    pub tokens: i64,
 }
 
-/// Session-scoped approval details for an extension's permission-gated capability access, keyed by extension name.
+/// Per-source token attribution snapshot for the current context window. The heaviest individual messages are available separately via `metadata.getContextHeaviestMessages`.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MetadataContextAttributionResultContextAttribution {
+    /// Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`.
+    pub buffer_tokens: i64,
+    /// The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`.
+    pub categories: MetadataContextAttributionResultContextAttributionCategories,
+    /// Successful compaction history for the session.
+    pub compactions: MetadataContextAttributionResultContextAttributionCompactions,
+    /// Token count at which background compaction starts. Mirrors `SessionContextInfo.compactionThreshold`.
+    pub compaction_threshold: i64,
+    /// Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`.
+    pub entries: Vec<MetadataContextAttributionResultContextAttributionEntriesItem>,
+    /// Prompt limit plus the model's output reserve: the full context window `categories.freeSpace` and `categories.buffer` are measured against. Mirrors `SessionContextInfo.limit`.
+    pub limit: i64,
+    /// The concrete model id the entire breakdown was tokenized against (feeds the per-model token multiplier). Under `Auto` (Free/Student) this is the resolved model, not the literal `auto` sentinel, so totals are not undercounted. A single-model approximation of a potentially multi-model Auto session.
+    pub model_id: String,
+    /// How `modelId` was chosen. Not a closed set — tolerate unknown values. Known values today: `autoResolved` (the model Auto resolved to), `selected` (the user's explicitly selected model), `default` (a fallback before any model is known).
+    pub model_source: String,
+    /// Maximum prompt tokens the resolved model accepts — the denominator for a `##k/###k` context-usage display. Mirrors `SessionContextInfo.promptTokenLimit`.
+    pub prompt_token_limit: i64,
+    /// Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share.
+    pub total_tokens: i64,
+}
+
+/// Per-source attribution breakdown for the session's current context window, or null if uninitialized.
 ///
 /// <div class="warning">
 ///
@@ -8835,14 +9487,12 @@ pub struct PermissionDecisionApproveForSessionApprovalFactory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess {
-    /// Extension name.
-    pub extension_name: String,
-    /// Approval covering an extension's request to access a permission-gated capability.
-    pub kind: PermissionDecisionApproveForSessionApprovalExtensionPermissionAccessKind,
+pub struct MetadataContextAttributionResult {
+    /// Per-source context-window attribution, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
+    pub context_attribution: Option<MetadataContextAttributionResultContextAttribution>,
 }
 
-/// Permission-decision request variant to approve for the rest of the session, with optional tool approval or URL domain.
+/// Parameters for the heaviest-messages query.
 ///
 /// <div class="warning">
 ///
@@ -8852,18 +9502,13 @@ pub struct PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForSession {
-    /// Session-scoped approval to remember (tool prompts only; omitted for path/url prompts)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub approval: Option<PermissionDecisionApproveForSessionApproval>,
-    /// URL domain to approve for the rest of the session (URL prompts only)
+pub struct MetadataContextHeaviestMessagesRequest {
+    /// Maximum number of messages to return, most-expensive first. Omit for the server default.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub domain: Option<String>,
-    /// Approve and remember for the rest of the session
-    pub kind: PermissionDecisionApproveForSessionKind,
+    pub limit: Option<i64>,
 }
 
-/// Location-scoped approval details for specific command identifiers.
+/// The heaviest individual messages in the session's context window, most-expensive first.
 ///
 /// <div class="warning">
 ///
@@ -8873,14 +9518,14 @@ pub struct PermissionDecisionApproveForSession {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalCommands {
-    /// Command identifiers covered by this approval.
-    pub command_identifiers: Vec<String>,
-    /// Approval scoped to specific command identifiers.
-    pub kind: PermissionDecisionApproveForLocationApprovalCommandsKind,
+pub struct MetadataContextHeaviestMessagesResult {
+    /// Heaviest messages, most-expensive first.
+    pub messages: Vec<ContextHeaviestMessage>,
+    /// Total token count of the current context window, so callers can compute each message's share without a second call.
+    pub total_tokens: i64,
 }
 
-/// Location-scoped approval details for read-only filesystem operations.
+/// Model identifier and token limits used to compute the context-info breakdown.
 ///
 /// <div class="warning">
 ///
@@ -8890,12 +9535,43 @@ pub struct PermissionDecisionApproveForLocationApprovalCommands {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalRead {
-    /// Approval covering read-only filesystem operations.
-    pub kind: PermissionDecisionApproveForLocationApprovalReadKind,
+pub struct MetadataContextInfoRequest {
+    /// Maximum output tokens allowed by the target model. Pass 0 if unknown.
+    pub output_token_limit: i64,
+    /// Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default.
+    pub prompt_token_limit: i64,
+    /// Model identifier used for tokenization. Omit to use the session default. Used both for token counting and to compute display values.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub selected_model: Option<String>,
 }
 
-/// Location-scoped approval details for filesystem write operations.
+/// Token-usage breakdown for the session's current context window
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MetadataContextInfoResultContextInfo {
+    /// Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%)
+    pub buffer_tokens: i64,
+    /// Token count at which background compaction starts (configurable percentage of promptTokenLimit)
+    pub compaction_threshold: i64,
+    /// Tokens consumed by user/assistant/tool messages
+    pub conversation_tokens: i64,
+    /// Prompt token limit plus the model's full output token limit.
+    pub limit: i64,
+    /// Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools)
+    pub mcp_tools_tokens: i64,
+    /// The model used for token counting
+    pub model_name: String,
+    /// Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified)
+    pub prompt_token_limit: i64,
+    /// Tokens consumed by the system prompt
+    pub system_tokens: i64,
+    /// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
+    pub tool_definitions_tokens: i64,
+    /// Sum of system, conversation and tool-definition tokens
+    pub total_tokens: i64,
+}
+
+/// Token breakdown for the session's current context window, or null if uninitialized.
 ///
 /// <div class="warning">
 ///
@@ -8905,12 +9581,12 @@ pub struct PermissionDecisionApproveForLocationApprovalRead {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalWrite {
-    /// Approval covering filesystem write operations.
-    pub kind: PermissionDecisionApproveForLocationApprovalWriteKind,
+pub struct MetadataContextInfoResult {
+    /// Token breakdown for the current context window, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
+    pub context_info: Option<MetadataContextInfoResultContextInfo>,
 }
 
-/// Location-scoped approval details for an MCP server tool, or all tools on the server when `toolName` is null.
+/// Indicates whether the local session is currently processing a turn or background continuation.
 ///
 /// <div class="warning">
 ///
@@ -8920,16 +9596,12 @@ pub struct PermissionDecisionApproveForLocationApprovalWrite {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalMcp {
-    /// Approval covering an MCP tool.
-    pub kind: PermissionDecisionApproveForLocationApprovalMcpKind,
-    /// MCP server name.
-    pub server_name: String,
-    /// MCP tool name, or null to cover every tool on the server.
-    pub tool_name: Option<String>,
+pub struct MetadataIsProcessingResult {
+    /// Whether the session is currently processing user/agent messages. False for non-local sessions (which don't run a local agentic loop). Reflects an in-flight turn or background continuation.
+    pub processing: bool,
 }
 
-/// Location-scoped approval details for MCP sampling requests from a server.
+/// Model identifier to use when re-tokenizing the session's existing messages.
 ///
 /// <div class="warning">
 ///
@@ -8939,14 +9611,12 @@ pub struct PermissionDecisionApproveForLocationApprovalMcp {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalMcpSampling {
-    /// Approval covering MCP sampling requests for a server.
-    pub kind: PermissionDecisionApproveForLocationApprovalMcpSamplingKind,
-    /// MCP server name.
-    pub server_name: String,
+pub struct MetadataRecomputeContextTokensRequest {
+    /// Model identifier used for tokenization. The runtime token-counts both chat-context and system-context messages against this model.
+    pub model_id: String,
 }
 
-/// Location-scoped approval details for writes to long-term memory.
+/// Re-tokenize the session's existing messages against `modelId` and return the token totals. Useful for hosts that want an initial estimate of context usage on session resume, before the next agent turn fires `session.context_info_changed` events. Returns zeros for an empty session.
 ///
 /// <div class="warning">
 ///
@@ -8956,12 +9626,16 @@ pub struct PermissionDecisionApproveForLocationApprovalMcpSampling {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalMemory {
-    /// Approval covering writes to long-term memory.
-    pub kind: PermissionDecisionApproveForLocationApprovalMemoryKind,
+pub struct MetadataRecomputeContextTokensResult {
+    /// Tokens contributed by user/assistant/tool messages (excludes system/developer prompts).
+    pub messages_token_count: i64,
+    /// Tokens contributed by system/developer prompt snapshots.
+    pub system_token_count: i64,
+    /// Sum of tokens across chat-context and system-context messages currently held by the session.
+    pub total_tokens: i64,
 }
 
-/// Location-scoped approval details for a custom tool, keyed by tool name.
+/// Updated working directory and git context. Emitted as the new payload of `session.context_changed`.
 ///
 /// <div class="warning">
 ///
@@ -8971,14 +9645,33 @@ pub struct PermissionDecisionApproveForLocationApprovalMemory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalCustomTool {
-    /// Approval covering a custom tool.
-    pub kind: PermissionDecisionApproveForLocationApprovalCustomToolKind,
-    /// Custom tool name.
-    pub tool_name: String,
+pub struct SessionWorkingDirectoryContext {
+    /// Merge-base commit SHA (fork point from the remote default branch)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub base_commit: Option<String>,
+    /// Current git branch name
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// Current working directory path
+    pub cwd: String,
+    /// Root directory of the git repository, resolved via git rev-parse
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Head commit of the current git branch
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub head_commit: Option<String>,
+    /// Hosting platform type of the repository
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<SessionWorkingDirectoryContextHostType>,
+    /// Repository identifier derived from the git remote URL ("owner/name" for GitHub, "org/project/repo" for Azure DevOps)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// Raw host string from the git remote URL (e.g. "github.com", "dev.azure.com")
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository_host: Option<String>,
 }
 
-/// Location-scoped approval details for extension-management operations, optionally narrowed by operation.
+/// Updated working-directory/git context to record on the session.
 ///
 /// <div class="warning">
 ///
@@ -8988,15 +9681,12 @@ pub struct PermissionDecisionApproveForLocationApprovalCustomTool {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalExtensionManagement {
-    /// Approval covering extension lifecycle operations such as enable, disable, or reload.
-    pub kind: PermissionDecisionApproveForLocationApprovalExtensionManagementKind,
-    /// Optional operation identifier; when omitted, the approval covers all extension management operations.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub operation: Option<String>,
+pub struct MetadataRecordContextChangeRequest {
+    /// Updated working directory and git context. Emitted as the new payload of `session.context_changed`.
+    pub context: SessionWorkingDirectoryContext,
 }
 
-/// Location-scoped factory approval, optionally narrowed by approval key.
+/// Notify the session that its working directory context has changed. Emits a `session.context_changed` event so consumers (telemetry, OTel tracker, ACP, the timeline UI) can react. Use this when the host has detected a cwd/branch/repo change outside the session's normal lifecycle (e.g., after a shell command in interactive mode). For a local session, a report whose `cwd` diverges from the session's current working directory is ignored (the call still succeeds but records nothing and emits no event); move a local session's working directory via `metadata.setWorkingDirectory` instead.
 ///
 /// <div class="warning">
 ///
@@ -9006,15 +9696,9 @@ pub struct PermissionDecisionApproveForLocationApprovalExtensionManagement {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalFactory {
-    /// Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub approval_key: Option<String>,
-    /// Approval covering factory operations.
-    pub kind: PermissionDecisionApproveForLocationApprovalFactoryKind,
-}
+pub struct MetadataRecordContextChangeResult {}
 
-/// Location-scoped approval details for an extension's permission-gated capability access, keyed by extension name.
+/// Absolute path to set as the session's new working directory. For local sessions the path must be absolute and exist on disk: it is validated before any session state changes, and a failing validation rejects the call with nothing mutated, persisted, or emitted. Remote sessions record the path as-is.
 ///
 /// <div class="warning">
 ///
@@ -9024,14 +9708,12 @@ pub struct PermissionDecisionApproveForLocationApprovalFactory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess {
-    /// Extension name.
-    pub extension_name: String,
-    /// Approval covering an extension's request to access a permission-gated capability.
-    pub kind: PermissionDecisionApproveForLocationApprovalExtensionPermissionAccessKind,
+pub struct MetadataSetWorkingDirectoryRequest {
+    /// Absolute path to set as the session's working directory. The runtime updates the session's recorded cwd so subsequent operations (shell tools, file lookups, telemetry) anchor to it.
+    pub working_directory: String,
 }
 
-/// Permission-decision request variant to approve and persist a permission for a project location, with approval details and location key.
+/// Update the session's working directory. Used by the host when the user explicitly changes cwd (e.g., the `/cd` slash command). The host is responsible for any related side-effects (file index, etc.); it does NOT change the process working directory (a session's cwd is per-session, not process-global). For local sessions the runtime validates the target first (an absolute path that exists on disk) and re-bases the permission primary directory; a rejected validation fails the call before anything is mutated, persisted, or emitted. Location-scoped permission rules are then re-keyed to the new directory (best-effort). Remote sessions only record the path.
 ///
 /// <div class="warning">
 ///
@@ -9039,18 +9721,14 @@ pub struct PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproveForLocation {
-    /// Approval to persist for this location
-    pub approval: PermissionDecisionApproveForLocationApproval,
-    /// Approve and persist for this project location
-    pub kind: PermissionDecisionApproveForLocationKind,
-    /// Location key (git root or cwd) to persist the approval to
-    pub location_key: String,
+pub struct MetadataSetWorkingDirectoryResult {
+    /// Working directory after the update
+    pub working_directory: String,
 }
 
-/// Permission-decision request variant to permanently approve a URL domain across sessions.
+/// The repository the remote session targets.
 ///
 /// <div class="warning">
 ///
@@ -9060,14 +9738,16 @@ pub struct PermissionDecisionApproveForLocation {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApprovePermanently {
-    /// URL domain to approve permanently
-    pub domain: String,
-    /// Approve and persist across sessions (URL prompts only)
-    pub kind: PermissionDecisionApprovePermanentlyKind,
+pub struct MetadataSnapshotRemoteMetadataRepository {
+    /// The branch the remote session is operating on.
+    pub branch: String,
+    /// The GitHub repository name (without owner).
+    pub name: String,
+    /// The GitHub owner (user or organization) of the target repository.
+    pub owner: String,
 }
 
-/// Permission-decision request variant to reject a pending permission request, with optional feedback.
+/// Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.
 ///
 /// <div class="warning">
 ///
@@ -9077,15 +9757,21 @@ pub struct PermissionDecisionApprovePermanently {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionReject {
-    /// Optional feedback explaining the rejection
+pub struct MetadataSnapshotRemoteMetadata {
+    /// The pull request number the remote session is associated with, if any.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub feedback: Option<String>,
-    /// Reject the request
-    pub kind: PermissionDecisionRejectKind,
+    pub pull_request_number: Option<i64>,
+    /// The repository the remote session targets.
+    pub repository: MetadataSnapshotRemoteMetadataRepository,
+    /// The original resource identifier (task ID or PR node ID), preserved across event-replay reconstructions. Falls back to `sessionId` when absent.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub resource_id: Option<String>,
+    /// Whether the remote task originated from Copilot Coding Agent (cca) or a CLI `--remote` invocation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task_type: Option<MetadataSnapshotRemoteMetadataTaskType>,
 }
 
-/// Permission-decision variant indicating no user was available to confirm the request.
+/// Active server-driven promotion for a model, including its discount and optional expiry.
 ///
 /// <div class="warning">
 ///
@@ -9095,12 +9781,22 @@ pub struct PermissionDecisionReject {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionUserNotAvailable {
-    /// No user is available to confirm the request
-    pub kind: PermissionDecisionUserNotAvailableKind,
+pub struct ModelBillingPromo {
+    /// Percentage discount (0-100) applied while the promotion is active. May be fractional.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub discount_percent: Option<f64>,
+    /// UTC ISO 8601 timestamp marking when the promotion ends. Optional: an open-ended promotion omits this field. When present, the API only surfaces a promo whose expiry parses and is in the future, so consumers should treat a past value as expired.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ends_at: Option<String>,
+    /// Stable identifier for the promotion campaign.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub id: Option<String>,
+    /// Human-readable promotion message. Does not include the expiry timestamp; consumers may format endsAt and append it when present.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
 }
 
-/// Permission-decision variant indicating the request was approved.
+/// Long context tier pricing (available for models with extended context windows)
 ///
 /// <div class="warning">
 ///
@@ -9110,12 +9806,38 @@ pub struct PermissionDecisionUserNotAvailable {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApproved {
-    /// The permission request was approved
-    pub kind: PermissionDecisionApprovedKind,
+pub struct ModelBillingTokenPricesLongContext {
+    /// Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
+    #[doc(hidden)]
+    #[deprecated]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cache_price: Option<f64>,
+    /// AI Credits cost per billing batch of cached (read) tokens
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cache_read_price: Option<f64>,
+    /// AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cache_write1h_price: Option<f64>,
+    /// AI Credits cost per billing batch of cache-write (cache creation) tokens.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cache_write_price: Option<f64>,
+    /// Use maxPromptTokens instead. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.
+    #[doc(hidden)]
+    #[deprecated]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_max: Option<i64>,
+    /// AI Credits cost per billing batch of input tokens
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input_price: Option<f64>,
+    /// Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_prompt_tokens: Option<i64>,
+    /// AI Credits cost per billing batch of output tokens
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub output_price: Option<f64>,
 }
 
-/// Permission-decision variant indicating approval was remembered for the session, with approval details.
+/// Token-level pricing information for this model
 ///
 /// <div class="warning">
 ///
@@ -9123,16 +9845,46 @@ pub struct PermissionDecisionApproved {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApprovedForSession {
-    /// The approval to add as a session-scoped rule
-    pub approval: UserToolSessionApproval,
-    /// Approved and remembered for the rest of the session
-    pub kind: PermissionDecisionApprovedForSessionKind,
+pub struct ModelBillingTokenPrices {
+    /// Number of tokens per standard billing batch
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub batch_size: Option<i64>,
+    /// Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
+    #[doc(hidden)]
+    #[deprecated]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cache_price: Option<f64>,
+    /// AI Credits cost per billing batch of cached (read) tokens
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cache_read_price: Option<f64>,
+    /// AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cache_write1h_price: Option<f64>,
+    /// AI Credits cost per billing batch of cache-write (cache creation) tokens.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cache_write_price: Option<f64>,
+    /// Use maxPromptTokens instead. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.
+    #[doc(hidden)]
+    #[deprecated]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_max: Option<i64>,
+    /// AI Credits cost per billing batch of input tokens
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input_price: Option<f64>,
+    /// Long context tier pricing (available for models with extended context windows)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub long_context: Option<ModelBillingTokenPricesLongContext>,
+    /// Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_prompt_tokens: Option<i64>,
+    /// AI Credits cost per billing batch of output tokens
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub output_price: Option<f64>,
 }
 
-/// Permission-decision variant indicating approval was persisted for a project location, with approval details and location key.
+/// Billing information
 ///
 /// <div class="warning">
 ///
@@ -9140,18 +9892,24 @@ pub struct PermissionDecisionApprovedForSession {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionApprovedForLocation {
-    /// The approval to persist for this location
-    pub approval: UserToolSessionApproval,
-    /// Approved and persisted for this project location
-    pub kind: PermissionDecisionApprovedForLocationKind,
-    /// The location key (git root or cwd) to persist the approval to
-    pub location_key: String,
+pub struct ModelBilling {
+    /// Whole-number percentage discount (0-100) applied to usage billed through this model. Populated for the synthetic `auto` model, where requests routed by auto-mode are billed at a reduced rate; absent for concrete models.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub discount_percent: Option<i32>,
+    /// Billing cost multiplier relative to the base rate
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub multiplier: Option<f64>,
+    /// Active server-driven promotion for this model, if any. Present when the model is being promoted with a discount, which may be time-boxed or open-ended.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub promo: Option<ModelBillingPromo>,
+    /// Token-level pricing information for this model
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub token_prices: Option<ModelBillingTokenPrices>,
 }
 
-/// Permission-decision variant indicating the request was cancelled before use, with an optional reason.
+/// Vision-specific limits
 ///
 /// <div class="warning">
 ///
@@ -9161,15 +9919,19 @@ pub struct PermissionDecisionApprovedForLocation {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionCancelled {
-    /// The permission request was cancelled before a response was used
-    pub kind: PermissionDecisionCancelledKind,
-    /// Optional explanation of why the request was cancelled
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
+pub struct ModelCapabilitiesLimitsVision {
+    /// Maximum image size in bytes
+    #[serde(rename = "max_prompt_image_size")]
+    pub max_prompt_image_size: i64,
+    /// Maximum number of images per prompt
+    #[serde(rename = "max_prompt_images")]
+    pub max_prompt_images: i64,
+    /// MIME types the model accepts
+    #[serde(rename = "supported_media_types")]
+    pub supported_media_types: Vec<String>,
 }
 
-/// Permission-decision variant indicating explicit denial by permission rules, with the matching rules.
+/// Token limits for prompts, outputs, and context window
 ///
 /// <div class="warning">
 ///
@@ -9179,14 +9941,25 @@ pub struct PermissionDecisionCancelled {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionDeniedByRules {
-    /// Denied because approval rules explicitly blocked it
-    pub kind: PermissionDecisionDeniedByRulesKind,
-    /// Rules that denied the request
-    pub rules: Vec<PermissionRule>,
+pub struct ModelCapabilitiesLimits {
+    /// Maximum total context window size in tokens
+    #[serde(
+        rename = "max_context_window_tokens",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub max_context_window_tokens: Option<i64>,
+    /// Maximum number of output/completion tokens
+    #[serde(rename = "max_output_tokens", skip_serializing_if = "Option::is_none")]
+    pub max_output_tokens: Option<i64>,
+    /// Maximum number of prompt/input tokens
+    #[serde(rename = "max_prompt_tokens", skip_serializing_if = "Option::is_none")]
+    pub max_prompt_tokens: Option<i64>,
+    /// Vision-specific limits
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub vision: Option<ModelCapabilitiesLimitsVision>,
 }
 
-/// Permission-decision variant indicating no approval rule matched and user confirmation was unavailable.
+/// Feature flags indicating what the model supports
 ///
 /// <div class="warning">
 ///
@@ -9196,12 +9969,19 @@ pub struct PermissionDecisionDeniedByRules {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser {
-    /// Denied because no approval rule matched and user confirmation was unavailable
-    pub kind: PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUserKind,
+pub struct ModelCapabilitiesSupports {
+    /// Resolved Anthropic adaptive-thinking capability — unsupported / optional / required. 'required' models reject thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8).
+    #[serde(rename = "adaptive_thinking", skip_serializing_if = "Option::is_none")]
+    pub adaptive_thinking: Option<AdaptiveThinkingSupport>,
+    /// Whether this model supports reasoning effort configuration
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<bool>,
+    /// Whether this model supports vision/image input
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub vision: Option<bool>,
 }
 
-/// Permission-decision variant indicating the user denied an interactive prompt, with optional feedback and force-reject flag.
+/// Model capabilities and limits
 ///
 /// <div class="warning">
 ///
@@ -9211,18 +9991,16 @@ pub struct PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionDeniedInteractivelyByUser {
-    /// Optional feedback from the user explaining the denial
+pub struct ModelCapabilities {
+    /// Token limits for prompts, outputs, and context window
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub feedback: Option<String>,
-    /// Whether to force-reject the current agent turn
+    pub limits: Option<ModelCapabilitiesLimits>,
+    /// Feature flags indicating what the model supports
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub force_reject: Option<bool>,
-    /// Denied by the user during an interactive prompt
-    pub kind: PermissionDecisionDeniedInteractivelyByUserKind,
+    pub supports: Option<ModelCapabilitiesSupports>,
 }
 
-/// Permission-decision variant indicating denial by content-exclusion policy, with path and message.
+/// A service-published message about a model, carrying a stable machine-readable code alongside human-readable text.
 ///
 /// <div class="warning">
 ///
@@ -9232,16 +10010,14 @@ pub struct PermissionDecisionDeniedInteractivelyByUser {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionDeniedByContentExclusionPolicy {
-    /// Denied by the organization's content exclusion policy
-    pub kind: PermissionDecisionDeniedByContentExclusionPolicyKind,
-    /// Human-readable explanation of why the path was excluded
+pub struct ModelMessage {
+    /// Stable machine-readable identifier for the message, such as `client_version_deprecated`. Hosts can key custom presentation off this; unrecognized codes should fall back to displaying `message`.
+    pub code: String,
+    /// Human-readable message text intended for display to the user.
     pub message: String,
-    /// File path that triggered the exclusion
-    pub path: String,
 }
 
-/// Permission-decision variant indicating denial by a permission request hook, with optional message and interrupt flag.
+/// Policy state (if applicable)
 ///
 /// <div class="warning">
 ///
@@ -9251,35 +10027,15 @@ pub struct PermissionDecisionDeniedByContentExclusionPolicy {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionDeniedByPermissionRequestHook {
-    /// Whether to interrupt the current agent turn
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub interrupt: Option<bool>,
-    /// Denied by a permission request hook registered by an extension or plugin
-    pub kind: PermissionDecisionDeniedByPermissionRequestHookKind,
-    /// Optional message from the hook explaining the denial
+pub struct ModelPolicy {
+    /// Current policy state for this model
+    pub state: ModelPolicyState,
+    /// Usage terms or conditions for this model
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub message: Option<String>,
-}
-
-/// Pending permission request ID and the decision to apply (approve/reject and scope).
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PermissionDecisionRequest {
-    /// Request ID of the pending permission request
-    pub request_id: RequestId,
-    /// The client's response to the pending permission prompt
-    pub result: PermissionDecision,
+    pub terms: Option<String>,
 }
 
-/// Location-persisted tool approval details for specific command identifiers.
+/// Service-published warning text that hosts should display when presenting a model.
 ///
 /// <div class="warning">
 ///
@@ -9289,14 +10045,13 @@ pub struct PermissionDecisionRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsCommands {
-    /// Command identifiers covered by this approval.
-    pub command_identifiers: Vec<String>,
-    /// Approval scoped to specific command identifiers.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsCommandsKind,
+pub struct ModelWarningText {
+    /// Data-retention warning for the model. The text may contain Markdown links and should be rendered as Markdown when supported.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub data_retention: Option<String>,
 }
 
-/// Location-persisted tool approval details for read-only filesystem operations.
+/// Copilot model metadata, including identifier, display name, capabilities, policy, billing, reasoning efforts, and picker categories.
 ///
 /// <div class="warning">
 ///
@@ -9306,12 +10061,46 @@ pub struct PermissionsLocationsAddToolApprovalDetailsCommands {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsRead {
-    /// Approval covering read-only filesystem operations.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsReadKind,
-}
-
-/// Location-persisted tool approval details for filesystem write operations.
+pub struct Model {
+    /// Billing information
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub billing: Option<ModelBilling>,
+    /// Model capabilities and limits
+    pub capabilities: ModelCapabilities,
+    /// Default reasoning effort level (only present if model supports reasoning effort)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub default_reasoning_effort: Option<String>,
+    /// Model identifier (e.g., "claude-sonnet-4.5")
+    pub id: String,
+    /// Informational notices the service published for this model, such as an upcoming change or a recommended alternative. Present only when the service published at least one notice. Hosts should surface these without implying anything is wrong with the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub info_messages: Option<Vec<ModelMessage>>,
+    /// Model capability category for grouping in the model picker
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_picker_category: Option<ModelPickerCategory>,
+    /// Relative cost tier for token-based billing users
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_picker_price_category: Option<ModelPickerPriceCategory>,
+    /// Display name
+    pub name: String,
+    /// Policy state (if applicable)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy: Option<ModelPolicy>,
+    /// Context-window tiers this model offers, when the provider advertises them independently of tiered token pricing. Copilot models carry their tiers in `billing.tokenPrices`; a provider that has no pricing to publish (an agent host reached over AHP, for example) declares them here instead, so the model picker can still offer the tier toggle.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub supported_context_tiers: Option<Vec<String>>,
+    /// Supported reasoning effort levels (only present if model supports reasoning effort)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub supported_reasoning_efforts: Option<Vec<String>>,
+    /// Warnings the service published for this model, such as a deprecated client version. Present only when the service published at least one warning. The model remains usable; hosts should surface these as advisory rather than blocking.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning_messages: Option<Vec<ModelMessage>>,
+    /// Warning text the service requires hosts to surface for this model. Present only when the service published at least one warning.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning_text: Option<ModelWarningText>,
+}
+
+/// Managed, repository, and CLI model overrides to overlay onto the session at startup.
 ///
 /// <div class="warning">
 ///
@@ -9321,12 +10110,31 @@ pub struct PermissionsLocationsAddToolApprovalDetailsRead {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsWrite {
-    /// Approval covering filesystem write operations.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsWriteKind,
+pub struct ModelApplyStartupOverlayRequest {
+    /// Model explicitly selected by the CLI, when provided.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cli_model: Option<String>,
+    /// Whether the overlay is being applied while resuming a deferred session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deferred_resume: Option<bool>,
+    /// Model required by device-managed policy, when configured.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_managed_model: Option<String>,
+    /// Context tier selected by repository settings, when configured.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_context_tier: Option<String>,
+    /// Model selected by repository settings, when configured.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_model: Option<String>,
+    /// Reasoning effort selected by repository settings, when configured.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_reasoning_effort: Option<String>,
+    /// Model required by server-managed policy, when configured.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_managed_model: Option<String>,
 }
 
-/// Location-persisted tool approval details for an MCP server tool, or all tools when `toolName` is null.
+/// Vision-specific limits
 ///
 /// <div class="warning">
 ///
@@ -9336,16 +10144,25 @@ pub struct PermissionsLocationsAddToolApprovalDetailsWrite {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsMcp {
-    /// Approval covering an MCP tool.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsMcpKind,
-    /// MCP server name.
-    pub server_name: String,
-    /// MCP tool name, or null to cover every tool on the server.
-    pub tool_name: Option<String>,
+pub struct ModelCapabilitiesOverrideLimitsVision {
+    /// Maximum image size in bytes
+    #[serde(
+        rename = "max_prompt_image_size",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub max_prompt_image_size: Option<i64>,
+    /// Maximum number of images per prompt
+    #[serde(rename = "max_prompt_images", skip_serializing_if = "Option::is_none")]
+    pub max_prompt_images: Option<i64>,
+    /// MIME types the model accepts
+    #[serde(
+        rename = "supported_media_types",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub supported_media_types: Option<Vec<String>>,
 }
 
-/// Location-persisted tool approval details for MCP sampling requests from a server.
+/// Token limits for prompts, outputs, and context window
 ///
 /// <div class="warning">
 ///
@@ -9355,14 +10172,25 @@ pub struct PermissionsLocationsAddToolApprovalDetailsMcp {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsMcpSampling {
-    /// Approval covering MCP sampling requests for a server.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsMcpSamplingKind,
-    /// MCP server name.
-    pub server_name: String,
+pub struct ModelCapabilitiesOverrideLimits {
+    /// Maximum total context window size in tokens
+    #[serde(
+        rename = "max_context_window_tokens",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub max_context_window_tokens: Option<i64>,
+    /// Maximum number of output/completion tokens
+    #[serde(rename = "max_output_tokens", skip_serializing_if = "Option::is_none")]
+    pub max_output_tokens: Option<i64>,
+    /// Maximum number of prompt/input tokens
+    #[serde(rename = "max_prompt_tokens", skip_serializing_if = "Option::is_none")]
+    pub max_prompt_tokens: Option<i64>,
+    /// Vision-specific limits
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub vision: Option<ModelCapabilitiesOverrideLimitsVision>,
 }
 
-/// Location-persisted tool approval details for writes to long-term memory.
+/// Feature flags indicating what the model supports
 ///
 /// <div class="warning">
 ///
@@ -9372,12 +10200,19 @@ pub struct PermissionsLocationsAddToolApprovalDetailsMcpSampling {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsMemory {
-    /// Approval covering writes to long-term memory.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsMemoryKind,
+pub struct ModelCapabilitiesOverrideSupports {
+    /// Resolved Anthropic adaptive-thinking capability — unsupported / optional / required. 'required' models reject thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8).
+    #[serde(rename = "adaptive_thinking", skip_serializing_if = "Option::is_none")]
+    pub adaptive_thinking: Option<AdaptiveThinkingSupport>,
+    /// Whether this model supports reasoning effort configuration
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<bool>,
+    /// Whether this model supports vision/image input
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub vision: Option<bool>,
 }
 
-/// Location-persisted tool approval details for a custom tool, keyed by tool name.
+/// Optional capability overrides (vision, tool_calls, reasoning, etc.).
 ///
 /// <div class="warning">
 ///
@@ -9387,14 +10222,16 @@ pub struct PermissionsLocationsAddToolApprovalDetailsMemory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsCustomTool {
-    /// Approval covering a custom tool.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsCustomToolKind,
-    /// Custom tool name.
-    pub tool_name: String,
+pub struct ModelCapabilitiesOverride {
+    /// Token limits for prompts, outputs, and context window
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub limits: Option<ModelCapabilitiesOverrideLimits>,
+    /// Feature flags indicating what the model supports
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub supports: Option<ModelCapabilitiesOverrideSupports>,
 }
 
-/// Location-persisted tool approval details for extension-management operations, optionally narrowed by operation.
+/// List of Copilot models available to the resolved user, including capabilities and billing metadata.
 ///
 /// <div class="warning">
 ///
@@ -9404,15 +10241,12 @@ pub struct PermissionsLocationsAddToolApprovalDetailsCustomTool {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsExtensionManagement {
-    /// Approval covering extension lifecycle operations such as enable, disable, or reload.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsExtensionManagementKind,
-    /// Optional operation identifier; when omitted, the approval covers all extension management operations.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub operation: Option<String>,
+pub struct ModelList {
+    /// List of available models with full metadata
+    pub models: Vec<Model>,
 }
 
-/// Location-persisted factory approval, optionally narrowed by approval key.
+/// Optional listing options.
 ///
 /// <div class="warning">
 ///
@@ -9422,15 +10256,13 @@ pub struct PermissionsLocationsAddToolApprovalDetailsExtensionManagement {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsFactory {
-    /// Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.
+pub struct ModelListRequest {
+    /// If true, bypasses the per-session model list cache and re-fetches from CAPI.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub approval_key: Option<String>,
-    /// Approval covering factory operations.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsFactoryKind,
+    pub skip_cache: Option<bool>,
 }
 
-/// Location-persisted tool approval details for an extension's permission-gated capability access, keyed by extension name.
+/// Filesystem and environment context used to resolve model-picker settings.
 ///
 /// <div class="warning">
 ///
@@ -9440,14 +10272,16 @@ pub struct PermissionsLocationsAddToolApprovalDetailsFactory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess {
-    /// Extension name.
-    pub extension_name: String,
-    /// Approval covering an extension's request to access a permission-gated capability.
-    pub kind: PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccessKind,
+pub struct ModelPickerSettingsContext {
+    /// Optional Copilot configuration directory containing persisted settings.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_dir: Option<String>,
+    /// Environment variables consulted while resolving model-picker settings.
+    pub environment: serde_json::Value,
+    /// User home directory used when resolving persisted settings.
+    pub home_directory: String,
 }
 
-/// Location-scoped tool approval to persist.
 ///
 /// <div class="warning">
 ///
@@ -9455,16 +10289,20 @@ pub struct PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionLocationAddToolApprovalParams {
-    /// Tool approval to persist and apply
-    pub approval: PermissionsLocationsAddToolApprovalDetails,
-    /// Location key (git root or cwd) to persist the approval to
-    pub location_key: String,
+pub struct ModelPickerPersistenceRequest {
+    /// Whether context tier was explicitly selected and should be persisted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier_explicit: Option<bool>,
+    /// Whether reasoning effort was explicitly selected and should be persisted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort_explicit: Option<bool>,
+    /// Filesystem and environment context used to resolve settings persistence.
+    pub settings_context: ModelPickerSettingsContext,
 }
 
-/// Working directory to load persisted location permissions for.
+/// Reasoning effort level to apply to the currently selected model.
 ///
 /// <div class="warning">
 ///
@@ -9474,12 +10312,12 @@ pub struct PermissionLocationAddToolApprovalParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionLocationApplyParams {
-    /// Working directory whose persisted location permissions should be applied
-    pub working_directory: String,
+pub struct ModelSetReasoningEffortRequest {
+    /// Reasoning effort level to apply to the currently selected model. The host is responsible for validating the value against the model's supported levels before calling.
+    pub reasoning_effort: String,
 }
 
-/// Summary of persisted location permissions applied to the session.
+/// Update the session's reasoning effort without changing the selected model. Use `switchTo` instead when you also need to change the model. The runtime stores the effort on the session and applies it to subsequent turns.
 ///
 /// <div class="warning">
 ///
@@ -9489,22 +10327,12 @@ pub struct PermissionLocationApplyParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionLocationApplyResult {
-    /// Number of persisted allowed directories added to the live path manager
-    pub applied_directory_count: i64,
-    /// Number of location-scoped rules added to the live permission service
-    pub applied_rule_count: i64,
-    /// Location-scoped rules applied to the live permission service
-    pub applied_rules: Vec<PermissionRule>,
-    /// Whether a different location was applied since the previous apply call
-    pub changed: bool,
-    /// Location key used in the location-permissions store
-    pub location_key: String,
-    /// Whether the location is a git repo or directory
-    pub location_type: PermissionLocationType,
+pub struct ModelSetReasoningEffortResult {
+    /// Reasoning effort level recorded on the session after the update
+    pub reasoning_effort: String,
 }
 
-/// Working directory to resolve into a location-permissions key.
+/// Optional opaque account selection or compatibility GitHub token used to list models.
 ///
 /// <div class="warning">
 ///
@@ -9514,12 +10342,15 @@ pub struct PermissionLocationApplyResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionLocationResolveParams {
-    /// Working directory whose permission location should be resolved
-    pub working_directory: String,
+pub struct ModelsListRequest {
+    /// GitHub token accepted for compatibility with existing SDK clients. When provided, resolves this token instead of using the current account.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub git_hub_token: Option<String>,
+    /// Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub selection_id: Option<String>,
 }
 
-/// Resolved location-permissions key and type.
 ///
 /// <div class="warning">
 ///
@@ -9529,14 +10360,16 @@ pub struct PermissionLocationResolveParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionLocationResolveResult {
-    /// Location key used in the location-permissions store
-    pub location_key: String,
-    /// Whether the location is a git repo or directory
-    pub location_type: PermissionLocationType,
+pub struct ModelSwitchConfirmation {
+    /// Current conversation token count before switching models.
+    pub current_tokens: f64,
+    /// Target model token limit used by the compaction preflight.
+    pub target_limit: f64,
+    /// Display name of the model that requires compaction confirmation.
+    pub target_model_display_name: String,
 }
 
-/// Directory path to add to the session's allowed directories.
+/// Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.
 ///
 /// <div class="warning">
 ///
@@ -9546,12 +10379,51 @@ pub struct PermissionLocationResolveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionPathsAddParams {
-    /// Directory to add to the allow-list. The runtime resolves and validates the path before adding.
-    pub path: String,
+pub struct ModelSwitchToRequest {
+    /// Explicit response to a model-switch compaction preflight. Omit to request a confirmation projection when compaction is necessary.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub compaction_decision: Option<String>,
+    /// Explicit context tier for the selected model. `"default"` / `"long_context"` apply the requested tier; omit this field to use normal model behavior with no explicit tier.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier: Option<ContextTier>,
+    /// When true, defer this switch (enqueue it) if another model change is already queued, even when no turn is active — so it drains last (FIFO) and wins over the already-queued change. Intended for genuine user-initiated model selections; internal restore/reapply switches omit it and apply immediately when no turn is active. When no other model change is queued this has no effect (a switch still applies immediately unless a turn is active).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub defer_if_model_change_queued: Option<bool>,
+    /// Override individual model capabilities resolved by the runtime
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_capabilities: Option<ModelCapabilitiesOverride>,
+    /// Settings scope used when persisting the selected model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_change_scope: Option<String>,
+    /// Model selection id to switch to, as returned by `list`. A bare id (e.g. `claude-sonnet-4.6`) names a Copilot (CAPI) model; a provider-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a registry BYOK model.
+    pub model_id: String,
+    /// Optional settings context and explicit-override flags used to persist a picker selection.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub picker_persistence: Option<ModelPickerPersistenceRequest>,
+    /// Reasoning effort level to use for the model. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. "none" disables reasoning. When omitted, no effort override is applied.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<String>,
+    /// Reasoning summary mode to request for supported model clients
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_summary: Option<ReasoningSummary>,
+    /// Optional repository settings scope to persist after the switch commits.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_scope: Option<String>,
+    /// Require the target to be currently available and enabled before applying the switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub require_available: Option<bool>,
+    /// When true, evaluate context-window compaction policy before applying the switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub run_compaction_preflight: Option<bool>,
+    /// Origin to record on the effective `session.model_change` event. Defaults to `sdk` when omitted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<ModelChangeSource>,
+    /// Output verbosity level to request for supported models
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub verbosity: Option<Verbosity>,
 }
 
-/// Path to evaluate against the session's allowed directories.
+/// The model identifier active on the session after the switch.
 ///
 /// <div class="warning">
 ///
@@ -9561,12 +10433,34 @@ pub struct PermissionPathsAddParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionPathsAllowedCheckParams {
-    /// Path to check against the session's allowed directories
-    pub path: String,
+pub struct ModelSwitchToResult {
+    /// Compaction confirmation projection when status is confirmation_required
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub confirmation: Option<ModelSwitchConfirmation>,
+    /// True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deferred: Option<bool>,
+    /// Deprecation warnings associated with the selected model or options.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deprecation_warnings: Option<Vec<String>>,
+    /// User-facing outcome message for the model switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+    /// Currently active model identifier after the switch
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_id: Option<String>,
+    /// Persistence failure encountered after applying the model switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub persistence_error: Option<String>,
+    /// Lifecycle result for the requested switch
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<String>,
+    /// User-facing warning produced while applying the model switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
 }
 
-/// Indicates whether the supplied path is within the session's allowed directories.
+/// Agent interaction mode to apply to the session.
 ///
 /// <div class="warning">
 ///
@@ -9576,12 +10470,42 @@ pub struct PermissionPathsAllowedCheckParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionPathsAllowedCheckResult {
-    /// Whether the path is within the session's allowed directories
-    pub allowed: bool,
-}
-
-/// If specified, replaces the session's path-permission policy. The runtime constructs the appropriate PathManager based on these inputs (rooted at the session's working directory). Omit to leave the current path policy unchanged.
+pub struct ModeSetRequest {
+    /// Explicit response to a model-switch compaction preflight.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub compaction_decision: Option<String>,
+    /// Session whose plan-mode base state should be inherited.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub inherit_plan_base_from_session_id: Option<String>,
+    /// The session mode the agent is operating in
+    pub mode: SessionMode,
+    /// Whether the selected plan model should be persisted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub persist_plan_selection: Option<bool>,
+    /// Settings context used when persisting the selected plan model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub picker_settings_context: Option<ModelPickerSettingsContext>,
+    /// Context tier to use with the dedicated plan model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plan_context_tier: Option<String>,
+    /// Action to perform when leaving plan mode.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plan_exit_action: Option<String>,
+    /// Dedicated model to use in plan mode, when configured.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plan_model: Option<String>,
+    /// Whether a dedicated plan model is configured.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plan_model_configured: Option<bool>,
+    /// Reasoning effort to use with the dedicated plan model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plan_reasoning_effort: Option<String>,
+    /// Whether leaving plan mode should restore the session's previous model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub restore_plan_model: Option<bool>,
+}
+
+/// Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.
 ///
 /// <div class="warning">
 ///
@@ -9591,22 +10515,32 @@ pub struct PermissionPathsAllowedCheckResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionPathsConfig {
-    /// Additional directories to allow tool access to (in addition to the session's working directory). When `unrestricted` is true, these are still pre-populated on the UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention completion).
+pub struct ModeSetResult {
+    /// Whether the host should arm an interactive continuation after the mode change.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_directories: Option<Vec<String>>,
-    /// Whether to include the system temp directory in the allowed list (defaults to true). Ignored when `unrestricted` is true.
+    pub arm_interactive_continuation: Option<bool>,
+    /// Compaction confirmation required before the mode change can complete.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_temp_directory: Option<bool>,
-    /// If true, the runtime allows access to all paths without prompting. Equivalent to constructing an UnrestrictedPathManager.
+    pub confirmation: Option<ModelSwitchConfirmation>,
+    /// Whether the host must defer implementing the requested mode change.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub unrestricted: Option<bool>,
-    /// Workspace root path (special-cased to be allowed even before the directory exists). Ignored when `unrestricted` is true.
+    pub defer_implementation: Option<bool>,
+    /// Deprecation warnings associated with the model selected by the mode change.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub workspace_path: Option<String>,
+    pub deprecation_warnings: Option<Vec<String>>,
+    /// User-facing outcome message for the model switch triggered by the mode change.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+    /// Whether applying the mode changed the active model.
+    pub model_changed: bool,
+    /// Lifecycle status of the requested mode change.
+    pub status: String,
+    /// User-facing warning produced while applying the mode change.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
 }
 
-/// Snapshot of the session's allow-listed directories and primary working directory.
+/// Result of moving in-flight MCP loading to the background.
 ///
 /// <div class="warning">
 ///
@@ -9616,14 +10550,12 @@ pub struct PermissionPathsConfig {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionPathsList {
-    /// All directories currently allowed for tool access on this session.
-    pub directories: Vec<String>,
-    /// The primary working directory for this session.
-    pub primary: String,
+pub struct MoveMcpLoadingToBackgroundResult {
+    /// Whether an in-flight MCP load was moved to the background, releasing turns that were waiting on it. False when no MCP load was in flight or the waiting turns had already been released.
+    pub moved_to_background: bool,
 }
 
-/// Directory path to set as the session's new primary working directory.
+/// Azure-specific provider options.
 ///
 /// <div class="warning">
 ///
@@ -9633,12 +10565,13 @@ pub struct PermissionPathsList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionPathsUpdatePrimaryParams {
-    /// Directory to set as the new primary working directory for the session's permission policy.
-    pub path: String,
+pub struct ProviderConfigAzure {
+    /// API version. When set, uses the versioned deployment route. When omitted, uses the GA versionless v1 route.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub api_version: Option<String>,
 }
 
-/// Path to evaluate against the session's workspace (primary) directory.
+/// External SDK input for a named custom model provider. Ingested by the native protocol boundary before host dispatch.
 ///
 /// <div class="warning">
 ///
@@ -9648,12 +10581,38 @@ pub struct PermissionPathsUpdatePrimaryParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionPathsWorkspaceCheckParams {
-    /// Path to check against the session workspace directory
-    pub path: String,
+pub struct NamedProviderConfig {
+    /// Static API key used to authenticate provider requests.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub api_key: Option<String>,
+    /// Azure authentication configuration for the provider.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub azure: Option<ProviderConfigAzure>,
+    /// Base URL for provider API requests.
+    pub base_url: String,
+    /// Static bearer token used to authenticate provider requests.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub bearer_token: Option<String>,
+    /// Whether the host supplies bearer tokens dynamically.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub has_bearer_token_provider: Option<bool>,
+    /// Additional HTTP headers included with provider requests.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub headers: Option<HashMap<String, String>>,
+    /// Unique provider name used to qualify model selection IDs.
+    pub name: String,
+    /// Transport used to communicate with the provider.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transport: Option<ProviderConfigTransport>,
+    /// Provider protocol family.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#type: Option<ProviderConfigType>,
+    /// Wire API used to communicate with the provider.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wire_api: Option<ProviderConfigWireApi>,
 }
 
-/// Indicates whether the supplied path is within the session's workspace directory.
+/// The session's friendly name, or null when not yet set.
 ///
 /// <div class="warning">
 ///
@@ -9663,12 +10622,12 @@ pub struct PermissionPathsWorkspaceCheckParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionPathsWorkspaceCheckResult {
-    /// Whether the path is within the session workspace directory
-    pub allowed: bool,
+pub struct NameGetResult {
+    /// The session name (user-set or auto-generated), or null if not yet set
+    pub name: Option<String>,
 }
 
-/// Notification payload describing the permission prompt that the client just rendered.
+/// Auto-generated session summary to apply as the session's name when no user-set name exists.
 ///
 /// <div class="warning">
 ///
@@ -9678,12 +10637,12 @@ pub struct PermissionPathsWorkspaceCheckResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionPromptShownNotification {
-    /// Human-readable description of the prompt the user is being asked to approve. Used by the runtime to fire the registered `permission_prompt` notification hook (e.g. terminal bell, desktop notification).
-    pub message: String,
+pub struct NameSetAutoRequest {
+    /// Auto-generated session summary. Empty/whitespace-only values are ignored; values are trimmed before persisting.
+    pub summary: String,
 }
 
-/// Indicates whether the permission decision was applied; false when the request was already resolved.
+/// Indicates whether the auto-generated summary was applied as the session's name.
 ///
 /// <div class="warning">
 ///
@@ -9693,12 +10652,12 @@ pub struct PermissionPromptShownNotification {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionRequestResult {
-    /// Whether the permission request was handled successfully
-    pub success: bool,
+pub struct NameSetAutoResult {
+    /// Whether the auto-generated summary was persisted. False if the session already has a user-set name, the summary normalized to empty, or the session does not have a workspace.
+    pub applied: bool,
 }
 
-/// If specified, replaces the session's approved/denied permission rules. Omit to leave the current rules unchanged.
+/// New friendly name to apply to the session.
 ///
 /// <div class="warning">
 ///
@@ -9708,14 +10667,12 @@ pub struct PermissionRequestResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionRulesSet {
-    /// Rules that auto-approve matching requests
-    pub approved: Vec<PermissionRule>,
-    /// Rules that auto-deny matching requests
-    pub denied: Vec<PermissionRule>,
+pub struct NameSetRequest {
+    /// New session name (1–100 characters, trimmed of leading/trailing whitespace)
+    pub name: String,
 }
 
-/// Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type.
+/// Source descriptor for a `session.options.update` content-exclusion rule, with source name and type.
 ///
 /// <div class="warning">
 ///
@@ -9725,12 +10682,14 @@ pub struct PermissionRulesSet {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsConfigureAdditionalContentExclusionPolicyRuleSource {
+pub struct OptionsUpdateAdditionalContentExclusionPolicyRuleSource {
+    /// Name of the policy source.
     pub name: String,
+    /// Type of the policy source.
     pub r#type: String,
 }
 
-/// Single content-exclusion rule supplied to `session.permissions.configure`, with paths, match conditions, and source.
+/// Single content-exclusion rule supplied to `session.options.update`, with paths, match conditions, and source.
 ///
 /// <div class="warning">
 ///
@@ -9740,17 +10699,20 @@ pub struct PermissionsConfigureAdditionalContentExclusionPolicyRuleSource {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsConfigureAdditionalContentExclusionPolicyRule {
+pub struct OptionsUpdateAdditionalContentExclusionPolicyRule {
+    /// Conditions of which at least one must match.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub if_any_match: Option<Vec<String>>,
+    /// Conditions none of which may match.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub if_none_match: Option<Vec<String>>,
+    /// Path patterns covered by this rule.
     pub paths: Vec<String>,
-    /// Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type.
-    pub source: PermissionsConfigureAdditionalContentExclusionPolicyRuleSource,
+    /// Source descriptor for a `session.options.update` content-exclusion rule, with source name and type.
+    pub source: OptionsUpdateAdditionalContentExclusionPolicyRuleSource,
 }
 
-/// Content-exclusion policy supplied to `session.permissions.configure`, with rules, last-updated data, and scope.
+/// Content-exclusion policy supplied to `session.options.update`, with rules, last-updated data, and scope.
 ///
 /// <div class="warning">
 ///
@@ -9760,15 +10722,17 @@ pub struct PermissionsConfigureAdditionalContentExclusionPolicyRule {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsConfigureAdditionalContentExclusionPolicy {
+pub struct OptionsUpdateAdditionalContentExclusionPolicy {
+    /// Opaque policy update timestamp supplied by the host.
     #[serde(rename = "last_updated_at")]
     pub last_updated_at: serde_json::Value,
-    pub rules: Vec<PermissionsConfigureAdditionalContentExclusionPolicyRule>,
-    /// Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope` enumeration.
-    pub scope: PermissionsConfigureAdditionalContentExclusionPolicyScope,
+    /// Content-exclusion rules to apply.
+    pub rules: Vec<OptionsUpdateAdditionalContentExclusionPolicyRule>,
+    /// Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.
+    pub scope: OptionsUpdateAdditionalContentExclusionPolicyScope,
 }
 
-/// If specified, replaces the session's URL-permission policy. The runtime constructs a fresh DefaultUrlManager based on these inputs. Omit to leave the current URL policy unchanged.
+/// Pending permission prompt reconstructed from event history, with request ID and user-facing prompt details.
 ///
 /// <div class="warning">
 ///
@@ -9776,18 +10740,16 @@ pub struct PermissionsConfigureAdditionalContentExclusionPolicy {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionUrlsConfig {
-    /// Initial list of allowed URL/domain patterns. Patterns may include path components. Ignored when `unrestricted` is true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub initial_allowed: Option<Vec<String>>,
-    /// If true, the runtime allows access to all URLs without prompting. Initial allow-list is ignored when this is true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub unrestricted: Option<bool>,
+pub struct PendingPermissionRequest {
+    /// The user-facing permission prompt details (commands, write, read, mcp, url, memory, custom-tool, path, hook)
+    pub request: PermissionPromptRequest,
+    /// Unique identifier for the pending permission request
+    pub request_id: RequestId,
 }
 
-/// Patch of permission policy fields to apply (omit a field to leave it unchanged).
+/// List of pending permission requests reconstructed from event history.
 ///
 /// <div class="warning">
 ///
@@ -9797,29 +10759,12 @@ pub struct PermissionUrlsConfig {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsConfigureParams {
-    /// If specified, replaces the host-supplied GitHub Content Exclusion policies on the session (combined with natively-discovered policies when evaluating tool/file access). Omit to leave the current policies unchanged.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_content_exclusion_policies:
-        Option<Vec<PermissionsConfigureAdditionalContentExclusionPolicy>>,
-    /// If specified, sets whether path/URL read permission requests are auto-approved. Omit to leave the current value unchanged.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub approve_all_read_permission_requests: Option<bool>,
-    /// If specified, sets whether tool permission requests are auto-approved without prompting. Omit to leave the current value unchanged.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub approve_all_tool_permission_requests: Option<bool>,
-    /// If specified, replaces the session's path-permission policy. The runtime constructs the appropriate PathManager based on these inputs (rooted at the session's working directory). Omit to leave the current path policy unchanged.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub paths: Option<PermissionPathsConfig>,
-    /// If specified, replaces the session's approved/denied permission rules. Omit to leave the current rules unchanged.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub rules: Option<PermissionRulesSet>,
-    /// If specified, replaces the session's URL-permission policy. The runtime constructs a fresh DefaultUrlManager based on these inputs. Omit to leave the current URL policy unchanged.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub urls: Option<PermissionUrlsConfig>,
+pub struct PendingPermissionRequestList {
+    /// Pending permission prompts reconstructed from the session's event history. Equivalent to the set of `permission.requested` events that have not yet been followed by a matching `permission.completed` event. Used by clients (e.g. the CLI) to hydrate UI for prompts that were emitted before the client attached to the session.
+    pub items: Vec<PendingPermissionRequest>,
 }
 
-/// Indicates whether the operation succeeded.
+/// Permission-decision request variant to approve only the current permission request.
 ///
 /// <div class="warning">
 ///
@@ -9829,12 +10774,15 @@ pub struct PermissionsConfigureParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsConfigureResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveOnce {
+    /// True only when a host surfaced this request to a user who approved it.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub approved_interactively: Option<bool>,
+    /// Approve this single request only
+    pub kind: PermissionDecisionApproveOnceKind,
 }
 
-/// Indicates whether the operation succeeded.
+/// Session-scoped approval details for specific command identifiers.
 ///
 /// <div class="warning">
 ///
@@ -9844,12 +10792,14 @@ pub struct PermissionsConfigureResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsFolderTrustAddTrustedResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForSessionApprovalCommands {
+    /// Command identifiers covered by this approval.
+    pub command_identifiers: Vec<String>,
+    /// Approval scoped to specific command identifiers.
+    pub kind: PermissionDecisionApproveForSessionApprovalCommandsKind,
 }
 
-/// No parameters.
+/// Session-scoped approval details for read-only filesystem operations.
 ///
 /// <div class="warning">
 ///
@@ -9859,9 +10809,12 @@ pub struct PermissionsFolderTrustAddTrustedResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsGetAllowAllRequest {}
+pub struct PermissionDecisionApproveForSessionApprovalRead {
+    /// Approval covering read-only filesystem operations.
+    pub kind: PermissionDecisionApproveForSessionApprovalReadKind,
+}
 
-/// Indicates whether the operation succeeded.
+/// Session-scoped approval details for filesystem write operations.
 ///
 /// <div class="warning">
 ///
@@ -9871,12 +10824,12 @@ pub struct PermissionsGetAllowAllRequest {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsLocationsAddToolApprovalResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForSessionApprovalWrite {
+    /// Approval covering filesystem write operations.
+    pub kind: PermissionDecisionApproveForSessionApprovalWriteKind,
 }
 
-/// Scope and add/remove instructions for modifying session- or location-scoped permission rules.
+/// Session-scoped approval details for an MCP server tool, or all tools on the server when `toolName` is null.
 ///
 /// <div class="warning">
 ///
@@ -9886,21 +10839,16 @@ pub struct PermissionsLocationsAddToolApprovalResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsModifyRulesParams {
-    /// Rules to add to the scope. Applied before `remove`/`removeAll`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub add: Option<Vec<PermissionRule>>,
-    /// Specific rules to remove from the scope. Ignored when `removeAll` is true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub remove: Option<Vec<PermissionRule>>,
-    /// When true, removes every rule currently in the scope (after any `add` is applied). Useful for clearing the location scope wholesale.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub remove_all: Option<bool>,
-    /// Whether the change applies to ephemeral session-scoped rules (cleared at session end) or to location-scoped rules persisted via the location-permissions config file.
-    pub scope: PermissionsModifyRulesScope,
+pub struct PermissionDecisionApproveForSessionApprovalMcp {
+    /// Approval covering an MCP tool.
+    pub kind: PermissionDecisionApproveForSessionApprovalMcpKind,
+    /// MCP server name.
+    pub server_name: String,
+    /// MCP tool name, or null to cover every tool on the server.
+    pub tool_name: Option<String>,
 }
 
-/// Indicates whether the operation succeeded.
+/// Session-scoped approval details for MCP sampling requests from a server.
 ///
 /// <div class="warning">
 ///
@@ -9910,12 +10858,14 @@ pub struct PermissionsModifyRulesParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsModifyRulesResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForSessionApprovalMcpSampling {
+    /// Approval covering MCP sampling requests for a server.
+    pub kind: PermissionDecisionApproveForSessionApprovalMcpSamplingKind,
+    /// MCP server name.
+    pub server_name: String,
 }
 
-/// Indicates whether the operation succeeded.
+/// Session-scoped approval details for writes to long-term memory.
 ///
 /// <div class="warning">
 ///
@@ -9925,12 +10875,12 @@ pub struct PermissionsModifyRulesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsNotifyPromptShownResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForSessionApprovalMemory {
+    /// Approval covering writes to long-term memory.
+    pub kind: PermissionDecisionApproveForSessionApprovalMemoryKind,
 }
 
-/// Indicates whether the operation succeeded.
+/// Session-scoped approval details for a custom tool, keyed by tool name.
 ///
 /// <div class="warning">
 ///
@@ -9940,12 +10890,14 @@ pub struct PermissionsNotifyPromptShownResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsPathsAddResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForSessionApprovalCustomTool {
+    /// Approval covering a custom tool.
+    pub kind: PermissionDecisionApproveForSessionApprovalCustomToolKind,
+    /// Custom tool name.
+    pub tool_name: String,
 }
 
-/// No parameters; returns the session's allow-listed directories.
+/// Session-scoped approval details for extension-management operations, optionally narrowed by operation.
 ///
 /// <div class="warning">
 ///
@@ -9955,24 +10907,15 @@ pub struct PermissionsPathsAddResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsPathsListRequest {}
-
-/// Indicates whether the operation succeeded.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PermissionsPathsUpdatePrimaryResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForSessionApprovalExtensionManagement {
+    /// Approval covering extension lifecycle operations such as enable, disable, or reload.
+    pub kind: PermissionDecisionApproveForSessionApprovalExtensionManagementKind,
+    /// Optional operation identifier; when omitted, the approval covers all extension management operations.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub operation: Option<String>,
 }
 
-/// No parameters; returns currently-pending permission requests for the session.
+/// Session-scoped factory approval, optionally narrowed by approval key.
 ///
 /// <div class="warning">
 ///
@@ -9982,9 +10925,15 @@ pub struct PermissionsPathsUpdatePrimaryResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsPendingRequestsRequest {}
+pub struct PermissionDecisionApproveForSessionApprovalFactory {
+    /// Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub approval_key: Option<String>,
+    /// Approval covering factory operations.
+    pub kind: PermissionDecisionApproveForSessionApprovalFactoryKind,
+}
 
-/// Clears session-scoped tool permission approvals, and optionally the location-scoped ones.
+/// Session-scoped approval details for an extension's permission-gated capability access, keyed by extension name.
 ///
 /// <div class="warning">
 ///
@@ -9994,13 +10943,14 @@ pub struct PermissionsPendingRequestsRequest {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsResetSessionApprovalsRequest {
-    /// Whether location-scoped approvals are cleared too. Defaults to `true`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_location: Option<bool>,
+pub struct PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess {
+    /// Extension name.
+    pub extension_name: String,
+    /// Approval covering an extension's request to access a permission-gated capability.
+    pub kind: PermissionDecisionApproveForSessionApprovalExtensionPermissionAccessKind,
 }
 
-/// Indicates whether the operation succeeded.
+/// Session-scoped approval details for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.
 ///
 /// <div class="warning">
 ///
@@ -10010,12 +10960,16 @@ pub struct PermissionsResetSessionApprovalsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsResetSessionApprovalsResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForSessionApprovalExtensionEnvAccess {
+    /// Names of the sensitive environment variables this approval covers. Values are never persisted.
+    pub environment_variables: Vec<String>,
+    /// Extension name.
+    pub extension_name: String,
+    /// Approval covering an extension's request to read sensitive environment variables.
+    pub kind: PermissionDecisionApproveForSessionApprovalExtensionEnvAccessKind,
 }
 
-/// Allow-all mode to apply for the session.
+/// Permission-decision request variant to approve for the rest of the session, with optional tool approval or URL domain.
 ///
 /// <div class="warning">
 ///
@@ -10025,22 +10979,18 @@ pub struct PermissionsResetSessionApprovalsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsSetAllowAllRequest {
-    /// Legacy full allow-all toggle. Prefer `mode`; when `mode` is omitted, `enabled: true` is treated as `mode: "on"` and any other value is treated as `mode: "off"`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enabled: Option<bool>,
-    /// Allow-all mode to apply. `on` enables full allow-all; `auto` enables advisory LLM auto-approval; `off` disables both.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<PermissionsAllowAllMode>,
-    /// Optional model id for the `auto` mode auto-approval LLM judging. Only meaningful when `mode` is `auto`; ignored otherwise. When omitted, the session resolves a default judge model: `gpt-5.5` for CAPI sessions and the session's active model for BYOK sessions.
+pub struct PermissionDecisionApproveForSession {
+    /// Session-scoped approval to remember (tool prompts only; omitted for path/url prompts)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
+    pub approval: Option<PermissionDecisionApproveForSessionApproval>,
+    /// URL domain to approve for the rest of the session (URL prompts only)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub source: Option<PermissionsSetAllowAllSource>,
+    pub domain: Option<String>,
+    /// Approve and remember for the rest of the session
+    pub kind: PermissionDecisionApproveForSessionKind,
 }
 
-/// Allow-all toggle for tool permission requests, with an optional telemetry source.
+/// Location-scoped approval details for specific command identifiers.
 ///
 /// <div class="warning">
 ///
@@ -10050,15 +11000,14 @@ pub struct PermissionsSetAllowAllRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsSetApproveAllRequest {
-    /// Whether to auto-approve all tool permission requests
-    pub enabled: bool,
-    /// Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source: Option<PermissionsSetApproveAllSource>,
+pub struct PermissionDecisionApproveForLocationApprovalCommands {
+    /// Command identifiers covered by this approval.
+    pub command_identifiers: Vec<String>,
+    /// Approval scoped to specific command identifiers.
+    pub kind: PermissionDecisionApproveForLocationApprovalCommandsKind,
 }
 
-/// Indicates whether the operation succeeded.
+/// Location-scoped approval details for read-only filesystem operations.
 ///
 /// <div class="warning">
 ///
@@ -10068,12 +11017,12 @@ pub struct PermissionsSetApproveAllRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsSetApproveAllResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForLocationApprovalRead {
+    /// Approval covering read-only filesystem operations.
+    pub kind: PermissionDecisionApproveForLocationApprovalReadKind,
 }
 
-/// Toggles whether permission prompts should be bridged into session events for this client.
+/// Location-scoped approval details for filesystem write operations.
 ///
 /// <div class="warning">
 ///
@@ -10083,12 +11032,12 @@ pub struct PermissionsSetApproveAllResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsSetRequiredRequest {
-    /// Whether the client wants `permission.requested` events bridged from the session-owned permission service. CLI clients that render prompt UI set this to `true` for as long as their listener is mounted; headless callers leave it unset (the default is `false`).
-    pub required: bool,
+pub struct PermissionDecisionApproveForLocationApprovalWrite {
+    /// Approval covering filesystem write operations.
+    pub kind: PermissionDecisionApproveForLocationApprovalWriteKind,
 }
 
-/// Indicates whether the operation succeeded.
+/// Location-scoped approval details for an MCP server tool, or all tools on the server when `toolName` is null.
 ///
 /// <div class="warning">
 ///
@@ -10098,12 +11047,16 @@ pub struct PermissionsSetRequiredRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsSetRequiredResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForLocationApprovalMcp {
+    /// Approval covering an MCP tool.
+    pub kind: PermissionDecisionApproveForLocationApprovalMcpKind,
+    /// MCP server name.
+    pub server_name: String,
+    /// MCP tool name, or null to cover every tool on the server.
+    pub tool_name: Option<String>,
 }
 
-/// Indicates whether the operation succeeded.
+/// Location-scoped approval details for MCP sampling requests from a server.
 ///
 /// <div class="warning">
 ///
@@ -10113,12 +11066,14 @@ pub struct PermissionsSetRequiredResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionsUrlsSetUnrestrictedModeResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct PermissionDecisionApproveForLocationApprovalMcpSampling {
+    /// Approval covering MCP sampling requests for a server.
+    pub kind: PermissionDecisionApproveForLocationApprovalMcpSamplingKind,
+    /// MCP server name.
+    pub server_name: String,
 }
 
-/// Whether the URL-permission policy should run in unrestricted mode.
+/// Location-scoped approval details for writes to long-term memory.
 ///
 /// <div class="warning">
 ///
@@ -10128,12 +11083,12 @@ pub struct PermissionsUrlsSetUnrestrictedModeResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionUrlsSetUnrestrictedModeParams {
-    /// Whether to allow access to all URLs without prompting. Toggles the runtime's URL-permission policy in place.
-    pub enabled: bool,
+pub struct PermissionDecisionApproveForLocationApprovalMemory {
+    /// Approval covering writes to long-term memory.
+    pub kind: PermissionDecisionApproveForLocationApprovalMemoryKind,
 }
 
-/// Optional message to echo back to the caller.
+/// Location-scoped approval details for a custom tool, keyed by tool name.
 ///
 /// <div class="warning">
 ///
@@ -10143,13 +11098,14 @@ pub struct PermissionUrlsSetUnrestrictedModeParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PingRequest {
-    /// Optional message to echo back
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub message: Option<String>,
+pub struct PermissionDecisionApproveForLocationApprovalCustomTool {
+    /// Approval covering a custom tool.
+    pub kind: PermissionDecisionApproveForLocationApprovalCustomToolKind,
+    /// Custom tool name.
+    pub tool_name: String,
 }
 
-/// Server liveness response, including the echoed message, current server timestamp, and protocol version.
+/// Location-scoped approval details for extension-management operations, optionally narrowed by operation.
 ///
 /// <div class="warning">
 ///
@@ -10159,16 +11115,15 @@ pub struct PingRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PingResult {
-    /// Echoed message (or default greeting)
-    pub message: String,
-    /// Server protocol version number
-    pub protocol_version: i64,
-    /// ISO 8601 timestamp when the server handled the ping
-    pub timestamp: String,
+pub struct PermissionDecisionApproveForLocationApprovalExtensionManagement {
+    /// Approval covering extension lifecycle operations such as enable, disable, or reload.
+    pub kind: PermissionDecisionApproveForLocationApprovalExtensionManagementKind,
+    /// Optional operation identifier; when omitted, the approval covers all extension management operations.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub operation: Option<String>,
 }
 
-/// Existence, contents, and resolved path of the session plan file.
+/// Location-scoped factory approval, optionally narrowed by approval key.
 ///
 /// <div class="warning">
 ///
@@ -10178,16 +11133,15 @@ pub struct PingResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PlanReadResult {
-    /// The content of the plan file, or null if it does not exist
-    pub content: Option<String>,
-    /// Whether the plan file exists in the workspace
-    pub exists: bool,
-    /// Absolute file path of the plan file, or null if workspace is not enabled
-    pub path: Option<String>,
+pub struct PermissionDecisionApproveForLocationApprovalFactory {
+    /// Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub approval_key: Option<String>,
+    /// Approval covering factory operations.
+    pub kind: PermissionDecisionApproveForLocationApprovalFactoryKind,
 }
 
-/// A single todo row read from the session SQL `todos` table. All fields are optional because the SQL schema is best-effort and the agent may not have populated every column.
+/// Location-scoped approval details for an extension's permission-gated capability access, keyed by extension name.
 ///
 /// <div class="warning">
 ///
@@ -10197,22 +11151,14 @@ pub struct PlanReadResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PlanSqlTodosRow {
-    /// Todo description.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Todo identifier.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
-    /// Todo status.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
-    /// Todo title.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
+pub struct PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess {
+    /// Extension name.
+    pub extension_name: String,
+    /// Approval covering an extension's request to access a permission-gated capability.
+    pub kind: PermissionDecisionApproveForLocationApprovalExtensionPermissionAccessKind,
 }
 
-/// Todo rows read from the session SQL database. Empty when no session database is available.
+/// Location-scoped approval details for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.
 ///
 /// <div class="warning">
 ///
@@ -10222,12 +11168,16 @@ pub struct PlanSqlTodosRow {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PlanReadSqlTodosResult {
-    /// Rows from the session SQL todos table, ordered by creation time and id.
-    pub rows: Vec<PlanSqlTodosRow>,
+pub struct PermissionDecisionApproveForLocationApprovalExtensionEnvAccess {
+    /// Names of the sensitive environment variables this approval covers. Values are never persisted.
+    pub environment_variables: Vec<String>,
+    /// Extension name.
+    pub extension_name: String,
+    /// Approval covering an extension's request to read sensitive environment variables.
+    pub kind: PermissionDecisionApproveForLocationApprovalExtensionEnvAccessKind,
 }
 
-/// A single dependency edge read from the session SQL `todo_deps` table, indicating that one todo must complete before another.
+/// Permission-decision request variant to approve and persist a permission for a project location, with approval details and location key.
 ///
 /// <div class="warning">
 ///
@@ -10235,16 +11185,18 @@ pub struct PlanReadSqlTodosResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PlanSqlTodoDependency {
-    /// ID of the todo it depends on.
-    pub depends_on: String,
-    /// ID of the todo that has the dependency.
-    pub todo_id: String,
+pub struct PermissionDecisionApproveForLocation {
+    /// Approval to persist for this location
+    pub approval: PermissionDecisionApproveForLocationApproval,
+    /// Approve and persist for this project location
+    pub kind: PermissionDecisionApproveForLocationKind,
+    /// Location key (git root or cwd) to persist the approval to
+    pub location_key: String,
 }
 
-/// Todo rows + dependency edges read from the session SQL database.
+/// Permission-decision request variant to permanently approve a URL domain across sessions.
 ///
 /// <div class="warning">
 ///
@@ -10254,14 +11206,14 @@ pub struct PlanSqlTodoDependency {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PlanReadSqlTodosWithDependenciesResult {
-    /// Edges from the session SQL todo_deps table. Empty when no database, no todo_deps table, or the SELECT failed. Read independently from `rows`, so a broken todo_deps table does not affect the rows result and vice versa.
-    pub dependencies: Vec<PlanSqlTodoDependency>,
-    /// Rows from the session SQL todos table, ordered by creation time and id. Empty when no database, no todos table, or the SELECT failed.
-    pub rows: Vec<PlanSqlTodosRow>,
+pub struct PermissionDecisionApprovePermanently {
+    /// URL domain to approve permanently
+    pub domain: String,
+    /// Approve and persist across sessions (URL prompts only)
+    pub kind: PermissionDecisionApprovePermanentlyKind,
 }
 
-/// Replacement contents to write to the session plan file.
+/// Permission-decision request variant to reject a pending permission request, with optional feedback.
 ///
 /// <div class="warning">
 ///
@@ -10271,12 +11223,15 @@ pub struct PlanReadSqlTodosWithDependenciesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PlanUpdateRequest {
-    /// The new content for the plan file
-    pub content: String,
+pub struct PermissionDecisionReject {
+    /// Optional feedback explaining the rejection
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub feedback: Option<String>,
+    /// Reject the request
+    pub kind: PermissionDecisionRejectKind,
 }
 
-/// Session plugin metadata, with name, marketplace, optional version, and enabled state.
+/// Permission-decision variant indicating no user was available to confirm the request.
 ///
 /// <div class="warning">
 ///
@@ -10286,19 +11241,12 @@ pub struct PlanUpdateRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct Plugin {
-    /// Whether the plugin is currently enabled
-    pub enabled: bool,
-    /// Marketplace the plugin came from
-    pub marketplace: String,
-    /// Plugin name
-    pub name: String,
-    /// Installed version
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub version: Option<String>,
+pub struct PermissionDecisionUserNotAvailable {
+    /// No user is available to confirm the request
+    pub kind: PermissionDecisionUserNotAvailableKind,
 }
 
-/// Result of installing a plugin.
+/// Permission-decision variant indicating the request was approved.
 ///
 /// <div class="warning">
 ///
@@ -10308,20 +11256,12 @@ pub struct Plugin {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginInstallResult {
-    /// Set when the install path is deprecated (e.g. direct repo / URL / local installs). Callers should surface this to end users.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub deprecation_warning: Option<String>,
-    /// The newly installed plugin's metadata
-    pub plugin: InstalledPluginInfo,
-    /// Optional post-install message provided by the plugin (e.g. setup instructions)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub post_install_message: Option<String>,
-    /// Number of skills discovered and installed from the plugin
-    pub skills_installed: i64,
+pub struct PermissionDecisionApproved {
+    /// The permission request was approved
+    pub kind: PermissionDecisionApprovedKind,
 }
 
-/// Plugins installed for the session, with their enabled state and version metadata.
+/// Permission-decision variant indicating approval was remembered for the session, with approval details.
 ///
 /// <div class="warning">
 ///
@@ -10329,14 +11269,16 @@ pub struct PluginInstallResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginList {
-    /// Installed plugins
-    pub plugins: Vec<Plugin>,
-}
-
-/// Plugins installed in user/global state.
+pub struct PermissionDecisionApprovedForSession {
+    /// The approval to add as a session-scoped rule
+    pub approval: UserToolSessionApproval,
+    /// Approved and remembered for the rest of the session
+    pub kind: PermissionDecisionApprovedForSessionKind,
+}
+
+/// Permission-decision variant indicating approval was persisted for a project location, with approval details and location key.
 ///
 /// <div class="warning">
 ///
@@ -10344,14 +11286,18 @@ pub struct PluginList {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginListResult {
-    /// Installed plugins
-    pub plugins: Vec<InstalledPluginInfo>,
+pub struct PermissionDecisionApprovedForLocation {
+    /// The approval to persist for this location
+    pub approval: UserToolSessionApproval,
+    /// Approved and persisted for this project location
+    pub kind: PermissionDecisionApprovedForLocationKind,
+    /// The location key (git root or cwd) to persist the approval to
+    pub location_key: String,
 }
 
-/// Plugin names (or specs) to disable.
+/// Permission-decision variant indicating the request was cancelled before use, with an optional reason.
 ///
 /// <div class="warning">
 ///
@@ -10361,12 +11307,15 @@ pub struct PluginListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsDisableRequest {
-    /// Plugin names or "plugin@marketplace" specs to disable. Unknown names are ignored. Non-marketplace direct installs cannot be disabled via this API; uninstall them instead. Plugin-owned MCP servers are stopped in active sessions immediately; other plugin contributions remain available until each session reloads plugins.
-    pub names: Vec<String>,
+pub struct PermissionDecisionCancelled {
+    /// The permission request was cancelled before a response was used
+    pub kind: PermissionDecisionCancelledKind,
+    /// Optional explanation of why the request was cancelled
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
 }
 
-/// Plugin names (or specs) to enable.
+/// Permission-decision variant indicating explicit denial by permission rules, with the matching rules.
 ///
 /// <div class="warning">
 ///
@@ -10376,12 +11325,14 @@ pub struct PluginsDisableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsEnableRequest {
-    /// Plugin names or "plugin@marketplace" specs to enable. Unknown names are ignored. Non-marketplace direct installs are always enabled and cannot be toggled via this API.
-    pub names: Vec<String>,
+pub struct PermissionDecisionDeniedByRules {
+    /// Denied because approval rules explicitly blocked it
+    pub kind: PermissionDecisionDeniedByRulesKind,
+    /// Rules that denied the request
+    pub rules: Vec<PermissionRule>,
 }
 
-/// Plugin source and optional working directory for relative-path resolution.
+/// Permission-decision variant indicating no approval rule matched and user confirmation was unavailable.
 ///
 /// <div class="warning">
 ///
@@ -10391,15 +11342,12 @@ pub struct PluginsEnableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsInstallRequest {
-    /// Plugin install spec. Accepts the same forms as the CLI: "plugin@marketplace" (marketplace install), "owner/repo" or "owner/repo:subpath" (GitHub direct), an http/https/ssh URL, or a local path. Direct (non-marketplace) installs are deprecated and will produce a deprecationWarning in the result.
-    pub source: String,
-    /// Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub working_directory: Option<String>,
+pub struct PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser {
+    /// Denied because no approval rule matched and user confirmation was unavailable
+    pub kind: PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUserKind,
 }
 
-/// Marketplace source and optional working directory for relative-path resolution.
+/// Permission-decision variant indicating the user denied an interactive prompt, with optional feedback and force-reject flag.
 ///
 /// <div class="warning">
 ///
@@ -10409,15 +11357,18 @@ pub struct PluginsInstallRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsMarketplacesAddRequest {
-    /// Marketplace source. Accepts the same forms as the CLI: "owner/repo" or "owner/repo#ref" (GitHub), an http/https/ssh URL (optionally with #ref), a git scp-style URL (user@host:path), or a local path. The marketplace's own name (from its manifest) is used as the registration key.
-    pub source: String,
-    /// Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.
+pub struct PermissionDecisionDeniedInteractivelyByUser {
+    /// Optional feedback from the user explaining the denial
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub working_directory: Option<String>,
+    pub feedback: Option<String>,
+    /// Whether to force-reject the current agent turn
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub force_reject: Option<bool>,
+    /// Denied by the user during an interactive prompt
+    pub kind: PermissionDecisionDeniedInteractivelyByUserKind,
 }
 
-/// Name of the marketplace whose plugin catalog to fetch.
+/// Permission-decision variant indicating denial by content-exclusion policy, with path and message.
 ///
 /// <div class="warning">
 ///
@@ -10427,12 +11378,16 @@ pub struct PluginsMarketplacesAddRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsMarketplacesBrowseRequest {
-    /// Marketplace name to browse
-    pub name: String,
+pub struct PermissionDecisionDeniedByContentExclusionPolicy {
+    /// Denied by the organization's content exclusion policy
+    pub kind: PermissionDecisionDeniedByContentExclusionPolicyKind,
+    /// Human-readable explanation of why the path was excluded
+    pub message: String,
+    /// File path that triggered the exclusion
+    pub path: String,
 }
 
-/// Optional marketplace name; omit to refresh all.
+/// Permission-decision variant indicating denial by a permission request hook, with optional message and interrupt flag.
 ///
 /// <div class="warning">
 ///
@@ -10442,13 +11397,18 @@ pub struct PluginsMarketplacesBrowseRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsMarketplacesRefreshRequest {
-    /// Marketplace name to refresh. When omitted, every registered marketplace is refreshed.
+pub struct PermissionDecisionDeniedByPermissionRequestHook {
+    /// Whether to interrupt the current agent turn
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
+    pub interrupt: Option<bool>,
+    /// Denied by a permission request hook registered by an extension or plugin
+    pub kind: PermissionDecisionDeniedByPermissionRequestHookKind,
+    /// Optional message from the hook explaining the denial
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
 }
 
-/// Name of the marketplace to remove and an optional force flag.
+/// Optional informational context describing how and where the permission decision was made. This does not affect permission behavior.
 ///
 /// <div class="warning">
 ///
@@ -10458,15 +11418,19 @@ pub struct PluginsMarketplacesRefreshRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsMarketplacesRemoveRequest {
-    /// When true, also uninstall every plugin sourced from this marketplace. When false (default), removal is a no-op if any plugin from this marketplace is installed and the dependent plugin names are returned in the result.
+pub struct PermissionDecisionContext {
+    /// Disposition of the permission request as observed by the responding client.
+    pub outcome: PermissionDecisionOutcome,
+    /// Whether the responding client could ask a user interactively, was running headlessly, or had no response path. Omit when the client cannot determine this authoritatively.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub force: Option<bool>,
-    /// Marketplace name to remove
-    pub name: String,
+    pub response_capability: Option<PermissionResponseCapability>,
+    /// Controlled reason or actor responsible for the response.
+    pub source: PermissionDecisionSource,
+    /// Client surface that submitted the response.
+    pub surface: PermissionDecisionSurface,
 }
 
-/// Optional flags controlling which side effects the reload performs.
+/// Pending permission request ID and the decision to apply (approve/reject and scope).
 ///
 /// <div class="warning">
 ///
@@ -10474,27 +11438,19 @@ pub struct PluginsMarketplacesRemoveRequest {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsReloadRequest {
-    /// When true, skip repo-level hooks during the hook reload. Use before folder trust is confirmed; load them post-trust via `sessions.loadDeferredRepoHooks`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub defer_repo_hooks: Option<bool>,
-    /// Re-run custom-agent discovery after refreshing plugins. Defaults to true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reload_custom_agents: Option<bool>,
-    /// Re-discover and relaunch subprocess extensions (including plugin-shipped extensions) after refreshing plugins. Defaults to true. Has no effect when the session has no active extension controller (e.g. extensions were not requested for the session).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reload_extensions: Option<bool>,
-    /// Re-load user, plugin, and (subject to `deferRepoHooks`) repo hooks. Defaults to true. Has no effect when the host has not registered a hook reloader (e.g. remote sessions).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reload_hooks: Option<bool>,
-    /// Reload MCP server connections after refreshing plugins. Defaults to true.
+pub struct PermissionDecisionRequest {
+    /// Optional informational context describing how and where this response was made. Omit it to preserve legacy behavior without attributing an origin.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reload_mcp: Option<bool>,
+    pub decision_context: Option<PermissionDecisionContext>,
+    /// Request ID of the pending permission request
+    pub request_id: RequestId,
+    /// The client's response to the pending permission prompt
+    pub result: PermissionDecision,
 }
 
-/// Name (or spec) of the plugin to uninstall.
+/// Location-persisted tool approval details for specific command identifiers.
 ///
 /// <div class="warning">
 ///
@@ -10504,15 +11460,14 @@ pub struct PluginsReloadRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsUninstallRequest {
-    /// Stable source identity for a direct (non-marketplace) install. Disambiguates uninstall when multiple installed plugins share the same name.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub direct_source_id: Option<String>,
-    /// Plugin name or "plugin@marketplace" spec to uninstall. When ambiguous, prefer the fully-qualified spec.
-    pub name: String,
+pub struct PermissionsLocationsAddToolApprovalDetailsCommands {
+    /// Command identifiers covered by this approval.
+    pub command_identifiers: Vec<String>,
+    /// Approval scoped to specific command identifiers.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsCommandsKind,
 }
 
-/// Name (or spec) of the plugin to update.
+/// Location-persisted tool approval details for read-only filesystem operations.
 ///
 /// <div class="warning">
 ///
@@ -10522,12 +11477,12 @@ pub struct PluginsUninstallRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsUpdateRequest {
-    /// Plugin name or "plugin@marketplace" spec to update.
-    pub name: String,
+pub struct PermissionsLocationsAddToolApprovalDetailsRead {
+    /// Approval covering read-only filesystem operations.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsReadKind,
 }
 
-/// Per-plugin result from updating all plugins, with versions, skills installed, success flag, and optional error.
+/// Location-persisted tool approval details for filesystem write operations.
 ///
 /// <div class="warning">
 ///
@@ -10537,28 +11492,12 @@ pub struct PluginsUpdateRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginUpdateAllEntry {
-    /// Error message (failure only)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Marketplace the plugin came from. Empty string ("") for direct installs.
-    pub marketplace: String,
-    /// Plugin name that was updated
-    pub name: String,
-    /// Version after the update, when available
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub new_version: Option<String>,
-    /// Previously installed version, when available
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub previous_version: Option<String>,
-    /// Number of skills installed after the update (success only)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub skills_installed: Option<i64>,
-    /// Whether the update succeeded for this plugin
-    pub success: bool,
+pub struct PermissionsLocationsAddToolApprovalDetailsWrite {
+    /// Approval covering filesystem write operations.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsWriteKind,
 }
 
-/// Result of updating all installed plugins.
+/// Location-persisted tool approval details for an MCP server tool, or all tools when `toolName` is null.
 ///
 /// <div class="warning">
 ///
@@ -10568,12 +11507,16 @@ pub struct PluginUpdateAllEntry {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginUpdateAllResult {
-    /// Per-plugin update results in deterministic order.
-    pub results: Vec<PluginUpdateAllEntry>,
+pub struct PermissionsLocationsAddToolApprovalDetailsMcp {
+    /// Approval covering an MCP tool.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsMcpKind,
+    /// MCP server name.
+    pub server_name: String,
+    /// MCP tool name, or null to cover every tool on the server.
+    pub tool_name: Option<String>,
 }
 
-/// Result of updating a single plugin.
+/// Location-persisted tool approval details for MCP sampling requests from a server.
 ///
 /// <div class="warning">
 ///
@@ -10583,18 +11526,14 @@ pub struct PluginUpdateAllResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginUpdateResult {
-    /// Version after the update, when reported by the plugin manifest
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub new_version: Option<String>,
-    /// Version that was previously installed, when available
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub previous_version: Option<String>,
-    /// Number of skills discovered and installed after the update
-    pub skills_installed: i64,
+pub struct PermissionsLocationsAddToolApprovalDetailsMcpSampling {
+    /// Approval covering MCP sampling requests for a server.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsMcpSamplingKind,
+    /// MCP server name.
+    pub server_name: String,
 }
 
-/// A BYOK model definition referencing a named provider.
+/// Location-persisted tool approval details for writes to long-term memory.
 ///
 /// <div class="warning">
 ///
@@ -10604,35 +11543,12 @@ pub struct PluginUpdateResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderModelConfig {
-    /// Optional capability overrides (vision, tool_calls, reasoning, etc.).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub capabilities: Option<ModelCapabilitiesOverride>,
-    /// Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`.
-    pub id: String,
-    /// Maximum context window tokens for the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_context_window_tokens: Option<f64>,
-    /// Maximum output tokens for the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_output_tokens: Option<f64>,
-    /// Maximum prompt/input tokens for the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_prompt_tokens: Option<f64>,
-    /// Well-known base model id used for behavior/capability/config lookup. Defaults to `id`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_id: Option<String>,
-    /// Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Name of the NamedProviderConfig that serves this model.
-    pub provider: String,
-    /// The model name sent to the provider API for inference. Defaults to `id`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub wire_model: Option<String>,
+pub struct PermissionsLocationsAddToolApprovalDetailsMemory {
+    /// Approval covering writes to long-term memory.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsMemoryKind,
 }
 
-/// BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
+/// Location-persisted tool approval details for a custom tool, keyed by tool name.
 ///
 /// <div class="warning">
 ///
@@ -10642,16 +11558,14 @@ pub struct ProviderModelConfig {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderAddRequest {
-    /// BYOK model definitions to register. Each must reference a provider that is already registered or included in this same call. Selection ids (`provider/id`) must be unique across the registry.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub models: Option<Vec<ProviderModelConfig>>,
-    /// Named BYOK provider connections to register, additive to any providers already in the registry. Each name must be unique across the registry and must not contain '/'.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub providers: Option<Vec<NamedProviderConfig>>,
+pub struct PermissionsLocationsAddToolApprovalDetailsCustomTool {
+    /// Approval covering a custom tool.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsCustomToolKind,
+    /// Custom tool name.
+    pub tool_name: String,
 }
 
-/// The selectable model entries synthesized for the models added by this call.
+/// Location-persisted tool approval details for extension-management operations, optionally narrowed by operation.
 ///
 /// <div class="warning">
 ///
@@ -10661,12 +11575,15 @@ pub struct ProviderAddRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderAddResult {
-    /// Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.
-    pub models: Vec<serde_json::Value>,
+pub struct PermissionsLocationsAddToolApprovalDetailsExtensionManagement {
+    /// Approval covering extension lifecycle operations such as enable, disable, or reload.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsExtensionManagementKind,
+    /// Optional operation identifier; when omitted, the approval covers all extension management operations.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub operation: Option<String>,
 }
 
-/// Custom model-provider configuration (BYOK).
+/// Location-persisted factory approval, optionally narrowed by approval key.
 ///
 /// <div class="warning">
 ///
@@ -10676,51 +11593,15 @@ pub struct ProviderAddResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderConfig {
-    /// API key. Optional for local providers like Ollama.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub api_key: Option<String>,
-    /// Azure-specific provider options.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub azure: Option<ProviderConfigAzure>,
-    /// API endpoint URL.
-    pub base_url: String,
-    /// Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub bearer_token: Option<String>,
-    /// When true, the SDK client supplies bearer tokens on demand: the runtime calls the client-session `providerToken.getToken` callback before each request and applies the returned token as an `Authorization: Bearer <token>` header. This is the bearer/OAuth scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens (including Anthropic's), not a provider-specific API-key header such as Anthropic's `x-api-key`. The token-acquiring function itself stays on the SDK side and is never serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`, the callback takes precedence: the runtime applies the token returned by `providerToken.getToken` as the `Authorization: Bearer` header for each request and does not send the static credential.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub has_bearer_token_provider: Option<bool>,
-    /// Custom HTTP headers to include in all outbound requests to the provider.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub headers: Option<HashMap<String, String>>,
-    /// Maximum context window tokens for the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_context_window_tokens: Option<f64>,
-    /// Maximum output tokens for the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_output_tokens: Option<f64>,
-    /// Maximum prompt/input tokens for the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_prompt_tokens: Option<f64>,
-    /// Well-known model ID used for capability lookup. When set, agent behavior config and token limits are inferred from this model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_id: Option<String>,
-    /// Provider transport. Defaults to "http".
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub transport: Option<ProviderConfigTransport>,
-    /// Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#type: Option<ProviderConfigType>,
-    /// Wire API format (openai/azure only). Defaults to "completions".
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub wire_api: Option<ProviderConfigWireApi>,
-    /// The model identifier sent to the provider API for inference (the "wire" model), as opposed to modelId which is the well-known base.
+pub struct PermissionsLocationsAddToolApprovalDetailsFactory {
+    /// Optional factory operation name or canonical approval key; when omitted, the approval covers all factory operations.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub wire_model: Option<String>,
+    pub approval_key: Option<String>,
+    /// Approval covering factory operations.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsFactoryKind,
 }
 
-/// Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.
+/// Location-persisted tool approval details for an extension's permission-gated capability access, keyed by extension name.
 ///
 /// <div class="warning">
 ///
@@ -10730,20 +11611,14 @@ pub struct ProviderConfig {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderSessionToken {
-    /// When the token expires, if known. Callers should refresh by calling `getEndpoint` again before this time, or reactively on any 401/403 response from `baseUrl`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub expires_at: Option<String>,
-    /// HTTP header name the token must be sent under.
-    pub header: String,
-    /// The model the token is bound to, when applicable. When set, the token is only valid for requests against this model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// The short-lived token value.
-    pub token: String,
+pub struct PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess {
+    /// Extension name.
+    pub extension_name: String,
+    /// Approval covering an extension's request to access a permission-gated capability.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccessKind,
 }
 
-/// A snapshot of the provider endpoint the session is currently configured to talk to.
+/// Location-persisted tool approval details for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.
 ///
 /// <div class="warning">
 ///
@@ -10753,28 +11628,16 @@ pub struct ProviderSessionToken {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderEndpoint {
-    /// A credential the caller should use with this endpoint. Omitted only when the endpoint accepts unauthenticated requests.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub api_key: Option<String>,
-    /// Base URL to pass to the LLM client library.
-    pub base_url: String,
-    /// HTTP headers the caller must include on every outbound request.
-    pub headers: HashMap<String, String>,
-    /// Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_token: Option<ProviderSessionToken>,
-    /// Transport to be used for provider requests.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub transport: Option<ProviderEndpointTransport>,
-    /// Provider family. Matches the `type` field of a BYOK provider config.
-    pub r#type: ProviderEndpointType,
-    /// Wire API to be used, when required for the provider type.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub wire_api: Option<ProviderEndpointWireApi>,
+pub struct PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess {
+    /// Names of the sensitive environment variables this approval covers. Values are never persisted.
+    pub environment_variables: Vec<String>,
+    /// Extension name.
+    pub extension_name: String,
+    /// Approval covering an extension's request to read sensitive environment variables.
+    pub kind: PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccessKind,
 }
 
-/// Optional model identifier to scope the endpoint snapshot to.
+/// Location-scoped tool approval to persist.
 ///
 /// <div class="warning">
 ///
@@ -10782,15 +11645,16 @@ pub struct ProviderEndpoint {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderGetEndpointRequest {
-    /// Model identifier the caller intends to use against the returned endpoint. Used to pick the correct wire shape. Omit to use whichever model the session is currently using.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_id: Option<String>,
+pub struct PermissionLocationAddToolApprovalParams {
+    /// Tool approval to persist and apply
+    pub approval: PermissionsLocationsAddToolApprovalDetails,
+    /// Location key (git root or cwd) to persist the approval to
+    pub location_key: String,
 }
 
-/// Asks the SDK client to acquire a bearer token for a BYOK provider whose config set `hasBearerTokenProvider: true`. Issued by the runtime before each outbound model request; the runtime does no caching, so this is sent once per request.
+/// Working directory to load persisted location permissions for.
 ///
 /// <div class="warning">
 ///
@@ -10800,14 +11664,12 @@ pub struct ProviderGetEndpointRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderTokenAcquireRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Name of the BYOK provider needing a token. For the legacy whole-session `provider` this is the implicit provider name; for named providers it is `NamedProviderConfig.name`.
-    pub provider_name: String,
+pub struct PermissionLocationApplyParams {
+    /// Working directory whose persisted location permissions should be applied
+    pub working_directory: String,
 }
 
-/// A bearer token supplied by the SDK client for a BYOK provider. The runtime sets it as `Authorization: Bearer <token>` on the outbound request and does no caching; the SDK consumer owns token caching and refresh.
+/// Summary of persisted location permissions applied to the session.
 ///
 /// <div class="warning">
 ///
@@ -10817,12 +11679,22 @@ pub struct ProviderTokenAcquireRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ProviderTokenAcquireResult {
-    /// The bearer token value (without the `Bearer ` prefix).
-    pub token: String,
+pub struct PermissionLocationApplyResult {
+    /// Number of persisted allowed directories added to the live path manager
+    pub applied_directory_count: i64,
+    /// Number of location-scoped rules added to the live permission service
+    pub applied_rule_count: i64,
+    /// Location-scoped rules applied to the live permission service
+    pub applied_rules: Vec<PermissionRule>,
+    /// Whether a different location was applied since the previous apply call
+    pub changed: bool,
+    /// Location key used in the location-permissions store
+    pub location_key: String,
+    /// Whether the location is a git repo or directory
+    pub location_type: PermissionLocationType,
 }
 
-/// Blob attachment with inline base64-encoded data
+/// Working directory to resolve into a location-permissions key.
 ///
 /// <div class="warning">
 ///
@@ -10832,19 +11704,12 @@ pub struct ProviderTokenAcquireResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentBlob {
-    /// Base64-encoded content
-    pub data: String,
-    /// User-facing display name for the attachment
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_name: Option<String>,
-    /// MIME type of the inline data
-    pub mime_type: String,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentBlobType,
+pub struct PermissionLocationResolveParams {
+    /// Working directory whose permission location should be resolved
+    pub working_directory: String,
 }
 
-/// Directory attachment
+/// Resolved location-permissions key and type.
 ///
 /// <div class="warning">
 ///
@@ -10854,16 +11719,14 @@ pub struct PushAttachmentBlob {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentDirectory {
-    /// User-facing display name for the attachment
-    pub display_name: String,
-    /// Absolute directory path
-    pub path: String,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentDirectoryType,
+pub struct PermissionLocationResolveResult {
+    /// Location key used in the location-permissions store
+    pub location_key: String,
+    /// Whether the location is a git repo or directory
+    pub location_type: PermissionLocationType,
 }
 
-/// Optional line range to scope the attachment to a specific section of the file
+/// Directory path to add to the session's allowed directories.
 ///
 /// <div class="warning">
 ///
@@ -10873,14 +11736,12 @@ pub struct PushAttachmentDirectory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentFileLineRange {
-    /// End line number (1-based, inclusive)
-    pub end: i64,
-    /// Start line number (1-based)
-    pub start: i64,
+pub struct PermissionPathsAddParams {
+    /// Directory to add to the allow-list. The runtime resolves and validates the path before adding, then loads conventional `.github/skills/` and `.github/agents/` definitions under it when their subsystem gates are enabled. Adding the directory is therefore also a trust decision for configuration stored there.
+    pub path: String,
 }
 
-/// File attachment
+/// Path to evaluate against the session's allowed directories.
 ///
 /// <div class="warning">
 ///
@@ -10890,19 +11751,12 @@ pub struct PushAttachmentFileLineRange {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentFile {
-    /// User-facing display name for the attachment
-    pub display_name: String,
-    /// Optional line range to scope the attachment to a specific section of the file
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub line_range: Option<PushAttachmentFileLineRange>,
-    /// Absolute file path
+pub struct PermissionPathsAllowedCheckParams {
+    /// Path to check against the session's allowed directories
     pub path: String,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentFileType,
 }
 
-/// Pointer to a GitHub repository.
+/// Indicates whether the supplied path is within the session's allowed directories.
 ///
 /// <div class="warning">
 ///
@@ -10912,17 +11766,12 @@ pub struct PushAttachmentFile {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushGitHubRepoRef {
-    /// Numeric GitHub repository id
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub id: Option<i64>,
-    /// Repository name (without owner)
-    pub name: String,
-    /// Repository owner login (user or organization)
-    pub owner: String,
+pub struct PermissionPathsAllowedCheckResult {
+    /// Whether the path is within the session's allowed directories
+    pub allowed: bool,
 }
 
-/// Pointer to a GitHub Actions job.
+/// If specified, replaces the session's path-permission policy. The runtime constructs the appropriate PathManager based on these inputs (rooted at the session's working directory). Omit to leave the current path policy unchanged.
 ///
 /// <div class="warning">
 ///
@@ -10932,25 +11781,22 @@ pub struct PushGitHubRepoRef {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubActionsJob {
-    /// Terminal conclusion of the job when finished (e.g., success, failure, cancelled). Absent for in-progress jobs.
+pub struct PermissionPathsConfig {
+    /// Additional directories to allow tool access to (in addition to the session's working directory). Conventional `.github/skills/` and `.github/agents/` definitions under them also join the session catalogs when their subsystem gates are enabled, so supplying a directory is a trust decision for configuration stored there. When `unrestricted` is true, these are still pre-populated on the UnrestrictedPathManager so they remain visible via getDirectories() (e.g. for @-mention completion).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub conclusion: Option<String>,
-    /// Job id within the workflow run
-    pub job_id: i64,
-    /// Display name of the job
-    pub job_name: String,
-    /// Repository the workflow run belongs to
-    pub repo: PushGitHubRepoRef,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubActionsJobType,
-    /// URL to the job on GitHub
-    pub url: String,
-    /// Display name of the workflow the job ran in
-    pub workflow_name: String,
+    pub additional_directories: Option<Vec<String>>,
+    /// Whether to include the system temp directory in the allowed list (defaults to true). Ignored when `unrestricted` is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_temp_directory: Option<bool>,
+    /// If true, the runtime allows access to all paths without prompting. Equivalent to constructing an UnrestrictedPathManager.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub unrestricted: Option<bool>,
+    /// Workspace root path (special-cased to be allowed even before the directory exists). Ignored when `unrestricted` is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub workspace_path: Option<String>,
 }
 
-/// Pointer to a GitHub commit.
+/// Snapshot of the session's allow-listed directories and primary working directory.
 ///
 /// <div class="warning">
 ///
@@ -10960,20 +11806,14 @@ pub struct PushAttachmentGitHubActionsJob {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubCommit {
-    /// First line of the commit message
-    pub message: String,
-    /// Full commit SHA
-    pub oid: String,
-    /// Repository the commit belongs to
-    pub repo: PushGitHubRepoRef,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubCommitType,
-    /// URL to the commit on GitHub
-    pub url: String,
+pub struct PermissionPathsList {
+    /// All directories currently allowed for tool access on this session.
+    pub directories: Vec<String>,
+    /// The primary working directory for this session.
+    pub primary: String,
 }
 
-/// Pointer to a file in a GitHub repository at a specific ref.
+/// Directory path to set as the session's new primary working directory.
 ///
 /// <div class="warning">
 ///
@@ -10983,20 +11823,12 @@ pub struct PushAttachmentGitHubCommit {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubFile {
-    /// Repository-relative path to the file
+pub struct PermissionPathsUpdatePrimaryParams {
+    /// Directory to set as the new primary working directory for the session's permission policy.
     pub path: String,
-    /// Git ref the file is read at (branch, tag, or commit SHA)
-    pub r#ref: String,
-    /// Repository the file lives in
-    pub repo: PushGitHubRepoRef,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubFileType,
-    /// URL to the file on GitHub
-    pub url: String,
 }
 
-/// One side of a file diff (head or base)
+/// Path to evaluate against the session's workspace (primary) directory.
 ///
 /// <div class="warning">
 ///
@@ -11006,16 +11838,12 @@ pub struct PushAttachmentGitHubFile {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubFileDiffSide {
-    /// Repository-relative path to the file
+pub struct PermissionPathsWorkspaceCheckParams {
+    /// Path to check against the session workspace directory
     pub path: String,
-    /// Git ref (branch, tag, or commit SHA) the file is read at
-    pub r#ref: String,
-    /// Repository the file lives in
-    pub repo: PushGitHubRepoRef,
 }
 
-/// Pointer to a single-file diff. At least one of `head` and `base` must be present.
+/// Indicates whether the supplied path is within the session's workspace directory.
 ///
 /// <div class="warning">
 ///
@@ -11025,20 +11853,12 @@ pub struct PushAttachmentGitHubFileDiffSide {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubFileDiff {
-    /// File location on the base side of the diff. Absent for additions.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub base: Option<PushAttachmentGitHubFileDiffSide>,
-    /// File location on the head side of the diff. Absent for deletions.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub head: Option<PushAttachmentGitHubFileDiffSide>,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubFileDiffType,
-    /// URL to the diff on GitHub (e.g., a commit, compare, or PR-file URL)
-    pub url: String,
+pub struct PermissionPathsWorkspaceCheckResult {
+    /// Whether the path is within the session workspace directory
+    pub allowed: bool,
 }
 
-/// GitHub issue, pull request, or discussion reference
+/// Notification payload describing the permission prompt that the client just rendered.
 ///
 /// <div class="warning">
 ///
@@ -11048,22 +11868,12 @@ pub struct PushAttachmentGitHubFileDiff {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubReference {
-    /// Issue, pull request, or discussion number
-    pub number: i64,
-    /// Type of GitHub reference
-    pub reference_type: PushAttachmentGitHubReferenceType,
-    /// Current state of the referenced item (e.g., open, closed, merged)
-    pub state: String,
-    /// Title of the referenced item
-    pub title: String,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubReferenceType,
-    /// URL to the referenced item on GitHub
-    pub url: String,
+pub struct PermissionPromptShownNotification {
+    /// Human-readable description of the prompt the user is being asked to approve. Used by the runtime to fire the registered `permission_prompt` notification hook (e.g. terminal bell, desktop notification).
+    pub message: String,
 }
 
-/// Pointer to a GitHub release.
+/// Indicates whether the permission decision was applied; false when the request was already resolved.
 ///
 /// <div class="warning">
 ///
@@ -11073,20 +11883,12 @@ pub struct PushAttachmentGitHubReference {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubRelease {
-    /// Human-readable release name
-    pub name: String,
-    /// Repository the release belongs to
-    pub repo: PushGitHubRepoRef,
-    /// Git tag the release is anchored to
-    pub tag_name: String,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubReleaseType,
-    /// URL to the release on GitHub
-    pub url: String,
+pub struct PermissionRequestResult {
+    /// Whether the permission request was handled successfully
+    pub success: bool,
 }
 
-/// Pointer to a GitHub repository.
+/// If specified, replaces the session's approved/denied permission rules. Omit to leave the current rules unchanged.
 ///
 /// <div class="warning">
 ///
@@ -11096,22 +11898,14 @@ pub struct PushAttachmentGitHubRelease {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubRepository {
-    /// Short description of the repository
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Git ref this attachment is anchored at (branch, tag, or commit). When absent the default branch is implied.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#ref: Option<String>,
-    /// Repository pointer
-    pub repo: PushGitHubRepoRef,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubRepositoryType,
-    /// URL to the repository on GitHub
-    pub url: String,
+pub struct PermissionRulesSet {
+    /// Rules that auto-approve matching requests
+    pub approved: Vec<PermissionRule>,
+    /// Rules that auto-deny matching requests
+    pub denied: Vec<PermissionRule>,
 }
 
-/// Pointer to a line range inside a file in a GitHub repository.
+/// Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type.
 ///
 /// <div class="warning">
 ///
@@ -11121,22 +11915,14 @@ pub struct PushAttachmentGitHubRepository {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubSnippet {
-    /// Line range the snippet covers
-    pub line_range: PushAttachmentFileLineRange,
-    /// Repository-relative path to the file
-    pub path: String,
-    /// Git ref the file is read at (branch, tag, or commit SHA)
-    pub r#ref: String,
-    /// Repository the file lives in
-    pub repo: PushGitHubRepoRef,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubSnippetType,
-    /// URL to the snippet on GitHub (with line anchor)
-    pub url: String,
+pub struct PermissionsConfigureAdditionalContentExclusionPolicyRuleSource {
+    /// Name of the policy source.
+    pub name: String,
+    /// Type of the policy source.
+    pub r#type: String,
 }
 
-/// One side of a tree comparison (head or base)
+/// Single content-exclusion rule supplied to `session.permissions.configure`, with paths, match conditions, and source.
 ///
 /// <div class="warning">
 ///
@@ -11146,14 +11932,20 @@ pub struct PushAttachmentGitHubSnippet {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubTreeComparisonSide {
-    /// Repository the revision belongs to
-    pub repo: PushGitHubRepoRef,
-    /// Git revision (branch, tag, or commit SHA)
-    pub revision: String,
+pub struct PermissionsConfigureAdditionalContentExclusionPolicyRule {
+    /// Conditions of which at least one must match.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub if_any_match: Option<Vec<String>>,
+    /// Conditions none of which may match.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub if_none_match: Option<Vec<String>>,
+    /// Path patterns covered by this rule.
+    pub paths: Vec<String>,
+    /// Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type.
+    pub source: PermissionsConfigureAdditionalContentExclusionPolicyRuleSource,
 }
 
-/// Pointer to a comparison between two git revisions.
+/// Content-exclusion policy supplied to `session.permissions.configure`, with rules, last-updated data, and scope.
 ///
 /// <div class="warning">
 ///
@@ -11163,18 +11955,17 @@ pub struct PushAttachmentGitHubTreeComparisonSide {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubTreeComparison {
-    /// Base side of the comparison
-    pub base: PushAttachmentGitHubTreeComparisonSide,
-    /// Head side of the comparison
-    pub head: PushAttachmentGitHubTreeComparisonSide,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubTreeComparisonType,
-    /// URL to the comparison on GitHub
-    pub url: String,
+pub struct PermissionsConfigureAdditionalContentExclusionPolicy {
+    /// Opaque policy update timestamp supplied by the host.
+    #[serde(rename = "last_updated_at")]
+    pub last_updated_at: serde_json::Value,
+    /// Content-exclusion rules to apply.
+    pub rules: Vec<PermissionsConfigureAdditionalContentExclusionPolicyRule>,
+    /// Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope` enumeration.
+    pub scope: PermissionsConfigureAdditionalContentExclusionPolicyScope,
 }
 
-/// Generic GitHub URL reference.
+/// If specified, replaces the session's URL-permission policy. The runtime constructs a fresh DefaultUrlManager based on these inputs. Omit to leave the current URL policy unchanged.
 ///
 /// <div class="warning">
 ///
@@ -11184,14 +11975,16 @@ pub struct PushAttachmentGitHubTreeComparison {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentGitHubUrl {
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentGitHubUrlType,
-    /// URL to the GitHub resource
-    pub url: String,
+pub struct PermissionUrlsConfig {
+    /// Initial list of allowed URL/domain patterns. Patterns may include path components. Ignored when `unrestricted` is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub initial_allowed: Option<Vec<String>>,
+    /// If true, the runtime allows access to all URLs without prompting. Initial allow-list is ignored when this is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub unrestricted: Option<bool>,
 }
 
-/// End position of the selection
+/// Patch of permission policy fields to apply (omit a field to leave it unchanged).
 ///
 /// <div class="warning">
 ///
@@ -11201,14 +11994,29 @@ pub struct PushAttachmentGitHubUrl {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentSelectionDetailsEnd {
-    /// End character offset within the line (0-based)
-    pub character: i64,
-    /// End line number (0-based)
-    pub line: i64,
+pub struct PermissionsConfigureParams {
+    /// If specified, replaces the host-supplied GitHub Content Exclusion policies on the session (combined with natively-discovered policies when evaluating tool/file access). Omit to leave the current policies unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub additional_content_exclusion_policies:
+        Option<Vec<PermissionsConfigureAdditionalContentExclusionPolicy>>,
+    /// If specified, sets whether path/URL read permission requests are auto-approved. Omit to leave the current value unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub approve_all_read_permission_requests: Option<bool>,
+    /// If specified, sets whether tool permission requests are auto-approved without prompting. Omit to leave the current value unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub approve_all_tool_permission_requests: Option<bool>,
+    /// If specified, replaces the session's path-permission policy. The runtime constructs the appropriate PathManager based on these inputs (rooted at the session's working directory). Omit to leave the current path policy unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub paths: Option<PermissionPathsConfig>,
+    /// If specified, replaces the session's approved/denied permission rules. Omit to leave the current rules unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub rules: Option<PermissionRulesSet>,
+    /// If specified, replaces the session's URL-permission policy. The runtime constructs a fresh DefaultUrlManager based on these inputs. Omit to leave the current URL policy unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub urls: Option<PermissionUrlsConfig>,
 }
 
-/// Start position of the selection
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11218,14 +12026,12 @@ pub struct PushAttachmentSelectionDetailsEnd {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentSelectionDetailsStart {
-    /// Start character offset within the line (0-based)
-    pub character: i64,
-    /// Start line number (0-based)
-    pub line: i64,
+pub struct PermissionsConfigureResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Position range of the selection within the file
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11235,14 +12041,12 @@ pub struct PushAttachmentSelectionDetailsStart {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentSelectionDetails {
-    /// End position of the selection
-    pub end: PushAttachmentSelectionDetailsEnd,
-    /// Start position of the selection
-    pub start: PushAttachmentSelectionDetailsStart,
+pub struct PermissionsFolderTrustAddTrustedResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Code selection attachment from an editor
+/// No parameters.
 ///
 /// <div class="warning">
 ///
@@ -11252,20 +12056,9 @@ pub struct PushAttachmentSelectionDetails {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PushAttachmentSelection {
-    /// User-facing display name for the selection
-    pub display_name: String,
-    /// Absolute path to the file containing the selection
-    pub file_path: String,
-    /// Position range of the selection within the file
-    pub selection: PushAttachmentSelectionDetails,
-    /// The selected text content
-    pub text: String,
-    /// Attachment type discriminator
-    pub r#type: PushAttachmentSelectionType,
-}
+pub struct PermissionsGetModeRequest {}
 
-/// Inputs for starting a deferred-idle drain.
+/// Current permission mode.
 ///
 /// <div class="warning">
 ///
@@ -11275,12 +12068,12 @@ pub struct PushAttachmentSelection {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueBeginDeferredIdleDrainRequest {
-    /// Whether the host still has active background work.
-    pub active_background_work: bool,
+pub struct PermissionsGetModeResult {
+    /// Current permission mode
+    pub mode: PermissionMode,
 }
 
-/// Whether a deferred-idle drain should run.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11290,12 +12083,12 @@ pub struct QueueBeginDeferredIdleDrainRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueBeginDeferredIdleDrainResult {
-    /// True when the host should run finishDeferredIdleDrain asynchronously.
-    pub should_drain: bool,
+pub struct PermissionsLocationsAddToolApprovalResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Internal filter for consuming queued system notifications.
+/// Scope and add/remove instructions for modifying session- or location-scoped permission rules.
 ///
 /// <div class="warning">
 ///
@@ -11305,12 +12098,21 @@ pub struct QueueBeginDeferredIdleDrainResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueConsumeSystemNotificationsRequest {
-    /// Opaque runtime-owned filter object.
-    pub filter: serde_json::Value,
+pub struct PermissionsModifyRulesParams {
+    /// Rules to add to the scope. Applied before `remove`/`removeAll`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub add: Option<Vec<PermissionRule>>,
+    /// Specific rules to remove from the scope. Ignored when `removeAll` is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remove: Option<Vec<PermissionRule>>,
+    /// When true, removes every rule currently in the scope (after any `add` is applied). Useful for clearing the location scope wholesale.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remove_all: Option<bool>,
+    /// Whether the change applies to ephemeral session-scoped rules (cleared at session end) or to location-scoped rules persisted via the location-permissions config file.
+    pub scope: PermissionsModifyRulesScope,
 }
 
-/// Queued-command response indicating the host executed the command, with an optional flag to stop queue processing.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11320,15 +12122,12 @@ pub struct QueueConsumeSystemNotificationsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueuedCommandHandled {
-    /// The host actually executed the queued command.
-    pub handled: bool,
-    /// When true, the runtime will not process subsequent queued commands until a new request comes in.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stop_processing_queue: Option<bool>,
+pub struct PermissionsModifyRulesResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Queued-command response indicating the host did not execute the command and the queue may continue.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11338,12 +12137,12 @@ pub struct QueuedCommandHandled {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueuedCommandNotHandled {
-    /// The host did not execute the queued command. Unblocks the queue without claiming the command was processed (e.g. when the handler threw before completing).
-    pub handled: bool,
+pub struct PermissionsNotifyPromptShownResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Inputs for marking session.idle deferred in native state.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11353,12 +12152,12 @@ pub struct QueuedCommandNotHandled {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueDeferSessionIdleRequest {
-    /// Whether the deferred idle was caused by an aborted foreground turn.
-    pub aborted: bool,
+pub struct PermissionsPathsAddResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Parameters for duplicating a queued item.
+/// No parameters; returns the session's allow-listed directories.
 ///
 /// <div class="warning">
 ///
@@ -11368,11 +12167,9 @@ pub struct QueueDeferSessionIdleRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueDuplicateAtRequest {
-    pub id: String,
-}
+pub struct PermissionsPathsListRequest {}
 
-/// Result of duplicating a queued item.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11382,12 +12179,12 @@ pub struct QueueDuplicateAtRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueDuplicateAtResult {
-    /// Fresh stable opaque id assigned to the duplicate.
-    pub id: String,
+pub struct PermissionsPathsUpdatePrimaryResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Result of enqueueing the resume-pending wake item.
+/// No parameters; returns currently-pending permission requests for the session.
 ///
 /// <div class="warning">
 ///
@@ -11397,12 +12194,9 @@ pub struct QueueDuplicateAtResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueEnqueueResumePendingResult {
-    /// True when a wake item was newly queued.
-    pub queued: bool,
-}
+pub struct PermissionsPendingRequestsRequest {}
 
-/// Inputs for completing a deferred-idle drain.
+/// Clears session-scoped tool permission approvals, and optionally the location-scoped ones.
 ///
 /// <div class="warning">
 ///
@@ -11412,14 +12206,13 @@ pub struct QueueEnqueueResumePendingResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueFinishDeferredIdleDrainRequest {
-    /// Whether the host still has active background work.
-    pub active_background_work: bool,
-    /// Whether native queued work remains.
-    pub has_pending: bool,
+pub struct PermissionsResetSessionApprovalsRequest {
+    /// Whether location-scoped approvals are cleared too. Defaults to `true`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_location: Option<bool>,
 }
 
-/// Action selected by the native deferred-idle drain.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11429,14 +12222,12 @@ pub struct QueueFinishDeferredIdleDrainRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueFinishDeferredIdleDrainResult {
-    /// Whether the deferred idle was caused by an aborted foreground turn.
-    pub aborted: bool,
-    /// One of none, processQueue, or emitSessionIdle.
-    pub action: String,
+pub struct PermissionsResetSessionApprovalsResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Whether the native queue has pending work.
+/// Allow-all toggle for tool permission requests, with an optional telemetry source.
 ///
 /// <div class="warning">
 ///
@@ -11446,12 +12237,15 @@ pub struct QueueFinishDeferredIdleDrainResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueHasPendingResult {
-    /// True when queued or immediate native work is pending.
-    pub has_pending: bool,
+pub struct PermissionsSetApproveAllRequest {
+    /// Whether to auto-approve all tool permission requests
+    pub enabled: bool,
+    /// Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<PermissionsSetApproveAllSource>,
 }
 
-/// Serializable message fields accepted by queue.insertAt.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11461,45 +12255,12 @@ pub struct QueueHasPendingResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueInsertMessage {
-    /// Optional explicit agent mode. When omitted, the session's current mode is assigned.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_mode: Option<SendAgentMode>,
-    /// Optional attachments for the message.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub attachments: Option<Vec<serde_json::Value>>,
-    /// Whether the message is billable.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub billable: Option<bool>,
-    /// Accepted for internal SendOptions compatibility but ignored; delivery is derived from current session activity.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub delivery: Option<String>,
-    /// Optional user-facing display text.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_prompt: Option<String>,
-    /// Accepted for SendOptions compatibility but ignored; inserted items always use queued delivery semantics.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<SendMode>,
-    /// Accepted for SendOptions compatibility but ignored; the requested public position controls placement.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub prepend: Option<bool>,
-    /// The user message text.
-    pub prompt: String,
-    /// Per-turn request headers.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub request_headers: Option<HashMap<String, String>>,
-    /// Required tool name for the turn, when any.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub required_tool: Option<String>,
-    /// Optional provenance source. `system` is rejected: it would hide the inserted row from `pendingItems` and make it unaddressable while still executing, so inserted items must stay visible.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source: Option<String>,
-    /// Accepted for SendOptions compatibility but ignored; insertion scheduling is controlled by the queue drain state.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub wait: Option<bool>,
+pub struct PermissionsSetApproveAllResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Parameters for inserting a queued message at a public visible position.
+/// Permission mode to apply for the session.
 ///
 /// <div class="warning">
 ///
@@ -11509,13 +12270,18 @@ pub struct QueueInsertMessage {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueInsertAtRequest {
-    pub message: QueueInsertMessage,
-    /// Zero-based position in the public visible queue. Values outside the queue clamp to an end.
-    pub position: i64,
+pub struct PermissionsSetModeRequest {
+    /// Optional judge model id for assisted mode. When omitted, the session resolves the provider default: `gpt-5.5` for CAPI sessions and the active session model for BYOK sessions.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub assisted_approval_model: Option<String>,
+    /// Permission mode to apply
+    pub mode: PermissionMode,
+    /// Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK callers.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<PermissionModeSource>,
 }
 
-/// Result of inserting a queued message.
+/// Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode.
 ///
 /// <div class="warning">
 ///
@@ -11525,12 +12291,14 @@ pub struct QueueInsertAtRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueInsertAtResult {
-    /// Fresh stable opaque id assigned to the inserted item.
-    pub id: String,
+pub struct PermissionsSetModeResult {
+    /// Authoritative permission mode after the mutation
+    pub mode: PermissionMode,
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Parameters for moving a queued item by stable id.
+/// Toggles whether permission prompts should be bridged into session events for this client.
 ///
 /// <div class="warning">
 ///
@@ -11540,14 +12308,12 @@ pub struct QueueInsertAtResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueMoveItemRequest {
-    /// Stable opaque queued-item id.
-    pub id: String,
-    /// Zero-based target position in the public visible queue. Values outside the queue clamp to an end.
-    pub to_position: i64,
+pub struct PermissionsSetRequiredRequest {
+    /// Whether the client wants `permission.requested` events bridged from the session-owned permission service. CLI clients that render prompt UI set this to `true` for as long as their listener is mounted; headless callers leave it unset (the default is `false`).
+    pub required: bool,
 }
 
-/// Result of moving a queued item.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11557,12 +12323,12 @@ pub struct QueueMoveItemRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueMoveItemResult {
-    /// True when the item changed position; false when it was already at the requested position.
-    pub changed: bool,
+pub struct PermissionsSetRequiredResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// User-facing pending queue entry, with kind and display text for a queued message, slash command, or model change.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -11572,18 +12338,12 @@ pub struct QueueMoveItemResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueuePendingItems {
-    /// Agent mode stored on this queued entry, as stamped when it was enqueued. Items without an explicit mode report interactive. This is not necessarily the mode that will constrain the turn: a plan or autopilot session applies its own write gate, continuation loop and permission posture to every drained item regardless of the mode stored here.
-    pub agent_mode: SendAgentMode,
-    /// Human-readable text to display for this queue entry in the UI
-    pub display_text: String,
-    /// Stable opaque id for the canonical queued item. Batch rows share one id.
-    pub id: String,
-    /// Whether this item is a queued user message or a queued slash command / model change
-    pub kind: QueuePendingItemsKind,
+pub struct PermissionsUrlsSetUnrestrictedModeResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Snapshot of the session's pending queued items and immediate-steering messages.
+/// Whether the URL-permission policy should run in unrestricted mode.
 ///
 /// <div class="warning">
 ///
@@ -11593,14 +12353,12 @@ pub struct QueuePendingItems {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueuePendingItemsResult {
-    /// Pending queued items in submission order. Includes user messages, queued slash commands, and queued model changes; omits internal system items.
-    pub items: Vec<QueuePendingItems>,
-    /// Display text for messages currently in the immediate steering queue (interjections sent during a running turn).
-    pub steering_messages: Vec<String>,
+pub struct PermissionUrlsSetUnrestrictedModeParams {
+    /// Whether to allow access to all URLs without prompting. Toggles the runtime's URL-permission policy in place.
+    pub enabled: bool,
 }
 
-/// Parameters for removing a queued item by stable id.
+/// Optional message to echo back to the caller.
 ///
 /// <div class="warning">
 ///
@@ -11610,11 +12368,13 @@ pub struct QueuePendingItemsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueRemoveAtRequest {
-    pub id: String,
+pub struct PingRequest {
+    /// Optional message to echo back
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
 }
 
-/// Result of removing a queued item.
+/// Server liveness response, including the echoed message, current server timestamp, and protocol version.
 ///
 /// <div class="warning">
 ///
@@ -11624,12 +12384,16 @@ pub struct QueueRemoveAtRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueRemoveAtResult {
-    /// True when the addressed item was removed.
-    pub removed: bool,
+pub struct PingResult {
+    /// Echoed message (or default greeting)
+    pub message: String,
+    /// Server protocol version number
+    pub protocol_version: i64,
+    /// ISO 8601 timestamp when the server handled the ping
+    pub timestamp: String,
 }
 
-/// Indicates whether a user-facing pending item was removed.
+/// Existence, contents, and resolved path of the session plan file.
 ///
 /// <div class="warning">
 ///
@@ -11639,12 +12403,16 @@ pub struct QueueRemoveAtResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueRemoveMostRecentResult {
-    /// True if a user-facing pending item was removed (LIFO across both queues); false when no removable items remained.
-    pub removed: bool,
+pub struct PlanReadResult {
+    /// The content of the plan file, or null if it does not exist
+    pub content: Option<String>,
+    /// Whether the plan file exists in the workspace
+    pub exists: bool,
+    /// Absolute file path of the plan file, or null if workspace is not enabled
+    pub path: Option<String>,
 }
 
-/// Parameters for steering a queued message into a live turn.
+/// A single todo row read from the session SQL `todos` table. All fields are optional because the SQL schema is best-effort and the agent may not have populated every column.
 ///
 /// <div class="warning">
 ///
@@ -11654,11 +12422,25 @@ pub struct QueueRemoveMostRecentResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueSendNowRequest {
-    pub id: String,
+pub struct PlanSqlTodosRow {
+    /// Todo creation time, as stored by the session SQL schema's `datetime('now')` default: `YYYY-MM-DD HH:MM:SS` in UTC. Lets clients attribute todos to the work item that created them (e.g. scoping a goal's progress to the todos it produced) rather than to the whole session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Todo description.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Todo identifier.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub id: Option<String>,
+    /// Todo status.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<String>,
+    /// Todo title.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
 }
 
-/// Result of trying to steer a queued message into a live turn.
+/// Todo rows read from the session SQL database. Empty when no session database is available.
 ///
 /// <div class="warning">
 ///
@@ -11668,12 +12450,12 @@ pub struct QueueSendNowRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueSendNowResult {
-    /// True when the item was accepted into the steering lane; false when no main turn was live.
-    pub steered: bool,
+pub struct PlanReadSqlTodosResult {
+    /// Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables.
+    pub rows: Vec<PlanSqlTodosRow>,
 }
 
-/// Parameters for acquiring or releasing the queued-lane drain pause. Acquisition is exclusive and non-idempotent: `paused: true` against an already-paused session fails with `queue_already_paused`. The pause is never released automatically — it is not tied to the caller's lifetime, so a client that exits without sending `paused: false` leaves the lane frozen. Release is unowned: `paused: false` clears the pause for any caller, including one that never acquired it.
+/// A single dependency edge read from the session SQL `todo_deps` table, indicating that one todo must complete before another.
 ///
 /// <div class="warning">
 ///
@@ -11683,11 +12465,14 @@ pub struct QueueSendNowResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueSetDrainPausedRequest {
-    pub paused: bool,
+pub struct PlanSqlTodoDependency {
+    /// ID of the todo it depends on.
+    pub depends_on: String,
+    /// ID of the todo that has the dependency.
+    pub todo_id: String,
 }
 
-/// Internal snapshot of native queue state for local session orchestration.
+/// Todo rows + dependency edges read from the session SQL database.
 ///
 /// <div class="warning">
 ///
@@ -11697,20 +12482,14 @@ pub struct QueueSetDrainPausedRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueSnapshotResult {
-    /// Insertion orders for queued items, aligned with `items`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub item_orders: Option<Vec<i64>>,
-    /// User-facing pending items in FIFO order.
-    pub items: Vec<QueuePendingItems>,
-    /// Insertion orders for immediate steering messages, aligned with `steeringMessages`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub steering_message_orders: Option<Vec<i64>>,
-    /// Immediate steering messages waiting for an active turn.
-    pub steering_messages: Vec<String>,
+pub struct PlanReadSqlTodosWithDependenciesResult {
+    /// Edges from the session SQL todo_deps table. Empty when no database, no todo_deps table, or the SELECT failed. Read independently from `rows`, so a broken todo_deps table does not affect the rows result and vice versa.
+    pub dependencies: Vec<PlanSqlTodoDependency>,
+    /// Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables. Empty when no database, no todos table, or the SELECT failed.
+    pub rows: Vec<PlanSqlTodosRow>,
 }
 
-/// Parameters for editing a single queued message.
+/// Replacement contents to write to the session plan file.
 ///
 /// <div class="warning">
 ///
@@ -11720,14 +12499,12 @@ pub struct QueueSnapshotResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueUpdateTextRequest {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_prompt: Option<String>,
-    pub id: String,
-    pub prompt: String,
+pub struct PlanUpdateRequest {
+    /// The new content for the plan file
+    pub content: String,
 }
 
-/// Result of editing a queued message.
+/// Session plugin metadata, with name, marketplace, optional version, and enabled state.
 ///
 /// <div class="warning">
 ///
@@ -11737,12 +12514,19 @@ pub struct QueueUpdateTextRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct QueueUpdateTextResult {
-    /// True when the stored text changed.
-    pub updated: bool,
+pub struct Plugin {
+    /// Whether the plugin is currently enabled
+    pub enabled: bool,
+    /// Marketplace the plugin came from
+    pub marketplace: String,
+    /// Plugin name
+    pub name: String,
+    /// Installed version
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub version: Option<String>,
 }
 
-/// Event type to register consumer interest for, used by runtime gating logic.
+/// Result of installing a plugin.
 ///
 /// <div class="warning">
 ///
@@ -11752,12 +12536,20 @@ pub struct QueueUpdateTextResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RegisterEventInterestParams {
-    /// The event type the consumer wants the runtime to treat as 'observed' for behavior-switching gating. Some runtime code paths inspect whether any consumer is interested in a specific event type and choose a different implementation accordingly (e.g. `mcp.oauth_required`: when interest is registered the runtime delegates interactive OAuth token acquisition to the consumer via `mcp.oauth_required` events; when no interest is registered the runtime still attempts non-interactive reconnect from cached or refreshable tokens, and only marks the server `needs-auth` if usable credentials are unavailable — it does not open a browser or start interactive OAuth without a consumer). SDK clients that long-poll events do NOT automatically appear as listeners to these gating checks — they must explicitly call `registerInterest` for each event type they want the runtime to count as having a consumer. Multiple registrations for the same event type from the same or different consumers are tracked independently and must each be released. See: `mcp.oauth_required`, `sampling.requested`, `auto_mode_switch.requested`, `session_limits_exhausted.requested`, `user_input.requested`, `elicitation.requested`, `command.queued`, `exit_plan_mode.requested`.
-    pub event_type: String,
+pub struct PluginInstallResult {
+    /// Set when the install path is deprecated (e.g. direct repo / URL / local installs). Callers should surface this to end users.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deprecation_warning: Option<String>,
+    /// The newly installed plugin's metadata
+    pub plugin: InstalledPluginInfo,
+    /// Optional post-install message provided by the plugin (e.g. setup instructions)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub post_install_message: Option<String>,
+    /// Number of skills discovered and installed from the plugin
+    pub skills_installed: i64,
 }
 
-/// Opaque handle representing an event-type interest registration.
+/// Plugins installed for the session, with their enabled state and version metadata.
 ///
 /// <div class="warning">
 ///
@@ -11767,12 +12559,12 @@ pub struct RegisterEventInterestParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RegisterEventInterestResult {
-    /// Opaque handle for this registration. Pass to releaseInterest to release. Each call to registerInterest produces a fresh handle, even when the same eventType is registered multiple times.
-    pub handle: String,
+pub struct PluginList {
+    /// Installed plugins
+    pub plugins: Vec<Plugin>,
 }
 
-/// Optional registration options.
+/// Plugins installed in user/global state.
 ///
 /// <div class="warning">
 ///
@@ -11782,14 +12574,12 @@ pub struct RegisterEventInterestResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsRegisterExtensionToolsOnSessionOptions {
-    /// In-process `() => boolean` gating callback (CLI-only optimization). Marked internal: replaced by runtime-side enable/disable RPCs in the SDK migration.
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) enabled: Option<serde_json::Value>,
+pub struct PluginListResult {
+    /// Installed plugins
+    pub plugins: Vec<InstalledPluginInfo>,
 }
 
-/// Params to attach an extension loader's tools to a session.
+/// Trusted built-in plugin directories to use for this runtime process.
 ///
 /// <div class="warning">
 ///
@@ -11799,18 +12589,12 @@ pub struct SessionsRegisterExtensionToolsOnSessionOptions {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct RegisterExtensionToolsParams {
-    /// In-process ExtensionLoader handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, extension discovery/launch moves entirely into the runtime — the CLI passes pure config (search paths, disabled ids) via SessionOptions instead.
-    #[doc(hidden)]
-    pub(crate) loader: serde_json::Value,
-    /// Optional registration options.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<SessionsRegisterExtensionToolsOnSessionOptions>,
-    /// Session to register extension tools on.
-    pub session_id: SessionId,
+pub struct PluginsBuiltinSetRequest {
+    /// Complete replacement set of trusted built-in plugin directories. Every entry must be an absolute local filesystem path no longer than 4096 characters.
+    pub paths: Vec<String>,
 }
 
-/// Handle for releasing the extension tool registration.
+/// Plugin names (or specs) to disable.
 ///
 /// <div class="warning">
 ///
@@ -11820,13 +12604,12 @@ pub(crate) struct RegisterExtensionToolsParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct RegisterExtensionToolsResult {
-    /// In-process unsubscribe function (CLI-only optimization). Marked internal: replaced by an explicit `extensions.unregister` RPC in the SDK migration.
-    #[doc(hidden)]
-    pub(crate) unsubscribe: serde_json::Value,
+pub struct PluginsDisableRequest {
+    /// Plugin names or "plugin@marketplace" specs to disable. Unknown names are ignored. Non-marketplace direct installs cannot be disabled via this API; uninstall them instead. Plugin-owned MCP servers are stopped in active sessions immediately; other plugin contributions remain available until each session reloads plugins.
+    pub names: Vec<String>,
 }
 
-/// Opaque handle previously returned by `registerInterest` to release.
+/// Plugin names (or specs) to enable.
 ///
 /// <div class="warning">
 ///
@@ -11836,12 +12619,12 @@ pub(crate) struct RegisterExtensionToolsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ReleaseEventInterestParams {
-    /// Handle returned by a previous `registerInterest` call. Idempotent: releasing an unknown or already-released handle is a no-op (returns success). When the last outstanding handle for an event type is released, the runtime reverts to its 'no consumer' code path for that event type.
-    pub handle: String,
+pub struct PluginsEnableRequest {
+    /// Plugin names or "plugin@marketplace" specs to enable. Unknown names are ignored. Non-marketplace direct installs are always enabled and cannot be toggled via this API.
+    pub names: Vec<String>,
 }
 
-/// Reattach to an existing MC session without creating a new one.
+/// Plugin source and optional working directory for relative-path resolution.
 ///
 /// <div class="warning">
 ///
@@ -11851,14 +12634,15 @@ pub struct ReleaseEventInterestParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteControlConfigExistingMcSession {
-    /// Existing MC session ID to reattach to.
-    pub mc_session_id: String,
-    /// Existing MC task ID for the reattached session.
-    pub mc_task_id: String,
+pub struct PluginsInstallRequest {
+    /// Plugin install spec. Accepts the same forms as the CLI: "plugin@marketplace" (marketplace install), "owner/repo" or "owner/repo:subpath" (GitHub direct), an http/https/ssh URL, or a local path. Direct (non-marketplace) installs are deprecated and will produce a deprecationWarning in the result.
+    pub source: String,
+    /// Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub working_directory: Option<String>,
 }
 
-/// Configuration for the runtime-managed remote-control singleton.
+/// Marketplace source and optional working directory for relative-path resolution.
 ///
 /// <div class="warning">
 ///
@@ -11868,24 +12652,15 @@ pub struct RemoteControlConfigExistingMcSession {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteControlConfig {
-    /// Reattach to an existing MC session without creating a new one.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub existing_mc_session: Option<RemoteControlConfigExistingMcSession>,
-    /// Whether the user explicitly requested remote (vs. implicit session-sync). Controls warning surfacing for missing-repo cases.
-    pub explicit: bool,
-    /// Whether remote export should be enabled.
-    pub remote: bool,
-    /// When true, suppresses timeline messages on successful setup.
-    pub silent: bool,
-    /// Whether the MC session may steer the local session (write mode).
-    pub steerable: bool,
-    /// Existing Mission Control task ID to attach the exported session to.
+pub struct PluginsMarketplacesAddRequest {
+    /// Marketplace source. Accepts the same forms as the CLI: "owner/repo" or "owner/repo#ref" (GitHub), an http/https/ssh URL (optionally with #ref), a git scp-style URL (user@host:path), or a local path. The marketplace's own name (from its manifest) is used as the registration key.
+    pub source: String,
+    /// Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub task_id: Option<String>,
+    pub working_directory: Option<String>,
 }
 
-/// Remote control is connected to a local session.
+/// Name of the marketplace whose plugin catalog to fetch.
 ///
 /// <div class="warning">
 ///
@@ -11895,27 +12670,12 @@ pub struct RemoteControlConfig {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteControlStatusActive {
-    /// Session id remote control is pointed at.
-    pub attached_session_id: String,
-    /// True while a read-only/session-sync export is deferred, awaiting the first `user.message` before its MC session exists. Marked internal: this field is excluded from the public SDK surface and is populated only on the CLI in-process path.
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) awaiting_first_message: Option<bool>,
-    /// MC frontend URL for this session, when known.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub frontend_url: Option<String>,
-    /// Whether the MC session may steer this session.
-    pub is_steerable: bool,
-    /// In-process prompt-manager handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, the same bidirectional prompt-routing handshake is expressed via dedicated remote-control RPCs (register/resolve) rather than a shared in-process object.
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) prompt_manager: Option<serde_json::Value>,
-    /// Remote control state tag: active.
-    pub state: RemoteControlStatusActiveState,
+pub struct PluginsMarketplacesBrowseRequest {
+    /// Marketplace name to browse
+    pub name: String,
 }
 
-/// Remote control is in the middle of initial setup.
+/// Optional marketplace name; omit to refresh all.
 ///
 /// <div class="warning">
 ///
@@ -11925,14 +12685,13 @@ pub struct RemoteControlStatusActive {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteControlStatusConnecting {
-    /// Session id the connection is attaching to.
-    pub attached_session_id: String,
-    /// Remote control state tag: connecting.
-    pub state: RemoteControlStatusConnectingState,
+pub struct PluginsMarketplacesRefreshRequest {
+    /// Marketplace name to refresh. When omitted, every registered marketplace is refreshed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
 }
 
-/// The last setup attempt failed. The singleton is otherwise off.
+/// Name of the marketplace to remove and an optional force flag.
 ///
 /// <div class="warning">
 ///
@@ -11942,17 +12701,15 @@ pub struct RemoteControlStatusConnecting {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteControlStatusError {
-    /// Session id the failing setup attempt targeted, when known.
+pub struct PluginsMarketplacesRemoveRequest {
+    /// When true, also uninstall every plugin sourced from this marketplace. When false (default), removal is a no-op if any plugin from this marketplace is installed and the dependent plugin names are returned in the result.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub attached_session_id: Option<String>,
-    /// Human-readable error message from the last setup attempt.
-    pub error: String,
-    /// Remote control state tag: setup failed.
-    pub state: RemoteControlStatusErrorState,
+    pub force: Option<bool>,
+    /// Marketplace name to remove
+    pub name: String,
 }
 
-/// Remote control is not connected.
+/// Optional flags controlling which side effects the reload performs.
 ///
 /// <div class="warning">
 ///
@@ -11962,12 +12719,25 @@ pub struct RemoteControlStatusError {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteControlStatusOff {
-    /// Remote control state tag: not connected.
-    pub state: RemoteControlStatusOffState,
+pub struct PluginsReloadRequest {
+    /// When true, skip repo-level hooks during the hook reload. Use before folder trust is confirmed; load them post-trust via `sessions.loadDeferredRepoHooks`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub defer_repo_hooks: Option<bool>,
+    /// Re-run custom-agent discovery after refreshing plugins. Defaults to true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reload_custom_agents: Option<bool>,
+    /// Re-discover and relaunch subprocess extensions (including plugin-shipped extensions) after refreshing plugins. Defaults to true. Has no effect when the session has no active extension controller (e.g. extensions were not requested for the session).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reload_extensions: Option<bool>,
+    /// Re-load user, plugin, and (subject to `deferRepoHooks`) repo hooks. Defaults to true. Has no effect when the host has not registered a hook reloader (e.g. remote sessions).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reload_hooks: Option<bool>,
+    /// Reload MCP server connections after refreshing plugins. Defaults to true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reload_mcp: Option<bool>,
 }
 
-/// Wrapper for the singleton's current status.
+/// Name (or spec) of the plugin to uninstall.
 ///
 /// <div class="warning">
 ///
@@ -11977,12 +12747,15 @@ pub struct RemoteControlStatusOff {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteControlStatusResult {
-    /// State of the runtime-managed remote-control singleton.
-    pub status: serde_json::Value,
+pub struct PluginsUninstallRequest {
+    /// Stable source identity for a direct (non-marketplace) install. Disambiguates uninstall when multiple installed plugins share the same name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub direct_source_id: Option<String>,
+    /// Plugin name or "plugin@marketplace" spec to uninstall. When ambiguous, prefer the fully-qualified spec.
+    pub name: String,
 }
 
-/// Outcome of a stopRemoteControl call.
+/// Name (or spec) of the plugin to update.
 ///
 /// <div class="warning">
 ///
@@ -11992,14 +12765,12 @@ pub struct RemoteControlStatusResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteControlStopResult {
-    /// State of the runtime-managed remote-control singleton.
-    pub status: serde_json::Value,
-    /// Whether the singleton was actually torn down by this call.
-    pub stopped: bool,
+pub struct PluginsUpdateRequest {
+    /// Plugin name or "plugin@marketplace" spec to update.
+    pub name: String,
 }
 
-/// Outcome of a transferRemoteControl call.
+/// Per-plugin result from updating all plugins, with versions, skills installed, success flag, and optional error.
 ///
 /// <div class="warning">
 ///
@@ -12009,14 +12780,28 @@ pub struct RemoteControlStopResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteControlTransferResult {
-    /// State of the runtime-managed remote-control singleton.
-    pub status: serde_json::Value,
-    /// Whether the rebinding actually happened.
-    pub transferred: bool,
+pub struct PluginUpdateAllEntry {
+    /// Error message (failure only)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Marketplace the plugin came from. Empty string ("") for direct installs.
+    pub marketplace: String,
+    /// Plugin name that was updated
+    pub name: String,
+    /// Version after the update, when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub new_version: Option<String>,
+    /// Previously installed version, when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub previous_version: Option<String>,
+    /// Number of skills installed after the update (success only)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skills_installed: Option<i64>,
+    /// Whether the update succeeded for this plugin
+    pub success: bool,
 }
 
-/// Optional remote session mode ("off", "export", or "on"); defaults to enabling both export and remote steering.
+/// Result of updating all installed plugins.
 ///
 /// <div class="warning">
 ///
@@ -12026,13 +12811,12 @@ pub struct RemoteControlTransferResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteEnableRequest {
-    /// Per-session remote mode. "off" disables remote, "export" exports session events to GitHub without enabling remote steering, "on" enables both export and remote steering.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<RemoteSessionMode>,
+pub struct PluginUpdateAllResult {
+    /// Per-plugin update results in deterministic order.
+    pub results: Vec<PluginUpdateAllEntry>,
 }
 
-/// GitHub URL for the session and a flag indicating whether remote steering is enabled.
+/// Result of updating a single plugin.
 ///
 /// <div class="warning">
 ///
@@ -12042,15 +12826,18 @@ pub struct RemoteEnableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteEnableResult {
-    /// Whether remote steering is enabled
-    pub remote_steerable: bool,
-    /// GitHub frontend URL for this session
+pub struct PluginUpdateResult {
+    /// Version after the update, when reported by the plugin manifest
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub url: Option<String>,
+    pub new_version: Option<String>,
+    /// Version that was previously installed, when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub previous_version: Option<String>,
+    /// Number of skills discovered and installed after the update
+    pub skills_installed: i64,
 }
 
-/// New remote-steerability state to persist as a `session.remote_steerable_changed` event.
+/// Serializable definition of a caller-implemented tool whose execution is handled over the SDK connection.
 ///
 /// <div class="warning">
 ///
@@ -12060,12 +12847,35 @@ pub struct RemoteEnableResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteNotifySteerableChangedRequest {
-    /// Whether the session now supports remote steering via GitHub. The runtime persists this as a `session.remote_steerable_changed` event so resume/replay sees the up-to-date capability.
-    pub remote_steerable: bool,
+pub struct ProtocolExternalToolDefinition {
+    /// Tool-loading deferral policy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub defer: Option<ProtocolExternalToolDefer>,
+    /// Model-visible explanation of what the tool does.
+    pub description: String,
+    /// Whether the tool executes commands in a terminal.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_terminal: Option<bool>,
+    /// Optional caller-defined metadata associated with the tool.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub metadata: Option<HashMap<String, serde_json::Value>>,
+    /// Unique model-visible tool name.
+    pub name: String,
+    /// Whether this definition replaces a built-in tool with the same name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub overrides_built_in_tool: Option<bool>,
+    /// JSON Schema describing the tool's input arguments.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parameters: Option<HashMap<String, serde_json::Value>>,
+    /// Whether execution bypasses the normal tool permission prompt.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skip_permission: Option<bool>,
+    /// Optional human-readable display title.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
 }
 
-/// Persist a steerability change as a `session.remote_steerable_changed` event. Used by the host (CLI / SDK consumer) when it has just finished enabling or disabling steering on a remote exporter that the runtime does not directly own.
+/// A BYOK model definition referencing a named provider.
 ///
 /// <div class="warning">
 ///
@@ -12075,11 +12885,37 @@ pub struct RemoteNotifySteerableChangedRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteNotifySteerableChangedResult {}
-
-/// Remote session connection result.
-///
-/// <div class="warning">
+pub struct ProviderModelConfig {
+    /// Optional capability overrides (vision, tool_calls, reasoning, etc.).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub capabilities: Option<ModelCapabilitiesOverride>,
+    /// Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`.
+    pub id: String,
+    /// Maximum context window tokens for the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_context_window_tokens: Option<i64>,
+    /// Maximum output tokens for the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_output_tokens: Option<i64>,
+    /// Maximum prompt/input tokens for the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_prompt_tokens: Option<i64>,
+    /// Well-known base model id used for behavior/capability/config lookup. Defaults to `id`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_id: Option<String>,
+    /// Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Name of the configured provider that serves this model.
+    pub provider: String,
+    /// The model name sent to the provider API for inference. Defaults to `id`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wire_model: Option<String>,
+}
+
+/// BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
+///
+/// <div class="warning">
 ///
 /// **Experimental.** This type is part of an experimental wire-protocol surface
 /// and may change or be removed in future SDK or CLI releases.
@@ -12087,14 +12923,16 @@ pub struct RemoteNotifySteerableChangedResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteSessionConnectionResult {
-    /// Metadata for a connected remote session.
-    pub metadata: ConnectedRemoteSessionMetadata,
-    /// SDK session ID for the connected remote session.
-    pub session_id: SessionId,
+pub struct ProviderAddRequest {
+    /// BYOK model definitions to register. Each must reference a provider that is already registered or included in this same call. Selection ids (`provider/id`) must be unique across the registry.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub models: Option<Vec<ProviderModelConfig>>,
+    /// Named BYOK provider connections to register, additive to any providers already in the registry. Each name must be unique across the registry and must not contain '/'.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub providers: Option<Vec<NamedProviderConfig>>,
 }
 
-/// GitHub repository the remote session belongs to.
+/// The selectable model entries synthesized for the models added by this call.
 ///
 /// <div class="warning">
 ///
@@ -12104,16 +12942,12 @@ pub struct RemoteSessionConnectionResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteSessionMetadataRepository {
-    /// Branch associated with the remote session.
-    pub branch: String,
-    /// Repository name.
-    pub name: String,
-    /// Repository owner.
-    pub owner: String,
+pub struct ProviderAddResult {
+    /// Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.
+    pub models: Vec<serde_json::Value>,
 }
 
-/// Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).
+/// Custom model-provider configuration (BYOK).
 ///
 /// <div class="warning">
 ///
@@ -12123,46 +12957,57 @@ pub struct RemoteSessionMetadataRepository {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteSessionMetadataValue {
-    /// Most recent working directory context.
+pub struct ProviderConfig {
+    /// API key. Optional for local providers like Ollama.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub context: Option<SessionContext>,
-    /// Always true for remote sessions.
-    pub is_remote: bool,
-    /// Last-modified time as an ISO 8601 timestamp.
-    pub modified_time: String,
-    /// Optional human-friendly name set via /rename.
+    pub api_key: Option<String>,
+    /// Azure-specific provider options.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Pull request number associated with the session.
+    pub azure: Option<ProviderConfigAzure>,
+    /// API endpoint URL.
+    pub base_url: String,
+    /// Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub pull_request_number: Option<i64>,
-    /// Backing remote session IDs (most recent first).
-    pub remote_session_ids: Vec<String>,
-    /// GitHub repository the remote session belongs to.
-    pub repository: RemoteSessionMetadataRepository,
-    /// Original remote resource identifier (task ID or PR node ID).
+    pub bearer_token: Option<String>,
+    /// When true, the SDK client supplies bearer tokens on demand: the runtime calls the client-session `providerToken.getToken` callback before each request and applies the returned token as an `Authorization: Bearer <token>` header. This is the bearer/OAuth scheme used by Azure AD / managed-identity tokens and provider OAuth access tokens (including Anthropic's), not a provider-specific API-key header such as Anthropic's `x-api-key`. The token-acquiring function itself stays on the SDK side and is never serialized; only this flag crosses the wire. When set alongside `apiKey`/`bearerToken`, the callback takes precedence: the runtime applies the token returned by `providerToken.getToken` as the `Authorization: Bearer` header for each request and does not send the static credential.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub resource_id: Option<String>,
-    /// Stable session identifier.
-    pub session_id: SessionId,
-    /// Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.
+    pub has_bearer_token_provider: Option<bool>,
+    /// Custom HTTP headers to include in all outbound requests to the provider.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub stale_at: Option<String>,
-    /// Session creation time as an ISO 8601 timestamp.
-    pub start_time: String,
-    /// Server-side task state returned by GitHub.
+    pub headers: Option<HashMap<String, String>>,
+    /// Maximum context window tokens for the model.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub state: Option<String>,
-    /// Short summary of the session, when one has been derived.
+    pub max_context_window_tokens: Option<f64>,
+    /// Maximum output tokens for the model.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary: Option<String>,
-    /// Whether the remote task originated from CCA or CLI `--remote`.
+    pub max_output_tokens: Option<f64>,
+    /// Maximum prompt/input tokens for the model.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub task_type: Option<RemoteSessionMetadataTaskType>,
+    pub max_prompt_tokens: Option<f64>,
+    /// Overrides for model capabilities when they cannot be inferred from modelId.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_capabilities: Option<ModelCapabilitiesOverride>,
+    /// Well-known model ID used for capability lookup. When set, agent behavior config and token limits are inferred from this model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_id: Option<String>,
+    /// Provider name used for model and telemetry attribution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_name: Option<String>,
+    /// Provider transport. Defaults to "http".
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transport: Option<ProviderConfigTransport>,
+    /// Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#type: Option<ProviderConfigType>,
+    /// Wire API format (openai/azure only). Defaults to "completions".
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wire_api: Option<ProviderConfigWireApi>,
+    /// The model identifier sent to the provider API for inference (the "wire" model), as opposed to modelId which is the well-known base.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wire_model: Option<String>,
 }
 
-/// Repository context for the remote session.
+/// Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.
 ///
 /// <div class="warning">
 ///
@@ -12172,17 +13017,20 @@ pub struct RemoteSessionMetadataValue {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct RemoteSessionRepository {
-    /// Optional branch associated with the remote session.
+pub struct ProviderSessionToken {
+    /// When the token expires, if known. Callers should refresh by calling `getEndpoint` again before this time, or reactively on any 401/403 response from `baseUrl`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    /// Repository name.
-    pub name: String,
-    /// Repository owner or organization login.
-    pub owner: String,
+    pub expires_at: Option<String>,
+    /// HTTP header name the token must be sent under.
+    pub header: String,
+    /// The model the token is bound to, when applicable. When set, the token is only valid for requests against this model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// The short-lived token value.
+    pub token: String,
 }
 
-/// macOS seatbelt experimental options.
+/// A snapshot of the provider endpoint the session is currently configured to talk to.
 ///
 /// <div class="warning">
 ///
@@ -12192,13 +13040,28 @@ pub struct RemoteSessionRepository {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxConfigUserPolicyExperimentalSeatbelt {
-    /// Whether the macOS seatbelt profile may access the keychain.
+pub struct ProviderEndpoint {
+    /// A credential the caller should use with this endpoint. Omitted only when the endpoint accepts unauthenticated requests.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub keychain_access: Option<bool>,
+    pub api_key: Option<String>,
+    /// Base URL to pass to the LLM client library.
+    pub base_url: String,
+    /// HTTP headers the caller must include on every outbound request.
+    pub headers: HashMap<String, String>,
+    /// Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_token: Option<ProviderSessionToken>,
+    /// Transport to be used for provider requests.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transport: Option<ProviderEndpointTransport>,
+    /// Provider family. Matches the `type` field of a BYOK provider config.
+    pub r#type: ProviderEndpointType,
+    /// Wire API to be used, when required for the provider type.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wire_api: Option<ProviderEndpointWireApi>,
 }
 
-/// Platform-specific experimental policy fields.
+/// Optional model identifier to scope the endpoint snapshot to.
 ///
 /// <div class="warning">
 ///
@@ -12208,13 +13071,13 @@ pub struct SandboxConfigUserPolicyExperimentalSeatbelt {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxConfigUserPolicyExperimental {
-    /// macOS seatbelt experimental options.
+pub struct ProviderGetEndpointRequest {
+    /// Model identifier the caller intends to use against the returned endpoint. Used to pick the correct wire shape. Omit to use whichever model the session is currently using.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub seatbelt: Option<SandboxConfigUserPolicyExperimentalSeatbelt>,
+    pub model_id: Option<String>,
 }
 
-/// Filesystem rules to merge into the base policy.
+/// Asks the SDK client to acquire a bearer token for a BYOK provider whose config set `hasBearerTokenProvider: true`. Issued by the runtime before each outbound model request; the runtime does no caching, so this is sent once per request.
 ///
 /// <div class="warning">
 ///
@@ -12224,22 +13087,14 @@ pub struct SandboxConfigUserPolicyExperimental {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxConfigUserPolicyFilesystem {
-    /// Whether to clear the policy when the session exits.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub clear_policy_on_exit: Option<bool>,
-    /// Paths explicitly denied.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub denied_paths: Option<Vec<String>>,
-    /// Paths granted read-only access.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub readonly_paths: Option<Vec<String>>,
-    /// Paths granted read/write access.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub readwrite_paths: Option<Vec<String>>,
+pub struct ProviderTokenAcquireRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Name of the BYOK provider needing a token. For the legacy whole-session provider this is the implicit provider name; for named providers it is the configured provider name.
+    pub provider_name: String,
 }
 
-/// HTTP proxy configuration for sandboxed traffic.
+/// A bearer token supplied by the SDK client for a BYOK provider. The runtime sets it as `Authorization: Bearer <token>` on the outbound request and does no caching; the SDK consumer owns token caching and refresh.
 ///
 /// <div class="warning">
 ///
@@ -12249,18 +13104,12 @@ pub struct SandboxConfigUserPolicyFilesystem {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxConfigUserPolicyNetworkProxy {
-    /// Optional password for proxy authentication, combined with the URL at spawn time. The persisted value may be a literal password, a `${secret:…}` reference resolved from the OS keychain, or a `${VAR}`/`$VAR` environment reference; it is resolved just before the sandboxed process routes through the proxy. The /sandbox dialog stores a real password in the OS keychain and persists only a `${secret:…}` placeholder (never plaintext in settings.json); the field is masked in the dialog and redacted by /settings show.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub password: Option<String>,
-    /// Proxy URL (e.g. http://proxy.example.com:8080). The port is optional and defaults to the scheme's standard port when omitted. Credentials must not be embedded here — a `user:pass@` authority is rejected; put them in the separate `username`/`password` fields. A credential-free http:// loopback URL is routed through the localhost proxy automatically; loopback covers localhost and any *.localhost subdomain, the whole 127.0.0.0/8 range, ::1, and IPv4-mapped loopback (::ffff:127.0.0.1). An https:// URL, or one with a username/password set, is used as-is.
-    pub url: String,
-    /// Optional username for proxy authentication. Combined with the URL (and `password`) into `user:pass@host` when the sandboxed process routes through the proxy.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub username: Option<String>,
+pub struct ProviderTokenAcquireResult {
+    /// The bearer token value (without the `Bearer ` prefix).
+    pub token: String,
 }
 
-/// Network rules to merge into the base policy.
+/// Blob attachment with inline base64-encoded data
 ///
 /// <div class="warning">
 ///
@@ -12270,19 +13119,19 @@ pub struct SandboxConfigUserPolicyNetworkProxy {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxConfigUserPolicyNetwork {
-    /// Whether traffic to local/loopback addresses is allowed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub allow_local_network: Option<bool>,
-    /// Whether outbound network traffic is allowed at all.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub allow_outbound: Option<bool>,
-    /// HTTP proxy the sandboxed process routes traffic through. Enforced on Windows and cooperative (honored by well-behaved tools, not strictly enforced) on Linux and macOS. Credentials go in the separate `username`/`password` fields. A credential-free http:// loopback proxy URL is routed through the localhost proxy automatically; an https:// or authenticated loopback URL is used as-is.
+pub struct PushAttachmentBlob {
+    /// Base64-encoded content
+    pub data: String,
+    /// User-facing display name for the attachment
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub proxy: Option<SandboxConfigUserPolicyNetworkProxy>,
+    pub display_name: Option<String>,
+    /// MIME type of the inline data
+    pub mime_type: String,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentBlobType,
 }
 
-/// macOS seatbelt-specific options.
+/// Directory attachment
 ///
 /// <div class="warning">
 ///
@@ -12292,13 +13141,16 @@ pub struct SandboxConfigUserPolicyNetwork {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxConfigUserPolicySeatbelt {
-    /// Whether the macOS seatbelt profile may access the keychain.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub keychain_access: Option<bool>,
+pub struct PushAttachmentDirectory {
+    /// User-facing display name for the attachment
+    pub display_name: String,
+    /// Absolute directory path
+    pub path: String,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentDirectoryType,
 }
 
-/// User-managed sandbox policy fragment merged into the auto-discovered base policy.
+/// Optional line range to scope the attachment to a specific section of the file
 ///
 /// <div class="warning">
 ///
@@ -12308,22 +13160,14 @@ pub struct SandboxConfigUserPolicySeatbelt {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxConfigUserPolicy {
-    /// Deprecated legacy location for `seatbelt`; read only when the top-level `seatbelt` is absent.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub experimental: Option<SandboxConfigUserPolicyExperimental>,
-    /// Filesystem rules to merge into the base policy.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub filesystem: Option<SandboxConfigUserPolicyFilesystem>,
-    /// Network rules to merge into the base policy.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub network: Option<SandboxConfigUserPolicyNetwork>,
-    /// macOS seatbelt options to merge into the base policy.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub seatbelt: Option<SandboxConfigUserPolicySeatbelt>,
-}
-
-/// Resolved sandbox configuration.
+pub struct PushAttachmentFileLineRange {
+    /// End line number (1-based, inclusive)
+    pub end: i64,
+    /// Start line number (1-based)
+    pub start: i64,
+}
+
+/// File attachment
 ///
 /// <div class="warning">
 ///
@@ -12333,27 +13177,19 @@ pub struct SandboxConfigUserPolicy {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxConfig {
-    /// Whether to auto-add the current working directory to readwritePaths. Default: true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub add_current_working_directory: Option<bool>,
-    /// Whether to auto-grant read access to common developer-tool caches, registries, and toolchains in their default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and, on Unix, up-front creation of) the scratch caches builds write on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so builds work without exporting CARGO_HOME/GOPATH/etc. Default: true (enabled by default; set to false to opt out).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub allow_dev_tool_caches: Option<bool>,
-    /// Whether sandboxing is enabled for the session.
-    pub enabled: bool,
-    /// Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the OS keyring the sandbox blocks. Default: false (opt-in).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub gh_auth: Option<bool>,
-    /// Whether to inject the Copilot GitHub token as an `http.<host>.extraheader` so authenticated HTTPS git works inside the sandbox without the shell-based credential helper the sandbox blocks. Default: false (opt-in).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub git_auth: Option<bool>,
-    /// User-managed sandbox policy fragment merged into the auto-discovered base policy.
+pub struct PushAttachmentFile {
+    /// User-facing display name for the attachment
+    pub display_name: String,
+    /// Optional line range to scope the attachment to a specific section of the file
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub user_policy: Option<SandboxConfigUserPolicy>,
+    pub line_range: Option<PushAttachmentFileLineRange>,
+    /// Absolute file path
+    pub path: String,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentFileType,
 }
 
-/// Register an absolute-time scheduled prompt.
+/// Pointer to a GitHub repository.
 ///
 /// <div class="warning">
 ///
@@ -12363,20 +13199,17 @@ pub struct SandboxConfig {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleAddAtRequest {
-    /// Epoch milliseconds when the prompt should fire.
-    pub at: i64,
-    /// Optional display-only prompt label.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_prompt: Option<String>,
-    /// Prompt text to enqueue when the schedule fires.
-    pub prompt: String,
-    /// Whether the schedule should re-arm after each tick. Defaults to false.
+pub struct PushGitHubRepoRef {
+    /// Numeric GitHub repository id
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub recurring: Option<bool>,
+    pub id: Option<i64>,
+    /// Repository name (without owner)
+    pub name: String,
+    /// Repository owner login (user or organization)
+    pub owner: String,
 }
 
-/// Register a cron scheduled prompt.
+/// Pointer to a GitHub Actions job.
 ///
 /// <div class="warning">
 ///
@@ -12386,23 +13219,25 @@ pub struct ScheduleAddAtRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleAddCronRequest {
-    /// 5-field cron expression.
-    pub cron: String,
-    /// Optional display-only prompt label.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_prompt: Option<String>,
-    /// Prompt text to enqueue when the schedule fires.
-    pub prompt: String,
-    /// Whether the schedule should re-arm after each tick. Defaults to true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub recurring: Option<bool>,
-    /// IANA timezone for evaluating the cron expression.
+pub struct PushAttachmentGitHubActionsJob {
+    /// Terminal conclusion of the job when finished (e.g., success, failure, cancelled). Absent for in-progress jobs.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub tz: Option<String>,
+    pub conclusion: Option<String>,
+    /// Job id within the workflow run
+    pub job_id: i64,
+    /// Display name of the job
+    pub job_name: String,
+    /// Repository the workflow run belongs to
+    pub repo: PushGitHubRepoRef,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubActionsJobType,
+    /// URL to the job on GitHub
+    pub url: String,
+    /// Display name of the workflow the job ran in
+    pub workflow_name: String,
 }
 
-/// Register a relative-interval scheduled prompt.
+/// Pointer to a GitHub commit.
 ///
 /// <div class="warning">
 ///
@@ -12412,20 +13247,20 @@ pub struct ScheduleAddCronRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleAddRequest {
-    /// Optional display-only prompt label.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_prompt: Option<String>,
-    /// Human-readable interval such as `30s`, `5m`, or `2h`.
-    pub interval: String,
-    /// Prompt text to enqueue when the schedule fires.
-    pub prompt: String,
-    /// Whether the schedule should re-arm after each tick. Defaults to true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub recurring: Option<bool>,
+pub struct PushAttachmentGitHubCommit {
+    /// First line of the commit message
+    pub message: String,
+    /// Full commit SHA
+    pub oid: String,
+    /// Repository the commit belongs to
+    pub repo: PushGitHubRepoRef,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubCommitType,
+    /// URL to the commit on GitHub
+    pub url: String,
 }
 
-/// Scheduled prompt entry with ID, timing (`intervalMs`, `cron`, or `at`), prompt text, recurrence, and next run time.
+/// Pointer to a file in a GitHub repository at a specific ref.
 ///
 /// <div class="warning">
 ///
@@ -12435,36 +13270,20 @@ pub struct ScheduleAddRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleEntry {
-    /// Absolute fire time (epoch milliseconds) for a one-shot calendar schedule.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub at: Option<i64>,
-    /// 5-field cron expression for a recurring calendar schedule, evaluated in `tz`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cron: Option<String>,
-    /// Display-only label for the prompt as shown in the UI (e.g. `/skill-name` for a skill-invocation schedule). The actual enqueued prompt is `prompt`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_prompt: Option<String>,
-    /// Sequential id assigned by the runtime within the session. Stable across resumes (rebuilt from the event log).
-    pub id: i64,
-    /// Interval between scheduled ticks, in milliseconds (relative-interval schedules).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub interval_ms: Option<i64>,
-    /// ISO 8601 timestamp when the next tick is scheduled to fire.
-    pub next_run_at: String,
-    /// Prompt text that gets enqueued on every tick.
-    pub prompt: String,
-    /// Whether the schedule re-arms after each tick (`/every`) or fires once (`/after`).
-    pub recurring: bool,
-    /// True for a self-paced (`dynamic`) schedule: no fixed cadence; the model arms each next run via the `manage_schedule` `wakeup` action. `nextRunAt` is model-controlled.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub self_paced: Option<bool>,
-    /// IANA timezone the `cron` expression is evaluated in.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tz: Option<String>,
+pub struct PushAttachmentGitHubFile {
+    /// Repository-relative path to the file
+    pub path: String,
+    /// Git ref the file is read at (branch, tag, or commit SHA)
+    pub r#ref: String,
+    /// Repository the file lives in
+    pub repo: PushGitHubRepoRef,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubFileType,
+    /// URL to the file on GitHub
+    pub url: String,
 }
 
-/// Result of registering or re-arming a scheduled prompt.
+/// One side of a file diff (head or base)
 ///
 /// <div class="warning">
 ///
@@ -12474,16 +13293,16 @@ pub struct ScheduleEntry {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleAddResult {
-    /// The registered or updated schedule entry.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entry: Option<ScheduleEntry>,
-    /// User-facing validation error, when registration failed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
+pub struct PushAttachmentGitHubFileDiffSide {
+    /// Repository-relative path to the file
+    pub path: String,
+    /// Git ref (branch, tag, or commit SHA) the file is read at
+    pub r#ref: String,
+    /// Repository the file lives in
+    pub repo: PushGitHubRepoRef,
 }
 
-/// Register a self-paced scheduled prompt.
+/// Pointer to a single-file diff. At least one of `head` and `base` must be present.
 ///
 /// <div class="warning">
 ///
@@ -12493,15 +13312,20 @@ pub struct ScheduleAddResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleAddSelfPacedRequest {
-    /// Optional display-only prompt label.
+pub struct PushAttachmentGitHubFileDiff {
+    /// File location on the base side of the diff. Absent for additions.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_prompt: Option<String>,
-    /// Prompt text to enqueue when the schedule fires.
-    pub prompt: String,
+    pub base: Option<PushAttachmentGitHubFileDiffSide>,
+    /// File location on the head side of the diff. Absent for deletions.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub head: Option<PushAttachmentGitHubFileDiffSide>,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubFileDiffType,
+    /// URL to the diff on GitHub (e.g., a commit, compare, or PR-file URL)
+    pub url: String,
 }
 
-/// Whether the session currently has an active self-paced schedule.
+/// GitHub issue, pull request, or discussion reference
 ///
 /// <div class="warning">
 ///
@@ -12511,12 +13335,22 @@ pub struct ScheduleAddSelfPacedRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleHasSelfPacedResult {
-    /// True when at least one active schedule is self-paced.
-    pub has_self_paced: bool,
+pub struct PushAttachmentGitHubReference {
+    /// Issue, pull request, or discussion number
+    pub number: i64,
+    /// Type of GitHub reference
+    pub reference_type: PushAttachmentGitHubReferenceType,
+    /// Current state of the referenced item (e.g., open, closed, merged)
+    pub state: String,
+    /// Title of the referenced item
+    pub title: String,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubReferenceType,
+    /// URL to the referenced item on GitHub
+    pub url: String,
 }
 
-/// Snapshot of the currently active recurring prompts for this session.
+/// Pointer to a GitHub release.
 ///
 /// <div class="warning">
 ///
@@ -12526,12 +13360,20 @@ pub struct ScheduleHasSelfPacedResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleList {
-    /// Active scheduled prompts, ordered by id.
-    pub entries: Vec<ScheduleEntry>,
+pub struct PushAttachmentGitHubRelease {
+    /// Human-readable release name
+    pub name: String,
+    /// Repository the release belongs to
+    pub repo: PushGitHubRepoRef,
+    /// Git tag the release is anchored to
+    pub tag_name: String,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubReleaseType,
+    /// URL to the release on GitHub
+    pub url: String,
 }
 
-/// Re-arm a self-paced scheduled prompt.
+/// Pointer to a GitHub repository.
 ///
 /// <div class="warning">
 ///
@@ -12541,14 +13383,22 @@ pub struct ScheduleList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleRearmSelfPacedRequest {
-    /// Epoch milliseconds when the prompt should next fire.
-    pub at: i64,
-    /// Id of the self-paced scheduled prompt.
-    pub id: i64,
+pub struct PushAttachmentGitHubRepository {
+    /// Short description of the repository
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Git ref this attachment is anchored at (branch, tag, or commit). When absent the default branch is implied.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#ref: Option<String>,
+    /// Repository pointer
+    pub repo: PushGitHubRepoRef,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubRepositoryType,
+    /// URL to the repository on GitHub
+    pub url: String,
 }
 
-/// Identifier of the scheduled prompt to remove.
+/// Pointer to a line range inside a file in a GitHub repository.
 ///
 /// <div class="warning">
 ///
@@ -12558,12 +13408,22 @@ pub struct ScheduleRearmSelfPacedRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleStopRequest {
-    /// Id of the scheduled prompt to remove.
-    pub id: i64,
+pub struct PushAttachmentGitHubSnippet {
+    /// Line range the snippet covers
+    pub line_range: PushAttachmentFileLineRange,
+    /// Repository-relative path to the file
+    pub path: String,
+    /// Git ref the file is read at (branch, tag, or commit SHA)
+    pub r#ref: String,
+    /// Repository the file lives in
+    pub repo: PushGitHubRepoRef,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubSnippetType,
+    /// URL to the snippet on GitHub (with line anchor)
+    pub url: String,
 }
 
-/// Remove a scheduled prompt by id. The result entry is omitted if the id was unknown.
+/// One side of a tree comparison (head or base)
 ///
 /// <div class="warning">
 ///
@@ -12573,13 +13433,14 @@ pub struct ScheduleStopRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ScheduleStopResult {
-    /// The removed entry, or omitted if no entry matched.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entry: Option<ScheduleEntry>,
-}
-
-/// Secret values to add to the redaction filter.
+pub struct PushAttachmentGitHubTreeComparisonSide {
+    /// Repository the revision belongs to
+    pub repo: PushGitHubRepoRef,
+    /// Git revision (branch, tag, or commit SHA)
+    pub revision: String,
+}
+
+/// Pointer to a comparison between two git revisions.
 ///
 /// <div class="warning">
 ///
@@ -12589,12 +13450,18 @@ pub struct ScheduleStopResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SecretsAddFilterValuesRequest {
-    /// Raw secret values to register for redaction
-    pub values: Vec<String>,
+pub struct PushAttachmentGitHubTreeComparison {
+    /// Base side of the comparison
+    pub base: PushAttachmentGitHubTreeComparisonSide,
+    /// Head side of the comparison
+    pub head: PushAttachmentGitHubTreeComparisonSide,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubTreeComparisonType,
+    /// URL to the comparison on GitHub
+    pub url: String,
 }
 
-/// Confirmation that the secret values were registered.
+/// Generic GitHub URL reference.
 ///
 /// <div class="warning">
 ///
@@ -12604,12 +13471,14 @@ pub struct SecretsAddFilterValuesRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SecretsAddFilterValuesResult {
-    /// Whether the values were successfully registered
-    pub ok: bool,
+pub struct PushAttachmentGitHubUrl {
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentGitHubUrlType,
+    /// URL to the GitHub resource
+    pub url: String,
 }
 
-/// Parameters for session.extensions.sendAttachmentsToMessage.
+/// End position of the selection
 ///
 /// <div class="warning">
 ///
@@ -12619,15 +13488,14 @@ pub struct SecretsAddFilterValuesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SendAttachmentsToMessageParams {
-    /// Attachments to push into the next user-message turn. extension_context entries take the slim shape; standard variants take their full AttachmentSchema shape.
-    pub attachments: Vec<serde_json::Value>,
-    /// Optional canvas instance binding the push for provenance. When supplied, the runtime resolves the canvas, verifies it is owned by the calling extension, and stamps canvasId/instanceId onto each extension_context entry. When omitted, no resolution runs and those fields stay unset on the attachment.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub instance_id: Option<String>,
+pub struct PushAttachmentSelectionDetailsEnd {
+    /// End character offset within the line (0-based)
+    pub character: i64,
+    /// End line number (0-based)
+    pub line: i64,
 }
 
-/// A single user message to append to the session as part of a `session.sendMessages` turn
+/// Start position of the selection
 ///
 /// <div class="warning">
 ///
@@ -12637,29 +13505,14 @@ pub struct SendAttachmentsToMessageParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SendMessageItem {
-    /// Optional attachments (files, directories, selections, blobs, GitHub references) to include with this message
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub attachments: Option<Vec<serde_json::Value>>,
-    /// If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) billable: Option<bool>,
-    /// If provided, this is shown in the timeline instead of `prompt`
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_prompt: Option<String>,
-    /// The user message text
-    pub prompt: String,
-    /// If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub required_tool: Option<String>,
-    /// Optional provenance tag copied to the resulting user.message event. Must be `user`, `system`, `command-<command-id>` for command-originated messages, `schedule-<numeric-id>` for scheduled prompts, or `agent-<agent-id>` for prompts sent by another agent.
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) source: Option<String>,
+pub struct PushAttachmentSelectionDetailsStart {
+    /// Start character offset within the line (0-based)
+    pub character: i64,
+    /// Start line number (0-based)
+    pub line: i64,
 }
 
-/// Parameters for sending zero or more user messages to the session in a single turn. Remote-backed (Mission Control) sessions do not support this method and will return an error.
+/// Position range of the selection within the file
 ///
 /// <div class="warning">
 ///
@@ -12669,33 +13522,14 @@ pub struct SendMessageItem {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SendMessagesRequest {
-    /// The UI mode the agent was in when these messages were sent. Defaults to the session's current mode.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_mode: Option<SendAgentMode>,
-    /// The user messages to append to the conversation, in order. May be empty, in which case a single turn runs over the existing history with no new user message.
-    pub messages: Vec<SendMessageItem>,
-    /// How to deliver the messages. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<SendMode>,
-    /// If true, adds the messages to the front of the queue instead of the end
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub prepend: Option<bool>,
-    /// Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub request_headers: Option<HashMap<String, String>>,
-    /// W3C Trace Context traceparent header for distributed tracing of this agent turn
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub traceparent: Option<String>,
-    /// W3C Trace Context tracestate header for distributed tracing
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tracestate: Option<String>,
-    /// If true, await completion of the agentic loop for this turn before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageIds`; the caller can rely on the agent having processed the messages before the call resolves. Transport-dependent tail semantics: on a LOCAL (in-process) session the wait additionally blocks until the completed turn's event tail has been dispatched to this session's in-process subscribers, so a subsequent read of subscriber state already reflects the turn; on a REMOTE session the wait resolves once the loop completes and mirrored delivery follows over the wire. Callers that need the stronger local guarantee on remote sessions should await the event stream explicitly.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub wait: Option<bool>,
+pub struct PushAttachmentSelectionDetails {
+    /// End position of the selection
+    pub end: PushAttachmentSelectionDetailsEnd,
+    /// Start position of the selection
+    pub start: PushAttachmentSelectionDetailsStart,
 }
 
-/// Result of sending zero or more user messages
+/// Code selection attachment from an editor
 ///
 /// <div class="warning">
 ///
@@ -12705,12 +13539,20 @@ pub struct SendMessagesRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SendMessagesResult {
-    /// Unique identifiers assigned to the messages, one per provided message in order. Empty when no messages were provided.
-    pub message_ids: Vec<String>,
+pub struct PushAttachmentSelection {
+    /// User-facing display name for the selection
+    pub display_name: String,
+    /// Absolute path to the file containing the selection
+    pub file_path: String,
+    /// Position range of the selection within the file
+    pub selection: PushAttachmentSelectionDetails,
+    /// The selected text content
+    pub text: String,
+    /// Attachment type discriminator
+    pub r#type: PushAttachmentSelectionType,
 }
 
-/// Parameters for sending a user message to the session
+/// Inputs for starting a deferred-idle drain.
 ///
 /// <div class="warning">
 ///
@@ -12720,49 +13562,12 @@ pub struct SendMessagesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SendRequest {
-    /// The UI mode the agent was in when this message was sent. Defaults to the session's current mode.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_mode: Option<SendAgentMode>,
-    /// Optional attachments (files, directories, selections, blobs, GitHub references) to include with the message
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub attachments: Option<Vec<serde_json::Value>>,
-    /// If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub billable: Option<bool>,
-    /// If provided, this is shown in the timeline instead of `prompt`
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub display_prompt: Option<String>,
-    /// How to deliver the message. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<SendMode>,
-    /// If true, adds the message to the front of the queue instead of the end
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub prepend: Option<bool>,
-    /// The user message text
-    pub prompt: String,
-    /// Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub request_headers: Option<HashMap<String, String>>,
-    /// If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub required_tool: Option<String>,
-    /// Optional provenance tag copied to the resulting user.message event. Must be `user`, `system`, `command-<command-id>` for command-originated messages, `schedule-<numeric-id>` for scheduled prompts, or `agent-<agent-id>` for prompts sent by another agent.
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) source: Option<String>,
-    /// W3C Trace Context traceparent header for distributed tracing of this agent turn
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub traceparent: Option<String>,
-    /// W3C Trace Context tracestate header for distributed tracing
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tracestate: Option<String>,
-    /// If true, await completion of the agentic loop for this message before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageId`; the caller can rely on the agent having processed the message before the call resolves. Transport-dependent tail semantics: on a LOCAL (in-process) session the wait additionally blocks until the completed turn's event tail has been dispatched to this session's in-process subscribers, so a subsequent read of subscriber state already reflects the turn; on a REMOTE session the wait resolves once the loop completes and mirrored delivery follows over the wire. Callers that need the stronger local guarantee on remote sessions should await the event stream explicitly.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub wait: Option<bool>,
+pub struct QueueBeginDeferredIdleDrainRequest {
+    /// Whether the host still has active background work.
+    pub active_background_work: bool,
 }
 
-/// Result of sending a user message
+/// Whether a deferred-idle drain should run.
 ///
 /// <div class="warning">
 ///
@@ -12772,12 +13577,12 @@ pub struct SendRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SendResult {
-    /// Unique identifier assigned to the message
-    pub message_id: String,
+pub struct QueueBeginDeferredIdleDrainResult {
+    /// True when the host should run finishDeferredIdleDrain asynchronously.
+    pub should_drain: bool,
 }
 
-/// Internal request for sending a system notification.
+/// Internal filter for consuming queued system notifications.
 ///
 /// <div class="warning">
 ///
@@ -12787,18 +13592,12 @@ pub struct SendResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SendSystemNotificationRequest {
-    /// Optional structured notification kind.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub kind: Option<serde_json::Value>,
-    /// Notification text to deliver to the model.
-    pub message: String,
-    /// Internal delivery options, including passive policy.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<serde_json::Value>,
+pub struct QueueConsumeSystemNotificationsRequest {
+    /// Opaque runtime-owned filter object.
+    pub filter: serde_json::Value,
 }
 
-/// Agents discovered across user, project, plugin, and remote sources.
+/// Queued-command response indicating the host executed the command, with an optional flag to stop queue processing.
 ///
 /// <div class="warning">
 ///
@@ -12808,12 +13607,15 @@ pub struct SendSystemNotificationRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ServerAgentList {
-    /// All discovered agents across all sources
-    pub agents: Vec<AgentInfo>,
+pub struct QueuedCommandHandled {
+    /// The host actually executed the queued command.
+    pub handled: bool,
+    /// When true, the runtime will not process subsequent queued commands until a new request comes in.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stop_processing_queue: Option<bool>,
 }
 
-/// Instruction sources discovered across user, repository, and plugin sources.
+/// Queued-command response indicating the host did not execute the command and the queue may continue.
 ///
 /// <div class="warning">
 ///
@@ -12823,12 +13625,12 @@ pub struct ServerAgentList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ServerInstructionSourceList {
-    /// All discovered instruction sources
-    pub sources: Vec<InstructionSource>,
+pub struct QueuedCommandNotHandled {
+    /// The host did not execute the queued command. Unblocks the queue without claiming the command was processed (e.g. when the handler threw before completing).
+    pub handled: bool,
 }
 
-/// Server-side skill metadata, including name, description, source, enabled/invocable state, path, project path, and argument hint.
+/// Inputs for marking session.idle deferred in native state.
 ///
 /// <div class="warning">
 ///
@@ -12838,29 +13640,12 @@ pub struct ServerInstructionSourceList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ServerSkill {
-    /// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub argument_hint: Option<String>,
-    /// Description of what the skill does
-    pub description: String,
-    /// Whether the skill is currently enabled (based on global config)
-    pub enabled: bool,
-    /// Unique identifier for the skill
-    pub name: String,
-    /// Absolute path to the skill file
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// The project path this skill belongs to (only for project/inherited skills)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_path: Option<String>,
-    /// Source location type (e.g., project, personal-copilot, plugin, builtin)
-    pub source: SkillSource,
-    /// Whether the skill can be invoked by the user as a slash command
-    pub user_invocable: bool,
+pub struct QueueDeferSessionIdleRequest {
+    /// Whether the deferred idle was caused by an aborted foreground turn.
+    pub aborted: bool,
 }
 
-/// Skills discovered across global and project sources.
+/// Parameters for duplicating a queued item.
 ///
 /// <div class="warning">
 ///
@@ -12870,15 +13655,12 @@ pub struct ServerSkill {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ServerSkillList {
-    /// Messages for skills that failed to load (e.g. malformed SKILL.md). Empty when host skills are excluded so host-local paths are not disclosed to multitenant callers.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub errors: Option<Vec<String>>,
-    /// All discovered skills across all sources
-    pub skills: Vec<ServerSkill>,
+pub struct QueueDuplicateAtRequest {
+    /// Stable opaque ID of the queued item to duplicate.
+    pub id: String,
 }
 
-/// Current activity flags for the session.
+/// Result of duplicating a queued item.
 ///
 /// <div class="warning">
 ///
@@ -12888,14 +13670,12 @@ pub struct ServerSkillList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionActivity {
-    /// Whether an in-flight operation can currently be aborted.
-    pub abortable: bool,
-    /// Whether the session currently has active work, including running turns or tasks.
-    pub has_active_work: bool,
+pub struct QueueDuplicateAtResult {
+    /// Fresh stable opaque id assigned to the duplicate.
+    pub id: String,
 }
 
-/// Authentication status and account metadata for the session.
+/// Result of enqueueing the resume-pending wake item.
 ///
 /// <div class="warning">
 ///
@@ -12905,27 +13685,12 @@ pub struct SessionActivity {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionAuthStatus {
-    /// Authentication type
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub auth_type: Option<AuthInfoType>,
-    /// Copilot plan tier (e.g., individual_pro, business)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_plan: Option<String>,
-    /// Authentication host URL
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub host: Option<String>,
-    /// Whether the session has resolved authentication
-    pub is_authenticated: bool,
-    /// Authenticated login/username, if available
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub login: Option<String>,
-    /// Human-readable authentication status description
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status_message: Option<String>,
+pub struct QueueEnqueueResumePendingResult {
+    /// True when a wake item was newly queued.
+    pub queued: bool,
 }
 
-/// Map of sessionId -> bytes freed by removing the session's workspace directory.
+/// Inputs for completing a deferred-idle drain.
 ///
 /// <div class="warning">
 ///
@@ -12935,39 +13700,31 @@ pub struct SessionAuthStatus {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionBulkDeleteResult {
-    /// Map of sessionId -> bytes freed by removing the session's workspace directory. Sessions whose deletion failed are omitted from this map (failures are logged on the server but not surfaced per-id; check the map for absent IDs to detect them).
-    pub freed_bytes: HashMap<String, i64>,
-}
-
-/// Successful compaction history for the session.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionContextAttributionCompactions {
-    /// Number of successful compactions in this session.
-    pub count: i64,
+pub struct QueueFinishDeferredIdleDrainRequest {
+    /// Whether the host still has active background work.
+    pub active_background_work: bool,
+    /// Whether native queued work remains.
+    pub has_pending: bool,
 }
 
+/// Action selected by the native deferred-idle drain.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionContextAttributionEntriesItem {
-    /// Supplementary per-entry metadata (e.g. `messageCount`, `role`, `evictable`, `pluginSource`). Values are stringified; parse as needed and ignore unrecognized keys.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub attributes: Option<HashMap<String, String>>,
-    /// Identifier for this entry, formed by joining its `kind` and source name (e.g. `tool:bash`, `skill:tmux`, `toolDefinition:bash`); unique within the snapshot. Use it to match the same entry across snapshots, to correlate with other APIs (skill/agent/MCP registries), and as the `parentId` target for nesting. Distinct from the human-facing `label`.
-    pub id: String,
-    /// Source category for this entry. Not a closed set — tolerate unknown values. Known values today: `skill`, `subagent`, `mcpServer`, `tool`, `system`, `toolDefinition`, `plugin`.
-    pub kind: String,
-    /// Human-readable display label, e.g. `bash` or `skill: tmux`. Presentation-only; may be localized/reformatted without notice — do not key off it.
-    pub label: String,
-    /// Optional `id` of the parent entry: e.g. a `plugin` entry parenting its `skill`/`mcpServer` entries, or the `system` entry parenting `toolDefinition` entries. Omitted for top-level entries.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub parent_id: Option<String>,
-    /// Token count currently in context attributable to this entry.
-    pub tokens: i64,
+pub struct QueueFinishDeferredIdleDrainResult {
+    /// Whether the deferred idle was caused by an aborted foreground turn.
+    pub aborted: bool,
+    /// One of none, processQueue, or emitSessionIdle.
+    pub action: String,
 }
 
-/// Per-source context-window attribution, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
+/// Whether the native queue has pending work.
 ///
 /// <div class="warning">
 ///
@@ -12977,16 +13734,12 @@ pub struct SessionContextAttributionEntriesItem {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionContextAttribution {
-    /// Successful compaction history for the session.
-    pub compactions: SessionContextAttributionCompactions,
-    /// Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`.
-    pub entries: Vec<SessionContextAttributionEntriesItem>,
-    /// Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share.
-    pub total_tokens: i64,
+pub struct QueueHasPendingResult {
+    /// True when queued or immediate native work is pending.
+    pub has_pending: bool,
 }
 
-/// Token breakdown for the current context window, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
+/// Serializable message fields accepted by queue.insertAt.
 ///
 /// <div class="warning">
 ///
@@ -12996,30 +13749,45 @@ pub struct SessionContextAttribution {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionContextInfo {
-    /// Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%)
-    pub buffer_tokens: i64,
-    /// Token count at which background compaction starts (configurable percentage of promptTokenLimit)
-    pub compaction_threshold: i64,
-    /// Tokens consumed by user/assistant/tool messages
-    pub conversation_tokens: i64,
-    /// Prompt token limit plus the model's full output token limit.
-    pub limit: i64,
-    /// Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools)
-    pub mcp_tools_tokens: i64,
-    /// The model used for token counting
-    pub model_name: String,
-    /// Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified)
-    pub prompt_token_limit: i64,
-    /// Tokens consumed by the system prompt
-    pub system_tokens: i64,
-    /// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
-    pub tool_definitions_tokens: i64,
-    /// Sum of system, conversation and tool-definition tokens
-    pub total_tokens: i64,
+pub struct QueueInsertMessage {
+    /// Optional explicit agent mode. When omitted, the session's current mode is assigned.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_mode: Option<SendAgentMode>,
+    /// Optional attachments for the message.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub attachments: Option<Vec<serde_json::Value>>,
+    /// Whether the message is billable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub billable: Option<bool>,
+    /// Accepted for internal SendOptions compatibility but ignored; delivery is derived from current session activity.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub delivery: Option<String>,
+    /// Optional user-facing display text.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_prompt: Option<String>,
+    /// Accepted for SendOptions compatibility but ignored; inserted items always use queued delivery semantics.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mode: Option<SendMode>,
+    /// Accepted for SendOptions compatibility but ignored; the requested public position controls placement.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub prepend: Option<bool>,
+    /// The user message text.
+    pub prompt: String,
+    /// Per-turn request headers.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_headers: Option<HashMap<String, String>>,
+    /// Required tool name for the turn, when any.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub required_tool: Option<String>,
+    /// Optional provenance source. `system` is rejected: it would hide the inserted row from `pendingItems` and make it unaddressable while still executing, so inserted items must stay visible.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<String>,
+    /// Accepted for SendOptions compatibility but ignored; insertion scheduling is controlled by the queue drain state.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wait: Option<bool>,
 }
 
-/// The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.
+/// Parameters for inserting a queued message at a public visible position.
 ///
 /// <div class="warning">
 ///
@@ -13029,12 +13797,14 @@ pub struct SessionContextInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionEnrichMetadataResult {
-    /// Enriched records, with summary and context backfilled. Sessions confirmed empty and unnamed may be omitted.
-    pub sessions: Vec<LocalSessionMetadataValue>,
+pub struct QueueInsertAtRequest {
+    /// Queued message contents and delivery metadata.
+    pub message: QueueInsertMessage,
+    /// Zero-based position in the public visible queue. Values outside the queue clamp to an end.
+    pub position: i64,
 }
 
-/// File path, content to append, and optional mode for the client-provided session filesystem.
+/// Result of inserting a queued message.
 ///
 /// <div class="warning">
 ///
@@ -13044,19 +13814,12 @@ pub struct SessionEnrichMetadataResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsAppendFileRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Path using SessionFs conventions
-    pub path: String,
-    /// Content to append
-    pub content: String,
-    /// Optional POSIX-style mode for newly created files
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<i64>,
+pub struct QueueInsertAtResult {
+    /// Fresh stable opaque id assigned to the inserted item.
+    pub id: String,
 }
 
-/// Describes a filesystem error.
+/// Parameters for moving a queued item by stable id.
 ///
 /// <div class="warning">
 ///
@@ -13066,15 +13829,14 @@ pub struct SessionFsAppendFileRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsError {
-    /// Error classification
-    pub code: SessionFsErrorCode,
-    /// Free-form detail about the error, for logging/diagnostics
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub message: Option<String>,
+pub struct QueueMoveItemRequest {
+    /// Stable opaque queued-item id.
+    pub id: String,
+    /// Zero-based target position in the public visible queue. Values outside the queue clamp to an end.
+    pub to_position: i64,
 }
 
-/// Path to test for existence in the client-provided session filesystem.
+/// Result of moving a queued item.
 ///
 /// <div class="warning">
 ///
@@ -13084,14 +13846,12 @@ pub struct SessionFsError {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsExistsRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Path using SessionFs conventions
-    pub path: String,
+pub struct QueueMoveItemResult {
+    /// True when the item changed position; false when it was already at the requested position.
+    pub changed: bool,
 }
 
-/// Indicates whether the requested path exists in the client-provided session filesystem.
+/// User-facing pending queue entry, with kind and display text for a queued message, slash command, or model change.
 ///
 /// <div class="warning">
 ///
@@ -13101,12 +13861,18 @@ pub struct SessionFsExistsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsExistsResult {
-    /// Whether the path exists
-    pub exists: bool,
+pub struct QueuePendingItems {
+    /// Agent mode stored on this queued entry, as stamped when it was enqueued. Items without an explicit mode report interactive. This is not necessarily the mode that will constrain the turn: a plan or autopilot session applies its own write gate, continuation loop and permission posture to every drained item regardless of the mode stored here.
+    pub agent_mode: SendAgentMode,
+    /// Human-readable text to display for this queue entry in the UI
+    pub display_text: String,
+    /// Stable opaque id for the canonical queued item. Batch rows share one id.
+    pub id: String,
+    /// Whether this item is a queued user message or a queued slash command / model change
+    pub kind: QueuePendingItemsKind,
 }
 
-/// Directory path to create in the client-provided session filesystem, with options for recursive creation and POSIX mode.
+/// Snapshot of the session's pending queued items and immediate-steering messages.
 ///
 /// <div class="warning">
 ///
@@ -13116,20 +13882,17 @@ pub struct SessionFsExistsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsMkdirRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Path using SessionFs conventions
-    pub path: String,
-    /// Create parent directories as needed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub recursive: Option<bool>,
-    /// Optional POSIX-style mode for newly created directories
+pub struct QueuePendingItemsResult {
+    /// How many leading entries of `steeringMessages` have already been folded into the running turn (and so have an emitted `user.message`), as opposed to still waiting for one. Absent for hosts that do not distinguish the two.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<i64>,
+    pub in_flight_steering_count: Option<i64>,
+    /// Pending queued items in submission order. Includes user messages, queued slash commands, and queued model changes; omits internal system items.
+    pub items: Vec<QueuePendingItems>,
+    /// Display text for messages currently in the immediate steering queue (interjections sent during a running turn).
+    pub steering_messages: Vec<String>,
 }
 
-/// Directory path whose entries should be listed from the client-provided session filesystem.
+/// Parameters for removing a queued item by stable id.
 ///
 /// <div class="warning">
 ///
@@ -13139,14 +13902,12 @@ pub struct SessionFsMkdirRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsReaddirRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Path using SessionFs conventions
-    pub path: String,
+pub struct QueueRemoveAtRequest {
+    /// Stable opaque ID of the queued item to remove.
+    pub id: String,
 }
 
-/// Names of entries in the requested directory, or a filesystem error if the read failed.
+/// Result of removing a queued item.
 ///
 /// <div class="warning">
 ///
@@ -13156,15 +13917,12 @@ pub struct SessionFsReaddirRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsReaddirResult {
-    /// Entry names in the directory
-    pub entries: Vec<String>,
-    /// Describes a filesystem error.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<SessionFsError>,
+pub struct QueueRemoveAtResult {
+    /// True when the addressed item was removed.
+    pub removed: bool,
 }
 
-/// Directory entry returned by session filesystem `readdirWithTypes`, with name and entry type.
+/// Indicates whether a user-facing pending item was removed.
 ///
 /// <div class="warning">
 ///
@@ -13174,14 +13932,12 @@ pub struct SessionFsReaddirResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsReaddirWithTypesEntry {
-    /// Entry name
-    pub name: String,
-    /// Entry type
-    pub r#type: SessionFsReaddirWithTypesEntryType,
+pub struct QueueRemoveMostRecentResult {
+    /// True if a user-facing pending item was removed (LIFO across both queues); false when no removable items remained.
+    pub removed: bool,
 }
 
-/// Directory path whose entries (with type information) should be listed from the client-provided session filesystem.
+/// Parameters for steering a queued message into a live turn.
 ///
 /// <div class="warning">
 ///
@@ -13191,14 +13947,12 @@ pub struct SessionFsReaddirWithTypesEntry {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsReaddirWithTypesRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Path using SessionFs conventions
-    pub path: String,
+pub struct QueueSendNowRequest {
+    /// Stable opaque ID of the queued item to steer into the live turn.
+    pub id: String,
 }
 
-/// Entries in the requested directory paired with file/directory type information, or a filesystem error if the read failed.
+/// Result of trying to steer a queued message into a live turn.
 ///
 /// <div class="warning">
 ///
@@ -13208,15 +13962,12 @@ pub struct SessionFsReaddirWithTypesRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsReaddirWithTypesResult {
-    /// Directory entries with type information
-    pub entries: Vec<SessionFsReaddirWithTypesEntry>,
-    /// Describes a filesystem error.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<SessionFsError>,
+pub struct QueueSendNowResult {
+    /// True when the item was accepted into the steering lane; false when no main turn was live.
+    pub steered: bool,
 }
 
-/// Path of the file to read from the client-provided session filesystem.
+/// Parameters for acquiring or releasing the queued-lane drain pause. Acquisition is exclusive and non-idempotent: `paused: true` against an already-paused session fails with `queue_already_paused`. The pause is never released automatically — it is not tied to the caller's lifetime, so a client that exits without sending `paused: false` leaves the lane frozen. Release is unowned: `paused: false` clears the pause for any caller, including one that never acquired it.
 ///
 /// <div class="warning">
 ///
@@ -13226,14 +13977,12 @@ pub struct SessionFsReaddirWithTypesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsReadFileRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Path using SessionFs conventions
-    pub path: String,
+pub struct QueueSetDrainPausedRequest {
+    /// Whether queued-lane draining should be paused.
+    pub paused: bool,
 }
 
-/// File content as a UTF-8 string, or a filesystem error if the read failed.
+/// Internal snapshot of native queue state for local session orchestration.
 ///
 /// <div class="warning">
 ///
@@ -13243,15 +13992,20 @@ pub struct SessionFsReadFileRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsReadFileResult {
-    /// File content as UTF-8 string
-    pub content: String,
-    /// Describes a filesystem error.
+pub struct QueueSnapshotResult {
+    /// Insertion orders for queued items, aligned with `items`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<SessionFsError>,
+    pub item_orders: Option<Vec<i64>>,
+    /// User-facing pending items in FIFO order.
+    pub items: Vec<QueuePendingItems>,
+    /// Insertion orders for immediate steering messages, aligned with `steeringMessages`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub steering_message_orders: Option<Vec<i64>>,
+    /// Immediate steering messages waiting for an active turn.
+    pub steering_messages: Vec<String>,
 }
 
-/// Source and destination paths for renaming or moving an entry in the client-provided session filesystem.
+/// Parameters for editing a single queued message.
 ///
 /// <div class="warning">
 ///
@@ -13261,16 +14015,17 @@ pub struct SessionFsReadFileResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsRenameRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Source path using SessionFs conventions
-    pub src: String,
-    /// Destination path using SessionFs conventions
-    pub dest: String,
+pub struct QueueUpdateTextRequest {
+    /// Optional replacement prompt displayed to the user.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_prompt: Option<String>,
+    /// Stable opaque ID of the queued item to edit.
+    pub id: String,
+    /// Replacement prompt sent to the model.
+    pub prompt: String,
 }
 
-/// Path to remove from the client-provided session filesystem, with options for recursive removal and force.
+/// Result of editing a queued message.
 ///
 /// <div class="warning">
 ///
@@ -13280,20 +14035,12 @@ pub struct SessionFsRenameRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsRmRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Path using SessionFs conventions
-    pub path: String,
-    /// Remove directories and their contents recursively
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub recursive: Option<bool>,
-    /// Ignore errors if the path does not exist
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub force: Option<bool>,
+pub struct QueueUpdateTextResult {
+    /// True when the stored text changed.
+    pub updated: bool,
 }
 
-/// Optional capabilities declared by the provider
+/// Event type to register consumer interest for, used by runtime gating logic.
 ///
 /// <div class="warning">
 ///
@@ -13303,13 +14050,12 @@ pub struct SessionFsRmRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSetProviderCapabilities {
-    /// Whether the provider supports SQLite query/exists operations
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sqlite: Option<bool>,
+pub struct RegisterEventInterestParams {
+    /// The event type the consumer wants the runtime to treat as 'observed' for behavior-switching gating. Some runtime code paths inspect whether any consumer is interested in a specific event type and choose a different implementation accordingly (e.g. `mcp.oauth_required`: when interest is registered the runtime delegates interactive OAuth token acquisition to the consumer via `mcp.oauth_required` events; when no interest is registered the runtime still attempts non-interactive reconnect from cached or refreshable tokens, and only marks the server `needs-auth` if usable credentials are unavailable — it does not open a browser or start interactive OAuth without a consumer). SDK clients that long-poll events do NOT automatically appear as listeners to these gating checks — they must explicitly call `registerInterest` for each event type they want the runtime to count as having a consumer. Multiple registrations for the same event type from the same or different consumers are tracked independently and must each be released. See: `mcp.oauth_required`, `sampling.requested`, `auto_mode_switch.requested`, `session_limits_exhausted.requested`, `user_input.requested`, `elicitation.requested`, `command.queued`, `exit_plan_mode.requested`.
+    pub event_type: String,
 }
 
-/// Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider.
+/// Opaque handle representing an event-type interest registration.
 ///
 /// <div class="warning">
 ///
@@ -13319,19 +14065,29 @@ pub struct SessionFsSetProviderCapabilities {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSetProviderRequest {
-    /// Optional capabilities declared by the provider
+pub struct RegisterEventInterestResult {
+    /// Opaque handle for this registration. Pass to releaseInterest to release. Each call to registerInterest produces a fresh handle, even when the same eventType is registered multiple times.
+    pub handle: String,
+}
+
+/// Optional registration options.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsRegisterExtensionToolsOnSessionOptions {
+    /// In-process `() => boolean` gating callback (CLI-only optimization). Marked internal: replaced by runtime-side enable/disable RPCs in the SDK migration.
+    #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub capabilities: Option<SessionFsSetProviderCapabilities>,
-    /// Path conventions used by this filesystem
-    pub conventions: SessionFsSetProviderConventions,
-    /// Initial working directory for sessions
-    pub initial_cwd: String,
-    /// Path within each session's SessionFs where the runtime stores files for that session
-    pub session_state_path: String,
+    pub(crate) enabled: Option<serde_json::Value>,
 }
 
-/// Indicates whether the calling client was registered as the session filesystem provider.
+/// Params to attach an extension loader's tools to a session.
 ///
 /// <div class="warning">
 ///
@@ -13341,12 +14097,18 @@ pub struct SessionFsSetProviderRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSetProviderResult {
-    /// Whether the provider was set successfully
-    pub success: bool,
+pub(crate) struct RegisterExtensionToolsParams {
+    /// In-process ExtensionLoader handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, extension discovery/launch moves entirely into the runtime — the CLI passes pure config (search paths, disabled ids) via SessionOptions instead.
+    #[doc(hidden)]
+    pub(crate) loader: serde_json::Value,
+    /// Optional registration options.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub options: Option<SessionsRegisterExtensionToolsOnSessionOptions>,
+    /// Session to register extension tools on.
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the per-session SQLite database already exists.
+/// Handle for releasing the extension tool registration.
 ///
 /// <div class="warning">
 ///
@@ -13356,12 +14118,13 @@ pub struct SessionFsSetProviderResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSqliteExistsResult {
-    /// Whether the session database already exists
-    pub exists: bool,
+pub(crate) struct RegisterExtensionToolsResult {
+    /// In-process unsubscribe function (CLI-only optimization). Marked internal: replaced by an explicit `extensions.unregister` RPC in the SDK migration.
+    #[doc(hidden)]
+    pub(crate) unsubscribe: serde_json::Value,
 }
 
-/// SQL query, query type, and optional bind parameters for executing a SQLite query against the per-session database. The provider applies its SQLite busy timeout for every call.
+/// Opaque handle previously returned by `registerInterest` to release.
 ///
 /// <div class="warning">
 ///
@@ -13371,19 +14134,12 @@ pub struct SessionFsSqliteExistsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSqliteQueryRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// SQL query to execute
-    pub query: String,
-    /// How to execute the query: 'exec' for DDL/multi-statement (no results), 'query' for SELECT (returns rows), 'run' for INSERT/UPDATE/DELETE (returns rowsAffected)
-    pub query_type: SessionFsSqliteQueryType,
-    /// Optional named bind parameters
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub params: Option<HashMap<String, serde_json::Value>>,
+pub struct ReleaseEventInterestParams {
+    /// Handle returned by a previous `registerInterest` call. Idempotent: releasing an unknown or already-released handle is a no-op (returns success). When the last outstanding handle for an event type is released, the runtime reverts to its 'no consumer' code path for that event type.
+    pub handle: String,
 }
 
-/// Query results including rows, columns, and rows affected, or a filesystem error if execution failed.
+/// Reattach to an existing MC session without creating a new one.
 ///
 /// <div class="warning">
 ///
@@ -13393,22 +14149,14 @@ pub struct SessionFsSqliteQueryRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSqliteQueryResult {
-    /// Column names from the result set
-    pub columns: Vec<String>,
-    /// Describes a filesystem error.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<SessionFsError>,
-    /// SQLite last_insert_rowid() value for INSERT.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub last_insert_rowid: Option<i64>,
-    /// For SELECT: array of row objects. For others: empty array.
-    pub rows: Vec<HashMap<String, serde_json::Value>>,
-    /// Number of rows affected (for INSERT/UPDATE/DELETE)
-    pub rows_affected: i64,
+pub struct RemoteControlConfigExistingMcSession {
+    /// Existing MC session ID to reattach to.
+    pub mc_session_id: String,
+    /// Existing MC task ID for the reattached session.
+    pub mc_task_id: String,
 }
 
-/// Classified SQLite transaction failure. busyOrLocked guarantees rollback; postCommitAmbiguous must never be retried.
+/// Configuration for the runtime-managed remote-control singleton.
 ///
 /// <div class="warning">
 ///
@@ -13418,12 +14166,24 @@ pub struct SessionFsSqliteQueryResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSqliteTransactionError {
-    pub error_class: SessionFsSqliteTransactionErrorClass,
-    pub message: String,
+pub struct RemoteControlConfig {
+    /// Reattach to an existing MC session without creating a new one.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub existing_mc_session: Option<RemoteControlConfigExistingMcSession>,
+    /// Whether the user explicitly requested remote (vs. implicit session-sync). Controls warning surfacing for missing-repo cases.
+    pub explicit: bool,
+    /// Whether remote export should be enabled.
+    pub remote: bool,
+    /// When true, suppresses timeline messages on successful setup.
+    pub silent: bool,
+    /// Whether the MC session may steer the local session (write mode).
+    pub steerable: bool,
+    /// Existing Mission Control task ID to attach the exported session to.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task_id: Option<String>,
 }
 
-/// One statement in an atomic SQLite transaction.
+/// Remote control is connected to a local session.
 ///
 /// <div class="warning">
 ///
@@ -13433,17 +14193,27 @@ pub struct SessionFsSqliteTransactionError {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSqliteTransactionStatement {
-    /// Optional named bind parameters.
+pub struct RemoteControlStatusActive {
+    /// Session id remote control is pointed at.
+    pub attached_session_id: String,
+    /// True while a read-only/session-sync export is deferred, awaiting the first `user.message` before its MC session exists. Marked internal: this field is excluded from the public SDK surface and is populated only on the CLI in-process path.
+    #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub params: Option<HashMap<String, serde_json::Value>>,
-    /// SQL statement to execute.
-    pub query: String,
-    /// How to execute the statement.
-    pub query_type: SessionFsSqliteQueryType,
+    pub(crate) awaiting_first_message: Option<bool>,
+    /// MC frontend URL for this session, when known.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub frontend_url: Option<String>,
+    /// Whether the MC session may steer this session.
+    pub is_steerable: bool,
+    /// In-process prompt-manager handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. Retained as an optional compatibility field; native remote control does not populate or consume it.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) prompt_manager: Option<serde_json::Value>,
+    /// Remote control state tag: active.
+    pub state: RemoteControlStatusActiveState,
 }
 
-/// Statements to execute atomically. Providers apply busy handling for every call.
+/// Remote control is in the middle of initial setup.
 ///
 /// <div class="warning">
 ///
@@ -13453,13 +14223,14 @@ pub struct SessionFsSqliteTransactionStatement {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSqliteTransactionRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    pub statements: Vec<SessionFsSqliteTransactionStatement>,
+pub struct RemoteControlStatusConnecting {
+    /// Session id the connection is attaching to.
+    pub attached_session_id: String,
+    /// Remote control state tag: connecting.
+    pub state: RemoteControlStatusConnectingState,
 }
 
-/// Per-statement results, or a classified transaction error.
+/// The last setup attempt failed. The singleton is otherwise off.
 ///
 /// <div class="warning">
 ///
@@ -13469,13 +14240,17 @@ pub struct SessionFsSqliteTransactionRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsSqliteTransactionResult {
+pub struct RemoteControlStatusError {
+    /// Session id the failing setup attempt targeted, when known.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<SessionFsSqliteTransactionError>,
-    pub results: Vec<SessionFsSqliteQueryResult>,
+    pub attached_session_id: Option<String>,
+    /// Human-readable error message from the last setup attempt.
+    pub error: String,
+    /// Remote control state tag: setup failed.
+    pub state: RemoteControlStatusErrorState,
 }
 
-/// Path whose metadata should be returned from the client-provided session filesystem.
+/// Remote control is not connected.
 ///
 /// <div class="warning">
 ///
@@ -13485,14 +14260,12 @@ pub struct SessionFsSqliteTransactionResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsStatRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Path using SessionFs conventions
-    pub path: String,
+pub struct RemoteControlStatusOff {
+    /// Remote control state tag: not connected.
+    pub state: RemoteControlStatusOffState,
 }
 
-/// Filesystem metadata for the requested path, or a filesystem error if the stat failed.
+/// Wrapper for the singleton's current status.
 ///
 /// <div class="warning">
 ///
@@ -13502,23 +14275,12 @@ pub struct SessionFsStatRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsStatResult {
-    /// ISO 8601 timestamp of creation
-    pub birthtime: String,
-    /// Describes a filesystem error.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<SessionFsError>,
-    /// Whether the path is a directory
-    pub is_directory: bool,
-    /// Whether the path is a file
-    pub is_file: bool,
-    /// ISO 8601 timestamp of last modification
-    pub mtime: String,
-    /// File size in bytes
-    pub size: i64,
+pub struct RemoteControlStatusResult {
+    /// State of the runtime-managed remote-control singleton.
+    pub status: serde_json::Value,
 }
 
-/// File path, content to write, and optional mode for the client-provided session filesystem.
+/// Outcome of a stopRemoteControl call.
 ///
 /// <div class="warning">
 ///
@@ -13528,19 +14290,14 @@ pub struct SessionFsStatResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFsWriteFileRequest {
-    /// Target session identifier
-    pub session_id: SessionId,
-    /// Path using SessionFs conventions
-    pub path: String,
-    /// Content to write
-    pub content: String,
-    /// Optional POSIX-style mode for newly created files
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<i64>,
+pub struct RemoteControlStopResult {
+    /// State of the runtime-managed remote-control singleton.
+    pub status: serde_json::Value,
+    /// Whether the singleton was actually torn down by this call.
+    pub stopped: bool,
 }
 
-/// Installed plugin record for a session, with marketplace, version, install time, enabled state, cache path, and source.
+/// Outcome of a transferRemoteControl call.
 ///
 /// <div class="warning">
 ///
@@ -13550,31 +14307,14 @@ pub struct SessionFsWriteFileRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionInstalledPlugin {
-    /// Path where the plugin is cached locally
-    #[serde(rename = "cache_path", skip_serializing_if = "Option::is_none")]
-    pub cache_path: Option<String>,
-    /// Whether the plugin is currently enabled
-    pub enabled: bool,
-    /// Installation timestamp (ISO-8601)
-    #[serde(rename = "installed_at")]
-    pub installed_at: String,
-    /// Marketplace the plugin came from (empty string for direct repo installs)
-    pub marketplace: String,
-    /// Plugin name
-    pub name: String,
-    /// Source descriptor for direct repo installs (when marketplace is empty)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source: Option<serde_json::Value>,
-    /// Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.
-    #[serde(rename = "source_sha", skip_serializing_if = "Option::is_none")]
-    pub source_sha: Option<String>,
-    /// Installed version, if known
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub version: Option<String>,
+pub struct RemoteControlTransferResult {
+    /// State of the runtime-managed remote-control singleton.
+    pub status: serde_json::Value,
+    /// Whether the rebinding actually happened.
+    pub transferred: bool,
 }
 
-/// Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or full commit SHA, and optional subpath.
+/// Optional remote session mode ("off", "export", or "on"); defaults to enabling both export and remote steering.
 ///
 /// <div class="warning">
 ///
@@ -13584,20 +14324,13 @@ pub struct SessionInstalledPlugin {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionInstalledPluginSourceGitHub {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#ref: Option<String>,
-    pub repo: String,
-    /// Optional full 40-character hexadecimal commit SHA.
+pub struct RemoteEnableRequest {
+    /// Per-session remote mode. "off" disables remote, "export" exports session events to GitHub without enabling remote steering, "on" enables both export and remote steering.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub sha: Option<String>,
-    /// Constant value. Always "github".
-    pub source: SessionInstalledPluginSourceGitHubSource,
+    pub mode: Option<RemoteSessionMode>,
 }
 
-/// Source descriptor for a direct local plugin install, with a local filesystem path.
+/// GitHub URL for the session and a flag indicating whether remote steering is enabled.
 ///
 /// <div class="warning">
 ///
@@ -13607,13 +14340,15 @@ pub struct SessionInstalledPluginSourceGitHub {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionInstalledPluginSourceLocal {
-    pub path: String,
-    /// Constant value. Always "local".
-    pub source: SessionInstalledPluginSourceLocalSource,
+pub struct RemoteEnableResult {
+    /// Whether remote steering is enabled
+    pub remote_steerable: bool,
+    /// GitHub frontend URL for this session
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub url: Option<String>,
 }
 
-/// Source descriptor for a direct URL plugin install, with URL, optional ref or full commit SHA, and optional subpath.
+/// New remote-steerability state to persist as a `session.remote_steerable_changed` event.
 ///
 /// <div class="warning">
 ///
@@ -13623,20 +14358,12 @@ pub struct SessionInstalledPluginSourceLocal {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionInstalledPluginSourceUrl {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#ref: Option<String>,
-    /// Optional full 40-character hexadecimal commit SHA.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sha: Option<String>,
-    /// Constant value. Always "url".
-    pub source: SessionInstalledPluginSourceUrlSource,
-    pub url: String,
+pub struct RemoteNotifySteerableChangedRequest {
+    /// Whether the session now supports remote steering via GitHub. The runtime persists this as a `session.remote_steerable_changed` event so resume/replay sees the up-to-date capability.
+    pub remote_steerable: bool,
 }
 
-/// Baseline data provenance for a prediction.
+/// Persist a steerability change as a `session.remote_steerable_changed` event. Used by the host (CLI / SDK consumer) when it has just finished enabling or disabling steering on a remote exporter that the runtime does not directly own.
 ///
 /// <div class="warning">
 ///
@@ -13646,14 +14373,9 @@ pub struct SessionInstalledPluginSourceUrl {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionLimitPredictionBaselineData {
-    /// End of the baseline data slice.
-    pub window_end: String,
-    /// Start of the baseline data slice.
-    pub window_start: String,
-}
+pub struct RemoteNotifySteerableChangedResult {}
 
-/// Semantic usage tier and its AI-credit cap.
+/// Remote session connection result.
 ///
 /// <div class="warning">
 ///
@@ -13663,13 +14385,14 @@ pub struct SessionLimitPredictionBaselineData {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionLimitPredictionTierOption {
-    /// AI-credit cap for this tier.
-    pub cap: f64,
-    pub tier: SessionLimitPredictionTier,
+pub struct RemoteSessionConnectionResult {
+    /// Metadata for a connected remote session.
+    pub metadata: ConnectedRemoteSessionMetadata,
+    /// SDK session ID for the connected remote session.
+    pub session_id: SessionId,
 }
 
-/// Explainable AI-credit session-limit prediction.
+/// GitHub repository the remote session belongs to.
 ///
 /// <div class="warning">
 ///
@@ -13679,29 +14402,16 @@ pub struct SessionLimitPredictionTierOption {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionLimitPredictionDetails {
-    /// Baseline data provenance.
-    pub baseline_data: SessionLimitPredictionBaselineData,
-    /// Client population used for the prediction.
-    pub client_type: SessionLimitPredictionClientType,
-    /// Resolved model family when known.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub family: Option<String>,
-    /// Model identifier used for lookup.
-    pub model_id: String,
-    /// Recommended maximum AI credits for this session.
-    pub recommended_cap: f64,
-    /// Tier chosen as the recommended cap.
-    pub recommended_tier: SessionLimitPredictionTier,
-    /// Baseline fallback level used to create the prediction.
-    pub source: SessionLimitPredictionSource,
-    /// Key matched at the source level, such as a model id, family id, or `global`.
-    pub source_key: String,
-    /// Ordered usage tiers and their AI-credit caps.
-    pub tiers: Vec<SessionLimitPredictionTierOption>,
+pub struct RemoteSessionMetadataRepository {
+    /// Branch associated with the remote session.
+    pub branch: String,
+    /// Repository name.
+    pub name: String,
+    /// Repository owner.
+    pub owner: String,
 }
 
-/// Parameters for predicting an AI-credit session limit. Omitting `modelId` uses the session's currently selected model.
+/// Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).
 ///
 /// <div class="warning">
 ///
@@ -13711,32 +14421,72 @@ pub struct SessionLimitPredictionDetails {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionLimitPredictionRequest {
-    /// Client type to size for. Defaults to `cli-interactive`.
+pub struct RemoteSessionMetadataValue {
+    /// Most recent working directory context.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_type: Option<SessionLimitPredictionClientType>,
-    /// Optional model identifier override. If omitted, the session's current model is used.
+    pub context: Option<SessionContext>,
+    /// Host-supplied human description of what the session is doing right now ("running tests", "waiting for approval"). Optional in the protocol and absent on hosts that do not publish it, so never rely on it -- it enriches `hostStatus`, it does not replace it.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_id: Option<String>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionLimitPredictionResultAvailable {
-    pub kind: SessionLimitPredictionResultAvailableKind,
-    /// Predicted session limit details.
-    pub prediction: SessionLimitPredictionDetails,
+    pub host_activity: Option<String>,
+    /// Live status as the owning host reports it in its session listing, so a row for a session running elsewhere can show that it is running. Absent for hosts that publish no such status (the cloud task managers), which read as idle.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub host_status: Option<RemoteSessionHostStatus>,
+    /// Always true for remote sessions.
+    pub is_remote: bool,
+    /// Last-modified time as an ISO 8601 timestamp.
+    pub modified_time: String,
+    /// Optional human-friendly name set via /rename.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Pull request number associated with the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub pull_request_number: Option<i64>,
+    /// Backing remote session IDs (most recent first).
+    pub remote_session_ids: Vec<String>,
+    /// GitHub repository the remote session belongs to.
+    pub repository: RemoteSessionMetadataRepository,
+    /// Original remote resource identifier (task ID or PR node ID).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub resource_id: Option<String>,
+    /// Stable session identifier.
+    pub session_id: SessionId,
+    /// Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stale_at: Option<String>,
+    /// Session creation time as an ISO 8601 timestamp.
+    pub start_time: String,
+    /// Server-side task state returned by GitHub.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub state: Option<String>,
+    /// Short summary of the session, when one has been derived.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary: Option<String>,
+    /// Whether the remote task originated from CCA or CLI `--remote`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task_type: Option<RemoteSessionMetadataTaskType>,
 }
 
+/// Repository context for the remote session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionLimitPredictionResultUnavailable {
-    pub kind: SessionLimitPredictionResultUnavailableKind,
-    /// Reason no prediction is available.
-    pub reason: SessionLimitPredictionUnavailableReason,
+pub struct RemoteSessionRepository {
+    /// Optional branch associated with the remote session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// Repository name.
+    pub name: String,
+    /// Repository owner or organization login.
+    pub owner: String,
 }
 
-/// Sessions matching the filter, ordered most-recently-modified first.
+/// Credential-injection capability flags applied while the sandbox is enabled. For the same capability independent of sandboxing, and matched to the credential's GitHub host, see `shell.credentials`; the two are additive.
 ///
 /// <div class="warning">
 ///
@@ -13746,12 +14496,16 @@ pub struct SessionLimitPredictionResultUnavailable {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionList {
-    /// Sessions ordered most-recently-modified first. Discriminated by `isRemote`.
-    pub sessions: Vec<serde_json::Value>,
+pub struct SandboxConfigAuth {
+    /// Whether to export `GH_TOKEN` so the `gh` CLI authenticates inside the sandbox without the OS keyring the sandbox blocks. Default: false (opt-in).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gh: Option<bool>,
+    /// Whether to inject git credentials as an `http.<url>.extraheader` so authenticated HTTPS git works inside the sandbox without the shell-based credential helper the sandbox blocks. github.com is served by the Copilot token; every other forge (Azure DevOps, GitHub Enterprise Server, GitLab, ...) by a credential the host resolves from the user's own helper before the sandbox is applied. Default: false (opt-in).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub git: Option<bool>,
 }
 
-/// Optional filter applied to the returned sessions
+/// macOS seatbelt experimental options.
 ///
 /// <div class="warning">
 ///
@@ -13761,22 +14515,13 @@ pub struct SessionList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionListFilter {
-    /// Match sessions whose context.branch equals this value
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    /// Match sessions whose context.cwd equals this value
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    /// Match sessions whose context.gitRoot equals this value
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Match sessions whose context.repository equals this value
+pub struct SandboxConfigUserPolicyExperimentalSeatbelt {
+    /// Whether the macOS seatbelt profile may access the keychain.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
+    pub keychain_access: Option<bool>,
 }
 
-/// Queued repo-level startup prompts and the total hook command count after loading.
+/// Platform-specific experimental policy fields.
 ///
 /// <div class="warning">
 ///
@@ -13786,49 +14531,38 @@ pub struct SessionListFilter {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionLoadDeferredRepoHooksResult {
-    /// Total hook command count (user + plugin + repo) loaded for the session by this call. Captured atomically with startupPrompts so callers don't need to read a separate counter.
-    pub hook_count: i64,
-    /// Repo-level startup prompts queued from repo hook configs. Empty on resume, when no repo configs were pending, or when disableAllHooks is set.
-    pub startup_prompts: Vec<String>,
+pub struct SandboxConfigUserPolicyExperimental {
+    /// macOS seatbelt experimental options.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub seatbelt: Option<SandboxConfigUserPolicyExperimentalSeatbelt>,
 }
 
-/// Public-facing projection of workspace metadata for SDK / TUI consumers
+/// Filesystem rules to merge into the base policy.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataSnapshotWorkspace {
-    /// Branch checked out at session start, if any
+pub struct SandboxConfigUserPolicyFilesystem {
+    /// Whether to clear the policy when the session exits.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    /// ISO 8601 timestamp when the workspace was created
-    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
-    pub created_at: Option<String>,
-    /// Current working directory at session start
+    pub clear_policy_on_exit: Option<bool>,
+    /// Paths explicitly denied.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    /// Resolved git root for cwd, if any
-    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Repository host type, if known
-    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<WorkspaceSummaryHostType>,
-    /// Workspace identifier (1:1 with sessionId)
-    pub id: String,
-    /// Display name for the session, if set
+    pub denied_paths: Option<Vec<String>>,
+    /// Paths granted read-only access.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Repository identifier in 'owner/repo' or 'org/project/repo' format, if any
+    pub readonly_paths: Option<Vec<String>>,
+    /// Paths granted read/write access.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
-    /// ISO 8601 timestamp when the workspace was last updated
-    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
-    pub updated_at: Option<String>,
-    /// Whether the display name was explicitly set by the user
-    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
-    pub user_named: Option<bool>,
+    pub readwrite_paths: Option<Vec<String>>,
 }
 
-/// Point-in-time snapshot of slow-changing session identifier and state fields
+/// HTTP proxy configuration for sandboxed traffic.
 ///
 /// <div class="warning">
 ///
@@ -13838,45 +14572,40 @@ pub struct SessionMetadataSnapshotWorkspace {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataSnapshot {
-    /// True when the session was detected to be in use by another process at construction time. Local consumers may surface a confirmation prompt before fully attaching. Always false for new sessions.
-    pub already_in_use: bool,
-    /// Runtime client name associated with the session (telemetry identifier).
+pub struct SandboxConfigUserPolicyNetworkProxy {
+    /// Optional password for proxy authentication, combined with the URL at spawn time. The persisted value may be a literal password, a `${secret:…}` reference resolved from the OS keychain, or a `${VAR}`/`$VAR` environment reference; it is resolved just before the sandboxed process routes through the proxy. The /sandbox dialog stores a real password in the OS keychain and persists only a `${secret:…}` placeholder (never plaintext in settings.json); the field is masked in the dialog and redacted by /settings show.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    /// The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot')
-    pub current_mode: MetadataSnapshotCurrentMode,
-    /// User-provided name supplied at session construction (via `--name`), if any. Immutable after construction.
+    pub password: Option<String>,
+    /// Proxy URL (e.g. http://proxy.example.com:8080). The port is optional and defaults to the scheme's standard port when omitted. Credentials must not be embedded here — a `user:pass@` authority is rejected; put them in the separate `username`/`password` fields. A credential-free http:// loopback URL is routed through the localhost proxy automatically; loopback covers localhost and any *.localhost subdomain, the whole 127.0.0.0/8 range, ::1, and IPv4-mapped loopback (::ffff:127.0.0.1). An https:// URL, or one with a username/password set, is used as-is.
+    pub url: String,
+    /// Optional username for proxy authentication. Combined with the URL (and `password`) into `user:pass@host` when the sandboxed process routes through the proxy.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub initial_name: Option<String>,
-    /// Whether this is a remote session (i.e., one whose runtime executes elsewhere and is steered through this process)
-    pub is_remote: bool,
-    /// ISO 8601 timestamp of when the session's persisted state was last modified on disk. For new sessions, equals startTime. For resumed sessions, reflects the previous modification time at construction.
-    pub modified_time: String,
-    /// Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.
+    pub username: Option<String>,
+}
+
+/// Network rules to merge into the base policy.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SandboxConfigUserPolicyNetwork {
+    /// Whether traffic to local/loopback addresses is allowed.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote_metadata: Option<MetadataSnapshotRemoteMetadata>,
-    /// Currently selected model identifier, if any
+    pub allow_local_network: Option<bool>,
+    /// Whether outbound network traffic is allowed at all.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub selected_model: Option<String>,
-    /// The unique identifier of the session
-    pub session_id: SessionId,
-    /// Current session limits, or null when no limits are active
-    pub session_limits: Option<SessionLimitsConfig>,
-    /// ISO 8601 timestamp of when the session started
-    pub start_time: String,
-    /// Short human-readable summary of the session, if known. Omitted when no summary has been generated.
+    pub allow_outbound: Option<bool>,
+    /// HTTP proxy the sandboxed process routes traffic through. Enforced on Windows and cooperative (honored by well-behaved tools, not strictly enforced) on Linux and macOS. Credentials go in the separate `username`/`password` fields. A credential-free http:// loopback proxy URL is routed through the localhost proxy automatically; an https:// or authenticated loopback URL is used as-is.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary: Option<String>,
-    /// Absolute path to the session's current working directory
-    pub working_directory: String,
-    /// Public-facing workspace metadata for this session, or null if the session has no associated workspace. Excludes runtime-internal fields (GitHub IDs, summary count, internal flags).
-    pub workspace: Option<SessionMetadataSnapshotWorkspace>,
-    /// Absolute path to the session's workspace directory on disk, or null if the session has no associated workspace
-    pub workspace_path: Option<String>,
+    pub proxy: Option<SandboxConfigUserPolicyNetworkProxy>,
 }
 
-/// Cost-category metadata for a CAPI model.
+/// macOS seatbelt-specific options.
 ///
 /// <div class="warning">
 ///
@@ -13886,12 +14615,13 @@ pub struct SessionMetadataSnapshot {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionModelPriceCategory {
-    pub id: String,
-    pub price_category: ModelPickerPriceCategory,
+pub struct SandboxConfigUserPolicySeatbelt {
+    /// Whether the macOS seatbelt profile may access the keychain.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub keychain_access: Option<bool>,
 }
 
-/// The list of models available to this session.
+/// User-managed sandbox policy fragment merged into the auto-discovered base policy.
 ///
 /// <div class="warning">
 ///
@@ -13901,18 +14631,22 @@ pub struct SessionModelPriceCategory {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionModelList {
-    /// Available models, ordered with the most preferred default first. Includes both Copilot (CAPI) models and any registry BYOK models; a BYOK model appears under its provider-qualified selection id (`provider/id`).
-    pub list: Vec<serde_json::Value>,
-    /// Cost categories for the full CAPI catalog, including picker-disabled models that Auto may select. Metadata only; entries absent from `list` are not manually selectable.
+pub struct SandboxConfigUserPolicy {
+    /// Deprecated legacy location for `seatbelt`; read only when the top-level `seatbelt` is absent.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_price_categories: Option<Vec<SessionModelPriceCategory>>,
-    /// Per-quota snapshots returned alongside the model list, keyed by quota type.
+    pub experimental: Option<SandboxConfigUserPolicyExperimental>,
+    /// Filesystem rules to merge into the base policy.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub quota_snapshots: Option<HashMap<String, serde_json::Value>>,
+    pub filesystem: Option<SandboxConfigUserPolicyFilesystem>,
+    /// Network rules to merge into the base policy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub network: Option<SandboxConfigUserPolicyNetwork>,
+    /// macOS seatbelt options to merge into the base policy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub seatbelt: Option<SandboxConfigUserPolicySeatbelt>,
 }
 
-/// Source descriptor for a `sessions.open` content-exclusion rule, with source name and type.
+/// Resolved sandbox configuration.
 ///
 /// <div class="warning">
 ///
@@ -13922,12 +14656,24 @@ pub struct SessionModelList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource {
-    pub name: String,
-    pub r#type: String,
+pub struct SandboxConfig {
+    /// Whether to auto-add the current working directory to readwritePaths. Default: true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub add_current_working_directory: Option<bool>,
+    /// Whether to auto-grant read access to the tool directories discovered on PATH and in toolchain environment variables (GOROOT, CARGO_HOME, JAVA_HOME, VIRTUAL_ENV, and similar), and to common developer-tool caches, registries, and toolchains in their default home locations (cargo, go, npm, Maven, and more), plus read-write access to (and up-front creation of) the scratch caches builds write on every run (go-build, ccache, sccache, Gradle caches, Cargo lock/tracker files), so builds work without extra configuration; a relocated CARGO_HOME additionally gets its Cargo lock files granted read-write. Set to false to disable every grant listed above: user-installed toolchains (rustup, nvm, pyenv, conda, pipx) then need explicit userPolicy.filesystem entries — readonlyPaths to read them, plus readwriteFiles for a relocated CARGO_HOME's .package-cache and .global-cache, which Cargo locks on every build. Only these developer-tool grants are affected: the working directory (see addCurrentWorkingDirectory), temporary storage, session log paths, and system locations follow their own rules and stay granted, so commands still run. Default: true (enabled by default; set to false to opt out).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub allow_dev_tool_access: Option<bool>,
+    /// Credential-injection capability flags.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth: Option<SandboxConfigAuth>,
+    /// Whether sandboxing is enabled for the session.
+    pub enabled: bool,
+    /// User-managed sandbox policy fragment merged into the auto-discovered base policy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub user_policy: Option<SandboxConfigUserPolicy>,
 }
 
-/// Single content-exclusion rule supplied to `sessions.open` options, with paths, match conditions, and source.
+/// Register an absolute-time scheduled prompt.
 ///
 /// <div class="warning">
 ///
@@ -13937,17 +14683,20 @@ pub struct SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionOpenOptionsAdditionalContentExclusionPolicyRule {
+pub struct ScheduleAddAtRequest {
+    /// Epoch milliseconds when the prompt should fire.
+    pub at: i64,
+    /// Optional display-only prompt label.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub if_any_match: Option<Vec<String>>,
+    pub display_prompt: Option<String>,
+    /// Prompt text to enqueue when the schedule fires.
+    pub prompt: String,
+    /// Whether the schedule should re-arm after each tick. Defaults to false.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub if_none_match: Option<Vec<String>>,
-    pub paths: Vec<String>,
-    /// Source descriptor for a `sessions.open` content-exclusion rule, with source name and type.
-    pub source: SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource,
+    pub recurring: Option<bool>,
 }
 
-/// Content-exclusion policy supplied to `sessions.open` options, with rules, last-updated data, and scope.
+/// Register a cron scheduled prompt.
 ///
 /// <div class="warning">
 ///
@@ -13957,15 +14706,23 @@ pub struct SessionOpenOptionsAdditionalContentExclusionPolicyRule {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionOpenOptionsAdditionalContentExclusionPolicy {
-    #[serde(rename = "last_updated_at")]
-    pub last_updated_at: serde_json::Value,
-    pub rules: Vec<SessionOpenOptionsAdditionalContentExclusionPolicyRule>,
-    /// Allowed values for the `SessionOpenOptionsAdditionalContentExclusionPolicyScope` enumeration.
-    pub scope: SessionOpenOptionsAdditionalContentExclusionPolicyScope,
+pub struct ScheduleAddCronRequest {
+    /// 5-field cron expression.
+    pub cron: String,
+    /// Optional display-only prompt label.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_prompt: Option<String>,
+    /// Prompt text to enqueue when the schedule fires.
+    pub prompt: String,
+    /// Whether the schedule should re-arm after each tick. Defaults to true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub recurring: Option<bool>,
+    /// IANA timezone for evaluating the cron expression.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tz: Option<String>,
 }
 
-/// A host-provided script sourced before each built-in shell command when its shell target matches the active shell.
+/// Register a relative-interval scheduled prompt.
 ///
 /// <div class="warning">
 ///
@@ -13975,14 +14732,20 @@ pub struct SessionOpenOptionsAdditionalContentExclusionPolicy {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShellInitScript {
-    /// Path to the script to source.
-    pub path: String,
-    /// Built-in shell that may source this script.
-    pub shell: ShellInitScriptShell,
+pub struct ScheduleAddRequest {
+    /// Optional display-only prompt label.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_prompt: Option<String>,
+    /// Human-readable interval such as `30s`, `5m`, or `2h`.
+    pub interval: String,
+    /// Prompt text to enqueue when the schedule fires.
+    pub prompt: String,
+    /// Whether the schedule should re-arm after each tick. Defaults to true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub recurring: Option<bool>,
 }
 
-/// Per-session settings for built-in shell tools.
+/// Scheduled prompt entry with ID, timing (`intervalMs`, `cron`, or `at`), prompt text, recurrence, and next run time.
 ///
 /// <div class="warning">
 ///
@@ -13992,29 +14755,36 @@ pub struct ShellInitScript {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShellOptions {
-    /// Controls automatic non-interactive profile loading where supported. Explicit initScripts are unaffected.
+pub struct ScheduleEntry {
+    /// Absolute fire time (epoch milliseconds) for a one-shot calendar schedule.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub init_profile: Option<ShellInitProfile>,
-    /// Ordered host-provided script paths sourced before each built-in shell command when the
-    /// entry's shell target matches the active shell. Use these for rc files, environment setup scripts,
-    /// or other custom scripts. A script that returns a nonzero status is reported, and later scripts
-    /// and the user command continue while the shell remains running. Because scripts are sourced into
-    /// the command shell, `exit`, `exec`, failures under `set -e`, or other shell-terminating behavior
-    /// can prevent continuation. Script standard output is preserved; Bash script stderr is discarded,
-    /// PowerShell exception messages are replaced, and runtime-generated failure notices omit
-    /// configured script paths. When sandboxing is enabled, each script must already be readable under
-    /// the active sandbox filesystem policy. Pass an empty array to clear the list.
+    pub at: Option<i64>,
+    /// 5-field cron expression for a recurring calendar schedule, evaluated in `tz`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub init_scripts: Option<Vec<ShellInitScript>>,
-    /// Flags passed to the active built-in shell process on startup, replacing its default flags.
-    /// When omitted, the built-in Bash shell uses `--norc --noprofile`,
-    /// and the built-in PowerShell shell uses `-NoProfile -NoLogo`.
+    pub cron: Option<String>,
+    /// Display-only label for the prompt as shown in the UI (e.g. `/skill-name` for a skill-invocation schedule). The actual enqueued prompt is `prompt`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub process_flags: Option<Vec<String>>,
+    pub display_prompt: Option<String>,
+    /// Sequential id assigned by the runtime within the session. Stable across resumes (rebuilt from the event log).
+    pub id: i64,
+    /// Interval between scheduled ticks, in milliseconds (relative-interval schedules).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub interval_ms: Option<i64>,
+    /// ISO 8601 timestamp when the next tick is scheduled to fire.
+    pub next_run_at: String,
+    /// Prompt text that gets enqueued on every tick.
+    pub prompt: String,
+    /// Whether the schedule re-arms after each tick (`/every`) or fires once (`/after`).
+    pub recurring: bool,
+    /// True for a self-paced (`dynamic`) schedule: no fixed cadence; the model arms each next run via the `manage_schedule` `wakeup` action. `nextRunAt` is model-controlled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub self_paced: Option<bool>,
+    /// IANA timezone the `cron` expression is evaluated in.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tz: Option<String>,
 }
 
-/// Session construction options.
+/// Result of registering or re-arming a scheduled prompt.
 ///
 /// <div class="warning">
 ///
@@ -14024,237 +14794,3908 @@ pub struct ShellOptions {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionOpenOptions {
-    /// Additional content-exclusion policies to merge into the session policy set.
-    ///
-    /// <div class="warning">
-    ///
-    /// **Experimental.** This type is part of an experimental wire-protocol surface
-    /// and may change or be removed in future SDK or CLI releases.
-    ///
-    /// </div>
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_content_exclusion_policies:
-        Option<Vec<SessionOpenOptionsAdditionalContentExclusionPolicy>>,
-    /// Additional directories the agent may access beyond the working directory. Each entry is granted to the session's file-access allow-list and surfaced to the model (system prompt context and `@`-mention completion). Absolute paths are recommended; a relative path is resolved against the session's working directory. Nonexistent or unresolvable entries are skipped with a warning. This is applied on both session creation and resume, and is not persisted: a resumed session that omits this option does not retain previously supplied directories (re-supply them, exactly as the CLI re-passes `--add-dir`).
+pub struct ScheduleAddResult {
+    /// The registered or updated schedule entry.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_directories: Option<Vec<String>>,
-    /// Runtime context discriminator for agent filtering.
+    pub entry: Option<ScheduleEntry>,
+    /// User-facing validation error, when registration failed.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_context: Option<String>,
-    /// Whether to include instructions from every MCP server in the system prompt instead of only allowlisted servers.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub allow_all_mcp_server_instructions: Option<bool>,
-    /// Whether ask_user is explicitly disabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ask_user_disabled: Option<bool>,
-    /// Initial authentication info for the session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub auth_info: Option<serde_json::Value>,
-    /// Allowlist of available tool names.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub available_tools: Option<Vec<String>>,
-    /// Options scoped to the built-in CAPI (Copilot API) provider.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub capi: Option<CapiSessionOptions>,
-    /// Structured client kind used for runtime behavior gates.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_kind: Option<String>,
-    /// Identifier of the client driving the session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    /// Whether commit-message coauthor trailers are enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub coauthor_enabled: Option<bool>,
-    /// Override Copilot configuration directory.
+    pub error: Option<String>,
+}
+
+/// Register a self-paced scheduled prompt.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ScheduleAddSelfPacedRequest {
+    /// Optional display-only prompt label.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub config_dir: Option<String>,
-    /// Whether auto-mode continuation is enabled.
+    pub display_prompt: Option<String>,
+    /// Prompt text to enqueue when the schedule fires.
+    pub prompt: String,
+}
+
+/// Whether the session currently has an active self-paced schedule.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ScheduleHasSelfPacedResult {
+    /// True when at least one active schedule is self-paced.
+    pub has_self_paced: bool,
+}
+
+/// Snapshot of the currently active recurring prompts for this session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ScheduleList {
+    /// Active scheduled prompts, ordered by id.
+    pub entries: Vec<ScheduleEntry>,
+}
+
+/// Re-arm a self-paced scheduled prompt.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ScheduleRearmSelfPacedRequest {
+    /// Epoch milliseconds when the prompt should next fire.
+    pub at: i64,
+    /// Id of the self-paced scheduled prompt.
+    pub id: i64,
+}
+
+/// Identifier of the scheduled prompt to remove.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ScheduleStopRequest {
+    /// Id of the scheduled prompt to remove.
+    pub id: i64,
+}
+
+/// Remove a scheduled prompt by id. The result entry is omitted if the id was unknown.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ScheduleStopResult {
+    /// The removed entry, or omitted if no entry matched.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub continue_on_auto_mode: Option<bool>,
-    /// Override URL for the Copilot API endpoint.
+    pub entry: Option<ScheduleEntry>,
+}
+
+/// Secret values to add to the redaction filter.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SecretsAddFilterValuesRequest {
+    /// Raw secret values to register for redaction
+    pub values: Vec<String>,
+}
+
+/// Confirmation that the secret values were registered.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SecretsAddFilterValuesResult {
+    /// Whether the values were successfully registered
+    pub ok: bool,
+}
+
+/// Parameters for session.extensions.sendAttachmentsToMessage.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SendAttachmentsToMessageParams {
+    /// Attachments to push into the next user-message turn. extension_context entries take the slim shape; standard variants take their full AttachmentSchema shape.
+    pub attachments: Vec<serde_json::Value>,
+    /// Optional canvas instance binding the push for provenance. When supplied, the runtime resolves the canvas, verifies it is owned by the calling extension, and stamps canvasId/instanceId onto each extension_context entry. When omitted, no resolution runs and those fields stay unset on the attachment.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_url: Option<String>,
-    /// Whether custom agents default to local-only execution.
+    pub instance_id: Option<String>,
+}
+
+/// A single user message to append to the session as part of a `session.sendMessages` turn
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SendMessageItem {
+    /// Optional attachments (files, directories, selections, blobs, GitHub references) to include with this message
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub custom_agents_local_only: Option<bool>,
-    /// Parent engagement ID for detached child telemetry rollup.
+    pub attachments: Option<Vec<serde_json::Value>>,
+    /// If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.
+    #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub detached_from_spawning_parent_engagement_id: Option<String>,
-    /// Parent session ID for detached child telemetry rollup.
+    pub(crate) billable: Option<bool>,
+    /// If provided, this is shown in the timeline instead of `prompt`
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub detached_from_spawning_parent_session_id: Option<String>,
-    /// Instruction source IDs disabled for this session.
+    pub display_prompt: Option<String>,
+    /// The user message text
+    pub prompt: String,
+    /// If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub disabled_instruction_sources: Option<Vec<String>>,
-    /// Skill IDs disabled for this session.
+    pub required_tool: Option<String>,
+    /// Optional provenance tag copied to the resulting user.message event. Must be `user`, `system`, `command-<command-id>` for command-originated messages, `schedule-<numeric-id>` for scheduled prompts, or `agent-<agent-id>` for prompts sent by another agent.
+    #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub disabled_skills: Option<Vec<String>>,
-    /// Experimental: enable native model citations (Anthropic models today), normalized onto the `assistant.message` event. Off by default; may change or be removed while the citations surface is experimental.
-    ///
-    /// <div class="warning">
-    ///
-    /// **Experimental.** This type is part of an experimental wire-protocol surface
-    /// and may change or be removed in future SDK or CLI releases.
-    ///
-    /// </div>
+    pub(crate) source: Option<String>,
+}
+
+/// Parameters for sending zero or more user messages to the session in a single turn. Remote-backed (Mission Control) sessions do not support this method and will return an error.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SendMessagesRequest {
+    /// The UI mode the agent was in when these messages were sent. Defaults to the session's current mode.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_citations: Option<bool>,
-    /// Opt in to capturing file changes for session rewind and session diff. Capture cannot reconstruct changes made before it was enabled. On create it starts capture from the first turn. It is also honored on resume: for a session that already has tracked prior turns, tracking continues automatically even if this is omitted; passing it on resume additionally enables tracking for an eligible session that has no prior root turn yet. Resuming a session whose prior root turns were never tracked has no restorable baseline, so tracking stays disabled for it and rewind reports file change tracking as unavailable; the resume itself still succeeds, so sessions that predate tracking remain loadable. The opt-in is only rejected when the session can never track (a subagent session, or one without local session storage). It is intentionally absent from the mutable options update because enabling it after edits have occurred would create an incomplete, misleading baseline. Subagents share the parent session's capture store and are not tracked as separate rewind points: a file a subagent writes is attributed to whichever root user turn was open when the capture was staged, just before the tool body ran. A turn cannot open while a staged capture is still in flight, so a subagent tool that staged under the spawning turn stays attributed to it however late the write lands, while a capture it stages after the user's next message belongs to that later turn. Attribution decides which turn's rewind point counts and file preview include that write; it does not narrow which rewinds revert it, because a rewind restores every capture from the selected turn onward, so the earlier spawning turn reverts it as well.
+    pub agent_mode: Option<SendAgentMode>,
+    /// The user messages to append to the conversation, in order. May be empty, in which case a single turn runs over the existing history with no new user message.
+    pub messages: Vec<SendMessageItem>,
+    /// How to deliver the messages. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_file_change_tracking: Option<bool>,
-    /// Opt-in: self-fetch and enforce enterprise managed settings at session bootstrap.
+    pub mode: Option<SendMode>,
+    /// If true, adds the messages to the front of the queue instead of the end
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_managed_settings: Option<bool>,
-    /// Whether on-demand custom instruction discovery is enabled.
+    pub prepend: Option<bool>,
+    /// Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_on_demand_instruction_discovery: Option<bool>,
-    /// Whether shell-script safety heuristics are enabled.
+    pub request_headers: Option<HashMap<String, String>>,
+    /// W3C Trace Context traceparent header for distributed tracing of this agent turn
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_script_safety: Option<bool>,
-    /// Whether model responses stream as delta events.
+    pub traceparent: Option<String>,
+    /// W3C Trace Context tracestate header for distributed tracing
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_streaming: Option<bool>,
-    /// How MCP server environment values are interpreted.
+    pub tracestate: Option<String>,
+    /// If true, await completion of the agentic loop for this turn before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageIds`; the caller can rely on the agent having processed the messages before the call resolves. Transport-dependent tail semantics: on a LOCAL (in-process) session the wait additionally blocks until the completed turn's event tail has been dispatched to this session's in-process subscribers, so a subsequent read of subscriber state already reflects the turn; on a REMOTE session the wait resolves once the loop completes and mirrored delivery follows over the wire. Callers that need the stronger local guarantee on remote sessions should await the event stream explicitly.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub env_value_mode: Option<SessionOpenOptionsEnvValueMode>,
-    /// Override directory for session event logs.
+    pub wait: Option<bool>,
+}
+
+/// Result of sending zero or more user messages
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SendMessagesResult {
+    /// Unique identifiers assigned to the messages, one per provided message in order. Empty when no messages were provided.
+    pub message_ids: Vec<String>,
+}
+
+/// Parameters for sending a user message to the session
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SendRequest {
+    /// The UI mode the agent was in when this message was sent. Defaults to the session's current mode.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub events_log_directory: Option<String>,
-    /// Whether subagent callback events should be forwarded into the session event log sink.
+    pub agent_mode: Option<SendAgentMode>,
+    /// Optional attachments (files, directories, selections, blobs, GitHub references) to include with the message
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub events_log_includes_subagents: Option<bool>,
-    /// Built-in subagent names to exclude from this session. Excluded built-ins are hidden from agent discovery and cannot be dispatched unless a custom agent with the same name is available.
+    pub attachments: Option<Vec<serde_json::Value>>,
+    /// If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub excluded_builtin_agents: Option<Vec<String>>,
-    /// Denylist of tool names.
+    pub billable: Option<bool>,
+    /// If provided, this is shown in the timeline instead of `prompt`
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub excluded_tools: Option<Vec<String>>,
-    /// ExP assignment ('flight') data injected by an SDK integrator, in the same JSON shape the Copilot CLI fetches from the experimentation service (CopilotExpAssignmentResponse). When supplied this is fed into the FeatureFlagService exactly like CLI-fetched assignments and ExP-backed flags wait for it. When absent the session does not block on ExP.
-    #[doc(hidden)]
+    pub display_prompt: Option<String>,
+    /// How to deliver the message. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) exp_assignments: Option<serde_json::Value>,
-    /// Feature-flag values resolved by the host.
+    pub mode: Option<SendMode>,
+    /// If true, adds the message to the front of the queue instead of the end
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub feature_flags: Option<HashMap<String, bool>>,
-    /// Built-in subagent names to include in this session. When specified, only these built-ins are available, subject to runtime availability and exclusions. Custom agents with the same name remain available.
+    pub prepend: Option<bool>,
+    /// The user message text
+    pub prompt: String,
+    /// Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub included_builtin_agents: Option<Vec<String>>,
-    /// Installed plugins visible to the session.
+    pub request_headers: Option<HashMap<String, String>>,
+    /// If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub installed_plugins: Option<Vec<InstalledPlugin>>,
-    /// Stable integration identifier for analytics.
+    pub required_tool: Option<String>,
+    /// Optional provenance tag copied to the resulting user.message event. Must be `user`, `system`, `command-<command-id>` for command-originated messages, `schedule-<numeric-id>` for scheduled prompts, or `agent-<agent-id>` for prompts sent by another agent.
+    #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub integration_id: Option<String>,
-    /// Whether experimental behavior is enabled.
+    pub(crate) source: Option<String>,
+    /// W3C Trace Context traceparent header for distributed tracing of this agent turn
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_experimental_mode: Option<bool>,
-    /// Whether interactive shell sessions are logged.
+    pub traceparent: Option<String>,
+    /// W3C Trace Context tracestate header for distributed tracing
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub log_interactive_shells: Option<bool>,
-    /// Identifier sent to LSP-style integrations.
+    pub tracestate: Option<String>,
+    /// If true, await completion of the agentic loop for this message before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageId`; the caller can rely on the agent having processed the message before the call resolves. Transport-dependent tail semantics: on a LOCAL (in-process) session the wait additionally blocks until the completed turn's event tail has been dispatched to this session's in-process subscribers, so a subsequent read of subscriber state already reflects the turn; on a REMOTE session the wait resolves once the loop completes and mirrored delivery follows over the wire. Callers that need the stronger local guarantee on remote sessions should await the event stream explicitly.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub lsp_client_name: Option<String>,
-    /// Maximum decoded byte size of a single inline model-facing binary tool result persisted in session events (default 10 MB).
+    pub wait: Option<bool>,
+}
+
+/// Result of sending a user message
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SendResult {
+    /// Unique identifier assigned to the message
+    pub message_id: String,
+}
+
+/// Internal request for sending a system notification.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SendSystemNotificationRequest {
+    /// Optional structured notification kind.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_inline_binary_bytes: Option<i64>,
-    /// Memory configuration for this session.
+    pub kind: Option<serde_json::Value>,
+    /// Notification text to deliver to the model.
+    pub message: String,
+    /// Internal delivery options, including passive policy.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub memory: Option<MemoryConfiguration>,
-    /// Initial model identifier.
+    pub options: Option<serde_json::Value>,
+}
+
+/// Agents discovered across user, project, plugin, and remote sources.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ServerAgentList {
+    /// All discovered agents across all sources
+    pub agents: Vec<AgentInfo>,
+}
+
+/// Instruction sources discovered across user, repository, and plugin sources.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ServerInstructionSourceList {
+    /// All discovered instruction sources
+    pub sources: Vec<InstructionSource>,
+}
+
+/// Server-side skill metadata, including name, description, source, enabled/invocable state, path, project path, and argument hint.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ServerSkill {
+    /// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Initial model capability overrides.
+    pub argument_hint: Option<String>,
+    /// Canonical slash command name used to invoke the skill, without the leading '/'
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_capabilities_overrides: Option<ModelCapabilitiesOverride>,
-    /// BYOK model definitions added to the selectable model list, each referencing a provider name.
-    ///
-    /// <div class="warning">
-    ///
-    /// **Experimental.** This type is part of an experimental wire-protocol surface
-    /// and may change or be removed in future SDK or CLI releases.
-    ///
-    /// </div>
+    pub command_name: Option<String>,
+    /// Description of what the skill does
+    pub description: String,
+    /// Whether the skill is currently enabled (based on global config)
+    pub enabled: bool,
+    /// Unique identifier for the skill
+    pub name: String,
+    /// Absolute path to the skill file
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub models: Option<Vec<ProviderModelConfig>>,
-    /// Optional human-friendly session name.
+    pub path: Option<String>,
+    /// The project path this skill belongs to (only for project/inherited skills)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Custom model-provider configuration (BYOK).
+    pub project_path: Option<String>,
+    /// Source location type (e.g., project, personal-copilot, plugin, builtin)
+    pub source: SkillSource,
+    /// Whether the skill can be invoked by the user as a slash command
+    pub user_invocable: bool,
+}
+
+/// Skills discovered across global and project sources.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ServerSkillList {
+    /// Messages for skills that failed to load (e.g. malformed SKILL.md). Empty when host skills are excluded so host-local paths are not disclosed to multitenant callers.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub provider: Option<ProviderConfig>,
-    /// Named BYOK provider connections, additive to CAPI auth. Combining with `provider` is rejected.
-    ///
-    /// <div class="warning">
-    ///
-    /// **Experimental.** This type is part of an experimental wire-protocol surface
-    /// and may change or be removed in future SDK or CLI releases.
-    ///
-    /// </div>
+    pub errors: Option<Vec<String>>,
+    /// All discovered skills across all sources
+    pub skills: Vec<ServerSkill>,
+}
+
+/// Current activity flags for the session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionActivity {
+    /// Whether an in-flight operation can currently be aborted.
+    pub abortable: bool,
+    /// Whether the session currently has active work, including running turns or tasks.
+    pub has_active_work: bool,
+}
+
+/// Current authentication information, or null when no authentication is active.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionAuthInfoResult {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub providers: Option<Vec<NamedProviderConfig>>,
-    /// Initial reasoning effort level. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. When omitted, no effort override is applied.
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Name of the environment variable that supplied the credential, when applicable
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_effort: Option<String>,
-    /// Initial reasoning summary mode for supported model clients.
+    pub env_var: Option<String>,
+    /// Authentication host
+    pub host: String,
+    /// Authenticated login, when available
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_summary: Option<SessionOpenOptionsReasoningSummary>,
-    /// Telemetry-only remote-defaulted flag.
+    pub login: Option<String>,
+    /// Opaque SDK GitHub credential registration backing this identity. Routing metadata only; never a credential.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub registration_id: Option<String>,
+    /// Authentication type
+    pub r#type: AuthInfoType,
+}
+
+/// Internal GitHub login parameters.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionAuthLoginRequest {
+    /// GitHub host URL
+    pub host: String,
+    /// GitHub login
+    pub login: String,
+    /// Whether to persist the token after login
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub persist: Option<bool>,
+    /// GitHub authentication token
+    pub token: String,
+}
+
+/// Parameters identifying a GitHub authentication to log out.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionAuthLogoutUserRequest {
+    /// Authentication information to log out
+    pub auth_info: AuthInfo,
+}
+
+/// Authentication status and account metadata for the session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionAuthStatus {
+    /// Authentication type
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_type: Option<AuthInfoType>,
+    /// Copilot plan tier (e.g., individual_pro, business)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_plan: Option<String>,
+    /// Authentication host URL
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub host: Option<String>,
+    /// Whether the session has resolved authentication
+    pub is_authenticated: bool,
+    /// Authenticated login/username, if available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub login: Option<String>,
+    /// Human-readable authentication status description
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_message: Option<String>,
+}
+
+/// Parameters for switching the session's active authentication.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionAuthSwitchRequest {
+    /// Authentication information to activate
+    pub auth_info: AuthInfo,
+    /// Optional token paired with the authentication information
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub token: Option<String>,
+}
+
+/// Map of sessionId -> bytes freed by removing the session's workspace directory.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionBulkDeleteResult {
+    /// Map of sessionId -> bytes freed by removing the session's workspace directory. Sessions whose deletion failed are omitted from this map (failures are logged on the server but not surfaced per-id; check the map for absent IDs to detect them).
+    pub freed_bytes: HashMap<String, i64>,
+}
+
+/// The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionContextAttributionCategories {
+    /// Output reserve plus post-blocking-threshold buffer.
+    pub buffer: i64,
+    /// Custom-instructions tokens (0 when none are configured).
+    pub custom_instructions: i64,
+    /// Remaining unused window capacity (clamped at 0).
+    pub free_space: i64,
+    /// MCP tool-definition tokens.
+    pub mcp_tools: i64,
+    /// Conversation (user/assistant/tool) message tokens.
+    pub messages: i64,
+    /// System prompt tokens, excluding custom instructions.
+    pub system_prompt: i64,
+    /// Non-MCP tool-definition tokens.
+    pub system_tools: i64,
+}
+
+/// Successful compaction history for the session.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionContextAttributionCompactions {
+    /// Number of successful compactions in this session.
+    pub count: i64,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionContextAttributionEntriesItem {
+    /// Supplementary per-entry metadata (e.g. `messageCount`, `role`, `evictable`, `pluginSource`). Values are stringified; parse as needed and ignore unrecognized keys.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub attributes: Option<HashMap<String, String>>,
+    /// Identifier for this entry, formed by joining its `kind` and source name (e.g. `tool:bash`, `skill:tmux`, `toolDefinition:bash`); unique within the snapshot. Use it to match the same entry across snapshots, to correlate with other APIs (skill/agent/MCP registries), and as the `parentId` target for nesting. Distinct from the human-facing `label`.
+    pub id: String,
+    /// Source category for this entry. Not a closed set — tolerate unknown values. Known values today: `skill`, `subagent`, `mcpServer`, `tool`, `system`, `toolDefinition`, `plugin`.
+    pub kind: String,
+    /// Human-readable display label, e.g. `bash` or `skill: tmux`. Presentation-only; may be localized/reformatted without notice — do not key off it.
+    pub label: String,
+    /// Optional `id` of the parent entry: e.g. a `plugin` entry parenting its `skill`/`mcpServer` entries, or the `system` entry parenting `toolDefinition` entries. Omitted for top-level entries.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parent_id: Option<String>,
+    /// Token count currently in context attributable to this entry.
+    pub tokens: i64,
+}
+
+/// Per-source context-window attribution, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionContextAttribution {
+    /// Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`.
+    pub buffer_tokens: i64,
+    /// The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`.
+    pub categories: SessionContextAttributionCategories,
+    /// Successful compaction history for the session.
+    pub compactions: SessionContextAttributionCompactions,
+    /// Token count at which background compaction starts. Mirrors `SessionContextInfo.compactionThreshold`.
+    pub compaction_threshold: i64,
+    /// Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`.
+    pub entries: Vec<SessionContextAttributionEntriesItem>,
+    /// Prompt limit plus the model's output reserve: the full context window `categories.freeSpace` and `categories.buffer` are measured against. Mirrors `SessionContextInfo.limit`.
+    pub limit: i64,
+    /// The concrete model id the entire breakdown was tokenized against (feeds the per-model token multiplier). Under `Auto` (Free/Student) this is the resolved model, not the literal `auto` sentinel, so totals are not undercounted. A single-model approximation of a potentially multi-model Auto session.
+    pub model_id: String,
+    /// How `modelId` was chosen. Not a closed set — tolerate unknown values. Known values today: `autoResolved` (the model Auto resolved to), `selected` (the user's explicitly selected model), `default` (a fallback before any model is known).
+    pub model_source: String,
+    /// Maximum prompt tokens the resolved model accepts — the denominator for a `##k/###k` context-usage display. Mirrors `SessionContextInfo.promptTokenLimit`.
+    pub prompt_token_limit: i64,
+    /// Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share.
+    pub total_tokens: i64,
+}
+
+/// Token breakdown for the current context window, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionContextInfo {
+    /// Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%)
+    pub buffer_tokens: i64,
+    /// Token count at which background compaction starts (configurable percentage of promptTokenLimit)
+    pub compaction_threshold: i64,
+    /// Tokens consumed by user/assistant/tool messages
+    pub conversation_tokens: i64,
+    /// Prompt token limit plus the model's full output token limit.
+    pub limit: i64,
+    /// Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools)
+    pub mcp_tools_tokens: i64,
+    /// The model used for token counting
+    pub model_name: String,
+    /// Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified)
+    pub prompt_token_limit: i64,
+    /// Tokens consumed by the system prompt
+    pub system_tokens: i64,
+    /// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
+    pub tool_definitions_tokens: i64,
+    /// Sum of system, conversation and tool-definition tokens
+    pub total_tokens: i64,
+}
+
+/// The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionEnrichMetadataResult {
+    /// Enriched records, with summary and context backfilled. Sessions confirmed empty and unnamed may be omitted.
+    pub sessions: Vec<LocalSessionMetadataValue>,
+}
+
+/// File path, content to append, and optional mode for the client-provided session filesystem.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsAppendFileRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Path using SessionFs conventions
+    pub path: String,
+    /// Content to append
+    pub content: String,
+    /// Optional POSIX-style mode for newly created files
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mode: Option<i64>,
+}
+
+/// Describes a filesystem error.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsError {
+    /// Error classification
+    pub code: SessionFsErrorCode,
+    /// Free-form detail about the error, for logging/diagnostics
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+}
+
+/// Path to test for existence in the client-provided session filesystem.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsExistsRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Path using SessionFs conventions
+    pub path: String,
+}
+
+/// Indicates whether the requested path exists in the client-provided session filesystem.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsExistsResult {
+    /// Whether the path exists
+    pub exists: bool,
+}
+
+/// Directory path to create in the client-provided session filesystem, with options for recursive creation and POSIX mode.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsMkdirRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Path using SessionFs conventions
+    pub path: String,
+    /// Create parent directories as needed
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub recursive: Option<bool>,
+    /// Optional POSIX-style mode for newly created directories
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mode: Option<i64>,
+}
+
+/// Directory path whose entries should be listed from the client-provided session filesystem.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsReaddirRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Path using SessionFs conventions
+    pub path: String,
+}
+
+/// Names of entries in the requested directory, or a filesystem error if the read failed.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsReaddirResult {
+    /// Entry names in the directory
+    pub entries: Vec<String>,
+    /// Describes a filesystem error.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<SessionFsError>,
+}
+
+/// Directory entry returned by session filesystem `readdirWithTypes`, with name and entry type.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsReaddirWithTypesEntry {
+    /// Entry name
+    pub name: String,
+    /// Entry type
+    pub r#type: SessionFsReaddirWithTypesEntryType,
+}
+
+/// Directory path whose entries (with type information) should be listed from the client-provided session filesystem.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsReaddirWithTypesRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Path using SessionFs conventions
+    pub path: String,
+}
+
+/// Entries in the requested directory paired with file/directory type information, or a filesystem error if the read failed.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsReaddirWithTypesResult {
+    /// Directory entries with type information
+    pub entries: Vec<SessionFsReaddirWithTypesEntry>,
+    /// Describes a filesystem error.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<SessionFsError>,
+}
+
+/// Path of the file to read from the client-provided session filesystem.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsReadFileRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Path using SessionFs conventions
+    pub path: String,
+}
+
+/// File content as a UTF-8 string, or a filesystem error if the read failed.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsReadFileResult {
+    /// File content as UTF-8 string
+    pub content: String,
+    /// Describes a filesystem error.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<SessionFsError>,
+}
+
+/// Source and destination paths for renaming or moving an entry in the client-provided session filesystem.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsRenameRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Source path using SessionFs conventions
+    pub src: String,
+    /// Destination path using SessionFs conventions
+    pub dest: String,
+}
+
+/// Path to remove from the client-provided session filesystem, with options for recursive removal and force.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsRmRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Path using SessionFs conventions
+    pub path: String,
+    /// Remove directories and their contents recursively
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub recursive: Option<bool>,
+    /// Ignore errors if the path does not exist
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub force: Option<bool>,
+}
+
+/// Optional capabilities declared by the provider
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSetProviderCapabilities {
+    /// Whether the provider supports SQLite query/exists operations
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sqlite: Option<bool>,
+}
+
+/// Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSetProviderRequest {
+    /// Optional capabilities declared by the provider
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub capabilities: Option<SessionFsSetProviderCapabilities>,
+    /// Path conventions used by this filesystem
+    pub conventions: SessionFsSetProviderConventions,
+    /// Initial working directory for sessions
+    pub initial_cwd: String,
+    /// Path within each session's SessionFs where the runtime stores files for that session
+    pub session_state_path: String,
+}
+
+/// Indicates whether the calling client was registered as the session filesystem provider.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSetProviderResult {
+    /// Whether the provider was set successfully
+    pub success: bool,
+}
+
+/// Indicates whether the per-session SQLite database already exists.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSqliteExistsResult {
+    /// Whether the session database already exists
+    pub exists: bool,
+}
+
+/// SQL query, query type, and optional bind parameters for executing a SQLite query against the per-session database. The provider applies its SQLite busy timeout for every call.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSqliteQueryRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// SQL query to execute
+    pub query: String,
+    /// How to execute the query: 'exec' for DDL/multi-statement (no results), 'query' for SELECT (returns rows), 'run' for INSERT/UPDATE/DELETE (returns rowsAffected)
+    pub query_type: SessionFsSqliteQueryType,
+    /// Optional named bind parameters
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub params: Option<HashMap<String, serde_json::Value>>,
+}
+
+/// Query results including rows, columns, and rows affected, or a filesystem error if execution failed.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSqliteQueryResult {
+    /// Column names from the result set
+    pub columns: Vec<String>,
+    /// Describes a filesystem error.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<SessionFsError>,
+    /// SQLite last_insert_rowid() value for INSERT.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub last_insert_rowid: Option<i64>,
+    /// For SELECT: array of row objects. For others: empty array.
+    pub rows: Vec<HashMap<String, serde_json::Value>>,
+    /// Number of rows affected (for INSERT/UPDATE/DELETE)
+    pub rows_affected: i64,
+}
+
+/// Classified SQLite transaction failure. busyOrLocked guarantees rollback; postCommitAmbiguous must never be retried.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSqliteTransactionError {
+    /// Machine-readable classification of the transaction failure.
+    pub error_class: SessionFsSqliteTransactionErrorClass,
+    /// Human-readable transaction failure message.
+    pub message: String,
+}
+
+/// One statement in an atomic SQLite transaction.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSqliteTransactionStatement {
+    /// Optional named bind parameters.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub params: Option<HashMap<String, serde_json::Value>>,
+    /// SQL statement to execute.
+    pub query: String,
+    /// How to execute the statement.
+    pub query_type: SessionFsSqliteQueryType,
+}
+
+/// Statements to execute atomically. Providers apply busy handling for every call.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSqliteTransactionRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Ordered SQL statements to execute in one transaction.
+    pub statements: Vec<SessionFsSqliteTransactionStatement>,
+}
+
+/// Per-statement results, or a classified transaction error.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsSqliteTransactionResult {
+    /// Classified transaction failure, when execution did not succeed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<SessionFsSqliteTransactionError>,
+    /// Per-statement query results in input order.
+    pub results: Vec<SessionFsSqliteQueryResult>,
+}
+
+/// Path whose metadata should be returned from the client-provided session filesystem.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsStatRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Path using SessionFs conventions
+    pub path: String,
+}
+
+/// Filesystem metadata for the requested path, or a filesystem error if the stat failed.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsStatResult {
+    /// ISO 8601 timestamp of creation
+    pub birthtime: String,
+    /// Describes a filesystem error.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<SessionFsError>,
+    /// Whether the path is a directory
+    pub is_directory: bool,
+    /// Whether the path is a file
+    pub is_file: bool,
+    /// ISO 8601 timestamp of last modification
+    pub mtime: String,
+    /// File size in bytes
+    pub size: i64,
+}
+
+/// File path, content to write, and optional mode for the client-provided session filesystem.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionFsWriteFileRequest {
+    /// Target session identifier
+    pub session_id: SessionId,
+    /// Path using SessionFs conventions
+    pub path: String,
+    /// Content to write
+    pub content: String,
+    /// Optional POSIX-style mode for newly created files
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mode: Option<i64>,
+}
+
+/// Installed plugin record for a session, with marketplace, version, install time, enabled state, cache path, and source.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionInstalledPlugin {
+    /// Path where the plugin is cached locally
+    #[serde(rename = "cache_path", skip_serializing_if = "Option::is_none")]
+    pub cache_path: Option<String>,
+    /// Whether the plugin is currently enabled
+    pub enabled: bool,
+    /// Installation timestamp (ISO-8601)
+    #[serde(rename = "installed_at")]
+    pub installed_at: String,
+    /// Absolute path of the marketplace directory a live plugin was resolved from. Present only on live, never-persisted records — those synthesized at session start for a directory/local marketplace, whose cache_path points at the real plugin directory on disk rather than a copy under the installed-plugins cache. Its presence is what marks a record as live, and no record carrying it is ever written to the persisted installedPlugins key.
+    #[serde(rename = "installed_from", skip_serializing_if = "Option::is_none")]
+    pub installed_from: Option<String>,
+    /// Marketplace the plugin came from (empty string for direct repo installs)
+    pub marketplace: String,
+    /// Plugin name
+    pub name: String,
+    /// Source descriptor for direct repo installs (when marketplace is empty)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<serde_json::Value>,
+    /// Per-plugin source fingerprint (a SHA-256 hash of the plugin's catalog source spec plus its resolved source subtree — NOT a Git commit SHA) captured at marketplace install/update time. Auto-update compares it against the freshly recomputed fingerprint to detect a content change that does not bump the version. Absent for pre-existing installs and for direct (non-marketplace) installs.
+    #[serde(rename = "source_sha", skip_serializing_if = "Option::is_none")]
+    pub source_sha: Option<String>,
+    /// Installed version, if known
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub version: Option<String>,
+}
+
+/// Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or full commit SHA, and optional subpath.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionInstalledPluginSourceGitHub {
+    /// Optional repository-relative path to the plugin.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<String>,
+    /// Optional Git ref to resolve.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#ref: Option<String>,
+    /// GitHub repository in `owner/repo` form.
+    pub repo: String,
+    /// Optional full 40-character hexadecimal commit SHA.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sha: Option<String>,
+    /// Constant value. Always "github".
+    pub source: SessionInstalledPluginSourceGitHubSource,
+}
+
+/// Source descriptor for a direct local plugin install, with a local filesystem path.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionInstalledPluginSourceLocal {
+    /// Local filesystem path to the plugin.
+    pub path: String,
+    /// Constant value. Always "local".
+    pub source: SessionInstalledPluginSourceLocalSource,
+}
+
+/// Source descriptor for a direct URL plugin install, with URL, optional ref or full commit SHA, and optional subpath.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionInstalledPluginSourceUrl {
+    /// Optional source-relative path to the plugin.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<String>,
+    /// Optional Git ref to resolve.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub r#ref: Option<String>,
+    /// Optional full 40-character hexadecimal commit SHA.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sha: Option<String>,
+    /// Constant value. Always "url".
+    pub source: SessionInstalledPluginSourceUrlSource,
+    /// URL of the plugin source.
+    pub url: String,
+}
+
+/// Baseline data provenance for a prediction.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionLimitPredictionBaselineData {
+    /// End of the baseline data slice.
+    pub window_end: String,
+    /// Start of the baseline data slice.
+    pub window_start: String,
+}
+
+/// Semantic usage tier and its AI-credit cap.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionLimitPredictionTierOption {
+    /// AI-credit cap for this tier.
+    pub cap: f64,
+    /// Semantic usage tier.
+    pub tier: SessionLimitPredictionTier,
+}
+
+/// Explainable AI-credit session-limit prediction.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionLimitPredictionDetails {
+    /// Baseline data provenance.
+    pub baseline_data: SessionLimitPredictionBaselineData,
+    /// Client population used for the prediction.
+    pub client_type: SessionLimitPredictionClientType,
+    /// Resolved model family when known.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub family: Option<String>,
+    /// Model identifier used for lookup.
+    pub model_id: String,
+    /// Recommended maximum AI credits for this session.
+    pub recommended_cap: f64,
+    /// Tier chosen as the recommended cap.
+    pub recommended_tier: SessionLimitPredictionTier,
+    /// Baseline fallback level used to create the prediction.
+    pub source: SessionLimitPredictionSource,
+    /// Key matched at the source level, such as a model id, family id, or `global`.
+    pub source_key: String,
+    /// Ordered usage tiers and their AI-credit caps.
+    pub tiers: Vec<SessionLimitPredictionTierOption>,
+}
+
+/// Parameters for predicting an AI-credit session limit. Omitting `modelId` uses the session's currently selected model.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionLimitPredictionRequest {
+    /// Client type to size for. Defaults to `cli-interactive`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_type: Option<SessionLimitPredictionClientType>,
+    /// Optional model identifier override. If omitted, the session's current model is used.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_id: Option<String>,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionLimitPredictionResultAvailable {
+    /// Prediction result variant discriminator.
+    pub kind: SessionLimitPredictionResultAvailableKind,
+    /// Predicted session limit details.
+    pub prediction: SessionLimitPredictionDetails,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionLimitPredictionResultUnavailable {
+    /// Prediction result variant discriminator.
+    pub kind: SessionLimitPredictionResultUnavailableKind,
+    /// Reason no prediction is available.
+    pub reason: SessionLimitPredictionUnavailableReason,
+}
+
+/// Sessions matching the filter, ordered most-recently-modified first.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionList {
+    /// Sessions ordered most-recently-modified first. Discriminated by `isRemote`.
+    pub sessions: Vec<serde_json::Value>,
+}
+
+/// Optional filter applied to the returned sessions
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionListFilter {
+    /// Match sessions whose context.branch equals this value
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// Match sessions whose context.cwd equals this value
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Match sessions whose context.gitRoot equals this value
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Match sessions whose context.repository equals this value
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+}
+
+/// Queued repo-level startup prompts and the total hook command count after loading.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionLoadDeferredRepoHooksResult {
+    /// Total hook command count (user + plugin + repo) loaded for the session by this call. Captured atomically with startupPrompts so callers don't need to read a separate counter.
+    pub hook_count: i64,
+    /// Repo-level startup prompts queued from repo hook configs. Empty on resume, when no repo configs were pending, or when disableAllHooks is set.
+    pub startup_prompts: Vec<String>,
+}
+
+/// Enterprise permission policy expressed with the runtime's managed permission-rule syntax.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionManagedPermissions {
+    /// Permission rules that allow matching operations unless another managed source, deny, or ask rule restricts them.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub allow: Option<Vec<String>>,
+    /// Permission rules that require explicit human approval.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ask: Option<Vec<String>>,
+    /// Permission rules that block matching operations. Deny has highest precedence.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deny: Option<Vec<String>>,
+    /// When set to `disable`, prevents bypass/allow-all permission modes. `allow-auto-only` blocks full allow-all but permits advisory auto-approval. Any other value is accepted rather than failing the session, but is enforced as `disable`: the key is only present to restrict something, so a mode this runtime cannot interpret fails closed to the most restrictive one it knows. Omit the key entirely to impose no restriction.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_bypass_permissions_mode: Option<String>,
+}
+
+/// Managed settings an SDK host may inject at session startup. Only permissions are accepted in this initial contract.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionManagedSettings {
+    /// Managed permission policy injected by the SDK host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permissions: Option<SessionManagedPermissions>,
+}
+
+/// Public-facing projection of workspace metadata for SDK / TUI consumers
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionMetadataSnapshotWorkspace {
+    /// Branch checked out at session start, if any
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// ISO 8601 timestamp when the workspace was created
+    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Current working directory at session start
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Resolved git root for cwd, if any
+    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Repository host type, if known
+    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<WorkspaceSummaryHostType>,
+    /// Workspace identifier (1:1 with sessionId)
+    pub id: String,
+    /// Display name for the session, if set
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Repository identifier in 'owner/repo' or 'org/project/repo' format, if any
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// ISO 8601 timestamp when the workspace was last updated
+    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
+    pub updated_at: Option<String>,
+    /// Whether the display name was explicitly set by the user
+    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
+    pub user_named: Option<bool>,
+}
+
+/// Point-in-time snapshot of slow-changing session identifier and state fields
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionMetadataSnapshot {
+    /// True when the session was detected to be in use by another process at construction time. Local consumers may surface a confirmation prompt before fully attaching. Always false for new sessions.
+    pub already_in_use: bool,
+    /// Runtime client name associated with the session (telemetry identifier).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot')
+    pub current_mode: MetadataSnapshotCurrentMode,
+    /// User-provided name supplied at session construction (via `--name`), if any. Immutable after construction.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub initial_name: Option<String>,
+    /// Whether this is a remote session (i.e., one whose runtime executes elsewhere and is steered through this process)
+    pub is_remote: bool,
+    /// ISO 8601 timestamp of when the session's persisted state was last modified on disk. For new sessions, equals startTime. For resumed sessions, reflects the previous modification time at construction.
+    pub modified_time: String,
+    /// Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_metadata: Option<MetadataSnapshotRemoteMetadata>,
+    /// Currently selected model identifier, if any
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub selected_model: Option<String>,
+    /// The unique identifier of the session
+    pub session_id: SessionId,
+    /// Current session limits, or null when no limits are active
+    pub session_limits: Option<SessionLimitsConfig>,
+    /// ISO 8601 timestamp of when the session started
+    pub start_time: String,
+    /// Short human-readable summary of the session, if known. Omitted when no summary has been generated.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary: Option<String>,
+    /// Absolute path to the session's current working directory
+    pub working_directory: String,
+    /// Public-facing workspace metadata for this session, or null if the session has no associated workspace. Excludes runtime-internal fields (GitHub IDs, summary count, internal flags).
+    pub workspace: Option<SessionMetadataSnapshotWorkspace>,
+    /// Absolute path to the session's workspace directory on disk, or null if the session has no associated workspace
+    pub workspace_path: Option<String>,
+}
+
+/// Cost-category metadata for a CAPI model.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionModelPriceCategory {
+    /// CAPI model identifier.
+    pub id: String,
+    /// Cost category assigned to the model.
+    pub price_category: ModelPickerPriceCategory,
+}
+
+/// The list of models available to this session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionModelList {
+    /// Available models, ordered with the most preferred default first. Includes both Copilot (CAPI) models and any registry BYOK models; a BYOK model appears under its provider-qualified selection id (`provider/id`).
+    pub list: Vec<serde_json::Value>,
+    /// Cost categories for the full CAPI catalog, including picker-disabled models that Auto may select. Metadata only; entries absent from `list` are not manually selectable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_price_categories: Option<Vec<SessionModelPriceCategory>>,
+    /// Per-quota snapshots returned alongside the model list, keyed by quota type.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub quota_snapshots: Option<HashMap<String, serde_json::Value>>,
+}
+
+/// Source descriptor for a `sessions.open` content-exclusion rule, with source name and type.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource {
+    /// Name of the policy source.
+    pub name: String,
+    /// Type of the policy source.
+    pub r#type: String,
+}
+
+/// Single content-exclusion rule supplied to `sessions.open` options, with paths, match conditions, and source.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionOpenOptionsAdditionalContentExclusionPolicyRule {
+    /// Conditions of which at least one must match.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub if_any_match: Option<Vec<String>>,
+    /// Conditions none of which may match.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub if_none_match: Option<Vec<String>>,
+    /// Path patterns covered by this rule.
+    pub paths: Vec<String>,
+    /// Source descriptor for a `sessions.open` content-exclusion rule, with source name and type.
+    pub source: SessionOpenOptionsAdditionalContentExclusionPolicyRuleSource,
+}
+
+/// Content-exclusion policy supplied to `sessions.open` options, with rules, last-updated data, and scope.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionOpenOptionsAdditionalContentExclusionPolicy {
+    /// Opaque policy update timestamp supplied by the host.
+    #[serde(rename = "last_updated_at")]
+    pub last_updated_at: serde_json::Value,
+    /// Content-exclusion rules to apply.
+    pub rules: Vec<SessionOpenOptionsAdditionalContentExclusionPolicyRule>,
+    /// Allowed values for the `SessionOpenOptionsAdditionalContentExclusionPolicyScope` enumeration.
+    pub scope: SessionOpenOptionsAdditionalContentExclusionPolicyScope,
+}
+
+/// Command-scoped GitHub credential injection for the shell commands an agent runs.
+///
+/// Each channel is opt-in and independent, and injection is scoped to the individual command
+/// spawn: the credential is resolved from the session's *current* authentication at every spawn
+/// and reaches only spawns whose script actually invokes `git` or `gh`. Because nothing is
+/// retained between spawns, replacing the session credential (`session.gitHubAuth.setCredentials`)
+/// changes what the next spawned command presents — which seeding a credential into the runtime
+/// process's own environment cannot do, since a child's environment is fixed at `exec`.
+///
+/// The credential is matched to the host it authenticates to, so a github.com credential is never
+/// presented to a GitHub Enterprise host and vice versa. Where a channel cannot express that
+/// boundary it injects nothing rather than crossing it -- see `gh` below.
+///
+/// This is independent of `sandboxConfig`: it is a decision about which identity the agent
+/// presents, not about what the agent may touch, and it works on every platform whether or not
+/// an OS sandboxing backend is available. `sandboxConfig.auth` remains the sandbox-scoped
+/// spelling and is additive with this one.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellCredentials {
+    /// Whether to authenticate the agent's `gh` commands as the session's GitHub credential, by
+    /// exporting `GH_TOKEN` to a spawn that runs `gh`. Any inherited `gh` credential is removed from
+    /// spawns that do not, so the credential stays command-scoped.
+    ///
+    /// Applies to a github.com credential only. `gh` picks its credential variable from the host a
+    /// command targets rather than the one the credential belongs to, and the command can choose that
+    /// target, so `GH_ENTERPRISE_TOKEN` would offer a single-tenant enterprise credential to every
+    /// other enterprise host. A session whose credential is enterprise-scoped therefore runs `gh`
+    /// unauthenticated; its `git` commands are unaffected, because `http.<host>.extraheader` is scoped
+    /// to one host by construction. Default: false (opt-in).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gh: Option<bool>,
+    /// Whether to authenticate the agent's `git` commands as the session's GitHub credential, by
+    /// injecting an `http.<host>.extraheader` (plus `insteadOf` rewrites so SSH-spelled remotes for
+    /// that host use the authenticated HTTPS transport). Applied only to a spawn that runs a
+    /// remote-contacting `git` subcommand. Default: false (opt-in).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub git: Option<bool>,
+}
+
+/// A host-provided script sourced before each built-in shell command when its shell target matches the active shell.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellInitScript {
+    /// Path to the script to source.
+    pub path: String,
+    /// Built-in shell that may source this script.
+    pub shell: ShellInitScriptShell,
+}
+
+/// Per-session settings for built-in shell tools.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellOptions {
+    /// Command-scoped GitHub credential injection for shell commands.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub credentials: Option<ShellCredentials>,
+    /// Controls automatic non-interactive profile loading where supported. Explicit initScripts are unaffected.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub init_profile: Option<ShellInitProfile>,
+    /// Ordered host-provided script paths sourced before each built-in shell command when the
+    /// entry's shell target matches the active shell. Use these for rc files, environment setup scripts,
+    /// or other custom scripts. A script that returns a nonzero status is reported, and later scripts
+    /// and the user command continue while the shell remains running. Because scripts are sourced into
+    /// the command shell, `exit`, `exec`, failures under `set -e`, or other shell-terminating behavior
+    /// can prevent continuation. Script standard output is preserved; Bash script stderr is discarded,
+    /// PowerShell exception messages are replaced, and runtime-generated failure notices omit
+    /// configured script paths. When sandboxing is enabled, each script must already be readable under
+    /// the active sandbox filesystem policy. Pass an empty array to clear the list.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub init_scripts: Option<Vec<ShellInitScript>>,
+    /// Flags passed to the active built-in shell process on startup, replacing its default flags.
+    /// When omitted, the built-in Bash shell uses `--norc --noprofile`,
+    /// and the built-in PowerShell shell uses `-NoProfile -NoLogo`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub process_flags: Option<Vec<String>>,
+}
+
+/// Session construction options.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionOpenOptions {
+    /// Additional content-exclusion policies to merge into the session policy set.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub additional_content_exclusion_policies:
+        Option<Vec<SessionOpenOptionsAdditionalContentExclusionPolicy>>,
+    /// Additional directories the agent may access beyond the working directory. Each entry is granted to the session's file-access allow-list and surfaced to the model (system prompt context and `@`-mention completion). Conventional `.github/skills/` and `.github/agents/` definitions under each directory also join the session's project catalogs when their existing subsystem gates are enabled: added-root skills require both `enableConfigDiscovery` and effective `enableSkills`; added-root agents require `enableConfigDiscovery`. Supplying a directory therefore activates configuration from it and should be treated as a trust decision. Absolute paths are recommended; a relative path is resolved against the session's working directory. Nonexistent or unresolvable entries are skipped with a warning. This is applied during session creation and cold resume and is not persisted, so a cold resume must re-supply the directories.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub additional_directories: Option<Vec<String>>,
+    /// Runtime context discriminator for agent filtering.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_context: Option<String>,
+    /// Whether to include instructions from every MCP server in the system prompt instead of only allowlisted servers.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub allow_all_mcp_server_instructions: Option<bool>,
+    /// Whether ask_user is explicitly disabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ask_user_disabled: Option<bool>,
+    /// Initial authentication info for the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_info: Option<AuthInfo>,
+    /// Allowlist of available tool names.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub available_tools: Option<Vec<String>>,
+    /// Options scoped to the built-in CAPI (Copilot API) provider.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub capi: Option<CapiSessionOptions>,
+    /// Structured client kind used for runtime behavior gates.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_kind: Option<String>,
+    /// Identifier of the client driving the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Whether commit-message coauthor trailers are enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub coauthor_enabled: Option<bool>,
+    /// Override Copilot configuration directory.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_dir: Option<String>,
+    /// Whether auto-mode continuation is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub continue_on_auto_mode: Option<bool>,
+    /// Override URL for the Copilot API endpoint.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_url: Option<String>,
+    /// Whether custom agents default to local-only execution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub custom_agents_local_only: Option<bool>,
+    /// Parent engagement ID for detached child telemetry rollup.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub detached_from_spawning_parent_engagement_id: Option<String>,
+    /// Parent session ID for detached child telemetry rollup.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub detached_from_spawning_parent_session_id: Option<String>,
+    /// Instruction source IDs disabled for this session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_instruction_sources: Option<Vec<String>>,
+    /// MCP server names disabled for this session. Disabled servers are not started or authenticated on create or cold resume.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_mcp_servers: Option<Vec<String>>,
+    /// Skill IDs disabled for this session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_skills: Option<Vec<String>>,
+    /// Experimental: enable native model citations for supported Anthropic and OpenAI models, normalized onto the `assistant.message` event. Off by default; may change or be removed while the citations surface is experimental.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_citations: Option<bool>,
+    /// Opt in to capturing file changes for session rewind and session diff. Capture cannot reconstruct changes made before it was enabled. On create it starts capture from the first turn. It is also honored on resume: for a session that already has tracked prior turns, tracking continues automatically even if this is omitted; passing it on resume additionally enables tracking for an eligible session that has no prior root turn yet. Resuming a session whose prior root turns were never tracked has no restorable baseline, so tracking stays disabled for it and rewind reports file change tracking as unavailable; the resume itself still succeeds, so sessions that predate tracking remain loadable. The opt-in is only rejected when the session can never track (a subagent session, or one without local session storage). It is intentionally absent from the mutable options update because enabling it after edits have occurred would create an incomplete, misleading baseline. Subagents share the parent session's capture store and are not tracked as separate rewind points: a file a subagent writes is attributed to whichever root user turn was open when the capture was staged, just before the tool body ran. A turn cannot open while a staged capture is still in flight, so a subagent tool that staged under the spawning turn stays attributed to it however late the write lands, while a capture it stages after the user's next message belongs to that later turn. Attribution decides which turn's rewind point counts and file preview include that write; it does not narrow which rewinds revert it, because a rewind restores every capture from the selected turn onward, so the earlier spawning turn reverts it as well.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_file_change_tracking: Option<bool>,
+    /// Opt-in: self-fetch and enforce enterprise managed settings at session bootstrap.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_managed_settings: Option<bool>,
+    /// Whether on-demand custom instruction discovery is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_on_demand_instruction_discovery: Option<bool>,
+    /// Whether shell-script safety heuristics are enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_script_safety: Option<bool>,
+    /// Whether model responses stream as delta events.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_streaming: Option<bool>,
+    /// How MCP server environment values are interpreted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub env_value_mode: Option<SessionOpenOptionsEnvValueMode>,
+    /// Override directory for session event logs.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub events_log_directory: Option<String>,
+    /// Whether subagent callback events should be forwarded into the session event log sink.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub events_log_includes_subagents: Option<bool>,
+    /// Built-in subagent names to exclude from this session. Excluded built-ins are hidden from agent discovery and cannot be dispatched unless a custom agent with the same name is available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub excluded_builtin_agents: Option<Vec<String>>,
+    /// Denylist of tool names.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub excluded_tools: Option<Vec<String>>,
+    /// ExP assignment ('flight') data injected by an SDK integrator, in the same JSON shape the Copilot CLI fetches from the experimentation service (CopilotExpAssignmentResponse). When supplied this is fed into the FeatureFlagService exactly like CLI-fetched assignments and ExP-backed flags wait for it. When absent the session does not block on ExP.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) exp_assignments: Option<serde_json::Value>,
+    /// Feature-flag values resolved by the host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub feature_flags: Option<HashMap<String, bool>>,
+    /// Built-in subagent names to include in this session. When specified, only these built-ins are available, subject to runtime availability and exclusions. Custom agents with the same name remain available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub included_builtin_agents: Option<Vec<String>>,
+    /// Built-in skill names to include in this session. When specified, only these runtime-bundled skills are available. Skills from other sources with the same name remain available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub included_builtin_skills: Option<Vec<String>>,
+    /// Installed plugins visible to the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub installed_plugins: Option<Vec<InstalledPlugin>>,
+    /// Stable integration identifier for analytics.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub integration_id: Option<String>,
+    /// Whether experimental behavior is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_experimental_mode: Option<bool>,
+    /// Whether interactive shell sessions are logged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub log_interactive_shells: Option<bool>,
+    /// Identifier sent to LSP-style integrations.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub lsp_client_name: Option<String>,
+    /// Permissions-only enterprise policy injected by the SDK host at session create or resume. Composes restrictively with self-fetched and device policy and is not persisted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed_settings: Option<SessionManagedSettings>,
+    /// Maximum decoded byte size of a single inline model-facing binary tool result persisted in session events (default 10 MB).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_inline_binary_bytes: Option<i64>,
+    /// Memory configuration for this session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub memory: Option<MemoryConfiguration>,
+    /// Initial model identifier.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Initial model capability overrides.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_capabilities_overrides: Option<ModelCapabilitiesOverride>,
+    /// BYOK model definitions added to the selectable model list, each referencing a provider name.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub models: Option<Vec<ProviderModelConfig>>,
+    /// Optional human-friendly session name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Custom model-provider configuration (BYOK).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider: Option<ProviderConfig>,
+    /// Named BYOK provider connections, additive to CAPI auth. Combining with `provider` is rejected.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub providers: Option<Vec<NamedProviderConfig>>,
+    /// Initial reasoning effort level. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. When omitted, no effort override is applied.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<String>,
+    /// Initial reasoning summary mode for supported model clients.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_summary: Option<SessionOpenOptionsReasoningSummary>,
+    /// Telemetry-only remote-defaulted flag.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_defaulted_on: Option<bool>,
+    /// Telemetry-only remote exporting flag.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_exporting: Option<bool>,
+    /// Whether this session supports remote steering.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_steerable: Option<bool>,
+    /// Whether the host is an interactive UI.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub running_in_interactive_mode: Option<bool>,
+    /// Resolved sandbox configuration.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_config: Option<SandboxConfig>,
+    /// Origin of the sandbox choice. The runtime uses this only for internal telemetry provenance; managed policy is derived independently.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) sandbox_config_source: Option<SandboxConfigSource>,
+    /// Capabilities enabled for this session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_capabilities: Option<Vec<SessionCapability>>,
+    /// Optional stable session identifier to use for a new session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+    /// Initial session limits.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_limits: Option<SessionLimitsConfig>,
+    /// Per-session settings for built-in shell tools.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell: Option<ShellOptions>,
+    /// Use shell.initProfile instead. Shell init profile.
+    #[doc(hidden)]
+    #[deprecated]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell_init_profile: Option<String>,
+    /// PowerShell process flags applied to built-in and user-requested shell commands.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell_process_flags: Option<Vec<String>>,
+    /// Additional directories to search for skills.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skill_directories: Option<Vec<String>>,
+    /// Whether to skip custom instruction sources.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skip_custom_instructions: Option<bool>,
+    /// Optional trajectory output file path.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub trajectory_file: Option<String>,
+    /// Initial output verbosity level for supported models.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub verbosity: Option<Verbosity>,
+    /// Working directory to anchor the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub working_directory: Option<String>,
+    /// Pre-resolved working-directory context for session startup.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub working_directory_context: Option<SessionContext>,
+}
+
+/// Parameters for creating a new local session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsOpenCreate {
+    /// Whether to emit session.start during creation. Defaults to true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub emit_start: Option<bool>,
+    /// Create a new local session.
+    pub kind: SessionsOpenCreateKind,
+    /// Session construction options.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub options: Option<SessionOpenOptions>,
+}
+
+/// Parameters for resuming a specific local session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsOpenResume {
+    /// Resume a specific local session by ID or prefix.
+    pub kind: SessionsOpenResumeKind,
+    /// Session resume options.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub options: Option<SessionOpenOptions>,
+    /// Whether to emit session.resume after loading. Defaults to true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub resume: Option<bool>,
+    /// Session ID or unique prefix to resume.
+    pub session_id: SessionId,
+    /// Suppress workspace.yaml metadata writeback when resuming from an incidental cwd.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub suppress_resume_workspace_metadata_writeback: Option<bool>,
+}
+
+/// Parameters for resuming the most relevant local session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsOpenResumeLast {
+    /// Working-directory context used to choose the most relevant session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context: Option<SessionContext>,
+    /// Resume the most relevant existing local session.
+    pub kind: SessionsOpenResumeLastKind,
+    /// Session resume options.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub options: Option<SessionOpenOptions>,
+    /// Suppress workspace.yaml metadata writeback when resuming from an incidental cwd.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub suppress_resume_workspace_metadata_writeback: Option<bool>,
+}
+
+/// Parameters for attaching to an already-active session by ID.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsOpenAttach {
+    /// Attach to an already-active in-process session by ID. Unlike `resume`, this does NOT re-load from disk; the session must already be loaded by an earlier `create`/`resume` call. Returns `status: 'not_found'` when no active session matches the id. Useful for in-process consumers that need a fresh API handle to a session opened elsewhere (e.g., a peer foreground-session switch).
+    pub kind: SessionsOpenAttachKind,
+    /// Session ID to attach to.
+    pub session_id: SessionId,
+}
+
+/// Parameters for connecting to a live remote session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsOpenRemote {
+    /// Connect to a live remote session.
+    pub kind: SessionsOpenRemoteKind,
+    /// Session options for the connection.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub options: Option<SessionOpenOptions>,
+    /// Remote session identifier to connect to.
+    pub remote_session_id: SessionId,
+    /// Repository context for the remote session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<RemoteSessionRepository>,
+}
+
+/// Parameters for creating a new cloud session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsOpenCloud {
+    /// Create a new cloud (coding-agent) session.
+    pub kind: SessionsOpenCloudKind,
+    /// In-process callback invoked when the cloud task is created (before connection). Marked internal because a function reference cannot cross the JSON-RPC boundary. Disappears in the SDK migration: the field is purely cosmetic (it flips a single CLI phase label from 'creating' to 'connecting') and the wire-clean version just drops the intermediate phase.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) on_task_created: Option<serde_json::Value>,
+    /// Session options for cloud session creation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub options: Option<SessionOpenOptions>,
+    /// Optional owner (user or organization login) to associate with the cloud session when no repository is provided. Ignored when `repository` is set (the repo's owner takes precedence).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub owner: Option<String>,
+    /// Repository for the cloud session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<RemoteSessionRepository>,
+}
+
+/// Parameters for fetching a remote session and handing it off to a new local session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsOpenHandoff {
+    /// Fetch a remote session and hand it off to a new local session.
+    pub kind: SessionsOpenHandoffKind,
+    /// Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).
+    pub metadata: RemoteSessionMetadataValue,
+    /// In-process confirmation callback `(request) => boolean | Promise<boolean>` invoked when the handoff needs the caller to confirm a non-fatal blocker (e.g. a repository mismatch between the current working directory and the remote session). Returning `true` proceeds with the handoff; returning `false` (or omitting the callback) aborts it. Marked internal because a function reference cannot cross the JSON-RPC boundary, for the same reasons as `onProgress`.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) on_confirm: Option<serde_json::Value>,
+    /// In-process progress callback `(update) => void` invoked for each handoff step. Marked internal because a function reference cannot cross the JSON-RPC boundary. The host-side `handoffSession` is already declared as `AsyncGenerator<HandoffProgress, HandoffResult>`; the schema layer flattens it because it does not yet support streaming methods. The wire-clean replacement is to expose the AsyncGenerator directly (or use vscode-jsonrpc `$/progress` notifications) once the schema/transport layer supports it.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) on_progress: Option<serde_json::Value>,
+    /// Session construction options for the new local session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub options: Option<SessionOpenOptions>,
+    /// Task type determines the handoff strategy (CCA fetches events; CLI prepares a transient session).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task_type: Option<SessionsOpenHandoffTaskType>,
+}
+
+/// `sessions.open` handoff progress update with step, status, and optional message.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsOpenProgress {
+    /// Optional step message.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+    /// Step status.
+    pub status: SessionsOpenProgressStatus,
+    /// Handoff step.
+    pub step: SessionsOpenProgressStep,
+}
+
+/// Result of opening a session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionOpenResult {
+    /// Remote session metadata, present when status is `connected`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub metadata: Option<RemoteSessionMetadataValue>,
+    /// Handoff progress steps, present when status is `handed_off`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub progress: Option<Vec<SessionsOpenProgress>>,
+    /// Remote session ID, present when status is `connected`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_session_id: Option<SessionId>,
+    /// In-process SessionClientApi handle for the opened session, returned to CLI callers as a transitional shortcut. Marked internal so the public SDK surface does not expose it; SDK consumers should construct per-session clients from `sessionId` instead.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) session_api: Option<serde_json::Value>,
+    /// Opened session ID. Omitted when status is `not_found`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+    /// Startup prompts queued by user-level hook configs at session creation. Only populated when status is `created`; resumed sessions return an empty array.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub startup_prompts: Option<Vec<String>>,
+    /// Outcome of the open request.
+    pub status: SessionsOpenStatus,
+}
+
+/// Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionPruneResult {
+    /// Session IDs that would be deleted in dry-run mode (always empty otherwise)
+    pub candidates: Vec<String>,
+    /// Session IDs that were deleted (always empty in dry-run mode)
+    pub deleted: Vec<String>,
+    /// True when no deletions were actually performed
+    pub dry_run: bool,
+    /// Total bytes freed (actual when not dry-run, projected when dry-run)
+    pub freed_bytes: i64,
+    /// Session IDs that were skipped (e.g., named sessions)
+    pub skipped: Vec<String>,
+}
+
+/// Session IDs to close, deactivate, and delete from disk.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsBulkDeleteRequest {
+    /// Session IDs to close, deactivate, and delete from disk
+    pub session_ids: Vec<String>,
+}
+
+/// Session IDs to test for live in-use locks.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsCheckInUseRequest {
+    /// Session IDs to test for live in-use locks
+    pub session_ids: Vec<String>,
+}
+
+/// Session IDs from the input set that are currently in use by another process.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsCheckInUseResult {
+    /// Session IDs from the input set that are currently held by another running process via an alive lock file
+    pub in_use: Vec<String>,
+}
+
+/// Session ID to close.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsCloseRequest {
+    /// Session ID to close
+    pub session_id: SessionId,
+}
+
+/// Closes a session: emits shutdown, flushes pending events to disk, releases the in-use lock, disposes the active session. Idempotent: succeeds even if the session is not currently active.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsCloseResult {}
+
+/// Session ID to delete from disk.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsDeleteRequest {
+    /// Session ID to delete
+    pub session_id: SessionId,
+    /// Internal resolved session directory path to delete
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_path: Option<String>,
+}
+
+/// Session metadata records to enrich with summary and context information.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsEnrichMetadataRequest {
+    /// Session metadata records to enrich. Records that already have summary and context are returned unchanged.
+    pub sessions: Vec<LocalSessionMetadataValue>,
+}
+
+/// Token authentication accepted by session.gitHubAuth.setCredentials.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SettableTokenAuthInfo {
+    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_user: Option<CopilotUserResponse>,
+    /// Authentication host.
+    pub host: String,
+    /// The token value itself. Treat as a secret.
+    pub token: String,
+    /// SDK-side token authentication; the host configured the token directly via the SDK.
+    pub r#type: SettableTokenAuthInfoType,
+}
+
+/// New auth credentials to install on the session. Omit to leave credentials unchanged.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSetCredentialsParams {
+    /// The new auth credentials to install on the session. When omitted or `undefined`, the call is a no-op and the session's existing credentials are preserved. The runtime installs the supplied value immediately for outbound model/API requests. When the credential carries a raw token (`token`, `env`, or `gh-cli`) but no `copilotUser`, the runtime additionally re-resolves `copilotUser` server-side (best-effort, asynchronously, after the synchronous install) so plan/quota/billing metadata regains fidelity; on resolution failure the verbatim credential remains installed. It does NOT otherwise validate the credential. Several variants carry secret material; treat this method's params as containing secrets at rest and in transit.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub credentials: Option<SettableAuthInfo>,
+}
+
+/// Indicates whether the credential update succeeded.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSetCredentialsResult {
+    /// Whether the session ended up with a populated `copilotUser` for the installed credentials. `true` when the supplied credential already carried `copilotUser` or it was successfully re-resolved server-side. `false` when the credential is installed without `copilotUser` — either re-resolution failed, or the variant cannot be re-resolved from the credential alone (only the raw-token variants `token`, `env`, and `gh-cli` can). In both `false` cases the token swap still applied, but plan/quota/billing metadata is degraded. Present whenever a credential was supplied; omitted only when no credential was supplied (no-op call).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_user_resolved: Option<bool>,
+    /// Whether the operation succeeded
+    pub success: bool,
+}
+
+/// Availability of built-in job tools surfaced to boundary consumers.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSettingsBuiltInToolAvailabilitySnapshot {
+    /// Whether the create-pull-request tool is available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub create_pull_request: Option<bool>,
+    /// Whether the report-progress tool is available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub report_progress: Option<bool>,
+}
+
+/// Named Rust-owned settings predicate to evaluate for this session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSettingsEvaluatePredicateRequest {
+    /// Predicate name. The runtime owns the raw feature-flag names and composition logic.
+    pub name: SessionSettingsPredicateName,
+    /// Tool name for tool-scoped predicates such as trivial-change handling.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_name: Option<String>,
+}
+
+/// Result of evaluating a Rust-owned settings predicate.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSettingsEvaluatePredicateResult {
+    /// Whether the named settings predicate evaluated to enabled.
+    pub enabled: bool,
+}
+
+/// Redacted job settings for a session. The job nonce is excluded.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSettingsJobSnapshot {
+    /// Availability of job-specific built-in tools.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub built_in_tool_availability: Option<SessionSettingsBuiltInToolAvailabilitySnapshot>,
+    /// GitHub Actions event type for the job.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub event_type: Option<String>,
+    /// Whether this is the workflow's trigger job.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_trigger_job: Option<bool>,
+}
+
+/// Redacted model routing settings for a session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSettingsModelSnapshot {
+    /// Agent service callback URL for job and progress updates.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub callback_url: Option<String>,
+    /// Default reasoning effort for the selected model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub default_reasoning_effort: Option<String>,
+    /// Agent job identifier for the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub instance_id: Option<String>,
+    /// Selected model identifier.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+}
+
+/// Online-evaluation settings safe to expose across the SDK boundary.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSettingsOnlineEvaluationSnapshot {
+    /// Whether online evaluation is disabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_online_evaluation: Option<bool>,
+    /// Whether online-evaluation output-file generation is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_online_evaluation_output_file: Option<bool>,
+}
+
+/// Redacted repository and GitHub host settings for a session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSettingsRepoSnapshot {
+    /// Checked-out repository branch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// Checked-out commit SHA.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub commit: Option<String>,
+    /// GitHub server host name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub host: Option<String>,
+    /// Protocol used to access the GitHub host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub host_protocol: Option<String>,
+    /// GitHub repository database ID.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub id: Option<f64>,
+    /// Repository name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// GitHub repository owner database ID.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub owner_id: Option<f64>,
+    /// Repository owner login.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub owner_name: Option<String>,
+    /// Number of commits in the pull request.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub pr_commit_count: Option<f64>,
+    /// Whether the repository is writable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub read_write: Option<bool>,
+    /// GitHub secret-scanning service URL.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub secret_scanning_url: Option<String>,
+    /// GitHub server base URL.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_url: Option<String>,
+}
+
+/// Redacted validation and memory-tool settings for a session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSettingsValidationSnapshot {
+    /// Whether advisory validation is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub advisory_enabled: Option<bool>,
+    /// Whether CodeQL validation is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub codeql_enabled: Option<bool>,
+    /// Whether code-review validation is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub code_review_enabled: Option<bool>,
+    /// Model used for code-review validation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub code_review_model: Option<String>,
+    /// Dependabot validation timeout budget in seconds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub dependabot_timeout: Option<f64>,
+    /// Whether the memory-store tool is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub memory_store_enabled: Option<bool>,
+    /// Whether the memory-vote tool is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub memory_vote_enabled: Option<bool>,
+    /// Whether secret-scanning validation is enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub secret_scanning_enabled: Option<bool>,
+    /// General validation timeout budget in seconds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout: Option<f64>,
+}
+
+/// Redacted, serializable view of session runtime settings for SDK boundary consumers. Secrets and raw feature flags are intentionally excluded.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSettingsSnapshot {
+    /// Name of the SDK client that created the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Redacted job settings.
+    pub job: SessionSettingsJobSnapshot,
+    /// Redacted model routing settings.
+    pub model: SessionSettingsModelSnapshot,
+    /// Online-evaluation settings safe for SDK consumers.
+    pub online_evaluation: SessionSettingsOnlineEvaluationSnapshot,
+    /// Redacted repository and host settings.
+    pub repo: SessionSettingsRepoSnapshot,
+    /// Session start time as Unix epoch milliseconds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub start_time_ms: Option<f64>,
+    /// Session timeout in milliseconds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout_ms: Option<f64>,
+    /// Redacted validation and memory-tool settings.
+    pub validation: SessionSettingsValidationSnapshot,
+    /// Agent runtime version selector copied from the session settings, such as `latest` or a runtime release identifier.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub version: Option<String>,
+}
+
+/// UUID prefix to resolve to a unique session ID.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsFindByPrefixRequest {
+    /// UUID prefix (>=7 hex chars, <36 chars). Returns the unique session ID, or undefined when there is no match or the prefix matches multiple sessions.
+    pub prefix: String,
+}
+
+/// Session ID matching the prefix, omitted when no unique match exists.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsFindByPrefixResult {
+    /// Omitted when no unique session matches the prefix (no match or ambiguous)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+}
+
+/// GitHub task ID to look up.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsFindByTaskIDRequest {
+    /// GitHub task ID to look up
+    pub task_id: String,
+}
+
+/// ID of the local session bound to the given GitHub task, or omitted when none.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsFindByTaskIDResult {
+    /// Omitted when no local session is bound to that GitHub task
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+}
+
+/// Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsForkRequest {
+    /// Optional friendly name to assign to the forked session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Source session ID to fork from
+    pub session_id: SessionId,
+    /// Optional event ID boundary. When provided, the fork includes only events before this ID (exclusive). When omitted, all events are included.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub to_event_id: Option<String>,
+}
+
+/// Identifier and optional friendly name assigned to the newly forked session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsForkResult {
+    /// Friendly name assigned to the forked session, if any.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// The new forked session's ID
+    pub session_id: SessionId,
+}
+
+/// Session ID whose board entry count should be returned.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetBoardEntryCountRequest {
+    /// Session ID whose board entry count should be returned.
+    pub session_id: SessionId,
+}
+
+/// Dynamic-context board entry count, when available.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetBoardEntryCountResult {
+    /// Board entry count, when available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub count: Option<i64>,
+}
+
+/// Session ID whose event-log file path to compute.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetEventFilePathRequest {
+    /// Session ID whose event-log file path to compute
+    pub session_id: SessionId,
+}
+
+/// Absolute path to the session's events.jsonl file on disk.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetEventFilePathResult {
+    /// Absolute path to the session's events.jsonl file
+    pub file_path: String,
+}
+
+/// Optional working-directory context used to score session relevance.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetLastForContextRequest {
+    /// Optional working-directory context used to score session relevance. When omitted the most-recently-modified session wins.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context: Option<SessionContext>,
+}
+
+/// Most-relevant session ID for the supplied context, or omitted when no sessions exist.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetLastForContextResult {
+    /// Most-relevant session ID for the supplied context, or omitted when no sessions exist
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+}
+
+/// Session ID whose persisted metadata should be read.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetMetadataRequest {
+    /// Session ID to inspect
+    pub session_id: SessionId,
+}
+
+/// Persisted local session metadata when the session exists.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetMetadataResult {
+    /// Local session metadata, omitted when the session does not exist.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session: Option<LocalSessionMetadataValue>,
+}
+
+/// Session ID to look up the persisted remote-steerable flag for.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetPersistedRemoteSteerableRequest {
+    /// Session ID to look up the persisted remote-steerable flag for
+    pub session_id: SessionId,
+}
+
+/// The session's persisted remote-steerable flag, or omitted when no value has been persisted.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsGetPersistedRemoteSteerableResult {
+    /// The session's persisted remote-steerable flag if recorded; omitted when no value has been persisted
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_steerable: Option<bool>,
+}
+
+/// Map of sessionId -> on-disk size in bytes for each session's workspace directory.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionSizes {
+    /// Map of sessionId -> on-disk size in bytes for the session's workspace directory
+    pub sizes: HashMap<String, i64>,
+}
+
+/// Limit for non-empty local session IDs.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsListNonEmptySessionIdsRequest {
+    /// Maximum number of session IDs to return.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub limit: Option<i64>,
+}
+
+/// Recent local session IDs that contain user-visible history.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsListNonEmptySessionIdsResult {
+    /// Session IDs ordered newest-first.
+    pub session_ids: Vec<String>,
+}
+
+/// Optional source filter, metadata-load limit, and context filter applied to the returned sessions.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsListRequest {
+    /// Optional filter applied to the returned sessions
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub filter: Option<SessionListFilter>,
+    /// When true, include detached maintenance sessions. Defaults to false for user-facing session lists.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_detached: Option<bool>,
+    /// When provided, only the first N local sessions (sorted by modification time, newest first) load full metadata; remaining sessions return basic info only. Use 0 to return only basic info for every local session. Has no effect on remote entries (which always carry their full shape).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub metadata_limit: Option<i64>,
+    /// Which session sources to include. Defaults to `local` for backward compatibility.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<SessionSource>,
+    /// Only meaningful when `source` includes remote. When true, propagates errors from the remote service instead of silently returning an empty remote list. Defaults to false.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub throw_on_error: Option<bool>,
+}
+
+/// Active session ID whose deferred repo-level hooks should be loaded.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsLoadDeferredRepoHooksRequest {
+    /// Active session ID whose deferred repo-level hooks should be loaded
+    pub session_id: SessionId,
+}
+
+/// Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsPruneOldRequest {
+    /// When true, only report what would be deleted without performing any deletion
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub dry_run: Option<bool>,
+    /// Session IDs that should never be considered for pruning
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exclude_session_ids: Option<Vec<String>>,
+    /// When true, named sessions (set via /rename) are also eligible for pruning
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_named: Option<bool>,
+    /// Delete sessions whose modifiedTime is at least this many days old
+    pub older_than_days: i64,
+}
+
+/// Session ID whose in-use lock should be released.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsReleaseLockRequest {
+    /// Session ID whose in-use lock should be released
+    pub session_id: SessionId,
+}
+
+/// Release the in-use lock held by this process for the given session. No-op when this process does not currently hold a lock for the session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsReleaseLockResult {}
+
+/// Active session ID and an optional flag for deferring repo-level hooks until folder trust.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsReloadPluginHooksRequest {
+    /// When true, skip repo-level hooks. Use before folder trust is confirmed; loadDeferredRepoHooks loads them post-trust.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub defer_repo_hooks: Option<bool>,
+    /// Active session ID to reload hooks for
+    pub session_id: SessionId,
+}
+
+/// Reload all hooks (user, plugin, optionally repo) and apply them to the active session. Call after installing or removing plugins so their hooks take effect immediately. No-op when no active session matches the given sessionId.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsReloadPluginHooksResult {}
+
+/// Session ID whose pending events should be flushed to disk.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsSaveRequest {
+    /// Session ID whose pending events should be flushed to disk
+    pub session_id: SessionId,
+}
+
+/// Flush a session's pending events to disk. No-op when no writer exists for the session (e.g., already closed).
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsSaveResult {}
+
+/// Manager-wide additional plugins to register; replaces any previously-configured set.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsSetAdditionalPluginsRequest {
+    /// Manager-wide additional plugins to register. Replaces any previously-configured set. Pass an empty array to clear.
+    pub plugins: Vec<InstalledPlugin>,
+}
+
+/// Replace the manager-wide additional plugins. New session creations and subsequent hook reloads see the new set; already-running sessions keep their existing hook installation until the next reload.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsSetAdditionalPluginsResult {}
+
+/// Patch for the singleton's steering state.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsSetRemoteControlSteeringRequest {
+    /// Target steering state. Today only `true` is actionable on the underlying exporter; `false` is reserved for future use.
+    pub enabled: bool,
+}
+
+/// Parameters for attaching the remote-control singleton to a session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsStartRemoteControlRequest {
+    /// Configuration for the runtime-managed remote-control singleton.
+    pub config: RemoteControlConfig,
+    /// Local session id to attach remote control to.
+    pub session_id: SessionId,
+}
+
+/// Parameters for stopping the remote-control singleton.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsStopRemoteControlRequest {
+    /// When provided, the stop is rejected unless the singleton currently points at this session id (compare-and-swap semantics).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expected_session_id: Option<String>,
+    /// When true, the singleton is unconditionally torn down regardless of `expectedSessionId`. Use during shutdown or explicit `/remote off`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub force: Option<bool>,
+}
+
+/// Parameters for atomically rebinding the remote-control singleton.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionsTransferRemoteControlRequest {
+    /// When provided, the transfer is rejected unless the singleton currently points at this session id (compare-and-swap semantics to avoid clobbering newer state).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expected_from_session_id: Option<String>,
+    /// Local session id to point remote control at.
+    pub to_session_id: String,
+}
+
+/// Telemetry engagement ID for the session, when available.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionTelemetryEngagement {
+    /// Current telemetry engagement ID, when available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub engagement_id: Option<String>,
+}
+
+/// Patch of mutable session options to apply to the running session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionUpdateOptionsParams {
+    /// Additional content-exclusion policies to merge into the session's policy set.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub additional_content_exclusion_policies:
+        Option<Vec<OptionsUpdateAdditionalContentExclusionPolicy>>,
+    /// Runtime context discriminator (e.g., `cli`, `actions`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_context: Option<String>,
+    /// Whether to include instructions from every MCP server in the system prompt instead of only allowlisted servers.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub allow_all_mcp_server_instructions: Option<bool>,
+    /// Whether to disable the `ask_user` tool (encourages autonomous behavior).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ask_user_disabled: Option<bool>,
+    /// Allowlist of tool names available to this session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub available_tools: Option<Vec<String>>,
+    /// Options scoped to the built-in CAPI (Copilot API) provider.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub capi: Option<CapiSessionOptions>,
+    /// Identifier of the client driving the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Whether to include the `Co-authored-by` trailer in commit messages.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub coauthor_enabled: Option<bool>,
+    /// Context tier for models with tiered pricing. The session uses this to derive effective `modelCapabilitiesOverrides` so compaction, truncation, token display, and request limits honor the selected tier.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier: Option<OptionsUpdateContextTier>,
+    /// Whether to allow auto-mode continuation across turns.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub continue_on_auto_mode: Option<bool>,
+    /// Override URL for the Copilot API endpoint.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_url: Option<String>,
+    /// Whether to default custom agents to local-only execution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub custom_agents_local_only: Option<bool>,
+    /// Instruction source IDs to exclude from the system prompt.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_instruction_sources: Option<Vec<String>>,
+    /// Skill IDs that should be excluded from this session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_skills: Option<Vec<String>>,
+    /// Whether to enable loading of `.github/hooks/` filesystem hooks. Separate from the SDK callback hook mechanism.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_file_hooks: Option<bool>,
+    /// Whether to enable host git operations (context resolution, child repo scanning, git info in system prompt).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_host_git_operations: Option<bool>,
+    /// Whether to discover custom instructions on demand after successful file views (AGENTS.md / CLAUDE.md / .github/copilot-instructions.md surfacing). Combined with `skipCustomInstructions`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_on_demand_instruction_discovery: Option<bool>,
+    /// Whether to surface reasoning-summary events from the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_reasoning_summaries: Option<bool>,
+    /// Whether shell-script safety heuristics are enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_script_safety: Option<bool>,
+    /// Whether to enable cross-session store writes and reads.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_session_store: Option<bool>,
+    /// Whether to enable skill directory scanning and loading. Falls back to enableConfigDiscovery when unset.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_skills: Option<bool>,
+    /// Whether to stream model responses.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_streaming: Option<bool>,
+    /// How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub env_value_mode: Option<OptionsUpdateEnvValueMode>,
+    /// Override directory for the session-events log. When unset, the runtime's default events log directory is used.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub events_log_directory: Option<String>,
+    /// Whether subagent callback events should be forwarded into the session event log sink.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub events_log_includes_subagents: Option<bool>,
+    /// Built-in subagent names to exclude from this session. Excluded built-ins are hidden from agent discovery and cannot be dispatched unless a custom agent with the same name is available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub excluded_builtin_agents: Option<Vec<String>>,
+    /// Denylist of tool names for this session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub excluded_tools: Option<Vec<String>>,
+    /// Map of feature-flag IDs to their boolean enabled state.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub feature_flags: Option<HashMap<String, bool>>,
+    /// Built-in subagent names to include in this session. When specified, only these built-ins are available, subject to runtime availability and exclusions. Custom agents with the same name remain available. Set to null to remove the allowlist restriction.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub included_builtin_agents: Option<Vec<String>>,
+    /// Built-in skill names to include in this session. When specified, only these runtime-bundled skills are available. Skills from other sources with the same name remain available. Set to null to remove the allowlist restriction.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub included_builtin_skills: Option<Vec<String>>,
+    /// Full set of installed plugins for the session. Replaces the existing list; the runtime invalidates the skills cache only when the list materially changes.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub installed_plugins: Option<Vec<SessionInstalledPlugin>>,
+    /// Stable integration identifier used for analytics and rate-limit attribution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub integration_id: Option<String>,
+    /// Whether experimental capabilities are enabled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_experimental_mode: Option<bool>,
+    /// Whether interactive shell sessions are logged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub log_interactive_shells: Option<bool>,
+    /// Identifier sent to LSP-style integrations.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub lsp_client_name: Option<String>,
+    /// Whether to expose the `manage_schedule` tool to the agent. The runtime always owns the per-session schedule registry; this flag only controls tool exposure (typically gated to staff users).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub manage_schedule_enabled: Option<bool>,
+    /// Maximum decoded byte size of a single model-facing binary tool result (e.g. an image) persisted inline in session events and re-presented to the model on later turns / resume. Larger results are persisted as a metadata-only marker and shown to the model as a short text note. Defaults to 10 MB.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_inline_binary_bytes: Option<i64>,
+    /// The model ID to use for assistant turns.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Per-property model capability overrides for the selected model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_capabilities_overrides: Option<ModelCapabilitiesOverride>,
+    /// Organization-level custom instructions to inject into the system prompt.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub organization_custom_instructions: Option<String>,
+    /// Custom model-provider configuration (BYOK).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider: Option<ProviderConfig>,
+    /// Reasoning effort for the selected model. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. When omitted, no effort override is applied.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<String>,
+    /// Reasoning summary mode for supported model clients.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_summary: Option<OptionsUpdateReasoningSummary>,
+    /// Whether the session is running in an interactive UI.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub running_in_interactive_mode: Option<bool>,
+    /// Resolved sandbox configuration.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_config: Option<SandboxConfig>,
+    /// Origin of the sandbox choice. The runtime uses this only for internal telemetry provenance; managed policy is derived independently.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) sandbox_config_source: Option<SandboxConfigSource>,
+    /// Replaces the session's capability set with the given list. Use to enable or disable capabilities mid-session (e.g., remove `memory` for reproducible scripted runs). Omit the field to leave the existing capability set unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_capabilities: Option<Vec<SessionCapability>>,
+    /// Optional session limits. Pass null to clear the session limits.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_limits: Option<SessionLimitsConfig>,
+    /// Per-session settings for built-in shell tools.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell: Option<ShellOptions>,
+    /// Use shell.initProfile instead. Shell init profile (`None` or `NonInteractive`).
+    #[doc(hidden)]
+    #[deprecated]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell_init_profile: Option<String>,
+    /// PowerShell process flags applied to built-in and user-requested shell commands.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell_process_flags: Option<Vec<String>>,
+    /// Additional directories to search for skills.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skill_directories: Option<Vec<String>>,
+    /// Whether to skip loading custom instruction sources.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skip_custom_instructions: Option<bool>,
+    /// Whether to skip embedding retrieval pipeline initialization and execution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skip_embedding_retrieval: Option<bool>,
+    /// When true, the selected custom agent's prompt is not injected into the user message (skill context is still injected). Used by automation triggers where the agent prompt is already in the problem statement.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub suppress_custom_agent_prompt: Option<bool>,
+    /// Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_filter_precedence: Option<OptionsUpdateToolFilterPrecedence>,
+    /// Optional path for trajectory output.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub trajectory_file: Option<String>,
+    /// Output verbosity level for supported models.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub verbosity: Option<Verbosity>,
+    /// Absolute working-directory path for shell tools.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub working_directory: Option<String>,
+}
+
+/// Indicates whether the session options patch was applied successfully.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionUpdateOptionsResult {
+    /// Number of hooks loaded from installed plugins, returned when installedPlugins is updated
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plugin_hook_count: Option<i64>,
+    /// Whether the operation succeeded
+    pub success: bool,
+}
+
+/// User-requested shell execution cancellation handle.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellCancelUserRequestedRequest {
+    /// Request ID previously passed to executeUserRequested
+    pub request_id: RequestId,
+}
+
+/// Shell command to run, with optional working directory and timeout in milliseconds.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellExecRequest {
+    /// Shell command to execute
+    pub command: String,
+    /// Working directory (defaults to session working directory)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Timeout in milliseconds (default: 30000)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout: Option<i64>,
+}
+
+/// Identifier of the spawned process, used to correlate streamed output and exit notifications.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellExecResult {
+    /// Unique identifier for tracking streamed output
+    pub process_id: String,
+}
+
+/// User-requested shell command and cancellation handle.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellExecuteUserRequestedRequest {
+    /// Shell command to execute
+    pub command: String,
+    /// Caller-provided cancellation handle for this execution
+    pub request_id: RequestId,
+}
+
+/// Identifier of a process previously returned by "shell.exec" and the signal to send.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellKillRequest {
+    /// Process identifier returned by shell.exec
+    pub process_id: String,
+    /// Signal to send (default: SIGTERM)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote_defaulted_on: Option<bool>,
-    /// Telemetry-only remote exporting flag.
+    pub signal: Option<ShellKillSignal>,
+}
+
+/// Indicates whether the signal was delivered; false if the process was unknown or already exited.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellKillResult {
+    /// Whether the signal was sent successfully
+    pub killed: bool,
+}
+
+/// Parameters for shutting down the session
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShutdownRequest {
+    /// Optional human-readable reason. Typically the message of the error that triggered shutdown when type is 'error'.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote_exporting: Option<bool>,
-    /// Whether this session supports remote steering.
+    pub reason: Option<String>,
+    /// Why the session is being shut down. Defaults to "routine" when omitted.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote_steerable: Option<bool>,
-    /// Whether the host is an interactive UI.
+    pub r#type: Option<ShutdownType>,
+}
+
+/// Skill metadata available to a session, with name, description, source, enabled/invocable state, path, plugin, and argument hint.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Skill {
+    /// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub running_in_interactive_mode: Option<bool>,
-    /// Resolved sandbox configuration.
+    pub argument_hint: Option<String>,
+    /// Canonical slash command name used to invoke the skill, without the leading '/'
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub sandbox_config: Option<SandboxConfig>,
-    /// Capabilities enabled for this session.
+    pub command_name: Option<String>,
+    /// Description of what the skill does
+    pub description: String,
+    /// Whether the skill is currently enabled
+    pub enabled: bool,
+    /// Unique identifier for the skill
+    pub name: String,
+    /// Absolute path to the skill file
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_capabilities: Option<Vec<SessionCapability>>,
-    /// Optional stable session identifier to use for a new session.
+    pub path: Option<String>,
+    /// Name of the plugin that provides the skill, when source is 'plugin'
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
-    /// Initial session limits.
+    pub plugin_name: Option<String>,
+    /// Source location type (e.g., project, personal-copilot, plugin, builtin)
+    pub source: SkillSource,
+    /// Whether the skill can be invoked by the user as a slash command
+    pub user_invocable: bool,
+}
+
+/// Canonical directory where skills can be discovered or created, with scope, preference, and optional project path.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillDiscoveryPath {
+    /// Absolute path of the create/discovery target (may not exist on disk yet)
+    pub path: String,
+    /// Whether this is the canonical directory to create a new skill in its tier. At most one entry per tier is preferred; the `personal-agents` and `custom` scopes are never preferred.
+    pub preferred_for_creation: bool,
+    /// The input project path this directory was derived from (only for project scope)
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_limits: Option<SessionLimitsConfig>,
-    /// Per-session settings for built-in shell tools.
+    pub project_path: Option<String>,
+    /// Which tier this directory belongs to
+    pub scope: SkillDiscoveryScope,
+}
+
+/// Canonical locations where skills can be created so the runtime will recognize them.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillDiscoveryPathList {
+    /// Canonical skill create/discovery directories, in priority order
+    pub paths: Vec<SkillDiscoveryPath>,
+}
+
+/// Skills available to the session, with their enabled state.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillList {
+    /// Available skills
+    pub skills: Vec<Skill>,
+}
+
+/// Skill names to mark as disabled in global configuration, replacing any previous list.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsConfigSetDisabledSkillsRequest {
+    /// List of skill names to disable
+    pub disabled_skills: Vec<String>,
+}
+
+/// Adds or removes a single skill from the global disabled list, leaving every other entry untouched.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsConfigSetSkillDisabledRequest {
+    /// True to disable the skill, false to enable it
+    pub disabled: bool,
+    /// Name of the skill to add to or remove from the disabled list
+    pub name: String,
+}
+
+/// Name of the skill to disable for the session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsDisableRequest {
+    /// Name of the skill to disable
+    pub name: String,
+}
+
+/// Optional project paths and additional skill directories to include in discovery.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsDiscoverRequest {
+    /// When true, omit skills from the host's global sources (personal, custom, plugin, and built-in), returning only project-scoped skills. For multitenant deployments.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exclude_host_skills: Option<bool>,
+    /// Optional list of project directory paths to scan for project-scoped skills
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub project_paths: Option<Vec<String>>,
+    /// Optional list of additional skill directory paths to include
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skill_directories: Option<Vec<String>>,
+}
+
+/// Name of the skill to enable for the session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsEnableRequest {
+    /// Name of the skill to enable
+    pub name: String,
+}
+
+/// Optional project paths to enumerate.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsGetDiscoveryPathsRequest {
+    /// When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub shell: Option<ShellOptions>,
-    /// Use shell.initProfile instead. Shell init profile.
-    #[doc(hidden)]
-    #[deprecated]
+    pub exclude_host_skills: Option<bool>,
+    /// Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub shell_init_profile: Option<String>,
-    /// PowerShell process flags applied to built-in and user-requested shell commands.
+    pub project_paths: Option<Vec<String>>,
+}
+
+/// Skill invocation record with name, path, content, allowed tools, and turn number.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsInvokedSkill {
+    /// Tools that should be auto-approved when this skill is active, captured at invocation time
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub shell_process_flags: Option<Vec<String>>,
-    /// Additional directories to search for skills.
+    pub allowed_tools: Option<Vec<String>>,
+    /// Full content of the skill file
+    pub content: String,
+    /// Turn number when the skill was invoked
+    pub invoked_at_turn: i64,
+    /// Unique identifier for the skill
+    pub name: String,
+    /// Path to the SKILL.md file
+    pub path: String,
+}
+
+/// Skills invoked during this session, ordered by invocation time (most recent last).
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsGetInvokedResult {
+    /// Skills invoked during this session, ordered by invocation time (most recent last)
+    pub skills: Vec<SkillsInvokedSkill>,
+}
+
+/// Diagnostics from reloading skill definitions, with warnings and errors as separate lists.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsLoadDiagnostics {
+    /// Errors emitted while loading skills (e.g. skills that failed to load entirely)
+    pub errors: Vec<String>,
+    /// Warnings emitted while loading skills (e.g. skills that loaded but had issues)
+    pub warnings: Vec<String>,
+}
+
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SlashCommandTimelineEntry {
+    /// Text displayed for the timeline entry.
+    pub text: String,
+    /// Timeline entry presentation type.
+    pub r#type: String,
+    /// Optional URL associated with the timeline entry.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub skill_directories: Option<Vec<String>>,
-    /// Whether to skip custom instruction sources.
+    pub url: Option<String>,
+}
+
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SlashCommandAddTimelineEntryResult {
+    /// Timeline entry the host should append.
+    pub entry: SlashCommandTimelineEntry,
+    /// Discriminator for an add-timeline-entry result.
+    pub kind: SlashCommandAddTimelineEntryResultKind,
+    /// Optional text the host should prefill into the input editor.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub skip_custom_instructions: Option<bool>,
-    /// Optional trajectory output file path.
+    pub prefill_input: Option<String>,
+    /// Whether command execution changed persisted runtime settings.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub trajectory_file: Option<String>,
-    /// Initial output verbosity level for supported models.
+    pub runtime_settings_changed: Option<bool>,
+}
+
+/// Slash-command invocation result that submits an agent prompt, with display prompt, optional mode, optional user-facing notice, and settings-change flag.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SlashCommandAgentPromptResult {
+    /// Prompt text to display to the user
+    pub display_prompt: String,
+    /// Agent prompt result discriminator
+    pub kind: SlashCommandAgentPromptResultKind,
+    /// Optional target session mode for the agent prompt
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub verbosity: Option<Verbosity>,
-    /// Working directory to anchor the session.
+    pub mode: Option<SessionMode>,
+    /// Optional user-facing notice to show before the prompt is submitted
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub working_directory: Option<String>,
-    /// Pre-resolved working-directory context for session startup.
+    pub notice: Option<String>,
+    /// Prompt to submit to the agent
+    pub prompt: String,
+    /// True when the invocation mutated user runtime settings; consumers caching settings should refresh
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub working_directory_context: Option<SessionContext>,
+    pub runtime_settings_changed: Option<bool>,
 }
 
-/// Parameters for creating a new local session.
+/// Slash-command invocation result indicating completion, with optional message and settings-change flag.
 ///
 /// <div class="warning">
 ///
@@ -14264,18 +18705,18 @@ pub struct SessionOpenOptions {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsOpenCreate {
-    /// Whether to emit session.start during creation. Defaults to true.
+pub struct SlashCommandCompletedResult {
+    /// Completed result discriminator
+    pub kind: SlashCommandCompletedResultKind,
+    /// Optional user-facing message describing the completed command
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub emit_start: Option<bool>,
-    /// Create a new local session.
-    pub kind: SessionsOpenCreateKind,
-    /// Session construction options.
+    pub message: Option<String>,
+    /// True when the invocation mutated user runtime settings; consumers caching settings should refresh
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<SessionOpenOptions>,
+    pub runtime_settings_changed: Option<bool>,
 }
 
-/// Parameters for resuming a specific local session.
+/// Slash-command invocation result containing text output plus Markdown/ANSI rendering flags.
 ///
 /// <div class="warning">
 ///
@@ -14285,23 +18726,23 @@ pub struct SessionsOpenCreate {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsOpenResume {
-    /// Resume a specific local session by ID or prefix.
-    pub kind: SessionsOpenResumeKind,
-    /// Session resume options.
+pub struct SlashCommandTextResult {
+    /// Text result discriminator
+    pub kind: SlashCommandTextResultKind,
+    /// Whether text contains Markdown
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<SessionOpenOptions>,
-    /// Whether to emit session.resume after loading. Defaults to true.
+    pub markdown: Option<bool>,
+    /// Whether ANSI sequences should be preserved
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub resume: Option<bool>,
-    /// Session ID or unique prefix to resume.
-    pub session_id: SessionId,
-    /// Suppress workspace.yaml metadata writeback when resuming from an incidental cwd.
+    pub preserve_ansi: Option<bool>,
+    /// True when the invocation mutated user runtime settings; consumers caching settings should refresh
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub suppress_resume_workspace_metadata_writeback: Option<bool>,
+    pub runtime_settings_changed: Option<bool>,
+    /// Text output for the client to render
+    pub text: String,
 }
 
-/// Parameters for resuming the most relevant local session.
+/// Selectable slash-command subcommand option with name, description, and optional group label.
 ///
 /// <div class="warning">
 ///
@@ -14311,21 +18752,17 @@ pub struct SessionsOpenResume {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsOpenResumeLast {
-    /// Working-directory context used to choose the most relevant session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context: Option<SessionContext>,
-    /// Resume the most relevant existing local session.
-    pub kind: SessionsOpenResumeLastKind,
-    /// Session resume options.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<SessionOpenOptions>,
-    /// Suppress workspace.yaml metadata writeback when resuming from an incidental cwd.
+pub struct SlashCommandSelectSubcommandOption {
+    /// Human-readable description of the subcommand
+    pub description: String,
+    /// Optional group label for organizing options
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub suppress_resume_workspace_metadata_writeback: Option<bool>,
+    pub group: Option<String>,
+    /// Subcommand name to invoke
+    pub name: String,
 }
 
-/// Parameters for attaching to an already-active session by ID.
+/// Slash-command invocation result asking the client to present subcommand options for a parent command.
 ///
 /// <div class="warning">
 ///
@@ -14335,14 +18772,20 @@ pub struct SessionsOpenResumeLast {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsOpenAttach {
-    /// Attach to an already-active in-process session by ID. Unlike `resume`, this does NOT re-load from disk; the session must already be loaded by an earlier `create`/`resume` call. Returns `status: 'not_found'` when no active session matches the id. Useful for in-process consumers that need a fresh API handle to a session opened elsewhere (e.g., a peer foreground-session switch).
-    pub kind: SessionsOpenAttachKind,
-    /// Session ID to attach to.
-    pub session_id: SessionId,
+pub struct SlashCommandSelectSubcommandResult {
+    /// Parent command name that requires subcommand selection
+    pub command: String,
+    /// Select subcommand result discriminator
+    pub kind: SlashCommandSelectSubcommandResultKind,
+    /// Available subcommand options for the client to present
+    pub options: Vec<SlashCommandSelectSubcommandOption>,
+    /// True when the invocation mutated user runtime settings; consumers caching settings should refresh
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub runtime_settings_changed: Option<bool>,
+    /// Human-readable title for the selection UI
+    pub title: String,
 }
 
-/// Parameters for connecting to a live remote session.
 ///
 /// <div class="warning">
 ///
@@ -14352,20 +18795,20 @@ pub struct SessionsOpenAttach {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsOpenRemote {
-    /// Connect to a live remote session.
-    pub kind: SessionsOpenRemoteKind,
-    /// Session options for the connection.
+pub struct SlashCommandModelPickerDialog {
+    /// Discriminator for a model-picker dialog.
+    pub kind: SlashCommandModelPickerDialogKind,
+    /// Model that should be enabled before it can be selected.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<SessionOpenOptions>,
-    /// Remote session identifier to connect to.
-    pub remote_session_id: SessionId,
-    /// Repository context for the remote session.
+    pub model_to_enable: Option<String>,
+    /// Settings scope the picker should modify.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<RemoteSessionRepository>,
+    pub scope: Option<String>,
+    /// Model-selection target represented by the picker.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub target: Option<String>,
 }
 
-/// Parameters for creating a new cloud session.
 ///
 /// <div class="warning">
 ///
@@ -14375,25 +18818,73 @@ pub struct SessionsOpenRemote {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsOpenCloud {
-    /// Create a new cloud (coding-agent) session.
-    pub kind: SessionsOpenCloudKind,
-    /// In-process callback invoked when the cloud task is created (before connection). Marked internal because a function reference cannot cross the JSON-RPC boundary. Disappears in the SDK migration: the field is purely cosmetic (it flips a single CLI phase label from 'creating' to 'connecting') and the wire-clean version just drops the intermediate phase.
-    #[doc(hidden)]
+pub struct SlashCommandShowDialogResult {
+    /// Dialog the host should display.
+    pub dialog: SlashCommandModelPickerDialog,
+    /// Discriminator for a show-dialog result.
+    pub kind: SlashCommandShowDialogResultKind,
+    /// Whether command execution changed persisted runtime settings.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) on_task_created: Option<serde_json::Value>,
-    /// Session options for cloud session creation.
+    pub runtime_settings_changed: Option<bool>,
+}
+
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SlashCommandSetModelResult {
+    /// Discriminator for a set-model result.
+    pub kind: SlashCommandSetModelResultKind,
+    /// Model selected by the command.
+    pub model: String,
+    /// Reasoning effort selected for the model.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<SessionOpenOptions>,
-    /// Optional owner (user or organization login) to associate with the cloud session when no repository is provided. Ignored when `repository` is set (the repo's owner takes precedence).
+    pub reasoning_effort: Option<String>,
+    /// Repository settings scope modified by the command.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_scope: Option<String>,
+    /// User-settings snapshot to restore if the host cancels the model switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub revert_on_cancel: Option<serde_json::Value>,
+    /// Whether command execution changed persisted runtime settings.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub runtime_settings_changed: Option<bool>,
+    /// Settings scope modified by the command.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub scope: Option<String>,
+    /// User-facing warning produced while selecting the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
+}
+
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SlashCommandSetPlanModelResult {
+    /// Discriminator for a set-plan-model result.
+    pub kind: SlashCommandSetPlanModelResultKind,
+    /// User-facing confirmation message for the plan-model selection.
+    pub message: String,
+    /// Dedicated model selected for plan mode.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub owner: Option<String>,
-    /// Repository for the cloud session.
+    pub plan_model: Option<String>,
+    /// Whether command execution changed persisted runtime settings.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<RemoteSessionRepository>,
+    pub runtime_settings_changed: Option<bool>,
 }
 
-/// Parameters for fetching a remote session and handing it off to a new local session.
+/// Subagent model, reasoning effort, and context tier settings
 ///
 /// <div class="warning">
 ///
@@ -14403,28 +18894,19 @@ pub struct SessionsOpenCloud {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsOpenHandoff {
-    /// Fetch a remote session and hand it off to a new local session.
-    pub kind: SessionsOpenHandoffKind,
-    /// Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).
-    pub metadata: RemoteSessionMetadataValue,
-    /// In-process confirmation callback `(request) => boolean | Promise<boolean>` invoked when the handoff needs the caller to confirm a non-fatal blocker (e.g. a repository mismatch between the current working directory and the remote session). Returning `true` proceeds with the handoff; returning `false` (or omitting the callback) aborts it. Marked internal because a function reference cannot cross the JSON-RPC boundary, for the same reasons as `onProgress`.
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) on_confirm: Option<serde_json::Value>,
-    /// In-process progress callback `(update) => void` invoked for each handoff step. Marked internal because a function reference cannot cross the JSON-RPC boundary. The host-side `handoffSession` is already declared as `AsyncGenerator<HandoffProgress, HandoffResult>`; the schema layer flattens it because it does not yet support streaming methods. The wire-clean replacement is to expose the AsyncGenerator directly (or use vscode-jsonrpc `$/progress` notifications) once the schema/transport layer supports it.
-    #[doc(hidden)]
+pub struct SubagentSettingsEntry {
+    /// Context tier override for matching subagents
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) on_progress: Option<serde_json::Value>,
-    /// Session construction options for the new local session.
+    pub context_tier: Option<SubagentSettingsEntryContextTier>,
+    /// Reasoning effort override for matching subagents
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<SessionOpenOptions>,
-    /// Task type determines the handoff strategy (CCA fetches events; CLI prepares a transient session).
+    pub effort_level: Option<String>,
+    /// Model override for matching subagents
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub task_type: Option<SessionsOpenHandoffTaskType>,
+    pub model: Option<String>,
 }
 
-/// `sessions.open` handoff progress update with step, status, and optional message.
+/// Subagent settings to apply, or null to clear the live session override
 ///
 /// <div class="warning">
 ///
@@ -14434,17 +18916,22 @@ pub struct SessionsOpenHandoff {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsOpenProgress {
-    /// Optional step message.
+pub struct SubagentSettings {
+    /// Per-agent settings keyed by subagent agent_type
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub message: Option<String>,
-    /// Step status.
-    pub status: SessionsOpenProgressStatus,
-    /// Handoff step.
-    pub step: SessionsOpenProgressStep,
+    pub agents: Option<HashMap<String, SubagentSettingsEntry>>,
+    /// Names of subagents the user has turned off; they cannot be dispatched
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_subagents: Option<Vec<String>>,
+    /// Maximum number of subagents that can run concurrently; applies to usage-based billing users only
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_concurrency: Option<i32>,
+    /// Maximum subagent nesting depth; applies to usage-based billing users only
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_depth: Option<i32>,
 }
 
-/// Result of opening a session.
+/// Tracked background agent task metadata, including IDs, status, timing, agent type, prompt, model, result, and latest response.
 ///
 /// <div class="warning">
 ///
@@ -14454,31 +18941,62 @@ pub struct SessionsOpenProgress {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionOpenResult {
-    /// Remote session metadata, present when status is `connected`.
+pub struct TaskAgentInfo {
+    /// ISO 8601 timestamp when the current active period began
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub metadata: Option<RemoteSessionMetadataValue>,
-    /// Handoff progress steps, present when status is `handed_off`.
+    pub active_started_at: Option<String>,
+    /// Accumulated active execution time in milliseconds
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub progress: Option<Vec<SessionsOpenProgress>>,
-    /// Remote session ID, present when status is `connected`.
+    pub active_time_ms: Option<i64>,
+    /// Type of agent running this task
+    pub agent_type: String,
+    /// Whether the task is currently in the original sync wait and can be moved to background mode. False once it is already backgrounded, idle, finished, or no longer has a promotable sync waiter.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote_session_id: Option<SessionId>,
-    /// In-process SessionClientApi handle for the opened session, returned to CLI callers as a transitional shortcut. Marked internal so the public SDK surface does not expose it; SDK consumers should construct per-session clients from `sessionId` instead.
-    #[doc(hidden)]
+    pub can_promote_to_background: Option<bool>,
+    /// ISO 8601 timestamp when the task finished
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) session_api: Option<serde_json::Value>,
-    /// Opened session ID. Omitted when status is `not_found`.
+    pub completed_at: Option<String>,
+    /// Short description of the task
+    pub description: String,
+    /// Friendly, non-unique name intended for display
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
-    /// Startup prompts queued by user-level hook configs at session creation. Only populated when status is `created`; resumed sessions return an empty array.
+    pub display_name: Option<String>,
+    /// Error message when the task failed
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub startup_prompts: Option<Vec<String>>,
-    /// Outcome of the open request.
-    pub status: SessionsOpenStatus,
+    pub error: Option<String>,
+    /// Whether task execution is synchronously awaited or managed in the background
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub execution_mode: Option<TaskExecutionMode>,
+    /// Unique task identifier
+    pub id: String,
+    /// ISO 8601 timestamp when the agent entered idle state
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub idle_since: Option<String>,
+    /// Most recent response text from the agent
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub latest_response: Option<String>,
+    /// Requested model override for the task when specified
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Most recent prompt delivered to the agent. Updated whenever the agent receives a follow-up message.
+    pub prompt: String,
+    /// Runtime model resolved for the task when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub resolved_model: Option<String>,
+    /// Result text from the task when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<String>,
+    /// ISO 8601 timestamp when the task was started
+    pub started_at: String,
+    /// Current lifecycle status of the task
+    pub status: TaskStatus,
+    /// Tool call ID associated with this agent task
+    pub tool_call_id: String,
+    /// Task kind
+    pub r#type: TaskAgentInfoType,
 }
 
-/// Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.
+/// Timestamped display line for task progress output or recent agent activity.
 ///
 /// <div class="warning">
 ///
@@ -14488,20 +19006,14 @@ pub struct SessionOpenResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPruneResult {
-    /// Session IDs that would be deleted in dry-run mode (always empty otherwise)
-    pub candidates: Vec<String>,
-    /// Session IDs that were deleted (always empty in dry-run mode)
-    pub deleted: Vec<String>,
-    /// True when no deletions were actually performed
-    pub dry_run: bool,
-    /// Total bytes freed (actual when not dry-run, projected when dry-run)
-    pub freed_bytes: i64,
-    /// Session IDs that were skipped (e.g., named sessions)
-    pub skipped: Vec<String>,
+pub struct TaskProgressLine {
+    /// Display message, e.g., "▸ bash", "✓ edit src/foo.ts"
+    pub message: String,
+    /// ISO 8601 timestamp when this event occurred
+    pub timestamp: String,
 }
 
-/// Session IDs to close, deactivate, and delete from disk.
+/// Progress snapshot for an agent task, with recent activity lines and optional latest intent.
 ///
 /// <div class="warning">
 ///
@@ -14511,12 +19023,17 @@ pub struct SessionPruneResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsBulkDeleteRequest {
-    /// Session IDs to close, deactivate, and delete from disk
-    pub session_ids: Vec<String>,
+pub struct TaskAgentProgress {
+    /// The most recent intent reported by the agent
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub latest_intent: Option<String>,
+    /// Recent tool execution events converted to display lines
+    pub recent_activity: Vec<TaskProgressLine>,
+    /// Progress kind
+    pub r#type: TaskAgentProgressType,
 }
 
-/// Session IDs to test for live in-use locks.
+/// Task completion notification with summary from the agent
 ///
 /// <div class="warning">
 ///
@@ -14526,12 +19043,24 @@ pub struct SessionsBulkDeleteRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsCheckInUseRequest {
-    /// Session IDs to test for live in-use locks
-    pub session_ids: Vec<String>,
+pub struct TaskCompleteData {
+    /// Active autopilot objective ID evaluated by the completion reviewer
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub objective_id: Option<i64>,
+    /// Semantic completion decision. Absent on legacy events and invalid tool calls
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub outcome: Option<TaskCompletionOutcome>,
+    /// Label-safe runtime rationale for the completion decision (e.g. a cancellation or pause/resume downgrade), when one applies. Reviewer-authored rationale is intentionally omitted here because this event has no IFC label channel; the reviewer's findings remain available through its own labeled sub-agent events
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Whether the task was accepted as complete. False when validation failed or completion was rejected or blocked by the reviewer
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub success: Option<bool>,
+    /// Summary of the completed task, provided by the agent
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary: Option<String>,
 }
 
-/// Session IDs from the input set that are currently in use by another process.
 ///
 /// <div class="warning">
 ///
@@ -14541,12 +19070,30 @@ pub struct SessionsCheckInUseRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsCheckInUseResult {
-    /// Session IDs from the input set that are currently held by another running process via an alive lock file
-    pub in_use: Vec<String>,
+pub struct TaskCompletionDecision {
+    /// Objective eligibility token captured when the decision was evaluated.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub completion_eligibility_token: Option<i64>,
+    /// Whether completion was accepted after the reviewer-rejection budget was exhausted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub completion_rejection_budget_exhausted: Option<bool>,
+    /// Active autopilot objective evaluated by the completion reviewer.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub objective_id: Option<i64>,
+    /// Semantic result of evaluating the task completion request.
+    pub outcome: TaskCompletionOutcome,
+    /// Rationale for the completion decision, when one is available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Whether the rationale was derived from completion-reviewer output.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reviewer_derived: Option<bool>,
+    /// Information-flow metadata captured from the completion reviewer.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reviewer_result_meta: Option<serde_json::Value>,
 }
 
-/// Session ID to close.
+/// Background tasks currently tracked by the session.
 ///
 /// <div class="warning">
 ///
@@ -14556,12 +19103,12 @@ pub struct SessionsCheckInUseResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsCloseRequest {
-    /// Session ID to close
-    pub session_id: SessionId,
+pub struct TaskList {
+    /// Currently tracked tasks
+    pub tasks: Vec<serde_json::Value>,
 }
 
-/// Closes a session: emits shutdown, flushes pending events to disk, releases the in-use lock, disposes the active session. Idempotent: succeeds even if the session is not currently active.
+/// Identifier of the background task to cancel.
 ///
 /// <div class="warning">
 ///
@@ -14571,9 +19118,12 @@ pub struct SessionsCloseRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsCloseResult {}
+pub struct TasksCancelRequest {
+    /// Task identifier
+    pub id: String,
+}
 
-/// Session ID to delete from disk.
+/// Indicates whether the background task was successfully cancelled.
 ///
 /// <div class="warning">
 ///
@@ -14583,15 +19133,12 @@ pub struct SessionsCloseResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsDeleteRequest {
-    /// Session ID to delete
-    pub session_id: SessionId,
-    /// Internal resolved session directory path to delete
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_path: Option<String>,
+pub struct TasksCancelResult {
+    /// Whether the task was successfully cancelled
+    pub cancelled: bool,
 }
 
-/// Session metadata records to enrich with summary and context information.
+/// The first sync-waiting task that can currently be promoted to background mode.
 ///
 /// <div class="warning">
 ///
@@ -14601,12 +19148,13 @@ pub struct SessionsDeleteRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsEnrichMetadataRequest {
-    /// Session metadata records to enrich. Records that already have summary and context are returned unchanged.
-    pub sessions: Vec<LocalSessionMetadataValue>,
+pub struct TasksGetCurrentPromotableResult {
+    /// The first sync-waiting task (agent first, then shell) that can currently be promoted to background mode. Omitted if no such task exists. The returned task is guaranteed to have executionMode='sync' and canPromoteToBackground=true at the time of the call.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task: Option<serde_json::Value>,
 }
 
-/// New auth credentials to install on the session. Omit to leave credentials unchanged.
+/// Identifier of the background task to fetch progress for.
 ///
 /// <div class="warning">
 ///
@@ -14616,13 +19164,12 @@ pub struct SessionsEnrichMetadataRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSetCredentialsParams {
-    /// The new auth credentials to install on the session. When omitted or `undefined`, the call is a no-op and the session's existing credentials are preserved. The runtime installs the supplied value immediately for outbound model/API requests. When the credential carries a raw token (`token`, `env`, or `gh-cli`) but no `copilotUser`, the runtime additionally re-resolves `copilotUser` server-side (best-effort, asynchronously, after the synchronous install) so plan/quota/billing metadata regains fidelity; on resolution failure the verbatim credential remains installed. It does NOT otherwise validate the credential. Several variants carry secret material; treat this method's params as containing secrets at rest and in transit.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub credentials: Option<serde_json::Value>,
+pub struct TasksGetProgressRequest {
+    /// Task identifier (agent ID or shell ID)
+    pub id: String,
 }
 
-/// Indicates whether the credential update succeeded.
+/// Progress information for the task, or null when no task with that ID is tracked.
 ///
 /// <div class="warning">
 ///
@@ -14632,15 +19179,12 @@ pub struct SessionSetCredentialsParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSetCredentialsResult {
-    /// Whether the session ended up with a populated `copilotUser` for the installed credentials. `true` when the supplied credential already carried `copilotUser` or it was successfully re-resolved server-side. `false` when the credential is installed without `copilotUser` — either re-resolution failed, or the variant cannot be re-resolved from the credential alone (only the raw-token variants `token`, `env`, and `gh-cli` can). In both `false` cases the token swap still applied, but plan/quota/billing metadata is degraded. Present whenever a credential was supplied; omitted only when no credential was supplied (no-op call).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_user_resolved: Option<bool>,
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct TasksGetProgressResult {
+    /// Progress information for the task, discriminated by type. Returns null when no task with this ID is currently tracked.
+    pub progress: Option<serde_json::Value>,
 }
 
-/// Availability of built-in job tools surfaced to boundary consumers.
+/// Tracked shell task metadata, including ID, command, status, timing, attachment/execution mode, log path, and PID.
 ///
 /// <div class="warning">
 ///
@@ -14650,14 +19194,39 @@ pub struct SessionSetCredentialsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsBuiltInToolAvailabilitySnapshot {
+pub struct TaskShellInfo {
+    /// Whether the shell runs inside a managed PTY session or as an independent background process
+    pub attachment_mode: TaskShellInfoAttachmentMode,
+    /// Whether this shell task can be promoted to background mode
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub create_pull_request: Option<bool>,
+    pub can_promote_to_background: Option<bool>,
+    /// Command being executed
+    pub command: String,
+    /// ISO 8601 timestamp when the task finished
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub report_progress: Option<bool>,
+    pub completed_at: Option<String>,
+    /// Short description of the task
+    pub description: String,
+    /// Whether task execution is synchronously awaited or managed in the background
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub execution_mode: Option<TaskExecutionMode>,
+    /// Unique task identifier
+    pub id: String,
+    /// Path to the detached shell log, when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub log_path: Option<String>,
+    /// Process ID when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub pid: Option<i64>,
+    /// ISO 8601 timestamp when the task was started
+    pub started_at: String,
+    /// Current lifecycle status of the task
+    pub status: TaskStatus,
+    /// Task kind
+    pub r#type: TaskShellInfoType,
 }
 
-/// Named Rust-owned settings predicate to evaluate for this session.
+/// Progress snapshot for a shell task, with recent stdout/stderr output and optional process ID.
 ///
 /// <div class="warning">
 ///
@@ -14667,15 +19236,17 @@ pub struct SessionSettingsBuiltInToolAvailabilitySnapshot {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsEvaluatePredicateRequest {
-    /// Predicate name. The runtime owns the raw feature-flag names and composition logic.
-    pub name: SessionSettingsPredicateName,
-    /// Tool name for tool-scoped predicates such as trivial-change handling.
+pub struct TaskShellProgress {
+    /// Process ID when available
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_name: Option<String>,
+    pub pid: Option<i64>,
+    /// Recent stdout/stderr lines from the running shell command
+    pub recent_output: String,
+    /// Progress kind
+    pub r#type: TaskShellProgressType,
 }
 
-/// Result of evaluating a Rust-owned settings predicate.
+/// The promoted task as it now exists in background mode, omitted if no promotable task was waiting.
 ///
 /// <div class="warning">
 ///
@@ -14685,11 +19256,13 @@ pub struct SessionSettingsEvaluatePredicateRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsEvaluatePredicateResult {
-    pub enabled: bool,
+pub struct TasksPromoteCurrentToBackgroundResult {
+    /// The promoted task as it now exists in background mode, omitted if no promotable task was waiting. Atomic operation: avoids the race window of getCurrentPromotable + promoteToBackground.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task: Option<serde_json::Value>,
 }
 
-/// Redacted job settings for a session. The job nonce is excluded.
+/// Identifier of the task to promote to background mode.
 ///
 /// <div class="warning">
 ///
@@ -14699,16 +19272,12 @@ pub struct SessionSettingsEvaluatePredicateResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsJobSnapshot {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub built_in_tool_availability: Option<SessionSettingsBuiltInToolAvailabilitySnapshot>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub event_type: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_trigger_job: Option<bool>,
+pub struct TasksPromoteToBackgroundRequest {
+    /// Task identifier
+    pub id: String,
 }
 
-/// Redacted model routing settings for a session.
+/// Indicates whether the task was successfully promoted to background mode.
 ///
 /// <div class="warning">
 ///
@@ -14718,18 +19287,12 @@ pub struct SessionSettingsJobSnapshot {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsModelSnapshot {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub callback_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default_reasoning_effort: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub instance_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
+pub struct TasksPromoteToBackgroundResult {
+    /// Whether the task was successfully promoted to background mode
+    pub promoted: bool,
 }
 
-/// Online-evaluation settings safe to expose across the SDK boundary.
+/// Refresh metadata for any detached background shells the runtime knows about. Use after a long pause to pick up exit/output state for shells running outside the agent loop.
 ///
 /// <div class="warning">
 ///
@@ -14739,14 +19302,9 @@ pub struct SessionSettingsModelSnapshot {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsOnlineEvaluationSnapshot {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub disable_online_evaluation: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_online_evaluation_output_file: Option<bool>,
-}
+pub struct TasksRefreshResult {}
 
-/// Redacted repository and GitHub host settings for a session.
+/// Identifier of the completed or cancelled task to remove from tracking.
 ///
 /// <div class="warning">
 ///
@@ -14756,34 +19314,12 @@ pub struct SessionSettingsOnlineEvaluationSnapshot {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsRepoSnapshot {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub commit: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub host: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub host_protocol: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub id: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub owner_id: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub owner_name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub pr_commit_count: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub read_write: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub secret_scanning_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub server_url: Option<String>,
+pub struct TasksRemoveRequest {
+    /// Task identifier
+    pub id: String,
 }
 
-/// Redacted validation and memory-tool settings for a session.
+/// Indicates whether the task was removed. False when the task does not exist or is still running/idle.
 ///
 /// <div class="warning">
 ///
@@ -14793,28 +19329,12 @@ pub struct SessionSettingsRepoSnapshot {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsValidationSnapshot {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub advisory_enabled: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub codeql_enabled: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub code_review_enabled: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub code_review_model: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub dependabot_timeout: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub memory_store_enabled: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub memory_vote_enabled: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub secret_scanning_enabled: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout: Option<f64>,
+pub struct TasksRemoveResult {
+    /// Whether the task was removed. Returns false if the task does not exist or is still running/idle (cancel it first).
+    pub removed: bool,
 }
 
-/// Redacted, serializable view of session runtime settings for SDK boundary consumers. Secrets and raw feature flags are intentionally excluded.
+/// Identifier of the target agent task, message content, and optional sender agent ID.
 ///
 /// <div class="warning">
 ///
@@ -14824,23 +19344,17 @@ pub struct SessionSettingsValidationSnapshot {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsSnapshot {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    pub job: SessionSettingsJobSnapshot,
-    pub model: SessionSettingsModelSnapshot,
-    pub online_evaluation: SessionSettingsOnlineEvaluationSnapshot,
-    pub repo: SessionSettingsRepoSnapshot,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub start_time_ms: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout_ms: Option<f64>,
-    pub validation: SessionSettingsValidationSnapshot,
+pub struct TasksSendMessageRequest {
+    /// Agent ID of the sender, if sent on behalf of another agent
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub version: Option<String>,
+    pub from_agent_id: Option<String>,
+    /// Agent task identifier
+    pub id: String,
+    /// Message content to send to the agent
+    pub message: String,
 }
 
-/// UUID prefix to resolve to a unique session ID.
+/// Indicates whether the message was delivered, with an error message when delivery failed.
 ///
 /// <div class="warning">
 ///
@@ -14850,12 +19364,15 @@ pub struct SessionSettingsSnapshot {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsFindByPrefixRequest {
-    /// UUID prefix (>=7 hex chars, <36 chars). Returns the unique session ID, or undefined when there is no match or the prefix matches multiple sessions.
-    pub prefix: String,
+pub struct TasksSendMessageResult {
+    /// Error message if delivery failed
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Whether the message was successfully delivered or steered
+    pub sent: bool,
 }
 
-/// Session ID matching the prefix, omitted when no unique match exists.
+/// Agent type, prompt, name, and optional description and model override for the new task.
 ///
 /// <div class="warning">
 ///
@@ -14865,13 +19382,22 @@ pub struct SessionsFindByPrefixRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsFindByPrefixResult {
-    /// Omitted when no unique session matches the prefix (no match or ambiguous)
+pub struct TasksStartAgentRequest {
+    /// Type of agent to start (e.g., 'explore', 'task', 'general-purpose')
+    pub agent_type: String,
+    /// Short description of the task
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
+    pub description: Option<String>,
+    /// Optional model override
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Friendly, non-unique name used when displaying the agent
+    pub name: String,
+    /// Task prompt for the agent
+    pub prompt: String,
 }
 
-/// GitHub task ID to look up.
+/// Identifier assigned to the newly started background agent task.
 ///
 /// <div class="warning">
 ///
@@ -14881,12 +19407,12 @@ pub struct SessionsFindByPrefixResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsFindByTaskIDRequest {
-    /// GitHub task ID to look up
-    pub task_id: String,
+pub struct TasksStartAgentResult {
+    /// Generated agent ID for the background task
+    pub agent_id: String,
 }
 
-/// ID of the local session bound to the given GitHub task, or omitted when none.
+/// Wait until all in-flight background tasks (agents + shells) and any follow-up turns scheduled by their completions have settled. Returns when the runtime is fully drained or after an internal timeout (default 10 minutes; configurable via COPILOT_TASK_WAIT_TIMEOUT_SECONDS).
 ///
 /// <div class="warning">
 ///
@@ -14896,13 +19422,9 @@ pub struct SessionsFindByTaskIDRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsFindByTaskIDResult {
-    /// Omitted when no local session is bound to that GitHub task
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
-}
+pub struct TasksWaitForPendingResult {}
 
-/// Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.
+/// Feature override key/value pairs to attach to subsequent telemetry events from this session.
 ///
 /// <div class="warning">
 ///
@@ -14912,18 +19434,12 @@ pub struct SessionsFindByTaskIDResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsForkRequest {
-    /// Optional friendly name to assign to the forked session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Source session ID to fork from
-    pub session_id: SessionId,
-    /// Optional event ID boundary. When provided, the fork includes only events before this ID (exclusive). When omitted, all events are included.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub to_event_id: Option<String>,
+pub struct TelemetrySetFeatureOverridesRequest {
+    /// Override key/value pairs to attach to subsequent telemetry events from this session. Replaces any previously-set overrides.
+    pub features: HashMap<String, String>,
 }
 
-/// Identifier and optional friendly name assigned to the newly forked session.
+/// Built-in tool metadata with identifier, optional namespaced name, description, input-parameter schema, and usage instructions.
 ///
 /// <div class="warning">
 ///
@@ -14933,15 +19449,23 @@ pub struct SessionsForkRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsForkResult {
-    /// Friendly name assigned to the forked session, if any.
+pub struct Tool {
+    /// Description of what the tool does
+    pub description: String,
+    /// Optional instructions for how to use this tool effectively
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// The new forked session's ID
-    pub session_id: SessionId,
+    pub instructions: Option<String>,
+    /// Tool identifier (e.g., "bash", "grep", "str_replace_editor")
+    pub name: String,
+    /// Optional namespaced name for declarative filtering (e.g., "playwright/navigate" for MCP tools)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub namespaced_name: Option<String>,
+    /// JSON Schema for the tool's input parameters
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parameters: Option<HashMap<String, serde_json::Value>>,
 }
 
-/// Session ID whose board entry count should be returned.
+/// Built-in tools available for the requested model, with their parameters and instructions.
 ///
 /// <div class="warning">
 ///
@@ -14951,12 +19475,12 @@ pub struct SessionsForkResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetBoardEntryCountRequest {
-    /// Session ID whose board entry count should be returned.
-    pub session_id: SessionId,
+pub struct ToolList {
+    /// List of available built-in tools with metadata
+    pub tools: Vec<Tool>,
 }
 
-/// Dynamic-context board entry count, when available.
+/// A message injected by a tool result.
 ///
 /// <div class="warning">
 ///
@@ -14966,13 +19490,14 @@ pub struct SessionsGetBoardEntryCountRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetBoardEntryCountResult {
-    /// Board entry count, when available.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub count: Option<i64>,
+pub struct ToolResultNewMessage {
+    /// Message content to inject after the tool result.
+    pub content: String,
+    /// Source attributed to the injected message.
+    pub source: String,
 }
 
-/// Session ID whose event-log file path to compute.
+/// Expanded canonical result returned by a session tool.
 ///
 /// <div class="warning">
 ///
@@ -14982,12 +19507,59 @@ pub struct SessionsGetBoardEntryCountResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetEventFilePathRequest {
-    /// Session ID whose event-log file path to compute
-    pub session_id: SessionId,
+pub struct ToolResultExpanded {
+    /// Base64-encoded binary results returned to the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub binary_results_for_llm: Option<Vec<ExternalToolTextResultForLlmBinaryResultsForLlm>>,
+    /// Sources returned by the tool that the model may cite.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub citable_sources: Option<Vec<serde_json::Value>>,
+    /// Structured content blocks returned to the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub contents: Option<Vec<serde_json::Value>>,
+    /// Error message for an unsuccessful execution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Metadata propagated with the tool result, including information-flow labels.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mcp_meta: Option<HashMap<String, serde_json::Value>>,
+    /// Messages to inject after the tool result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub new_messages: Option<Vec<ToolResultNewMessage>>,
+    /// Whether post-tool-use failure hooks have already processed this result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub post_tool_use_failure_hooks_processed: Option<bool>,
+    /// Execution outcome classification.
+    pub result_type: ToolResultType,
+    /// Detailed log content available for session display.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_log: Option<String>,
+    /// Skill invocation metadata produced by the tool.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skill_invocation: Option<serde_json::Value>,
+    /// Whether large-output post-processing should be skipped.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skip_large_output_processing: Option<bool>,
+    /// Structured result content in addition to the model-facing text.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub structured_content: Option<serde_json::Value>,
+    /// Completion-review decision produced by the task-completion tool.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task_completion_decision: Option<TaskCompletionDecision>,
+    /// Text result returned to the model.
+    pub text_result_for_llm: String,
+    /// Deferred tool names made available by this result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_references: Option<Vec<String>>,
+    /// Tool-specific telemetry payload.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_telemetry: Option<serde_json::Value>,
+    /// Optional UI resource produced by the tool.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ui_resource: Option<serde_json::Value>,
 }
 
-/// Absolute path to the session's events.jsonl file on disk.
+/// A tool name and arguments to execute through the session's native invocation pipeline.
 ///
 /// <div class="warning">
 ///
@@ -14997,12 +19569,17 @@ pub struct SessionsGetEventFilePathRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetEventFilePathResult {
-    /// Absolute path to the session's events.jsonl file
-    pub file_path: String,
+pub struct ToolsExecuteRequest {
+    /// Arguments supplied to the tool.
+    pub arguments: serde_json::Value,
+    /// Name of the currently offered tool to execute.
+    pub name: String,
+    /// Optional identifier used to correlate this invocation with its tool call.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_call_id: Option<String>,
 }
 
-/// Optional working-directory context used to score session relevance.
+/// Shell-specific names and description lines used to materialize built-in shell tool descriptors.
 ///
 /// <div class="warning">
 ///
@@ -15012,13 +19589,24 @@ pub struct SessionsGetEventFilePathResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetLastForContextRequest {
-    /// Optional working-directory context used to score session relevance. When omitted the most-recently-modified session wins.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context: Option<SessionContext>,
+pub struct ToolsShellDescriptorConfig {
+    /// Additional model-facing shell description lines.
+    pub description_lines: Vec<String>,
+    /// Human-readable shell name.
+    pub display_name: String,
+    /// Tool name used to list active shells.
+    pub list_shells_tool_name: String,
+    /// Tool name used to read shell output.
+    pub read_shell_tool_name: String,
+    /// Tool name used to start shell commands.
+    pub shell_tool_name: String,
+    /// Stable shell type identifier.
+    pub shell_type: String,
+    /// Tool name used to stop shell commands.
+    pub stop_shell_tool_name: String,
 }
 
-/// Most-relevant session ID for the supplied context, or omitted when no sessions exist.
+/// Options controlling how Rust-owned built-in tool descriptors are materialized.
 ///
 /// <div class="warning">
 ///
@@ -15028,13 +19616,37 @@ pub struct SessionsGetLastForContextRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetLastForContextResult {
-    /// Most-relevant session ID for the supplied context, or omitted when no sessions exist
+pub struct ToolsGetBuiltinDescriptorsRequest {
+    /// Whether background task completion notifications are enabled.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
+    pub background_task_notifications_enabled: Option<bool>,
+    /// Whether tool descriptors should include authoring metadata.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub include_author: Option<bool>,
+    /// Whether line numbers should be omitted from the view tool descriptor.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub no_view_line_numbers: Option<bool>,
+    /// Whether descriptors should favor fewer user-intervention prompts.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reduce_user_intervention: Option<bool>,
+    /// Whether shell commands may only run asynchronously.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell_async_only_enabled: Option<bool>,
+    /// Shell-specific names and description lines for shell tools.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell_config: Option<ToolsShellDescriptorConfig>,
+    /// Whether the configured shell supports PowerShell 7 syntax.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell_supports_power_shell7_syntax: Option<bool>,
+    /// Default shell timeout in milliseconds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shell_timeout_ms: Option<f64>,
+    /// Whether semantic skill lookup is available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skill_embedding_enabled: Option<bool>,
 }
 
-/// Session ID whose persisted metadata should be read.
+/// Rust-owned built-in tool descriptors for the session.
 ///
 /// <div class="warning">
 ///
@@ -15044,12 +19656,12 @@ pub struct SessionsGetLastForContextResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetMetadataRequest {
-    /// Session ID to inspect
-    pub session_id: SessionId,
+pub struct ToolsGetBuiltinDescriptorsResult {
+    /// Built-in tool descriptors materialized for the session.
+    pub tools: Vec<BuiltinToolDescriptor>,
 }
 
-/// Persisted local session metadata when the session exists.
+/// Current lightweight tool metadata snapshot for the session.
 ///
 /// <div class="warning">
 ///
@@ -15059,13 +19671,12 @@ pub struct SessionsGetMetadataRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetMetadataResult {
-    /// Local session metadata, omitted when the session does not exist.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session: Option<LocalSessionMetadataValue>,
+pub struct ToolsGetCurrentMetadataResult {
+    /// Current tool metadata, or null when tools have not been initialized yet
+    pub tools: Option<Vec<CurrentToolMetadata>>,
 }
 
-/// Session ID to look up the persisted remote-steerable flag for.
+/// Resolve, build, and validate the runtime tool list for this session. Subagent sessions and consumer flows that need an initialized tool set before `send` invoke this. Default base-class implementation is a no-op for sessions that don't support tool validation.
 ///
 /// <div class="warning">
 ///
@@ -15075,12 +19686,9 @@ pub struct SessionsGetMetadataResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetPersistedRemoteSteerableRequest {
-    /// Session ID to look up the persisted remote-steerable flag for
-    pub session_id: SessionId,
-}
+pub struct ToolsInitializeAndValidateResult {}
 
-/// The session's persisted remote-steerable flag, or omitted when no value has been persisted.
+/// Optional model identifier whose tool overrides should be applied to the listing.
 ///
 /// <div class="warning">
 ///
@@ -15090,13 +19698,13 @@ pub struct SessionsGetPersistedRemoteSteerableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetPersistedRemoteSteerableResult {
-    /// The session's persisted remote-steerable flag if recorded; omitted when no value has been persisted
+pub struct ToolsListRequest {
+    /// Optional model ID — when provided, the returned tool list reflects model-specific overrides
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote_steerable: Option<bool>,
+    pub model: Option<String>,
 }
 
-/// Map of sessionId -> on-disk size in bytes for each session's workspace directory.
+/// Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.
 ///
 /// <div class="warning">
 ///
@@ -15106,12 +19714,12 @@ pub struct SessionsGetPersistedRemoteSteerableResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSizes {
-    /// Map of sessionId -> on-disk size in bytes for the session's workspace directory
-    pub sizes: HashMap<String, i64>,
+pub struct ToolsSetRequest {
+    /// Complete replacement list for the calling connection.
+    pub tools: Vec<ProtocolExternalToolDefinition>,
 }
 
-/// Limit for non-empty local session IDs.
+/// Empty result after replacing the calling connection's externally implemented tools.
 ///
 /// <div class="warning">
 ///
@@ -15121,13 +19729,9 @@ pub struct SessionSizes {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsListNonEmptySessionIdsRequest {
-    /// Maximum number of session IDs to return.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub limit: Option<i64>,
-}
+pub struct ToolsSetResult {}
 
-/// Recent local session IDs that contain user-visible history.
+/// Task-completion tool arguments and final result used to build a label-safe session event payload.
 ///
 /// <div class="warning">
 ///
@@ -15137,12 +19741,14 @@ pub struct SessionsListNonEmptySessionIdsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsListNonEmptySessionIdsResult {
-    /// Session IDs ordered newest-first.
-    pub session_ids: Vec<String>,
+pub struct ToolsTaskCompleteEventDataRequest {
+    /// Final expanded result returned by the task_complete tool.
+    pub final_result: ToolResultExpanded,
+    /// Arguments supplied to the completed task_complete tool call.
+    pub tool_args: serde_json::Value,
 }
 
-/// Optional source filter, metadata-load limit, and context filter applied to the returned sessions.
+/// Empty result after applying subagent settings
 ///
 /// <div class="warning">
 ///
@@ -15152,25 +19758,9 @@ pub struct SessionsListNonEmptySessionIdsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsListRequest {
-    /// Optional filter applied to the returned sessions
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub filter: Option<SessionListFilter>,
-    /// When true, include detached maintenance sessions. Defaults to false for user-facing session lists.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_detached: Option<bool>,
-    /// When provided, only the first N local sessions (sorted by modification time, newest first) load full metadata; remaining sessions return basic info only. Use 0 to return only basic info for every local session. Has no effect on remote entries (which always carry their full shape).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub metadata_limit: Option<i64>,
-    /// Which session sources to include. Defaults to `local` for backward compatibility.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source: Option<SessionSource>,
-    /// Only meaningful when `source` includes remote. When true, propagates errors from the remote service instead of silently returning an empty remote list. Defaults to false.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub throw_on_error: Option<bool>,
-}
+pub struct ToolsUpdateSubagentSettingsResult {}
 
-/// Active session ID whose deferred repo-level hooks should be loaded.
+/// Selectable option for a UI elicitation multi-select array item, with submitted value and display label.
 ///
 /// <div class="warning">
 ///
@@ -15180,12 +19770,14 @@ pub struct SessionsListRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsLoadDeferredRepoHooksRequest {
-    /// Active session ID whose deferred repo-level hooks should be loaded
-    pub session_id: SessionId,
+pub struct UIElicitationArrayAnyOfFieldItemsAnyOf {
+    /// Value submitted when this option is selected.
+    pub r#const: String,
+    /// Display label for this option.
+    pub title: String,
 }
 
-/// Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).
+/// Schema applied to each item in the array.
 ///
 /// <div class="warning">
 ///
@@ -15195,21 +19787,12 @@ pub struct SessionsLoadDeferredRepoHooksRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsPruneOldRequest {
-    /// When true, only report what would be deleted without performing any deletion
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub dry_run: Option<bool>,
-    /// Session IDs that should never be considered for pruning
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exclude_session_ids: Option<Vec<String>>,
-    /// When true, named sessions (set via /rename) are also eligible for pruning
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_named: Option<bool>,
-    /// Delete sessions whose modifiedTime is at least this many days old
-    pub older_than_days: i64,
+pub struct UIElicitationArrayAnyOfFieldItems {
+    /// Selectable options, each with a value and a display label.
+    pub any_of: Vec<UIElicitationArrayAnyOfFieldItemsAnyOf>,
 }
 
-/// Session ID whose in-use lock should be released.
+/// Multi-select string field where each option pairs a value with a display label.
 ///
 /// <div class="warning">
 ///
@@ -15219,12 +19802,29 @@ pub struct SessionsPruneOldRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsReleaseLockRequest {
-    /// Session ID whose in-use lock should be released
-    pub session_id: SessionId,
+pub struct UIElicitationArrayAnyOfField {
+    /// Default values selected when the form is first shown.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub default: Option<Vec<String>>,
+    /// Help text describing the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Schema applied to each item in the array.
+    pub items: UIElicitationArrayAnyOfFieldItems,
+    /// Maximum number of items the user may select.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_items: Option<i64>,
+    /// Minimum number of items the user must select.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub min_items: Option<i64>,
+    /// Human-readable label for the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    /// Type discriminator. Always "array".
+    pub r#type: UIElicitationArrayAnyOfFieldType,
 }
 
-/// Release the in-use lock held by this process for the given session. No-op when this process does not currently hold a lock for the session.
+/// Schema applied to each item in the array.
 ///
 /// <div class="warning">
 ///
@@ -15234,9 +19834,14 @@ pub struct SessionsReleaseLockRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsReleaseLockResult {}
+pub struct UIElicitationArrayEnumFieldItems {
+    /// Allowed string values for each selected item.
+    pub r#enum: Vec<String>,
+    /// Type discriminator. Always "string".
+    pub r#type: UIElicitationArrayEnumFieldItemsType,
+}
 
-/// Active session ID and an optional flag for deferring repo-level hooks until folder trust.
+/// Multi-select string field whose allowed values are defined inline.
 ///
 /// <div class="warning">
 ///
@@ -15246,27 +19851,29 @@ pub struct SessionsReleaseLockResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsReloadPluginHooksRequest {
-    /// When true, skip repo-level hooks. Use before folder trust is confirmed; loadDeferredRepoHooks loads them post-trust.
+pub struct UIElicitationArrayEnumField {
+    /// Default values selected when the form is first shown.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub defer_repo_hooks: Option<bool>,
-    /// Active session ID to reload hooks for
-    pub session_id: SessionId,
+    pub default: Option<Vec<String>>,
+    /// Help text describing the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Schema applied to each item in the array.
+    pub items: UIElicitationArrayEnumFieldItems,
+    /// Maximum number of items the user may select.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_items: Option<i64>,
+    /// Minimum number of items the user must select.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub min_items: Option<i64>,
+    /// Human-readable label for the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    /// Type discriminator. Always "array".
+    pub r#type: UIElicitationArrayEnumFieldType,
 }
 
-/// Reload all hooks (user, plugin, optionally repo) and apply them to the active session. Call after installing or removing plugins so their hooks take effect immediately. No-op when no active session matches the given sessionId.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionsReloadPluginHooksResult {}
-
-/// Session ID whose pending events should be flushed to disk.
+/// JSON Schema describing the form fields to present to the user
 ///
 /// <div class="warning">
 ///
@@ -15276,12 +19883,17 @@ pub struct SessionsReloadPluginHooksResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsSaveRequest {
-    /// Session ID whose pending events should be flushed to disk
-    pub session_id: SessionId,
+pub struct UIElicitationSchema {
+    /// Form field definitions, keyed by field name
+    pub properties: HashMap<String, serde_json::Value>,
+    /// List of required field names
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub required: Option<Vec<String>>,
+    /// Schema type indicator (always 'object')
+    pub r#type: UIElicitationSchemaType,
 }
 
-/// Flush a session's pending events to disk. No-op when no writer exists for the session (e.g., already closed).
+/// Prompt message and JSON schema describing the form fields to elicit from the user.
 ///
 /// <div class="warning">
 ///
@@ -15291,9 +19903,23 @@ pub struct SessionsSaveRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsSaveResult {}
+pub struct UIElicitationRequest {
+    /// MCP request metadata.
+    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
+    pub meta: Option<HashMap<String, serde_json::Value>>,
+    /// Message describing what information is needed from the user
+    pub message: String,
+    /// Elicitation mode. Omitted and form are equivalent for structured elicitation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mode: Option<McpElicitationFormMode>,
+    /// JSON Schema describing the form fields to present to the user
+    pub requested_schema: UIElicitationSchema,
+    /// MCP task metadata.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task: Option<McpTaskMetadata>,
+}
 
-/// Manager-wide additional plugins to register; replaces any previously-configured set.
+/// The elicitation response (accept with form values, decline, or cancel)
 ///
 /// <div class="warning">
 ///
@@ -15303,12 +19929,18 @@ pub struct SessionsSaveResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsSetAdditionalPluginsRequest {
-    /// Manager-wide additional plugins to register. Replaces any previously-configured set. Pass an empty array to clear.
-    pub plugins: Vec<InstalledPlugin>,
+pub struct UIElicitationResponse {
+    /// MCP response metadata.
+    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
+    pub meta: Option<HashMap<String, serde_json::Value>>,
+    /// The user's response: accept (submitted), decline (rejected), or cancel (dismissed)
+    pub action: UIElicitationResponseAction,
+    /// The form values submitted by the user (present when action is 'accept')
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub content: Option<HashMap<String, serde_json::Value>>,
 }
 
-/// Replace the manager-wide additional plugins. New session creations and subsequent hook reloads see the new set; already-running sessions keep their existing hook installation until the next reload.
+/// Indicates whether the elicitation response was accepted; false if it was already resolved by another client.
 ///
 /// <div class="warning">
 ///
@@ -15318,9 +19950,12 @@ pub struct SessionsSetAdditionalPluginsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsSetAdditionalPluginsResult {}
+pub struct UIElicitationResult {
+    /// Whether the response was accepted. False if the request was already resolved by another client.
+    pub success: bool,
+}
 
-/// Patch for the singleton's steering state.
+/// Boolean field rendered as a yes/no toggle.
 ///
 /// <div class="warning">
 ///
@@ -15330,12 +19965,21 @@ pub struct SessionsSetAdditionalPluginsResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsSetRemoteControlSteeringRequest {
-    /// Target steering state. Today only `true` is actionable on the underlying exporter; `false` is reserved for future use.
-    pub enabled: bool,
+pub struct UIElicitationSchemaPropertyBoolean {
+    /// Default value selected when the form is first shown.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub default: Option<bool>,
+    /// Help text describing the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Human-readable label for the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    /// Type discriminator. Always "boolean".
+    pub r#type: UIElicitationSchemaPropertyBooleanType,
 }
 
-/// Parameters for attaching the remote-control singleton to a session.
+/// Numeric field accepting either a number or an integer.
 ///
 /// <div class="warning">
 ///
@@ -15345,14 +19989,27 @@ pub struct SessionsSetRemoteControlSteeringRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsStartRemoteControlRequest {
-    /// Configuration for the runtime-managed remote-control singleton.
-    pub config: RemoteControlConfig,
-    /// Local session id to attach remote control to.
-    pub session_id: SessionId,
+pub struct UIElicitationSchemaPropertyNumber {
+    /// Default value populated in the input when the form is first shown.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub default: Option<f64>,
+    /// Help text describing the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Maximum allowed value (inclusive).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub maximum: Option<f64>,
+    /// Minimum allowed value (inclusive).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub minimum: Option<f64>,
+    /// Human-readable label for the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    /// Numeric type accepted by the field.
+    pub r#type: UIElicitationSchemaPropertyNumberType,
 }
 
-/// Parameters for stopping the remote-control singleton.
+/// Free-text string field with optional length and format constraints.
 ///
 /// <div class="warning">
 ///
@@ -15362,16 +20019,30 @@ pub struct SessionsStartRemoteControlRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsStopRemoteControlRequest {
-    /// When provided, the stop is rejected unless the singleton currently points at this session id (compare-and-swap semantics).
+pub struct UIElicitationSchemaPropertyString {
+    /// Default value populated in the input when the form is first shown.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub expected_session_id: Option<String>,
-    /// When true, the singleton is unconditionally torn down regardless of `expectedSessionId`. Use during shutdown or explicit `/remote off`.
+    pub default: Option<String>,
+    /// Help text describing the field.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub force: Option<bool>,
+    pub description: Option<String>,
+    /// Optional format hint that constrains the accepted input.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub format: Option<UIElicitationSchemaPropertyStringFormat>,
+    /// Maximum number of characters allowed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_length: Option<i64>,
+    /// Minimum number of characters required.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub min_length: Option<i64>,
+    /// Human-readable label for the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    /// Type discriminator. Always "string".
+    pub r#type: UIElicitationSchemaPropertyStringType,
 }
 
-/// Parameters for atomically rebinding the remote-control singleton.
+/// Single-select string field whose allowed values are defined inline.
 ///
 /// <div class="warning">
 ///
@@ -15381,15 +20052,26 @@ pub struct SessionsStopRemoteControlRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsTransferRemoteControlRequest {
-    /// When provided, the transfer is rejected unless the singleton currently points at this session id (compare-and-swap semantics to avoid clobbering newer state).
+pub struct UIElicitationStringEnumField {
+    /// Default value selected when the form is first shown.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub expected_from_session_id: Option<String>,
-    /// Local session id to point remote control at.
-    pub to_session_id: String,
+    pub default: Option<String>,
+    /// Help text describing the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Allowed string values.
+    pub r#enum: Vec<String>,
+    /// Optional display labels for each enum value, in the same order as `enum`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enum_names: Option<Vec<String>>,
+    /// Human-readable label for the field.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    /// Type discriminator. Always "string".
+    pub r#type: UIElicitationStringEnumFieldType,
 }
 
-/// Telemetry engagement ID for the session, when available.
+/// Selectable option for a UI elicitation single-select string field, with submitted value and display label.
 ///
 /// <div class="warning">
 ///
@@ -15399,13 +20081,14 @@ pub struct SessionsTransferRemoteControlRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTelemetryEngagement {
-    /// Current telemetry engagement ID, when available.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub engagement_id: Option<String>,
+pub struct UIElicitationStringOneOfFieldOneOf {
+    /// Value submitted when this option is selected.
+    pub r#const: String,
+    /// Display label for this option.
+    pub title: String,
 }
 
-/// Patch of mutable session options to apply to the running session.
+/// Single-select string field where each option pairs a value with a display label.
 ///
 /// <div class="warning">
 ///
@@ -15415,191 +20098,23 @@ pub struct SessionTelemetryEngagement {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUpdateOptionsParams {
-    /// Additional content-exclusion policies to merge into the session's policy set.
-    ///
-    /// <div class="warning">
-    ///
-    /// **Experimental.** This type is part of an experimental wire-protocol surface
-    /// and may change or be removed in future SDK or CLI releases.
-    ///
-    /// </div>
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_content_exclusion_policies:
-        Option<Vec<OptionsUpdateAdditionalContentExclusionPolicy>>,
-    /// Runtime context discriminator (e.g., `cli`, `actions`).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_context: Option<String>,
-    /// Whether to include instructions from every MCP server in the system prompt instead of only allowlisted servers.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub allow_all_mcp_server_instructions: Option<bool>,
-    /// Whether to disable the `ask_user` tool (encourages autonomous behavior).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ask_user_disabled: Option<bool>,
-    /// Allowlist of tool names available to this session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub available_tools: Option<Vec<String>>,
-    /// Options scoped to the built-in CAPI (Copilot API) provider.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub capi: Option<CapiSessionOptions>,
-    /// Identifier of the client driving the session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    /// Whether to include the `Co-authored-by` trailer in commit messages.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub coauthor_enabled: Option<bool>,
-    /// Context tier for models with tiered pricing. The session uses this to derive effective `modelCapabilitiesOverrides` so compaction, truncation, token display, and request limits honor the selected tier.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_tier: Option<OptionsUpdateContextTier>,
-    /// Whether to allow auto-mode continuation across turns.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub continue_on_auto_mode: Option<bool>,
-    /// Override URL for the Copilot API endpoint.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_url: Option<String>,
-    /// Whether to default custom agents to local-only execution.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub custom_agents_local_only: Option<bool>,
-    /// Instruction source IDs to exclude from the system prompt.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub disabled_instruction_sources: Option<Vec<String>>,
-    /// Skill IDs that should be excluded from this session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub disabled_skills: Option<Vec<String>>,
-    /// Whether to enable loading of `.github/hooks/` filesystem hooks. Separate from the SDK callback hook mechanism.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_file_hooks: Option<bool>,
-    /// Whether to enable host git operations (context resolution, child repo scanning, git info in system prompt).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_host_git_operations: Option<bool>,
-    /// Whether to discover custom instructions on demand after successful file views (AGENTS.md / CLAUDE.md / .github/copilot-instructions.md surfacing). Combined with `skipCustomInstructions`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_on_demand_instruction_discovery: Option<bool>,
-    /// Whether to surface reasoning-summary events from the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_reasoning_summaries: Option<bool>,
-    /// Whether shell-script safety heuristics are enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_script_safety: Option<bool>,
-    /// Whether to enable cross-session store writes and reads.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_session_store: Option<bool>,
-    /// Whether to enable skill directory scanning and loading. Falls back to enableConfigDiscovery when unset.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_skills: Option<bool>,
-    /// Whether to stream model responses.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enable_streaming: Option<bool>,
-    /// How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub env_value_mode: Option<OptionsUpdateEnvValueMode>,
-    /// Override directory for the session-events log. When unset, the runtime's default events log directory is used.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub events_log_directory: Option<String>,
-    /// Whether subagent callback events should be forwarded into the session event log sink.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub events_log_includes_subagents: Option<bool>,
-    /// Built-in subagent names to exclude from this session. Excluded built-ins are hidden from agent discovery and cannot be dispatched unless a custom agent with the same name is available.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub excluded_builtin_agents: Option<Vec<String>>,
-    /// Denylist of tool names for this session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub excluded_tools: Option<Vec<String>>,
-    /// Map of feature-flag IDs to their boolean enabled state.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub feature_flags: Option<HashMap<String, bool>>,
-    /// Built-in subagent names to include in this session. When specified, only these built-ins are available, subject to runtime availability and exclusions. Custom agents with the same name remain available. Set to null to remove the allowlist restriction.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub included_builtin_agents: Option<Vec<String>>,
-    /// Full set of installed plugins for the session. Replaces the existing list; the runtime invalidates the skills cache only when the list materially changes.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub installed_plugins: Option<Vec<SessionInstalledPlugin>>,
-    /// Stable integration identifier used for analytics and rate-limit attribution.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub integration_id: Option<String>,
-    /// Whether experimental capabilities are enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_experimental_mode: Option<bool>,
-    /// Whether interactive shell sessions are logged.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub log_interactive_shells: Option<bool>,
-    /// Identifier sent to LSP-style integrations.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub lsp_client_name: Option<String>,
-    /// Whether to expose the `manage_schedule` tool to the agent. The runtime always owns the per-session schedule registry; this flag only controls tool exposure (typically gated to staff users).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub manage_schedule_enabled: Option<bool>,
-    /// Maximum decoded byte size of a single model-facing binary tool result (e.g. an image) persisted inline in session events and re-presented to the model on later turns / resume. Larger results are persisted as a metadata-only marker and shown to the model as a short text note. Defaults to 10 MB.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_inline_binary_bytes: Option<i64>,
-    /// The model ID to use for assistant turns.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Per-property model capability overrides for the selected model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_capabilities_overrides: Option<ModelCapabilitiesOverride>,
-    /// Organization-level custom instructions to inject into the system prompt.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub organization_custom_instructions: Option<String>,
-    /// Custom model-provider configuration (BYOK).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub provider: Option<ProviderConfig>,
-    /// Reasoning effort for the selected model. CAPI values are model-defined and validated against the selected model; BYOK providers may define additional values. When omitted, no effort override is applied.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_effort: Option<String>,
-    /// Reasoning summary mode for supported model clients.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_summary: Option<OptionsUpdateReasoningSummary>,
-    /// Whether the session is running in an interactive UI.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub running_in_interactive_mode: Option<bool>,
-    /// Resolved sandbox configuration.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sandbox_config: Option<SandboxConfig>,
-    /// Replaces the session's capability set with the given list. Use to enable or disable capabilities mid-session (e.g., remove `memory` for reproducible scripted runs). Omit the field to leave the existing capability set unchanged.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_capabilities: Option<Vec<SessionCapability>>,
-    /// Optional session limits. Pass null to clear the session limits.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_limits: Option<SessionLimitsConfig>,
-    /// Per-session settings for built-in shell tools.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub shell: Option<ShellOptions>,
-    /// Use shell.initProfile instead. Shell init profile (`None` or `NonInteractive`).
-    #[doc(hidden)]
-    #[deprecated]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub shell_init_profile: Option<String>,
-    /// PowerShell process flags applied to built-in and user-requested shell commands.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub shell_process_flags: Option<Vec<String>>,
-    /// Additional directories to search for skills.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub skill_directories: Option<Vec<String>>,
-    /// Whether to skip loading custom instruction sources.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub skip_custom_instructions: Option<bool>,
-    /// Whether to skip embedding retrieval pipeline initialization and execution.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub skip_embedding_retrieval: Option<bool>,
-    /// When true, the selected custom agent's prompt is not injected into the user message (skill context is still injected). Used by automation triggers where the agent prompt is already in the problem statement.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub suppress_custom_agent_prompt: Option<bool>,
-    /// Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_filter_precedence: Option<OptionsUpdateToolFilterPrecedence>,
-    /// Optional path for trajectory output.
+pub struct UIElicitationStringOneOfField {
+    /// Default value selected when the form is first shown.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub trajectory_file: Option<String>,
-    /// Output verbosity level for supported models.
+    pub default: Option<String>,
+    /// Help text describing the field.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub verbosity: Option<Verbosity>,
-    /// Absolute working-directory path for shell tools.
+    pub description: Option<String>,
+    /// Selectable options, each with a value and a display label.
+    pub one_of: Vec<UIElicitationStringOneOfFieldOneOf>,
+    /// Human-readable label for the field.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub working_directory: Option<String>,
+    pub title: Option<String>,
+    /// Type discriminator. Always "string".
+    pub r#type: UIElicitationStringOneOfFieldType,
 }
 
-/// Indicates whether the session options patch was applied successfully.
+/// Transient question to answer without adding it to conversation history.
 ///
 /// <div class="warning">
 ///
@@ -15609,15 +20124,20 @@ pub struct SessionUpdateOptionsParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUpdateOptionsResult {
-    /// Number of hooks loaded from installed plugins, returned when installedPlugins is updated
+pub struct UIEphemeralQueryRequest {
+    /// In-process `AbortSignal` forwarded to the model client to cancel an in-flight request. Marked internal: excluded from the public SDK surface. Replaced by an explicit cancellation token + cancel RPC in the SDK migration.
+    #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub plugin_hook_count: Option<i64>,
-    /// Whether the operation succeeded
-    pub success: bool,
+    pub(crate) abort_signal: Option<serde_json::Value>,
+    /// In-process streaming callback `(text) => void` invoked with each token as the model emits it. Marked internal: excluded from the public SDK surface. In a process-separated SDK this is replaced by a streaming RPC that yields chunks and a final answer.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) on_chunk: Option<serde_json::Value>,
+    /// Question to answer from the current conversation context.
+    pub question: String,
 }
 
-/// User-requested shell execution cancellation handle.
+/// Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs.
 ///
 /// <div class="warning">
 ///
@@ -15627,12 +20147,12 @@ pub struct SessionUpdateOptionsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShellCancelUserRequestedRequest {
-    /// Request ID previously passed to executeUserRequested
-    pub request_id: RequestId,
+pub struct UIEphemeralQueryResult {
+    /// Answer returned by the model
+    pub answer: String,
 }
 
-/// Shell command to run, with optional working directory and timeout in milliseconds.
+/// User response for a pending exit-plan-mode request, with approval state, selected action, auto-approve flag, and feedback.
 ///
 /// <div class="warning">
 ///
@@ -15642,18 +20162,24 @@ pub struct ShellCancelUserRequestedRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShellExecRequest {
-    /// Shell command to execute
-    pub command: String,
-    /// Working directory (defaults to session working directory)
+pub struct UIExitPlanModeResponse {
+    /// Whether the plan was approved.
+    pub approved: bool,
+    /// Whether subsequent edits should be auto-approved without confirmation.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    /// Timeout in milliseconds (default: 30000)
+    pub auto_approve_edits: Option<bool>,
+    /// When true, the agent is instructed to end its turn without starting implementation so the client can restore the session model and auto-submit a fresh implementation turn on it. Set only when a distinct plan configuration (a different model, reasoning effort, or context tier) actually ran the planning turn.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout: Option<i64>,
+    pub defer_implementation: Option<bool>,
+    /// Feedback from the user when they declined the plan or requested changes.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub feedback: Option<String>,
+    /// The action the user selected. Defaults to 'autopilot' when autoApproveEdits is true, otherwise 'interactive'.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub selected_action: Option<UIExitPlanModeAction>,
 }
 
-/// Identifier of the spawned process, used to correlate streamed output and exit notifications.
+/// Request ID of a pending `auto_mode_switch.requested` event and the user's response.
 ///
 /// <div class="warning">
 ///
@@ -15663,12 +20189,14 @@ pub struct ShellExecRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShellExecResult {
-    /// Unique identifier for tracking streamed output
-    pub process_id: String,
+pub struct UIHandlePendingAutoModeSwitchRequest {
+    /// The unique request ID from the auto_mode_switch.requested event
+    pub request_id: RequestId,
+    /// User's choice for auto-mode switching: yes (allow this turn), yes_always (allow + persist as setting), or no (decline).
+    pub response: UIAutoModeSwitchResponse,
 }
 
-/// User-requested shell command and cancellation handle.
+/// Pending elicitation request ID and the user's response (accept/decline/cancel + form values).
 ///
 /// <div class="warning">
 ///
@@ -15678,14 +20206,14 @@ pub struct ShellExecResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShellExecuteUserRequestedRequest {
-    /// Shell command to execute
-    pub command: String,
-    /// Caller-provided cancellation handle for this execution
+pub struct UIHandlePendingElicitationRequest {
+    /// The unique request ID from the elicitation.requested event
     pub request_id: RequestId,
+    /// The elicitation response (accept with form values, decline, or cancel)
+    pub result: UIElicitationResponse,
 }
 
-/// Identifier of a process previously returned by "shell.exec" and the signal to send.
+/// Request ID of a pending `exit_plan_mode.requested` event and the user's response.
 ///
 /// <div class="warning">
 ///
@@ -15695,15 +20223,14 @@ pub struct ShellExecuteUserRequestedRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShellKillRequest {
-    /// Process identifier returned by shell.exec
-    pub process_id: String,
-    /// Signal to send (default: SIGTERM)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub signal: Option<ShellKillSignal>,
+pub struct UIHandlePendingExitPlanModeRequest {
+    /// The unique request ID from the exit_plan_mode.requested event
+    pub request_id: RequestId,
+    /// User response for a pending exit-plan-mode request, with approval state, selected action, auto-approve flag, and feedback.
+    pub response: UIExitPlanModeResponse,
 }
 
-/// Indicates whether the signal was delivered; false if the process was unknown or already exited.
+/// Indicates whether the pending UI request was resolved by this call.
 ///
 /// <div class="warning">
 ///
@@ -15713,12 +20240,12 @@ pub struct ShellKillRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShellKillResult {
-    /// Whether the signal was sent successfully
-    pub killed: bool,
+pub struct UIHandlePendingResult {
+    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
+    pub success: bool,
 }
 
-/// Parameters for shutting down the session
+/// Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.
 ///
 /// <div class="warning">
 ///
@@ -15728,16 +20255,27 @@ pub struct ShellKillResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShutdownRequest {
-    /// Optional human-readable reason. Typically the message of the error that triggered shutdown when type is 'error'.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-    /// Why the session is being shut down. Defaults to "routine" when omitted.
+pub struct UIHandlePendingSamplingResponse {}
+
+/// Request ID of a pending `sampling.requested` event and an optional sampling result payload (omit to reject).
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UIHandlePendingSamplingRequest {
+    /// The unique request ID from the sampling.requested event
+    pub request_id: RequestId,
+    /// Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#type: Option<ShutdownType>,
+    pub response: Option<UIHandlePendingSamplingResponse>,
 }
 
-/// Skill metadata available to a session, with name, description, source, enabled/invocable state, path, plugin, and argument hint.
+/// The user's selected action for an exhausted session limit.
 ///
 /// <div class="warning">
 ///
@@ -15747,29 +20285,18 @@ pub struct ShutdownRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct Skill {
-    /// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub argument_hint: Option<String>,
-    /// Description of what the skill does
-    pub description: String,
-    /// Whether the skill is currently enabled
-    pub enabled: bool,
-    /// Unique identifier for the skill
-    pub name: String,
-    /// Absolute path to the skill file
+pub struct UISessionLimitsExhaustedResponse {
+    /// Action selected by the user.
+    pub action: UISessionLimitsExhaustedResponseAction,
+    /// AI Credits to add to the current max when action is 'add'.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// Name of the plugin that provides the skill, when source is 'plugin'
+    pub additional_ai_credits: Option<f64>,
+    /// New absolute max AI Credits when action is 'set'.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub plugin_name: Option<String>,
-    /// Source location type (e.g., project, personal-copilot, plugin, builtin)
-    pub source: SkillSource,
-    /// Whether the skill can be invoked by the user as a slash command
-    pub user_invocable: bool,
+    pub max_ai_credits: Option<f64>,
 }
 
-/// Canonical directory where skills can be discovered or created, with scope, preference, and optional project path.
+/// Request ID of a pending `session_limits_exhausted.requested` event and the user's selected limit action.
 ///
 /// <div class="warning">
 ///
@@ -15779,19 +20306,14 @@ pub struct Skill {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillDiscoveryPath {
-    /// Absolute path of the create/discovery target (may not exist on disk yet)
-    pub path: String,
-    /// Whether this is the canonical directory to create a new skill in its tier. At most one entry per tier is preferred; the `personal-agents` and `custom` scopes are never preferred.
-    pub preferred_for_creation: bool,
-    /// The input project path this directory was derived from (only for project scope)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_path: Option<String>,
-    /// Which tier this directory belongs to
-    pub scope: SkillDiscoveryScope,
+pub struct UIHandlePendingSessionLimitsExhaustedRequest {
+    /// The unique request ID from the session_limits_exhausted.requested event
+    pub request_id: RequestId,
+    /// The selected session-limit action.
+    pub response: UISessionLimitsExhaustedResponse,
 }
 
-/// Canonical locations where skills can be created so the runtime will recognize them.
+/// User response for a pending user-input request, with answer text and whether it was typed freeform.
 ///
 /// <div class="warning">
 ///
@@ -15801,12 +20323,14 @@ pub struct SkillDiscoveryPath {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillDiscoveryPathList {
-    /// Canonical skill create/discovery directories, in priority order
-    pub paths: Vec<SkillDiscoveryPath>,
+pub struct UIUserInputResponse {
+    /// The user's answer text
+    pub answer: String,
+    /// True if the user typed a freeform response, false if they selected a presented choice. Used by telemetry to differentiate between free text input and choice selection.
+    pub was_freeform: bool,
 }
 
-/// Skills available to the session, with their enabled state.
+/// Request ID of a pending `user_input.requested` event and the user's response.
 ///
 /// <div class="warning">
 ///
@@ -15816,12 +20340,14 @@ pub struct SkillDiscoveryPathList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillList {
-    /// Available skills
-    pub skills: Vec<Skill>,
+pub struct UIHandlePendingUserInputRequest {
+    /// The unique request ID from the user_input.requested event
+    pub request_id: RequestId,
+    /// User response for a pending user-input request, with answer text and whether it was typed freeform.
+    pub response: UIUserInputResponse,
 }
 
-/// Skill names to mark as disabled in global configuration, replacing any previous list.
+/// Register an in-process handler for `auto_mode_switch.requested` events. The caller still attaches the actual listener via the standard event-subscription mechanism; this registration solely tells the server bridge to skip its own dispatch (so a remote client doesn't race the in-process handler for the same requestId).
 ///
 /// <div class="warning">
 ///
@@ -15831,12 +20357,75 @@ pub struct SkillList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsConfigSetDisabledSkillsRequest {
-    /// List of skill names to disable
-    pub disabled_skills: Vec<String>,
+pub struct UIRegisterDirectAutoModeSwitchHandlerResult {
+    /// Opaque handle representing the registration. Pass this same handle to `unregisterDirectAutoModeSwitchHandler` when the in-process handler is no longer active. Multiple registrations are reference-counted; the server bridge will only dispatch auto-mode-switch requests when no handles are active.
+    pub handle: String,
+}
+
+/// Opaque handle previously returned by `registerDirectAutoModeSwitchHandler` to release.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UIUnregisterDirectAutoModeSwitchHandlerRequest {
+    /// Handle previously returned by `registerDirectAutoModeSwitchHandler`
+    pub handle: String,
+}
+
+/// Indicates whether the handle was active and the registration count was decremented.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UIUnregisterDirectAutoModeSwitchHandlerResult {
+    /// True if the handle was active and decremented the counter; false if the handle was unknown.
+    pub unregistered: bool,
+}
+
+/// Configured per-agent subagent overrides
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateSubagentSettingsRequestSubagents {
+    /// Per-agent settings keyed by subagent agent_type
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agents: Option<HashMap<String, SubagentSettingsEntry>>,
+    /// Names of subagents the user has turned off; they cannot be dispatched
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_subagents: Option<Vec<String>>,
+    /// Maximum number of subagents that can run concurrently; applies to usage-based billing users only
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_concurrency: Option<i32>,
+    /// Maximum subagent nesting depth; applies to usage-based billing users only
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_depth: Option<i32>,
+}
+
+/// Subagent settings to apply to the current session
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateSubagentSettingsRequest {
+    /// Subagent settings to apply, or null to clear the live session override
+    pub subagents: Option<UpdateSubagentSettingsRequestSubagents>,
 }
 
-/// Name of the skill to disable for the session.
+/// Request count and cost metrics for this model
 ///
 /// <div class="warning">
 ///
@@ -15846,12 +20435,14 @@ pub struct SkillsConfigSetDisabledSkillsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsDisableRequest {
-    /// Name of the skill to disable
-    pub name: String,
+pub struct UsageMetricsModelMetricRequests {
+    /// User-initiated premium request cost (with multiplier applied)
+    pub cost: f64,
+    /// Number of API requests made with this model
+    pub count: i64,
 }
 
-/// Optional project paths and additional skill directories to include in discovery.
+/// Per-model token-detail entry containing the accumulated token count for one token type.
 ///
 /// <div class="warning">
 ///
@@ -15861,19 +20452,12 @@ pub struct SkillsDisableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsDiscoverRequest {
-    /// When true, omit skills from the host's global sources (personal, custom, plugin, and built-in), returning only project-scoped skills. For multitenant deployments.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exclude_host_skills: Option<bool>,
-    /// Optional list of project directory paths to scan for project-scoped skills
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_paths: Option<Vec<String>>,
-    /// Optional list of additional skill directory paths to include
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub skill_directories: Option<Vec<String>>,
+pub struct UsageMetricsModelMetricTokenDetail {
+    /// Accumulated token count for this token type
+    pub token_count: i64,
 }
 
-/// Name of the skill to enable for the session.
+/// Token usage metrics for this model
 ///
 /// <div class="warning">
 ///
@@ -15883,12 +20467,21 @@ pub struct SkillsDiscoverRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsEnableRequest {
-    /// Name of the skill to enable
-    pub name: String,
+pub struct UsageMetricsModelMetricUsage {
+    /// Total tokens read from prompt cache
+    pub cache_read_tokens: i64,
+    /// Total tokens written to prompt cache
+    pub cache_write_tokens: i64,
+    /// Total input tokens consumed
+    pub input_tokens: i64,
+    /// Total output tokens produced
+    pub output_tokens: i64,
+    /// Total output tokens used for reasoning
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_tokens: Option<i64>,
 }
 
-/// Optional project paths to enumerate.
+/// Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.
 ///
 /// <div class="warning">
 ///
@@ -15898,16 +20491,23 @@ pub struct SkillsEnableRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsGetDiscoveryPathsRequest {
-    /// When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments.
+pub struct UsageMetricsModelMetric {
+    /// Latest known prompt-cache expiration for this model. A timestamp in the past indicates that the observed cache has expired.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub exclude_host_skills: Option<bool>,
-    /// Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.
+    pub cache_expires_at: Option<String>,
+    /// Request count and cost metrics for this model
+    pub requests: UsageMetricsModelMetricRequests,
+    /// Token count details per type
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub project_paths: Option<Vec<String>>,
+    pub token_details: Option<HashMap<String, UsageMetricsModelMetricTokenDetail>>,
+    /// Accumulated nano-AI units cost for this model
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub total_nano_aiu: Option<f64>,
+    /// Token usage metrics for this model
+    pub usage: UsageMetricsModelMetricUsage,
 }
 
-/// Skill invocation record with name, path, content, allowed tools, and turn number.
+/// Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.
 ///
 /// <div class="warning">
 ///
@@ -15917,21 +20517,22 @@ pub struct SkillsGetDiscoveryPathsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsInvokedSkill {
-    /// Tools that should be auto-approved when this skill is active, captured at invocation time
+pub struct UsageMetricsAgentMetric {
+    /// Human-readable label for this subagent invocation, copied from the originating `subagent.started` event. For task-tool subagents this is the invocation's task description rather than the agent's configured display name, so group by `agentName` for stable per-agent labels.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub allowed_tools: Option<Vec<String>>,
-    /// Full content of the skill file
-    pub content: String,
-    /// Turn number when the skill was invoked
-    pub invoked_at_turn: i64,
-    /// Unique identifier for the skill
-    pub name: String,
-    /// Path to the SKILL.md file
-    pub path: String,
+    pub agent_display_name: Option<String>,
+    /// Configured agent name, when this is a subagent
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_name: Option<String>,
+    /// Per-model usage for this agent, keyed by model identifier
+    pub model_metrics: HashMap<String, UsageMetricsModelMetric>,
+    /// Time spent in model API calls by this agent, in milliseconds
+    pub total_api_duration_ms: i64,
+    /// Accumulated nano-AI units cost for this agent
+    pub total_nano_aiu: f64,
 }
 
-/// Skills invoked during this session, ordered by invocation time (most recent last).
+/// Aggregated code change metrics
 ///
 /// <div class="warning">
 ///
@@ -15941,12 +20542,18 @@ pub struct SkillsInvokedSkill {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsGetInvokedResult {
-    /// Skills invoked during this session, ordered by invocation time (most recent last)
-    pub skills: Vec<SkillsInvokedSkill>,
+pub struct UsageMetricsCodeChanges {
+    /// Distinct file paths modified during the session
+    pub files_modified: Vec<String>,
+    /// Number of distinct files modified
+    pub files_modified_count: i64,
+    /// Total lines of code added
+    pub lines_added: i64,
+    /// Total lines of code removed
+    pub lines_removed: i64,
 }
 
-/// Diagnostics from reloading skill definitions, with warnings and errors as separate lists.
+/// Session-wide token-detail entry containing the accumulated token count for one token type.
 ///
 /// <div class="warning">
 ///
@@ -15956,14 +20563,12 @@ pub struct SkillsGetInvokedResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsLoadDiagnostics {
-    /// Errors emitted while loading skills (e.g. skills that failed to load entirely)
-    pub errors: Vec<String>,
-    /// Warnings emitted while loading skills (e.g. skills that loaded but had issues)
-    pub warnings: Vec<String>,
+pub struct UsageMetricsTokenDetail {
+    /// Accumulated token count for this token type
+    pub token_count: i64,
 }
 
-/// Slash-command invocation result that submits an agent prompt, with display prompt, optional mode, optional user-facing notice, and settings-change flag.
+/// Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
 ///
 /// <div class="warning">
 ///
@@ -15973,25 +20578,38 @@ pub struct SkillsLoadDiagnostics {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SlashCommandAgentPromptResult {
-    /// Prompt text to display to the user
-    pub display_prompt: String,
-    /// Agent prompt result discriminator
-    pub kind: SlashCommandAgentPromptResultKind,
-    /// Optional target session mode for the agent prompt
+pub struct UsageGetMetricsResult {
+    /// Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<SessionMode>,
-    /// Optional user-facing notice to show before the prompt is submitted
+    pub agent_metrics: Option<HashMap<String, UsageMetricsAgentMetric>>,
+    /// Aggregated code change metrics
+    pub code_changes: UsageMetricsCodeChanges,
+    /// Currently active model identifier
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub notice: Option<String>,
-    /// Prompt to submit to the agent
-    pub prompt: String,
-    /// True when the invocation mutated user runtime settings; consumers caching settings should refresh
+    pub current_model: Option<String>,
+    /// Input tokens from the most recent main-agent API call
+    pub last_call_input_tokens: i64,
+    /// Output tokens from the most recent main-agent API call
+    pub last_call_output_tokens: i64,
+    /// Per-model token and request metrics, keyed by model identifier
+    pub model_metrics: HashMap<String, UsageMetricsModelMetric>,
+    /// ISO 8601 timestamp when the session started
+    pub session_start_time: String,
+    /// Session-wide per-token-type accumulated token counts
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub runtime_settings_changed: Option<bool>,
+    pub token_details: Option<HashMap<String, UsageMetricsTokenDetail>>,
+    /// Total time spent in model API calls (milliseconds)
+    pub total_api_duration_ms: i64,
+    /// Session-wide accumulated nano-AI units cost
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub total_nano_aiu: Option<f64>,
+    /// Total user-initiated premium request cost across all models (may be fractional due to multipliers)
+    pub total_premium_request_cost: f64,
+    /// Raw count of user-initiated API requests
+    pub total_user_requests: i64,
 }
 
-/// Slash-command invocation result indicating completion, with optional message and settings-change flag.
+/// Result of a user-requested shell command.
 ///
 /// <div class="warning">
 ///
@@ -16001,18 +20619,22 @@ pub struct SlashCommandAgentPromptResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SlashCommandCompletedResult {
-    /// Completed result discriminator
-    pub kind: SlashCommandCompletedResultKind,
-    /// Optional user-facing message describing the completed command
+pub struct UserRequestedShellCommandResult {
+    /// Error output when the execution failed
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub message: Option<String>,
-    /// True when the invocation mutated user runtime settings; consumers caching settings should refresh
+    pub error: Option<String>,
+    /// Process exit code, when available
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub runtime_settings_changed: Option<bool>,
+    pub exit_code: Option<i64>,
+    /// Captured command output
+    pub output: String,
+    /// Whether the command completed successfully
+    pub success: bool,
+    /// Tool call id emitted for the shell execution
+    pub tool_call_id: String,
 }
 
-/// Slash-command invocation result containing text output plus Markdown/ANSI rendering flags.
+/// A single user setting's effective value alongside its default, so consumers can render settings left at their default.
 ///
 /// <div class="warning">
 ///
@@ -16022,23 +20644,16 @@ pub struct SlashCommandCompletedResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SlashCommandTextResult {
-    /// Text result discriminator
-    pub kind: SlashCommandTextResultKind,
-    /// Whether text contains Markdown
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub markdown: Option<bool>,
-    /// Whether ANSI sequences should be preserved
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub preserve_ansi: Option<bool>,
-    /// True when the invocation mutated user runtime settings; consumers caching settings should refresh
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub runtime_settings_changed: Option<bool>,
-    /// Text output for the client to render
-    pub text: String,
+pub struct UserSettingMetadata {
+    /// The centrally-known default for this setting (null when no default is registered).
+    pub default: serde_json::Value,
+    /// True when the user has not set an explicit value for this setting (i.e. it is left at its default). Reflects whether the user has overridden the key, not whether the effective value happens to equal the default — a key explicitly set to a value identical to the default still reports false.
+    pub is_default: bool,
+    /// The effective value: the user's value if set, otherwise the default.
+    pub value: serde_json::Value,
 }
 
-/// Selectable slash-command subcommand option with name, description, and optional group label.
+/// Per-key metadata for every known user setting (settings.json overlaid with the legacy config.json, config.json wins), including settings left at their default. Excludes repository- and enterprise-managed overrides.
 ///
 /// <div class="warning">
 ///
@@ -16048,17 +20663,12 @@ pub struct SlashCommandTextResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SlashCommandSelectSubcommandOption {
-    /// Human-readable description of the subcommand
-    pub description: String,
-    /// Optional group label for organizing options
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub group: Option<String>,
-    /// Subcommand name to invoke
-    pub name: String,
+pub struct UserSettingsGetResult {
+    /// Every known user setting keyed by setting name, each with its effective value, default, and whether it is at the default.
+    pub settings: HashMap<String, UserSettingMetadata>,
 }
 
-/// Slash-command invocation result asking the client to present subcommand options for a parent command.
+/// Partial user settings to write to settings.json. Each top-level key is written individually, replacing the existing value; a key whose value is null is removed.
 ///
 /// <div class="warning">
 ///
@@ -16068,21 +20678,12 @@ pub struct SlashCommandSelectSubcommandOption {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SlashCommandSelectSubcommandResult {
-    /// Parent command name that requires subcommand selection
-    pub command: String,
-    /// Select subcommand result discriminator
-    pub kind: SlashCommandSelectSubcommandResultKind,
-    /// Available subcommand options for the client to present
-    pub options: Vec<SlashCommandSelectSubcommandOption>,
-    /// True when the invocation mutated user runtime settings; consumers caching settings should refresh
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub runtime_settings_changed: Option<bool>,
-    /// Human-readable title for the selection UI
-    pub title: String,
+pub struct UserSettingsSetRequest {
+    /// Partial user settings to write, as a free-form object keyed by setting name
+    pub settings: serde_json::Value,
 }
 
-/// Subagent model, reasoning effort, and context tier settings
+/// Outcome of writing user settings.
 ///
 /// <div class="warning">
 ///
@@ -16092,19 +20693,12 @@ pub struct SlashCommandSelectSubcommandResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SubagentSettingsEntry {
-    /// Context tier override for matching subagents
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_tier: Option<SubagentSettingsEntryContextTier>,
-    /// Reasoning effort override for matching subagents
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub effort_level: Option<String>,
-    /// Model override for matching subagents
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
+pub struct UserSettingsSetResult {
+    /// Top-level keys whose write landed in settings.json but is shadowed by a value still present in the legacy config.json (config.json wins on read). The write does not take effect until the legacy value is removed.
+    pub shadowed_keys: Vec<String>,
 }
 
-/// Subagent settings to apply, or null to clear the live session override
+/// Current sharing status and shareable GitHub URL for a session.
 ///
 /// <div class="warning">
 ///
@@ -16114,22 +20708,33 @@ pub struct SubagentSettingsEntry {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SubagentSettings {
-    /// Per-agent settings keyed by subagent agent_type
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agents: Option<HashMap<String, SubagentSettingsEntry>>,
-    /// Names of subagents the user has turned off; they cannot be dispatched
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub disabled_subagents: Option<Vec<String>>,
-    /// Maximum number of subagents that can run concurrently; applies to usage-based billing users only
+pub struct VisibilityGetResult {
+    /// Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_concurrency: Option<i32>,
-    /// Maximum subagent nesting depth; applies to usage-based billing users only
+    pub share_url: Option<String>,
+    /// Current sharing status. Absent when the session is not synced or the status could not be retrieved (e.g. the user is not authenticated).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_depth: Option<i32>,
+    pub status: Option<SessionVisibilityStatus>,
+    /// Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the session cannot be shared and `status`/`shareUrl` are absent.
+    pub synced: bool,
+}
+
+/// Desired sharing status for the session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct VisibilitySetRequest {
+    /// Sharing status to apply. "repo" makes the session visible to repository readers; "unshared" restricts it to the creator and collaborators.
+    pub status: SessionVisibilityStatus,
 }
 
-/// Tracked background agent task metadata, including IDs, status, timing, agent type, prompt, model, result, and latest response.
+/// Effective sharing status and shareable GitHub URL after updating session visibility.
 ///
 /// <div class="warning">
 ///
@@ -16139,59 +20744,18 @@ pub struct SubagentSettings {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TaskAgentInfo {
-    /// ISO 8601 timestamp when the current active period began
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub active_started_at: Option<String>,
-    /// Accumulated active execution time in milliseconds
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub active_time_ms: Option<i64>,
-    /// Type of agent running this task
-    pub agent_type: String,
-    /// Whether the task is currently in the original sync wait and can be moved to background mode. False once it is already backgrounded, idle, finished, or no longer has a promotable sync waiter.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub can_promote_to_background: Option<bool>,
-    /// ISO 8601 timestamp when the task finished
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub completed_at: Option<String>,
-    /// Short description of the task
-    pub description: String,
-    /// Error message when the task failed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Whether task execution is synchronously awaited or managed in the background
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub execution_mode: Option<TaskExecutionMode>,
-    /// Unique task identifier
-    pub id: String,
-    /// ISO 8601 timestamp when the agent entered idle state
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub idle_since: Option<String>,
-    /// Most recent response text from the agent
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub latest_response: Option<String>,
-    /// Requested model override for the task when specified
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Most recent prompt delivered to the agent. Updated whenever the agent receives a follow-up message.
-    pub prompt: String,
-    /// Runtime model resolved for the task when available
+pub struct VisibilitySetResult {
+    /// Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub resolved_model: Option<String>,
-    /// Result text from the task when available
+    pub share_url: Option<String>,
+    /// Effective sharing status after the update. May differ from the requested status for task types that are already visible to repository readers by default. Absent when the update could not be applied (e.g. the session is not synced or the user is not authenticated).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<String>,
-    /// ISO 8601 timestamp when the task was started
-    pub started_at: String,
-    /// Current lifecycle status of the task
-    pub status: TaskStatus,
-    /// Tool call ID associated with this agent task
-    pub tool_call_id: String,
-    /// Task kind
-    pub r#type: TaskAgentInfoType,
+    pub status: Option<SessionVisibilityStatus>,
+    /// Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the visibility change could not be applied and `status`/`shareUrl` are absent.
+    pub synced: bool,
 }
 
-/// Timestamped display line for task progress output or recent agent activity.
+/// A single changed file and its unified diff.
 ///
 /// <div class="warning">
 ///
@@ -16201,14 +20765,22 @@ pub struct TaskAgentInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TaskProgressLine {
-    /// Display message, e.g., "▸ bash", "✓ edit src/foo.ts"
-    pub message: String,
-    /// ISO 8601 timestamp when this event occurred
-    pub timestamp: String,
+pub struct WorkspaceDiffFileChange {
+    /// Type of change represented by this file diff.
+    pub change_type: WorkspaceDiffFileChangeType,
+    /// Unified diff content for the file. Empty when the diff was truncated.
+    pub diff: String,
+    /// Whether the diff content was omitted because it exceeded the per-file size limit.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_truncated: Option<bool>,
+    /// Original file path for renamed files.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub old_path: Option<String>,
+    /// Path to the changed file, relative to the workspace root when the file lives under it. A file changed outside the workspace root keeps a `../`-relative path, or an absolute path when no relative path exists (for example a different Windows drive).
+    pub path: String,
 }
 
-/// Progress snapshot for an agent task, with recent activity lines and optional latest intent.
+/// Workspace diff result for the requested mode.
 ///
 /// <div class="warning">
 ///
@@ -16218,17 +20790,24 @@ pub struct TaskProgressLine {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TaskAgentProgress {
-    /// The most recent intent reported by the agent
+pub struct WorkspaceDiffResult {
+    /// Default branch used for a branch diff, when branch mode was requested.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub latest_intent: Option<String>,
-    /// Recent tool execution events converted to display lines
-    pub recent_activity: Vec<TaskProgressLine>,
-    /// Progress kind
-    pub r#type: TaskAgentProgressType,
+    pub base_branch: Option<String>,
+    /// Changed files and their unified diffs.
+    pub changes: Vec<WorkspaceDiffFileChange>,
+    /// Whether the requested diff fell back to unstaged changes, either because branch diff failed or session diff was unavailable.
+    pub is_fallback: bool,
+    /// Effective mode used for the returned changes.
+    pub mode: WorkspaceDiffMode,
+    /// Diff mode requested by the client.
+    pub requested_mode: WorkspaceDiffMode,
+    /// Why the session diff could not be produced, when applicable. Set only when `session` mode was requested and `isFallback` is true, so a client can tell the permanent `file-change-tracking-disabled` apart from the transient `session-busy`, which the same request answers once the session settles. Never set for `unstaged` or `branch` mode, and never `unsupported-remote-session`: a remote session's captures live on its own host, so a `session`-mode diff is rejected for one rather than answered with a controller-side fallback.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub unavailable_reason: Option<HistoryRewindUnavailableReason>,
 }
 
-/// Background tasks currently tracked by the session.
+/// Compaction summary checkpoint to persist.
 ///
 /// <div class="warning">
 ///
@@ -16238,12 +20817,14 @@ pub struct TaskAgentProgress {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TaskList {
-    /// Currently tracked tasks
-    pub tasks: Vec<serde_json::Value>,
+pub struct WorkspacesAddSummaryRequest {
+    /// Markdown summary content to persist.
+    pub content: String,
+    /// Summary title shown in checkpoint listings.
+    pub title: String,
 }
 
-/// Identifier of the background task to cancel.
+/// Persisted summary metadata and refreshed workspace metadata.
 ///
 /// <div class="warning">
 ///
@@ -16253,12 +20834,16 @@ pub struct TaskList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksCancelRequest {
-    /// Task identifier
-    pub id: String,
+pub struct WorkspacesAddSummaryResult {
+    /// Metadata for the persisted summary.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary: Option<serde_json::Value>,
+    /// Refreshed metadata for the containing workspace.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub workspace: Option<serde_json::Value>,
 }
 
-/// Indicates whether the background task was successfully cancelled.
+/// Whether the autopilot objective file exists.
 ///
 /// <div class="warning">
 ///
@@ -16268,12 +20853,12 @@ pub struct TasksCancelRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksCancelResult {
-    /// Whether the task was successfully cancelled
-    pub cancelled: bool,
+pub struct WorkspacesAutopilotObjectiveExistsResult {
+    /// True when the objective file exists.
+    pub exists: bool,
 }
 
-/// The first sync-waiting task that can currently be promoted to background mode.
+/// Workspace checkpoint metadata with assigned number, human-readable title, and checkpoint filename.
 ///
 /// <div class="warning">
 ///
@@ -16283,13 +20868,16 @@ pub struct TasksCancelResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksGetCurrentPromotableResult {
-    /// The first sync-waiting task (agent first, then shell) that can currently be promoted to background mode. Omitted if no such task exists. The returned task is guaranteed to have executionMode='sync' and canPromoteToBackground=true at the time of the call.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub task: Option<serde_json::Value>,
+pub struct WorkspacesCheckpoints {
+    /// Filename of the checkpoint within the workspace checkpoints directory
+    pub filename: String,
+    /// Checkpoint number assigned by the workspace manager
+    pub number: i64,
+    /// Human-readable checkpoint title
+    pub title: String,
 }
 
-/// Identifier of the background task to fetch progress for.
+/// Relative path and UTF-8 content for the workspace file to create or overwrite.
 ///
 /// <div class="warning">
 ///
@@ -16299,12 +20887,14 @@ pub struct TasksGetCurrentPromotableResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksGetProgressRequest {
-    /// Task identifier (agent ID or shell ID)
-    pub id: String,
+pub struct WorkspacesCreateFileRequest {
+    /// File content to write as a UTF-8 string
+    pub content: String,
+    /// Relative path within the workspace files directory
+    pub path: String,
 }
 
-/// Progress information for the task, or null when no task with that ID is tracked.
+/// Result of deleting the autopilot objective file.
 ///
 /// <div class="warning">
 ///
@@ -16314,12 +20904,12 @@ pub struct TasksGetProgressRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksGetProgressResult {
-    /// Progress information for the task, discriminated by type. Returns null when no task with this ID is currently tracked.
-    pub progress: Option<serde_json::Value>,
+pub struct WorkspacesDeleteAutopilotObjectiveResult {
+    /// True when a file was deleted.
+    pub deleted: bool,
 }
 
-/// Tracked shell task metadata, including ID, command, status, timing, attachment/execution mode, log path, and PID.
+/// Parameters for computing a workspace diff.
 ///
 /// <div class="warning">
 ///
@@ -16329,39 +20919,15 @@ pub struct TasksGetProgressResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TaskShellInfo {
-    /// Whether the shell runs inside a managed PTY session or as an independent background process
-    pub attachment_mode: TaskShellInfoAttachmentMode,
-    /// Whether this shell task can be promoted to background mode
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub can_promote_to_background: Option<bool>,
-    /// Command being executed
-    pub command: String,
-    /// ISO 8601 timestamp when the task finished
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub completed_at: Option<String>,
-    /// Short description of the task
-    pub description: String,
-    /// Whether task execution is synchronously awaited or managed in the background
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub execution_mode: Option<TaskExecutionMode>,
-    /// Unique task identifier
-    pub id: String,
-    /// Path to the detached shell log, when available
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub log_path: Option<String>,
-    /// Process ID when available
+pub struct WorkspacesDiffRequest {
+    /// When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub pid: Option<i64>,
-    /// ISO 8601 timestamp when the task was started
-    pub started_at: String,
-    /// Current lifecycle status of the task
-    pub status: TaskStatus,
-    /// Task kind
-    pub r#type: TaskShellInfoType,
+    pub ignore_whitespace: Option<bool>,
+    /// Diff mode requested by the client.
+    pub mode: WorkspaceDiffMode,
 }
 
-/// Progress snapshot for a shell task, with recent stdout/stderr output and optional process ID.
+/// Optional session context used when creating a local workspace.
 ///
 /// <div class="warning">
 ///
@@ -16371,17 +20937,71 @@ pub struct TaskShellInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TaskShellProgress {
-    /// Process ID when available
+pub struct WorkspacesEnsureRequest {
+    /// Opaque workspace context supplied by the session host.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub pid: Option<i64>,
-    /// Recent stdout/stderr lines from the running shell command
-    pub recent_output: String,
-    /// Progress kind
-    pub r#type: TaskShellProgressType,
+    pub context: Option<serde_json::Value>,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct WorkspacesGetWorkspaceResultWorkspace {
+    /// Current Git branch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// Whether the per-session Chronicle upgrade prompt was dismissed for the workspace.
+    #[serde(
+        rename = "chronicle_sync_dismissed",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub chronicle_sync_dismissed: Option<bool>,
+    /// Name of the client that created the workspace.
+    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Timestamp when the workspace was created.
+    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Current working directory associated with the workspace.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Git repository root associated with the workspace.
+    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
+    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
+    /// Stable workspace identifier.
+    pub id: String,
+    /// Most recent Mission Control event identifier observed for the workspace.
+    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
+    pub mc_last_event_id: Option<String>,
+    /// Mission Control session identifier associated with the workspace.
+    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
+    pub mc_session_id: Option<String>,
+    /// Mission Control task identifier associated with the workspace.
+    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
+    pub mc_task_id: Option<String>,
+    /// Workspace display name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Whether the workspace session can be steered remotely.
+    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
+    pub remote_steerable: Option<bool>,
+    /// Repository identifier associated with the workspace.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// Number of persisted summaries in the workspace.
+    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
+    pub summary_count: Option<i64>,
+    /// Timestamp when the workspace was last updated.
+    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
+    pub updated_at: Option<String>,
+    /// Whether the workspace name was explicitly chosen by the user.
+    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
+    pub user_named: Option<bool>,
 }
 
-/// The promoted task as it now exists in background mode, omitted if no promotable task was waiting.
+/// Current workspace metadata for the session, including its absolute filesystem path when available.
 ///
 /// <div class="warning">
 ///
@@ -16391,13 +21011,15 @@ pub struct TaskShellProgress {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksPromoteCurrentToBackgroundResult {
-    /// The promoted task as it now exists in background mode, omitted if no promotable task was waiting. Atomic operation: avoids the race window of getCurrentPromotable + promoteToBackground.
+pub struct WorkspacesGetWorkspaceResult {
+    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub task: Option<serde_json::Value>,
+    pub path: Option<String>,
+    /// Current workspace metadata, or null if not available
+    pub workspace: Option<WorkspacesGetWorkspaceResultWorkspace>,
 }
 
-/// Identifier of the task to promote to background mode.
+/// Workspace checkpoints in chronological order; empty when the workspace is not enabled.
 ///
 /// <div class="warning">
 ///
@@ -16407,12 +21029,12 @@ pub struct TasksPromoteCurrentToBackgroundResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksPromoteToBackgroundRequest {
-    /// Task identifier
-    pub id: String,
+pub struct WorkspacesListCheckpointsResult {
+    /// Workspace checkpoints in chronological order. Empty when workspace is not enabled.
+    pub checkpoints: Vec<WorkspacesCheckpoints>,
 }
 
-/// Indicates whether the task was successfully promoted to background mode.
+/// Relative paths of files stored in the session workspace files directory.
 ///
 /// <div class="warning">
 ///
@@ -16422,24 +21044,12 @@ pub struct TasksPromoteToBackgroundRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksPromoteToBackgroundResult {
-    /// Whether the task was successfully promoted to background mode
-    pub promoted: bool,
+pub struct WorkspacesListFilesResult {
+    /// Relative file paths in the workspace files directory
+    pub files: Vec<String>,
 }
 
-/// Refresh metadata for any detached background shells the runtime knows about. Use after a long pause to pick up exit/output state for shells running outside the agent loop.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct TasksRefreshResult {}
-
-/// Identifier of the completed or cancelled task to remove from tracking.
+/// Autopilot objective file content, or null when missing.
 ///
 /// <div class="warning">
 ///
@@ -16449,12 +21059,12 @@ pub struct TasksRefreshResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksRemoveRequest {
-    /// Task identifier
-    pub id: String,
+pub struct WorkspacesReadAutopilotObjectiveResult {
+    /// Autopilot objective file content, or null when missing.
+    pub content: Option<String>,
 }
 
-/// Indicates whether the task was removed. False when the task does not exist or is still running/idle.
+/// Checkpoint number to read.
 ///
 /// <div class="warning">
 ///
@@ -16464,12 +21074,12 @@ pub struct TasksRemoveRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksRemoveResult {
-    /// Whether the task was removed. Returns false if the task does not exist or is still running/idle (cancel it first).
-    pub removed: bool,
+pub struct WorkspacesReadCheckpointRequest {
+    /// Checkpoint number to read
+    pub number: i64,
 }
 
-/// Identifier of the target agent task, message content, and optional sender agent ID.
+/// Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.
 ///
 /// <div class="warning">
 ///
@@ -16479,17 +21089,12 @@ pub struct TasksRemoveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksSendMessageRequest {
-    /// Agent ID of the sender, if sent on behalf of another agent
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub from_agent_id: Option<String>,
-    /// Agent task identifier
-    pub id: String,
-    /// Message content to send to the agent
-    pub message: String,
+pub struct WorkspacesReadCheckpointResult {
+    /// Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing
+    pub content: Option<String>,
 }
 
-/// Indicates whether the message was delivered, with an error message when delivery failed.
+/// Relative path of the workspace file to read.
 ///
 /// <div class="warning">
 ///
@@ -16499,15 +21104,12 @@ pub struct TasksSendMessageRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksSendMessageResult {
-    /// Error message if delivery failed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Whether the message was successfully delivered or steered
-    pub sent: bool,
+pub struct WorkspacesReadFileRequest {
+    /// Relative path within the workspace files directory
+    pub path: String,
 }
 
-/// Agent type, prompt, name, and optional description and model override for the new task.
+/// Contents of the requested workspace file as a UTF-8 string.
 ///
 /// <div class="warning">
 ///
@@ -16517,22 +21119,12 @@ pub struct TasksSendMessageResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksStartAgentRequest {
-    /// Type of agent to start (e.g., 'explore', 'task', 'general-purpose')
-    pub agent_type: String,
-    /// Short description of the task
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Optional model override
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Short name for the agent, used to generate a human-readable ID
-    pub name: String,
-    /// Task prompt for the agent
-    pub prompt: String,
+pub struct WorkspacesReadFileResult {
+    /// File content as a UTF-8 string
+    pub content: String,
 }
 
-/// Identifier assigned to the newly started background agent task.
+/// Pasted content to save as a UTF-8 file in the session workspace.
 ///
 /// <div class="warning">
 ///
@@ -16542,24 +21134,23 @@ pub struct TasksStartAgentRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksStartAgentResult {
-    /// Generated agent ID for the background task
-    pub agent_id: String,
+pub struct WorkspacesSaveLargePasteRequest {
+    /// Pasted content to save as a UTF-8 file
+    pub content: String,
 }
 
-/// Wait until all in-flight background tasks (agents + shells) and any follow-up turns scheduled by their completions have settled. Returns when the runtime is fully drained or after an internal timeout (default 10 minutes; configurable via COPILOT_TASK_WAIT_TIMEOUT_SECONDS).
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TasksWaitForPendingResult {}
+pub struct WorkspacesSaveLargePasteResultSaved {
+    /// Filename within the workspace files directory
+    pub filename: String,
+    /// Absolute filesystem path to the saved paste file
+    pub file_path: String,
+    /// Size of the saved file in bytes
+    pub size_bytes: i64,
+}
 
-/// Feature override key/value pairs to attach to subsequent telemetry events from this session.
+/// Descriptor for the saved paste file, or null when the workspace is unavailable.
 ///
 /// <div class="warning">
 ///
@@ -16569,12 +21160,12 @@ pub struct TasksWaitForPendingResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TelemetrySetFeatureOverridesRequest {
-    /// Override key/value pairs to attach to subsequent telemetry events from this session. Replaces any previously-set overrides.
-    pub features: HashMap<String, String>,
+pub struct WorkspacesSaveLargePasteResult {
+    /// Saved-paste descriptor, or null when the workspace is unavailable (e.g. CCA runtime, non-infinite sessions, remote sessions)
+    pub saved: Option<WorkspacesSaveLargePasteResultSaved>,
 }
 
-/// Authentication-info variant for SDK-configured token authentication, carrying host and the secret token value.
+/// Rollback point for local workspace summaries.
 ///
 /// <div class="warning">
 ///
@@ -16584,19 +21175,12 @@ pub struct TelemetrySetFeatureOverridesRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct TokenAuthInfo {
-    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_user: Option<CopilotUserResponse>,
-    /// Authentication host.
-    pub host: String,
-    /// The token value itself. Treat as a secret.
-    pub token: String,
-    /// SDK-side token authentication; the host configured the token directly via the SDK.
-    pub r#type: TokenAuthInfoType,
+pub struct WorkspacesTruncateSummariesRequest {
+    /// Number of newest summaries to keep.
+    pub keep_count: i64,
 }
 
-/// Built-in tool metadata with identifier, optional namespaced name, description, input-parameter schema, and usage instructions.
+/// Public-facing workspace metadata for this session, or null if the session has no associated workspace. Excludes runtime-internal fields (GitHub IDs, summary count, internal flags).
 ///
 /// <div class="warning">
 ///
@@ -16606,23 +21190,39 @@ pub struct TokenAuthInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct Tool {
-    /// Description of what the tool does
-    pub description: String,
-    /// Optional instructions for how to use this tool effectively
+pub struct WorkspaceSummary {
+    /// Branch checked out at session start, if any
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub instructions: Option<String>,
-    /// Tool identifier (e.g., "bash", "grep", "str_replace_editor")
-    pub name: String,
-    /// Optional namespaced name for declarative filtering (e.g., "playwright/navigate" for MCP tools)
+    pub branch: Option<String>,
+    /// ISO 8601 timestamp when the workspace was created
+    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Current working directory at session start
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub namespaced_name: Option<String>,
-    /// JSON Schema for the tool's input parameters
+    pub cwd: Option<String>,
+    /// Resolved git root for cwd, if any
+    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Repository host type, if known
+    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<WorkspaceSummaryHostType>,
+    /// Workspace identifier (1:1 with sessionId)
+    pub id: String,
+    /// Display name for the session, if set
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub parameters: Option<HashMap<String, serde_json::Value>>,
+    pub name: Option<String>,
+    /// Repository identifier in 'owner/repo' or 'org/project/repo' format, if any
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// ISO 8601 timestamp when the workspace was last updated
+    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
+    pub updated_at: Option<String>,
+    /// Whether the display name was explicitly set by the user
+    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
+    pub user_named: Option<bool>,
 }
 
-/// Built-in tools available for the requested model, with their parameters and instructions.
+/// Workspace metadata fields to update.
 ///
 /// <div class="warning">
 ///
@@ -16632,12 +21232,16 @@ pub struct Tool {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ToolList {
-    /// List of available built-in tools with metadata
-    pub tools: Vec<Tool>,
+pub struct WorkspacesUpdateMetadataRequest {
+    /// Opaque workspace context supplied by the session host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context: Option<serde_json::Value>,
+    /// Optional workspace display name override.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
 }
 
-/// Current lightweight tool metadata snapshot for the session.
+/// Autopilot objective file content to persist.
 ///
 /// <div class="warning">
 ///
@@ -16647,24 +21251,12 @@ pub struct ToolList {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ToolsGetCurrentMetadataResult {
-    /// Current tool metadata, or null when tools have not been initialized yet
-    pub tools: Option<Vec<CurrentToolMetadata>>,
+pub struct WorkspacesWriteAutopilotObjectiveRequest {
+    /// Autopilot objective file content.
+    pub content: String,
 }
 
-/// Resolve, build, and validate the runtime tool list for this session. Subagent sessions and consumer flows that need an initialized tool set before `send` invoke this. Default base-class implementation is a no-op for sessions that don't support tool validation.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ToolsInitializeAndValidateResult {}
-
-/// Optional model identifier whose tool overrides should be applied to the listing.
+/// Result of writing the autopilot objective file.
 ///
 /// <div class="warning">
 ///
@@ -16674,25 +21266,12 @@ pub struct ToolsInitializeAndValidateResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ToolsListRequest {
-    /// Optional model ID — when provided, the returned tool list reflects model-specific overrides
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
+pub struct WorkspacesWriteAutopilotObjectiveResult {
+    /// Filesystem operation performed.
+    pub operation: String,
 }
 
-/// Empty result after applying subagent settings
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ToolsUpdateSubagentSettingsResult {}
-
-/// Selectable option for a UI elicitation multi-select array item, with submitted value and display label.
+/// List of Copilot models available to the resolved user, including capabilities and billing metadata.
 ///
 /// <div class="warning">
 ///
@@ -16702,14 +21281,12 @@ pub struct ToolsUpdateSubagentSettingsResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationArrayAnyOfFieldItemsAnyOf {
-    /// Value submitted when this option is selected.
-    pub r#const: String,
-    /// Display label for this option.
-    pub title: String,
+pub struct ModelsListResult {
+    /// List of available models with full metadata
+    pub models: Vec<Model>,
 }
 
-/// Schema applied to each item in the array.
+/// The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
 ///
 /// <div class="warning">
 ///
@@ -16717,14 +21294,14 @@ pub struct UIElicitationArrayAnyOfFieldItemsAnyOf {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct UIElicitationArrayAnyOfFieldItems {
-    /// Selectable options, each with a value and a display label.
-    pub any_of: Vec<UIElicitationArrayAnyOfFieldItemsAnyOf>,
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelsGetBuiltInCatalogResult {
+    /// Built-in model entries.
+    pub models: Vec<BuiltInModelCatalogEntry>,
 }
 
-/// Multi-select string field where each option pairs a value with a display label.
+/// Built-in tools available for the requested model, with their parameters and instructions.
 ///
 /// <div class="warning">
 ///
@@ -16734,29 +21311,12 @@ pub struct UIElicitationArrayAnyOfFieldItems {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationArrayAnyOfField {
-    /// Default values selected when the form is first shown.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default: Option<Vec<String>>,
-    /// Help text describing the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Schema applied to each item in the array.
-    pub items: UIElicitationArrayAnyOfFieldItems,
-    /// Maximum number of items the user may select.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_items: Option<i64>,
-    /// Minimum number of items the user must select.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub min_items: Option<i64>,
-    /// Human-readable label for the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// Type discriminator. Always "array".
-    pub r#type: UIElicitationArrayAnyOfFieldType,
+pub struct ToolsListResult {
+    /// List of available built-in tools with metadata
+    pub tools: Vec<Tool>,
 }
 
-/// Schema applied to each item in the array.
+/// User-configured MCP servers, keyed by server name.
 ///
 /// <div class="warning">
 ///
@@ -16766,14 +21326,12 @@ pub struct UIElicitationArrayAnyOfField {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationArrayEnumFieldItems {
-    /// Allowed string values for each selected item.
-    pub r#enum: Vec<String>,
-    /// Type discriminator. Always "string".
-    pub r#type: UIElicitationArrayEnumFieldItemsType,
+pub struct McpConfigListResult {
+    /// All MCP servers from user config, keyed by name
+    pub servers: HashMap<String, serde_json::Value>,
 }
 
-/// Multi-select string field whose allowed values are defined inline.
+/// Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.
 ///
 /// <div class="warning">
 ///
@@ -16783,29 +21341,14 @@ pub struct UIElicitationArrayEnumFieldItems {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationArrayEnumField {
-    /// Default values selected when the form is first shown.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default: Option<Vec<String>>,
-    /// Help text describing the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Schema applied to each item in the array.
-    pub items: UIElicitationArrayEnumFieldItems,
-    /// Maximum number of items the user may select.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_items: Option<i64>,
-    /// Minimum number of items the user must select.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub min_items: Option<i64>,
-    /// Human-readable label for the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// Type discriminator. Always "array".
-    pub r#type: UIElicitationArrayEnumFieldType,
+pub struct ExtensionsDiscoverResult {
+    /// Discovered user and enabled installed-plugin extensions from persisted Copilot home state
+    pub extensions: Vec<DiscoveredExtension>,
+    /// Effective extension loading mode. Defaults to load_and_augment when unset.
+    pub mode: DiscoveredExtensionMode,
 }
 
-/// JSON Schema describing the form fields to present to the user
+/// Plugins installed in user/global state.
 ///
 /// <div class="warning">
 ///
@@ -16815,17 +21358,12 @@ pub struct UIElicitationArrayEnumField {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationSchema {
-    /// Form field definitions, keyed by field name
-    pub properties: HashMap<String, serde_json::Value>,
-    /// List of required field names
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub required: Option<Vec<String>>,
-    /// Schema type indicator (always 'object')
-    pub r#type: UIElicitationSchemaType,
+pub struct PluginsListResult {
+    /// Installed plugins
+    pub plugins: Vec<InstalledPluginInfo>,
 }
 
-/// Prompt message and JSON schema describing the form fields to elicit from the user.
+/// Result of installing a plugin.
 ///
 /// <div class="warning">
 ///
@@ -16835,14 +21373,20 @@ pub struct UIElicitationSchema {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationRequest {
-    /// Message describing what information is needed from the user
-    pub message: String,
-    /// JSON Schema describing the form fields to present to the user
-    pub requested_schema: UIElicitationSchema,
+pub struct PluginsInstallResult {
+    /// Set when the install path is deprecated (e.g. direct repo / URL / local installs). Callers should surface this to end users.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deprecation_warning: Option<String>,
+    /// The newly installed plugin's metadata
+    pub plugin: InstalledPluginInfo,
+    /// Optional post-install message provided by the plugin (e.g. setup instructions)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub post_install_message: Option<String>,
+    /// Number of skills discovered and installed from the plugin
+    pub skills_installed: i64,
 }
 
-/// The elicitation response (accept with form values, decline, or cancel)
+/// Result of updating a single plugin.
 ///
 /// <div class="warning">
 ///
@@ -16852,15 +21396,18 @@ pub struct UIElicitationRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationResponse {
-    /// The user's response: accept (submitted), decline (rejected), or cancel (dismissed)
-    pub action: UIElicitationResponseAction,
-    /// The form values submitted by the user (present when action is 'accept')
+pub struct PluginsUpdateResult {
+    /// Version after the update, when reported by the plugin manifest
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub content: Option<HashMap<String, serde_json::Value>>,
+    pub new_version: Option<String>,
+    /// Version that was previously installed, when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub previous_version: Option<String>,
+    /// Number of skills discovered and installed after the update
+    pub skills_installed: i64,
 }
 
-/// Indicates whether the elicitation response was accepted; false if it was already resolved by another client.
+/// Result of updating all installed plugins.
 ///
 /// <div class="warning">
 ///
@@ -16870,12 +21417,12 @@ pub struct UIElicitationResponse {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationResult {
-    /// Whether the response was accepted. False if the request was already resolved by another client.
-    pub success: bool,
+pub struct PluginsUpdateAllResult {
+    /// Per-plugin update results in deterministic order.
+    pub results: Vec<PluginUpdateAllEntry>,
 }
 
-/// Boolean field rendered as a yes/no toggle.
+/// All registered marketplaces, including built-in defaults.
 ///
 /// <div class="warning">
 ///
@@ -16885,21 +21432,12 @@ pub struct UIElicitationResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationSchemaPropertyBoolean {
-    /// Default value selected when the form is first shown.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default: Option<bool>,
-    /// Help text describing the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Human-readable label for the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// Type discriminator. Always "boolean".
-    pub r#type: UIElicitationSchemaPropertyBooleanType,
+pub struct PluginsMarketplacesListResult {
+    /// Registered marketplaces
+    pub marketplaces: Vec<MarketplaceInfo>,
 }
 
-/// Numeric field accepting either a number or an integer.
+/// Result of registering a new marketplace.
 ///
 /// <div class="warning">
 ///
@@ -16909,27 +21447,12 @@ pub struct UIElicitationSchemaPropertyBoolean {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationSchemaPropertyNumber {
-    /// Default value populated in the input when the form is first shown.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default: Option<f64>,
-    /// Help text describing the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Maximum allowed value (inclusive).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub maximum: Option<f64>,
-    /// Minimum allowed value (inclusive).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub minimum: Option<f64>,
-    /// Human-readable label for the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// Numeric type accepted by the field.
-    pub r#type: UIElicitationSchemaPropertyNumberType,
+pub struct PluginsMarketplacesAddResult {
+    /// Final name of the marketplace as resolved from its manifest
+    pub name: String,
 }
 
-/// Free-text string field with optional length and format constraints.
+/// Outcome of the remove attempt, including dependent-plugin info when applicable.
 ///
 /// <div class="warning">
 ///
@@ -16939,30 +21462,15 @@ pub struct UIElicitationSchemaPropertyNumber {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationSchemaPropertyString {
-    /// Default value populated in the input when the form is first shown.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default: Option<String>,
-    /// Help text describing the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Optional format hint that constrains the accepted input.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub format: Option<UIElicitationSchemaPropertyStringFormat>,
-    /// Maximum number of characters allowed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_length: Option<i64>,
-    /// Minimum number of characters required.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub min_length: Option<i64>,
-    /// Human-readable label for the field.
+pub struct PluginsMarketplacesRemoveResult {
+    /// Names of installed plugins that prevented removal. Populated only when `removed=false`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// Type discriminator. Always "string".
-    pub r#type: UIElicitationSchemaPropertyStringType,
+    pub dependent_plugins: Option<Vec<String>>,
+    /// True when the marketplace was actually removed. False when removal was skipped because the marketplace has dependent plugins and `force` was not set.
+    pub removed: bool,
 }
 
-/// Single-select string field whose allowed values are defined inline.
+/// Plugins advertised by the marketplace.
 ///
 /// <div class="warning">
 ///
@@ -16972,26 +21480,12 @@ pub struct UIElicitationSchemaPropertyString {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationStringEnumField {
-    /// Default value selected when the form is first shown.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default: Option<String>,
-    /// Help text describing the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Allowed string values.
-    pub r#enum: Vec<String>,
-    /// Optional display labels for each enum value, in the same order as `enum`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enum_names: Option<Vec<String>>,
-    /// Human-readable label for the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// Type discriminator. Always "string".
-    pub r#type: UIElicitationStringEnumFieldType,
+pub struct PluginsMarketplacesBrowseResult {
+    /// Plugins advertised by the marketplace
+    pub plugins: Vec<MarketplacePluginInfo>,
 }
 
-/// Selectable option for a UI elicitation single-select string field, with submitted value and display label.
+/// Result of refreshing one or more marketplace catalogs.
 ///
 /// <div class="warning">
 ///
@@ -17001,14 +21495,12 @@ pub struct UIElicitationStringEnumField {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationStringOneOfFieldOneOf {
-    /// Value submitted when this option is selected.
-    pub r#const: String,
-    /// Display label for this option.
-    pub title: String,
+pub struct PluginsMarketplacesRefreshResult {
+    /// Per-marketplace refresh results in deterministic order.
+    pub results: Vec<MarketplaceRefreshEntry>,
 }
 
-/// Single-select string field where each option pairs a value with a display label.
+/// Skills discovered across global and project sources.
 ///
 /// <div class="warning">
 ///
@@ -17018,46 +21510,30 @@ pub struct UIElicitationStringOneOfFieldOneOf {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIElicitationStringOneOfField {
-    /// Default value selected when the form is first shown.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default: Option<String>,
-    /// Help text describing the field.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Selectable options, each with a value and a display label.
-    pub one_of: Vec<UIElicitationStringOneOfFieldOneOf>,
-    /// Human-readable label for the field.
+pub struct SkillsDiscoverResult {
+    /// Messages for skills that failed to load (e.g. malformed SKILL.md). Empty when host skills are excluded so host-local paths are not disclosed to multitenant callers.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// Type discriminator. Always "string".
-    pub r#type: UIElicitationStringOneOfFieldType,
+    pub errors: Option<Vec<String>>,
+    /// All discovered skills across all sources
+    pub skills: Vec<ServerSkill>,
 }
 
-/// Transient question to answer without adding it to conversation history.
+/// Canonical locations where skills can be created so the runtime will recognize them.
 ///
 /// <div class="warning">
 ///
 /// **Experimental.** This type is part of an experimental wire-protocol surface
 /// and may change or be removed in future SDK or CLI releases.
 ///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct UIEphemeralQueryRequest {
-    /// In-process `AbortSignal` forwarded to the model client to cancel an in-flight request. Marked internal: excluded from the public SDK surface. Replaced by an explicit cancellation token + cancel RPC in the SDK migration.
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) abort_signal: Option<serde_json::Value>,
-    /// In-process streaming callback `(text) => void` invoked with each token as the model emits it. Marked internal: excluded from the public SDK surface. In a process-separated SDK this is replaced by a streaming RPC that yields chunks and a final answer.
-    #[doc(hidden)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) on_chunk: Option<serde_json::Value>,
-    /// Question to answer from the current conversation context.
-    pub question: String,
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsGetDiscoveryPathsResult {
+    /// Canonical skill create/discovery directories, in priority order
+    pub paths: Vec<SkillDiscoveryPath>,
 }
 
-/// Transient answer generated from current conversation context.
+/// Agents discovered across user, project, plugin, and remote sources.
 ///
 /// <div class="warning">
 ///
@@ -17067,12 +21543,12 @@ pub struct UIEphemeralQueryRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIEphemeralQueryResult {
-    /// Full assistant response text.
-    pub answer: String,
+pub struct AgentsDiscoverResult {
+    /// All discovered agents across all sources
+    pub agents: Vec<AgentInfo>,
 }
 
-/// User response for a pending exit-plan-mode request, with approval state, selected action, auto-approve flag, and feedback.
+/// Canonical locations where custom agents can be created so the runtime will recognize them.
 ///
 /// <div class="warning">
 ///
@@ -17082,24 +21558,12 @@ pub struct UIEphemeralQueryResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIExitPlanModeResponse {
-    /// Whether the plan was approved.
-    pub approved: bool,
-    /// Whether subsequent edits should be auto-approved without confirmation.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approve_edits: Option<bool>,
-    /// When true, the agent is instructed to end its turn without starting implementation so the client can restore the session model and auto-submit a fresh implementation turn on it. Set only when a distinct plan configuration (a different model, reasoning effort, or context tier) actually ran the planning turn.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub defer_implementation: Option<bool>,
-    /// Feedback from the user when they declined the plan or requested changes.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub feedback: Option<String>,
-    /// The action the user selected. Defaults to 'autopilot' when autoApproveEdits is true, otherwise 'interactive'.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub selected_action: Option<UIExitPlanModeAction>,
+pub struct AgentsGetDiscoveryPathsResult {
+    /// Canonical agent create/discovery directories, in priority order
+    pub paths: Vec<AgentDiscoveryPath>,
 }
 
-/// Request ID of a pending `auto_mode_switch.requested` event and the user's response.
+/// Instruction sources discovered across user, repository, and plugin sources.
 ///
 /// <div class="warning">
 ///
@@ -17109,14 +21573,12 @@ pub struct UIExitPlanModeResponse {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIHandlePendingAutoModeSwitchRequest {
-    /// The unique request ID from the auto_mode_switch.requested event
-    pub request_id: RequestId,
-    /// User's choice for auto-mode switching: yes (allow this turn), yes_always (allow + persist as setting), or no (decline).
-    pub response: UIAutoModeSwitchResponse,
+pub struct InstructionsDiscoverResult {
+    /// All discovered instruction sources
+    pub sources: Vec<InstructionSource>,
 }
 
-/// Pending elicitation request ID and the user's response (accept/decline/cancel + form values).
+/// Canonical files and directories where custom instructions can be created so the runtime will recognize them.
 ///
 /// <div class="warning">
 ///
@@ -17126,14 +21588,12 @@ pub struct UIHandlePendingAutoModeSwitchRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIHandlePendingElicitationRequest {
-    /// The unique request ID from the elicitation.requested event
-    pub request_id: RequestId,
-    /// The elicitation response (accept with form values, decline, or cancel)
-    pub result: UIElicitationResponse,
+pub struct InstructionsGetDiscoveryPathsResult {
+    /// Canonical instruction create/discovery files and directories, in priority order
+    pub paths: Vec<InstructionDiscoveryPath>,
 }
 
-/// Request ID of a pending `exit_plan_mode.requested` event and the user's response.
+/// Slash commands available in the session, after applying any include/exclude filters.
 ///
 /// <div class="warning">
 ///
@@ -17143,14 +21603,12 @@ pub struct UIHandlePendingElicitationRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIHandlePendingExitPlanModeRequest {
-    /// The unique request ID from the exit_plan_mode.requested event
-    pub request_id: RequestId,
-    /// User response for a pending exit-plan-mode request, with approval state, selected action, auto-approve flag, and feedback.
-    pub response: UIExitPlanModeResponse,
+pub struct CommandsListResult {
+    /// Commands available in this session
+    pub commands: Vec<SlashCommandInfo>,
 }
 
-/// Indicates whether the pending UI request was resolved by this call.
+/// Result of opening a session.
 ///
 /// <div class="warning">
 ///
@@ -17160,12 +21618,31 @@ pub struct UIHandlePendingExitPlanModeRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIHandlePendingResult {
-    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
-    pub success: bool,
+pub struct SessionsOpenResult {
+    /// Remote session metadata, present when status is `connected`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub metadata: Option<RemoteSessionMetadataValue>,
+    /// Handoff progress steps, present when status is `handed_off`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub progress: Option<Vec<SessionsOpenProgress>>,
+    /// Remote session ID, present when status is `connected`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_session_id: Option<SessionId>,
+    /// In-process SessionClientApi handle for the opened session, returned to CLI callers as a transitional shortcut. Marked internal so the public SDK surface does not expose it; SDK consumers should construct per-session clients from `sessionId` instead.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) session_api: Option<serde_json::Value>,
+    /// Opened session ID. Omitted when status is `not_found`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+    /// Startup prompts queued by user-level hook configs at session creation. Only populated when status is `created`; resumed sessions return an empty array.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub startup_prompts: Option<Vec<String>>,
+    /// Outcome of the open request.
+    pub status: SessionsOpenStatus,
 }
 
-/// Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.
+/// Remote session connection result.
 ///
 /// <div class="warning">
 ///
@@ -17175,9 +21652,14 @@ pub struct UIHandlePendingResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIHandlePendingSamplingResponse {}
+pub struct SessionsConnectResult {
+    /// Metadata for a connected remote session.
+    pub metadata: ConnectedRemoteSessionMetadata,
+    /// SDK session ID for the connected remote session.
+    pub session_id: SessionId,
+}
 
-/// Request ID of a pending `sampling.requested` event and an optional sampling result payload (omit to reject).
+/// Sessions matching the filter, ordered most-recently-modified first.
 ///
 /// <div class="warning">
 ///
@@ -17187,15 +21669,12 @@ pub struct UIHandlePendingSamplingResponse {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIHandlePendingSamplingRequest {
-    /// The unique request ID from the sampling.requested event
-    pub request_id: RequestId,
-    /// Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub response: Option<UIHandlePendingSamplingResponse>,
+pub struct SessionsListResult {
+    /// Sessions ordered most-recently-modified first. Discriminated by `isRemote`.
+    pub sessions: Vec<serde_json::Value>,
 }
 
-/// The user's selected action for an exhausted session limit.
+/// ID of the local session bound to the given GitHub task, or omitted when none.
 ///
 /// <div class="warning">
 ///
@@ -17205,18 +21684,13 @@ pub struct UIHandlePendingSamplingRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UISessionLimitsExhaustedResponse {
-    /// Action selected by the user.
-    pub action: UISessionLimitsExhaustedResponseAction,
-    /// AI Credits to add to the current max when action is 'add'.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_ai_credits: Option<f64>,
-    /// New absolute max AI Credits when action is 'set'.
+pub struct SessionsFindByTaskIdResult {
+    /// Omitted when no local session is bound to that GitHub task
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_ai_credits: Option<f64>,
+    pub session_id: Option<SessionId>,
 }
 
-/// Request ID of a pending `session_limits_exhausted.requested` event and the user's selected limit action.
+/// Map of sessionId -> on-disk size in bytes for each session's workspace directory.
 ///
 /// <div class="warning">
 ///
@@ -17226,14 +21700,12 @@ pub struct UISessionLimitsExhaustedResponse {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIHandlePendingSessionLimitsExhaustedRequest {
-    /// The unique request ID from the session_limits_exhausted.requested event
-    pub request_id: RequestId,
-    /// The selected session-limit action.
-    pub response: UISessionLimitsExhaustedResponse,
+pub struct SessionsGetSizesResult {
+    /// Map of sessionId -> on-disk size in bytes for the session's workspace directory
+    pub sizes: HashMap<String, i64>,
 }
 
-/// User response for a pending user-input request, with answer text and whether it was typed freeform.
+/// Map of sessionId -> bytes freed by removing the session's workspace directory.
 ///
 /// <div class="warning">
 ///
@@ -17243,14 +21715,12 @@ pub struct UIHandlePendingSessionLimitsExhaustedRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIUserInputResponse {
-    /// The user's answer text
-    pub answer: String,
-    /// True if the user typed a freeform response, false if they selected a presented choice. Used by telemetry to differentiate between free text input and choice selection.
-    pub was_freeform: bool,
+pub struct SessionsBulkDeleteResult {
+    /// Map of sessionId -> bytes freed by removing the session's workspace directory. Sessions whose deletion failed are omitted from this map (failures are logged on the server but not surfaced per-id; check the map for absent IDs to detect them).
+    pub freed_bytes: HashMap<String, i64>,
 }
 
-/// Request ID of a pending `user_input.requested` event and the user's response.
+/// Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.
 ///
 /// <div class="warning">
 ///
@@ -17260,14 +21730,20 @@ pub struct UIUserInputResponse {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIHandlePendingUserInputRequest {
-    /// The unique request ID from the user_input.requested event
-    pub request_id: RequestId,
-    /// User response for a pending user-input request, with answer text and whether it was typed freeform.
-    pub response: UIUserInputResponse,
+pub struct SessionsPruneOldResult {
+    /// Session IDs that would be deleted in dry-run mode (always empty otherwise)
+    pub candidates: Vec<String>,
+    /// Session IDs that were deleted (always empty in dry-run mode)
+    pub deleted: Vec<String>,
+    /// True when no deletions were actually performed
+    pub dry_run: bool,
+    /// Total bytes freed (actual when not dry-run, projected when dry-run)
+    pub freed_bytes: i64,
+    /// Session IDs that were skipped (e.g., named sessions)
+    pub skipped: Vec<String>,
 }
 
-/// Register an in-process handler for `auto_mode_switch.requested` events. The caller still attaches the actual listener via the standard event-subscription mechanism; this registration solely tells the server bridge to skip its own dispatch (so a remote client doesn't race the in-process handler for the same requestId).
+/// The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.
 ///
 /// <div class="warning">
 ///
@@ -17277,12 +21753,12 @@ pub struct UIHandlePendingUserInputRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIRegisterDirectAutoModeSwitchHandlerResult {
-    /// Opaque handle representing the registration. Pass this same handle to `unregisterDirectAutoModeSwitchHandler` when the in-process handler is no longer active. Multiple registrations are reference-counted; the server bridge will only dispatch auto-mode-switch requests when no handles are active.
-    pub handle: String,
+pub struct SessionsEnrichMetadataResult {
+    /// Enriched records, with summary and context backfilled. Sessions confirmed empty and unnamed may be omitted.
+    pub sessions: Vec<LocalSessionMetadataValue>,
 }
 
-/// Opaque handle previously returned by `registerDirectAutoModeSwitchHandler` to release.
+/// Queued repo-level startup prompts and the total hook command count after loading.
 ///
 /// <div class="warning">
 ///
@@ -17292,12 +21768,14 @@ pub struct UIRegisterDirectAutoModeSwitchHandlerResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIUnregisterDirectAutoModeSwitchHandlerRequest {
-    /// Handle previously returned by `registerDirectAutoModeSwitchHandler`
-    pub handle: String,
+pub struct SessionsLoadDeferredRepoHooksResult {
+    /// Total hook command count (user + plugin + repo) loaded for the session by this call. Captured atomically with startupPrompts so callers don't need to read a separate counter.
+    pub hook_count: i64,
+    /// Repo-level startup prompts queued from repo hook configs. Empty on resume, when no repo configs were pending, or when disableAllHooks is set.
+    pub startup_prompts: Vec<String>,
 }
 
-/// Indicates whether the handle was active and the registration count was decremented.
+/// Wrapper for the singleton's current status.
 ///
 /// <div class="warning">
 ///
@@ -17307,30 +21785,29 @@ pub struct UIUnregisterDirectAutoModeSwitchHandlerRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UIUnregisterDirectAutoModeSwitchHandlerResult {
-    /// True if the handle was active and decremented the counter; false if the handle was unknown.
-    pub unregistered: bool,
+pub struct SessionsStartRemoteControlResult {
+    /// State of the runtime-managed remote-control singleton.
+    pub status: serde_json::Value,
 }
 
-/// Configured per-agent subagent overrides
+/// Outcome of a transferRemoteControl call.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UpdateSubagentSettingsRequestSubagents {
-    /// Per-agent settings keyed by subagent agent_type
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub agents: Option<HashMap<String, SubagentSettingsEntry>>,
-    /// Names of subagents the user has turned off; they cannot be dispatched
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub disabled_subagents: Option<Vec<String>>,
-    /// Maximum number of subagents that can run concurrently; applies to usage-based billing users only
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_concurrency: Option<i32>,
-    /// Maximum subagent nesting depth; applies to usage-based billing users only
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_depth: Option<i32>,
+pub struct SessionsTransferRemoteControlResult {
+    /// State of the runtime-managed remote-control singleton.
+    pub status: serde_json::Value,
+    /// Whether the rebinding actually happened.
+    pub transferred: bool,
 }
 
-/// Subagent settings to apply to the current session
+/// Wrapper for the singleton's current status.
 ///
 /// <div class="warning">
 ///
@@ -17340,12 +21817,12 @@ pub struct UpdateSubagentSettingsRequestSubagents {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UpdateSubagentSettingsRequest {
-    /// Subagent settings to apply, or null to clear the live session override
-    pub subagents: Option<UpdateSubagentSettingsRequestSubagents>,
+pub struct SessionsSetRemoteControlSteeringResult {
+    /// State of the runtime-managed remote-control singleton.
+    pub status: serde_json::Value,
 }
 
-/// Aggregated code change metrics
+/// Outcome of a stopRemoteControl call.
 ///
 /// <div class="warning">
 ///
@@ -17355,18 +21832,14 @@ pub struct UpdateSubagentSettingsRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UsageMetricsCodeChanges {
-    /// Distinct file paths modified during the session
-    pub files_modified: Vec<String>,
-    /// Number of distinct files modified
-    pub files_modified_count: i64,
-    /// Total lines of code added
-    pub lines_added: i64,
-    /// Total lines of code removed
-    pub lines_removed: i64,
+pub struct SessionsStopRemoteControlResult {
+    /// State of the runtime-managed remote-control singleton.
+    pub status: serde_json::Value,
+    /// Whether the singleton was actually torn down by this call.
+    pub stopped: bool,
 }
 
-/// Request count and cost metrics for this model
+/// Wrapper for the singleton's current status.
 ///
 /// <div class="warning">
 ///
@@ -17376,14 +21849,12 @@ pub struct UsageMetricsCodeChanges {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UsageMetricsModelMetricRequests {
-    /// User-initiated premium request cost (with multiplier applied)
-    pub cost: f64,
-    /// Number of API requests made with this model
-    pub count: i64,
+pub struct SessionsGetRemoteControlStatusResult {
+    /// State of the runtime-managed remote-control singleton.
+    pub status: serde_json::Value,
 }
 
-/// Per-model token-detail entry containing the accumulated token count for one token type.
+/// Handle for releasing the extension tool registration.
 ///
 /// <div class="warning">
 ///
@@ -17393,12 +21864,13 @@ pub struct UsageMetricsModelMetricRequests {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UsageMetricsModelMetricTokenDetail {
-    /// Accumulated token count for this token type
-    pub token_count: i64,
+pub(crate) struct SessionsRegisterExtensionToolsOnSessionResult {
+    /// In-process unsubscribe function (CLI-only optimization). Marked internal: replaced by an explicit `extensions.unregister` RPC in the SDK migration.
+    #[doc(hidden)]
+    pub(crate) unsubscribe: serde_json::Value,
 }
 
-/// Token usage metrics for this model
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17408,21 +21880,12 @@ pub struct UsageMetricsModelMetricTokenDetail {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UsageMetricsModelMetricUsage {
-    /// Total tokens read from prompt cache
-    pub cache_read_tokens: i64,
-    /// Total tokens written to prompt cache
-    pub cache_write_tokens: i64,
-    /// Total input tokens consumed
-    pub input_tokens: i64,
-    /// Total output tokens produced
-    pub output_tokens: i64,
-    /// Total output tokens used for reasoning
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_tokens: Option<i64>,
+pub struct SessionSuspendParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.
+/// Result of sending a user message
 ///
 /// <div class="warning">
 ///
@@ -17432,23 +21895,12 @@ pub struct UsageMetricsModelMetricUsage {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UsageMetricsModelMetric {
-    /// Latest known prompt-cache expiration for this model. A timestamp in the past indicates that the observed cache has expired.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cache_expires_at: Option<String>,
-    /// Request count and cost metrics for this model
-    pub requests: UsageMetricsModelMetricRequests,
-    /// Token count details per type
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub token_details: Option<HashMap<String, UsageMetricsModelMetricTokenDetail>>,
-    /// Accumulated nano-AI units cost for this model
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub total_nano_aiu: Option<f64>,
-    /// Token usage metrics for this model
-    pub usage: UsageMetricsModelMetricUsage,
+pub struct SessionSendResult {
+    /// Unique identifier assigned to the message
+    pub message_id: String,
 }
 
-/// Session-wide token-detail entry containing the accumulated token count for one token type.
+/// Result of sending zero or more user messages
 ///
 /// <div class="warning">
 ///
@@ -17458,12 +21910,12 @@ pub struct UsageMetricsModelMetric {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UsageMetricsTokenDetail {
-    /// Accumulated token count for this token type
-    pub token_count: i64,
+pub struct SessionSendMessagesResult {
+    /// Unique identifiers assigned to the messages, one per provided message in order. Empty when no messages were provided.
+    pub message_ids: Vec<String>,
 }
 
-/// Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
+/// Result of aborting the current turn
 ///
 /// <div class="warning">
 ///
@@ -17473,35 +21925,15 @@ pub struct UsageMetricsTokenDetail {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UsageGetMetricsResult {
-    /// Aggregated code change metrics
-    pub code_changes: UsageMetricsCodeChanges,
-    /// Currently active model identifier
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub current_model: Option<String>,
-    /// Input tokens from the most recent main-agent API call
-    pub last_call_input_tokens: i64,
-    /// Output tokens from the most recent main-agent API call
-    pub last_call_output_tokens: i64,
-    /// Per-model token and request metrics, keyed by model identifier
-    pub model_metrics: HashMap<String, UsageMetricsModelMetric>,
-    /// ISO 8601 timestamp when the session started
-    pub session_start_time: String,
-    /// Session-wide per-token-type accumulated token counts
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub token_details: Option<HashMap<String, UsageMetricsTokenDetail>>,
-    /// Total time spent in model API calls (milliseconds)
-    pub total_api_duration_ms: i64,
-    /// Session-wide accumulated nano-AI units cost
+pub struct SessionAbortResult {
+    /// Error message if the abort failed
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub total_nano_aiu: Option<f64>,
-    /// Total user-initiated premium request cost across all models (may be fractional due to multipliers)
-    pub total_premium_request_cost: f64,
-    /// Raw count of user-initiated API requests
-    pub total_user_requests: i64,
+    pub error: Option<String>,
+    /// Whether the abort completed successfully
+    pub success: bool,
 }
 
-/// Authentication-info variant for OAuth user auth, with host and login; the token remains in the runtime secret store.
+/// Result of interrupting the main agent turn.
 ///
 /// <div class="warning">
 ///
@@ -17511,19 +21943,12 @@ pub struct UsageGetMetricsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UserAuthInfo {
-    /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_user: Option<CopilotUserResponse>,
-    /// Authentication host.
-    pub host: String,
-    /// OAuth user login.
-    pub login: String,
-    /// OAuth user authentication. The token itself is held in the runtime's secret token store (keyed by host+login) and is NOT carried in this struct.
-    pub r#type: UserAuthInfoType,
+pub struct SessionInterruptMainTurnResult {
+    /// Whether an in-flight main agent turn was interrupted. False when the main loop was not processing.
+    pub interrupted: bool,
 }
 
-/// Result of a user-requested shell command.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17533,22 +21958,12 @@ pub struct UserAuthInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UserRequestedShellCommandResult {
-    /// Error output when the execution failed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Process exit code, when available
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exit_code: Option<i64>,
-    /// Captured command output
-    pub output: String,
-    /// Whether the command completed successfully
-    pub success: bool,
-    /// Tool call id emitted for the shell execution
-    pub tool_call_id: String,
+pub struct SessionCancelAllBackgroundAgentsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// A single user setting's effective value alongside its default, so consumers can render settings left at their default.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17558,16 +21973,12 @@ pub struct UserRequestedShellCommandResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UserSettingMetadata {
-    /// The centrally-known default for this setting (null when no default is registered).
-    pub default: serde_json::Value,
-    /// True when the user has not set an explicit value for this setting (i.e. it is left at its default). Reflects whether the user has overridden the key, not whether the effective value happens to equal the default — a key explicitly set to a value identical to the default still reports false.
-    pub is_default: bool,
-    /// The effective value: the user's value if set, otherwise the default.
-    pub value: serde_json::Value,
+pub struct SessionGitHubAuthGetStatusParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Per-key metadata for every known user setting (settings.json overlaid with the legacy config.json, config.json wins), including settings left at their default. Excludes repository- and enterprise-managed overrides.
+/// Authentication status and account metadata for the session.
 ///
 /// <div class="warning">
 ///
@@ -17577,12 +21988,27 @@ pub struct UserSettingMetadata {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UserSettingsGetResult {
-    /// Every known user setting keyed by setting name, each with its effective value, default, and whether it is at the default.
-    pub settings: HashMap<String, UserSettingMetadata>,
+pub struct SessionGitHubAuthGetStatusResult {
+    /// Authentication type
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_type: Option<AuthInfoType>,
+    /// Copilot plan tier (e.g., individual_pro, business)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_plan: Option<String>,
+    /// Authentication host URL
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub host: Option<String>,
+    /// Whether the session has resolved authentication
+    pub is_authenticated: bool,
+    /// Authenticated login/username, if available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub login: Option<String>,
+    /// Human-readable authentication status description
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_message: Option<String>,
 }
 
-/// Partial user settings to write to settings.json. Each top-level key is written individually, replacing the existing value; a key whose value is null is removed.
+/// Indicates whether the credential update succeeded.
 ///
 /// <div class="warning">
 ///
@@ -17592,12 +22018,15 @@ pub struct UserSettingsGetResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UserSettingsSetRequest {
-    /// Partial user settings to write, as a free-form object keyed by setting name
-    pub settings: serde_json::Value,
+pub struct SessionGitHubAuthSetCredentialsResult {
+    /// Whether the session ended up with a populated `copilotUser` for the installed credentials. `true` when the supplied credential already carried `copilotUser` or it was successfully re-resolved server-side. `false` when the credential is installed without `copilotUser` — either re-resolution failed, or the variant cannot be re-resolved from the credential alone (only the raw-token variants `token`, `env`, and `gh-cli` can). In both `false` cases the token swap still applied, but plan/quota/billing metadata is degraded. Present whenever a credential was supplied; omitted only when no credential was supplied (no-op call).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub copilot_user_resolved: Option<bool>,
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Outcome of writing user settings.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17607,12 +22036,12 @@ pub struct UserSettingsSetRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UserSettingsSetResult {
-    /// Top-level keys whose write landed in settings.json but is shadowed by a value still present in the legacy config.json (config.json wins on read). The write does not take effect until the legacy value is removed.
-    pub shadowed_keys: Vec<String>,
+pub struct SessionGitHubAuthGetCurrentAuthInfoParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Current sharing status and shareable GitHub URL for a session.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17622,18 +22051,12 @@ pub struct UserSettingsSetResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct VisibilityGetResult {
-    /// Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub share_url: Option<String>,
-    /// Current sharing status. Absent when the session is not synced or the status could not be retrieved (e.g. the user is not authenticated).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<SessionVisibilityStatus>,
-    /// Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the session cannot be shared and `status`/`shareUrl` are absent.
-    pub synced: bool,
+pub struct SessionGitHubAuthGetAllAuthAvailableParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Desired sharing status for the session.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17643,12 +22066,12 @@ pub struct VisibilityGetResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct VisibilitySetRequest {
-    /// Sharing status to apply. "repo" makes the session visible to repository readers; "unshared" restricts it to the creator and collaborators.
-    pub status: SessionVisibilityStatus,
+pub struct SessionGitHubAuthRefreshCopilotUserParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Effective sharing status and shareable GitHub URL after updating session visibility.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17658,18 +22081,12 @@ pub struct VisibilitySetRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct VisibilitySetResult {
-    /// Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub share_url: Option<String>,
-    /// Effective sharing status after the update. May differ from the requested status for task types that are already visible to repository readers by default. Absent when the update could not be applied (e.g. the session is not synced or the user is not authenticated).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<SessionVisibilityStatus>,
-    /// Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the visibility change could not be applied and `status`/`shareUrl` are absent.
-    pub synced: bool,
+pub struct SessionGitHubAuthLogoutParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// A single changed file and its unified diff.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17679,22 +22096,12 @@ pub struct VisibilitySetResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspaceDiffFileChange {
-    /// Type of change represented by this file diff.
-    pub change_type: WorkspaceDiffFileChangeType,
-    /// Unified diff content for the file. Empty when the diff was truncated.
-    pub diff: String,
-    /// Whether the diff content was omitted because it exceeded the per-file size limit.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_truncated: Option<bool>,
-    /// Original file path for renamed files.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub old_path: Option<String>,
-    /// Path to the changed file, relative to the workspace root when the file lives under it. A file changed outside the workspace root keeps a `../`-relative path, or an absolute path when no relative path exists (for example a different Windows drive).
-    pub path: String,
+pub struct SessionGitHubAuthLastAuthErrorsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Workspace diff result for the requested mode.
+/// Result of collecting a redacted debug bundle.
 ///
 /// <div class="warning">
 ///
@@ -17704,24 +22111,19 @@ pub struct WorkspaceDiffFileChange {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspaceDiffResult {
-    /// Default branch used for a branch diff, when branch mode was requested.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub base_branch: Option<String>,
-    /// Changed files and their unified diffs.
-    pub changes: Vec<WorkspaceDiffFileChange>,
-    /// Whether the requested diff fell back to unstaged changes, either because branch diff failed or session diff was unavailable.
-    pub is_fallback: bool,
-    /// Effective mode used for the returned changes.
-    pub mode: WorkspaceDiffMode,
-    /// Diff mode requested by the client.
-    pub requested_mode: WorkspaceDiffMode,
-    /// Why the session diff could not be produced, when applicable. Set only when `session` mode was requested and `isFallback` is true, so a client can tell the permanent `file-change-tracking-disabled` apart from the transient `session-busy`, which the same request answers once the session settles. Never set for `unstaged` or `branch` mode, and never `unsupported-remote-session`: a remote session's captures live on its own host, so a `session`-mode diff is rejected for one rather than answered with a controller-side fallback.
+pub struct SessionDebugCollectLogsResult {
+    /// Files included in the redacted bundle.
+    pub entries: Vec<DebugCollectLogsCollectedEntry>,
+    /// Destination kind that was written.
+    pub kind: DebugCollectLogsResultKind,
+    /// Actual archive path or staging directory path written. This may differ from the requested path when no-overwrite suffixing or fallback-to-temp-directory was needed.
+    pub path: String,
+    /// Optional files or directories that could not be included.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub unavailable_reason: Option<HistoryRewindUnavailableReason>,
+    pub skipped_entries: Option<Vec<DebugCollectLogsSkippedEntry>>,
 }
 
-/// Compaction summary checkpoint to persist.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17731,14 +22133,12 @@ pub struct WorkspaceDiffResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesAddSummaryRequest {
-    /// Markdown summary content to persist.
-    pub content: String,
-    /// Summary title shown in checkpoint listings.
-    pub title: String,
+pub struct SessionCanvasListParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Persisted summary metadata and refreshed workspace metadata.
+/// Declared canvases available in this session.
 ///
 /// <div class="warning">
 ///
@@ -17748,14 +22148,12 @@ pub struct WorkspacesAddSummaryRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesAddSummaryResult {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub workspace: Option<serde_json::Value>,
+pub struct SessionCanvasListResult {
+    /// Declared canvases available in this session
+    pub canvases: Vec<DiscoveredCanvas>,
 }
 
-/// Whether the autopilot objective file exists.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -17765,12 +22163,12 @@ pub struct WorkspacesAddSummaryResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesAutopilotObjectiveExistsResult {
-    /// True when the objective file exists.
-    pub exists: bool,
+pub struct SessionCanvasListOpenParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Workspace checkpoint metadata with assigned number, human-readable title, and checkpoint filename.
+/// Live open-canvas snapshot.
 ///
 /// <div class="warning">
 ///
@@ -17780,16 +22178,12 @@ pub struct WorkspacesAutopilotObjectiveExistsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesCheckpoints {
-    /// Filename of the checkpoint within the workspace checkpoints directory
-    pub filename: String,
-    /// Checkpoint number assigned by the workspace manager
-    pub number: i64,
-    /// Human-readable checkpoint title
-    pub title: String,
+pub struct SessionCanvasListOpenResult {
+    /// Currently open canvas instances
+    pub open_canvases: Vec<OpenCanvasInstance>,
 }
 
-/// Relative path and UTF-8 content for the workspace file to create or overwrite.
+/// Open canvas instance snapshot.
 ///
 /// <div class="warning">
 ///
@@ -17799,14 +22193,34 @@ pub struct WorkspacesCheckpoints {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesCreateFileRequest {
-    /// File content to write as a UTF-8 string
-    pub content: String,
-    /// Relative path within the workspace files directory
-    pub path: String,
+pub struct SessionCanvasOpenResult {
+    /// Provider-local canvas identifier
+    pub canvas_id: String,
+    /// Owning provider identifier
+    pub extension_id: String,
+    /// Owning extension display name, when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub extension_name: Option<String>,
+    /// Host-local PNG path for the canvas icon, when supplied
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub icon: Option<String>,
+    /// Input supplied when the instance was opened
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input: Option<serde_json::Value>,
+    /// Stable caller-supplied canvas instance identifier
+    pub instance_id: String,
+    /// Provider-supplied status text
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<String>,
+    /// Rendered title
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    /// URL for web-rendered canvases
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub url: Option<String>,
 }
 
-/// Result of deleting the autopilot objective file.
+/// Canvas action invocation result.
 ///
 /// <div class="warning">
 ///
@@ -17816,12 +22230,13 @@ pub struct WorkspacesCreateFileRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesDeleteAutopilotObjectiveResult {
-    /// True when a file was deleted.
-    pub deleted: bool,
+pub struct SessionCanvasActionInvokeResult {
+    /// Provider-supplied action result
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<serde_json::Value>,
 }
 
-/// Parameters for computing a workspace diff.
+/// Complete current or terminal factory run envelope.
 ///
 /// <div class="warning">
 ///
@@ -17831,15 +22246,29 @@ pub struct WorkspacesDeleteAutopilotObjectiveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesDiffRequest {
-    /// When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.
+pub struct SessionFactoryRunResult {
+    /// Error message for an errored run.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub ignore_whitespace: Option<bool>,
-    /// Diff mode requested by the client.
-    pub mode: WorkspaceDiffMode,
+    pub error: Option<String>,
+    /// Machine-readable failure details for an errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub failure: Option<serde_json::Value>,
+    /// Reason for a halted or cancelled run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Completed factory result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<serde_json::Value>,
+    /// Factory run identifier.
+    pub run_id: String,
+    /// Partial journal and progress snapshot for a halted, cancelled, or errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub snapshot: Option<serde_json::Value>,
+    /// Current or terminal factory run status.
+    pub status: FactoryRunStatus,
 }
 
-/// Optional session context used when creating a local workspace.
+/// Resolved persisted factory identity and resumed run envelope.
 ///
 /// <div class="warning">
 ///
@@ -17849,55 +22278,14 @@ pub struct WorkspacesDiffRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesEnsureRequest {
-    /// Opaque workspace context supplied by the session host.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context: Option<serde_json::Value>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct WorkspacesGetWorkspaceResultWorkspace {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    #[serde(
-        rename = "chronicle_sync_dismissed",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub chronicle_sync_dismissed: Option<bool>,
-    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
-    pub created_at: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
-    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
-    pub id: String,
-    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
-    pub mc_last_event_id: Option<String>,
-    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
-    pub mc_session_id: Option<String>,
-    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
-    pub mc_task_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
-    pub remote_steerable: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
-    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
-    pub summary_count: Option<i64>,
-    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
-    pub updated_at: Option<String>,
-    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
-    pub user_named: Option<bool>,
+pub struct SessionFactoryResumeResult {
+    /// Persisted factory name resolved for the resumed run.
+    pub factory_name: String,
+    /// Terminal resumed run envelope.
+    pub run: FactoryRunResult,
 }
 
-/// Current workspace metadata for the session, including its absolute filesystem path when available.
+/// Complete current or terminal factory run envelope.
 ///
 /// <div class="warning">
 ///
@@ -17907,15 +22295,29 @@ pub struct WorkspacesGetWorkspaceResultWorkspace {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesGetWorkspaceResult {
-    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
+pub struct SessionFactoryGetRunResult {
+    /// Error message for an errored run.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// Current workspace metadata, or null if not available
-    pub workspace: Option<WorkspacesGetWorkspaceResultWorkspace>,
+    pub error: Option<String>,
+    /// Machine-readable failure details for an errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub failure: Option<serde_json::Value>,
+    /// Reason for a halted or cancelled run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Completed factory result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<serde_json::Value>,
+    /// Factory run identifier.
+    pub run_id: String,
+    /// Partial journal and progress snapshot for a halted, cancelled, or errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub snapshot: Option<serde_json::Value>,
+    /// Current or terminal factory run status.
+    pub status: FactoryRunStatus,
 }
 
-/// Workspace checkpoints in chronological order; empty when the workspace is not enabled.
+/// A page of factory runs in durable creation order.
 ///
 /// <div class="warning">
 ///
@@ -17925,12 +22327,24 @@ pub struct WorkspacesGetWorkspaceResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesListCheckpointsResult {
-    /// Workspace checkpoints in chronological order. Empty when workspace is not enabled.
-    pub checkpoints: Vec<WorkspacesCheckpoints>,
+pub struct SessionFactoryListRunsResult {
+    /// Whether terminal runs newer than this page exist.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub has_more_newer: Option<bool>,
+    /// Newest terminal-run cursor in this page, or null when the terminal window is empty.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub newest_seq: Option<i64>,
+    /// Oldest terminal-run cursor in this page, or null when the terminal window is empty.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub oldest_seq: Option<i64>,
+    /// Number of terminal runs older than this page.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub omitted_older: Option<i64>,
+    /// Factory run summaries in durable creation order.
+    pub runs: Vec<FactoryRunSummary>,
 }
 
-/// Relative paths of files stored in the session workspace files directory.
+/// Full factory run observability detail.
 ///
 /// <div class="warning">
 ///
@@ -17940,12 +22354,54 @@ pub struct WorkspacesListCheckpointsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesListFilesResult {
-    /// Relative file paths in the workspace files directory
-    pub files: Vec<String>,
+pub struct SessionFactoryGetRunDetailResult {
+    /// Epoch milliseconds when the current active segment started, or null while inactive.
+    pub active_segment_started_at: Option<i64>,
+    /// Durable identities and live statuses for direct factory agents.
+    pub agents: Vec<FactoryAgentSummary>,
+    /// Approved effective resource ceilings, or null until approved.
+    pub approved: Option<FactoryDeclaredLimits>,
+    /// Epoch milliseconds when the run completed, or null while nonterminal.
+    pub completed_at: Option<i64>,
+    /// Durable resource consumption.
+    pub consumed: FactoryRunConsumed,
+    /// Epoch milliseconds when the run was created.
+    pub created_at: i64,
+    /// Current phase identity, or null before any phase is entered.
+    pub current_phase: Option<FactoryCurrentPhase>,
+    /// Resource ceilings declared by the factory.
+    pub declared_limits: FactoryDeclaredLimits,
+    /// Number of phases declared by the factory.
+    pub declared_phase_count: i64,
+    /// Human-readable factory description.
+    pub description: String,
+    /// Registered factory name.
+    pub factory_name: String,
+    /// Number of direct factory agents currently live.
+    pub live_agent_count: i64,
+    /// Epoch milliseconds when this live-overlay snapshot was observed.
+    pub observed_at: i64,
+    /// Lifecycle and timing observations for each factory phase.
+    pub phases: Vec<FactoryPhaseObservation>,
+    /// Bidirectional page of durable factory progress.
+    pub progress: FactoryProgressPage,
+    /// Monotonic durable run revision.
+    pub revision: i64,
+    /// Factory run identifier.
+    pub run_id: String,
+    /// Epoch milliseconds when execution first started, or null before start.
+    pub started_at: Option<i64>,
+    /// Current factory run status.
+    pub status: FactoryRunStatus,
+    /// Terminal run outcome, or null while nonterminal.
+    pub terminal: Option<FactoryRunTerminal>,
+    /// Total direct factory agents spawned across all attempts.
+    pub total_spawned_agent_count: i64,
+    /// Epoch milliseconds when the durable run was last updated.
+    pub updated_at: i64,
 }
 
-/// Autopilot objective file content, or null when missing.
+/// A bidirectional page of factory progress.
 ///
 /// <div class="warning">
 ///
@@ -17955,12 +22411,22 @@ pub struct WorkspacesListFilesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesReadAutopilotObjectiveResult {
-    /// Autopilot objective file content, or null when missing.
-    pub content: Option<String>,
+pub struct SessionFactoryGetRunProgressResult {
+    /// Whether progress records newer than this page exist.
+    pub has_more_newer: bool,
+    /// Whether progress records older than this page exist.
+    pub has_more_older: bool,
+    /// Newest sequence number in this page, or null when empty.
+    pub newest_seq: Option<i64>,
+    /// Oldest sequence number in this page, or null when empty.
+    pub oldest_seq: Option<i64>,
+    /// Progress records in sequence order.
+    pub records: Vec<FactoryProgressLine>,
+    /// Run revision reflected by this page.
+    pub revision: i64,
 }
 
-/// Checkpoint number to read.
+/// Complete current or terminal factory run envelope.
 ///
 /// <div class="warning">
 ///
@@ -17970,12 +22436,29 @@ pub struct WorkspacesReadAutopilotObjectiveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesReadCheckpointRequest {
-    /// Checkpoint number to read
-    pub number: i64,
+pub struct SessionFactoryCancelResult {
+    /// Error message for an errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Machine-readable failure details for an errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub failure: Option<serde_json::Value>,
+    /// Reason for a halted or cancelled run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Completed factory result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<serde_json::Value>,
+    /// Factory run identifier.
+    pub run_id: String,
+    /// Partial journal and progress snapshot for a halted, cancelled, or errored run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub snapshot: Option<serde_json::Value>,
+    /// Current or terminal factory run status.
+    pub status: FactoryRunStatus,
 }
 
-/// Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.
+/// Acknowledgement that a factory request was accepted.
 ///
 /// <div class="warning">
 ///
@@ -17985,12 +22468,9 @@ pub struct WorkspacesReadCheckpointRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesReadCheckpointResult {
-    /// Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing
-    pub content: Option<String>,
-}
+pub struct SessionFactoryLogResult {}
 
-/// Relative path of the workspace file to read.
+/// Result of one factory-scoped subagent call.
 ///
 /// <div class="warning">
 ///
@@ -18000,12 +22480,13 @@ pub struct WorkspacesReadCheckpointResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesReadFileRequest {
-    /// Relative path within the workspace files directory
-    pub path: String,
+pub struct SessionFactoryAgentResult {
+    /// Agent result, omitted when the agent produced no result.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<serde_json::Value>,
 }
 
-/// Contents of the requested workspace file as a UTF-8 string.
+/// Result of reading a factory journal entry.
 ///
 /// <div class="warning">
 ///
@@ -18015,12 +22496,15 @@ pub struct WorkspacesReadFileRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesReadFileResult {
-    /// File content as a UTF-8 string
-    pub content: String,
+pub struct SessionFactoryJournalGetResult {
+    /// Whether the journal contained the requested key.
+    pub hit: bool,
+    /// Cached JSON result. The hit field distinguishes a cached JSON null from a miss.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result_json: Option<serde_json::Value>,
 }
 
-/// Pasted content to save as a UTF-8 file in the session workspace.
+/// Acknowledgement that a factory request was accepted.
 ///
 /// <div class="warning">
 ///
@@ -18030,23 +22514,24 @@ pub struct WorkspacesReadFileResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesSaveLargePasteRequest {
-    /// Pasted content to save as a UTF-8 file
-    pub content: String,
-}
+pub struct SessionFactoryJournalPutResult {}
 
+/// Identifies the target session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesSaveLargePasteResultSaved {
-    /// Filename within the workspace files directory
-    pub filename: String,
-    /// Absolute filesystem path to the saved paste file
-    pub file_path: String,
-    /// Size of the saved file in bytes
-    pub size_bytes: i64,
+pub struct SessionModelGetCurrentParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Descriptor for the saved paste file, or null when the workspace is unavailable.
+/// The currently selected model, reasoning effort, and context tier for the session. The context tier reflects `Session.getContextTier()`, restored from the session journal on resume.
 ///
 /// <div class="warning">
 ///
@@ -18056,12 +22541,19 @@ pub struct WorkspacesSaveLargePasteResultSaved {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesSaveLargePasteResult {
-    /// Saved-paste descriptor, or null when the workspace is unavailable (e.g. CCA runtime, non-infinite sessions, remote sessions)
-    pub saved: Option<WorkspacesSaveLargePasteResultSaved>,
+pub struct SessionModelGetCurrentResult {
+    /// Context tier for models that support multiple context-window sizes.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier: Option<ContextTier>,
+    /// Currently active model identifier
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_id: Option<String>,
+    /// Reasoning effort level currently applied to the active model, when one is set. Reads `Session.getReasoningEffort()` synchronously after `getSelectedModel()` resolves so the two values are reported as a snapshot.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<String>,
 }
 
-/// Rollback point for local workspace summaries.
+/// The model identifier active on the session after the switch.
 ///
 /// <div class="warning">
 ///
@@ -18071,12 +22563,34 @@ pub struct WorkspacesSaveLargePasteResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesTruncateSummariesRequest {
-    /// Number of newest summaries to keep.
-    pub keep_count: i64,
+pub struct SessionModelSwitchToResult {
+    /// Compaction confirmation projection when status is confirmation_required
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub confirmation: Option<ModelSwitchConfirmation>,
+    /// True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deferred: Option<bool>,
+    /// Deprecation warnings associated with the selected model or options.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deprecation_warnings: Option<Vec<String>>,
+    /// User-facing outcome message for the model switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+    /// Currently active model identifier after the switch
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_id: Option<String>,
+    /// Persistence failure encountered after applying the model switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub persistence_error: Option<String>,
+    /// Lifecycle result for the requested switch
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<String>,
+    /// User-facing warning produced while applying the model switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
 }
 
-/// Public-facing workspace metadata for this session, or null if the session has no associated workspace. Excludes runtime-internal fields (GitHub IDs, summary count, internal flags).
+/// The model identifier active on the session after the switch.
 ///
 /// <div class="warning">
 ///
@@ -18086,39 +22600,34 @@ pub struct WorkspacesTruncateSummariesRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspaceSummary {
-    /// Branch checked out at session start, if any
+pub struct SessionModelApplyStartupOverlayResult {
+    /// Compaction confirmation projection when status is confirmation_required
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    /// ISO 8601 timestamp when the workspace was created
-    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
-    pub created_at: Option<String>,
-    /// Current working directory at session start
+    pub confirmation: Option<ModelSwitchConfirmation>,
+    /// True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    /// Resolved git root for cwd, if any
-    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Repository host type, if known
-    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<WorkspaceSummaryHostType>,
-    /// Workspace identifier (1:1 with sessionId)
-    pub id: String,
-    /// Display name for the session, if set
+    pub deferred: Option<bool>,
+    /// Deprecation warnings associated with the selected model or options.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Repository identifier in 'owner/repo' or 'org/project/repo' format, if any
+    pub deprecation_warnings: Option<Vec<String>>,
+    /// User-facing outcome message for the model switch.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
-    /// ISO 8601 timestamp when the workspace was last updated
-    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
-    pub updated_at: Option<String>,
-    /// Whether the display name was explicitly set by the user
-    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
-    pub user_named: Option<bool>,
+    pub message: Option<String>,
+    /// Currently active model identifier after the switch
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_id: Option<String>,
+    /// Persistence failure encountered after applying the model switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub persistence_error: Option<String>,
+    /// Lifecycle result for the requested switch
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<String>,
+    /// User-facing warning produced while applying the model switch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
 }
 
-/// Workspace metadata fields to update.
+/// Update the session's reasoning effort without changing the selected model. Use `switchTo` instead when you also need to change the model. The runtime stores the effort on the session and applies it to subsequent turns.
 ///
 /// <div class="warning">
 ///
@@ -18128,16 +22637,12 @@ pub struct WorkspaceSummary {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesUpdateMetadataRequest {
-    /// Opaque workspace context supplied by the session host.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context: Option<serde_json::Value>,
-    /// Optional workspace display name override.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
+pub struct SessionModelSetReasoningEffortResult {
+    /// Reasoning effort level recorded on the session after the update
+    pub reasoning_effort: String,
 }
 
-/// Autopilot objective file content to persist.
+/// The list of models available to this session.
 ///
 /// <div class="warning">
 ///
@@ -18147,12 +22652,18 @@ pub struct WorkspacesUpdateMetadataRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesWriteAutopilotObjectiveRequest {
-    /// Autopilot objective file content.
-    pub content: String,
+pub struct SessionModelListResult {
+    /// Available models, ordered with the most preferred default first. Includes both Copilot (CAPI) models and any registry BYOK models; a BYOK model appears under its provider-qualified selection id (`provider/id`).
+    pub list: Vec<serde_json::Value>,
+    /// Cost categories for the full CAPI catalog, including picker-disabled models that Auto may select. Metadata only; entries absent from `list` are not manually selectable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_price_categories: Option<Vec<SessionModelPriceCategory>>,
+    /// Per-quota snapshots returned alongside the model list, keyed by quota type.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub quota_snapshots: Option<HashMap<String, serde_json::Value>>,
 }
 
-/// Result of writing the autopilot objective file.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18162,12 +22673,12 @@ pub struct WorkspacesWriteAutopilotObjectiveRequest {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WorkspacesWriteAutopilotObjectiveResult {
-    /// Filesystem operation performed.
-    pub operation: String,
+pub struct SessionModeGetParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// List of Copilot models available to the resolved user, including capabilities and billing metadata.
+/// Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.
 ///
 /// <div class="warning">
 ///
@@ -18177,12 +22688,32 @@ pub struct WorkspacesWriteAutopilotObjectiveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelsListResult {
-    /// List of available models with full metadata
-    pub models: Vec<Model>,
+pub struct SessionModeSetResult {
+    /// Whether the host should arm an interactive continuation after the mode change.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub arm_interactive_continuation: Option<bool>,
+    /// Compaction confirmation required before the mode change can complete.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub confirmation: Option<ModelSwitchConfirmation>,
+    /// Whether the host must defer implementing the requested mode change.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub defer_implementation: Option<bool>,
+    /// Deprecation warnings associated with the model selected by the mode change.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deprecation_warnings: Option<Vec<String>>,
+    /// User-facing outcome message for the model switch triggered by the mode change.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+    /// Whether applying the mode changed the active model.
+    pub model_changed: bool,
+    /// Lifecycle status of the requested mode change.
+    pub status: String,
+    /// User-facing warning produced while applying the mode change.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
 }
 
-/// The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18192,12 +22723,12 @@ pub struct ModelsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ModelsGetBuiltInCatalogResult {
-    /// Built-in model entries.
-    pub models: Vec<BuiltInModelCatalogEntry>,
+pub struct SessionNameGetParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Built-in tools available for the requested model, with their parameters and instructions.
+/// The session's friendly name, or null when not yet set.
 ///
 /// <div class="warning">
 ///
@@ -18207,12 +22738,12 @@ pub struct ModelsGetBuiltInCatalogResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ToolsListResult {
-    /// List of available built-in tools with metadata
-    pub tools: Vec<Tool>,
+pub struct SessionNameGetResult {
+    /// The session name (user-set or auto-generated), or null if not yet set
+    pub name: Option<String>,
 }
 
-/// User-configured MCP servers, keyed by server name.
+/// Indicates whether the auto-generated summary was applied as the session's name.
 ///
 /// <div class="warning">
 ///
@@ -18222,12 +22753,12 @@ pub struct ToolsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct McpConfigListResult {
-    /// All MCP servers from user config, keyed by name
-    pub servers: HashMap<String, serde_json::Value>,
+pub struct SessionNameSetAutoResult {
+    /// Whether the auto-generated summary was persisted. False if the session already has a user-set name, the summary normalized to empty, or the session does not have a workspace.
+    pub applied: bool,
 }
 
-/// Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18237,14 +22768,12 @@ pub struct McpConfigListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ExtensionsDiscoverResult {
-    /// Discovered user and enabled installed-plugin extensions from persisted Copilot home state
-    pub extensions: Vec<DiscoveredExtension>,
-    /// Effective extension loading mode. Defaults to load_and_augment when unset.
-    pub mode: DiscoveredExtensionMode,
+pub struct SessionPlanReadParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Plugins installed in user/global state.
+/// Existence, contents, and resolved path of the session plan file.
 ///
 /// <div class="warning">
 ///
@@ -18254,12 +22783,16 @@ pub struct ExtensionsDiscoverResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsListResult {
-    /// Installed plugins
-    pub plugins: Vec<InstalledPluginInfo>,
+pub struct SessionPlanReadResult {
+    /// The content of the plan file, or null if it does not exist
+    pub content: Option<String>,
+    /// Whether the plan file exists in the workspace
+    pub exists: bool,
+    /// Absolute file path of the plan file, or null if workspace is not enabled
+    pub path: Option<String>,
 }
 
-/// Result of installing a plugin.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18269,20 +22802,12 @@ pub struct PluginsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsInstallResult {
-    /// Set when the install path is deprecated (e.g. direct repo / URL / local installs). Callers should surface this to end users.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub deprecation_warning: Option<String>,
-    /// The newly installed plugin's metadata
-    pub plugin: InstalledPluginInfo,
-    /// Optional post-install message provided by the plugin (e.g. setup instructions)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub post_install_message: Option<String>,
-    /// Number of skills discovered and installed from the plugin
-    pub skills_installed: i64,
+pub struct SessionPlanDeleteParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Result of updating a single plugin.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18292,18 +22817,12 @@ pub struct PluginsInstallResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsUpdateResult {
-    /// Version after the update, when reported by the plugin manifest
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub new_version: Option<String>,
-    /// Version that was previously installed, when available
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub previous_version: Option<String>,
-    /// Number of skills discovered and installed after the update
-    pub skills_installed: i64,
+pub struct SessionPlanReadSqlTodosParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Result of updating all installed plugins.
+/// Todo rows read from the session SQL database. Empty when no session database is available.
 ///
 /// <div class="warning">
 ///
@@ -18313,12 +22832,12 @@ pub struct PluginsUpdateResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsUpdateAllResult {
-    /// Per-plugin update results in deterministic order.
-    pub results: Vec<PluginUpdateAllEntry>,
+pub struct SessionPlanReadSqlTodosResult {
+    /// Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables.
+    pub rows: Vec<PlanSqlTodosRow>,
 }
 
-/// All registered marketplaces, including built-in defaults.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18328,12 +22847,12 @@ pub struct PluginsUpdateAllResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsMarketplacesListResult {
-    /// Registered marketplaces
-    pub marketplaces: Vec<MarketplaceInfo>,
+pub struct SessionPlanReadSqlTodosWithDependenciesParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Result of registering a new marketplace.
+/// Todo rows + dependency edges read from the session SQL database.
 ///
 /// <div class="warning">
 ///
@@ -18343,12 +22862,14 @@ pub struct PluginsMarketplacesListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsMarketplacesAddResult {
-    /// Final name of the marketplace as resolved from its manifest
-    pub name: String,
+pub struct SessionPlanReadSqlTodosWithDependenciesResult {
+    /// Edges from the session SQL todo_deps table. Empty when no database, no todo_deps table, or the SELECT failed. Read independently from `rows`, so a broken todo_deps table does not affect the rows result and vice versa.
+    pub dependencies: Vec<PlanSqlTodoDependency>,
+    /// Rows from the session SQL todos table, ordered by creation time with insertion order used to break ties when available and id used for WITHOUT ROWID tables. Empty when no database, no todos table, or the SELECT failed.
+    pub rows: Vec<PlanSqlTodosRow>,
 }
 
-/// Outcome of the remove attempt, including dependent-plugin info when applicable.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18358,15 +22879,70 @@ pub struct PluginsMarketplacesAddResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsMarketplacesRemoveResult {
-    /// Names of installed plugins that prevented removal. Populated only when `removed=false`.
+pub struct SessionWorkspacesGetWorkspaceParams {
+    /// Target session identifier
+    pub session_id: SessionId,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionWorkspacesGetWorkspaceResultWorkspace {
+    /// Current Git branch.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub dependent_plugins: Option<Vec<String>>,
-    /// True when the marketplace was actually removed. False when removal was skipped because the marketplace has dependent plugins and `force` was not set.
-    pub removed: bool,
+    pub branch: Option<String>,
+    /// Whether the per-session Chronicle upgrade prompt was dismissed for the workspace.
+    #[serde(
+        rename = "chronicle_sync_dismissed",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub chronicle_sync_dismissed: Option<bool>,
+    /// Name of the client that created the workspace.
+    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Timestamp when the workspace was created.
+    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Current working directory associated with the workspace.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Git repository root associated with the workspace.
+    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
+    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
+    /// Stable workspace identifier.
+    pub id: String,
+    /// Most recent Mission Control event identifier observed for the workspace.
+    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
+    pub mc_last_event_id: Option<String>,
+    /// Mission Control session identifier associated with the workspace.
+    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
+    pub mc_session_id: Option<String>,
+    /// Mission Control task identifier associated with the workspace.
+    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
+    pub mc_task_id: Option<String>,
+    /// Workspace display name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Whether the workspace session can be steered remotely.
+    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
+    pub remote_steerable: Option<bool>,
+    /// Repository identifier associated with the workspace.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// Number of persisted summaries in the workspace.
+    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
+    pub summary_count: Option<i64>,
+    /// Timestamp when the workspace was last updated.
+    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
+    pub updated_at: Option<String>,
+    /// Whether the workspace name was explicitly chosen by the user.
+    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
+    pub user_named: Option<bool>,
 }
 
-/// Plugins advertised by the marketplace.
+/// Current workspace metadata for the session, including its absolute filesystem path when available.
 ///
 /// <div class="warning">
 ///
@@ -18376,12 +22952,73 @@ pub struct PluginsMarketplacesRemoveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsMarketplacesBrowseResult {
-    /// Plugins advertised by the marketplace
-    pub plugins: Vec<MarketplacePluginInfo>,
+pub struct SessionWorkspacesGetWorkspaceResult {
+    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<String>,
+    /// Current workspace metadata, or null if not available
+    pub workspace: Option<SessionWorkspacesGetWorkspaceResultWorkspace>,
 }
 
-/// Result of refreshing one or more marketplace catalogs.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionWorkspacesUpdateMetadataResultWorkspace {
+    /// Current Git branch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// Whether the per-session Chronicle upgrade prompt was dismissed for the workspace.
+    #[serde(
+        rename = "chronicle_sync_dismissed",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub chronicle_sync_dismissed: Option<bool>,
+    /// Name of the client that created the workspace.
+    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Timestamp when the workspace was created.
+    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Current working directory associated with the workspace.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Git repository root associated with the workspace.
+    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
+    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
+    /// Stable workspace identifier.
+    pub id: String,
+    /// Most recent Mission Control event identifier observed for the workspace.
+    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
+    pub mc_last_event_id: Option<String>,
+    /// Mission Control session identifier associated with the workspace.
+    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
+    pub mc_session_id: Option<String>,
+    /// Mission Control task identifier associated with the workspace.
+    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
+    pub mc_task_id: Option<String>,
+    /// Workspace display name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Whether the workspace session can be steered remotely.
+    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
+    pub remote_steerable: Option<bool>,
+    /// Repository identifier associated with the workspace.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// Number of persisted summaries in the workspace.
+    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
+    pub summary_count: Option<i64>,
+    /// Timestamp when the workspace was last updated.
+    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
+    pub updated_at: Option<String>,
+    /// Whether the workspace name was explicitly chosen by the user.
+    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
+    pub user_named: Option<bool>,
+}
+
+/// Current workspace metadata for the session, including its absolute filesystem path when available.
 ///
 /// <div class="warning">
 ///
@@ -18391,12 +23028,73 @@ pub struct PluginsMarketplacesBrowseResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PluginsMarketplacesRefreshResult {
-    /// Per-marketplace refresh results in deterministic order.
-    pub results: Vec<MarketplaceRefreshEntry>,
+pub struct SessionWorkspacesUpdateMetadataResult {
+    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<String>,
+    /// Current workspace metadata, or null if not available
+    pub workspace: Option<SessionWorkspacesUpdateMetadataResultWorkspace>,
 }
 
-/// Skills discovered across global and project sources.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionWorkspacesEnsureResultWorkspace {
+    /// Current Git branch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// Whether the per-session Chronicle upgrade prompt was dismissed for the workspace.
+    #[serde(
+        rename = "chronicle_sync_dismissed",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub chronicle_sync_dismissed: Option<bool>,
+    /// Name of the client that created the workspace.
+    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Timestamp when the workspace was created.
+    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Current working directory associated with the workspace.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Git repository root associated with the workspace.
+    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
+    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
+    /// Stable workspace identifier.
+    pub id: String,
+    /// Most recent Mission Control event identifier observed for the workspace.
+    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
+    pub mc_last_event_id: Option<String>,
+    /// Mission Control session identifier associated with the workspace.
+    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
+    pub mc_session_id: Option<String>,
+    /// Mission Control task identifier associated with the workspace.
+    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
+    pub mc_task_id: Option<String>,
+    /// Workspace display name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Whether the workspace session can be steered remotely.
+    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
+    pub remote_steerable: Option<bool>,
+    /// Repository identifier associated with the workspace.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// Number of persisted summaries in the workspace.
+    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
+    pub summary_count: Option<i64>,
+    /// Timestamp when the workspace was last updated.
+    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
+    pub updated_at: Option<String>,
+    /// Whether the workspace name was explicitly chosen by the user.
+    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
+    pub user_named: Option<bool>,
+}
+
+/// Current workspace metadata for the session, including its absolute filesystem path when available.
 ///
 /// <div class="warning">
 ///
@@ -18406,15 +23104,15 @@ pub struct PluginsMarketplacesRefreshResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsDiscoverResult {
-    /// Messages for skills that failed to load (e.g. malformed SKILL.md). Empty when host skills are excluded so host-local paths are not disclosed to multitenant callers.
+pub struct SessionWorkspacesEnsureResult {
+    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub errors: Option<Vec<String>>,
-    /// All discovered skills across all sources
-    pub skills: Vec<ServerSkill>,
+    pub path: Option<String>,
+    /// Current workspace metadata, or null if not available
+    pub workspace: Option<SessionWorkspacesEnsureResultWorkspace>,
 }
 
-/// Canonical locations where skills can be created so the runtime will recognize them.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18424,12 +23122,12 @@ pub struct SkillsDiscoverResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SkillsGetDiscoveryPathsResult {
-    /// Canonical skill create/discovery directories, in priority order
-    pub paths: Vec<SkillDiscoveryPath>,
+pub struct SessionWorkspacesListFilesParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Agents discovered across user, project, plugin, and remote sources.
+/// Relative paths of files stored in the session workspace files directory.
 ///
 /// <div class="warning">
 ///
@@ -18439,12 +23137,12 @@ pub struct SkillsGetDiscoveryPathsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentsDiscoverResult {
-    /// All discovered agents across all sources
-    pub agents: Vec<AgentInfo>,
+pub struct SessionWorkspacesListFilesResult {
+    /// Relative file paths in the workspace files directory
+    pub files: Vec<String>,
 }
 
-/// Canonical locations where custom agents can be created so the runtime will recognize them.
+/// Contents of the requested workspace file as a UTF-8 string.
 ///
 /// <div class="warning">
 ///
@@ -18454,12 +23152,12 @@ pub struct AgentsDiscoverResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AgentsGetDiscoveryPathsResult {
-    /// Canonical agent create/discovery directories, in priority order
-    pub paths: Vec<AgentDiscoveryPath>,
+pub struct SessionWorkspacesReadFileResult {
+    /// File content as a UTF-8 string
+    pub content: String,
 }
 
-/// Instruction sources discovered across user, repository, and plugin sources.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18469,12 +23167,12 @@ pub struct AgentsGetDiscoveryPathsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstructionsDiscoverResult {
-    /// All discovered instruction sources
-    pub sources: Vec<InstructionSource>,
+pub struct SessionWorkspacesListCheckpointsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Canonical files and directories where custom instructions can be created so the runtime will recognize them.
+/// Workspace checkpoints in chronological order; empty when the workspace is not enabled.
 ///
 /// <div class="warning">
 ///
@@ -18484,12 +23182,12 @@ pub struct InstructionsDiscoverResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct InstructionsGetDiscoveryPathsResult {
-    /// Canonical instruction create/discovery files and directories, in priority order
-    pub paths: Vec<InstructionDiscoveryPath>,
+pub struct SessionWorkspacesListCheckpointsResult {
+    /// Workspace checkpoints in chronological order. Empty when workspace is not enabled.
+    pub checkpoints: Vec<WorkspacesCheckpoints>,
 }
 
-/// Slash commands available in the session, after applying any include/exclude filters.
+/// Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.
 ///
 /// <div class="warning">
 ///
@@ -18499,12 +23197,12 @@ pub struct InstructionsGetDiscoveryPathsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CommandsListResult {
-    /// Commands available in this session
-    pub commands: Vec<SlashCommandInfo>,
+pub struct SessionWorkspacesReadCheckpointResult {
+    /// Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing
+    pub content: Option<String>,
 }
 
-/// Result of opening a session.
+/// Persisted summary metadata and refreshed workspace metadata.
 ///
 /// <div class="warning">
 ///
@@ -18514,31 +23212,74 @@ pub struct CommandsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsOpenResult {
-    /// Remote session metadata, present when status is `connected`.
+pub struct SessionWorkspacesAddSummaryResult {
+    /// Metadata for the persisted summary.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub metadata: Option<RemoteSessionMetadataValue>,
-    /// Handoff progress steps, present when status is `handed_off`.
+    pub summary: Option<serde_json::Value>,
+    /// Refreshed metadata for the containing workspace.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub progress: Option<Vec<SessionsOpenProgress>>,
-    /// Remote session ID, present when status is `connected`.
+    pub workspace: Option<serde_json::Value>,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionWorkspacesTruncateSummariesResultWorkspace {
+    /// Current Git branch.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote_session_id: Option<SessionId>,
-    /// In-process SessionClientApi handle for the opened session, returned to CLI callers as a transitional shortcut. Marked internal so the public SDK surface does not expose it; SDK consumers should construct per-session clients from `sessionId` instead.
-    #[doc(hidden)]
+    pub branch: Option<String>,
+    /// Whether the per-session Chronicle upgrade prompt was dismissed for the workspace.
+    #[serde(
+        rename = "chronicle_sync_dismissed",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub chronicle_sync_dismissed: Option<bool>,
+    /// Name of the client that created the workspace.
+    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Timestamp when the workspace was created.
+    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Current working directory associated with the workspace.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) session_api: Option<serde_json::Value>,
-    /// Opened session ID. Omitted when status is `not_found`.
+    pub cwd: Option<String>,
+    /// Git repository root associated with the workspace.
+    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
+    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
+    /// Stable workspace identifier.
+    pub id: String,
+    /// Most recent Mission Control event identifier observed for the workspace.
+    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
+    pub mc_last_event_id: Option<String>,
+    /// Mission Control session identifier associated with the workspace.
+    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
+    pub mc_session_id: Option<String>,
+    /// Mission Control task identifier associated with the workspace.
+    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
+    pub mc_task_id: Option<String>,
+    /// Workspace display name.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
-    /// Startup prompts queued by user-level hook configs at session creation. Only populated when status is `created`; resumed sessions return an empty array.
+    pub name: Option<String>,
+    /// Whether the workspace session can be steered remotely.
+    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
+    pub remote_steerable: Option<bool>,
+    /// Repository identifier associated with the workspace.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub startup_prompts: Option<Vec<String>>,
-    /// Outcome of the open request.
-    pub status: SessionsOpenStatus,
+    pub repository: Option<String>,
+    /// Number of persisted summaries in the workspace.
+    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
+    pub summary_count: Option<i64>,
+    /// Timestamp when the workspace was last updated.
+    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
+    pub updated_at: Option<String>,
+    /// Whether the workspace name was explicitly chosen by the user.
+    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
+    pub user_named: Option<bool>,
 }
 
-/// Remote session connection result.
+/// Current workspace metadata for the session, including its absolute filesystem path when available.
 ///
 /// <div class="warning">
 ///
@@ -18548,14 +23289,15 @@ pub struct SessionsOpenResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsConnectResult {
-    /// Metadata for a connected remote session.
-    pub metadata: ConnectedRemoteSessionMetadata,
-    /// SDK session ID for the connected remote session.
-    pub session_id: SessionId,
+pub struct SessionWorkspacesTruncateSummariesResult {
+    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<String>,
+    /// Current workspace metadata, or null if not available
+    pub workspace: Option<SessionWorkspacesTruncateSummariesResultWorkspace>,
 }
 
-/// Sessions matching the filter, ordered most-recently-modified first.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18565,12 +23307,12 @@ pub struct SessionsConnectResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsListResult {
-    /// Sessions ordered most-recently-modified first. Discriminated by `isRemote`.
-    pub sessions: Vec<serde_json::Value>,
+pub struct SessionWorkspacesReadAutopilotObjectiveParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// ID of the local session bound to the given GitHub task, or omitted when none.
+/// Autopilot objective file content, or null when missing.
 ///
 /// <div class="warning">
 ///
@@ -18580,13 +23322,12 @@ pub struct SessionsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsFindByTaskIdResult {
-    /// Omitted when no local session is bound to that GitHub task
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<SessionId>,
+pub struct SessionWorkspacesReadAutopilotObjectiveResult {
+    /// Autopilot objective file content, or null when missing.
+    pub content: Option<String>,
 }
 
-/// Map of sessionId -> on-disk size in bytes for each session's workspace directory.
+/// Result of writing the autopilot objective file.
 ///
 /// <div class="warning">
 ///
@@ -18596,12 +23337,12 @@ pub struct SessionsFindByTaskIdResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetSizesResult {
-    /// Map of sessionId -> on-disk size in bytes for the session's workspace directory
-    pub sizes: HashMap<String, i64>,
+pub struct SessionWorkspacesWriteAutopilotObjectiveResult {
+    /// Filesystem operation performed.
+    pub operation: String,
 }
 
-/// Map of sessionId -> bytes freed by removing the session's workspace directory.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18611,12 +23352,12 @@ pub struct SessionsGetSizesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsBulkDeleteResult {
-    /// Map of sessionId -> bytes freed by removing the session's workspace directory. Sessions whose deletion failed are omitted from this map (failures are logged on the server but not surfaced per-id; check the map for absent IDs to detect them).
-    pub freed_bytes: HashMap<String, i64>,
+pub struct SessionWorkspacesDeleteAutopilotObjectiveParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.
+/// Result of deleting the autopilot objective file.
 ///
 /// <div class="warning">
 ///
@@ -18626,20 +23367,12 @@ pub struct SessionsBulkDeleteResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsPruneOldResult {
-    /// Session IDs that would be deleted in dry-run mode (always empty otherwise)
-    pub candidates: Vec<String>,
-    /// Session IDs that were deleted (always empty in dry-run mode)
-    pub deleted: Vec<String>,
-    /// True when no deletions were actually performed
-    pub dry_run: bool,
-    /// Total bytes freed (actual when not dry-run, projected when dry-run)
-    pub freed_bytes: i64,
-    /// Session IDs that were skipped (e.g., named sessions)
-    pub skipped: Vec<String>,
+pub struct SessionWorkspacesDeleteAutopilotObjectiveResult {
+    /// True when a file was deleted.
+    pub deleted: bool,
 }
 
-/// The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18649,12 +23382,12 @@ pub struct SessionsPruneOldResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsEnrichMetadataResult {
-    /// Enriched records, with summary and context backfilled. Sessions confirmed empty and unnamed may be omitted.
-    pub sessions: Vec<LocalSessionMetadataValue>,
+pub struct SessionWorkspacesAutopilotObjectiveExistsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Queued repo-level startup prompts and the total hook command count after loading.
+/// Whether the autopilot objective file exists.
 ///
 /// <div class="warning">
 ///
@@ -18664,29 +23397,23 @@ pub struct SessionsEnrichMetadataResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsLoadDeferredRepoHooksResult {
-    /// Total hook command count (user + plugin + repo) loaded for the session by this call. Captured atomically with startupPrompts so callers don't need to read a separate counter.
-    pub hook_count: i64,
-    /// Repo-level startup prompts queued from repo hook configs. Empty on resume, when no repo configs were pending, or when disableAllHooks is set.
-    pub startup_prompts: Vec<String>,
+pub struct SessionWorkspacesAutopilotObjectiveExistsResult {
+    /// True when the objective file exists.
+    pub exists: bool,
 }
 
-/// Wrapper for the singleton's current status.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsStartRemoteControlResult {
-    /// State of the runtime-managed remote-control singleton.
-    pub status: serde_json::Value,
+pub struct SessionWorkspacesSaveLargePasteResultSaved {
+    /// Filename within the workspace files directory
+    pub filename: String,
+    /// Absolute filesystem path to the saved paste file
+    pub file_path: String,
+    /// Size of the saved file in bytes
+    pub size_bytes: i64,
 }
 
-/// Outcome of a transferRemoteControl call.
+/// Descriptor for the saved paste file, or null when the workspace is unavailable.
 ///
 /// <div class="warning">
 ///
@@ -18696,14 +23423,12 @@ pub struct SessionsStartRemoteControlResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsTransferRemoteControlResult {
-    /// State of the runtime-managed remote-control singleton.
-    pub status: serde_json::Value,
-    /// Whether the rebinding actually happened.
-    pub transferred: bool,
+pub struct SessionWorkspacesSaveLargePasteResult {
+    /// Saved-paste descriptor, or null when the workspace is unavailable (e.g. CCA runtime, non-infinite sessions, remote sessions)
+    pub saved: Option<SessionWorkspacesSaveLargePasteResultSaved>,
 }
 
-/// Wrapper for the singleton's current status.
+/// Workspace diff result for the requested mode.
 ///
 /// <div class="warning">
 ///
@@ -18713,12 +23438,24 @@ pub struct SessionsTransferRemoteControlResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsSetRemoteControlSteeringResult {
-    /// State of the runtime-managed remote-control singleton.
-    pub status: serde_json::Value,
+pub struct SessionWorkspacesDiffResult {
+    /// Default branch used for a branch diff, when branch mode was requested.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub base_branch: Option<String>,
+    /// Changed files and their unified diffs.
+    pub changes: Vec<WorkspaceDiffFileChange>,
+    /// Whether the requested diff fell back to unstaged changes, either because branch diff failed or session diff was unavailable.
+    pub is_fallback: bool,
+    /// Effective mode used for the returned changes.
+    pub mode: WorkspaceDiffMode,
+    /// Diff mode requested by the client.
+    pub requested_mode: WorkspaceDiffMode,
+    /// Why the session diff could not be produced, when applicable. Set only when `session` mode was requested and `isFallback` is true, so a client can tell the permanent `file-change-tracking-disabled` apart from the transient `session-busy`, which the same request answers once the session settles. Never set for `unstaged` or `branch` mode, and never `unsupported-remote-session`: a remote session's captures live on its own host, so a `session`-mode diff is rejected for one rather than answered with a controller-side fallback.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub unavailable_reason: Option<HistoryRewindUnavailableReason>,
 }
 
-/// Outcome of a stopRemoteControl call.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18728,14 +23465,12 @@ pub struct SessionsSetRemoteControlSteeringResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsStopRemoteControlResult {
-    /// State of the runtime-managed remote-control singleton.
-    pub status: serde_json::Value,
-    /// Whether the singleton was actually torn down by this call.
-    pub stopped: bool,
+pub struct SessionCompletionsGetTriggerCharactersParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Wrapper for the singleton's current status.
+/// Characters that, when typed in the composer, should trigger a `completions.request`. Empty when the session has no host-driven completions (e.g. local sessions, or a relay host that does not advertise `completionTriggerCharacters`).
 ///
 /// <div class="warning">
 ///
@@ -18745,12 +23480,12 @@ pub struct SessionsStopRemoteControlResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionsGetRemoteControlStatusResult {
-    /// State of the runtime-managed remote-control singleton.
-    pub status: serde_json::Value,
+pub struct SessionCompletionsGetTriggerCharactersResult {
+    /// Trigger characters advertised by the host (e.g. `["@", "#"]`). Empty disables host-driven completions for the session.
+    pub trigger_characters: Vec<String>,
 }
 
-/// Handle for releasing the extension tool registration.
+/// Host-driven completion items for the current composer input. Empty when the host returns no items or does not support completions.
 ///
 /// <div class="warning">
 ///
@@ -18760,10 +23495,9 @@ pub struct SessionsGetRemoteControlStatusResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct SessionsRegisterExtensionToolsOnSessionResult {
-    /// In-process unsubscribe function (CLI-only optimization). Marked internal: replaced by an explicit `extensions.unregister` RPC in the SDK migration.
-    #[doc(hidden)]
-    pub(crate) unsubscribe: serde_json::Value,
+pub struct SessionCompletionsRequestResult {
+    /// Completion items in host-ranked order.
+    pub items: Vec<SessionCompletionItem>,
 }
 
 /// Identifies the target session.
@@ -18776,12 +23510,12 @@ pub(crate) struct SessionsRegisterExtensionToolsOnSessionResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSuspendParams {
+pub struct SessionInstructionsGetSourcesParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Result of sending a user message
+/// Instruction sources loaded for the session, in merge order.
 ///
 /// <div class="warning">
 ///
@@ -18791,12 +23525,12 @@ pub struct SessionSuspendParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSendResult {
-    /// Unique identifier assigned to the message
-    pub message_id: String,
+pub struct SessionInstructionsGetSourcesResult {
+    /// Instruction sources for the session
+    pub sources: Vec<InstructionSource>,
 }
 
-/// Result of sending zero or more user messages
+/// Indicates whether fleet mode was successfully activated.
 ///
 /// <div class="warning">
 ///
@@ -18806,12 +23540,12 @@ pub struct SessionSendResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSendMessagesResult {
-    /// Unique identifiers assigned to the messages, one per provided message in order. Empty when no messages were provided.
-    pub message_ids: Vec<String>,
+pub struct SessionFleetStartResult {
+    /// Whether fleet mode was successfully activated
+    pub started: bool,
 }
 
-/// Result of aborting the current turn
+/// Agents available to the session.
 ///
 /// <div class="warning">
 ///
@@ -18821,15 +23555,12 @@ pub struct SessionSendMessagesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionAbortResult {
-    /// Error message if the abort failed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Whether the abort completed successfully
-    pub success: bool,
+pub struct SessionAgentListResult {
+    /// Available agents
+    pub agents: Vec<AgentInfo>,
 }
 
-/// Result of interrupting the main agent turn.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18839,12 +23570,12 @@ pub struct SessionAbortResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionInterruptMainTurnResult {
-    /// Whether an in-flight main agent turn was interrupted. False when the main loop was not processing.
-    pub interrupted: bool,
+pub struct SessionAgentGetCurrentParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Identifies the target session.
+/// The currently selected custom agent, or null when using the default agent.
 ///
 /// <div class="warning">
 ///
@@ -18854,12 +23585,12 @@ pub struct SessionInterruptMainTurnResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCancelAllBackgroundAgentsParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionAgentGetCurrentResult {
+    /// Currently selected custom agent, or null if using the default agent
+    pub agent: AgentInfo,
 }
 
-/// Identifies the target session.
+/// The newly selected custom agent.
 ///
 /// <div class="warning">
 ///
@@ -18869,12 +23600,12 @@ pub struct SessionCancelAllBackgroundAgentsParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionGitHubAuthGetStatusParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionAgentSelectResult {
+    /// The newly selected custom agent
+    pub agent: AgentInfo,
 }
 
-/// Authentication status and account metadata for the session.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18883,28 +23614,13 @@ pub struct SessionGitHubAuthGetStatusParams {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionGitHubAuthGetStatusResult {
-    /// Authentication type
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub auth_type: Option<AuthInfoType>,
-    /// Copilot plan tier (e.g., individual_pro, business)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_plan: Option<String>,
-    /// Authentication host URL
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub host: Option<String>,
-    /// Whether the session has resolved authentication
-    pub is_authenticated: bool,
-    /// Authenticated login/username, if available
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub login: Option<String>,
-    /// Human-readable authentication status description
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status_message: Option<String>,
+#[serde(rename_all = "camelCase")]
+pub struct SessionAgentDeselectParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the credential update succeeded.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18914,15 +23630,12 @@ pub struct SessionGitHubAuthGetStatusResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionGitHubAuthSetCredentialsResult {
-    /// Whether the session ended up with a populated `copilotUser` for the installed credentials. `true` when the supplied credential already carried `copilotUser` or it was successfully re-resolved server-side. `false` when the credential is installed without `copilotUser` — either re-resolution failed, or the variant cannot be re-resolved from the credential alone (only the raw-token variants `token`, `env`, and `gh-cli` can). In both `false` cases the token swap still applied, but plan/quota/billing metadata is degraded. Present whenever a credential was supplied; omitted only when no credential was supplied (no-op call).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub copilot_user_resolved: Option<bool>,
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionAgentReloadParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Result of collecting a redacted debug bundle.
+/// Custom agents available to the session after reloading definitions from disk.
 ///
 /// <div class="warning">
 ///
@@ -18932,19 +23645,12 @@ pub struct SessionGitHubAuthSetCredentialsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionDebugCollectLogsResult {
-    /// Files included in the redacted bundle.
-    pub entries: Vec<DebugCollectLogsCollectedEntry>,
-    /// Destination kind that was written.
-    pub kind: DebugCollectLogsResultKind,
-    /// Actual archive path or staging directory path written. This may differ from the requested path when no-overwrite suffixing or fallback-to-temp-directory was needed.
-    pub path: String,
-    /// Optional files or directories that could not be included.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub skipped_entries: Option<Vec<DebugCollectLogsSkippedEntry>>,
+pub struct SessionAgentReloadResult {
+    /// Reloaded custom agents
+    pub agents: Vec<AgentInfo>,
 }
 
-/// Identifies the target session.
+/// Identifier assigned to the newly started background agent task.
 ///
 /// <div class="warning">
 ///
@@ -18954,12 +23660,12 @@ pub struct SessionDebugCollectLogsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCanvasListParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionTasksStartAgentResult {
+    /// Generated agent ID for the background task
+    pub agent_id: String,
 }
 
-/// Declared canvases available in this session.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18969,12 +23675,12 @@ pub struct SessionCanvasListParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCanvasListResult {
-    /// Declared canvases available in this session
-    pub canvases: Vec<DiscoveredCanvas>,
+pub struct SessionTasksListParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Identifies the target session.
+/// Background tasks currently tracked by the session.
 ///
 /// <div class="warning">
 ///
@@ -18984,12 +23690,12 @@ pub struct SessionCanvasListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCanvasListOpenParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionTasksListResult {
+    /// Currently tracked tasks
+    pub tasks: Vec<serde_json::Value>,
 }
 
-/// Live open-canvas snapshot.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -18999,12 +23705,12 @@ pub struct SessionCanvasListOpenParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCanvasListOpenResult {
-    /// Currently open canvas instances
-    pub open_canvases: Vec<OpenCanvasInstance>,
+pub struct SessionTasksRefreshParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Open canvas instance snapshot.
+/// Refresh metadata for any detached background shells the runtime knows about. Use after a long pause to pick up exit/output state for shells running outside the agent loop.
 ///
 /// <div class="warning">
 ///
@@ -19014,34 +23720,9 @@ pub struct SessionCanvasListOpenResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCanvasOpenResult {
-    /// Provider-local canvas identifier
-    pub canvas_id: String,
-    /// Owning provider identifier
-    pub extension_id: String,
-    /// Owning extension display name, when available
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub extension_name: Option<String>,
-    /// Host-local PNG path for the canvas icon, when supplied
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub icon: Option<String>,
-    /// Input supplied when the instance was opened
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub input: Option<serde_json::Value>,
-    /// Stable caller-supplied canvas instance identifier
-    pub instance_id: String,
-    /// Provider-supplied status text
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
-    /// Rendered title
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// URL for web-rendered canvases
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub url: Option<String>,
-}
+pub struct SessionTasksRefreshResult {}
 
-/// Canvas action invocation result.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -19051,13 +23732,12 @@ pub struct SessionCanvasOpenResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCanvasActionInvokeResult {
-    /// Provider-supplied action result
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<serde_json::Value>,
+pub struct SessionTasksWaitForPendingParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Complete current or terminal factory run envelope.
+/// Wait until all in-flight background tasks (agents + shells) and any follow-up turns scheduled by their completions have settled. Returns when the runtime is fully drained or after an internal timeout (default 10 minutes; configurable via COPILOT_TASK_WAIT_TIMEOUT_SECONDS).
 ///
 /// <div class="warning">
 ///
@@ -19067,29 +23747,9 @@ pub struct SessionCanvasActionInvokeResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryRunResult {
-    /// Error message for an errored run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Machine-readable failure details for an errored run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub failure: Option<serde_json::Value>,
-    /// Reason for a halted or cancelled run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-    /// Completed factory result.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<serde_json::Value>,
-    /// Factory run identifier.
-    pub run_id: String,
-    /// Partial journal and progress snapshot for a halted, cancelled, or errored run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub snapshot: Option<serde_json::Value>,
-    /// Current or terminal factory run status.
-    pub status: FactoryRunStatus,
-}
+pub struct SessionTasksWaitForPendingResult {}
 
-/// Resolved persisted factory identity and resumed run envelope.
+/// Progress information for the task, or null when no task with that ID is tracked.
 ///
 /// <div class="warning">
 ///
@@ -19099,14 +23759,12 @@ pub struct SessionFactoryRunResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryResumeResult {
-    /// Persisted factory name resolved for the resumed run.
-    pub factory_name: String,
-    /// Terminal resumed run envelope.
-    pub run: FactoryRunResult,
+pub struct SessionTasksGetProgressResult {
+    /// Progress information for the task, discriminated by type. Returns null when no task with this ID is currently tracked.
+    pub progress: Option<serde_json::Value>,
 }
 
-/// Complete current or terminal factory run envelope.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -19116,29 +23774,12 @@ pub struct SessionFactoryResumeResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryGetRunResult {
-    /// Error message for an errored run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Machine-readable failure details for an errored run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub failure: Option<serde_json::Value>,
-    /// Reason for a halted or cancelled run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-    /// Completed factory result.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<serde_json::Value>,
-    /// Factory run identifier.
-    pub run_id: String,
-    /// Partial journal and progress snapshot for a halted, cancelled, or errored run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub snapshot: Option<serde_json::Value>,
-    /// Current or terminal factory run status.
-    pub status: FactoryRunStatus,
+pub struct SessionTasksGetCurrentPromotableParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Factory runs in durable creation order.
+/// The first sync-waiting task that can currently be promoted to background mode.
 ///
 /// <div class="warning">
 ///
@@ -19148,11 +23789,13 @@ pub struct SessionFactoryGetRunResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryListRunsResult {
-    pub runs: Vec<FactoryRunSummary>,
+pub struct SessionTasksGetCurrentPromotableResult {
+    /// The first sync-waiting task (agent first, then shell) that can currently be promoted to background mode. Omitted if no such task exists. The returned task is guaranteed to have executionMode='sync' and canPromoteToBackground=true at the time of the call.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task: Option<serde_json::Value>,
 }
 
-/// Full factory run observability detail.
+/// Indicates whether the task was successfully promoted to background mode.
 ///
 /// <div class="warning">
 ///
@@ -19162,32 +23805,12 @@ pub struct SessionFactoryListRunsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryGetRunDetailResult {
-    pub active_segment_started_at: Option<i64>,
-    pub agents: Vec<FactoryAgentSummary>,
-    pub approved: Option<FactoryDeclaredLimits>,
-    pub completed_at: Option<i64>,
-    pub consumed: FactoryRunConsumed,
-    pub created_at: i64,
-    pub current_phase: Option<FactoryCurrentPhase>,
-    pub declared_limits: FactoryDeclaredLimits,
-    pub declared_phase_count: i64,
-    pub description: String,
-    pub factory_name: String,
-    pub live_agent_count: i64,
-    pub observed_at: i64,
-    pub phases: Vec<FactoryPhaseObservation>,
-    pub progress: FactoryProgressPage,
-    pub revision: i64,
-    pub run_id: String,
-    pub started_at: Option<i64>,
-    pub status: FactoryRunStatus,
-    pub terminal: Option<FactoryRunTerminal>,
-    pub total_spawned_agent_count: i64,
-    pub updated_at: i64,
+pub struct SessionTasksPromoteToBackgroundResult {
+    /// Whether the task was successfully promoted to background mode
+    pub promoted: bool,
 }
 
-/// A bidirectional page of factory progress.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -19197,17 +23820,12 @@ pub struct SessionFactoryGetRunDetailResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryGetRunProgressResult {
-    pub has_more_newer: bool,
-    pub has_more_older: bool,
-    pub newest_seq: Option<i64>,
-    pub oldest_seq: Option<i64>,
-    pub records: Vec<FactoryProgressLine>,
-    /// Run revision reflected by this page.
-    pub revision: i64,
+pub struct SessionTasksPromoteCurrentToBackgroundParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Complete current or terminal factory run envelope.
+/// The promoted task as it now exists in background mode, omitted if no promotable task was waiting.
 ///
 /// <div class="warning">
 ///
@@ -19217,29 +23835,13 @@ pub struct SessionFactoryGetRunProgressResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryCancelResult {
-    /// Error message for an errored run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Machine-readable failure details for an errored run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub failure: Option<serde_json::Value>,
-    /// Reason for a halted or cancelled run.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-    /// Completed factory result.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<serde_json::Value>,
-    /// Factory run identifier.
-    pub run_id: String,
-    /// Partial journal and progress snapshot for a halted, cancelled, or errored run.
+pub struct SessionTasksPromoteCurrentToBackgroundResult {
+    /// The promoted task as it now exists in background mode, omitted if no promotable task was waiting. Atomic operation: avoids the race window of getCurrentPromotable + promoteToBackground.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub snapshot: Option<serde_json::Value>,
-    /// Current or terminal factory run status.
-    pub status: FactoryRunStatus,
+    pub task: Option<serde_json::Value>,
 }
 
-/// Acknowledgement that a factory request was accepted.
+/// Indicates whether the background task was successfully cancelled.
 ///
 /// <div class="warning">
 ///
@@ -19249,9 +23851,12 @@ pub struct SessionFactoryCancelResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryLogResult {}
+pub struct SessionTasksCancelResult {
+    /// Whether the task was successfully cancelled
+    pub cancelled: bool,
+}
 
-/// Result of one factory-scoped subagent call.
+/// Indicates whether the task was removed. False when the task does not exist or is still running/idle.
 ///
 /// <div class="warning">
 ///
@@ -19261,13 +23866,12 @@ pub struct SessionFactoryLogResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryAgentResult {
-    /// Agent result, omitted when the agent produced no result.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<serde_json::Value>,
+pub struct SessionTasksRemoveResult {
+    /// Whether the task was removed. Returns false if the task does not exist or is still running/idle (cancel it first).
+    pub removed: bool,
 }
 
-/// Result of reading a factory journal entry.
+/// Indicates whether the message was delivered, with an error message when delivery failed.
 ///
 /// <div class="warning">
 ///
@@ -19277,15 +23881,15 @@ pub struct SessionFactoryAgentResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryJournalGetResult {
-    /// Whether the journal contained the requested key.
-    pub hit: bool,
-    /// Cached JSON result. The hit field distinguishes a cached JSON null from a miss.
+pub struct SessionTasksSendMessageResult {
+    /// Error message if delivery failed
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub result_json: Option<serde_json::Value>,
+    pub error: Option<String>,
+    /// Whether the message was successfully delivered or steered
+    pub sent: bool,
 }
 
-/// Acknowledgement that a factory request was accepted.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -19295,9 +23899,12 @@ pub struct SessionFactoryJournalGetResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFactoryJournalPutResult {}
+pub struct SessionSkillsListParams {
+    /// Target session identifier
+    pub session_id: SessionId,
+}
 
-/// Identifies the target session.
+/// Skills available to the session, with their enabled state.
 ///
 /// <div class="warning">
 ///
@@ -19307,12 +23914,12 @@ pub struct SessionFactoryJournalPutResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionModelGetCurrentParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionSkillsListResult {
+    /// Available skills
+    pub skills: Vec<Skill>,
 }
 
-/// The currently selected model, reasoning effort, and context tier for the session. The context tier reflects `Session.getContextTier()`, restored from the session journal on resume.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -19322,19 +23929,12 @@ pub struct SessionModelGetCurrentParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionModelGetCurrentResult {
-    /// Context tier for models that support multiple context-window sizes.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_tier: Option<ContextTier>,
-    /// Currently active model identifier
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_id: Option<String>,
-    /// Reasoning effort level currently applied to the active model, when one is set. Reads `Session.getReasoningEffort()` synchronously after `getSelectedModel()` resolves so the two values are reported as a snapshot.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_effort: Option<String>,
+pub struct SessionSkillsGetInvokedParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// The model identifier active on the session after the switch.
+/// Skills invoked during this session, ordered by invocation time (most recent last).
 ///
 /// <div class="warning">
 ///
@@ -19344,16 +23944,12 @@ pub struct SessionModelGetCurrentResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionModelSwitchToResult {
-    /// True when the switch was deferred (enqueued as a cancellable `/model` command) because a turn was active or another model change was already queued, rather than applied immediately. When true, the session's live model is unchanged until the queued change drains.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub deferred: Option<bool>,
-    /// Currently active model identifier after the switch
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_id: Option<String>,
+pub struct SessionSkillsGetInvokedResult {
+    /// Skills invoked during this session, ordered by invocation time (most recent last)
+    pub skills: Vec<SkillsInvokedSkill>,
 }
 
-/// Update the session's reasoning effort without changing the selected model. Use `switchTo` instead when you also need to change the model. The runtime stores the effort on the session and applies it to subsequent turns.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -19363,12 +23959,12 @@ pub struct SessionModelSwitchToResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionModelSetReasoningEffortResult {
-    /// Reasoning effort level recorded on the session after the update
-    pub reasoning_effort: String,
+pub struct SessionSkillsReloadParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// The list of models available to this session.
+/// Diagnostics from reloading skill definitions, with warnings and errors as separate lists.
 ///
 /// <div class="warning">
 ///
@@ -19378,15 +23974,11 @@ pub struct SessionModelSetReasoningEffortResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionModelListResult {
-    /// Available models, ordered with the most preferred default first. Includes both Copilot (CAPI) models and any registry BYOK models; a BYOK model appears under its provider-qualified selection id (`provider/id`).
-    pub list: Vec<serde_json::Value>,
-    /// Cost categories for the full CAPI catalog, including picker-disabled models that Auto may select. Metadata only; entries absent from `list` are not manually selectable.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_price_categories: Option<Vec<SessionModelPriceCategory>>,
-    /// Per-quota snapshots returned alongside the model list, keyed by quota type.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub quota_snapshots: Option<HashMap<String, serde_json::Value>>,
+pub struct SessionSkillsReloadResult {
+    /// Errors emitted while loading skills (e.g. skills that failed to load entirely)
+    pub errors: Vec<String>,
+    /// Warnings emitted while loading skills (e.g. skills that loaded but had issues)
+    pub warnings: Vec<String>,
 }
 
 /// Identifies the target session.
@@ -19399,7 +23991,7 @@ pub struct SessionModelListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionModeGetParams {
+pub struct SessionSkillsEnsureLoadedParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
@@ -19414,12 +24006,12 @@ pub struct SessionModeGetParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionNameGetParams {
+pub struct SessionMcpListParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// The session's friendly name, or null when not yet set.
+/// MCP servers configured for the session, with their connection status and host-level state.
 ///
 /// <div class="warning">
 ///
@@ -19429,12 +24021,15 @@ pub struct SessionNameGetParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionNameGetResult {
-    /// The session name (user-set or auto-generated), or null if not yet set
-    pub name: Option<String>,
+pub struct SessionMcpListResult {
+    /// Host-level state, omitted when no MCP host is initialized.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub host: Option<McpHostState>,
+    /// Configured MCP servers
+    pub servers: Vec<McpServer>,
 }
 
-/// Indicates whether the auto-generated summary was applied as the session's name.
+/// Tools exposed by the connected MCP server. Throws when the server is not connected.
 ///
 /// <div class="warning">
 ///
@@ -19444,9 +24039,9 @@ pub struct SessionNameGetResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionNameSetAutoResult {
-    /// Whether the auto-generated summary was persisted. False if the session already has a user-set name, the summary normalized to empty, or the session does not have a workspace.
-    pub applied: bool,
+pub struct SessionMcpListToolsResult {
+    /// Tools exposed by the server.
+    pub tools: Vec<McpTools>,
 }
 
 /// Identifies the target session.
@@ -19459,12 +24054,12 @@ pub struct SessionNameSetAutoResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPlanReadParams {
+pub struct SessionMcpReloadParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Existence, contents, and resolved path of the session plan file.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -19474,16 +24069,12 @@ pub struct SessionPlanReadParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPlanReadResult {
-    /// The content of the plan file, or null if it does not exist
-    pub content: Option<String>,
-    /// Whether the plan file exists in the workspace
-    pub exists: bool,
-    /// Absolute file path of the plan file, or null if workspace is not enabled
-    pub path: Option<String>,
+pub struct SessionMcpMoveLoadingToBackgroundParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Identifies the target session.
+/// Result of moving in-flight MCP loading to the background.
 ///
 /// <div class="warning">
 ///
@@ -19493,12 +24084,12 @@ pub struct SessionPlanReadResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPlanDeleteParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionMcpMoveLoadingToBackgroundResult {
+    /// Whether an in-flight MCP load was moved to the background, releasing turns that were waiting on it. False when no MCP load was in flight or the waiting turns had already been released.
+    pub moved_to_background: bool,
 }
 
-/// Identifies the target session.
+/// MCP server startup filtering result.
 ///
 /// <div class="warning">
 ///
@@ -19508,12 +24099,18 @@ pub struct SessionPlanDeleteParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPlanReadSqlTodosParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionMcpReloadWithConfigResult {
+    /// Non-default servers allowed by policy
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub allowed_servers: Option<Vec<McpAllowedServer>>,
+    /// Servers whose connection attempt failed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub failed_servers: Option<Vec<McpFailedServer>>,
+    /// Servers filtered out before startup
+    pub filtered_servers: Vec<McpFilteredServer>,
 }
 
-/// Todo rows read from the session SQL database. Empty when no session database is available.
+/// Outcome of an MCP sampling execution: success result, failure error, or cancellation.
 ///
 /// <div class="warning">
 ///
@@ -19523,12 +24120,18 @@ pub struct SessionPlanReadSqlTodosParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPlanReadSqlTodosResult {
-    /// Rows from the session SQL todos table, ordered by creation time and id.
-    pub rows: Vec<PlanSqlTodosRow>,
+pub struct SessionMcpExecuteSamplingResult {
+    /// Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.
+    pub action: McpSamplingExecutionAction,
+    /// Error description, present when action='failure'.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<McpExecuteSamplingResult>,
 }
 
-/// Identifies the target session.
+/// Indicates whether an in-flight sampling execution with the given requestId was found and cancelled.
 ///
 /// <div class="warning">
 ///
@@ -19538,12 +24141,12 @@ pub struct SessionPlanReadSqlTodosResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPlanReadSqlTodosWithDependenciesParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionMcpCancelSamplingExecutionResult {
+    /// True if an in-flight execution with the given requestId was found and signalled to cancel. False when no such execution is in flight (already completed, never started, or cancelled by another caller).
+    pub cancelled: bool,
 }
 
-/// Todo rows + dependency edges read from the session SQL database.
+/// Env-value mode recorded on the session after the update.
 ///
 /// <div class="warning">
 ///
@@ -19553,11 +24156,9 @@ pub struct SessionPlanReadSqlTodosWithDependenciesParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPlanReadSqlTodosWithDependenciesResult {
-    /// Edges from the session SQL todo_deps table. Empty when no database, no todo_deps table, or the SELECT failed. Read independently from `rows`, so a broken todo_deps table does not affect the rows result and vice versa.
-    pub dependencies: Vec<PlanSqlTodoDependency>,
-    /// Rows from the session SQL todos table, ordered by creation time and id. Empty when no database, no todos table, or the SELECT failed.
-    pub rows: Vec<PlanSqlTodosRow>,
+pub struct SessionMcpSetEnvValueModeResult {
+    /// Mode recorded on the session after the update
+    pub mode: McpSetEnvValueModeDetails,
 }
 
 /// Identifies the target session.
@@ -19570,54 +24171,27 @@ pub struct SessionPlanReadSqlTodosWithDependenciesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesGetWorkspaceParams {
+pub struct SessionMcpRemoveGitHubParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
+/// Indicates whether the auto-managed `github` MCP server was removed (false when nothing to remove).
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesGetWorkspaceResultWorkspace {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    #[serde(
-        rename = "chronicle_sync_dismissed",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub chronicle_sync_dismissed: Option<bool>,
-    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
-    pub created_at: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
-    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
-    pub id: String,
-    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
-    pub mc_last_event_id: Option<String>,
-    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
-    pub mc_session_id: Option<String>,
-    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
-    pub mc_task_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
-    pub remote_steerable: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
-    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
-    pub summary_count: Option<i64>,
-    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
-    pub updated_at: Option<String>,
-    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
-    pub user_named: Option<bool>,
+pub struct SessionMcpRemoveGitHubResult {
+    /// True when the auto-managed `github` MCP server was removed; false when no removal happened (e.g. user has explicitly configured a `github` server, or the server was not registered).
+    pub removed: bool,
 }
 
-/// Current workspace metadata for the session, including its absolute filesystem path when available.
+/// Result of configuring GitHub MCP.
 ///
 /// <div class="warning">
 ///
@@ -19627,57 +24201,27 @@ pub struct SessionWorkspacesGetWorkspaceResultWorkspace {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesGetWorkspaceResult {
-    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// Current workspace metadata, or null if not available
-    pub workspace: Option<SessionWorkspacesGetWorkspaceResultWorkspace>,
+pub struct SessionMcpConfigureGitHubResult {
+    /// Whether GitHub MCP configuration changed.
+    pub changed: bool,
 }
 
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesUpdateMetadataResultWorkspace {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    #[serde(
-        rename = "chronicle_sync_dismissed",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub chronicle_sync_dismissed: Option<bool>,
-    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
-    pub created_at: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
-    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
-    pub id: String,
-    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
-    pub mc_last_event_id: Option<String>,
-    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
-    pub mc_session_id: Option<String>,
-    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
-    pub mc_task_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
-    pub remote_steerable: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
-    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
-    pub summary_count: Option<i64>,
-    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
-    pub updated_at: Option<String>,
-    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
-    pub user_named: Option<bool>,
+/// Whether the named MCP server is running.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionMcpIsServerRunningResult {
+    /// True if the server has an active client and transport.
+    pub running: bool,
 }
 
-/// Current workspace metadata for the session, including its absolute filesystem path when available.
+/// Indicates whether the pending MCP OAuth response was accepted.
 ///
 /// <div class="warning">
 ///
@@ -19687,57 +24231,28 @@ pub struct SessionWorkspacesUpdateMetadataResultWorkspace {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesUpdateMetadataResult {
-    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// Current workspace metadata, or null if not available
-    pub workspace: Option<SessionWorkspacesUpdateMetadataResultWorkspace>,
+pub struct SessionMcpOauthHandlePendingRequestResult {
+    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
+    pub success: bool,
 }
 
+/// OAuth authorization URL the caller should open, or empty when cached tokens already authenticated the server.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesEnsureResultWorkspace {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    #[serde(
-        rename = "chronicle_sync_dismissed",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub chronicle_sync_dismissed: Option<bool>,
-    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
-    pub created_at: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
-    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
-    pub id: String,
-    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
-    pub mc_last_event_id: Option<String>,
-    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
-    pub mc_session_id: Option<String>,
-    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
-    pub mc_task_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
-    pub remote_steerable: Option<bool>,
+pub struct SessionMcpOauthLoginResult {
+    /// URL the caller should open in a browser to complete OAuth. Omitted when cached tokens were still valid and no browser interaction was needed — the server is already reconnected in that case. When present, the runtime starts the callback listener before returning and continues the flow in the background; completion is signaled via session.mcp_server_status_changed.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
-    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
-    pub summary_count: Option<i64>,
-    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
-    pub updated_at: Option<String>,
-    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
-    pub user_named: Option<bool>,
+    pub authorization_url: Option<String>,
 }
 
-/// Current workspace metadata for the session, including its absolute filesystem path when available.
+/// Indicates whether the pending MCP OAuth response was accepted.
 ///
 /// <div class="warning">
 ///
@@ -19747,15 +24262,12 @@ pub struct SessionWorkspacesEnsureResultWorkspace {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesEnsureResult {
-    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// Current workspace metadata, or null if not available
-    pub workspace: Option<SessionWorkspacesEnsureResultWorkspace>,
+pub struct SessionMcpOauthRespondResult {
+    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
+    pub success: bool,
 }
 
-/// Identifies the target session.
+/// Indicates whether the pending MCP headers refresh response was accepted.
 ///
 /// <div class="warning">
 ///
@@ -19765,12 +24277,12 @@ pub struct SessionWorkspacesEnsureResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesListFilesParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionMcpHeadersHandlePendingHeadersRefreshRequestResult {
+    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
+    pub success: bool,
 }
 
-/// Relative paths of files stored in the session workspace files directory.
+/// Resource contents returned by the MCP server.
 ///
 /// <div class="warning">
 ///
@@ -19780,12 +24292,12 @@ pub struct SessionWorkspacesListFilesParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesListFilesResult {
-    /// Relative file paths in the workspace files directory
-    pub files: Vec<String>,
+pub struct SessionMcpAppsReadResourceResult {
+    /// Resource contents returned by the server
+    pub contents: Vec<McpAppsResourceContent>,
 }
 
-/// Contents of the requested workspace file as a UTF-8 string.
+/// App-callable tools from the named MCP server.
 ///
 /// <div class="warning">
 ///
@@ -19795,9 +24307,9 @@ pub struct SessionWorkspacesListFilesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesReadFileResult {
-    /// File content as a UTF-8 string
-    pub content: String,
+pub struct SessionMcpAppsListToolsResult {
+    /// App-callable tools from the server
+    pub tools: Vec<HashMap<String, serde_json::Value>>,
 }
 
 /// Identifies the target session.
@@ -19810,12 +24322,12 @@ pub struct SessionWorkspacesReadFileResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesListCheckpointsParams {
+pub struct SessionMcpAppsGetHostContextParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Workspace checkpoints in chronological order; empty when the workspace is not enabled.
+/// Current host context advertised to MCP App guests.
 ///
 /// <div class="warning">
 ///
@@ -19825,12 +24337,12 @@ pub struct SessionWorkspacesListCheckpointsParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesListCheckpointsResult {
-    /// Workspace checkpoints in chronological order. Empty when workspace is not enabled.
-    pub checkpoints: Vec<WorkspacesCheckpoints>,
+pub struct SessionMcpAppsGetHostContextResult {
+    /// Current host context
+    pub context: McpAppsHostContextDetails,
 }
 
-/// Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.
+/// Diagnostic snapshot of MCP Apps wiring for the named server.
 ///
 /// <div class="warning">
 ///
@@ -19840,12 +24352,14 @@ pub struct SessionWorkspacesListCheckpointsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesReadCheckpointResult {
-    /// Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing
-    pub content: Option<String>,
+pub struct SessionMcpAppsDiagnoseResult {
+    /// Capability negotiation snapshot
+    pub capability: McpAppsDiagnoseCapability,
+    /// What the server returned for this session
+    pub server: McpAppsDiagnoseServer,
 }
 
-/// Persisted summary metadata and refreshed workspace metadata.
+/// Resource contents returned by the MCP server.
 ///
 /// <div class="warning">
 ///
@@ -19855,56 +24369,12 @@ pub struct SessionWorkspacesReadCheckpointResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesAddSummaryResult {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub workspace: Option<serde_json::Value>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesTruncateSummariesResultWorkspace {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    #[serde(
-        rename = "chronicle_sync_dismissed",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub chronicle_sync_dismissed: Option<bool>,
-    #[serde(rename = "client_name", skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
-    pub created_at: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.
-    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<WorkspacesWorkspaceDetailsHostType>,
-    pub id: String,
-    #[serde(rename = "mc_last_event_id", skip_serializing_if = "Option::is_none")]
-    pub mc_last_event_id: Option<String>,
-    #[serde(rename = "mc_session_id", skip_serializing_if = "Option::is_none")]
-    pub mc_session_id: Option<String>,
-    #[serde(rename = "mc_task_id", skip_serializing_if = "Option::is_none")]
-    pub mc_task_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    #[serde(rename = "remote_steerable", skip_serializing_if = "Option::is_none")]
-    pub remote_steerable: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
-    #[serde(rename = "summary_count", skip_serializing_if = "Option::is_none")]
-    pub summary_count: Option<i64>,
-    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
-    pub updated_at: Option<String>,
-    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
-    pub user_named: Option<bool>,
+pub struct SessionMcpResourcesReadResult {
+    /// Resource contents returned by the server
+    pub contents: Vec<McpResourceContent>,
 }
 
-/// Current workspace metadata for the session, including its absolute filesystem path when available.
+/// One page of resources advertised by the named MCP server.
 ///
 /// <div class="warning">
 ///
@@ -19914,15 +24384,15 @@ pub struct SessionWorkspacesTruncateSummariesResultWorkspace {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesTruncateSummariesResult {
-    /// Absolute filesystem path to the workspace directory. Omitted when the session has no workspace (e.g. remote sessions).
+pub struct SessionMcpResourcesListResult {
+    /// Opaque cursor for the next page, if the server has more resources
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// Current workspace metadata, or null if not available
-    pub workspace: Option<SessionWorkspacesTruncateSummariesResultWorkspace>,
+    pub next_cursor: Option<String>,
+    /// Resources advertised by the server (proxied MCP `resources/list`)
+    pub resources: Vec<McpResource>,
 }
 
-/// Identifies the target session.
+/// One page of resource templates advertised by the named MCP server.
 ///
 /// <div class="warning">
 ///
@@ -19932,12 +24402,15 @@ pub struct SessionWorkspacesTruncateSummariesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesReadAutopilotObjectiveParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionMcpResourcesListTemplatesResult {
+    /// Opaque cursor for the next page, if the server has more resource templates
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub next_cursor: Option<String>,
+    /// Resource templates advertised by the server (proxied MCP `resources/templates/list`)
+    pub resource_templates: Vec<McpResourceTemplate>,
 }
 
-/// Autopilot objective file content, or null when missing.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -19947,12 +24420,12 @@ pub struct SessionWorkspacesReadAutopilotObjectiveParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesReadAutopilotObjectiveResult {
-    /// Autopilot objective file content, or null when missing.
-    pub content: Option<String>,
+pub struct SessionPluginsListParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Result of writing the autopilot objective file.
+/// Plugins installed for the session, with their enabled state and version metadata.
 ///
 /// <div class="warning">
 ///
@@ -19962,12 +24435,12 @@ pub struct SessionWorkspacesReadAutopilotObjectiveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesWriteAutopilotObjectiveResult {
-    /// Filesystem operation performed.
-    pub operation: String,
+pub struct SessionPluginsListResult {
+    /// Installed plugins
+    pub plugins: Vec<Plugin>,
 }
 
-/// Identifies the target session.
+/// A snapshot of the provider endpoint the session is currently configured to talk to.
 ///
 /// <div class="warning">
 ///
@@ -19977,12 +24450,28 @@ pub struct SessionWorkspacesWriteAutopilotObjectiveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesDeleteAutopilotObjectiveParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionProviderGetEndpointResult {
+    /// A credential the caller should use with this endpoint. Omitted only when the endpoint accepts unauthenticated requests.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub api_key: Option<String>,
+    /// Base URL to pass to the LLM client library.
+    pub base_url: String,
+    /// HTTP headers the caller must include on every outbound request.
+    pub headers: HashMap<String, String>,
+    /// Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_token: Option<ProviderSessionToken>,
+    /// Transport to be used for provider requests.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transport: Option<ProviderEndpointTransport>,
+    /// Provider family. Matches the `type` field of a BYOK provider config.
+    pub r#type: ProviderEndpointType,
+    /// Wire API to be used, when required for the provider type.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wire_api: Option<ProviderEndpointWireApi>,
 }
 
-/// Result of deleting the autopilot objective file.
+/// The selectable model entries synthesized for the models added by this call.
 ///
 /// <div class="warning">
 ///
@@ -19992,12 +24481,12 @@ pub struct SessionWorkspacesDeleteAutopilotObjectiveParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesDeleteAutopilotObjectiveResult {
-    /// True when a file was deleted.
-    pub deleted: bool,
+pub struct SessionProviderAddResult {
+    /// Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.
+    pub models: Vec<serde_json::Value>,
 }
 
-/// Identifies the target session.
+/// Indicates whether the session options patch was applied successfully.
 ///
 /// <div class="warning">
 ///
@@ -20007,12 +24496,15 @@ pub struct SessionWorkspacesDeleteAutopilotObjectiveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesAutopilotObjectiveExistsParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionOptionsUpdateResult {
+    /// Number of hooks loaded from installed plugins, returned when installedPlugins is updated
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plugin_hook_count: Option<i64>,
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Whether the autopilot objective file exists.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -20022,23 +24514,12 @@ pub struct SessionWorkspacesAutopilotObjectiveExistsParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesAutopilotObjectiveExistsResult {
-    /// True when the objective file exists.
-    pub exists: bool,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesSaveLargePasteResultSaved {
-    /// Filename within the workspace files directory
-    pub filename: String,
-    /// Absolute filesystem path to the saved paste file
-    pub file_path: String,
-    /// Size of the saved file in bytes
-    pub size_bytes: i64,
+pub struct SessionExtensionsListParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Descriptor for the saved paste file, or null when the workspace is unavailable.
+/// Extensions discovered for the session, with their current status.
 ///
 /// <div class="warning">
 ///
@@ -20048,12 +24529,12 @@ pub struct SessionWorkspacesSaveLargePasteResultSaved {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesSaveLargePasteResult {
-    /// Saved-paste descriptor, or null when the workspace is unavailable (e.g. CCA runtime, non-infinite sessions, remote sessions)
-    pub saved: Option<SessionWorkspacesSaveLargePasteResultSaved>,
+pub struct SessionExtensionsListResult {
+    /// Discovered extensions and their current status
+    pub extensions: Vec<Extension>,
 }
 
-/// Workspace diff result for the requested mode.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -20063,24 +24544,12 @@ pub struct SessionWorkspacesSaveLargePasteResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionWorkspacesDiffResult {
-    /// Default branch used for a branch diff, when branch mode was requested.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub base_branch: Option<String>,
-    /// Changed files and their unified diffs.
-    pub changes: Vec<WorkspaceDiffFileChange>,
-    /// Whether the requested diff fell back to unstaged changes, either because branch diff failed or session diff was unavailable.
-    pub is_fallback: bool,
-    /// Effective mode used for the returned changes.
-    pub mode: WorkspaceDiffMode,
-    /// Diff mode requested by the client.
-    pub requested_mode: WorkspaceDiffMode,
-    /// Why the session diff could not be produced, when applicable. Set only when `session` mode was requested and `isFallback` is true, so a client can tell the permanent `file-change-tracking-disabled` apart from the transient `session-busy`, which the same request answers once the session settles. Never set for `unstaged` or `branch` mode, and never `unsupported-remote-session`: a remote session's captures live on its own host, so a `session`-mode diff is rejected for one rather than answered with a controller-side fallback.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub unavailable_reason: Option<HistoryRewindUnavailableReason>,
+pub struct SessionExtensionsReloadParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Identifies the target session.
+/// Rust-owned built-in tool descriptors for the session.
 ///
 /// <div class="warning">
 ///
@@ -20090,12 +24559,12 @@ pub struct SessionWorkspacesDiffResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCompletionsGetTriggerCharactersParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionToolsGetBuiltinDescriptorsResult {
+    /// Built-in tool descriptors materialized for the session.
+    pub tools: Vec<BuiltinToolDescriptor>,
 }
 
-/// Characters that, when typed in the composer, should trigger a `completions.request`. Empty when the session has no host-driven completions (e.g. local sessions, or a relay host that does not advertise `completionTriggerCharacters`).
+/// Task completion notification with summary from the agent
 ///
 /// <div class="warning">
 ///
@@ -20105,12 +24574,25 @@ pub struct SessionCompletionsGetTriggerCharactersParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCompletionsGetTriggerCharactersResult {
-    /// Trigger characters advertised by the host (e.g. `["@", "#"]`). Empty disables host-driven completions for the session.
-    pub trigger_characters: Vec<String>,
+pub struct SessionToolsTaskCompleteEventDataResult {
+    /// Active autopilot objective ID evaluated by the completion reviewer
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub objective_id: Option<i64>,
+    /// Semantic completion decision. Absent on legacy events and invalid tool calls
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub outcome: Option<TaskCompletionOutcome>,
+    /// Label-safe runtime rationale for the completion decision (e.g. a cancellation or pause/resume downgrade), when one applies. Reviewer-authored rationale is intentionally omitted here because this event has no IFC label channel; the reviewer's findings remain available through its own labeled sub-agent events
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Whether the task was accepted as complete. False when validation failed or completion was rejected or blocked by the reviewer
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub success: Option<bool>,
+    /// Summary of the completed task, provided by the agent
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary: Option<String>,
 }
 
-/// Host-driven completion items for the current composer input. Empty when the host returns no items or does not support completions.
+/// Indicates whether the external tool call result was handled successfully.
 ///
 /// <div class="warning">
 ///
@@ -20120,9 +24602,9 @@ pub struct SessionCompletionsGetTriggerCharactersResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCompletionsRequestResult {
-    /// Completion items in host-ranked order.
-    pub items: Vec<SessionCompletionItem>,
+pub struct SessionToolsHandlePendingToolCallResult {
+    /// Whether the tool call result was handled successfully
+    pub success: bool,
 }
 
 /// Identifies the target session.
@@ -20135,12 +24617,12 @@ pub struct SessionCompletionsRequestResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionInstructionsGetSourcesParams {
+pub struct SessionToolsInitializeAndValidateParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Instruction sources loaded for the session, in merge order.
+/// Resolve, build, and validate the runtime tool list for this session. Subagent sessions and consumer flows that need an initialized tool set before `send` invoke this. Default base-class implementation is a no-op for sessions that don't support tool validation.
 ///
 /// <div class="warning">
 ///
@@ -20150,12 +24632,9 @@ pub struct SessionInstructionsGetSourcesParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionInstructionsGetSourcesResult {
-    /// Instruction sources for the session
-    pub sources: Vec<InstructionSource>,
-}
+pub struct SessionToolsInitializeAndValidateResult {}
 
-/// Indicates whether fleet mode was successfully activated.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -20165,12 +24644,12 @@ pub struct SessionInstructionsGetSourcesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionFleetStartResult {
-    /// Whether fleet mode was successfully activated
-    pub started: bool,
+pub struct SessionToolsGetCurrentMetadataParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Agents available to the session.
+/// Current lightweight tool metadata snapshot for the session.
 ///
 /// <div class="warning">
 ///
@@ -20180,12 +24659,12 @@ pub struct SessionFleetStartResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionAgentListResult {
-    /// Available agents
-    pub agents: Vec<AgentInfo>,
+pub struct SessionToolsGetCurrentMetadataResult {
+    /// Current tool metadata, or null when tools have not been initialized yet
+    pub tools: Option<Vec<CurrentToolMetadata>>,
 }
 
-/// Identifies the target session.
+/// Empty result after replacing the calling connection's externally implemented tools.
 ///
 /// <div class="warning">
 ///
@@ -20195,12 +24674,9 @@ pub struct SessionAgentListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionAgentGetCurrentParams {
-    /// Target session identifier
-    pub session_id: SessionId,
-}
+pub struct SessionToolsSetResult {}
 
-/// The currently selected custom agent, or null when using the default agent.
+/// Empty result after applying subagent settings
 ///
 /// <div class="warning">
 ///
@@ -20210,12 +24686,9 @@ pub struct SessionAgentGetCurrentParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionAgentGetCurrentResult {
-    /// Currently selected custom agent, or null if using the default agent
-    pub agent: AgentInfo,
-}
+pub struct SessionToolsUpdateSubagentSettingsResult {}
 
-/// The newly selected custom agent.
+/// Slash commands available in the session, after applying any include/exclude filters.
 ///
 /// <div class="warning">
 ///
@@ -20225,12 +24698,12 @@ pub struct SessionAgentGetCurrentResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionAgentSelectResult {
-    /// The newly selected custom agent
-    pub agent: AgentInfo,
+pub struct SessionCommandsListResult {
+    /// Commands available in this session
+    pub commands: Vec<SlashCommandInfo>,
 }
 
-/// Identifies the target session.
+/// Whether finalizing the invocation effect succeeded, and the failure reason when it did not.
 ///
 /// <div class="warning">
 ///
@@ -20240,12 +24713,15 @@ pub struct SessionAgentSelectResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionAgentDeselectParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionCommandsFinalizeInvocationEffectResult {
+    /// Failure reason when the invocation effect could not be finalized.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Whether the pending invocation effect was finalized successfully.
+    pub success: bool,
 }
 
-/// Identifies the target session.
+/// Indicates whether the pending client-handled command was completed successfully.
 ///
 /// <div class="warning">
 ///
@@ -20255,12 +24731,12 @@ pub struct SessionAgentDeselectParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionAgentReloadParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionCommandsHandlePendingCommandResult {
+    /// Whether the command was handled successfully
+    pub success: bool,
 }
 
-/// Custom agents available to the session after reloading definitions from disk.
+/// Error message produced while executing the command, if any.
 ///
 /// <div class="warning">
 ///
@@ -20270,12 +24746,13 @@ pub struct SessionAgentReloadParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionAgentReloadResult {
-    /// Reloaded custom agents
-    pub agents: Vec<AgentInfo>,
+pub struct SessionCommandsExecuteResult {
+    /// Error message produced while executing the command, if any. Omitted when the handler succeeded.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
 }
 
-/// Identifier assigned to the newly started background agent task.
+/// Indicates whether the command was accepted into the local execution queue.
 ///
 /// <div class="warning">
 ///
@@ -20285,12 +24762,12 @@ pub struct SessionAgentReloadResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksStartAgentResult {
-    /// Generated agent ID for the background task
-    pub agent_id: String,
+pub struct SessionCommandsEnqueueResult {
+    /// True when the command was accepted into the local execution queue. False when the call targets a session that does not support local command queueing (e.g. remote sessions).
+    pub queued: bool,
 }
 
-/// Identifies the target session.
+/// Indicates whether the queued-command response was matched to a pending request.
 ///
 /// <div class="warning">
 ///
@@ -20300,12 +24777,12 @@ pub struct SessionTasksStartAgentResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksListParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionCommandsRespondToQueuedCommandResult {
+    /// Whether a pending queued command with the given request ID was found and resolved. False when the request was already resolved, cancelled, or unknown.
+    pub success: bool,
 }
 
-/// Background tasks currently tracked by the session.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -20315,12 +24792,12 @@ pub struct SessionTasksListParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksListResult {
-    /// Currently tracked tasks
-    pub tasks: Vec<serde_json::Value>,
+pub struct SessionTelemetryGetEngagementIdParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Identifies the target session.
+/// Telemetry engagement ID for the session, when available.
 ///
 /// <div class="warning">
 ///
@@ -20330,12 +24807,13 @@ pub struct SessionTasksListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksRefreshParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionTelemetryGetEngagementIdResult {
+    /// Current telemetry engagement ID, when available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub engagement_id: Option<String>,
 }
 
-/// Refresh metadata for any detached background shells the runtime knows about. Use after a long pause to pick up exit/output state for shells running outside the agent loop.
+/// Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs.
 ///
 /// <div class="warning">
 ///
@@ -20345,9 +24823,12 @@ pub struct SessionTasksRefreshParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksRefreshResult {}
+pub struct SessionUiEphemeralQueryResult {
+    /// Answer returned by the model
+    pub answer: String,
+}
 
-/// Identifies the target session.
+/// The elicitation response (accept with form values, decline, or cancel)
 ///
 /// <div class="warning">
 ///
@@ -20357,12 +24838,18 @@ pub struct SessionTasksRefreshResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksWaitForPendingParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionUiElicitationResult {
+    /// MCP response metadata.
+    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
+    pub meta: Option<HashMap<String, serde_json::Value>>,
+    /// The user's response: accept (submitted), decline (rejected), or cancel (dismissed)
+    pub action: UIElicitationResponseAction,
+    /// The form values submitted by the user (present when action is 'accept')
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub content: Option<HashMap<String, serde_json::Value>>,
 }
 
-/// Wait until all in-flight background tasks (agents + shells) and any follow-up turns scheduled by their completions have settled. Returns when the runtime is fully drained or after an internal timeout (default 10 minutes; configurable via COPILOT_TASK_WAIT_TIMEOUT_SECONDS).
+/// Indicates whether the elicitation response was accepted; false if it was already resolved by another client.
 ///
 /// <div class="warning">
 ///
@@ -20372,9 +24859,12 @@ pub struct SessionTasksWaitForPendingParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksWaitForPendingResult {}
+pub struct SessionUiHandlePendingElicitationResult {
+    /// Whether the response was accepted. False if the request was already resolved by another client.
+    pub success: bool,
+}
 
-/// Progress information for the task, or null when no task with that ID is tracked.
+/// Indicates whether the pending UI request was resolved by this call.
 ///
 /// <div class="warning">
 ///
@@ -20384,12 +24874,12 @@ pub struct SessionTasksWaitForPendingResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksGetProgressResult {
-    /// Progress information for the task, discriminated by type. Returns null when no task with this ID is currently tracked.
-    pub progress: Option<serde_json::Value>,
+pub struct SessionUiHandlePendingUserInputResult {
+    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
+    pub success: bool,
 }
 
-/// Identifies the target session.
+/// Indicates whether the pending UI request was resolved by this call.
 ///
 /// <div class="warning">
 ///
@@ -20399,12 +24889,12 @@ pub struct SessionTasksGetProgressResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksGetCurrentPromotableParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionUiHandlePendingSamplingResult {
+    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
+    pub success: bool,
 }
 
-/// The first sync-waiting task that can currently be promoted to background mode.
+/// Indicates whether the pending UI request was resolved by this call.
 ///
 /// <div class="warning">
 ///
@@ -20414,13 +24904,12 @@ pub struct SessionTasksGetCurrentPromotableParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksGetCurrentPromotableResult {
-    /// The first sync-waiting task (agent first, then shell) that can currently be promoted to background mode. Omitted if no such task exists. The returned task is guaranteed to have executionMode='sync' and canPromoteToBackground=true at the time of the call.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub task: Option<serde_json::Value>,
+pub struct SessionUiHandlePendingAutoModeSwitchResult {
+    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
+    pub success: bool,
 }
 
-/// Indicates whether the task was successfully promoted to background mode.
+/// Indicates whether the pending UI request was resolved by this call.
 ///
 /// <div class="warning">
 ///
@@ -20430,12 +24919,12 @@ pub struct SessionTasksGetCurrentPromotableResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksPromoteToBackgroundResult {
-    /// Whether the task was successfully promoted to background mode
-    pub promoted: bool,
+pub struct SessionUiHandlePendingSessionLimitsExhaustedResult {
+    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
+    pub success: bool,
 }
 
-/// Identifies the target session.
+/// Indicates whether the pending UI request was resolved by this call.
 ///
 /// <div class="warning">
 ///
@@ -20445,12 +24934,12 @@ pub struct SessionTasksPromoteToBackgroundResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksPromoteCurrentToBackgroundParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionUiHandlePendingExitPlanModeResult {
+    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
+    pub success: bool,
 }
 
-/// The promoted task as it now exists in background mode, omitted if no promotable task was waiting.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -20460,13 +24949,12 @@ pub struct SessionTasksPromoteCurrentToBackgroundParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksPromoteCurrentToBackgroundResult {
-    /// The promoted task as it now exists in background mode, omitted if no promotable task was waiting. Atomic operation: avoids the race window of getCurrentPromotable + promoteToBackground.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub task: Option<serde_json::Value>,
+pub struct SessionUiRegisterDirectAutoModeSwitchHandlerParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the background task was successfully cancelled.
+/// Register an in-process handler for `auto_mode_switch.requested` events. The caller still attaches the actual listener via the standard event-subscription mechanism; this registration solely tells the server bridge to skip its own dispatch (so a remote client doesn't race the in-process handler for the same requestId).
 ///
 /// <div class="warning">
 ///
@@ -20474,14 +24962,14 @@ pub struct SessionTasksPromoteCurrentToBackgroundResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionTasksCancelResult {
-    /// Whether the task was successfully cancelled
-    pub cancelled: bool,
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionUiRegisterDirectAutoModeSwitchHandlerResult {
+    /// Opaque handle representing the registration. Pass this same handle to `unregisterDirectAutoModeSwitchHandler` when the in-process handler is no longer active. Multiple registrations are reference-counted; the server bridge will only dispatch auto-mode-switch requests when no handles are active.
+    pub handle: String,
 }
 
-/// Indicates whether the task was removed. False when the task does not exist or is still running/idle.
+/// Indicates whether the handle was active and the registration count was decremented.
 ///
 /// <div class="warning">
 ///
@@ -20491,12 +24979,12 @@ pub struct SessionTasksCancelResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksRemoveResult {
-    /// Whether the task was removed. Returns false if the task does not exist or is still running/idle (cancel it first).
-    pub removed: bool,
+pub struct SessionUiUnregisterDirectAutoModeSwitchHandlerResult {
+    /// True if the handle was active and decremented the counter; false if the handle was unknown.
+    pub unregistered: bool,
 }
 
-/// Indicates whether the message was delivered, with an error message when delivery failed.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20506,15 +24994,12 @@ pub struct SessionTasksRemoveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTasksSendMessageResult {
-    /// Error message if delivery failed
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Whether the message was successfully delivered or steered
-    pub sent: bool,
+pub struct SessionPermissionsConfigureResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Identifies the target session.
+/// Indicates whether the permission decision was applied; false when the request was already resolved.
 ///
 /// <div class="warning">
 ///
@@ -20524,12 +25009,12 @@ pub struct SessionTasksSendMessageResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSkillsListParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionPermissionsHandlePendingPermissionRequestResult {
+    /// Whether the permission request was handled successfully
+    pub success: bool,
 }
 
-/// Skills available to the session, with their enabled state.
+/// List of pending permission requests reconstructed from event history.
 ///
 /// <div class="warning">
 ///
@@ -20539,12 +25024,12 @@ pub struct SessionSkillsListParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSkillsListResult {
-    /// Available skills
-    pub skills: Vec<Skill>,
+pub struct SessionPermissionsPendingRequestsResult {
+    /// Pending permission prompts reconstructed from the session's event history. Equivalent to the set of `permission.requested` events that have not yet been followed by a matching `permission.completed` event. Used by clients (e.g. the CLI) to hydrate UI for prompts that were emitted before the client attached to the session.
+    pub items: Vec<PendingPermissionRequest>,
 }
 
-/// Identifies the target session.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20554,12 +25039,12 @@ pub struct SessionSkillsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSkillsGetInvokedParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionPermissionsSetApproveAllResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Skills invoked during this session, ordered by invocation time (most recent last).
+/// Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode.
 ///
 /// <div class="warning">
 ///
@@ -20569,12 +25054,14 @@ pub struct SessionSkillsGetInvokedParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSkillsGetInvokedResult {
-    /// Skills invoked during this session, ordered by invocation time (most recent last)
-    pub skills: Vec<SkillsInvokedSkill>,
+pub struct SessionPermissionsSetModeResult {
+    /// Authoritative permission mode after the mutation
+    pub mode: PermissionMode,
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Identifies the target session.
+/// Current permission mode.
 ///
 /// <div class="warning">
 ///
@@ -20584,12 +25071,12 @@ pub struct SessionSkillsGetInvokedResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSkillsReloadParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionPermissionsGetModeResult {
+    /// Current permission mode
+    pub mode: PermissionMode,
 }
 
-/// Diagnostics from reloading skill definitions, with warnings and errors as separate lists.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20599,14 +25086,12 @@ pub struct SessionSkillsReloadParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSkillsReloadResult {
-    /// Errors emitted while loading skills (e.g. skills that failed to load entirely)
-    pub errors: Vec<String>,
-    /// Warnings emitted while loading skills (e.g. skills that loaded but had issues)
-    pub warnings: Vec<String>,
+pub struct SessionPermissionsModifyRulesResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Identifies the target session.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20616,12 +25101,12 @@ pub struct SessionSkillsReloadResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSkillsEnsureLoadedParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionPermissionsSetRequiredResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Identifies the target session.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20631,12 +25116,12 @@ pub struct SessionSkillsEnsureLoadedParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpListParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionPermissionsResetSessionApprovalsResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// MCP servers configured for the session, with their connection status and host-level state.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20646,15 +25131,12 @@ pub struct SessionMcpListParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpListResult {
-    /// Host-level state, omitted when no MCP host is initialized.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub host: Option<McpHostState>,
-    /// Configured MCP servers
-    pub servers: Vec<McpServer>,
+pub struct SessionPermissionsNotifyPromptShownResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Tools exposed by the connected MCP server. Throws when the server is not connected.
+/// Snapshot of the session's allow-listed directories and primary working directory.
 ///
 /// <div class="warning">
 ///
@@ -20664,12 +25146,14 @@ pub struct SessionMcpListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpListToolsResult {
-    /// Tools exposed by the server.
-    pub tools: Vec<McpTools>,
+pub struct SessionPermissionsPathsListResult {
+    /// All directories currently allowed for tool access on this session.
+    pub directories: Vec<String>,
+    /// The primary working directory for this session.
+    pub primary: String,
 }
 
-/// Identifies the target session.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20679,12 +25163,12 @@ pub struct SessionMcpListToolsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpReloadParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionPermissionsPathsAddResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// MCP server startup filtering result.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20694,15 +25178,12 @@ pub struct SessionMcpReloadParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpReloadWithConfigResult {
-    /// Non-default servers allowed by policy
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub allowed_servers: Option<Vec<McpAllowedServer>>,
-    /// Servers filtered out before startup
-    pub filtered_servers: Vec<McpFilteredServer>,
+pub struct SessionPermissionsPathsUpdatePrimaryResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Outcome of an MCP sampling execution: success result, failure error, or cancellation.
+/// Indicates whether the supplied path is within the session's allowed directories.
 ///
 /// <div class="warning">
 ///
@@ -20712,18 +25193,12 @@ pub struct SessionMcpReloadWithConfigResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpExecuteSamplingResult {
-    /// Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.
-    pub action: McpSamplingExecutionAction,
-    /// Error description, present when action='failure'.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<McpExecuteSamplingResult>,
+pub struct SessionPermissionsPathsIsPathWithinAllowedDirectoriesResult {
+    /// Whether the path is within the session's allowed directories
+    pub allowed: bool,
 }
 
-/// Indicates whether an in-flight sampling execution with the given requestId was found and cancelled.
+/// Indicates whether the supplied path is within the session's workspace directory.
 ///
 /// <div class="warning">
 ///
@@ -20733,12 +25208,12 @@ pub struct SessionMcpExecuteSamplingResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpCancelSamplingExecutionResult {
-    /// True if an in-flight execution with the given requestId was found and signalled to cancel. False when no such execution is in flight (already completed, never started, or cancelled by another caller).
-    pub cancelled: bool,
+pub struct SessionPermissionsPathsIsPathWithinWorkspaceResult {
+    /// Whether the path is within the session workspace directory
+    pub allowed: bool,
 }
 
-/// Env-value mode recorded on the session after the update.
+/// Resolved location-permissions key and type.
 ///
 /// <div class="warning">
 ///
@@ -20748,12 +25223,14 @@ pub struct SessionMcpCancelSamplingExecutionResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpSetEnvValueModeResult {
-    /// Mode recorded on the session after the update
-    pub mode: McpSetEnvValueModeDetails,
+pub struct SessionPermissionsLocationsResolveResult {
+    /// Location key used in the location-permissions store
+    pub location_key: String,
+    /// Whether the location is a git repo or directory
+    pub location_type: PermissionLocationType,
 }
 
-/// Identifies the target session.
+/// Summary of persisted location permissions applied to the session.
 ///
 /// <div class="warning">
 ///
@@ -20763,12 +25240,22 @@ pub struct SessionMcpSetEnvValueModeResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpRemoveGitHubParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionPermissionsLocationsApplyResult {
+    /// Number of persisted allowed directories added to the live path manager
+    pub applied_directory_count: i64,
+    /// Number of location-scoped rules added to the live permission service
+    pub applied_rule_count: i64,
+    /// Location-scoped rules applied to the live permission service
+    pub applied_rules: Vec<PermissionRule>,
+    /// Whether a different location was applied since the previous apply call
+    pub changed: bool,
+    /// Location key used in the location-permissions store
+    pub location_key: String,
+    /// Whether the location is a git repo or directory
+    pub location_type: PermissionLocationType,
 }
 
-/// Indicates whether the auto-managed `github` MCP server was removed (false when nothing to remove).
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20778,12 +25265,12 @@ pub struct SessionMcpRemoveGitHubParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpRemoveGitHubResult {
-    /// True when the auto-managed `github` MCP server was removed; false when no removal happened (e.g. user has explicitly configured a `github` server, or the server was not registered).
-    pub removed: bool,
+pub struct SessionPermissionsLocationsAddToolApprovalResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Result of configuring GitHub MCP.
+/// Folder trust check result.
 ///
 /// <div class="warning">
 ///
@@ -20793,12 +25280,12 @@ pub struct SessionMcpRemoveGitHubResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpConfigureGitHubResult {
-    /// Whether GitHub MCP configuration changed.
-    pub changed: bool,
+pub struct SessionPermissionsFolderTrustIsTrustedResult {
+    /// Whether the folder is trusted
+    pub trusted: bool,
 }
 
-/// Whether the named MCP server is running.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20808,12 +25295,12 @@ pub struct SessionMcpConfigureGitHubResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpIsServerRunningResult {
-    /// True if the server has an active client and transport.
-    pub running: bool,
+pub struct SessionPermissionsFolderTrustAddTrustedResult {
+    /// Whether the operation succeeded
+    pub success: bool,
 }
 
-/// Indicates whether the pending MCP OAuth response was accepted.
+/// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
 ///
@@ -20823,12 +25310,12 @@ pub struct SessionMcpIsServerRunningResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpOauthHandlePendingRequestResult {
-    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
+pub struct SessionPermissionsUrlsSetUnrestrictedModeResult {
+    /// Whether the operation succeeded
     pub success: bool,
 }
 
-/// OAuth authorization URL the caller should open, or empty when cached tokens already authenticated the server.
+/// Identifier of the session event that was emitted for the log message.
 ///
 /// <div class="warning">
 ///
@@ -20838,13 +25325,12 @@ pub struct SessionMcpOauthHandlePendingRequestResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpOauthLoginResult {
-    /// URL the caller should open in a browser to complete OAuth. Omitted when cached tokens were still valid and no browser interaction was needed — the server is already reconnected in that case. When present, the runtime starts the callback listener before returning and continues the flow in the background; completion is signaled via session.mcp_server_status_changed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub authorization_url: Option<String>,
+pub struct SessionLogResult {
+    /// The unique identifier of the emitted session event
+    pub event_id: String,
 }
 
-/// Indicates whether the pending MCP OAuth response was accepted.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -20854,12 +25340,47 @@ pub struct SessionMcpOauthLoginResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpOauthRespondResult {
-    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
-    pub success: bool,
+pub struct SessionMetadataSnapshotParams {
+    /// Target session identifier
+    pub session_id: SessionId,
+}
+
+/// Public-facing projection of workspace metadata for SDK / TUI consumers
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionMetadataSnapshotResultWorkspace {
+    /// Branch checked out at session start, if any
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+    /// ISO 8601 timestamp when the workspace was created
+    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<String>,
+    /// Current working directory at session start
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    /// Resolved git root for cwd, if any
+    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
+    pub git_root: Option<String>,
+    /// Repository host type, if known
+    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
+    pub host_type: Option<WorkspaceSummaryHostType>,
+    /// Workspace identifier (1:1 with sessionId)
+    pub id: String,
+    /// Display name for the session, if set
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Repository identifier in 'owner/repo' or 'org/project/repo' format, if any
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// ISO 8601 timestamp when the workspace was last updated
+    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
+    pub updated_at: Option<String>,
+    /// Whether the display name was explicitly set by the user
+    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
+    pub user_named: Option<bool>,
 }
 
-/// Indicates whether the pending MCP headers refresh response was accepted.
+/// Point-in-time snapshot of slow-changing session identifier and state fields
 ///
 /// <div class="warning">
 ///
@@ -20869,12 +25390,45 @@ pub struct SessionMcpOauthRespondResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpHeadersHandlePendingHeadersRefreshRequestResult {
-    /// Whether the response was accepted. False if the request was unknown, timed out, or already resolved.
-    pub success: bool,
+pub struct SessionMetadataSnapshotResult {
+    /// True when the session was detected to be in use by another process at construction time. Local consumers may surface a confirmation prompt before fully attaching. Always false for new sessions.
+    pub already_in_use: bool,
+    /// Runtime client name associated with the session (telemetry identifier).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot')
+    pub current_mode: MetadataSnapshotCurrentMode,
+    /// User-provided name supplied at session construction (via `--name`), if any. Immutable after construction.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub initial_name: Option<String>,
+    /// Whether this is a remote session (i.e., one whose runtime executes elsewhere and is steered through this process)
+    pub is_remote: bool,
+    /// ISO 8601 timestamp of when the session's persisted state was last modified on disk. For new sessions, equals startTime. For resumed sessions, reflects the previous modification time at construction.
+    pub modified_time: String,
+    /// Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_metadata: Option<MetadataSnapshotRemoteMetadata>,
+    /// Currently selected model identifier, if any
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub selected_model: Option<String>,
+    /// The unique identifier of the session
+    pub session_id: SessionId,
+    /// Current session limits, or null when no limits are active
+    pub session_limits: Option<SessionLimitsConfig>,
+    /// ISO 8601 timestamp of when the session started
+    pub start_time: String,
+    /// Short human-readable summary of the session, if known. Omitted when no summary has been generated.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary: Option<String>,
+    /// Absolute path to the session's current working directory
+    pub working_directory: String,
+    /// Public-facing workspace metadata for this session, or null if the session has no associated workspace. Excludes runtime-internal fields (GitHub IDs, summary count, internal flags).
+    pub workspace: Option<SessionMetadataSnapshotResultWorkspace>,
+    /// Absolute path to the session's workspace directory on disk, or null if the session has no associated workspace
+    pub workspace_path: Option<String>,
 }
 
-/// Resource contents returned by the MCP server.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -20884,12 +25438,12 @@ pub struct SessionMcpHeadersHandlePendingHeadersRefreshRequestResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpAppsReadResourceResult {
-    /// Resource contents returned by the server
-    pub contents: Vec<McpAppsResourceContent>,
+pub struct SessionMetadataIsProcessingParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// App-callable tools from the named MCP server.
+/// Indicates whether the local session is currently processing a turn or background continuation.
 ///
 /// <div class="warning">
 ///
@@ -20899,9 +25453,9 @@ pub struct SessionMcpAppsReadResourceResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpAppsListToolsResult {
-    /// App-callable tools from the server
-    pub tools: Vec<HashMap<String, serde_json::Value>>,
+pub struct SessionMetadataIsProcessingResult {
+    /// Whether the session is currently processing user/agent messages. False for non-local sessions (which don't run a local agentic loop). Reflects an in-flight turn or background continuation.
+    pub processing: bool,
 }
 
 /// Identifies the target session.
@@ -20914,12 +25468,12 @@ pub struct SessionMcpAppsListToolsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpAppsGetHostContextParams {
+pub struct SessionMetadataActivityParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Current host context advertised to MCP App guests.
+/// Current activity flags for the session.
 ///
 /// <div class="warning">
 ///
@@ -20929,29 +25483,40 @@ pub struct SessionMcpAppsGetHostContextParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpAppsGetHostContextResult {
-    /// Current host context
-    pub context: McpAppsHostContextDetails,
+pub struct SessionMetadataActivityResult {
+    /// Whether an in-flight operation can currently be aborted.
+    pub abortable: bool,
+    /// Whether the session currently has active work, including running turns or tasks.
+    pub has_active_work: bool,
 }
 
-/// Diagnostic snapshot of MCP Apps wiring for the named server.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// Token-usage breakdown for the session's current context window
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpAppsDiagnoseResult {
-    /// Capability negotiation snapshot
-    pub capability: McpAppsDiagnoseCapability,
-    /// What the server returned for this session
-    pub server: McpAppsDiagnoseServer,
+pub struct SessionMetadataContextInfoResultContextInfo {
+    /// Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%)
+    pub buffer_tokens: i64,
+    /// Token count at which background compaction starts (configurable percentage of promptTokenLimit)
+    pub compaction_threshold: i64,
+    /// Tokens consumed by user/assistant/tool messages
+    pub conversation_tokens: i64,
+    /// Prompt token limit plus the model's full output token limit.
+    pub limit: i64,
+    /// Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools)
+    pub mcp_tools_tokens: i64,
+    /// The model used for token counting
+    pub model_name: String,
+    /// Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified)
+    pub prompt_token_limit: i64,
+    /// Tokens consumed by the system prompt
+    pub system_tokens: i64,
+    /// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
+    pub tool_definitions_tokens: i64,
+    /// Sum of system, conversation and tool-definition tokens
+    pub total_tokens: i64,
 }
 
-/// Resource contents returned by the MCP server.
+/// Token breakdown for the session's current context window, or null if uninitialized.
 ///
 /// <div class="warning">
 ///
@@ -20961,12 +25526,12 @@ pub struct SessionMcpAppsDiagnoseResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpResourcesReadResult {
-    /// Resource contents returned by the server
-    pub contents: Vec<McpResourceContent>,
+pub struct SessionMetadataContextInfoResult {
+    /// Token breakdown for the current context window, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
+    pub context_info: Option<SessionMetadataContextInfoResultContextInfo>,
 }
 
-/// One page of resources advertised by the named MCP server.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -20976,63 +25541,85 @@ pub struct SessionMcpResourcesReadResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpResourcesListResult {
-    /// Opaque cursor for the next page, if the server has more resources
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub next_cursor: Option<String>,
-    /// Resources advertised by the server (proxied MCP `resources/list`)
-    pub resources: Vec<McpResource>,
+pub struct SessionMetadataGetContextAttributionParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// One page of resource templates advertised by the named MCP server.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMcpResourcesListTemplatesResult {
-    /// Opaque cursor for the next page, if the server has more resource templates
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub next_cursor: Option<String>,
-    /// Resource templates advertised by the server (proxied MCP `resources/templates/list`)
-    pub resource_templates: Vec<McpResourceTemplate>,
+pub struct SessionMetadataGetContextAttributionResultContextAttributionCategories {
+    /// Output reserve plus post-blocking-threshold buffer.
+    pub buffer: i64,
+    /// Custom-instructions tokens (0 when none are configured).
+    pub custom_instructions: i64,
+    /// Remaining unused window capacity (clamped at 0).
+    pub free_space: i64,
+    /// MCP tool-definition tokens.
+    pub mcp_tools: i64,
+    /// Conversation (user/assistant/tool) message tokens.
+    pub messages: i64,
+    /// System prompt tokens, excluding custom instructions.
+    pub system_prompt: i64,
+    /// Non-MCP tool-definition tokens.
+    pub system_tools: i64,
 }
 
-/// Identifies the target session.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// Successful compaction history for the session.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPluginsListParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionMetadataGetContextAttributionResultContextAttributionCompactions {
+    /// Number of successful compactions in this session.
+    pub count: i64,
 }
 
-/// Plugins installed for the session, with their enabled state and version metadata.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPluginsListResult {
-    /// Installed plugins
-    pub plugins: Vec<Plugin>,
+pub struct SessionMetadataGetContextAttributionResultContextAttributionEntriesItem {
+    /// Supplementary per-entry metadata (e.g. `messageCount`, `role`, `evictable`, `pluginSource`). Values are stringified; parse as needed and ignore unrecognized keys.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub attributes: Option<HashMap<String, String>>,
+    /// Identifier for this entry, formed by joining its `kind` and source name (e.g. `tool:bash`, `skill:tmux`, `toolDefinition:bash`); unique within the snapshot. Use it to match the same entry across snapshots, to correlate with other APIs (skill/agent/MCP registries), and as the `parentId` target for nesting. Distinct from the human-facing `label`.
+    pub id: String,
+    /// Source category for this entry. Not a closed set — tolerate unknown values. Known values today: `skill`, `subagent`, `mcpServer`, `tool`, `system`, `toolDefinition`, `plugin`.
+    pub kind: String,
+    /// Human-readable display label, e.g. `bash` or `skill: tmux`. Presentation-only; may be localized/reformatted without notice — do not key off it.
+    pub label: String,
+    /// Optional `id` of the parent entry: e.g. a `plugin` entry parenting its `skill`/`mcpServer` entries, or the `system` entry parenting `toolDefinition` entries. Omitted for top-level entries.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parent_id: Option<String>,
+    /// Token count currently in context attributable to this entry.
+    pub tokens: i64,
 }
 
-/// A snapshot of the provider endpoint the session is currently configured to talk to.
+/// Per-source token attribution snapshot for the current context window. The heaviest individual messages are available separately via `metadata.getContextHeaviestMessages`.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionMetadataGetContextAttributionResultContextAttribution {
+    /// Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`.
+    pub buffer_tokens: i64,
+    /// The six normalized `/context` header buckets, computed from the same tokenization as `entries` so the two never disagree. Convenience rollups: `freeSpace` and `buffer` describe window capacity rather than occupied context, so the values do not sum to `totalTokens`.
+    pub categories: SessionMetadataGetContextAttributionResultContextAttributionCategories,
+    /// Successful compaction history for the session.
+    pub compactions: SessionMetadataGetContextAttributionResultContextAttributionCompactions,
+    /// Token count at which background compaction starts. Mirrors `SessionContextInfo.compactionThreshold`.
+    pub compaction_threshold: i64,
+    /// Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`.
+    pub entries: Vec<SessionMetadataGetContextAttributionResultContextAttributionEntriesItem>,
+    /// Prompt limit plus the model's output reserve: the full context window `categories.freeSpace` and `categories.buffer` are measured against. Mirrors `SessionContextInfo.limit`.
+    pub limit: i64,
+    /// The concrete model id the entire breakdown was tokenized against (feeds the per-model token multiplier). Under `Auto` (Free/Student) this is the resolved model, not the literal `auto` sentinel, so totals are not undercounted. A single-model approximation of a potentially multi-model Auto session.
+    pub model_id: String,
+    /// How `modelId` was chosen. Not a closed set — tolerate unknown values. Known values today: `autoResolved` (the model Auto resolved to), `selected` (the user's explicitly selected model), `default` (a fallback before any model is known).
+    pub model_source: String,
+    /// Maximum prompt tokens the resolved model accepts — the denominator for a `##k/###k` context-usage display. Mirrors `SessionContextInfo.promptTokenLimit`.
+    pub prompt_token_limit: i64,
+    /// Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share.
+    pub total_tokens: i64,
+}
+
+/// Per-source attribution breakdown for the session's current context window, or null if uninitialized.
 ///
 /// <div class="warning">
 ///
@@ -21042,28 +25629,12 @@ pub struct SessionPluginsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionProviderGetEndpointResult {
-    /// A credential the caller should use with this endpoint. Omitted only when the endpoint accepts unauthenticated requests.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub api_key: Option<String>,
-    /// Base URL to pass to the LLM client library.
-    pub base_url: String,
-    /// HTTP headers the caller must include on every outbound request.
-    pub headers: HashMap<String, String>,
-    /// Short-lived, rotating credential the caller must send on every request, in addition to `apiKey` if one is present. Omitted when the endpoint does not require one.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_token: Option<ProviderSessionToken>,
-    /// Transport to be used for provider requests.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub transport: Option<ProviderEndpointTransport>,
-    /// Provider family. Matches the `type` field of a BYOK provider config.
-    pub r#type: ProviderEndpointType,
-    /// Wire API to be used, when required for the provider type.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub wire_api: Option<ProviderEndpointWireApi>,
+pub struct SessionMetadataGetContextAttributionResult {
+    /// Per-source context-window attribution, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
+    pub context_attribution: Option<SessionMetadataGetContextAttributionResultContextAttribution>,
 }
 
-/// The selectable model entries synthesized for the models added by this call.
+/// The heaviest individual messages in the session's context window, most-expensive first.
 ///
 /// <div class="warning">
 ///
@@ -21073,12 +25644,14 @@ pub struct SessionProviderGetEndpointResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionProviderAddResult {
-    /// Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.
-    pub models: Vec<serde_json::Value>,
+pub struct SessionMetadataGetContextHeaviestMessagesResult {
+    /// Heaviest messages, most-expensive first.
+    pub messages: Vec<ContextHeaviestMessage>,
+    /// Total token count of the current context window, so callers can compute each message's share without a second call.
+    pub total_tokens: i64,
 }
 
-/// Indicates whether the session options patch was applied successfully.
+/// Notify the session that its working directory context has changed. Emits a `session.context_changed` event so consumers (telemetry, OTel tracker, ACP, the timeline UI) can react. Use this when the host has detected a cwd/branch/repo change outside the session's normal lifecycle (e.g., after a shell command in interactive mode). For a local session, a report whose `cwd` diverges from the session's current working directory is ignored (the call still succeeds but records nothing and emits no event); move a local session's working directory via `metadata.setWorkingDirectory` instead.
 ///
 /// <div class="warning">
 ///
@@ -21088,15 +25661,9 @@ pub struct SessionProviderAddResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionOptionsUpdateResult {
-    /// Number of hooks loaded from installed plugins, returned when installedPlugins is updated
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub plugin_hook_count: Option<i64>,
-    /// Whether the operation succeeded
-    pub success: bool,
-}
+pub struct SessionMetadataRecordContextChangeResult {}
 
-/// Identifies the target session.
+/// Update the session's working directory. Used by the host when the user explicitly changes cwd (e.g., the `/cd` slash command). The host is responsible for any related side-effects (file index, etc.); it does NOT change the process working directory (a session's cwd is per-session, not process-global). For local sessions the runtime validates the target first (an absolute path that exists on disk) and re-bases the permission primary directory; a rejected validation fails the call before anything is mutated, persisted, or emitted. Location-scoped permission rules are then re-keyed to the new directory (best-effort). Remote sessions only record the path.
 ///
 /// <div class="warning">
 ///
@@ -21106,12 +25673,12 @@ pub struct SessionOptionsUpdateResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionExtensionsListParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionMetadataSetWorkingDirectoryResult {
+    /// Working directory after the update
+    pub working_directory: String,
 }
 
-/// Extensions discovered for the session, with their current status.
+/// Re-tokenize the session's existing messages against `modelId` and return the token totals. Useful for hosts that want an initial estimate of context usage on session resume, before the next agent turn fires `session.context_info_changed` events. Returns zeros for an empty session.
 ///
 /// <div class="warning">
 ///
@@ -21121,9 +25688,13 @@ pub struct SessionExtensionsListParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionExtensionsListResult {
-    /// Discovered extensions and their current status
-    pub extensions: Vec<Extension>,
+pub struct SessionMetadataRecomputeContextTokensResult {
+    /// Tokens contributed by user/assistant/tool messages (excludes system/developer prompts).
+    pub messages_token_count: i64,
+    /// Tokens contributed by system/developer prompt snapshots.
+    pub system_token_count: i64,
+    /// Sum of tokens across chat-context and system-context messages currently held by the session.
+    pub total_tokens: i64,
 }
 
 /// Identifies the target session.
@@ -21136,12 +25707,12 @@ pub struct SessionExtensionsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionExtensionsReloadParams {
+pub struct SessionSettingsSnapshotParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Indicates whether the external tool call result was handled successfully.
+/// Redacted, serializable view of session runtime settings for SDK boundary consumers. Secrets and raw feature flags are intentionally excluded.
 ///
 /// <div class="warning">
 ///
@@ -21151,12 +25722,32 @@ pub struct SessionExtensionsReloadParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionToolsHandlePendingToolCallResult {
-    /// Whether the tool call result was handled successfully
-    pub success: bool,
+pub struct SessionSettingsSnapshotResult {
+    /// Name of the SDK client that created the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Redacted job settings.
+    pub job: SessionSettingsJobSnapshot,
+    /// Redacted model routing settings.
+    pub model: SessionSettingsModelSnapshot,
+    /// Online-evaluation settings safe for SDK consumers.
+    pub online_evaluation: SessionSettingsOnlineEvaluationSnapshot,
+    /// Redacted repository and host settings.
+    pub repo: SessionSettingsRepoSnapshot,
+    /// Session start time as Unix epoch milliseconds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub start_time_ms: Option<f64>,
+    /// Session timeout in milliseconds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout_ms: Option<f64>,
+    /// Redacted validation and memory-tool settings.
+    pub validation: SessionSettingsValidationSnapshot,
+    /// Agent runtime version selector copied from the session settings, such as `latest` or a runtime release identifier.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub version: Option<String>,
 }
 
-/// Identifies the target session.
+/// Batch content-exclusion result. Callers must fail closed when policy evaluation is unavailable.
 ///
 /// <div class="warning">
 ///
@@ -21166,12 +25757,14 @@ pub struct SessionToolsHandlePendingToolCallResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionToolsInitializeAndValidateParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionContentExclusionCheckPathsResult {
+    /// Whether the session's policy service was available for the complete batch. When false, checks is empty and callers must treat every requested path as excluded.
+    pub available: bool,
+    /// Per-path decisions in request order. Empty when available is false.
+    pub checks: Vec<ContentExclusionPathCheck>,
 }
 
-/// Resolve, build, and validate the runtime tool list for this session. Subagent sessions and consumer flows that need an initialized tool set before `send` invoke this. Default base-class implementation is a no-op for sessions that don't support tool validation.
+/// Identifier of the spawned process, used to correlate streamed output and exit notifications.
 ///
 /// <div class="warning">
 ///
@@ -21181,9 +25774,12 @@ pub struct SessionToolsInitializeAndValidateParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionToolsInitializeAndValidateResult {}
+pub struct SessionShellExecResult {
+    /// Unique identifier for tracking streamed output
+    pub process_id: String,
+}
 
-/// Identifies the target session.
+/// Indicates whether the signal was delivered; false if the process was unknown or already exited.
 ///
 /// <div class="warning">
 ///
@@ -21193,12 +25789,12 @@ pub struct SessionToolsInitializeAndValidateResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionToolsGetCurrentMetadataParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionShellKillResult {
+    /// Whether the signal was sent successfully
+    pub killed: bool,
 }
 
-/// Current lightweight tool metadata snapshot for the session.
+/// Result of a user-requested shell command.
 ///
 /// <div class="warning">
 ///
@@ -21208,12 +25804,22 @@ pub struct SessionToolsGetCurrentMetadataParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionToolsGetCurrentMetadataResult {
-    /// Current tool metadata, or null when tools have not been initialized yet
-    pub tools: Option<Vec<CurrentToolMetadata>>,
+pub struct SessionShellExecuteUserRequestedResult {
+    /// Error output when the execution failed
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Process exit code, when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exit_code: Option<i64>,
+    /// Captured command output
+    pub output: String,
+    /// Whether the command completed successfully
+    pub success: bool,
+    /// Tool call id emitted for the shell execution
+    pub tool_call_id: String,
 }
 
-/// Empty result after applying subagent settings
+/// Cancellation result for a user-requested shell command.
 ///
 /// <div class="warning">
 ///
@@ -21223,9 +25829,12 @@ pub struct SessionToolsGetCurrentMetadataResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionToolsUpdateSubagentSettingsResult {}
+pub struct SessionShellCancelUserRequestedResult {
+    /// Whether an in-flight execution was found and signalled to cancel
+    pub cancelled: bool,
+}
 
-/// Slash commands available in the session, after applying any include/exclude filters.
+/// Compaction outcome with the number of tokens and messages removed, summary text, and the resulting context window breakdown.
 ///
 /// <div class="warning">
 ///
@@ -21235,12 +25844,22 @@ pub struct SessionToolsUpdateSubagentSettingsResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCommandsListResult {
-    /// Commands available in this session
-    pub commands: Vec<SlashCommandInfo>,
+pub struct SessionHistoryCompactResult {
+    /// Post-compaction context window usage breakdown
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_window: Option<HistoryCompactContextWindow>,
+    /// Number of messages removed during compaction
+    pub messages_removed: i64,
+    /// Whether compaction completed successfully
+    pub success: bool,
+    /// Summary text produced by compaction. Omitted when compaction did not produce a summary (e.g. failure path).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summary_content: Option<String>,
+    /// Number of tokens freed by compaction
+    pub tokens_removed: i64,
 }
 
-/// Indicates whether the pending client-handled command was completed successfully.
+/// Number of events that were removed by the truncation.
 ///
 /// <div class="warning">
 ///
@@ -21250,12 +25869,18 @@ pub struct SessionCommandsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCommandsHandlePendingCommandResult {
-    /// Whether the command was handled successfully
-    pub success: bool,
+pub struct SessionHistoryTruncateResult {
+    /// Failure detail when checkpointCleanupFailed is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub checkpoint_cleanup_error: Option<String>,
+    /// True when conversation truncation succeeded but post-truncation workspace checkpoint cleanup failed. History is already truncated; callers may still prune snapshots but should report a checkpoint-cleanup rather than a truncation failure.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub checkpoint_cleanup_failed: Option<bool>,
+    /// Number of events that were removed
+    pub events_removed: i64,
 }
 
-/// Error message produced while executing the command, if any.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21265,13 +25890,12 @@ pub struct SessionCommandsHandlePendingCommandResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCommandsExecuteResult {
-    /// Error message produced while executing the command, if any. Omitted when the handler succeeded.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
+pub struct SessionHistoryListRewindPointsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the command was accepted into the local execution queue.
+/// Rewind points and file-change-tracking availability for the session.
 ///
 /// <div class="warning">
 ///
@@ -21281,12 +25905,17 @@ pub struct SessionCommandsExecuteResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCommandsEnqueueResult {
-    /// True when the command was accepted into the local execution queue. False when the call targets a session that does not support local command queueing (e.g. remote sessions).
-    pub queued: bool,
+pub struct SessionHistoryListRewindPointsResult {
+    /// Whether this session captured file changes from its first turn.
+    pub file_change_tracking_enabled: bool,
+    /// Root user turns in chronological order. Empty when `unavailableReason` is set.
+    pub points: Vec<HistoryRewindPoint>,
+    /// Why the listed points could not be produced, when applicable; the points list is empty whenever it is set. `unsupported-remote-session` is permanent for the session and comes with `fileChangeTrackingEnabled: false`. `session-busy` is transient and only ever reported by a session that *is* tracking (`fileChangeTrackingEnabled: true`), because the file-change captures cannot be read while work that may still mutate them is in flight; the same request succeeds once the session settles, so a client that wants points should retry rather than treat it as a failure. It is never `file-change-tracking-disabled`: an untracked local session still lists conversation-only points and reports that through `fileChangeTrackingEnabled: false`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub unavailable_reason: Option<HistoryRewindUnavailableReason>,
 }
 
-/// Indicates whether the queued-command response was matched to a pending request.
+/// Files and aggregate changes for a prospective rewind.
 ///
 /// <div class="warning">
 ///
@@ -21296,12 +25925,19 @@ pub struct SessionCommandsEnqueueResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionCommandsRespondToQueuedCommandResult {
-    /// Whether a pending queued command with the given request ID was found and resolved. False when the request was already resolved, cancelled, or unknown.
-    pub success: bool,
+pub struct SessionHistoryPreviewRewindResult {
+    /// Whether file restore is available for this session. This is authoritative: switch on it and read `reason` only when it is false.
+    pub available: bool,
+    /// Number of unique files in the preview.
+    pub file_count: i64,
+    /// Files ordered by path.
+    pub files: Vec<HistoryRewindFilePreview>,
+    /// Why file restore is unavailable, when applicable. Populated only when `available` is false and never set when `available` is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<HistoryRewindUnavailableReason>,
 }
 
-/// Identifies the target session.
+/// Structured outcome of a rewind request.
 ///
 /// <div class="warning">
 ///
@@ -21311,12 +25947,22 @@ pub struct SessionCommandsRespondToQueuedCommandResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTelemetryGetEngagementIdParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionHistoryRewindResult {
+    /// Failure detail. Set only for the failure and partial-failure outcomes (`files-rolled-back`, `rollback-incomplete`, `truncation-failed`, `checkpoint-cleanup-failed`, `snapshot-prune-failed`); omitted for `success` and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Number of persisted events removed by conversation truncation. Present only when truncation succeeded (outcomes `success`, `checkpoint-cleanup-failed`, and `snapshot-prune-failed`); omitted for every unavailable outcome (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`) and for `truncation-failed`, `files-rolled-back`, and `rollback-incomplete`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub events_removed: Option<i64>,
+    /// Overall rewind outcome. This discriminates the result: it governs which of the remaining fields are populated, so consumers must switch on it before reading `eventsRemoved`, `restoredFiles`, `skippedFiles`, or `error`. See each field for the outcomes that populate it.
+    pub outcome: HistoryRewindOutcome,
+    /// Absolute paths restored to their captured preimages. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.
+    pub restored_files: Vec<String>,
+    /// Captured files intentionally left unchanged. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.
+    pub skipped_files: Vec<HistorySkippedFileRestore>,
 }
 
-/// Telemetry engagement ID for the session, when available.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21326,13 +25972,12 @@ pub struct SessionTelemetryGetEngagementIdParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionTelemetryGetEngagementIdResult {
-    /// Current telemetry engagement ID, when available.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub engagement_id: Option<String>,
+pub struct SessionHistoryCancelBackgroundCompactionParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Transient answer generated from current conversation context.
+/// Indicates whether an in-progress background compaction was cancelled.
 ///
 /// <div class="warning">
 ///
@@ -21342,12 +25987,12 @@ pub struct SessionTelemetryGetEngagementIdResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiEphemeralQueryResult {
-    /// Full assistant response text.
-    pub answer: String,
+pub struct SessionHistoryCancelBackgroundCompactionResult {
+    /// Whether an in-progress background compaction was cancelled. False when no compaction was running, when the session is remote, or when the underlying processor was unavailable.
+    pub cancelled: bool,
 }
 
-/// The elicitation response (accept with form values, decline, or cancel)
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21357,15 +26002,12 @@ pub struct SessionUiEphemeralQueryResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiElicitationResult {
-    /// The user's response: accept (submitted), decline (rejected), or cancel (dismissed)
-    pub action: UIElicitationResponseAction,
-    /// The form values submitted by the user (present when action is 'accept')
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub content: Option<HashMap<String, serde_json::Value>>,
+pub struct SessionHistoryAbortManualCompactionParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the elicitation response was accepted; false if it was already resolved by another client.
+/// Indicates whether an in-progress manual compaction was aborted.
 ///
 /// <div class="warning">
 ///
@@ -21375,12 +26017,12 @@ pub struct SessionUiElicitationResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiHandlePendingElicitationResult {
-    /// Whether the response was accepted. False if the request was already resolved by another client.
-    pub success: bool,
+pub struct SessionHistoryAbortManualCompactionResult {
+    /// Whether an in-progress manual compaction was aborted. False when no manual compaction was running, when its abort controller was already aborted, or when the session is remote.
+    pub aborted: bool,
 }
 
-/// Indicates whether the pending UI request was resolved by this call.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21390,12 +26032,12 @@ pub struct SessionUiHandlePendingElicitationResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiHandlePendingUserInputResult {
-    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
-    pub success: bool,
+pub struct SessionHistorySummarizeForHandoffParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the pending UI request was resolved by this call.
+/// Markdown summary of the conversation context (empty when not available).
 ///
 /// <div class="warning">
 ///
@@ -21405,12 +26047,12 @@ pub struct SessionUiHandlePendingUserInputResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiHandlePendingSamplingResult {
-    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
-    pub success: bool,
+pub struct SessionHistorySummarizeForHandoffResult {
+    /// Markdown summary of the conversation context produced by an LLM. Empty string when there are no messages or when the session does not support local summarization.
+    pub summary: String,
 }
 
-/// Indicates whether the pending UI request was resolved by this call.
+/// What a successful clear removed. A clear that could not be applied rejects instead of reporting a count.
 ///
 /// <div class="warning">
 ///
@@ -21420,12 +26062,12 @@ pub struct SessionUiHandlePendingSamplingResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiHandlePendingAutoModeSwitchResult {
-    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
-    pub success: bool,
+pub struct SessionHistoryClearContextResult {
+    /// Number of non-system, non-developer messages that were removed from the conversation. Zero only when the window already held no conversation.
+    pub messages_cleared: i64,
 }
 
-/// Indicates whether the pending UI request was resolved by this call.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21435,12 +26077,12 @@ pub struct SessionUiHandlePendingAutoModeSwitchResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiHandlePendingSessionLimitsExhaustedResult {
-    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
-    pub success: bool,
+pub struct SessionQueuePendingItemsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the pending UI request was resolved by this call.
+/// Snapshot of the session's pending queued items and immediate-steering messages.
 ///
 /// <div class="warning">
 ///
@@ -21450,9 +26092,14 @@ pub struct SessionUiHandlePendingSessionLimitsExhaustedResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiHandlePendingExitPlanModeResult {
-    /// True if the request was still pending and was resolved by this call. False if the request ID was unknown, already resolved by another client (e.g. GitHub), expired, or otherwise no longer pending.
-    pub success: bool,
+pub struct SessionQueuePendingItemsResult {
+    /// How many leading entries of `steeringMessages` have already been folded into the running turn (and so have an emitted `user.message`), as opposed to still waiting for one. Absent for hosts that do not distinguish the two.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub in_flight_steering_count: Option<i64>,
+    /// Pending queued items in submission order. Includes user messages, queued slash commands, and queued model changes; omits internal system items.
+    pub items: Vec<QueuePendingItems>,
+    /// Display text for messages currently in the immediate steering queue (interjections sent during a running turn).
+    pub steering_messages: Vec<String>,
 }
 
 /// Identifies the target session.
@@ -21465,12 +26112,12 @@ pub struct SessionUiHandlePendingExitPlanModeResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiRegisterDirectAutoModeSwitchHandlerParams {
+pub struct SessionQueueSnapshotParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Register an in-process handler for `auto_mode_switch.requested` events. The caller still attaches the actual listener via the standard event-subscription mechanism; this registration solely tells the server bridge to skip its own dispatch (so a remote client doesn't race the in-process handler for the same requestId).
+/// Internal snapshot of native queue state for local session orchestration.
 ///
 /// <div class="warning">
 ///
@@ -21480,12 +26127,20 @@ pub struct SessionUiRegisterDirectAutoModeSwitchHandlerParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiRegisterDirectAutoModeSwitchHandlerResult {
-    /// Opaque handle representing the registration. Pass this same handle to `unregisterDirectAutoModeSwitchHandler` when the in-process handler is no longer active. Multiple registrations are reference-counted; the server bridge will only dispatch auto-mode-switch requests when no handles are active.
-    pub handle: String,
+pub struct SessionQueueSnapshotResult {
+    /// Insertion orders for queued items, aligned with `items`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub item_orders: Option<Vec<i64>>,
+    /// User-facing pending items in FIFO order.
+    pub items: Vec<QueuePendingItems>,
+    /// Insertion orders for immediate steering messages, aligned with `steeringMessages`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub steering_message_orders: Option<Vec<i64>>,
+    /// Immediate steering messages waiting for an active turn.
+    pub steering_messages: Vec<String>,
 }
 
-/// Indicates whether the handle was active and the registration count was decremented.
+/// Result of moving a queued item.
 ///
 /// <div class="warning">
 ///
@@ -21495,12 +26150,12 @@ pub struct SessionUiRegisterDirectAutoModeSwitchHandlerResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUiUnregisterDirectAutoModeSwitchHandlerResult {
-    /// True if the handle was active and decremented the counter; false if the handle was unknown.
-    pub unregistered: bool,
+pub struct SessionQueueMoveItemResult {
+    /// True when the item changed position; false when it was already at the requested position.
+    pub changed: bool,
 }
 
-/// Indicates whether the operation succeeded.
+/// Result of inserting a queued message.
 ///
 /// <div class="warning">
 ///
@@ -21510,12 +26165,12 @@ pub struct SessionUiUnregisterDirectAutoModeSwitchHandlerResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsConfigureResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionQueueInsertAtResult {
+    /// Fresh stable opaque id assigned to the inserted item.
+    pub id: String,
 }
 
-/// Indicates whether the permission decision was applied; false when the request was already resolved.
+/// Result of removing a queued item.
 ///
 /// <div class="warning">
 ///
@@ -21525,12 +26180,12 @@ pub struct SessionPermissionsConfigureResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsHandlePendingPermissionRequestResult {
-    /// Whether the permission request was handled successfully
-    pub success: bool,
+pub struct SessionQueueRemoveAtResult {
+    /// True when the addressed item was removed.
+    pub removed: bool,
 }
 
-/// List of pending permission requests reconstructed from event history.
+/// Result of editing a queued message.
 ///
 /// <div class="warning">
 ///
@@ -21540,12 +26195,12 @@ pub struct SessionPermissionsHandlePendingPermissionRequestResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsPendingRequestsResult {
-    /// Pending permission prompts reconstructed from the session's event history. Equivalent to the set of `permission.requested` events that have not yet been followed by a matching `permission.completed` event. Used by clients (e.g. the CLI) to hydrate UI for prompts that were emitted before the client attached to the session.
-    pub items: Vec<PendingPermissionRequest>,
+pub struct SessionQueueUpdateTextResult {
+    /// True when the stored text changed.
+    pub updated: bool,
 }
 
-/// Indicates whether the operation succeeded.
+/// Result of duplicating a queued item.
 ///
 /// <div class="warning">
 ///
@@ -21555,12 +26210,12 @@ pub struct SessionPermissionsPendingRequestsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsSetApproveAllResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionQueueDuplicateAtResult {
+    /// Fresh stable opaque id assigned to the duplicate.
+    pub id: String,
 }
 
-/// Indicates whether the operation succeeded and reports the post-mutation state.
+/// Result of trying to steer a queued message into a live turn.
 ///
 /// <div class="warning">
 ///
@@ -21570,17 +26225,12 @@ pub struct SessionPermissionsSetApproveAllResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsSetAllowAllResult {
-    /// Authoritative full allow-all state after the mutation
-    pub enabled: bool,
-    /// Authoritative allow-all mode after the mutation
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<PermissionsAllowAllMode>,
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionQueueSendNowResult {
+    /// True when the item was accepted into the steering lane; false when no main turn was live.
+    pub steered: bool,
 }
 
-/// Current allow-all permission mode.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21590,15 +26240,12 @@ pub struct SessionPermissionsSetAllowAllResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsGetAllowAllResult {
-    /// Whether full allow-all permissions are currently active
-    pub enabled: bool,
-    /// Current allow-all mode
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mode: Option<PermissionsAllowAllMode>,
+pub struct SessionQueueHasPendingParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the operation succeeded.
+/// Whether the native queue has pending work.
 ///
 /// <div class="warning">
 ///
@@ -21608,12 +26255,12 @@ pub struct SessionPermissionsGetAllowAllResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsModifyRulesResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionQueueHasPendingResult {
+    /// True when queued or immediate native work is pending.
+    pub has_pending: bool,
 }
 
-/// Indicates whether the operation succeeded.
+/// Whether a deferred-idle drain should run.
 ///
 /// <div class="warning">
 ///
@@ -21623,12 +26270,12 @@ pub struct SessionPermissionsModifyRulesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsSetRequiredResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionQueueBeginDeferredIdleDrainResult {
+    /// True when the host should run finishDeferredIdleDrain asynchronously.
+    pub should_drain: bool,
 }
 
-/// Indicates whether the operation succeeded.
+/// Action selected by the native deferred-idle drain.
 ///
 /// <div class="warning">
 ///
@@ -21638,12 +26285,14 @@ pub struct SessionPermissionsSetRequiredResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsResetSessionApprovalsResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionQueueFinishDeferredIdleDrainResult {
+    /// Whether the deferred idle was caused by an aborted foreground turn.
+    pub aborted: bool,
+    /// One of none, processQueue, or emitSessionIdle.
+    pub action: String,
 }
 
-/// Indicates whether the operation succeeded.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21653,12 +26302,12 @@ pub struct SessionPermissionsResetSessionApprovalsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsNotifyPromptShownResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionQueueRemoveMostRecentParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Snapshot of the session's allow-listed directories and primary working directory.
+/// Indicates whether a user-facing pending item was removed.
 ///
 /// <div class="warning">
 ///
@@ -21668,14 +26317,12 @@ pub struct SessionPermissionsNotifyPromptShownResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsPathsListResult {
-    /// All directories currently allowed for tool access on this session.
-    pub directories: Vec<String>,
-    /// The primary working directory for this session.
-    pub primary: String,
+pub struct SessionQueueRemoveMostRecentResult {
+    /// True if a user-facing pending item was removed (LIFO across both queues); false when no removable items remained.
+    pub removed: bool,
 }
 
-/// Indicates whether the operation succeeded.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21685,12 +26332,12 @@ pub struct SessionPermissionsPathsListResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsPathsAddResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionQueueClearParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the operation succeeded.
+/// Indicates whether a user-facing pending item was removed.
 ///
 /// <div class="warning">
 ///
@@ -21700,12 +26347,12 @@ pub struct SessionPermissionsPathsAddResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsPathsUpdatePrimaryResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionQueueConsumeSystemNotificationsResult {
+    /// True if a user-facing pending item was removed (LIFO across both queues); false when no removable items remained.
+    pub removed: bool,
 }
 
-/// Indicates whether the supplied path is within the session's allowed directories.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21715,12 +26362,12 @@ pub struct SessionPermissionsPathsUpdatePrimaryResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsPathsIsPathWithinAllowedDirectoriesResult {
-    /// Whether the path is within the session's allowed directories
-    pub allowed: bool,
+pub struct SessionQueueEnqueueResumePendingParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Indicates whether the supplied path is within the session's workspace directory.
+/// Result of enqueueing the resume-pending wake item.
 ///
 /// <div class="warning">
 ///
@@ -21730,12 +26377,12 @@ pub struct SessionPermissionsPathsIsPathWithinAllowedDirectoriesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsPathsIsPathWithinWorkspaceResult {
-    /// Whether the path is within the session workspace directory
-    pub allowed: bool,
+pub struct SessionQueueEnqueueResumePendingResult {
+    /// True when a wake item was newly queued.
+    pub queued: bool,
 }
 
-/// Resolved location-permissions key and type.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21745,14 +26392,12 @@ pub struct SessionPermissionsPathsIsPathWithinWorkspaceResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsLocationsResolveResult {
-    /// Location key used in the location-permissions store
-    pub location_key: String,
-    /// Whether the location is a git repo or directory
-    pub location_type: PermissionLocationType,
+pub struct SessionQueueProcessParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Summary of persisted location permissions applied to the session.
+/// Batch of session events returned by a read, with cursor and continuation metadata.
 ///
 /// <div class="warning">
 ///
@@ -21762,22 +26407,18 @@ pub struct SessionPermissionsLocationsResolveResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsLocationsApplyResult {
-    /// Number of persisted allowed directories added to the live path manager
-    pub applied_directory_count: i64,
-    /// Number of location-scoped rules added to the live permission service
-    pub applied_rule_count: i64,
-    /// Location-scoped rules applied to the live permission service
-    pub applied_rules: Vec<PermissionRule>,
-    /// Whether a different location was applied since the previous apply call
-    pub changed: bool,
-    /// Location key used in the location-permissions store
-    pub location_key: String,
-    /// Whether the location is a git repo or directory
-    pub location_type: PermissionLocationType,
+pub struct SessionEventLogReadResult {
+    /// Opaque cursor for the next read. Pass back unchanged in the next read.cursor to continue from where this read left off. Always present, even when no events were returned. For a backward read this cursor pages toward OLDER events; keep passing `direction: backward` with it (the cursor is also self-describing, so backward paging continues correctly).
+    pub cursor: String,
+    /// Cursor status: 'ok' means the cursor was applied successfully; 'expired' means the cursor referred to an event that no longer exists in history (e.g. truncated or compacted away) and the read fell back to a boundary of the remaining history. For a forward read the fallback starts from the beginning of the remaining history; for a backward read it falls back to the tail (the newest window). Because the fallback page is a fresh boundary snapshot rather than a continuation of the requested cursor, it may overlap events the consumer has already rendered — a backward fallback to the tail in particular can repeat the newest window. On 'expired', consumers should reset or rebase their local pagination state (or deduplicate by event id) before continuing from the returned cursor rather than blindly appending/prepending the fallback page.
+    pub cursor_status: EventsCursorStatus,
+    /// Session events for this batch, merged into a single stream in creation order: durable (persisted) events and ephemeral events interleave exactly as they were emitted. Set `includeEphemeral: false` to receive only durable events. Ephemeral events are never replayable once pruned from the in-memory ring, so a consumer that needs them should keep reading with a non-zero `waitMs`. For a backward (tail-first) read, the returned window contains persisted events only, still in chronological (oldest-to-newest) append order.
+    pub events: Vec<SessionEvent>,
+    /// True when more events are available in the read's direction. For a forward read, true means the batch returned `max` events and more are available immediately. For a backward read, true means older persisted events remain before the returned window.
+    pub has_more: bool,
 }
 
-/// Indicates whether the operation succeeded.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21787,12 +26428,12 @@ pub struct SessionPermissionsLocationsApplyResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsLocationsAddToolApprovalResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionEventLogTailParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Folder trust check result.
+/// Snapshot of the current tail cursor without returning any events. Use this when a consumer wants to subscribe to live events going forward without first paginating through the entire persisted history (which would happen if `read` were called without a cursor on a long-lived session).
 ///
 /// <div class="warning">
 ///
@@ -21802,12 +26443,12 @@ pub struct SessionPermissionsLocationsAddToolApprovalResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsFolderTrustIsTrustedResult {
-    /// Whether the folder is trusted
-    pub trusted: bool,
+pub struct SessionEventLogTailResult {
+    /// Opaque cursor pointing at the current tail of the session's persisted-events history. Pass back to `read` to receive only events that arrive AFTER this snapshot. When the session has no events, this returns the same sentinel as an unset cursor (i.e. equivalent to omitting the cursor on a first read).
+    pub cursor: String,
 }
 
-/// Indicates whether the operation succeeded.
+/// Opaque handle representing an event-type interest registration.
 ///
 /// <div class="warning">
 ///
@@ -21817,9 +26458,9 @@ pub struct SessionPermissionsFolderTrustIsTrustedResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsFolderTrustAddTrustedResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+pub struct SessionEventLogRegisterInterestResult {
+    /// Opaque handle for this registration. Pass to releaseInterest to release. Each call to registerInterest produces a fresh handle, even when the same eventType is registered multiple times.
+    pub handle: String,
 }
 
 /// Indicates whether the operation succeeded.
@@ -21832,12 +26473,12 @@ pub struct SessionPermissionsFolderTrustAddTrustedResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionPermissionsUrlsSetUnrestrictedModeResult {
+pub struct SessionEventLogReleaseInterestResult {
     /// Whether the operation succeeded
     pub success: bool,
 }
 
-/// Identifier of the session event that was emitted for the log message.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -21847,12 +26488,12 @@ pub struct SessionPermissionsUrlsSetUnrestrictedModeResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionLogResult {
-    /// The unique identifier of the emitted session event
-    pub event_id: String,
+pub struct SessionUsageGetMetricsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Identifies the target session.
+/// Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
 ///
 /// <div class="warning">
 ///
@@ -21862,47 +26503,38 @@ pub struct SessionLogResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataSnapshotParams {
-    /// Target session identifier
-    pub session_id: SessionId,
-}
-
-/// Public-facing projection of workspace metadata for SDK / TUI consumers
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionMetadataSnapshotResultWorkspace {
-    /// Branch checked out at session start, if any
+pub struct SessionUsageGetMetricsResult {
+    /// Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub branch: Option<String>,
-    /// ISO 8601 timestamp when the workspace was created
-    #[serde(rename = "created_at", skip_serializing_if = "Option::is_none")]
-    pub created_at: Option<String>,
-    /// Current working directory at session start
+    pub agent_metrics: Option<HashMap<String, UsageMetricsAgentMetric>>,
+    /// Aggregated code change metrics
+    pub code_changes: UsageMetricsCodeChanges,
+    /// Currently active model identifier
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cwd: Option<String>,
-    /// Resolved git root for cwd, if any
-    #[serde(rename = "git_root", skip_serializing_if = "Option::is_none")]
-    pub git_root: Option<String>,
-    /// Repository host type, if known
-    #[serde(rename = "host_type", skip_serializing_if = "Option::is_none")]
-    pub host_type: Option<WorkspaceSummaryHostType>,
-    /// Workspace identifier (1:1 with sessionId)
-    pub id: String,
-    /// Display name for the session, if set
+    pub current_model: Option<String>,
+    /// Input tokens from the most recent main-agent API call
+    pub last_call_input_tokens: i64,
+    /// Output tokens from the most recent main-agent API call
+    pub last_call_output_tokens: i64,
+    /// Per-model token and request metrics, keyed by model identifier
+    pub model_metrics: HashMap<String, UsageMetricsModelMetric>,
+    /// ISO 8601 timestamp when the session started
+    pub session_start_time: String,
+    /// Session-wide per-token-type accumulated token counts
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Repository identifier in 'owner/repo' or 'org/project/repo' format, if any
+    pub token_details: Option<HashMap<String, UsageMetricsTokenDetail>>,
+    /// Total time spent in model API calls (milliseconds)
+    pub total_api_duration_ms: i64,
+    /// Session-wide accumulated nano-AI units cost
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub repository: Option<String>,
-    /// ISO 8601 timestamp when the workspace was last updated
-    #[serde(rename = "updated_at", skip_serializing_if = "Option::is_none")]
-    pub updated_at: Option<String>,
-    /// Whether the display name was explicitly set by the user
-    #[serde(rename = "user_named", skip_serializing_if = "Option::is_none")]
-    pub user_named: Option<bool>,
+    pub total_nano_aiu: Option<f64>,
+    /// Total user-initiated premium request cost across all models (may be fractional due to multipliers)
+    pub total_premium_request_cost: f64,
+    /// Raw count of user-initiated API requests
+    pub total_user_requests: i64,
 }
 
-/// Point-in-time snapshot of slow-changing session identifier and state fields
+/// GitHub URL for the session and a flag indicating whether remote steering is enabled.
 ///
 /// <div class="warning">
 ///
@@ -21912,42 +26544,12 @@ pub struct SessionMetadataSnapshotResultWorkspace {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataSnapshotResult {
-    /// True when the session was detected to be in use by another process at construction time. Local consumers may surface a confirmation prompt before fully attaching. Always false for new sessions.
-    pub already_in_use: bool,
-    /// Runtime client name associated with the session (telemetry identifier).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    /// The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot')
-    pub current_mode: MetadataSnapshotCurrentMode,
-    /// User-provided name supplied at session construction (via `--name`), if any. Immutable after construction.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub initial_name: Option<String>,
-    /// Whether this is a remote session (i.e., one whose runtime executes elsewhere and is steered through this process)
-    pub is_remote: bool,
-    /// ISO 8601 timestamp of when the session's persisted state was last modified on disk. For new sessions, equals startTime. For resumed sessions, reflects the previous modification time at construction.
-    pub modified_time: String,
-    /// Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote_metadata: Option<MetadataSnapshotRemoteMetadata>,
-    /// Currently selected model identifier, if any
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub selected_model: Option<String>,
-    /// The unique identifier of the session
-    pub session_id: SessionId,
-    /// Current session limits, or null when no limits are active
-    pub session_limits: Option<SessionLimitsConfig>,
-    /// ISO 8601 timestamp of when the session started
-    pub start_time: String,
-    /// Short human-readable summary of the session, if known. Omitted when no summary has been generated.
+pub struct SessionRemoteEnableResult {
+    /// Whether remote steering is enabled
+    pub remote_steerable: bool,
+    /// GitHub frontend URL for this session
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary: Option<String>,
-    /// Absolute path to the session's current working directory
-    pub working_directory: String,
-    /// Public-facing workspace metadata for this session, or null if the session has no associated workspace. Excludes runtime-internal fields (GitHub IDs, summary count, internal flags).
-    pub workspace: Option<SessionMetadataSnapshotResultWorkspace>,
-    /// Absolute path to the session's workspace directory on disk, or null if the session has no associated workspace
-    pub workspace_path: Option<String>,
+    pub url: Option<String>,
 }
 
 /// Identifies the target session.
@@ -21960,12 +26562,12 @@ pub struct SessionMetadataSnapshotResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataIsProcessingParams {
+pub struct SessionRemoteDisableParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Indicates whether the local session is currently processing a turn or background continuation.
+/// Persist a steerability change as a `session.remote_steerable_changed` event. Used by the host (CLI / SDK consumer) when it has just finished enabling or disabling steering on a remote exporter that the runtime does not directly own.
 ///
 /// <div class="warning">
 ///
@@ -21975,10 +26577,7 @@ pub struct SessionMetadataIsProcessingParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataIsProcessingResult {
-    /// Whether the session is currently processing user/agent messages. False for non-local sessions (which don't run a local agentic loop). Reflects an in-flight turn or background continuation.
-    pub processing: bool,
-}
+pub struct SessionRemoteNotifySteerableChangedResult {}
 
 /// Identifies the target session.
 ///
@@ -21990,12 +26589,12 @@ pub struct SessionMetadataIsProcessingResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataActivityParams {
+pub struct SessionVisibilityGetParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Current activity flags for the session.
+/// Current sharing status and shareable GitHub URL for a session.
 ///
 /// <div class="warning">
 ///
@@ -22005,40 +26604,18 @@ pub struct SessionMetadataActivityParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataActivityResult {
-    /// Whether an in-flight operation can currently be aborted.
-    pub abortable: bool,
-    /// Whether the session currently has active work, including running turns or tasks.
-    pub has_active_work: bool,
-}
-
-/// Token-usage breakdown for the session's current context window
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionMetadataContextInfoResultContextInfo {
-    /// Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%)
-    pub buffer_tokens: i64,
-    /// Token count at which background compaction starts (configurable percentage of promptTokenLimit)
-    pub compaction_threshold: i64,
-    /// Tokens consumed by user/assistant/tool messages
-    pub conversation_tokens: i64,
-    /// Prompt token limit plus the model's full output token limit.
-    pub limit: i64,
-    /// Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools)
-    pub mcp_tools_tokens: i64,
-    /// The model used for token counting
-    pub model_name: String,
-    /// Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified)
-    pub prompt_token_limit: i64,
-    /// Tokens consumed by the system prompt
-    pub system_tokens: i64,
-    /// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
-    pub tool_definitions_tokens: i64,
-    /// Sum of system, conversation and tool-definition tokens
-    pub total_tokens: i64,
+pub struct SessionVisibilityGetResult {
+    /// Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub share_url: Option<String>,
+    /// Current sharing status. Absent when the session is not synced or the status could not be retrieved (e.g. the user is not authenticated).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<SessionVisibilityStatus>,
+    /// Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the session cannot be shared and `status`/`shareUrl` are absent.
+    pub synced: bool,
 }
 
-/// Token breakdown for the session's current context window, or null if uninitialized.
+/// Effective sharing status and shareable GitHub URL after updating session visibility.
 ///
 /// <div class="warning">
 ///
@@ -22048,9 +26625,15 @@ pub struct SessionMetadataContextInfoResultContextInfo {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataContextInfoResult {
-    /// Token breakdown for the current context window, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
-    pub context_info: Option<SessionMetadataContextInfoResultContextInfo>,
+pub struct SessionVisibilitySetResult {
+    /// Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub share_url: Option<String>,
+    /// Effective sharing status after the update. May differ from the requested status for task types that are already visible to repository readers by default. Absent when the update could not be applied (e.g. the session is not synced or the user is not authenticated).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<SessionVisibilityStatus>,
+    /// Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the visibility change could not be applied and `status`/`shareUrl` are absent.
+    pub synced: bool,
 }
 
 /// Identifies the target session.
@@ -22063,51 +26646,42 @@ pub struct SessionMetadataContextInfoResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataGetContextAttributionParams {
+pub struct SessionScheduleListParams {
     /// Target session identifier
     pub session_id: SessionId,
 }
 
-/// Successful compaction history for the session.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionMetadataGetContextAttributionResultContextAttributionCompactions {
-    /// Number of successful compactions in this session.
-    pub count: i64,
-}
-
+/// Snapshot of the currently active recurring prompts for this session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataGetContextAttributionResultContextAttributionEntriesItem {
-    /// Supplementary per-entry metadata (e.g. `messageCount`, `role`, `evictable`, `pluginSource`). Values are stringified; parse as needed and ignore unrecognized keys.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub attributes: Option<HashMap<String, String>>,
-    /// Identifier for this entry, formed by joining its `kind` and source name (e.g. `tool:bash`, `skill:tmux`, `toolDefinition:bash`); unique within the snapshot. Use it to match the same entry across snapshots, to correlate with other APIs (skill/agent/MCP registries), and as the `parentId` target for nesting. Distinct from the human-facing `label`.
-    pub id: String,
-    /// Source category for this entry. Not a closed set — tolerate unknown values. Known values today: `skill`, `subagent`, `mcpServer`, `tool`, `system`, `toolDefinition`, `plugin`.
-    pub kind: String,
-    /// Human-readable display label, e.g. `bash` or `skill: tmux`. Presentation-only; may be localized/reformatted without notice — do not key off it.
-    pub label: String,
-    /// Optional `id` of the parent entry: e.g. a `plugin` entry parenting its `skill`/`mcpServer` entries, or the `system` entry parenting `toolDefinition` entries. Omitted for top-level entries.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub parent_id: Option<String>,
-    /// Token count currently in context attributable to this entry.
-    pub tokens: i64,
+pub struct SessionScheduleListResult {
+    /// Active scheduled prompts, ordered by id.
+    pub entries: Vec<ScheduleEntry>,
 }
 
-/// Per-source token attribution snapshot for the current context window. The heaviest individual messages are available separately via `metadata.getContextHeaviestMessages`.
+/// Identifies the target session.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataGetContextAttributionResultContextAttribution {
-    /// Successful compaction history for the session.
-    pub compactions: SessionMetadataGetContextAttributionResultContextAttributionCompactions,
-    /// Flat list of per-source attribution entries. Group by `kind` and render unrecognized kinds generically. Nesting and rollups are expressed via `parentId`.
-    pub entries: Vec<SessionMetadataGetContextAttributionResultContextAttributionEntriesItem>,
-    /// Total token count of the current context window the entries are measured against (system message + conversation messages + tool definitions — the same total reported by /context). Divide an entry's `tokens` by this to derive its share.
-    pub total_tokens: i64,
+pub struct SessionScheduleHydrateParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Per-source attribution breakdown for the session's current context window, or null if uninitialized.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -22117,12 +26691,12 @@ pub struct SessionMetadataGetContextAttributionResultContextAttribution {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataGetContextAttributionResult {
-    /// Per-source context-window attribution, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
-    pub context_attribution: Option<SessionMetadataGetContextAttributionResultContextAttribution>,
+pub struct SessionScheduleHasSelfPacedParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// The heaviest individual messages in the session's context window, most-expensive first.
+/// Whether the session currently has an active self-paced schedule.
 ///
 /// <div class="warning">
 ///
@@ -22132,14 +26706,12 @@ pub struct SessionMetadataGetContextAttributionResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataGetContextHeaviestMessagesResult {
-    /// Heaviest messages, most-expensive first.
-    pub messages: Vec<ContextHeaviestMessage>,
-    /// Total token count of the current context window, so callers can compute each message's share without a second call.
-    pub total_tokens: i64,
+pub struct SessionScheduleHasSelfPacedResult {
+    /// True when at least one active schedule is self-paced.
+    pub has_self_paced: bool,
 }
 
-/// Notify the session that its working directory context has changed. Emits a `session.context_changed` event so consumers (telemetry, OTel tracker, ACP, the timeline UI) can react. Use this when the host has detected a cwd/branch/repo change outside the session's normal lifecycle (e.g., after a shell command in interactive mode). For a local session, a report whose `cwd` diverges from the session's current working directory is ignored (the call still succeeds but records nothing and emits no event); move a local session's working directory via `metadata.setWorkingDirectory` instead.
+/// Result of registering or re-arming a scheduled prompt.
 ///
 /// <div class="warning">
 ///
@@ -22149,9 +26721,16 @@ pub struct SessionMetadataGetContextHeaviestMessagesResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataRecordContextChangeResult {}
+pub struct SessionScheduleAddResult {
+    /// The registered or updated schedule entry.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entry: Option<ScheduleEntry>,
+    /// User-facing validation error, when registration failed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+}
 
-/// Update the session's working directory. Used by the host when the user explicitly changes cwd (e.g., the `/cd` slash command). The host is responsible for any related side-effects (file index, etc.); it does NOT change the process working directory (a session's cwd is per-session, not process-global). For local sessions the runtime validates the target first (an absolute path that exists on disk) and re-bases the permission primary directory; a rejected validation fails the call before anything is mutated, persisted, or emitted. Location-scoped permission rules are then re-keyed to the new directory (best-effort). Remote sessions only record the path.
+/// Result of registering or re-arming a scheduled prompt.
 ///
 /// <div class="warning">
 ///
@@ -22161,12 +26740,16 @@ pub struct SessionMetadataRecordContextChangeResult {}
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataSetWorkingDirectoryResult {
-    /// Working directory after the update
-    pub working_directory: String,
+pub struct SessionScheduleAddCronResult {
+    /// The registered or updated schedule entry.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entry: Option<ScheduleEntry>,
+    /// User-facing validation error, when registration failed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
 }
 
-/// Re-tokenize the session's existing messages against `modelId` and return the token totals. Useful for hosts that want an initial estimate of context usage on session resume, before the next agent turn fires `session.context_info_changed` events. Returns zeros for an empty session.
+/// Result of registering or re-arming a scheduled prompt.
 ///
 /// <div class="warning">
 ///
@@ -22176,16 +26759,16 @@ pub struct SessionMetadataSetWorkingDirectoryResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionMetadataRecomputeContextTokensResult {
-    /// Tokens contributed by user/assistant/tool messages (excludes system/developer prompts).
-    pub messages_token_count: i64,
-    /// Tokens contributed by system/developer prompt snapshots.
-    pub system_token_count: i64,
-    /// Sum of tokens across chat-context and system-context messages currently held by the session.
-    pub total_tokens: i64,
+pub struct SessionScheduleAddAtResult {
+    /// The registered or updated schedule entry.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entry: Option<ScheduleEntry>,
+    /// User-facing validation error, when registration failed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
 }
 
-/// Identifies the target session.
+/// Result of registering or re-arming a scheduled prompt.
 ///
 /// <div class="warning">
 ///
@@ -22195,12 +26778,16 @@ pub struct SessionMetadataRecomputeContextTokensResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsSnapshotParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+pub struct SessionScheduleAddSelfPacedResult {
+    /// The registered or updated schedule entry.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entry: Option<ScheduleEntry>,
+    /// User-facing validation error, when registration failed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
 }
 
-/// Redacted, serializable view of session runtime settings for SDK boundary consumers. Secrets and raw feature flags are intentionally excluded.
+/// Result of registering or re-arming a scheduled prompt.
 ///
 /// <div class="warning">
 ///
@@ -22210,23 +26797,32 @@ pub struct SessionSettingsSnapshotParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionSettingsSnapshotResult {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub client_name: Option<String>,
-    pub job: SessionSettingsJobSnapshot,
-    pub model: SessionSettingsModelSnapshot,
-    pub online_evaluation: SessionSettingsOnlineEvaluationSnapshot,
-    pub repo: SessionSettingsRepoSnapshot,
+pub struct SessionScheduleRearmSelfPacedResult {
+    /// The registered or updated schedule entry.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub start_time_ms: Option<f64>,
+    pub entry: Option<ScheduleEntry>,
+    /// User-facing validation error, when registration failed.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout_ms: Option<f64>,
-    pub validation: SessionSettingsValidationSnapshot,
+    pub error: Option<String>,
+}
+
+/// Remove a scheduled prompt by id. The result entry is omitted if the id was unknown.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionScheduleStopResult {
+    /// The removed entry, or omitted if no entry matched.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub version: Option<String>,
+    pub entry: Option<ScheduleEntry>,
 }
 
-/// Batch content-exclusion result. Callers must fail closed when policy evaluation is unavailable.
+/// A bearer token supplied by the SDK client for a BYOK provider. The runtime sets it as `Authorization: Bearer <token>` on the outbound request and does no caching; the SDK consumer owns token caching and refresh.
 ///
 /// <div class="warning">
 ///
@@ -22236,14 +26832,12 @@ pub struct SessionSettingsSnapshotResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionContentExclusionCheckPathsResult {
-    /// Whether the session's policy service was available for the complete batch. When false, checks is empty and callers must treat every requested path as excluded.
-    pub available: bool,
-    /// Per-path decisions in request order. Empty when available is false.
-    pub checks: Vec<ContentExclusionPathCheck>,
+pub struct ProviderTokenGetTokenResult {
+    /// The bearer token value (without the `Bearer ` prefix).
+    pub token: String,
 }
 
-/// Identifier of the spawned process, used to correlate streamed output and exit notifications.
+/// Acknowledgement that a factory request was accepted.
 ///
 /// <div class="warning">
 ///
@@ -22253,12 +26847,9 @@ pub struct SessionContentExclusionCheckPathsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionShellExecResult {
-    /// Unique identifier for tracking streamed output
-    pub process_id: String,
-}
+pub struct FactoryAbortResult {}
 
-/// Indicates whether the signal was delivered; false if the process was unknown or already exited.
+/// Identifies the target session.
 ///
 /// <div class="warning">
 ///
@@ -22268,12 +26859,12 @@ pub struct SessionShellExecResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionShellKillResult {
-    /// Whether the signal was sent successfully
-    pub killed: bool,
+pub struct SessionFsSqliteExistsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
-/// Result of a user-requested shell command.
+/// Canvas open result returned by the provider.
 ///
 /// <div class="warning">
 ///
@@ -22283,22 +26874,19 @@ pub struct SessionShellKillResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionShellExecuteUserRequestedResult {
-    /// Error output when the execution failed
+pub struct CanvasOpenResult {
+    /// Provider-supplied status text
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Process exit code, when available
+    pub status: Option<String>,
+    /// Provider-supplied title
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub exit_code: Option<i64>,
-    /// Captured command output
-    pub output: String,
-    /// Whether the command completed successfully
-    pub success: bool,
-    /// Tool call id emitted for the shell execution
-    pub tool_call_id: String,
+    pub title: Option<String>,
+    /// URL for web-rendered canvases
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub url: Option<String>,
 }
 
-/// Cancellation result for a user-requested shell command.
+/// Validation errors from the most recent authentication attempt.
 ///
 /// <div class="warning">
 ///
@@ -22306,14 +26894,9 @@ pub struct SessionShellExecuteUserRequestedResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionShellCancelUserRequestedResult {
-    /// Whether an in-flight execution was found and signalled to cancel
-    pub cancelled: bool,
-}
+pub type AuthValidationErrors = Vec<AuthValidationError>;
 
-/// Compaction outcome with the number of tokens and messages removed, summary text, and the resulting context window breakdown.
+/// SHA-256 digest encoded as exactly 64 lowercase hexadecimal characters.
 ///
 /// <div class="warning">
 ///
@@ -22321,24 +26904,9 @@ pub struct SessionShellCancelUserRequestedResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryCompactResult {
-    /// Post-compaction context window usage breakdown
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_window: Option<HistoryCompactContextWindow>,
-    /// Number of messages removed during compaction
-    pub messages_removed: i64,
-    /// Whether compaction completed successfully
-    pub success: bool,
-    /// Summary text produced by compaction. Omitted when compaction did not produce a summary (e.g. failure path).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary_content: Option<String>,
-    /// Number of tokens freed by compaction
-    pub tokens_removed: i64,
-}
+pub type CardDigestValue = String;
 
-/// Number of events that were removed by the truncation.
+/// Bounded extensible wire-feature identifier. Known values are described by `CatalogCapability`; newer callers may send future identifiers so an older runtime can return a typed negotiation refusal instead of failing schema validation. Capability negotiation establishes contract understanding, while each operation's result separately reports runtime availability.
 ///
 /// <div class="warning">
 ///
@@ -22346,20 +26914,9 @@ pub struct SessionHistoryCompactResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryTruncateResult {
-    /// Failure detail when checkpointCleanupFailed is true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub checkpoint_cleanup_error: Option<String>,
-    /// True when conversation truncation succeeded but post-truncation workspace checkpoint cleanup failed. History is already truncated; callers may still prune snapshots but should report a checkpoint-cleanup rather than a truncation failure.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub checkpoint_cleanup_failed: Option<bool>,
-    /// Number of events that were removed
-    pub events_removed: i64,
-}
+pub type CatalogCapabilityId = String;
 
-/// Identifies the target session.
+/// HTTP headers as a map from lowercased header name to a list of values. Multi-valued headers (e.g. Set-Cookie) preserve all values.
 ///
 /// <div class="warning">
 ///
@@ -22367,14 +26924,9 @@ pub struct SessionHistoryTruncateResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryListRewindPointsParams {
-    /// Target session identifier
-    pub session_id: SessionId,
-}
+pub type LlmInferenceHeaders = HashMap<String, Vec<String>>;
 
-/// Rewind points and file-change-tracking availability for the session.
+/// MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.
 ///
 /// <div class="warning">
 ///
@@ -22382,19 +26934,9 @@ pub struct SessionHistoryListRewindPointsParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryListRewindPointsResult {
-    /// Whether this session captured file changes from its first turn.
-    pub file_change_tracking_enabled: bool,
-    /// Root user turns in chronological order. Empty when `unavailableReason` is set.
-    pub points: Vec<HistoryRewindPoint>,
-    /// Why the listed points could not be produced, when applicable; the points list is empty whenever it is set. `unsupported-remote-session` is permanent for the session and comes with `fileChangeTrackingEnabled: false`. `session-busy` is transient and only ever reported by a session that *is* tracking (`fileChangeTrackingEnabled: true`), because the file-change captures cannot be read while work that may still mutate them is in flight; the same request succeeds once the session settles, so a client that wants points should retry rather than treat it as a failure. It is never `file-change-tracking-disabled`: an untracked local session still lists conversation-only points and reports that through `fileChangeTrackingEnabled: false`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub unavailable_reason: Option<HistoryRewindUnavailableReason>,
-}
+pub type McpExecuteSamplingResult = HashMap<String, serde_json::Value>;
 
-/// Files and aggregate changes for a prospective rewind.
+/// A runtime-assigned secret placeholder. The identifier is carried once, inside the placeholder, so it cannot contradict a separate secret-id field.
 ///
 /// <div class="warning">
 ///
@@ -22402,21 +26944,9 @@ pub struct SessionHistoryListRewindPointsResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryPreviewRewindResult {
-    /// Whether file restore is available for this session. This is authoritative: switch on it and read `reason` only when it is false.
-    pub available: bool,
-    /// Number of unique files in the preview.
-    pub file_count: i64,
-    /// Files ordered by path.
-    pub files: Vec<HistoryRewindFilePreview>,
-    /// Why file restore is unavailable, when applicable. Populated only when `available` is false and never set when `available` is true.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<HistoryRewindUnavailableReason>,
-}
+pub type McpPlanSecretReference = String;
 
-/// Structured outcome of a rewind request.
+/// The form values submitted by the user (present when action is 'accept')
 ///
 /// <div class="warning">
 ///
@@ -22424,24 +26954,9 @@ pub struct SessionHistoryPreviewRewindResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryRewindResult {
-    /// Failure detail. Set only for the failure and partial-failure outcomes (`files-rolled-back`, `rollback-incomplete`, `truncation-failed`, `checkpoint-cleanup-failed`, `snapshot-prune-failed`); omitted for `success` and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Number of persisted events removed by conversation truncation. Present only when truncation succeeded (outcomes `success`, `checkpoint-cleanup-failed`, and `snapshot-prune-failed`); omitted for every unavailable outcome (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`) and for `truncation-failed`, `files-rolled-back`, and `rollback-incomplete`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub events_removed: Option<i64>,
-    /// Overall rewind outcome. This discriminates the result: it governs which of the remaining fields are populated, so consumers must switch on it before reading `eventsRemoved`, `restoredFiles`, `skippedFiles`, or `error`. See each field for the outcomes that populate it.
-    pub outcome: HistoryRewindOutcome,
-    /// Absolute paths restored to their captured preimages. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.
-    pub restored_files: Vec<String>,
-    /// Captured files intentionally left unchanged. Always empty for conversation-only rewinds and for the unavailable outcomes (`session-busy`, `file-change-tracking-disabled`, `unsupported-remote-session`); only conversation-and-files outcomes that reached the file-restore stage populate it.
-    pub skipped_files: Vec<HistorySkippedFileRestore>,
-}
+pub type UIElicitationResponseContent = HashMap<String, serde_json::Value>;
 
-/// Identifies the target session.
+/// List of all authenticated users
 ///
 /// <div class="warning">
 ///
@@ -22449,14 +26964,9 @@ pub struct SessionHistoryRewindResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryCancelBackgroundCompactionParams {
-    /// Target session identifier
-    pub session_id: SessionId,
-}
+pub type AccountGetAllUsersResult = Vec<AccountAllUsers>;
 
-/// Indicates whether an in-progress background compaction was cancelled.
+/// The number of running background agents (task-registry agents) that were cancelled.
 ///
 /// <div class="warning">
 ///
@@ -22464,14 +26974,9 @@ pub struct SessionHistoryCancelBackgroundCompactionParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryCancelBackgroundCompactionResult {
-    /// Whether an in-progress background compaction was cancelled. False when no compaction was running, when the session is remote, or when the underlying processor was unavailable.
-    pub cancelled: bool,
-}
+pub type SessionCancelAllBackgroundAgentsResult = i64;
 
-/// Identifies the target session.
+/// Authentication accounts available to the internal session host.
 ///
 /// <div class="warning">
 ///
@@ -22479,14 +26984,9 @@ pub struct SessionHistoryCancelBackgroundCompactionResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryAbortManualCompactionParams {
-    /// Target session identifier
-    pub session_id: SessionId,
-}
+pub type SessionGitHubAuthGetAllAuthAvailableResult = Vec<SessionAuthStatus>;
 
-/// Indicates whether an in-progress manual compaction was aborted.
+/// Whether the current authentication was logged out.
 ///
 /// <div class="warning">
 ///
@@ -22494,14 +26994,9 @@ pub struct SessionHistoryAbortManualCompactionParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryAbortManualCompactionResult {
-    /// Whether an in-progress manual compaction was aborted. False when no manual compaction was running, when its abort controller was already aborted, or when the session is remote.
-    pub aborted: bool,
-}
+pub type SessionGitHubAuthLogoutResult = bool;
 
-/// Identifies the target session.
+/// Whether the requested authentication was logged out.
 ///
 /// <div class="warning">
 ///
@@ -22509,14 +27004,9 @@ pub struct SessionHistoryAbortManualCompactionResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistorySummarizeForHandoffParams {
-    /// Target session identifier
-    pub session_id: SessionId,
-}
+pub type SessionGitHubAuthLogoutUserResult = bool;
 
-/// Markdown summary of the conversation context (empty when not available).
+/// Validation errors from the most recent authentication attempt.
 ///
 /// <div class="warning">
 ///
@@ -22524,14 +27014,9 @@ pub struct SessionHistorySummarizeForHandoffParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistorySummarizeForHandoffResult {
-    /// Markdown summary of the conversation context produced by an LLM. Empty string when there are no messages or when the session does not support local summarization.
-    pub summary: String,
-}
+pub type SessionGitHubAuthLastAuthErrorsResult = Vec<AuthValidationError>;
 
-/// What a successful clear removed. A clear that could not be applied rejects instead of reporting a count.
+/// Standard MCP CallToolResult
 ///
 /// <div class="warning">
 ///
@@ -22539,46 +27024,89 @@ pub struct SessionHistorySummarizeForHandoffResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionHistoryClearContextResult {
-    /// Number of non-system, non-developer messages that were removed from the conversation. Zero only when the window already held no conversation.
-    pub messages_cleared: i64,
+pub type SessionMcpAppsCallToolResult = HashMap<String, serde_json::Value>;
+
+/// Authentication host. HMAC auth always targets the public GitHub host.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum HMACAuthInfoHost {
+    #[serde(rename = "https://github.com")]
+    #[default]
+    HttpsGitHubCom,
+}
+
+/// HMAC-based authentication used by GitHub-internal services.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum HMACAuthInfoType {
+    #[serde(rename = "hmac")]
+    #[default]
+    Hmac,
+}
+
+/// Personal access token (PAT) or server-to-server token sourced from an environment variable.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum EnvAuthInfoType {
+    #[serde(rename = "env")]
+    #[default]
+    Env,
+}
+
+/// SDK-side token authentication; the host configured the token directly via the SDK.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum TokenAuthInfoType {
+    #[serde(rename = "token")]
+    #[default]
+    Token,
+}
+
+/// SDK callback-backed GitHub token authentication.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum TokenProviderAuthInfoType {
+    #[serde(rename = "token-provider")]
+    #[default]
+    TokenProvider,
+}
+
+/// Authentication host (always the public GitHub host).
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CopilotApiTokenAuthInfoHost {
+    #[serde(rename = "https://github.com")]
+    #[default]
+    HttpsGitHubCom,
+}
+
+/// Direct Copilot API authentication via the `GITHUB_COPILOT_API_TOKEN` + `COPILOT_API_URL` environment-variable pair. The token itself is read from the environment by the runtime, not carried in this struct.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CopilotApiTokenAuthInfoType {
+    #[serde(rename = "copilot-api-token")]
+    #[default]
+    CopilotApiToken,
+}
+
+/// OAuth user authentication. The token itself is held in the runtime's secret token store (keyed by host+login) and is NOT carried in this struct.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum UserAuthInfoType {
+    #[serde(rename = "user")]
+    #[default]
+    User,
 }
 
-/// Identifies the target session.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueuePendingItemsParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+/// Authentication via the `gh` CLI's saved credentials.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum GhCliAuthInfoType {
+    #[serde(rename = "gh-cli")]
+    #[default]
+    GhCli,
 }
 
-/// Snapshot of the session's pending queued items and immediate-steering messages.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueuePendingItemsResult {
-    /// Pending queued items in submission order. Includes user messages, queued slash commands, and queued model changes; omits internal system items.
-    pub items: Vec<QueuePendingItems>,
-    /// Display text for messages currently in the immediate steering queue (interjections sent during a running turn).
-    pub steering_messages: Vec<String>,
+/// API-key authentication for non-GitHub LLM providers (e.g. when running BYOM-style).
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ApiKeyAuthInfoType {
+    #[serde(rename = "api-key")]
+    #[default]
+    ApiKey,
 }
 
-/// Identifies the target session.
+/// Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.
 ///
 /// <div class="warning">
 ///
@@ -22586,14 +27114,20 @@ pub struct SessionQueuePendingItemsResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueSnapshotParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum AuthInfo {
+    Hmac(HMACAuthInfo),
+    Env(EnvAuthInfo),
+    Token(TokenAuthInfo),
+    TokenProvider(TokenProviderAuthInfo),
+    CopilotApiToken(CopilotApiTokenAuthInfo),
+    User(UserAuthInfo),
+    GhCli(GhCliAuthInfo),
+    ApiKey(ApiKeyAuthInfo),
 }
 
-/// Internal snapshot of native queue state for local session orchestration.
+/// Resolved Anthropic adaptive-thinking capability for a model.
 ///
 /// <div class="warning">
 ///
@@ -22601,22 +27135,24 @@ pub struct SessionQueueSnapshotParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueSnapshotResult {
-    /// Insertion orders for queued items, aligned with `items`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub item_orders: Option<Vec<i64>>,
-    /// User-facing pending items in FIFO order.
-    pub items: Vec<QueuePendingItems>,
-    /// Insertion orders for immediate steering messages, aligned with `steeringMessages`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub steering_message_orders: Option<Vec<i64>>,
-    /// Immediate steering messages waiting for an active turn.
-    pub steering_messages: Vec<String>,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AdaptiveThinkingSupport {
+    /// The model does not accept thinking.type='adaptive'
+    #[serde(rename = "unsupported")]
+    Unsupported,
+    /// The model accepts adaptive thinking but also accepts thinking.type='enabled'
+    #[serde(rename = "optional")]
+    Optional,
+    /// The model only accepts adaptive thinking and rejects thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8)
+    #[serde(rename = "required")]
+    Required,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of moving a queued item.
+/// Which tier this directory belongs to
 ///
 /// <div class="warning">
 ///
@@ -22624,14 +27160,21 @@ pub struct SessionQueueSnapshotResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueMoveItemResult {
-    /// True when the item changed position; false when it was already at the requested position.
-    pub changed: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentDiscoveryPathScope {
+    /// The user's personal agent configuration directory.
+    #[serde(rename = "user")]
+    User,
+    /// A project's repository agent directory.
+    #[serde(rename = "project")]
+    Project,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of inserting a queued message.
+/// Where the agent definition was loaded from
 ///
 /// <div class="warning">
 ///
@@ -22639,14 +27182,33 @@ pub struct SessionQueueMoveItemResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueInsertAtResult {
-    /// Fresh stable opaque id assigned to the inserted item.
-    pub id: String,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentInfoSource {
+    /// Agent loaded from the user's personal agent configuration.
+    #[serde(rename = "user")]
+    User,
+    /// Agent loaded from the current project's repository configuration.
+    #[serde(rename = "project")]
+    Project,
+    /// Agent inherited from a parent project or workspace.
+    #[serde(rename = "inherited")]
+    Inherited,
+    /// Agent provided by a remote runtime or service.
+    #[serde(rename = "remote")]
+    Remote,
+    /// Agent contributed by an installed plugin.
+    #[serde(rename = "plugin")]
+    Plugin,
+    /// Agent built into the Copilot runtime.
+    #[serde(rename = "builtin")]
+    Builtin,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of removing a queued item.
+/// Kind of attention required when status === "attention". Meaningful only when status === "attention".
 ///
 /// <div class="warning">
 ///
@@ -22654,14 +27216,30 @@ pub struct SessionQueueInsertAtResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueRemoveAtResult {
-    /// True when the addressed item was removed.
-    pub removed: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistryLiveTargetEntryAttentionKind {
+    /// Session is blocked on an unrecoverable error
+    #[serde(rename = "error")]
+    Error,
+    /// Session is waiting for a tool-permission decision
+    #[serde(rename = "permission")]
+    Permission,
+    /// Session is waiting for the user to approve or reject a plan
+    #[serde(rename = "exit_plan")]
+    ExitPlan,
+    /// Session is waiting on an elicitation prompt
+    #[serde(rename = "elicitation")]
+    Elicitation,
+    /// Session is waiting for free-form user input
+    #[serde(rename = "user_input")]
+    UserInput,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of editing a queued message.
+/// Process kind tag for the registry entry
 ///
 /// <div class="warning">
 ///
@@ -22669,14 +27247,21 @@ pub struct SessionQueueRemoveAtResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueUpdateTextResult {
-    /// True when the stored text changed.
-    pub updated: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistryLiveTargetEntryKind {
+    /// Interactive Copilot CLI exposing a UI server (legacy/normal CLI process)
+    #[serde(rename = "ui-server")]
+    UiServer,
+    /// Headless `--server --managed-server` child spawned by a controller
+    #[serde(rename = "managed-server")]
+    ManagedServer,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of duplicating a queued item.
+/// How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.
 ///
 /// <div class="warning">
 ///
@@ -22684,14 +27269,21 @@ pub struct SessionQueueUpdateTextResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueDuplicateAtResult {
-    /// Fresh stable opaque id assigned to the duplicate.
-    pub id: String,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistryLiveTargetEntryLastTerminalEvent {
+    /// Last turn ended cleanly (model returned a final assistant message)
+    #[serde(rename = "turn_end")]
+    TurnEnd,
+    /// Last turn was aborted (e.g. user interrupted)
+    #[serde(rename = "abort")]
+    Abort,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of trying to steer a queued message into a live turn.
+/// Coarse lifecycle status of the foreground session
 ///
 /// <div class="warning">
 ///
@@ -22699,14 +27291,27 @@ pub struct SessionQueueDuplicateAtResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueSendNowResult {
-    /// True when the item was accepted into the steering lane; false when no main turn was live.
-    pub steered: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistryLiveTargetEntryStatus {
+    /// Session is actively processing a turn
+    #[serde(rename = "working")]
+    Working,
+    /// Session is idle, waiting for input
+    #[serde(rename = "waiting")]
+    Waiting,
+    /// Last turn completed successfully
+    #[serde(rename = "done")]
+    Done,
+    /// Session needs user attention (see attentionKind for the specific reason)
+    #[serde(rename = "attention")]
+    Attention,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Identifies the target session.
+/// Categorized reason for log-open failure
 ///
 /// <div class="warning">
 ///
@@ -22714,14 +27319,32 @@ pub struct SessionQueueSendNowResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueHasPendingParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistryLogCaptureOpenErrorReason {
+    /// Filesystem permission denied opening the log file
+    #[serde(rename = "permission")]
+    Permission,
+    /// No space left on device
+    #[serde(rename = "disk_full")]
+    DiskFull,
+    /// Other / uncategorized open failure
+    #[serde(rename = "other")]
+    Other,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Discriminator: child_process.spawn itself failed
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistrySpawnErrorKind {
+    #[serde(rename = "spawn-error")]
+    #[default]
+    SpawnError,
 }
 
-/// Whether the native queue has pending work.
+/// Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.
 ///
 /// <div class="warning">
 ///
@@ -22729,46 +27352,37 @@ pub struct SessionQueueHasPendingParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueHasPendingResult {
-    /// True when queued or immediate native work is pending.
-    pub has_pending: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistrySpawnPermissionMode {
+    /// Standard permission posture (prompts for each request)
+    #[serde(rename = "default")]
+    Default,
+    /// Full allow-all (requires the controller-local session to currently be in allow-all mode)
+    #[serde(rename = "yolo")]
+    Yolo,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Whether a deferred-idle drain should run.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueBeginDeferredIdleDrainResult {
-    /// True when the host should run finishDeferredIdleDrain asynchronously.
-    pub should_drain: bool,
+/// Discriminator: spawn succeeded but child never registered
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistrySpawnRegistryTimeoutKind {
+    #[serde(rename = "registry-timeout")]
+    #[default]
+    RegistryTimeout,
 }
 
-/// Action selected by the native deferred-idle drain.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueFinishDeferredIdleDrainResult {
-    /// Whether the deferred idle was caused by an aborted foreground turn.
-    pub aborted: bool,
-    /// One of none, processQueue, or emitSessionIdle.
-    pub action: String,
+/// Discriminator: managed-server child spawned successfully
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistrySpawnSpawnedKind {
+    #[serde(rename = "spawned")]
+    #[default]
+    Spawned,
 }
 
-/// Identifies the target session.
+/// Which parameter field was invalid. Omitted when the rejection is not field-specific.
 ///
 /// <div class="warning">
 ///
@@ -22776,14 +27390,38 @@ pub struct SessionQueueFinishDeferredIdleDrainResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueRemoveMostRecentParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistrySpawnValidationErrorField {
+    /// The cwd parameter
+    #[serde(rename = "cwd")]
+    Cwd,
+    /// The session name parameter
+    #[serde(rename = "name")]
+    Name,
+    /// The agentName parameter
+    #[serde(rename = "agentName")]
+    AgentName,
+    /// The model parameter
+    #[serde(rename = "model")]
+    Model,
+    /// The permissionMode parameter
+    #[serde(rename = "permissionMode")]
+    PermissionMode,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Indicates whether a user-facing pending item was removed.
+/// Discriminator: synchronous pre-validation rejected the request
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistrySpawnValidationErrorKind {
+    #[serde(rename = "validation-error")]
+    #[default]
+    ValidationError,
+}
+
+/// Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.
 ///
 /// <div class="warning">
 ///
@@ -22791,14 +27429,33 @@ pub struct SessionQueueRemoveMostRecentParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueRemoveMostRecentResult {
-    /// True if a user-facing pending item was removed (LIFO across both queues); false when no removable items remained.
-    pub removed: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentRegistrySpawnValidationErrorReason {
+    /// Provided cwd does not exist on disk
+    #[serde(rename = "cwd-not-found")]
+    CwdNotFound,
+    /// Provided cwd exists but is not a directory
+    #[serde(rename = "cwd-not-directory")]
+    CwdNotDirectory,
+    /// Session name failed validateSessionName
+    #[serde(rename = "invalid-name")]
+    InvalidName,
+    /// Requested agent name was not found in builtin or custom agents
+    #[serde(rename = "unknown-agent")]
+    UnknownAgent,
+    /// Requested model is not available to this session
+    #[serde(rename = "unknown-model")]
+    UnknownModel,
+    /// Caller asked for permissionMode='yolo' but the controller is not currently in allow-all mode
+    #[serde(rename = "yolo-not-allowed")]
+    YoloNotAllowed,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Identifies the target session.
+/// Outcome of an agentRegistry.spawn call.
 ///
 /// <div class="warning">
 ///
@@ -22806,14 +27463,80 @@ pub struct SessionQueueRemoveMostRecentResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueClearParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum AgentRegistrySpawnResult {
+    Spawned(AgentRegistrySpawnSpawned),
+    SpawnError(AgentRegistrySpawnError),
+    RegistryTimeout(AgentRegistrySpawnRegistryTimeout),
+    ValidationError(AgentRegistrySpawnValidationError),
 }
 
-/// Indicates whether a user-facing pending item was removed.
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentBlobType {
+    #[serde(rename = "blob")]
+    #[default]
+    Blob,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentDirectoryType {
+    #[serde(rename = "directory")]
+    #[default]
+    Directory,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentExtensionContextType {
+    #[serde(rename = "extension_context")]
+    #[default]
+    ExtensionContext,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentFileType {
+    #[serde(rename = "file")]
+    #[default]
+    File,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubActionsJobType {
+    #[serde(rename = "github_actions_job")]
+    #[default]
+    GitHubActionsJob,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubCommitType {
+    #[serde(rename = "github_commit")]
+    #[default]
+    GitHubCommit,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubFileType {
+    #[serde(rename = "github_file")]
+    #[default]
+    GitHubFile,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubFileDiffType {
+    #[serde(rename = "github_file_diff")]
+    #[default]
+    GitHubFileDiff,
+}
+
+/// Type of GitHub reference
 ///
 /// <div class="warning">
 ///
@@ -22821,44 +27544,72 @@ pub struct SessionQueueClearParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueConsumeSystemNotificationsResult {
-    /// True if a user-facing pending item was removed (LIFO across both queues); false when no removable items remained.
-    pub removed: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubReferenceType {
+    /// GitHub issue reference.
+    #[serde(rename = "issue")]
+    Issue,
+    /// GitHub pull request reference.
+    #[serde(rename = "pr")]
+    Pr,
+    /// GitHub discussion reference.
+    #[serde(rename = "discussion")]
+    Discussion,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubReleaseType {
+    #[serde(rename = "github_release")]
+    #[default]
+    GitHubRelease,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubRepositoryType {
+    #[serde(rename = "github_repository")]
+    #[default]
+    GitHubRepository,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubSnippetType {
+    #[serde(rename = "github_snippet")]
+    #[default]
+    GitHubSnippet,
+}
+
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubTreeComparisonType {
+    #[serde(rename = "github_tree_comparison")]
+    #[default]
+    GitHubTreeComparison,
 }
 
-/// Identifies the target session.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueEnqueueResumePendingParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentGitHubUrlType {
+    #[serde(rename = "github_url")]
+    #[default]
+    GitHubUrl,
 }
 
-/// Result of enqueueing the resume-pending wake item.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueEnqueueResumePendingResult {
-    /// True when a wake item was newly queued.
-    pub queued: bool,
+/// Attachment type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AttachmentSelectionType {
+    #[serde(rename = "selection")]
+    #[default]
+    Selection,
 }
 
-/// Identifies the target session.
+/// Authentication type
 ///
 /// <div class="warning">
 ///
@@ -22866,14 +27617,39 @@ pub struct SessionQueueEnqueueResumePendingResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionQueueProcessParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AuthInfoType {
+    /// Authentication provided by a GitHub App HMAC credential.
+    #[serde(rename = "hmac")]
+    Hmac,
+    /// Authentication resolved from environment-provided credentials.
+    #[serde(rename = "env")]
+    Env,
+    /// Authentication from an interactive user sign-in.
+    #[serde(rename = "user")]
+    User,
+    /// Authentication delegated to the GitHub CLI.
+    #[serde(rename = "gh-cli")]
+    GhCli,
+    /// Authentication from an API key credential.
+    #[serde(rename = "api-key")]
+    ApiKey,
+    /// Authentication from a GitHub token.
+    #[serde(rename = "token")]
+    Token,
+    /// Authentication from an SDK GitHub token callback.
+    #[serde(rename = "token-provider")]
+    TokenProvider,
+    /// Authentication from a Copilot API token.
+    #[serde(rename = "copilot-api-token")]
+    CopilotApiToken,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Batch of session events returned by a read, with cursor and continuation metadata.
+/// Custom input-format kind.
 ///
 /// <div class="warning">
 ///
@@ -22881,20 +27657,18 @@ pub struct SessionQueueProcessParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionEventLogReadResult {
-    /// Opaque cursor for the next read. Pass back unchanged in the next read.cursor to continue from where this read left off. Always present, even when no events were returned. For a backward read this cursor pages toward OLDER events; keep passing `direction: backward` with it (the cursor is also self-describing, so backward paging continues correctly).
-    pub cursor: String,
-    /// Cursor status: 'ok' means the cursor was applied successfully; 'expired' means the cursor referred to an event that no longer exists in history (e.g. truncated or compacted away) and the read fell back to a boundary of the remaining history. For a forward read the fallback starts from the beginning of the remaining history; for a backward read it falls back to the tail (the newest window). Because the fallback page is a fresh boundary snapshot rather than a continuation of the requested cursor, it may overlap events the consumer has already rendered — a backward fallback to the tail in particular can repeat the newest window. On 'expired', consumers should reset or rebase their local pagination state (or deduplicate by event id) before continuing from the returned cursor rather than blindly appending/prepending the fallback page.
-    pub cursor_status: EventsCursorStatus,
-    /// Session events for this batch, merged into a single stream in creation order: durable (persisted) events and ephemeral events interleave exactly as they were emitted. Set `includeEphemeral: false` to receive only durable events. Ephemeral events are never replayable once pruned from the in-memory ring, so a consumer that needs them should keep reading with a non-zero `waitMs`. For a backward (tail-first) read, the returned window contains persisted events only, still in chronological (oldest-to-newest) append order.
-    pub events: Vec<SessionEvent>,
-    /// True when more events are available in the read's direction. For a forward read, true means the batch returned `max` events and more are available immediately. For a backward read, true means older persisted events remain before the returned window.
-    pub has_more: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum BuiltinToolFormatType {
+    /// The tool input is parsed with the supplied grammar.
+    #[serde(rename = "grammar")]
+    Grammar,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Identifies the target session.
+/// Root JSON Schema type for a built-in tool input.
 ///
 /// <div class="warning">
 ///
@@ -22902,14 +27676,18 @@ pub struct SessionEventLogReadResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionEventLogTailParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum BuiltinToolInputSchemaType {
+    /// The tool accepts a JSON object.
+    #[serde(rename = "object")]
+    Object,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Snapshot of the current tail cursor without returning any events. Use this when a consumer wants to subscribe to live events going forward without first paginating through the entire persisted history (which would happen if `read` were called without a cursor on a long-lived session).
+/// Canonical digest algorithm for a validated MCP card
 ///
 /// <div class="warning">
 ///
@@ -22917,130 +27695,66 @@ pub struct SessionEventLogTailParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionEventLogTailResult {
-    /// Opaque cursor pointing at the current tail of the session's persisted-events history. Pass back to `read` to receive only events that arrive AFTER this snapshot. When the session has no events, this returns the same sentinel as an unset cursor (i.e. equivalent to omitting the cursor on a first read).
-    pub cursor: String,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CardDigestAlgorithm {
+    /// SHA-256 over RFC 8785 canonical JSON encoded as UTF-8.
+    #[serde(rename = "sha256-rfc8785")]
+    Sha256Rfc8785,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Opaque handle representing an event-type interest registration.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionEventLogRegisterInterestResult {
-    /// Opaque handle for this registration. Pass to releaseInterest to release. Each call to registerInterest produces a fresh handle, even when the same eventType is registered multiple times.
-    pub handle: String,
+/// AI skills are discovery-only and cannot be installed through this surface
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogAiSkillCandidateInstallability {
+    #[serde(rename = "not-installable-kind")]
+    #[default]
+    NotInstallableKind,
 }
 
-/// Indicates whether the operation succeeded.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionEventLogReleaseInterestResult {
-    /// Whether the operation succeeded
-    pub success: bool,
+/// Discriminator: this candidate describes an AI skill
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogAiSkillCandidateKind {
+    #[serde(rename = "ai-skill")]
+    #[default]
+    AiSkill,
 }
 
-/// Identifies the target session.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionUsageGetMetricsParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+/// Media type of the underlying AI skill card
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogAiSkillCandidateMediaType {
+    #[serde(rename = "application/ai-skill")]
+    #[default]
+    ApplicationAiSkill,
 }
 
-/// Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionUsageGetMetricsResult {
-    /// Aggregated code change metrics
-    pub code_changes: UsageMetricsCodeChanges,
-    /// Currently active model identifier
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub current_model: Option<String>,
-    /// Input tokens from the most recent main-agent API call
-    pub last_call_input_tokens: i64,
-    /// Output tokens from the most recent main-agent API call
-    pub last_call_output_tokens: i64,
-    /// Per-model token and request metrics, keyed by model identifier
-    pub model_metrics: HashMap<String, UsageMetricsModelMetric>,
-    /// ISO 8601 timestamp when the session started
-    pub session_start_time: String,
-    /// Session-wide per-token-type accumulated token counts
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub token_details: Option<HashMap<String, UsageMetricsTokenDetail>>,
-    /// Total time spent in model API calls (milliseconds)
-    pub total_api_duration_ms: i64,
-    /// Session-wide accumulated nano-AI units cost
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub total_nano_aiu: Option<f64>,
-    /// Total user-initiated premium request cost across all models (may be fractional due to multipliers)
-    pub total_premium_request_cost: f64,
-    /// Raw count of user-initiated API requests
-    pub total_user_requests: i64,
+/// Media type advertised for the referenced AI skill card
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogAiSkillCandidateProvenanceMediaType {
+    #[serde(rename = "application/ai-skill")]
+    #[default]
+    ApplicationAiSkill,
 }
 
-/// GitHub URL for the session and a flag indicating whether remote steering is enabled.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionRemoteEnableResult {
-    /// Whether remote steering is enabled
-    pub remote_steerable: bool,
-    /// GitHub frontend URL for this session
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub url: Option<String>,
+/// Discriminator: the card is URL-backed, and carries no embedded data
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogCandidateSourceUrlKind {
+    #[serde(rename = "url")]
+    #[default]
+    Url,
 }
 
-/// Identifies the target session.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionRemoteDisableParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+/// Discriminator: the card is embedded, and carries no URL
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogCandidateSourceEmbeddedKind {
+    #[serde(rename = "embedded")]
+    #[default]
+    Embedded,
 }
 
-/// Persist a steerability change as a `session.remote_steerable_changed` event. Used by the host (CLI / SDK consumer) when it has just finished enabling or disabling steering on a remote exporter that the runtime does not directly own.
+/// Where a candidate's card came from. Exactly one of a URL or embedded data: the union has no variant carrying both, and no variant carrying neither, so the rule holds structurally rather than by validation.
 ///
 /// <div class="warning">
 ///
@@ -23048,11 +27762,22 @@ pub struct SessionRemoteDisableParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionRemoteNotifySteerableChangedResult {}
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CatalogCandidateSource {
+    Url(CatalogCandidateSourceUrl),
+    Embedded(CatalogCandidateSourceEmbedded),
+}
 
-/// Identifies the target session.
+/// Discriminator: the caller is not authenticated
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogAuthenticationRequiredErrorKind {
+    #[serde(rename = "authentication-required")]
+    #[default]
+    AuthenticationRequired,
+}
+
+/// Why the catalog authority did not accept the caller's identity
 ///
 /// <div class="warning">
 ///
@@ -23060,14 +27785,24 @@ pub struct SessionRemoteNotifySteerableChangedResult {}
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionVisibilityGetParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogAuthenticationRequiredReason {
+    /// No credential was presented, so there is nothing to refresh and the caller must sign in.
+    #[serde(rename = "no-credential")]
+    NoCredential,
+    /// A credential was presented and its lifetime has elapsed. A silent refresh is worth attempting before prompting anyone.
+    #[serde(rename = "credential-expired")]
+    CredentialExpired,
+    /// A credential was presented and the authority refused it, for example because it was revoked, malformed, or issued for another audience. Refreshing the same rejected credential is not useful; the caller must sign in again.
+    #[serde(rename = "credential-rejected")]
+    CredentialRejected,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Current sharing status and shareable GitHub URL for a session.
+/// Whether an MCP server candidate can be planned for installation
 ///
 /// <div class="warning">
 ///
@@ -23075,20 +27810,29 @@ pub struct SessionVisibilityGetParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionVisibilityGetResult {
-    /// Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub share_url: Option<String>,
-    /// Current sharing status. Absent when the session is not synced or the status could not be retrieved (e.g. the user is not authenticated).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<SessionVisibilityStatus>,
-    /// Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the session cannot be shared and `status`/`shareUrl` are absent.
-    pub synced: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogMcpServerInstallability {
+    /// An install plan can be computed for this MCP server candidate.
+    #[serde(rename = "installable")]
+    Installable,
+    /// Policy forbids installing this MCP server candidate.
+    #[serde(rename = "not-installable-policy")]
+    NotInstallablePolicy,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Effective sharing status and shareable GitHub URL after updating session visibility.
+/// Discriminator: this candidate describes an MCP server
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogMcpServerCandidateKind {
+    #[serde(rename = "mcp-server")]
+    #[default]
+    McpServer,
+}
+
+/// JSON MCP card media type accepted for install planning
 ///
 /// <div class="warning">
 ///
@@ -23096,20 +27840,21 @@ pub struct SessionVisibilityGetResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionVisibilitySetResult {
-    /// Shareable GitHub URL for the session. Present when the session is synced and the URL can be resolved.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub share_url: Option<String>,
-    /// Effective sharing status after the update. May differ from the requested status for task types that are already visible to repository readers by default. Absent when the update could not be applied (e.g. the session is not synced or the user is not authenticated).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<SessionVisibilityStatus>,
-    /// Whether the session has been synced to Mission Control (i.e. has a GitHub task). When false, the visibility change could not be applied and `status`/`shareUrl` are absent.
-    pub synced: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpServerCardMediaType {
+    /// The current MCP server card media type.
+    #[serde(rename = "application/mcp-server-card+json")]
+    ApplicationMcpServerCardJson,
+    /// The legacy MCP server card media type, accepted for compatibility.
+    #[serde(rename = "application/mcp-server+json")]
+    ApplicationMcpServerJson,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Identifies the target session.
+/// One inert catalog result, represented as an MCP server or discovery-only AI skill variant so kind, media type, provenance, and installability cannot contradict each other.
 ///
 /// <div class="warning">
 ///
@@ -23117,14 +27862,14 @@ pub struct SessionVisibilitySetResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleListParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CatalogCandidate {
+    McpServer(CatalogMcpServerCandidate),
+    AiSkill(CatalogAiSkillCandidate),
 }
 
-/// Snapshot of the currently active recurring prompts for this session.
+/// What kind of resource a catalog candidate describes
 ///
 /// <div class="warning">
 ///
@@ -23132,14 +27877,21 @@ pub struct SessionScheduleListParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleListResult {
-    /// Active scheduled prompts, ordered by id.
-    pub entries: Vec<ScheduleEntry>,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogCandidateKind {
+    /// An MCP server, which can be planned for installation.
+    #[serde(rename = "mcp-server")]
+    McpServer,
+    /// An AI skill, which is discoverable but not installable through this surface.
+    #[serde(rename = "ai-skill")]
+    AiSkill,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Identifies the target session.
+/// A wire feature a caller can require of the catalog surface, negotiated per request. A grant means the runtime understands the feature's contract, not that the deployment has enabled the operation; typed unavailable results report availability separately.
 ///
 /// <div class="warning">
 ///
@@ -23147,14 +27899,38 @@ pub struct SessionScheduleListResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleHydrateParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogCapability {
+    /// Understands the current `application/mcp-server-card+json` media type.
+    #[serde(rename = "mcp-server-card")]
+    McpServerCard,
+    /// Understands the legacy `application/mcp-server+json` media type.
+    #[serde(rename = "legacy-mcp-server-card")]
+    LegacyMcpServerCard,
+    /// Understands `application/ai-skill` candidates as discovery-only and typed non-installable.
+    #[serde(rename = "ai-skill-discovery")]
+    AiSkillDiscovery,
+    /// Understands side-effect-free MCP install-plan requests, results, and plan handles; `planning-unavailable` separately reports that planning is not enabled.
+    #[serde(rename = "mcp-install-planning")]
+    McpInstallPlanning,
+    /// Understands plans that enumerate every eligible transport rather than a single preferred one.
+    #[serde(rename = "multiple-transport-choice")]
+    MultipleTransportChoice,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Identifies the target session.
+/// Discriminator: the upstream response broke the contract
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogContractViolationErrorKind {
+    #[serde(rename = "contract-violation")]
+    #[default]
+    ContractViolation,
+}
+
+/// Which wire-contract rule an upstream response broke
 ///
 /// <div class="warning">
 ///
@@ -23162,14 +27938,27 @@ pub struct SessionScheduleHydrateParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleHasSelfPacedParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogContractViolationReason {
+    /// A result carried both a URL and embedded data, when exactly one is permitted.
+    #[serde(rename = "both-url-and-data")]
+    BothUrlAndData,
+    /// A result carried neither a URL nor embedded data, when exactly one is required.
+    #[serde(rename = "neither-url-nor-data")]
+    NeitherUrlNorData,
+    /// Two results claimed the same normalised identity.
+    #[serde(rename = "duplicate-identity")]
+    DuplicateIdentity,
+    /// A result declared no media type, or one this contract does not model.
+    #[serde(rename = "unknown-media-type")]
+    UnknownMediaType,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Whether the session currently has an active self-paced schedule.
+/// Which kind of opaque handle was presented
 ///
 /// <div class="warning">
 ///
@@ -23177,14 +27966,29 @@ pub struct SessionScheduleHasSelfPacedParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleHasSelfPacedResult {
-    /// True when at least one active schedule is self-paced.
-    pub has_self_paced: bool,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogHandleType {
+    /// A search candidate handle.
+    #[serde(rename = "candidate")]
+    Candidate,
+    /// An install plan handle.
+    #[serde(rename = "plan")]
+    Plan,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of registering or re-arming a scheduled prompt.
+/// Discriminator: a handle was rejected
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogHandleRejectedErrorKind {
+    #[serde(rename = "handle-rejected")]
+    #[default]
+    HandleRejected,
+}
+
+/// Why a presented handle was rejected
 ///
 /// <div class="warning">
 ///
@@ -23192,18 +27996,27 @@ pub struct SessionScheduleHasSelfPacedResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleAddResult {
-    /// The registered or updated schedule entry.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entry: Option<ScheduleEntry>,
-    /// User-facing validation error, when registration failed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogHandleRejectionReason {
+    /// The handle is unparseable, unknown, or was issued for a different operation.
+    #[serde(rename = "invalid")]
+    Invalid,
+    /// The handle's time to live has elapsed.
+    #[serde(rename = "stale")]
+    Stale,
+    /// The handle has already been used, and handles are single-use.
+    #[serde(rename = "replayed")]
+    Replayed,
+    /// The handle was issued by a different runtime instance.
+    #[serde(rename = "foreign")]
+    Foreign,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of registering or re-arming a scheduled prompt.
+/// Which request field was rejected before any work was done
 ///
 /// <div class="warning">
 ///
@@ -23211,18 +28024,52 @@ pub struct SessionScheduleAddResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleAddCronResult {
-    /// The registered or updated schedule entry.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entry: Option<ScheduleEntry>,
-    /// User-facing validation error, when registration failed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogInvalidRequestField {
+    /// The search query was empty or longer than permitted.
+    #[serde(rename = "query")]
+    Query,
+    /// The requested result count fell outside its permitted range.
+    #[serde(rename = "limit")]
+    Limit,
+    /// The requested candidate kinds were empty or contained a duplicate.
+    #[serde(rename = "kinds")]
+    Kinds,
+    /// The negotiation block was missing or malformed.
+    #[serde(rename = "contract")]
+    Contract,
+    /// The plan source was missing or malformed.
+    #[serde(rename = "source")]
+    Source,
+    /// The supplied card was missing its media type, URL, or data.
+    #[serde(rename = "card")]
+    Card,
+    /// The requested configuration scope is not one this runtime writes.
+    #[serde(rename = "scope")]
+    Scope,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of registering or re-arming a scheduled prompt.
+/// Discriminator: the request itself was invalid
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogInvalidRequestErrorKind {
+    #[serde(rename = "invalid-request")]
+    #[default]
+    InvalidRequest,
+}
+
+/// Discriminator: the card was malformed
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogMalformedCardErrorKind {
+    #[serde(rename = "malformed-card")]
+    #[default]
+    MalformedCard,
+}
+
+/// Media type a catalog card is interpreted as
 ///
 /// <div class="warning">
 ///
@@ -23230,18 +28077,24 @@ pub struct SessionScheduleAddCronResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleAddAtResult {
-    /// The registered or updated schedule entry.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entry: Option<ScheduleEntry>,
-    /// User-facing validation error, when registration failed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogMediaType {
+    /// The current MCP server card media type.
+    #[serde(rename = "application/mcp-server-card+json")]
+    ApplicationMcpServerCardJson,
+    /// The legacy MCP server card media type, accepted for compatibility.
+    #[serde(rename = "application/mcp-server+json")]
+    ApplicationMcpServerJson,
+    /// An AI skill card. Representable and searchable, but typed non-installable.
+    #[serde(rename = "application/ai-skill")]
+    ApplicationAiSkill,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of registering or re-arming a scheduled prompt.
+/// How a card failed validation
 ///
 /// <div class="warning">
 ///
@@ -23249,18 +28102,38 @@ pub struct SessionScheduleAddAtResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleAddSelfPacedResult {
-    /// The registered or updated schedule entry.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entry: Option<ScheduleEntry>,
-    /// User-facing validation error, when registration failed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogMalformedCardReason {
+    /// The document is not well-formed JSON.
+    #[serde(rename = "invalid-json")]
+    InvalidJson,
+    /// The document does not satisfy its media type's schema.
+    #[serde(rename = "schema-violation")]
+    SchemaViolation,
+    /// The declared media type is not one this runtime understands.
+    #[serde(rename = "unsupported-media-type")]
+    UnsupportedMediaType,
+    /// A field the media type requires is absent.
+    #[serde(rename = "missing-required-field")]
+    MissingRequiredField,
+    /// The document exceeded the permitted size.
+    #[serde(rename = "size-limit-exceeded")]
+    SizeLimitExceeded,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Result of registering or re-arming a scheduled prompt.
+/// Discriminator: capability or protocol-version negotiation failed
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogNegotiationRefusedErrorKind {
+    #[serde(rename = "negotiation-refused")]
+    #[default]
+    NegotiationRefused,
+}
+
+/// Why capability and protocol-version negotiation refused a caller
 ///
 /// <div class="warning">
 ///
@@ -23268,18 +28141,29 @@ pub struct SessionScheduleAddSelfPacedResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleRearmSelfPacedResult {
-    /// The registered or updated schedule entry.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entry: Option<ScheduleEntry>,
-    /// User-facing validation error, when registration failed.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogNegotiationRefusedReason {
+    /// The caller's protocol version is below the lowest this runtime serves.
+    #[serde(rename = "unsupported-protocol-version")]
+    UnsupportedProtocolVersion,
+    /// The caller requires at least one capability this runtime cannot honour.
+    #[serde(rename = "unsupported-capability")]
+    UnsupportedCapability,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Remove a scheduled prompt by id. The result entry is omitted if the id was unknown.
+/// Discriminator: the network operation failed
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogNetworkFailureErrorKind {
+    #[serde(rename = "network-failure")]
+    #[default]
+    NetworkFailure,
+}
+
+/// Categorised network failure, low cardinality so it can be aggregated without carrying a URL
 ///
 /// <div class="warning">
 ///
@@ -23287,15 +28171,47 @@ pub struct SessionScheduleRearmSelfPacedResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionScheduleStopResult {
-    /// The removed entry, or omitted if no entry matched.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub entry: Option<ScheduleEntry>,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogNetworkFailureReason {
+    /// No network is available, so nothing was attempted.
+    #[serde(rename = "offline")]
+    Offline,
+    /// The authority's name could not be resolved.
+    #[serde(rename = "dns")]
+    Dns,
+    /// The request exceeded its time budget.
+    #[serde(rename = "timeout")]
+    Timeout,
+    /// The TLS handshake or certificate validation failed.
+    #[serde(rename = "tls")]
+    Tls,
+    /// The connection was refused or reset.
+    #[serde(rename = "connection-refused")]
+    ConnectionRefused,
+    /// The authority returned a status the runtime treats as a failure.
+    #[serde(rename = "http-status")]
+    HttpStatus,
+    /// The response exceeded the permitted size.
+    #[serde(rename = "response-too-large")]
+    ResponseTooLarge,
+    /// A redirect was refused by the runtime's redirect policy.
+    #[serde(rename = "redirect-rejected")]
+    RedirectRejected,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// A bearer token supplied by the SDK client for a BYOK provider. The runtime sets it as `Authorization: Bearer <token>` on the outbound request and does no caching; the SDK consumer owns token caching and refresh.
+/// Discriminator: the candidate cannot be installed
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogNotInstallableErrorKind {
+    #[serde(rename = "not-installable")]
+    #[default]
+    NotInstallable,
+}
+
+/// Why a discoverable candidate cannot be installed
 ///
 /// <div class="warning">
 ///
@@ -23303,14 +28219,32 @@ pub struct SessionScheduleStopResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ProviderTokenGetTokenResult {
-    /// The bearer token value (without the `Bearer ` prefix).
-    pub token: String,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogNotInstallableReason {
+    /// This kind of resource is not installable through this surface.
+    #[serde(rename = "kind-not-installable")]
+    KindNotInstallable,
+    /// AI skills are discoverable but have no typed importer in this phase.
+    #[serde(rename = "ai-skill-not-installable")]
+    AiSkillNotInstallable,
+    /// Policy forbids installing this candidate.
+    #[serde(rename = "policy-forbids")]
+    PolicyForbids,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Acknowledgement that a factory request was accepted.
+/// Discriminator: policy refused the operation
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogPolicyRejectedErrorKind {
+    #[serde(rename = "policy-rejected")]
+    #[default]
+    PolicyRejected,
+}
+
+/// Which authority produced a policy decision
 ///
 /// <div class="warning">
 ///
@@ -23318,11 +28252,51 @@ pub struct ProviderTokenGetTokenResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FactoryAbortResult {}
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpPlanPolicySource {
+    /// No policy applied, so the server is permitted by default.
+    #[serde(rename = "none")]
+    None,
+    /// An enterprise allowlist evaluated the server.
+    #[serde(rename = "enterprise-allowlist")]
+    EnterpriseAllowlist,
+    /// The registry the card came from evaluated the server.
+    #[serde(rename = "registry-policy")]
+    RegistryPolicy,
+    /// Local trust settings evaluated the server.
+    #[serde(rename = "local-trust")]
+    LocalTrust,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
 
-/// Identifies the target session.
+/// Discriminator: the search completed
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogSearchSucceededKind {
+    #[serde(rename = "succeeded")]
+    #[default]
+    Succeeded,
+}
+
+/// Discriminator: an unsupported candidate kind was requested
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogUnsupportedKindErrorKind {
+    #[serde(rename = "unsupported-kind")]
+    #[default]
+    UnsupportedKind,
+}
+
+/// Discriminator: retrieval was refused as unsafe
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogUnsafeRetrievalErrorKind {
+    #[serde(rename = "unsafe-retrieval")]
+    #[default]
+    UnsafeRetrieval,
+}
+
+/// Which hardened-fetch control refused a retrieval
 ///
 /// <div class="warning">
 ///
@@ -23330,14 +28304,41 @@ pub struct FactoryAbortResult {}
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionFsSqliteExistsParams {
-    /// Target session identifier
-    pub session_id: SessionId,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogUnsafeRetrievalReason {
+    /// The URL used a scheme the runtime refuses to fetch.
+    #[serde(rename = "blocked-scheme")]
+    BlockedScheme,
+    /// The URL embedded credentials.
+    #[serde(rename = "credentials-in-url")]
+    CredentialsInUrl,
+    /// The URL resolved to a loopback, private, link-local, or cloud metadata address.
+    #[serde(rename = "blocked-address")]
+    BlockedAddress,
+    /// A redirect target resolved to a blocked address.
+    #[serde(rename = "redirect-to-blocked-address")]
+    RedirectToBlockedAddress,
+    /// The configured proxy policy refused the request.
+    #[serde(rename = "proxy-rejected")]
+    ProxyRejected,
+    /// The authority is not permitted for card retrieval.
+    #[serde(rename = "host-not-permitted")]
+    HostNotPermitted,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Canvas open result returned by the provider.
+/// Discriminator: the operation is not available
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogUnavailableErrorKind {
+    #[serde(rename = "unavailable")]
+    #[default]
+    Unavailable,
+}
+
+/// Why a catalog operation is not available on this runtime
 ///
 /// <div class="warning">
 ///
@@ -23345,21 +28346,27 @@ pub struct SessionFsSqliteExistsParams {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CanvasOpenResult {
-    /// Provider-supplied status text
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
-    /// Provider-supplied title
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// URL for web-rendered canvases
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub url: Option<String>,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogUnavailableReason {
+    /// Bounded search is not wired up on this runtime build.
+    #[serde(rename = "search-unavailable")]
+    SearchUnavailable,
+    /// Install planning is not wired up on this runtime build.
+    #[serde(rename = "planning-unavailable")]
+    PlanningUnavailable,
+    /// No catalog authority is configured for this runtime.
+    #[serde(rename = "authority-not-configured")]
+    AuthorityNotConfigured,
+    /// The surface is disabled by policy on this runtime.
+    #[serde(rename = "disabled-by-policy")]
+    DisabledByPolicy,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// HTTP headers as a map from lowercased header name to a list of values. Multi-valued headers (e.g. Set-Cookie) preserve all values.
+/// Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
 ///
 /// <div class="warning">
 ///
@@ -23367,9 +28374,31 @@ pub struct CanvasOpenResult {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-pub type LlmInferenceHeaders = HashMap<String, Vec<String>>;
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CatalogSearchResult {
+    Succeeded(CatalogSearchSucceeded),
+    NegotiationRefused(CatalogNegotiationRefusedError),
+    UnsupportedKind(CatalogUnsupportedKindError),
+    InvalidRequest(CatalogInvalidRequestError),
+    AuthenticationRequired(CatalogAuthenticationRequiredError),
+    PolicyRejected(CatalogPolicyRejectedError),
+    NetworkFailure(CatalogNetworkFailureError),
+    UnsafeRetrieval(CatalogUnsafeRetrievalError),
+    MalformedCard(CatalogMalformedCardError),
+    ContractViolation(CatalogContractViolationError),
+    Unavailable(CatalogUnavailableError),
+}
 
-/// MCP CreateMessageResult payload (with optional 'tools' extension), present when action='success'. Treated as opaque at the schema layer; consumers should construct/consume it per the MCP CreateMessageResult shape.
+/// Discriminator: no usable transport is available
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogUnavailableTransportErrorKind {
+    #[serde(rename = "unavailable-transport")]
+    #[default]
+    UnavailableTransport,
+}
+
+/// Why no usable transport could be offered
 ///
 /// <div class="warning">
 ///
@@ -23377,9 +28406,24 @@ pub type LlmInferenceHeaders = HashMap<String, Vec<String>>;
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-pub type McpExecuteSamplingResult = HashMap<String, serde_json::Value>;
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CatalogUnavailableTransportReason {
+    /// The card advertises no transport this runtime can use.
+    #[serde(rename = "no-eligible-transport")]
+    NoEligibleTransport,
+    /// Every advertised transport is of a kind this runtime does not implement.
+    #[serde(rename = "transport-not-supported")]
+    TransportNotSupported,
+    /// Eligible remotes could not be enumerated, so no explicit choice can be offered.
+    #[serde(rename = "remote-enumeration-unavailable")]
+    RemoteEnumerationUnavailable,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
 
-/// The form values submitted by the user (present when action is 'accept')
+/// Optional completion hint for the input (e.g. 'directory' for filesystem path completion)
 ///
 /// <div class="warning">
 ///
@@ -23387,9 +28431,18 @@ pub type McpExecuteSamplingResult = HashMap<String, serde_json::Value>;
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-pub type UIElicitationResponseContent = HashMap<String, serde_json::Value>;
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SlashCommandInputCompletion {
+    /// Input should complete filesystem directories.
+    #[serde(rename = "directory")]
+    Directory,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
 
-/// List of all authenticated users
+/// Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command
 ///
 /// <div class="warning">
 ///
@@ -23397,9 +28450,24 @@ pub type UIElicitationResponseContent = HashMap<String, serde_json::Value>;
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-pub type AccountGetAllUsersResult = Vec<AccountAllUsers>;
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SlashCommandKind {
+    /// Command implemented by the runtime.
+    #[serde(rename = "builtin")]
+    Builtin,
+    /// Command backed by a skill.
+    #[serde(rename = "skill")]
+    Skill,
+    /// Command registered by an SDK client or extension.
+    #[serde(rename = "client")]
+    Client,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
 
-/// The number of running background agents (task-registry agents) that were cancelled.
+/// Whether a pending slash-command invocation effect was applied or cancelled by the host.
 ///
 /// <div class="warning">
 ///
@@ -23407,9 +28475,20 @@ pub type AccountGetAllUsersResult = Vec<AccountAllUsers>;
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-pub type SessionCancelAllBackgroundAgentsResult = i64;
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CommandsInvocationEffectOutcome {
+    /// The host applied the pending invocation effect.
+    #[serde(rename = "applied")]
+    Applied,
+    /// The host cancelled the pending invocation effect, so any provisional state must be reverted.
+    #[serde(rename = "cancelled")]
+    Cancelled,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
 
-/// Standard MCP CallToolResult
 ///
 /// <div class="warning">
 ///
@@ -23417,9 +28496,17 @@ pub type SessionCancelAllBackgroundAgentsResult = i64;
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-pub type SessionMcpAppsCallToolResult = HashMap<String, serde_json::Value>;
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CommandsInvocationOrigin {
+    #[serde(rename = "settings")]
+    Settings,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
 
-/// Resolved Anthropic adaptive-thinking capability for a model.
+/// Neutral SDK discriminator for the connected remote session kind.
 ///
 /// <div class="warning">
 ///
@@ -23428,23 +28515,20 @@ pub type SessionMcpAppsCallToolResult = HashMap<String, serde_json::Value>;
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AdaptiveThinkingSupport {
-    /// The model does not accept thinking.type='adaptive'
-    #[serde(rename = "unsupported")]
-    Unsupported,
-    /// The model accepts adaptive thinking but also accepts thinking.type='enabled'
-    #[serde(rename = "optional")]
-    Optional,
-    /// The model only accepts adaptive thinking and rejects thinking.type='enabled' with HTTP 400 (e.g. opus-4.7/4.8)
-    #[serde(rename = "required")]
-    Required,
+pub enum ConnectedRemoteSessionMetadataKind {
+    /// Remote CLI session.
+    #[serde(rename = "remote-session")]
+    RemoteSession,
+    /// GitHub Copilot coding agent session.
+    #[serde(rename = "coding-agent")]
+    CodingAgent,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Which tier this directory belongs to
+/// Controls how MCP tool result content is filtered: none leaves content unchanged, markdown sanitizes HTML while preserving Markdown-friendly output, and hidden_characters removes characters that can hide directives.
 ///
 /// <div class="warning">
 ///
@@ -23453,20 +28537,23 @@ pub enum AdaptiveThinkingSupport {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentDiscoveryPathScope {
-    /// The user's personal agent configuration directory.
-    #[serde(rename = "user")]
-    User,
-    /// A project's repository agent directory.
-    #[serde(rename = "project")]
-    Project,
+pub enum ContentFilterMode {
+    /// Leave MCP tool result content unchanged.
+    #[serde(rename = "none")]
+    None,
+    /// Sanitize HTML while preserving Markdown-friendly output.
+    #[serde(rename = "markdown")]
+    Markdown,
+    /// Remove characters that can hide directives.
+    #[serde(rename = "hidden_characters")]
+    HiddenCharacters,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Where the agent definition was loaded from
+/// Source category for a collected debug bundle entry.
 ///
 /// <div class="warning">
 ///
@@ -23475,32 +28562,42 @@ pub enum AgentDiscoveryPathScope {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentInfoSource {
-    /// Agent loaded from the user's personal agent configuration.
-    #[serde(rename = "user")]
-    User,
-    /// Agent loaded from the current project's repository configuration.
-    #[serde(rename = "project")]
-    Project,
-    /// Agent inherited from a parent project or workspace.
-    #[serde(rename = "inherited")]
-    Inherited,
-    /// Agent provided by a remote runtime or service.
-    #[serde(rename = "remote")]
-    Remote,
-    /// Agent contributed by an installed plugin.
-    #[serde(rename = "plugin")]
-    Plugin,
-    /// Agent built into the Copilot runtime.
-    #[serde(rename = "builtin")]
-    Builtin,
+pub enum DebugCollectLogsSource {
+    /// Session event log.
+    #[serde(rename = "events")]
+    Events,
+    /// Process log for the session.
+    #[serde(rename = "process-log")]
+    ProcessLog,
+    /// Interactive shell log for the session.
+    #[serde(rename = "shell-log")]
+    ShellLog,
+    /// Caller-provided diagnostic entry.
+    #[serde(rename = "additional")]
+    Additional,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Kind of attention required when status === "attention". Meaningful only when status === "attention".
+/// Destination variant discriminator.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DebugCollectLogsDestinationArchiveKind {
+    #[serde(rename = "archive")]
+    #[default]
+    Archive,
+}
+
+/// Destination variant discriminator.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DebugCollectLogsDestinationDirectoryKind {
+    #[serde(rename = "directory")]
+    #[default]
+    Directory,
+}
+
+/// Destination for the redacted debug bundle.
 ///
 /// <div class="warning">
 ///
@@ -23508,30 +28605,14 @@ pub enum AgentInfoSource {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistryLiveTargetEntryAttentionKind {
-    /// Session is blocked on an unrecoverable error
-    #[serde(rename = "error")]
-    Error,
-    /// Session is waiting for a tool-permission decision
-    #[serde(rename = "permission")]
-    Permission,
-    /// Session is waiting for the user to approve or reject a plan
-    #[serde(rename = "exit_plan")]
-    ExitPlan,
-    /// Session is waiting on an elicitation prompt
-    #[serde(rename = "elicitation")]
-    Elicitation,
-    /// Session is waiting for free-form user input
-    #[serde(rename = "user_input")]
-    UserInput,
-    /// Unknown variant for forward compatibility.
-    #[default]
-    #[serde(other)]
-    Unknown,
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DebugCollectLogsDestination {
+    Archive(DebugCollectLogsDestinationArchive),
+    Directory(DebugCollectLogsDestinationDirectory),
 }
 
-/// Process kind tag for the registry entry
+/// Kind of caller-provided debug log entry.
 ///
 /// <div class="warning">
 ///
@@ -23540,20 +28621,20 @@ pub enum AgentRegistryLiveTargetEntryAttentionKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistryLiveTargetEntryKind {
-    /// Interactive Copilot CLI exposing a UI server (legacy/normal CLI process)
-    #[serde(rename = "ui-server")]
-    UiServer,
-    /// Headless `--server --managed-server` child spawned by a controller
-    #[serde(rename = "managed-server")]
-    ManagedServer,
+pub enum DebugCollectLogsEntryKind {
+    /// Include a single server-local file.
+    #[serde(rename = "file")]
+    File,
+    /// Include files from a server-local directory recursively.
+    #[serde(rename = "directory")]
+    Directory,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.
+/// How a collected debug entry should be redacted before being staged.
 ///
 /// <div class="warning">
 ///
@@ -23562,20 +28643,20 @@ pub enum AgentRegistryLiveTargetEntryKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistryLiveTargetEntryLastTerminalEvent {
-    /// Last turn ended cleanly (model returned a final assistant message)
-    #[serde(rename = "turn_end")]
-    TurnEnd,
-    /// Last turn was aborted (e.g. user interrupted)
-    #[serde(rename = "abort")]
-    Abort,
+pub enum DebugCollectLogsRedaction {
+    /// Redact the file as plain UTF-8 log text.
+    #[serde(rename = "plain-text")]
+    PlainText,
+    /// Redact each non-empty line as a session event JSON object, falling back to plain-text redaction for malformed lines.
+    #[serde(rename = "events-jsonl")]
+    EventsJsonl,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Coarse lifecycle status of the foreground session
+/// Destination kind that was written.
 ///
 /// <div class="warning">
 ///
@@ -23584,26 +28665,20 @@ pub enum AgentRegistryLiveTargetEntryLastTerminalEvent {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistryLiveTargetEntryStatus {
-    /// Session is actively processing a turn
-    #[serde(rename = "working")]
-    Working,
-    /// Session is idle, waiting for input
-    #[serde(rename = "waiting")]
-    Waiting,
-    /// Last turn completed successfully
-    #[serde(rename = "done")]
-    Done,
-    /// Session needs user attention (see attentionKind for the specific reason)
-    #[serde(rename = "attention")]
-    Attention,
+pub enum DebugCollectLogsResultKind {
+    /// A .tgz archive was written.
+    #[serde(rename = "archive")]
+    Archive,
+    /// A directory containing redacted files was written.
+    #[serde(rename = "directory")]
+    Directory,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Categorized reason for log-open failure
+/// Persisted extension discovery source
 ///
 /// <div class="warning">
 ///
@@ -23612,31 +28687,20 @@ pub enum AgentRegistryLiveTargetEntryStatus {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistryLogCaptureOpenErrorReason {
-    /// Filesystem permission denied opening the log file
-    #[serde(rename = "permission")]
-    Permission,
-    /// No space left on device
-    #[serde(rename = "disk_full")]
-    DiskFull,
-    /// Other / uncategorized open failure
-    #[serde(rename = "other")]
-    Other,
+pub enum DiscoveredExtensionSource {
+    /// Extension discovered from the user's extensions directory.
+    #[serde(rename = "user")]
+    User,
+    /// Extension contributed by an installed plugin.
+    #[serde(rename = "plugin")]
+    Plugin,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Discriminator: child_process.spawn itself failed
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistrySpawnErrorKind {
-    #[serde(rename = "spawn-error")]
-    #[default]
-    SpawnError,
-}
-
-/// Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.
+/// Effective extension loading and agent-management mode
 ///
 /// <div class="warning">
 ///
@@ -23645,36 +28709,23 @@ pub enum AgentRegistrySpawnErrorKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistrySpawnPermissionMode {
-    /// Standard permission posture (prompts for each request)
-    #[serde(rename = "default")]
-    Default,
-    /// Full allow-all (requires the controller-local session to currently be in allow-all mode)
-    #[serde(rename = "yolo")]
-    Yolo,
+pub enum DiscoveredExtensionMode {
+    /// Extensions are not loaded.
+    #[serde(rename = "disabled")]
+    Disabled,
+    /// Extensions are loaded, but the agent cannot create, reload, or manage them.
+    #[serde(rename = "load_only")]
+    LoadOnly,
+    /// Extensions are loaded and the agent can create, reload, and manage them.
+    #[serde(rename = "load_and_augment")]
+    LoadAndAugment,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Discriminator: spawn succeeded but child never registered
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistrySpawnRegistryTimeoutKind {
-    #[serde(rename = "registry-timeout")]
-    #[default]
-    RegistryTimeout,
-}
-
-/// Discriminator: managed-server child spawned successfully
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistrySpawnSpawnedKind {
-    #[serde(rename = "spawned")]
-    #[default]
-    Spawned,
-}
-
-/// Which parameter field was invalid. Omitted when the rejection is not field-specific.
+/// Server transport type: stdio, http, sse (deprecated), or memory
 ///
 /// <div class="warning">
 ///
@@ -23683,37 +28734,26 @@ pub enum AgentRegistrySpawnSpawnedKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistrySpawnValidationErrorField {
-    /// The cwd parameter
-    #[serde(rename = "cwd")]
-    Cwd,
-    /// The session name parameter
-    #[serde(rename = "name")]
-    Name,
-    /// The agentName parameter
-    #[serde(rename = "agentName")]
-    AgentName,
-    /// The model parameter
-    #[serde(rename = "model")]
-    Model,
-    /// The permissionMode parameter
-    #[serde(rename = "permissionMode")]
-    PermissionMode,
+pub enum DiscoveredMcpServerType {
+    /// Server communicates over stdio with a local child process.
+    #[serde(rename = "stdio")]
+    Stdio,
+    /// Server communicates over streamable HTTP.
+    #[serde(rename = "http")]
+    Http,
+    /// Server communicates over Server-Sent Events (deprecated).
+    #[serde(rename = "sse")]
+    Sse,
+    /// Server is backed by an in-memory runtime implementation.
+    #[serde(rename = "memory")]
+    Memory,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Discriminator: synchronous pre-validation rejected the request
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistrySpawnValidationErrorKind {
-    #[serde(rename = "validation-error")]
-    #[default]
-    ValidationError,
-}
-
-/// Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.
+/// Agent-scope filter: 'primary' returns only main-agent events plus events whose type starts with 'subagent.' (matching the typed-subscription default behavior); 'all' returns events from all agents (matching wildcard-subscription behavior). Default is 'all' to preserve wildcard semantics for catch-up callers.
 ///
 /// <div class="warning">
 ///
@@ -23722,32 +28762,20 @@ pub enum AgentRegistrySpawnValidationErrorKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentRegistrySpawnValidationErrorReason {
-    /// Provided cwd does not exist on disk
-    #[serde(rename = "cwd-not-found")]
-    CwdNotFound,
-    /// Provided cwd exists but is not a directory
-    #[serde(rename = "cwd-not-directory")]
-    CwdNotDirectory,
-    /// Session name failed validateSessionName
-    #[serde(rename = "invalid-name")]
-    InvalidName,
-    /// Requested agent name was not found in builtin or custom agents
-    #[serde(rename = "unknown-agent")]
-    UnknownAgent,
-    /// Requested model is not available to this session
-    #[serde(rename = "unknown-model")]
-    UnknownModel,
-    /// Caller asked for permissionMode='yolo' but the controller is not currently in allow-all mode
-    #[serde(rename = "yolo-not-allowed")]
-    YoloNotAllowed,
+pub enum EventsAgentScope {
+    /// Return main-agent events and typed subagent lifecycle events.
+    #[serde(rename = "primary")]
+    Primary,
+    /// Return events from all agents.
+    #[serde(rename = "all")]
+    All,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Outcome of an agentRegistry.spawn call.
+/// Direction to page through the session's persisted event history. 'forward' pages from the cursor toward newer events; 'backward' returns the newest window first (tail-first) and pages toward older events. Events within a returned batch are always chronological (oldest-to-newest), even for a backward read.
 ///
 /// <div class="warning">
 ///
@@ -23755,16 +28783,21 @@ pub enum AgentRegistrySpawnValidationErrorReason {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum AgentRegistrySpawnResult {
-    Spawned(AgentRegistrySpawnSpawned),
-    SpawnError(AgentRegistrySpawnError),
-    RegistryTimeout(AgentRegistrySpawnRegistryTimeout),
-    ValidationError(AgentRegistrySpawnValidationError),
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum EventsReadDirection {
+    /// Page from the cursor toward newer events (default).
+    #[serde(rename = "forward")]
+    Forward,
+    /// Tail-first: return the newest events and page toward older events.
+    #[serde(rename = "backward")]
+    Backward,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Current or requested allow-all mode.
+/// Cursor status: 'ok' means the cursor was applied successfully; 'expired' means the cursor referred to an event that no longer exists in history (e.g. truncated or compacted away) and the read fell back to a boundary of the remaining history (the beginning for a forward read, the tail for a backward read). The fallback page is a fresh boundary snapshot, not a continuation of the requested cursor, so it may overlap already-rendered events; on 'expired' a consumer should reset/rebase its pagination state (or deduplicate by event id) before continuing from the returned cursor.
 ///
 /// <div class="warning">
 ///
@@ -23773,31 +28806,20 @@ pub enum AgentRegistrySpawnResult {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum PermissionsAllowAllMode {
-    /// Permission requests follow the normal approval flow.
-    #[serde(rename = "off")]
-    Off,
-    /// Tool, path, and URL permission requests are automatically approved.
-    #[serde(rename = "on")]
-    On,
-    /// Permission requests follow the normal approval flow with an LLM advisory recommendation attached; clients may choose to auto-approve requests the judge evaluated as acceptable.
-    #[serde(rename = "auto")]
-    Auto,
+pub enum EventsCursorStatus {
+    /// The cursor was applied successfully.
+    #[serde(rename = "ok")]
+    Ok,
+    /// The cursor referred to history that is no longer available.
+    #[serde(rename = "expired")]
+    Expired,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// API-key authentication for non-GitHub LLM providers (e.g. when running BYOM-style).
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ApiKeyAuthInfoType {
-    #[serde(rename = "api-key")]
-    #[default]
-    ApiKey,
-}
-
-/// Why the binary data is absent: it exceeded the inline size limit, or its asset was unavailable
+/// Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin (installed plugin), or session (session-state/<id>/extensions/)
 ///
 /// <div class="warning">
 ///
@@ -23806,84 +28828,26 @@ pub enum ApiKeyAuthInfoType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum OmittedBinaryOmittedReason {
-    /// Bytes exceeded the session's inline size limit.
-    #[serde(rename = "too_large")]
-    TooLarge,
-    /// The referenced binary asset could not be found (e.g. a truncated log).
-    #[serde(rename = "asset_unavailable")]
-    AssetUnavailable,
+pub enum ExtensionSource {
+    /// Extension discovered from the current project's .github/extensions directory.
+    #[serde(rename = "project")]
+    Project,
+    /// Extension discovered from the user's ~/.copilot/extensions directory.
+    #[serde(rename = "user")]
+    User,
+    /// Extension contributed by an installed plugin.
+    #[serde(rename = "plugin")]
+    Plugin,
+    /// Extension discovered from the current session's state directory (loaded only for this session).
+    #[serde(rename = "session")]
+    Session,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
-    Unknown,
-}
-
-/// Attachment type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentBlobType {
-    #[serde(rename = "blob")]
-    #[default]
-    Blob,
-}
-
-/// Attachment type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentDirectoryType {
-    #[serde(rename = "directory")]
-    #[default]
-    Directory,
-}
-
-/// Attachment type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentExtensionContextType {
-    #[serde(rename = "extension_context")]
-    #[default]
-    ExtensionContext,
-}
-
-/// Attachment type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentFileType {
-    #[serde(rename = "file")]
-    #[default]
-    File,
-}
-
-/// Attachment type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubActionsJobType {
-    #[serde(rename = "github_actions_job")]
-    #[default]
-    GitHubActionsJob,
-}
-
-/// Attachment type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubCommitType {
-    #[serde(rename = "github_commit")]
-    #[default]
-    GitHubCommit,
-}
-
-/// Attachment type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubFileType {
-    #[serde(rename = "github_file")]
-    #[default]
-    GitHubFile,
-}
-
-/// Attachment type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubFileDiffType {
-    #[serde(rename = "github_file_diff")]
-    #[default]
-    GitHubFileDiff,
+    Unknown,
 }
 
-/// Type of GitHub reference
+/// Current status: running, disabled, failed, or starting
 ///
 /// <div class="warning">
 ///
@@ -23892,16 +28856,19 @@ pub enum AttachmentGitHubFileDiffType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubReferenceType {
-    /// GitHub issue reference.
-    #[serde(rename = "issue")]
-    Issue,
-    /// GitHub pull request reference.
-    #[serde(rename = "pr")]
-    Pr,
-    /// GitHub discussion reference.
-    #[serde(rename = "discussion")]
-    Discussion,
+pub enum ExtensionStatus {
+    /// The extension process is running.
+    #[serde(rename = "running")]
+    Running,
+    /// The extension is installed but disabled.
+    #[serde(rename = "disabled")]
+    Disabled,
+    /// The extension failed to start or crashed.
+    #[serde(rename = "failed")]
+    Failed,
+    /// The extension process is starting.
+    #[serde(rename = "starting")]
+    Starting,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
@@ -23910,53 +28877,59 @@ pub enum AttachmentGitHubReferenceType {
 
 /// Attachment type discriminator
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubReleaseType {
-    #[serde(rename = "github_release")]
-    #[default]
-    GitHubRelease,
-}
-
-/// Attachment type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubRepositoryType {
-    #[serde(rename = "github_repository")]
+pub enum ExtensionContextPushInputType {
+    #[serde(rename = "extension_context")]
     #[default]
-    GitHubRepository,
+    ExtensionContext,
 }
 
-/// Attachment type discriminator
+/// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubSnippetType {
-    #[serde(rename = "github_snippet")]
+pub enum ExternalToolTextResultForLlmBinaryResultsForLlmType {
+    /// Binary image data.
+    #[serde(rename = "image")]
+    Image,
+    /// Other binary resource data.
+    #[serde(rename = "resource")]
+    Resource,
+    /// Unknown variant for forward compatibility.
     #[default]
-    GitHubSnippet,
+    #[serde(other)]
+    Unknown,
 }
 
-/// Attachment type discriminator
+/// Content block type discriminator
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubTreeComparisonType {
-    #[serde(rename = "github_tree_comparison")]
+pub enum ExternalToolTextResultForLlmContentAudioType {
+    #[serde(rename = "audio")]
     #[default]
-    GitHubTreeComparison,
+    Audio,
 }
 
-/// Attachment type discriminator
+/// Content block type discriminator
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentGitHubUrlType {
-    #[serde(rename = "github_url")]
+pub enum ExternalToolTextResultForLlmContentImageType {
+    #[serde(rename = "image")]
     #[default]
-    GitHubUrl,
+    Image,
 }
 
-/// Attachment type discriminator
+/// Content block type discriminator
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AttachmentSelectionType {
-    #[serde(rename = "selection")]
+pub enum ExternalToolTextResultForLlmContentResourceType {
+    #[serde(rename = "resource")]
     #[default]
-    Selection,
+    Resource,
 }
 
-/// Authentication type
+/// Theme variant this icon is intended for
 ///
 /// <div class="warning">
 ///
@@ -23965,35 +28938,52 @@ pub enum AttachmentSelectionType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AuthInfoType {
-    /// Authentication provided by a GitHub App HMAC credential.
-    #[serde(rename = "hmac")]
-    Hmac,
-    /// Authentication resolved from environment-provided credentials.
-    #[serde(rename = "env")]
-    Env,
-    /// Authentication from an interactive user sign-in.
-    #[serde(rename = "user")]
-    User,
-    /// Authentication delegated to the GitHub CLI.
-    #[serde(rename = "gh-cli")]
-    GhCli,
-    /// Authentication from an API key credential.
-    #[serde(rename = "api-key")]
-    ApiKey,
-    /// Authentication from a GitHub token.
-    #[serde(rename = "token")]
-    Token,
-    /// Authentication from a Copilot API token.
-    #[serde(rename = "copilot-api-token")]
-    CopilotApiToken,
+pub enum ExternalToolTextResultForLlmContentResourceLinkIconTheme {
+    /// Icon intended for light themes.
+    #[serde(rename = "light")]
+    Light,
+    /// Icon intended for dark themes.
+    #[serde(rename = "dark")]
+    Dark,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Optional completion hint for the input (e.g. 'directory' for filesystem path completion)
+/// Content block type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ExternalToolTextResultForLlmContentResourceLinkType {
+    #[serde(rename = "resource_link")]
+    #[default]
+    ResourceLink,
+}
+
+/// Content block type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ExternalToolTextResultForLlmContentShellExitType {
+    #[serde(rename = "shell_exit")]
+    #[default]
+    ShellExit,
+}
+
+/// Content block type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ExternalToolTextResultForLlmContentTerminalType {
+    #[serde(rename = "terminal")]
+    #[default]
+    Terminal,
+}
+
+/// Content block type discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ExternalToolTextResultForLlmContentTextType {
+    #[serde(rename = "text")]
+    #[default]
+    Text,
+}
+
+/// Execution-critical factory storage operation.
 ///
 /// <div class="warning">
 ///
@@ -24002,17 +28992,47 @@ pub enum AuthInfoType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum SlashCommandInputCompletion {
-    /// Input should complete filesystem directories.
-    #[serde(rename = "directory")]
-    Directory,
+pub enum FactoryDurableOperation {
+    /// Creating the durable run and declared phases.
+    #[serde(rename = "createRun")]
+    CreateRun,
+    /// Persisting the transition to running.
+    #[serde(rename = "markRunStarted")]
+    MarkRunStarted,
+    /// Persisting the terminal run envelope.
+    #[serde(rename = "finishRun")]
+    FinishRun,
+    /// Persisting subagent admission accounting.
+    #[serde(rename = "reserveAgent")]
+    ReserveAgent,
+    /// Rolling back an uncommitted subagent admission.
+    #[serde(rename = "releaseAgent")]
+    ReleaseAgent,
+    /// Persisting an idempotent model-usage charge.
+    #[serde(rename = "chargeCredit")]
+    ChargeCredit,
+    /// Persisting active execution time.
+    #[serde(rename = "addElapsed")]
+    AddElapsed,
+    /// Reading the authoritative AI-credit total.
+    #[serde(rename = "reconcileCreditTotal")]
+    ReconcileCreditTotal,
+    /// Reading a journal entry without treating storage failure as a cache miss.
+    #[serde(rename = "journalGet")]
+    JournalGet,
+    /// Persisting a journal entry before reporting success.
+    #[serde(rename = "journalPut")]
+    JournalPut,
+    /// Renewing the durable owner lease that proves this process still owns the run.
+    #[serde(rename = "refreshLease")]
+    RefreshLease,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command
+/// Current or terminal state of a factory run.
 ///
 /// <div class="warning">
 ///
@@ -24021,23 +29041,32 @@ pub enum SlashCommandInputCompletion {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum SlashCommandKind {
-    /// Command implemented by the runtime.
-    #[serde(rename = "builtin")]
-    Builtin,
-    /// Command backed by a skill.
-    #[serde(rename = "skill")]
-    Skill,
-    /// Command registered by an SDK client or extension.
-    #[serde(rename = "client")]
-    Client,
+pub enum FactoryRunStatus {
+    /// The run was minted and is awaiting approval.
+    #[serde(rename = "pending")]
+    Pending,
+    /// The run is executing.
+    #[serde(rename = "running")]
+    Running,
+    /// The run completed successfully.
+    #[serde(rename = "completed")]
+    Completed,
+    /// The run was interrupted while resource budget remained.
+    #[serde(rename = "halted")]
+    Halted,
+    /// The run was cancelled before completion.
+    #[serde(rename = "cancelled")]
+    Cancelled,
+    /// The factory body failed or reached a cumulative resource ceiling.
+    #[serde(rename = "error")]
+    Error,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Neutral SDK discriminator for the connected remote session kind.
+/// Kind of factory progress line.
 ///
 /// <div class="warning">
 ///
@@ -24046,20 +29075,20 @@ pub enum SlashCommandKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ConnectedRemoteSessionMetadataKind {
-    /// Remote CLI session.
-    #[serde(rename = "remote-session")]
-    RemoteSession,
-    /// GitHub Copilot coding agent session.
-    #[serde(rename = "coding-agent")]
-    CodingAgent,
+pub enum FactoryLogLineKind {
+    /// A narrator log line.
+    #[serde(rename = "log")]
+    Log,
+    /// A named factory phase marker.
+    #[serde(rename = "phase")]
+    Phase,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Controls how MCP tool result content is filtered: none leaves content unchanged, markdown sanitizes HTML while preserving Markdown-friendly output, and hidden_characters removes characters that can hide directives.
+/// Derived lifecycle state of a factory phase.
 ///
 /// <div class="warning">
 ///
@@ -24068,39 +29097,26 @@ pub enum ConnectedRemoteSessionMetadataKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ContentFilterMode {
-    /// Leave MCP tool result content unchanged.
-    #[serde(rename = "none")]
-    None,
-    /// Sanitize HTML while preserving Markdown-friendly output.
-    #[serde(rename = "markdown")]
-    Markdown,
-    /// Remove characters that can hide directives.
-    #[serde(rename = "hidden_characters")]
-    HiddenCharacters,
+pub enum FactoryPhaseStatus {
+    /// The phase has not been entered yet.
+    #[serde(rename = "pending")]
+    Pending,
+    /// The phase is currently entered and accumulating active time.
+    #[serde(rename = "active")]
+    Active,
+    /// The phase was entered and has since been closed.
+    #[serde(rename = "completed")]
+    Completed,
+    /// The phase was never entered because a later phase was entered or the run reached a terminal state.
+    #[serde(rename = "skipped")]
+    Skipped,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Authentication host (always the public GitHub host).
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum CopilotApiTokenAuthInfoHost {
-    #[serde(rename = "https://github.com")]
-    #[default]
-    HttpsGitHubCom,
-}
-
-/// Direct Copilot API authentication via the `GITHUB_COPILOT_API_TOKEN` + `COPILOT_API_URL` environment-variable pair. The token itself is read from the environment by the runtime, not carried in this struct.
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum CopilotApiTokenAuthInfoType {
-    #[serde(rename = "copilot-api-token")]
-    #[default]
-    CopilotApiToken,
-}
-
-/// Source category for a collected debug bundle entry.
+/// Cumulative resource ceiling that stopped a factory run.
 ///
 /// <div class="warning">
 ///
@@ -24109,40 +29125,54 @@ pub enum CopilotApiTokenAuthInfoType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DebugCollectLogsSource {
-    /// Session event log.
-    #[serde(rename = "events")]
-    Events,
-    /// Process log for the session.
-    #[serde(rename = "process-log")]
-    ProcessLog,
-    /// Interactive shell log for the session.
-    #[serde(rename = "shell-log")]
-    ShellLog,
-    /// Caller-provided diagnostic entry.
-    #[serde(rename = "additional")]
-    Additional,
+pub enum FactoryRunFailureKind {
+    /// The run admitted the approved maximum total number of subagents.
+    #[serde(rename = "maxTotalSubagents")]
+    MaxTotalSubagents,
+    /// The run reached the approved accumulated active-execution time in seconds.
+    #[serde(rename = "timeoutSeconds")]
+    TimeoutSeconds,
+    /// The run's settled subagent model usage exceeded the approved AI-credit ceiling, or no headroom remained for another subagent.
+    #[serde(rename = "maxAiCredits")]
+    MaxAiCredits,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
+/// Why the runtime is requesting a GitHub credential.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DebugCollectLogsDestinationArchiveKind {
-    #[serde(rename = "archive")]
+pub enum GitHubTokenAcquireReason {
+    /// The runtime is acquiring the registration's first credential.
+    #[serde(rename = "initial")]
+    Initial,
+    /// The runtime is replacing a credential that is approaching expiry.
+    #[serde(rename = "refresh")]
+    Refresh,
+    /// Unknown variant for forward compatibility.
     #[default]
-    Archive,
+    #[serde(other)]
+    Unknown,
 }
 
+/// GitHub credential response variant discriminator.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DebugCollectLogsDestinationDirectoryKind {
-    #[serde(rename = "directory")]
+pub enum GitHubTokenAcquireResultTokenKind {
+    #[serde(rename = "token")]
     #[default]
-    Directory,
+    Token,
 }
 
-/// Destination for the redacted debug bundle.
+/// GitHub credential response variant discriminator.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum GitHubTokenAcquireResultCancelledKind {
+    #[serde(rename = "cancelled")]
+    #[default]
+    Cancelled,
+}
+
+/// SDK host response to a GitHub credential request.
 ///
 /// <div class="warning">
 ///
@@ -24152,34 +29182,27 @@ pub enum DebugCollectLogsDestinationDirectoryKind {
 /// </div>
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
-pub enum DebugCollectLogsDestination {
-    Archive(DebugCollectLogsDestinationArchive),
-    Directory(DebugCollectLogsDestinationDirectory),
+pub enum GitHubTokenAcquireResult {
+    Token(GitHubTokenAcquireResultToken),
+    Cancelled(GitHubTokenAcquireResultCancelled),
 }
 
-/// Kind of caller-provided debug log entry.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// What initiated this compaction request, recorded as the `trigger` on the persisted `session.compaction_start` / `session.compaction_complete` events. When absent, the compaction is persisted without trigger attribution (initiator unknown).
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DebugCollectLogsEntryKind {
-    /// Include a single server-local file.
-    #[serde(rename = "file")]
-    File,
-    /// Include files from a server-local directory recursively.
-    #[serde(rename = "directory")]
-    Directory,
+pub enum HistoryCompactRequestTrigger {
+    /// User-requested compaction, e.g. the /compact command or a direct history.compact call.
+    #[serde(rename = "manual")]
+    Manual,
+    /// Compaction requested while switching to a model with a smaller context window.
+    #[serde(rename = "model_switch")]
+    ModelSwitch,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// How a collected debug entry should be redacted before being staged.
+/// Reason a captured file was not restored.
 ///
 /// <div class="warning">
 ///
@@ -24188,20 +29211,20 @@ pub enum DebugCollectLogsEntryKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DebugCollectLogsRedaction {
-    /// Redact the file as plain UTF-8 log text.
-    #[serde(rename = "plain-text")]
-    PlainText,
-    /// Redact each non-empty line as a session event JSON object, falling back to plain-text redaction for malformed lines.
-    #[serde(rename = "events-jsonl")]
-    EventsJsonl,
+pub enum HistoryFileRestoreSkipReason {
+    /// The file changed after Copilot's last captured write.
+    #[serde(rename = "user-modified")]
+    UserModified,
+    /// A faithful preimage was not captured.
+    #[serde(rename = "skipped-capture")]
+    SkippedCapture,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Destination kind that was written.
+/// Reason a rewind read (rewind points, file-restore preview, or session diff) could not be answered from the session's file-change captures.
 ///
 /// <div class="warning">
 ///
@@ -24210,20 +29233,23 @@ pub enum DebugCollectLogsRedaction {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DebugCollectLogsResultKind {
-    /// A .tgz archive was written.
-    #[serde(rename = "archive")]
-    Archive,
-    /// A directory containing redacted files was written.
-    #[serde(rename = "directory")]
-    Directory,
+pub enum HistoryRewindUnavailableReason {
+    /// The session did not opt into file-change tracking before its first turn.
+    #[serde(rename = "file-change-tracking-disabled")]
+    FileChangeTrackingDisabled,
+    /// The session still has work that may mutate files or history. Transient: the same request succeeds once the session settles, so callers should retry rather than treat it as a failure.
+    #[serde(rename = "session-busy")]
+    SessionBusy,
+    /// Remote-backed rewind routing is not supported.
+    #[serde(rename = "unsupported-remote-session")]
+    UnsupportedRemoteSession,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Persisted extension discovery source
+/// Aggregate file change represented by a rewind preview.
 ///
 /// <div class="warning">
 ///
@@ -24232,20 +29258,23 @@ pub enum DebugCollectLogsResultKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DiscoveredExtensionSource {
-    /// Extension discovered from the user's extensions directory.
-    #[serde(rename = "user")]
-    User,
-    /// Extension contributed by an installed plugin.
-    #[serde(rename = "plugin")]
-    Plugin,
+pub enum HistoryRewindChangeType {
+    /// The discarded turns created the file.
+    #[serde(rename = "created")]
+    Created,
+    /// The discarded turns deleted the file.
+    #[serde(rename = "deleted")]
+    Deleted,
+    /// The discarded turns modified the file.
+    #[serde(rename = "modified")]
+    Modified,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Effective extension loading and agent-management mode
+/// Scope of a rewind operation.
 ///
 /// <div class="warning">
 ///
@@ -24254,23 +29283,20 @@ pub enum DiscoveredExtensionSource {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DiscoveredExtensionMode {
-    /// Extensions are not loaded.
-    #[serde(rename = "disabled")]
-    Disabled,
-    /// Extensions are loaded, but the agent cannot create, reload, or manage them.
-    #[serde(rename = "load_only")]
-    LoadOnly,
-    /// Extensions are loaded and the agent can create, reload, and manage them.
-    #[serde(rename = "load_and_augment")]
-    LoadAndAugment,
+pub enum HistoryRewindMode {
+    /// Discard conversation events while leaving files unchanged.
+    #[serde(rename = "conversation")]
+    Conversation,
+    /// Discard conversation events and restore captured files changed by those turns.
+    #[serde(rename = "conversation-and-files")]
+    ConversationAndFiles,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Server transport type: stdio, http, sse (deprecated), or memory
+/// Outcome of a rewind request.
 ///
 /// <div class="warning">
 ///
@@ -24279,56 +29305,125 @@ pub enum DiscoveredExtensionMode {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DiscoveredMcpServerType {
-    /// Server communicates over stdio with a local child process.
-    #[serde(rename = "stdio")]
-    Stdio,
-    /// Server communicates over streamable HTTP.
-    #[serde(rename = "http")]
-    Http,
-    /// Server communicates over Server-Sent Events (deprecated).
-    #[serde(rename = "sse")]
-    Sse,
-    /// Server is backed by an in-memory runtime implementation.
-    #[serde(rename = "memory")]
-    Memory,
+pub enum HistoryRewindOutcome {
+    /// The requested rewind completed; reachable in either mode.
+    #[serde(rename = "success")]
+    Success,
+    /// The session still has work that may mutate files or history; reachable in either mode.
+    #[serde(rename = "session-busy")]
+    SessionBusy,
+    /// A conversation-and-files rewind was requested for a session that did not enable capture; conversation-only rewinds never produce this.
+    #[serde(rename = "file-change-tracking-disabled")]
+    FileChangeTrackingDisabled,
+    /// Remote-backed rewind routing is not supported; reachable in either mode.
+    #[serde(rename = "unsupported-remote-session")]
+    UnsupportedRemoteSession,
+    /// File restore failed and all applied file changes were rolled back; only conversation-and-files rewinds produce this.
+    #[serde(rename = "files-rolled-back")]
+    FilesRolledBack,
+    /// File restore failed and its rollback could not fully restore the pre-rewind state; only conversation-and-files rewinds produce this.
+    #[serde(rename = "rollback-incomplete")]
+    RollbackIncomplete,
+    /// Conversation truncation failed. In conversation-and-files mode any files that were restored are left in place because conversation history cannot be un-truncated; in conversation-only mode no files are restored. Consult restoredFiles for what, if anything, was applied.
+    #[serde(rename = "truncation-failed")]
+    TruncationFailed,
+    /// The conversation was rewound (and, in conversation-and-files mode, captured files were restored), but persisted checkpoints could not be cleaned up; reachable in either mode.
+    #[serde(rename = "checkpoint-cleanup-failed")]
+    CheckpointCleanupFailed,
+    /// Files and conversation were rewound, but obsolete file snapshots could not be removed; only conversation-and-files rewinds produce this.
+    #[serde(rename = "snapshot-prune-failed")]
+    SnapshotPruneFailed,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Hook event name dispatched through the SDK callback transport.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum HookType {
+    /// Runs before a tool is invoked.
+    #[serde(rename = "preToolUse")]
+    PreToolUse,
+    /// Runs before an MCP tool is invoked.
+    #[serde(rename = "preMcpToolCall")]
+    PreMcpToolCall,
+    /// Runs after a tool completes successfully.
+    #[serde(rename = "postToolUse")]
+    PostToolUse,
+    /// Runs after a tool fails.
+    #[serde(rename = "postToolUseFailure")]
+    PostToolUseFailure,
+    /// Runs after the user submits a prompt.
+    #[serde(rename = "userPromptSubmitted")]
+    UserPromptSubmitted,
+    /// Runs after the runtime transforms the submitted prompt for the model, before it is added to session history.
+    #[serde(rename = "userPromptTransformed")]
+    UserPromptTransformed,
+    /// Runs when a session starts.
+    #[serde(rename = "sessionStart")]
+    SessionStart,
+    /// Runs when a session ends.
+    #[serde(rename = "sessionEnd")]
+    SessionEnd,
+    /// Runs after an agent result is produced.
+    #[serde(rename = "postResult")]
+    PostResult,
+    /// Runs before a pull request description is generated.
+    #[serde(rename = "prePRDescription")]
+    PrePRDescription,
+    /// Runs when the agent encounters an error.
+    #[serde(rename = "errorOccurred")]
+    ErrorOccurred,
+    /// Runs when the agent stops.
+    #[serde(rename = "agentStop")]
+    AgentStop,
+    /// Runs when a subagent starts.
+    #[serde(rename = "subagentStart")]
+    SubagentStart,
+    /// Runs when a subagent stops.
+    #[serde(rename = "subagentStop")]
+    SubagentStop,
+    /// Runs before conversation context is compacted.
+    #[serde(rename = "preCompact")]
+    PreCompact,
+    /// Runs when the agent requests permission.
+    #[serde(rename = "permissionRequest")]
+    PermissionRequest,
+    /// Runs when the agent emits a notification.
+    #[serde(rename = "notification")]
+    Notification,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Personal access token (PAT) or server-to-server token sourced from an environment variable.
+/// Constant value. Always "github".
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum EnvAuthInfoType {
-    #[serde(rename = "env")]
+pub enum InstalledPluginSourceGitHubSource {
+    #[serde(rename = "github")]
     #[default]
-    Env,
+    GitHub,
 }
 
-/// Agent-scope filter: 'primary' returns only main-agent events plus events whose type starts with 'subagent.' (matching the typed-subscription default behavior); 'all' returns events from all agents (matching wildcard-subscription behavior). Default is 'all' to preserve wildcard semantics for catch-up callers.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// Constant value. Always "local".
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum EventsAgentScope {
-    /// Return main-agent events and typed subagent lifecycle events.
-    #[serde(rename = "primary")]
-    Primary,
-    /// Return events from all agents.
-    #[serde(rename = "all")]
-    All,
-    /// Unknown variant for forward compatibility.
+pub enum InstalledPluginSourceLocalSource {
+    #[serde(rename = "local")]
     #[default]
-    #[serde(other)]
-    Unknown,
+    Local,
 }
 
-/// Direction to page through the session's persisted event history. 'forward' pages from the cursor toward newer events; 'backward' returns the newest window first (tail-first) and pages toward older events. Events within a returned batch are always chronological (oldest-to-newest), even for a backward read.
+/// Constant value. Always "url".
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum InstalledPluginSourceUrlSource {
+    #[serde(rename = "url")]
+    #[default]
+    Url,
+}
+
+/// Whether the target is a single file or a directory of instruction files
 ///
 /// <div class="warning">
 ///
@@ -24337,20 +29432,20 @@ pub enum EventsAgentScope {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum EventsReadDirection {
-    /// Page from the cursor toward newer events (default).
-    #[serde(rename = "forward")]
-    Forward,
-    /// Tail-first: return the newest events and page toward older events.
-    #[serde(rename = "backward")]
-    Backward,
+pub enum InstructionDiscoveryPathKind {
+    /// The target is a single instruction file.
+    #[serde(rename = "file")]
+    File,
+    /// The target is a directory that holds instruction files.
+    #[serde(rename = "directory")]
+    Directory,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Cursor status: 'ok' means the cursor was applied successfully; 'expired' means the cursor referred to an event that no longer exists in history (e.g. truncated or compacted away) and the read fell back to a boundary of the remaining history (the beginning for a forward read, the tail for a backward read). The fallback page is a fresh boundary snapshot, not a continuation of the requested cursor, so it may overlap already-rendered events; on 'expired' a consumer should reset/rebase its pagination state (or deduplicate by event id) before continuing from the returned cursor.
+/// Which tier this target belongs to
 ///
 /// <div class="warning">
 ///
@@ -24359,20 +29454,26 @@ pub enum EventsReadDirection {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum EventsCursorStatus {
-    /// The cursor was applied successfully.
-    #[serde(rename = "ok")]
-    Ok,
-    /// The cursor referred to history that is no longer available.
-    #[serde(rename = "expired")]
-    Expired,
+pub enum InstructionDiscoveryPathLocation {
+    /// Instructions live in user-level configuration.
+    #[serde(rename = "user")]
+    User,
+    /// Instructions live in repository-level configuration.
+    #[serde(rename = "repository")]
+    Repository,
+    /// Instructions live under the current working directory.
+    #[serde(rename = "working-directory")]
+    WorkingDirectory,
+    /// Instructions live in plugin-provided configuration.
+    #[serde(rename = "plugin")]
+    Plugin,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin (installed plugin), or session (session-state/<id>/extensions/)
+/// Where this source lives — used for UI grouping
 ///
 /// <div class="warning">
 ///
@@ -24381,26 +29482,26 @@ pub enum EventsCursorStatus {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExtensionSource {
-    /// Extension discovered from the current project's .github/extensions directory.
-    #[serde(rename = "project")]
-    Project,
-    /// Extension discovered from the user's ~/.copilot/extensions directory.
+pub enum InstructionSourceLocation {
+    /// Instructions live in user-level configuration.
     #[serde(rename = "user")]
     User,
-    /// Extension contributed by an installed plugin.
+    /// Instructions live in repository-level configuration.
+    #[serde(rename = "repository")]
+    Repository,
+    /// Instructions live under the current working directory.
+    #[serde(rename = "working-directory")]
+    WorkingDirectory,
+    /// Instructions live in plugin-provided configuration.
     #[serde(rename = "plugin")]
     Plugin,
-    /// Extension discovered from the current session's state directory (loaded only for this session).
-    #[serde(rename = "session")]
-    Session,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Current status: running, disabled, failed, or starting
+/// Category of instruction source — used for merge logic
 ///
 /// <div class="warning">
 ///
@@ -24409,34 +29510,50 @@ pub enum ExtensionSource {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExtensionStatus {
-    /// The extension process is running.
-    #[serde(rename = "running")]
-    Running,
-    /// The extension is installed but disabled.
-    #[serde(rename = "disabled")]
-    Disabled,
-    /// The extension failed to start or crashed.
-    #[serde(rename = "failed")]
-    Failed,
-    /// The extension process is starting.
-    #[serde(rename = "starting")]
-    Starting,
+pub enum InstructionSourceType {
+    /// Instructions loaded from the user's home configuration.
+    #[serde(rename = "home")]
+    Home,
+    /// Instructions loaded from repository-scoped files.
+    #[serde(rename = "repo")]
+    Repo,
+    /// Instructions loaded from model-specific files.
+    #[serde(rename = "model")]
+    Model,
+    /// Instructions loaded from VS Code instruction files.
+    #[serde(rename = "vscode")]
+    Vscode,
+    /// Instructions discovered from nested agent files.
+    #[serde(rename = "nested-agents")]
+    NestedAgents,
+    /// Instructions inherited from child instruction files.
+    #[serde(rename = "child-instructions")]
+    ChildInstructions,
+    /// Instructions supplied by an installed plugin.
+    #[serde(rename = "plugin")]
+    Plugin,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Attachment type discriminator
+/// Transport the runtime would otherwise use for this request. `http` (the default when absent) covers plain HTTP and SSE responses; `websocket` indicates a full-duplex message channel where each body chunk maps to one WebSocket message and the `binary` flag distinguishes text from binary frames. The SDK consumer uses this to decide whether to service the request with an HTTP client or a WebSocket client. It is the one piece of request metadata the consumer cannot reliably infer from the URL or headers alone.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExtensionContextPushInputType {
-    #[serde(rename = "extension_context")]
+pub enum LlmInferenceHttpRequestStartTransport {
+    /// Plain HTTP or SSE response. Each body chunk is an opaque byte range; the response is a status line, headers, and a (possibly streamed) body.
+    #[serde(rename = "http")]
+    Http,
+    /// Full-duplex WebSocket channel. Each body chunk maps to exactly one WebSocket message and the `binary` flag distinguishes text from binary frames; request and response chunks flow concurrently.
+    #[serde(rename = "websocket")]
+    Websocket,
+    /// Unknown variant for forward compatibility.
     #[default]
-    ExtensionContext,
+    #[serde(other)]
+    Unknown,
 }
 
-/// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+/// Repository host type
 ///
 /// <div class="warning">
 ///
@@ -24445,44 +29562,20 @@ pub enum ExtensionContextPushInputType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExternalToolTextResultForLlmBinaryResultsForLlmType {
-    /// Binary image data.
-    #[serde(rename = "image")]
-    Image,
-    /// Other binary resource data.
-    #[serde(rename = "resource")]
-    Resource,
+pub enum SessionContextHostType {
+    /// Session repository is hosted on GitHub.
+    #[serde(rename = "github")]
+    GitHub,
+    /// Session repository is hosted on Azure DevOps.
+    #[serde(rename = "ado")]
+    Ado,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Content block type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExternalToolTextResultForLlmContentAudioType {
-    #[serde(rename = "audio")]
-    #[default]
-    Audio,
-}
-
-/// Content block type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExternalToolTextResultForLlmContentImageType {
-    #[serde(rename = "image")]
-    #[default]
-    Image,
-}
-
-/// Content block type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExternalToolTextResultForLlmContentResourceType {
-    #[serde(rename = "resource")]
-    #[default]
-    Resource,
-}
-
-/// Theme variant this icon is intended for
+/// Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".
 ///
 /// <div class="warning">
 ///
@@ -24491,52 +29584,48 @@ pub enum ExternalToolTextResultForLlmContentResourceType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExternalToolTextResultForLlmContentResourceLinkIconTheme {
-    /// Icon intended for light themes.
-    #[serde(rename = "light")]
-    Light,
-    /// Icon intended for dark themes.
-    #[serde(rename = "dark")]
-    Dark,
+pub enum SessionLogLevel {
+    /// Informational message.
+    #[serde(rename = "info")]
+    Info,
+    /// Warning message that may require attention.
+    #[serde(rename = "warning")]
+    Warning,
+    /// Error message describing a failure.
+    #[serde(rename = "error")]
+    Error,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Content block type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExternalToolTextResultForLlmContentResourceLinkType {
-    #[serde(rename = "resource_link")]
-    #[default]
-    ResourceLink,
-}
-
-/// Content block type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExternalToolTextResultForLlmContentShellExitType {
-    #[serde(rename = "shell_exit")]
-    #[default]
-    ShellExit,
-}
-
-/// Content block type discriminator
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExternalToolTextResultForLlmContentTerminalType {
-    #[serde(rename = "terminal")]
-    #[default]
-    Terminal,
-}
-
-/// Content block type discriminator
+/// Allowed values for the `McpAppsHostContextDetailsAvailableDisplayMode` enumeration.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ExternalToolTextResultForLlmContentTextType {
-    #[serde(rename = "text")]
+pub enum McpAppsHostContextDetailsAvailableDisplayMode {
+    /// Rendered inline within the host conversation surface
+    #[serde(rename = "inline")]
+    Inline,
+    /// Rendered as a fullscreen overlay
+    #[serde(rename = "fullscreen")]
+    Fullscreen,
+    /// Rendered as a picture-in-picture floating panel
+    #[serde(rename = "pip")]
+    Pip,
+    /// Unknown variant for forward compatibility.
     #[default]
-    Text,
+    #[serde(other)]
+    Unknown,
 }
 
-/// Execution-critical factory storage operation.
+/// Current display mode (SEP-1865)
 ///
 /// <div class="warning">
 ///
@@ -24545,44 +29634,23 @@ pub enum ExternalToolTextResultForLlmContentTextType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum FactoryDurableOperation {
-    /// Creating the durable run and declared phases.
-    #[serde(rename = "createRun")]
-    CreateRun,
-    /// Persisting the transition to running.
-    #[serde(rename = "markRunStarted")]
-    MarkRunStarted,
-    /// Persisting the terminal run envelope.
-    #[serde(rename = "finishRun")]
-    FinishRun,
-    /// Persisting subagent admission accounting.
-    #[serde(rename = "reserveAgent")]
-    ReserveAgent,
-    /// Rolling back an uncommitted subagent admission.
-    #[serde(rename = "releaseAgent")]
-    ReleaseAgent,
-    /// Persisting an idempotent model-usage charge.
-    #[serde(rename = "chargeCredit")]
-    ChargeCredit,
-    /// Persisting active execution time.
-    #[serde(rename = "addElapsed")]
-    AddElapsed,
-    /// Reading the authoritative AI-credit total.
-    #[serde(rename = "reconcileCreditTotal")]
-    ReconcileCreditTotal,
-    /// Reading a journal entry without treating storage failure as a cache miss.
-    #[serde(rename = "journalGet")]
-    JournalGet,
-    /// Persisting a journal entry before reporting success.
-    #[serde(rename = "journalPut")]
-    JournalPut,
+pub enum McpAppsHostContextDetailsDisplayMode {
+    /// Rendered inline within the host conversation surface
+    #[serde(rename = "inline")]
+    Inline,
+    /// Rendered as a fullscreen overlay
+    #[serde(rename = "fullscreen")]
+    Fullscreen,
+    /// Rendered as a picture-in-picture floating panel
+    #[serde(rename = "pip")]
+    Pip,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Current or terminal state of a factory run.
+/// Platform type for responsive design
 ///
 /// <div class="warning">
 ///
@@ -24591,32 +29659,23 @@ pub enum FactoryDurableOperation {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum FactoryRunStatus {
-    /// The run was minted and is awaiting approval.
-    #[serde(rename = "pending")]
-    Pending,
-    /// The run is executing.
-    #[serde(rename = "running")]
-    Running,
-    /// The run completed successfully.
-    #[serde(rename = "completed")]
-    Completed,
-    /// The run was interrupted while resource budget remained.
-    #[serde(rename = "halted")]
-    Halted,
-    /// The run was cancelled before completion.
-    #[serde(rename = "cancelled")]
-    Cancelled,
-    /// The factory body failed or reached a cumulative resource ceiling.
-    #[serde(rename = "error")]
-    Error,
+pub enum McpAppsHostContextDetailsPlatform {
+    /// Host runs in a web browser
+    #[serde(rename = "web")]
+    Web,
+    /// Host runs as a desktop application
+    #[serde(rename = "desktop")]
+    Desktop,
+    /// Host runs on a mobile device
+    #[serde(rename = "mobile")]
+    Mobile,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Kind of factory progress line.
+/// UI theme preference per SEP-1865
 ///
 /// <div class="warning">
 ///
@@ -24625,20 +29684,20 @@ pub enum FactoryRunStatus {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum FactoryLogLineKind {
-    /// A narrator log line.
-    #[serde(rename = "log")]
-    Log,
-    /// A named factory phase marker.
-    #[serde(rename = "phase")]
-    Phase,
+pub enum McpAppsHostContextDetailsTheme {
+    /// Light UI theme
+    #[serde(rename = "light")]
+    Light,
+    /// Dark UI theme
+    #[serde(rename = "dark")]
+    Dark,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Derived lifecycle state of a factory phase.
+/// Allowed values for the `McpAppsSetHostContextDetailsAvailableDisplayMode` enumeration.
 ///
 /// <div class="warning">
 ///
@@ -24647,26 +29706,23 @@ pub enum FactoryLogLineKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum FactoryPhaseStatus {
-    /// The phase has not been entered yet.
-    #[serde(rename = "pending")]
-    Pending,
-    /// The phase is currently entered and accumulating active time.
-    #[serde(rename = "active")]
-    Active,
-    /// The phase was entered and has since been closed.
-    #[serde(rename = "completed")]
-    Completed,
-    /// The phase was never entered because a later phase was entered or the run reached a terminal state.
-    #[serde(rename = "skipped")]
-    Skipped,
+pub enum McpAppsSetHostContextDetailsAvailableDisplayMode {
+    /// Rendered inline within the host conversation surface
+    #[serde(rename = "inline")]
+    Inline,
+    /// Rendered as a fullscreen overlay
+    #[serde(rename = "fullscreen")]
+    Fullscreen,
+    /// Rendered as a picture-in-picture floating panel
+    #[serde(rename = "pip")]
+    Pip,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Cumulative resource ceiling that stopped a factory run.
+/// Current display mode (SEP-1865)
 ///
 /// <div class="warning">
 ///
@@ -24675,46 +29731,48 @@ pub enum FactoryPhaseStatus {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum FactoryRunFailureKind {
-    /// The run admitted the approved maximum total number of subagents.
-    #[serde(rename = "maxTotalSubagents")]
-    MaxTotalSubagents,
-    /// The run reached the approved accumulated active-execution time in seconds.
-    #[serde(rename = "timeoutSeconds")]
-    TimeoutSeconds,
-    /// The run's settled subagent model usage exceeded the approved AI-credit ceiling, or no headroom remained for another subagent.
-    #[serde(rename = "maxAiCredits")]
-    MaxAiCredits,
+pub enum McpAppsSetHostContextDetailsDisplayMode {
+    /// Rendered inline within the host conversation surface
+    #[serde(rename = "inline")]
+    Inline,
+    /// Rendered as a fullscreen overlay
+    #[serde(rename = "fullscreen")]
+    Fullscreen,
+    /// Rendered as a picture-in-picture floating panel
+    #[serde(rename = "pip")]
+    Pip,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Authentication via the `gh` CLI's saved credentials.
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum GhCliAuthInfoType {
-    #[serde(rename = "gh-cli")]
-    #[default]
-    GhCli,
-}
-
-/// What initiated this compaction request, recorded as the `trigger` on the persisted `session.compaction_start` / `session.compaction_complete` events. When absent, the compaction is persisted without trigger attribution (initiator unknown).
+/// Platform type for responsive design
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HistoryCompactRequestTrigger {
-    /// User-requested compaction, e.g. the /compact command or a direct history.compact call.
-    #[serde(rename = "manual")]
-    Manual,
-    /// Compaction requested while switching to a model with a smaller context window.
-    #[serde(rename = "model_switch")]
-    ModelSwitch,
+pub enum McpAppsSetHostContextDetailsPlatform {
+    /// Host runs in a web browser
+    #[serde(rename = "web")]
+    Web,
+    /// Host runs as a desktop application
+    #[serde(rename = "desktop")]
+    Desktop,
+    /// Host runs on a mobile device
+    #[serde(rename = "mobile")]
+    Mobile,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Reason a captured file was not restored.
+/// UI theme preference per SEP-1865
 ///
 /// <div class="warning">
 ///
@@ -24723,20 +29781,20 @@ pub enum HistoryCompactRequestTrigger {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HistoryFileRestoreSkipReason {
-    /// The file changed after Copilot's last captured write.
-    #[serde(rename = "user-modified")]
-    UserModified,
-    /// A faithful preimage was not captured.
-    #[serde(rename = "skipped-capture")]
-    SkippedCapture,
+pub enum McpAppsSetHostContextDetailsTheme {
+    /// Light UI theme
+    #[serde(rename = "light")]
+    Light,
+    /// Dark UI theme
+    #[serde(rename = "dark")]
+    Dark,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Reason a rewind read (rewind points, file-restore preview, or session diff) could not be answered from the session's file-change captures.
+/// Structured MCP elicitation mode.
 ///
 /// <div class="warning">
 ///
@@ -24745,23 +29803,47 @@ pub enum HistoryFileRestoreSkipReason {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HistoryRewindUnavailableReason {
-    /// The session did not opt into file-change tracking before its first turn.
-    #[serde(rename = "file-change-tracking-disabled")]
-    FileChangeTrackingDisabled,
-    /// The session still has work that may mutate files or history. Transient: the same request succeeds once the session settles, so callers should retry rather than treat it as a failure.
-    #[serde(rename = "session-busy")]
-    SessionBusy,
-    /// Remote-backed rewind routing is not supported.
-    #[serde(rename = "unsupported-remote-session")]
-    UnsupportedRemoteSession,
+pub enum McpElicitationFormMode {
+    #[serde(rename = "form")]
+    Form,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Aggregate file change represented by a rewind preview.
+/// Headers-refresh response variant discriminator.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpHeadersHandlePendingHeadersRefreshRequestHeadersKind {
+    #[serde(rename = "headers")]
+    #[default]
+    Headers,
+}
+
+/// Headers-refresh response variant discriminator.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpHeadersHandlePendingHeadersRefreshRequestNoneKind {
+    #[serde(rename = "none")]
+    #[default]
+    None,
+}
+
+/// Host response: supply dynamic headers or decline this refresh.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum McpHeadersHandlePendingHeadersRefreshRequest {
+    Headers(McpHeadersHandlePendingHeadersRefreshRequestHeaders),
+    None(McpHeadersHandlePendingHeadersRefreshRequestNone),
+}
+
+/// Whether a planned configuration change would create or modify an entry
 ///
 /// <div class="warning">
 ///
@@ -24770,23 +29852,20 @@ pub enum HistoryRewindUnavailableReason {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HistoryRewindChangeType {
-    /// The discarded turns created the file.
-    #[serde(rename = "created")]
-    Created,
-    /// The discarded turns deleted the file.
-    #[serde(rename = "deleted")]
-    Deleted,
-    /// The discarded turns modified the file.
-    #[serde(rename = "modified")]
-    Modified,
+pub enum McpPlanConfigurationOperation {
+    /// Creates a configuration entry that does not exist yet.
+    #[serde(rename = "add")]
+    Add,
+    /// Modifies a configuration entry that already exists.
+    #[serde(rename = "update")]
+    Update,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Scope of a rewind operation.
+/// Configuration scope an MCP install plan targets
 ///
 /// <div class="warning">
 ///
@@ -24794,21 +29873,18 @@ pub enum HistoryRewindChangeType {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HistoryRewindMode {
-    /// Discard conversation events while leaving files unchanged.
-    #[serde(rename = "conversation")]
-    Conversation,
-    /// Discard conversation events and restore captured files changed by those turns.
-    #[serde(rename = "conversation-and-files")]
-    ConversationAndFiles,
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpPlanScope {
+    /// The user's own MCP configuration.
+    #[serde(rename = "user")]
+    User,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Outcome of a rewind request.
+/// What policy decided for a planned server
 ///
 /// <div class="warning">
 ///
@@ -24817,141 +29893,61 @@ pub enum HistoryRewindMode {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HistoryRewindOutcome {
-    /// The requested rewind completed; reachable in either mode.
-    #[serde(rename = "success")]
-    Success,
-    /// The session still has work that may mutate files or history; reachable in either mode.
-    #[serde(rename = "session-busy")]
-    SessionBusy,
-    /// A conversation-and-files rewind was requested for a session that did not enable capture; conversation-only rewinds never produce this.
-    #[serde(rename = "file-change-tracking-disabled")]
-    FileChangeTrackingDisabled,
-    /// Remote-backed rewind routing is not supported; reachable in either mode.
-    #[serde(rename = "unsupported-remote-session")]
-    UnsupportedRemoteSession,
-    /// File restore failed and all applied file changes were rolled back; only conversation-and-files rewinds produce this.
-    #[serde(rename = "files-rolled-back")]
-    FilesRolledBack,
-    /// File restore failed and its rollback could not fully restore the pre-rewind state; only conversation-and-files rewinds produce this.
-    #[serde(rename = "rollback-incomplete")]
-    RollbackIncomplete,
-    /// Conversation truncation failed. In conversation-and-files mode any files that were restored are left in place because conversation history cannot be un-truncated; in conversation-only mode no files are restored. Consult restoredFiles for what, if anything, was applied.
-    #[serde(rename = "truncation-failed")]
-    TruncationFailed,
-    /// The conversation was rewound (and, in conversation-and-files mode, captured files were restored), but persisted checkpoints could not be cleaned up; reachable in either mode.
-    #[serde(rename = "checkpoint-cleanup-failed")]
-    CheckpointCleanupFailed,
-    /// Files and conversation were rewound, but obsolete file snapshots could not be removed; only conversation-and-files rewinds produce this.
-    #[serde(rename = "snapshot-prune-failed")]
-    SnapshotPruneFailed,
+pub enum McpPlanPolicyDecision {
+    /// Policy permits the server.
+    #[serde(rename = "allowed")]
+    Allowed,
+    /// Policy forbids the server, so the plan cannot be applied.
+    #[serde(rename = "blocked")]
+    Blocked,
+    /// Policy permits the server only after an explicit approval.
+    #[serde(rename = "requires-approval")]
+    RequiresApproval,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Authentication host. HMAC auth always targets the public GitHub host.
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HMACAuthInfoHost {
-    #[serde(rename = "https://github.com")]
-    #[default]
-    HttpsGitHubCom,
-}
-
-/// HMAC-based authentication used by GitHub-internal services.
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HMACAuthInfoType {
-    #[serde(rename = "hmac")]
-    #[default]
-    Hmac,
-}
-
-/// Hook event name dispatched through the SDK callback transport.
+/// Consumer allowed to call an MCP tool.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HookType {
-    /// Runs before a tool is invoked.
-    #[serde(rename = "preToolUse")]
-    PreToolUse,
-    /// Runs before an MCP tool is invoked.
-    #[serde(rename = "preMcpToolCall")]
-    PreMcpToolCall,
-    /// Runs after a tool completes successfully.
-    #[serde(rename = "postToolUse")]
-    PostToolUse,
-    /// Runs after a tool fails.
-    #[serde(rename = "postToolUseFailure")]
-    PostToolUseFailure,
-    /// Runs after the user submits a prompt.
-    #[serde(rename = "userPromptSubmitted")]
-    UserPromptSubmitted,
-    /// Runs after the runtime transforms the submitted prompt for the model, before it is added to session history.
-    #[serde(rename = "userPromptTransformed")]
-    UserPromptTransformed,
-    /// Runs when a session starts.
-    #[serde(rename = "sessionStart")]
-    SessionStart,
-    /// Runs when a session ends.
-    #[serde(rename = "sessionEnd")]
-    SessionEnd,
-    /// Runs after an agent result is produced.
-    #[serde(rename = "postResult")]
-    PostResult,
-    /// Runs before a pull request description is generated.
-    #[serde(rename = "prePRDescription")]
-    PrePRDescription,
-    /// Runs when the agent encounters an error.
-    #[serde(rename = "errorOccurred")]
-    ErrorOccurred,
-    /// Runs when the agent stops.
-    #[serde(rename = "agentStop")]
-    AgentStop,
-    /// Runs when a subagent starts.
-    #[serde(rename = "subagentStart")]
-    SubagentStart,
-    /// Runs when a subagent stops.
-    #[serde(rename = "subagentStop")]
-    SubagentStop,
-    /// Runs before conversation context is compacted.
-    #[serde(rename = "preCompact")]
-    PreCompact,
-    /// Runs when the agent requests permission.
-    #[serde(rename = "permissionRequest")]
-    PermissionRequest,
-    /// Runs when the agent emits a notification.
-    #[serde(rename = "notification")]
-    Notification,
+pub enum McpToolUiVisibility {
+    /// The model may call the tool.
+    #[serde(rename = "model")]
+    Model,
+    /// An MCP App view may call the tool.
+    #[serde(rename = "app")]
+    App,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Constant value. Always "github".
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InstalledPluginSourceGitHubSource {
-    #[serde(rename = "github")]
-    #[default]
-    GitHub,
-}
-
-/// Constant value. Always "local".
+/// OAuth response variant discriminator.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InstalledPluginSourceLocalSource {
-    #[serde(rename = "local")]
+pub enum McpOauthPendingRequestResponseTokenKind {
+    #[serde(rename = "token")]
     #[default]
-    Local,
+    Token,
 }
 
-/// Constant value. Always "url".
+/// OAuth response variant discriminator.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InstalledPluginSourceUrlSource {
-    #[serde(rename = "url")]
+pub enum McpOauthPendingRequestResponseCancelledKind {
+    #[serde(rename = "cancelled")]
     #[default]
-    Url,
+    Cancelled,
 }
 
-/// Whether the target is a single file or a directory of instruction files
+/// Host response to the pending OAuth request.
 ///
 /// <div class="warning">
 ///
@@ -24959,21 +29955,14 @@ pub enum InstalledPluginSourceUrlSource {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InstructionDiscoveryPathKind {
-    /// The target is a single instruction file.
-    #[serde(rename = "file")]
-    File,
-    /// The target is a directory that holds instruction files.
-    #[serde(rename = "directory")]
-    Directory,
-    /// Unknown variant for forward compatibility.
-    #[default]
-    #[serde(other)]
-    Unknown,
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum McpOauthPendingRequestResponse {
+    Token(McpOauthPendingRequestResponseToken),
+    Cancelled(McpOauthPendingRequestResponseCancelled),
 }
 
-/// Which tier this target belongs to
+/// OAuth grant type override for this login.
 ///
 /// <div class="warning">
 ///
@@ -24982,26 +29971,20 @@ pub enum InstructionDiscoveryPathKind {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InstructionDiscoveryPathLocation {
-    /// Instructions live in user-level configuration.
-    #[serde(rename = "user")]
-    User,
-    /// Instructions live in repository-level configuration.
-    #[serde(rename = "repository")]
-    Repository,
-    /// Instructions live under the current working directory.
-    #[serde(rename = "working-directory")]
-    WorkingDirectory,
-    /// Instructions live in plugin-provided configuration.
-    #[serde(rename = "plugin")]
-    Plugin,
+pub enum McpOauthLoginGrantType {
+    /// Interactive browser-based OAuth flow using an authorization code, typically with PKCE.
+    #[serde(rename = "authorization_code")]
+    AuthorizationCode,
+    /// Headless OAuth flow where a confidential client authenticates directly with a client secret.
+    #[serde(rename = "client_credentials")]
+    ClientCredentials,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Where this source lives — used for UI grouping
+/// Why a passive MCP OAuth probe determined authentication is needed.
 ///
 /// <div class="warning">
 ///
@@ -25010,26 +29993,55 @@ pub enum InstructionDiscoveryPathLocation {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InstructionSourceLocation {
-    /// Instructions live in user-level configuration.
-    #[serde(rename = "user")]
-    User,
-    /// Instructions live in repository-level configuration.
-    #[serde(rename = "repository")]
-    Repository,
-    /// Instructions live under the current working directory.
-    #[serde(rename = "working-directory")]
-    WorkingDirectory,
-    /// Instructions live in plugin-provided configuration.
-    #[serde(rename = "plugin")]
-    Plugin,
+pub enum McpOauthProbeNeedsAuthReason {
+    /// No token was sent and the server requires authentication.
+    #[serde(rename = "initial")]
+    Initial,
+    /// A cached token was sent and rejected.
+    #[serde(rename = "refresh")]
+    Refresh,
+    /// The server returned a 403 insufficient_scope challenge, indicating additional scopes or audience are needed.
+    #[serde(rename = "upscope")]
+    Upscope,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Category of instruction source — used for merge logic
+/// Probe outcome variant discriminator.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpOauthProbeResultNoAuthRequiredStatus {
+    #[serde(rename = "no-auth-required")]
+    #[default]
+    NoAuthRequired,
+}
+
+/// Probe outcome variant discriminator.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpOauthProbeResultAuthenticatedStatus {
+    #[serde(rename = "authenticated")]
+    #[default]
+    Authenticated,
+}
+
+/// Probe outcome variant discriminator.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpOauthProbeResultNeedsAuthStatus {
+    #[serde(rename = "needs-auth")]
+    #[default]
+    NeedsAuth,
+}
+
+/// Probe outcome variant discriminator.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpOauthProbeResultFailedStatus {
+    #[serde(rename = "failed")]
+    #[default]
+    Failed,
+}
+
+/// Passive MCP OAuth probe result. `authenticated` means the server accepted the probe request while an OAuth-origin access token was attached; it does not prove the server required or independently validated that token. The probe does not make a second unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are reserved for API-call failures.
 ///
 /// <div class="warning">
 ///
@@ -25037,51 +30049,43 @@ pub enum InstructionSourceLocation {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InstructionSourceType {
-    /// Instructions loaded from the user's home configuration.
-    #[serde(rename = "home")]
-    Home,
-    /// Instructions loaded from repository-scoped files.
-    #[serde(rename = "repo")]
-    Repo,
-    /// Instructions loaded from model-specific files.
-    #[serde(rename = "model")]
-    Model,
-    /// Instructions loaded from VS Code instruction files.
-    #[serde(rename = "vscode")]
-    Vscode,
-    /// Instructions discovered from nested agent files.
-    #[serde(rename = "nested-agents")]
-    NestedAgents,
-    /// Instructions inherited from child instruction files.
-    #[serde(rename = "child-instructions")]
-    ChildInstructions,
-    /// Instructions supplied by an installed plugin.
-    #[serde(rename = "plugin")]
-    Plugin,
-    /// Unknown variant for forward compatibility.
-    #[default]
-    #[serde(other)]
-    Unknown,
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum McpOauthProbeResult {
+    NoAuthRequired(McpOauthProbeResultNoAuthRequired),
+    Authenticated(McpOauthProbeResultAuthenticated),
+    NeedsAuth(McpOauthProbeResultNeedsAuth),
+    Failed(McpOauthProbeResultFailed),
 }
 
-/// Transport the runtime would otherwise use for this request. `http` (the default when absent) covers plain HTTP and SSE responses; `websocket` indicates a full-duplex message channel where each body chunk maps to one WebSocket message and the `binary` flag distinguishes text from binary frames. The SDK consumer uses this to decide whether to service the request with an HTTP client or a WebSocket client. It is the one piece of request metadata the consumer cannot reliably infer from the URL or headers alone.
+/// Discriminator for an enumerated required value
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum LlmInferenceHttpRequestStartTransport {
-    /// Plain HTTP or SSE response. Each body chunk is an opaque byte range; the response is a status line, headers, and a (possibly streamed) body.
-    #[serde(rename = "http")]
-    Http,
-    /// Full-duplex WebSocket channel. Each body chunk maps to exactly one WebSocket message and the `binary` flag distinguishes text from binary frames; request and response chunks flow concurrently.
-    #[serde(rename = "websocket")]
-    Websocket,
+pub enum McpPlanEnumValueType {
+    /// One of a fixed, non-empty set of permitted values.
+    #[serde(rename = "enum")]
+    Enum,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Repository host type
+/// Discriminator: a plan was computed and nothing was changed
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpPlanInstallPlannedKind {
+    #[serde(rename = "planned")]
+    #[default]
+    Planned,
+}
+
+/// Discriminator for a candidate-backed install-plan source
 ///
 /// <div class="warning">
 ///
@@ -25090,20 +30094,17 @@ pub enum LlmInferenceHttpRequestStartTransport {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum SessionContextHostType {
-    /// Session repository is hosted on GitHub.
-    #[serde(rename = "github")]
-    GitHub,
-    /// Session repository is hosted on Azure DevOps.
-    #[serde(rename = "ado")]
-    Ado,
+pub enum McpPlanInstallSourceCandidateKind {
+    /// Plan from a candidate returned by catalog search.
+    #[serde(rename = "candidate")]
+    Candidate,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".
+/// Discriminator for a URL-backed MCP server card
 ///
 /// <div class="warning">
 ///
@@ -25112,23 +30113,17 @@ pub enum SessionContextHostType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum SessionLogLevel {
-    /// Informational message.
-    #[serde(rename = "info")]
-    Info,
-    /// Warning message that may require attention.
-    #[serde(rename = "warning")]
-    Warning,
-    /// Error message describing a failure.
-    #[serde(rename = "error")]
-    Error,
+pub enum McpServerCardUrlKind {
+    /// Retrieve the card from its URL.
+    #[serde(rename = "url")]
+    Url,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Allowed values for the `McpAppsHostContextDetailsAvailableDisplayMode` enumeration.
+/// Discriminator for an embedded MCP server card
 ///
 /// <div class="warning">
 ///
@@ -25137,23 +30132,17 @@ pub enum SessionLogLevel {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpAppsHostContextDetailsAvailableDisplayMode {
-    /// Rendered inline within the host conversation surface
-    #[serde(rename = "inline")]
-    Inline,
-    /// Rendered as a fullscreen overlay
-    #[serde(rename = "fullscreen")]
-    Fullscreen,
-    /// Rendered as a picture-in-picture floating panel
-    #[serde(rename = "pip")]
-    Pip,
+pub enum McpServerCardEmbeddedKind {
+    /// Use the embedded card document.
+    #[serde(rename = "embedded")]
+    Embedded,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Current display mode (SEP-1865)
+/// A card supplied directly by the caller. Exactly one of a URL or embedded data, encoded structurally so neither both nor neither can be expressed.
 ///
 /// <div class="warning">
 ///
@@ -25161,24 +30150,14 @@ pub enum McpAppsHostContextDetailsAvailableDisplayMode {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpAppsHostContextDetailsDisplayMode {
-    /// Rendered inline within the host conversation surface
-    #[serde(rename = "inline")]
-    Inline,
-    /// Rendered as a fullscreen overlay
-    #[serde(rename = "fullscreen")]
-    Fullscreen,
-    /// Rendered as a picture-in-picture floating panel
-    #[serde(rename = "pip")]
-    Pip,
-    /// Unknown variant for forward compatibility.
-    #[default]
-    #[serde(other)]
-    Unknown,
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum McpServerCardReference {
+    Url(McpServerCardUrl),
+    Embedded(McpServerCardEmbedded),
 }
 
-/// Platform type for responsive design
+/// Discriminator for a caller-supplied-card install-plan source
 ///
 /// <div class="warning">
 ///
@@ -25187,23 +30166,17 @@ pub enum McpAppsHostContextDetailsDisplayMode {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpAppsHostContextDetailsPlatform {
-    /// Host runs in a web browser
-    #[serde(rename = "web")]
-    Web,
-    /// Host runs as a desktop application
-    #[serde(rename = "desktop")]
-    Desktop,
-    /// Host runs on a mobile device
-    #[serde(rename = "mobile")]
-    Mobile,
+pub enum McpPlanInstallSourceCardKind {
+    /// Plan directly from a caller-supplied card.
+    #[serde(rename = "card")]
+    Card,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// UI theme preference per SEP-1865
+/// What an install plan is computed from: a candidate handle from a previous search, or a card supplied directly.
 ///
 /// <div class="warning">
 ///
@@ -25211,21 +30184,40 @@ pub enum McpAppsHostContextDetailsPlatform {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpAppsHostContextDetailsTheme {
-    /// Light UI theme
-    #[serde(rename = "light")]
-    Light,
-    /// Dark UI theme
-    #[serde(rename = "dark")]
-    Dark,
-    /// Unknown variant for forward compatibility.
-    #[default]
-    #[serde(other)]
-    Unknown,
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum McpPlanInstallSource {
+    Candidate(McpPlanInstallSourceCandidate),
+    Card(McpPlanInstallSourceCard),
 }
 
-/// Allowed values for the `McpAppsSetHostContextDetailsAvailableDisplayMode` enumeration.
+/// Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum McpPlanInstallResult {
+    Planned(McpPlanInstallPlanned),
+    NegotiationRefused(CatalogNegotiationRefusedError),
+    HandleRejected(CatalogHandleRejectedError),
+    InvalidRequest(CatalogInvalidRequestError),
+    AuthenticationRequired(CatalogAuthenticationRequiredError),
+    PolicyRejected(CatalogPolicyRejectedError),
+    NetworkFailure(CatalogNetworkFailureError),
+    UnsafeRetrieval(CatalogUnsafeRetrievalError),
+    MalformedCard(CatalogMalformedCardError),
+    ContractViolation(CatalogContractViolationError),
+    UnavailableTransport(CatalogUnavailableTransportError),
+    NotInstallable(CatalogNotInstallableError),
+    Unavailable(CatalogUnavailableError),
+}
+
+/// Discriminator for a package-backed transport choice
 ///
 /// <div class="warning">
 ///
@@ -25234,23 +30226,17 @@ pub enum McpAppsHostContextDetailsTheme {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpAppsSetHostContextDetailsAvailableDisplayMode {
-    /// Rendered inline within the host conversation surface
-    #[serde(rename = "inline")]
-    Inline,
-    /// Rendered as a fullscreen overlay
-    #[serde(rename = "fullscreen")]
-    Fullscreen,
-    /// Rendered as a picture-in-picture floating panel
-    #[serde(rename = "pip")]
-    Pip,
+pub enum McpPlanPackageInstallMethod {
+    /// Install and run a local package.
+    #[serde(rename = "package")]
+    Package,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Current display mode (SEP-1865)
+/// Transport exposed by a locally launched package
 ///
 /// <div class="warning">
 ///
@@ -25259,23 +30245,17 @@ pub enum McpAppsSetHostContextDetailsAvailableDisplayMode {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpAppsSetHostContextDetailsDisplayMode {
-    /// Rendered inline within the host conversation surface
-    #[serde(rename = "inline")]
-    Inline,
-    /// Rendered as a fullscreen overlay
-    #[serde(rename = "fullscreen")]
-    Fullscreen,
-    /// Rendered as a picture-in-picture floating panel
-    #[serde(rename = "pip")]
-    Pip,
+pub enum McpPlanPackageTransport {
+    /// A locally launched process spoken to over standard input and output.
+    #[serde(rename = "stdio")]
+    Stdio,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Platform type for responsive design
+/// Discriminator for a remote-endpoint transport choice
 ///
 /// <div class="warning">
 ///
@@ -25284,23 +30264,17 @@ pub enum McpAppsSetHostContextDetailsDisplayMode {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpAppsSetHostContextDetailsPlatform {
-    /// Host runs in a web browser
-    #[serde(rename = "web")]
-    Web,
-    /// Host runs as a desktop application
-    #[serde(rename = "desktop")]
-    Desktop,
-    /// Host runs on a mobile device
-    #[serde(rename = "mobile")]
-    Mobile,
+pub enum McpPlanRemoteInstallMethod {
+    /// Connect to a remote endpoint.
+    #[serde(rename = "remote")]
+    Remote,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// UI theme preference per SEP-1865
+/// Transport exposed by a remote endpoint
 ///
 /// <div class="warning">
 ///
@@ -25309,34 +30283,23 @@ pub enum McpAppsSetHostContextDetailsPlatform {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpAppsSetHostContextDetailsTheme {
-    /// Light UI theme
-    #[serde(rename = "light")]
-    Light,
-    /// Dark UI theme
-    #[serde(rename = "dark")]
-    Dark,
+pub enum McpPlanRemoteTransport {
+    /// An HTTP endpoint.
+    #[serde(rename = "http")]
+    Http,
+    /// A streamable HTTP endpoint.
+    #[serde(rename = "streamable-http")]
+    StreamableHttp,
+    /// A server-sent events endpoint.
+    #[serde(rename = "sse")]
+    Sse,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpHeadersHandlePendingHeadersRefreshRequestHeadersKind {
-    #[serde(rename = "headers")]
-    #[default]
-    Headers,
-}
-
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpHeadersHandlePendingHeadersRefreshRequestNoneKind {
-    #[serde(rename = "none")]
-    #[default]
-    None,
-}
-
-/// Host response: supply dynamic headers or decline this refresh.
+/// Where a required value is applied when the planned server is launched
 ///
 /// <div class="warning">
 ///
@@ -25344,14 +30307,30 @@ pub enum McpHeadersHandlePendingHeadersRefreshRequestNoneKind {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum McpHeadersHandlePendingHeadersRefreshRequest {
-    Headers(McpHeadersHandlePendingHeadersRefreshRequestHeaders),
-    None(McpHeadersHandlePendingHeadersRefreshRequestNone),
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpPlanValueCategory {
+    /// Set as an environment variable on the launched process.
+    #[serde(rename = "environment-variable")]
+    EnvironmentVariable,
+    /// Passed to the runtime that launches the package.
+    #[serde(rename = "runtime-argument")]
+    RuntimeArgument,
+    /// Passed to the packaged server itself.
+    #[serde(rename = "package-argument")]
+    PackageArgument,
+    /// Sent as a request header to a remote endpoint.
+    #[serde(rename = "header")]
+    Header,
+    /// Substituted into the remote endpoint URL.
+    #[serde(rename = "url-variable")]
+    UrlVariable,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// Consumer allowed to call an MCP tool.
+/// Discriminator for a scalar required value
 ///
 /// <div class="warning">
 ///
@@ -25360,34 +30339,17 @@ pub enum McpHeadersHandlePendingHeadersRefreshRequest {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpToolUiVisibility {
-    /// The model may call the tool.
-    #[serde(rename = "model")]
-    Model,
-    /// An MCP App view may call the tool.
-    #[serde(rename = "app")]
-    App,
+pub enum McpPlanRequiredValueScalarKind {
+    /// The value uses one scalar type.
+    #[serde(rename = "scalar")]
+    Scalar,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpOauthPendingRequestResponseTokenKind {
-    #[serde(rename = "token")]
-    #[default]
-    Token,
-}
-
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpOauthPendingRequestResponseCancelledKind {
-    #[serde(rename = "cancelled")]
-    #[default]
-    Cancelled,
-}
-
-/// Host response to the pending OAuth request.
+/// Scalar type a required value must conform to
 ///
 /// <div class="warning">
 ///
@@ -25395,14 +30357,27 @@ pub enum McpOauthPendingRequestResponseCancelledKind {
 /// and may change or be removed in future SDK or CLI releases.
 ///
 /// </div>
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum McpOauthPendingRequestResponse {
-    Token(McpOauthPendingRequestResponseToken),
-    Cancelled(McpOauthPendingRequestResponseCancelled),
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpPlanScalarValueType {
+    /// Free text.
+    #[serde(rename = "string")]
+    String,
+    /// A number.
+    #[serde(rename = "number")]
+    Number,
+    /// A boolean.
+    #[serde(rename = "boolean")]
+    Boolean,
+    /// A filesystem path.
+    #[serde(rename = "path")]
+    Path,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
 }
 
-/// OAuth grant type override for this login.
+/// Discriminator for an enumerated required value
 ///
 /// <div class="warning">
 ///
@@ -25411,19 +30386,31 @@ pub enum McpOauthPendingRequestResponse {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpOauthLoginGrantType {
-    /// Interactive browser-based OAuth flow using an authorization code, typically with PKCE.
-    #[serde(rename = "authorization_code")]
-    AuthorizationCode,
-    /// Headless OAuth flow where a confidential client authenticates directly with a client secret.
-    #[serde(rename = "client_credentials")]
-    ClientCredentials,
+pub enum McpPlanRequiredValueEnumKind {
+    /// The value uses a fixed non-empty enumeration.
+    #[serde(rename = "enum")]
+    Enum,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
+/// One non-secret value a transport choice needs, represented as a scalar or enumerated variant so enum values cannot be missing or attached to another type.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum McpPlanRequiredValue {
+    Scalar(McpPlanRequiredValueScalar),
+    Enum(McpPlanRequiredValueEnum),
+}
+
 /// Outcome of the sampling inference. 'success' produced a response; 'failure' encountered an error (including agent-side rejection by content filter or criteria); 'cancelled' the caller cancelled this execution via cancelSamplingExecution.
 ///
 /// <div class="warning">
@@ -25471,7 +30458,51 @@ pub enum McpServerConfigDeferTools {
     Unknown,
 }
 
-/// OAuth grant type to use when authenticating to the remote MCP server.
+/// OAuth grant type to use when authenticating to the remote MCP server.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpServerConfigHttpOauthGrantType {
+    /// Interactive browser-based authorization code flow with PKCE.
+    #[serde(rename = "authorization_code")]
+    AuthorizationCode,
+    /// Headless client credentials flow using the configured OAuth client.
+    #[serde(rename = "client_credentials")]
+    ClientCredentials,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Remote transport type. Defaults to "http" when omitted.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum McpServerConfigHttpType {
+    /// Streamable HTTP transport.
+    #[serde(rename = "http")]
+    Http,
+    /// Server-Sent Events transport.
+    #[serde(rename = "sse")]
+    Sse,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// In-process MCP transport type.
 ///
 /// <div class="warning">
 ///
@@ -25480,20 +30511,16 @@ pub enum McpServerConfigDeferTools {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpServerConfigHttpOauthGrantType {
-    /// Interactive browser-based authorization code flow with PKCE.
-    #[serde(rename = "authorization_code")]
-    AuthorizationCode,
-    /// Headless client credentials flow using the configured OAuth client.
-    #[serde(rename = "client_credentials")]
-    ClientCredentials,
+pub enum McpServerConfigMemoryType {
+    #[serde(rename = "memory")]
+    Memory,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Remote transport type. Defaults to "http" when omitted.
+/// Local MCP transport type.
 ///
 /// <div class="warning">
 ///
@@ -25502,13 +30529,13 @@ pub enum McpServerConfigHttpOauthGrantType {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum McpServerConfigHttpType {
-    /// Streamable HTTP transport.
-    #[serde(rename = "http")]
-    Http,
-    /// Server-Sent Events transport.
-    #[serde(rename = "sse")]
-    Sse,
+pub enum McpServerConfigStdioType {
+    /// Legacy alias for the local stdio transport.
+    #[serde(rename = "local")]
+    Local,
+    /// Server communicates over stdio with a local child process.
+    #[serde(rename = "stdio")]
+    Stdio,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
@@ -25954,6 +30981,14 @@ pub enum PermissionDecisionApproveForSessionApprovalExtensionPermissionAccessKin
     ExtensionPermissionAccess,
 }
 
+/// Approval covering an extension's request to read sensitive environment variables.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionDecisionApproveForSessionApprovalExtensionEnvAccessKind {
+    #[serde(rename = "extension-env-access")]
+    #[default]
+    ExtensionEnvAccess,
+}
+
 /// Session-scoped approval to remember (tool prompts only; omitted for path/url prompts)
 ///
 /// <div class="warning">
@@ -25975,6 +31010,7 @@ pub enum PermissionDecisionApproveForSessionApproval {
     ExtensionManagement(PermissionDecisionApproveForSessionApprovalExtensionManagement),
     Factory(PermissionDecisionApproveForSessionApprovalFactory),
     ExtensionPermissionAccess(PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess),
+    ExtensionEnvAccess(PermissionDecisionApproveForSessionApprovalExtensionEnvAccess),
 }
 
 /// Approve and remember for the rest of the session
@@ -26065,6 +31101,14 @@ pub enum PermissionDecisionApproveForLocationApprovalExtensionPermissionAccessKi
     ExtensionPermissionAccess,
 }
 
+/// Approval covering an extension's request to read sensitive environment variables.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionDecisionApproveForLocationApprovalExtensionEnvAccessKind {
+    #[serde(rename = "extension-env-access")]
+    #[default]
+    ExtensionEnvAccess,
+}
+
 /// Approval to persist for this location
 ///
 /// <div class="warning">
@@ -26088,6 +31132,7 @@ pub enum PermissionDecisionApproveForLocationApproval {
     ExtensionPermissionAccess(
         PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess,
     ),
+    ExtensionEnvAccess(PermissionDecisionApproveForLocationApprovalExtensionEnvAccess),
 }
 
 /// Approve and persist for this project location
@@ -26224,6 +31269,115 @@ pub enum PermissionDecision {
     DeniedByPermissionRequestHook(PermissionDecisionDeniedByPermissionRequestHook),
 }
 
+/// Disposition of a permission request as observed by the responding client.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionDecisionOutcome {
+    /// The request was approved automatically without a new human decision.
+    #[serde(rename = "auto_approved")]
+    AutoApproved,
+    /// The request was denied without an interactive user decision; source records why.
+    #[serde(rename = "autopilot_denied")]
+    AutopilotDenied,
+    /// The response came from an interactive user prompt.
+    #[serde(rename = "prompted_user")]
+    PromptedUser,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Response capability available to the client when it settled a permission request.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionResponseCapability {
+    /// The client could ask a user for this decision.
+    #[serde(rename = "interactive")]
+    Interactive,
+    /// The client could return an automated response but could not ask a user.
+    #[serde(rename = "headless")]
+    Headless,
+    /// The client had no response path available.
+    #[serde(rename = "none")]
+    None,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Controlled reason or actor responsible for a permission response.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionDecisionSource {
+    /// The response followed the assisted-approval judge recommendation.
+    #[serde(rename = "assisted_approval")]
+    AssistedApproval,
+    /// A human supplied the response through an interactive prompt.
+    #[serde(rename = "human_response")]
+    HumanResponse,
+    /// The host applied a standing policy or override rather than a judge recommendation or human decision.
+    #[serde(rename = "host_policy")]
+    HostPolicy,
+    /// The host denied the request because no interactive user response was available.
+    #[serde(rename = "unattended_fallback")]
+    UnattendedFallback,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Client surface that submitted a permission response.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionDecisionSurface {
+    /// The interactive Copilot CLI terminal UI.
+    #[serde(rename = "tui")]
+    Tui,
+    /// The non-interactive Copilot CLI prompt mode.
+    #[serde(rename = "prompt_mode")]
+    PromptMode,
+    /// The Copilot App client.
+    #[serde(rename = "copilot_app")]
+    CopilotApp,
+    /// An Agent Client Protocol host.
+    #[serde(rename = "acp")]
+    Acp,
+    /// A generic Copilot SDK client.
+    #[serde(rename = "sdk")]
+    Sdk,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Approval scoped to specific command identifiers.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum PermissionsLocationsAddToolApprovalDetailsCommandsKind {
@@ -26304,6 +31458,14 @@ pub enum PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccessKind
     ExtensionPermissionAccess,
 }
 
+/// Approval covering an extension's request to read sensitive environment variables.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccessKind {
+    #[serde(rename = "extension-env-access")]
+    #[default]
+    ExtensionEnvAccess,
+}
+
 /// Tool approval to persist and apply
 ///
 /// <div class="warning">
@@ -26325,6 +31487,7 @@ pub enum PermissionsLocationsAddToolApprovalDetails {
     ExtensionManagement(PermissionsLocationsAddToolApprovalDetailsExtensionManagement),
     Factory(PermissionsLocationsAddToolApprovalDetailsFactory),
     ExtensionPermissionAccess(PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess),
+    ExtensionEnvAccess(PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess),
 }
 
 /// Whether the location is a git repo or directory
@@ -26349,6 +31512,37 @@ pub enum PermissionLocationType {
     Unknown,
 }
 
+/// Optional source for permission-mode telemetry. Defaults to `rpc` when omitted for SDK callers.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionModeSource {
+    /// The mode was set from a CLI command-line flag.
+    #[serde(rename = "cli_flag")]
+    CliFlag,
+    /// The mode was set by a slash command.
+    #[serde(rename = "slash_command")]
+    SlashCommand,
+    /// The mode was set by confirming autopilot behavior.
+    #[serde(rename = "autopilot_confirmation")]
+    AutopilotConfirmation,
+    /// The mode was set at startup by the `defaultPermissionMode` user setting.
+    #[serde(rename = "user_setting")]
+    UserSetting,
+    /// The mode was set through an RPC caller.
+    #[serde(rename = "rpc")]
+    Rpc,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope` enumeration.
 ///
 /// <div class="warning">
@@ -26402,7 +31596,7 @@ pub enum PermissionsModifyRulesScope {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum PermissionsSetAllowAllSource {
+pub enum PermissionsSetApproveAllSource {
     /// Allow-all was enabled from a CLI command-line flag.
     #[serde(rename = "cli_flag")]
     CliFlag,
@@ -26412,6 +31606,9 @@ pub enum PermissionsSetAllowAllSource {
     /// Allow-all was enabled by confirming autopilot behavior.
     #[serde(rename = "autopilot_confirmation")]
     AutopilotConfirmation,
+    /// Allow-all was enabled at startup by the `defaultPermissionMode` user setting.
+    #[serde(rename = "user_setting")]
+    UserSetting,
     /// Allow-all was enabled through an RPC caller.
     #[serde(rename = "rpc")]
     Rpc,
@@ -26421,7 +31618,7 @@ pub enum PermissionsSetAllowAllSource {
     Unknown,
 }
 
-/// Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.
+/// Controls whether the runtime may defer loading an external tool definition.
 ///
 /// <div class="warning">
 ///
@@ -26430,19 +31627,13 @@ pub enum PermissionsSetAllowAllSource {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum PermissionsSetApproveAllSource {
-    /// Allow-all was enabled from a CLI command-line flag.
-    #[serde(rename = "cli_flag")]
-    CliFlag,
-    /// Allow-all was enabled by a slash command.
-    #[serde(rename = "slash_command")]
-    SlashCommand,
-    /// Allow-all was enabled by confirming autopilot behavior.
-    #[serde(rename = "autopilot_confirmation")]
-    AutopilotConfirmation,
-    /// Allow-all was enabled through an RPC caller.
-    #[serde(rename = "rpc")]
-    Rpc,
+pub enum ProtocolExternalToolDefer {
+    /// The runtime may defer the tool according to its tool-loading policy.
+    #[serde(rename = "auto")]
+    Auto,
+    /// The runtime must include the tool without deferring it.
+    #[serde(rename = "never")]
+    Never,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
@@ -26776,6 +31967,34 @@ pub enum RemoteSessionMode {
     Unknown,
 }
 
+/// What a remote host says one of its sessions is doing right now. Deliberately coarse: this is what a host can report for EVERY session in a catalogue listing, without a client subscribing to each one. AHP's `SessionSummary.status` is the source today; `input-needed` covers both a permission prompt and an `ask_user` question, since the summary does not say which.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum RemoteSessionHostStatus {
+    /// No turn is running.
+    #[serde(rename = "idle")]
+    Idle,
+    /// A turn is running.
+    #[serde(rename = "working")]
+    Working,
+    /// The session is blocked on the user: a permission prompt or an `ask_user` question.
+    #[serde(rename = "input-needed")]
+    InputNeeded,
+    /// The session ended its last turn in an error.
+    #[serde(rename = "error")]
+    Error,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Whether the remote task originated from CCA or CLI `--remote`.
 ///
 /// <div class="warning">
@@ -26798,6 +32017,43 @@ pub enum RemoteSessionMetadataTaskType {
     Unknown,
 }
 
+/// Origin of the sandbox choice supplied by an internal client.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SandboxConfigSource {
+    /// The client applied the default because no sandbox preference was configured.
+    #[serde(rename = "never_configured")]
+    NeverConfigured,
+    /// The user's persisted settings enabled the sandbox.
+    #[serde(rename = "user_enabled")]
+    UserEnabled,
+    /// The user's persisted settings disabled the sandbox.
+    #[serde(rename = "user_disabled")]
+    UserDisabled,
+    /// A command-line flag selected the sandbox state for this session.
+    #[serde(rename = "session_flag")]
+    SessionFlag,
+    /// The user disabled the sandbox for the current session.
+    #[serde(rename = "session_disabled")]
+    SessionDisabled,
+    /// The client disabled the sandbox because the host cannot enforce it.
+    #[serde(rename = "unsupported_host")]
+    UnsupportedHost,
+    /// A repository policy selected the sandbox state.
+    #[serde(rename = "repository_policy")]
+    RepositoryPolicy,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Session capability enabled for this session
 ///
 /// <div class="warning">
@@ -27060,6 +32316,7 @@ pub enum SessionLimitPredictionSource {
     Unknown,
 }
 
+/// Prediction result variant discriminator.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum SessionLimitPredictionResultAvailableKind {
     #[serde(rename = "available")]
@@ -27067,6 +32324,7 @@ pub enum SessionLimitPredictionResultAvailableKind {
     Available,
 }
 
+/// Prediction result variant discriminator.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum SessionLimitPredictionResultUnavailableKind {
     #[serde(rename = "unavailable")]
@@ -27431,6 +32689,34 @@ pub enum SessionsOpenStatus {
     Unknown,
 }
 
+/// SDK-side token authentication; the host configured the token directly via the SDK.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SettableTokenAuthInfoType {
+    #[serde(rename = "token")]
+    #[default]
+    Token,
+}
+
+/// Authentication credentials accepted by session.gitHubAuth.setCredentials. Session-owned token-provider identities cannot be installed through this method.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum SettableAuthInfo {
+    Hmac(HMACAuthInfo),
+    Env(EnvAuthInfo),
+    Token(SettableTokenAuthInfo),
+    CopilotApiToken(CopilotApiTokenAuthInfo),
+    User(UserAuthInfo),
+    GhCli(GhCliAuthInfo),
+    ApiKey(ApiKeyAuthInfo),
+}
+
 /// Rust-owned settings predicates exposed across the SDK boundary. Raw feature-flag names are intentionally not part of the contract.
 ///
 /// <div class="warning">
@@ -27601,6 +32887,14 @@ pub enum SkillDiscoveryScope {
     Unknown,
 }
 
+/// Discriminator for an add-timeline-entry result.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SlashCommandAddTimelineEntryResultKind {
+    #[serde(rename = "add-timeline-entry")]
+    #[default]
+    AddTimelineEntry,
+}
+
 /// Agent prompt result discriminator
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum SlashCommandAgentPromptResultKind {
@@ -27633,6 +32927,38 @@ pub enum SlashCommandSelectSubcommandResultKind {
     SelectSubcommand,
 }
 
+/// Discriminator for a model-picker dialog.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SlashCommandModelPickerDialogKind {
+    #[serde(rename = "model-picker")]
+    #[default]
+    ModelPicker,
+}
+
+/// Discriminator for a show-dialog result.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SlashCommandShowDialogResultKind {
+    #[serde(rename = "show-dialog")]
+    #[default]
+    ShowDialog,
+}
+
+/// Discriminator for a set-model result.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SlashCommandSetModelResultKind {
+    #[serde(rename = "set-model")]
+    #[default]
+    SetModel,
+}
+
+/// Discriminator for a set-plan-model result.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SlashCommandSetPlanModelResultKind {
+    #[serde(rename = "set-plan-model")]
+    #[default]
+    SetPlanModel,
+}
+
 /// Result of invoking the slash command (text output, prompt to send to the agent, completion, or subcommand selection).
 ///
 /// <div class="warning">
@@ -27648,6 +32974,10 @@ pub enum SlashCommandInvocationResult {
     AgentPrompt(SlashCommandAgentPromptResult),
     Completed(SlashCommandCompletedResult),
     SelectSubcommand(SlashCommandSelectSubcommandResult),
+    AddTimelineEntry(SlashCommandAddTimelineEntryResult),
+    ShowDialog(SlashCommandShowDialogResult),
+    SetModel(SlashCommandSetModelResult),
+    SetPlanModel(SlashCommandSetPlanModelResult),
 }
 
 /// Context tier override for matching subagents
@@ -27782,12 +33112,50 @@ pub enum TaskShellProgressType {
     Shell,
 }
 
-/// SDK-side token authentication; the host configured the token directly via the SDK.
+/// Execution outcome classification.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum TokenAuthInfoType {
-    #[serde(rename = "token")]
+pub enum ToolResultType {
+    /// The tool completed successfully.
+    #[serde(rename = "success")]
+    Success,
+    /// The tool failed.
+    #[serde(rename = "failure")]
+    Failure,
+    /// The tool exceeded its execution timeout.
+    #[serde(rename = "timeout")]
+    Timeout,
+    /// The tool request was rejected before execution.
+    #[serde(rename = "rejected")]
+    Rejected,
+    /// Permission policy denied the tool request.
+    #[serde(rename = "denied")]
+    Denied,
+    /// Unknown variant for forward compatibility.
     #[default]
-    Token,
+    #[serde(other)]
+    Unknown,
+}
+
+/// Canonical result returned by a session tool.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum ToolResult {
+    String(String),
+    ToolResultExpanded(ToolResultExpanded),
 }
 
 /// User's choice for auto-mode switching: yes (allow this turn), yes_always (allow + persist as setting), or no (decline).
@@ -28010,14 +33378,6 @@ pub enum UISessionLimitsExhaustedResponseAction {
     Unknown,
 }
 
-/// OAuth user authentication. The token itself is held in the runtime's secret token store (keyed by host+login) and is NOT carried in this struct.
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum UserAuthInfoType {
-    #[serde(rename = "user")]
-    #[default]
-    User,
-}
-
 /// Type of change represented by this file diff.
 ///
 /// <div class="warning">
diff --git a/rust/src/generated/rpc.rs b/rust/src/generated/rpc.rs
index 02404c1129..60bf9d804f 100644
--- a/rust/src/generated/rpc.rs
+++ b/rust/src/generated/rpc.rs
@@ -43,6 +43,13 @@ impl<'a> ClientRpc<'a> {
         }
     }
 
+    /// `catalog.*` sub-namespace.
+    pub fn catalog(&self) -> ClientRpcCatalog<'a> {
+        ClientRpcCatalog {
+            client: self.client,
+        }
+    }
+
     /// `commands.*` sub-namespace.
     pub fn commands(&self) -> ClientRpcCommands<'a> {
         ClientRpcCommands {
@@ -71,6 +78,13 @@ impl<'a> ClientRpc<'a> {
         }
     }
 
+    /// `managedSettings.*` sub-namespace.
+    pub fn managed_settings(&self) -> ClientRpcManagedSettings<'a> {
+        ClientRpcManagedSettings {
+            client: self.client,
+        }
+    }
+
     /// `mcp.*` sub-namespace.
     pub fn mcp(&self) -> ClientRpcMcp<'a> {
         ClientRpcMcp {
@@ -175,7 +189,7 @@ impl<'a> ClientRpc<'a> {
     ///
     /// # Parameters
     ///
-    /// * `params` - Parameters for the `server.connect` handshake: an optional connection token and optional connection-level opt-ins (e.g. GitHub telemetry forwarding).
+    /// * `params` - Connection-level opt-ins for the `server.connect` handshake. Transport authentication is consumed by the native protocol boundary before dispatch.
     ///
     /// # Returns
     ///
@@ -196,6 +210,29 @@ impl<'a> ClientRpc<'a> {
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+
+    /// Registers the calling SDK client as the per-entrypoint extension launch provider. Call before creating any sessions. When omitted, the runtime temporarily falls back to its built-in Node launcher for backward compatibility.
+    ///
+    /// Wire method: `registerExtensionLaunchProvider`.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn register_extension_launch_provider(&self) -> Result<(), Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(
+                rpc_methods::REGISTEREXTENSIONLAUNCHPROVIDER,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(())
+    }
 }
 
 /// `account.*` RPCs.
@@ -205,7 +242,7 @@ pub struct ClientRpcAccount<'a> {
 }
 
 impl<'a> ClientRpcAccount<'a> {
-    /// Gets Copilot quota usage for the authenticated user or supplied GitHub token.
+    /// Gets Copilot quota usage for the current or opaquely selected authenticated user.
     ///
     /// Wire method: `account.getQuota`.
     ///
@@ -229,13 +266,13 @@ impl<'a> ClientRpcAccount<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Gets Copilot quota usage for the authenticated user or supplied GitHub token.
+    /// Gets Copilot quota usage for the current or opaquely selected authenticated user.
     ///
     /// Wire method: `account.getQuota`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional GitHub token used to look up quota for a specific user instead of the global auth context.
+    /// * `params` - Optional opaque account selection or compatibility GitHub token used to look up quota.
     ///
     /// # Returns
     ///
@@ -308,13 +345,13 @@ impl<'a> ClientRpcAccount<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Stores authentication credentials after successful login (e.g., device code flow).
+    /// Validates and stores authentication credentials. When login is omitted, resolves the authenticated user from the token before persistence.
     ///
     /// Wire method: `account.login`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Credentials to store after successful authentication
+    /// * `params` - Credentials to validate and store. Omit login to resolve the authenticated user from the token.
     ///
     /// # Returns
     ///
@@ -471,6 +508,42 @@ impl<'a> ClientRpcAgents<'a> {
     }
 }
 
+/// `catalog.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcCatalog<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcCatalog<'a> {
+    /// Requests a bounded catalog search. This host-implemented server method is available through SDK/TUI hosts; standalone and C-ABI runtimes whose host does not implement server-method dispatch return JSON-RPC MethodNotFound. A runtime with search available returns inert candidate summaries, each with an opaque single-use handle scoped to this runtime instance; a runtime without it returns the typed search-unavailable result. Public authorities may be searched anonymously, while an authority that requires credentials yields the typed authentication-required result. All returned text, URLs, and package metadata are untrusted external data and can never trigger instructions, tools, or installation. Read-only: nothing is installed, configured, or persisted.
+    ///
+    /// Wire method: `catalog.search`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A bounded catalog search. Both the query length and the result count are capped by the schema so a caller cannot request an unbounded scan.
+    ///
+    /// # Returns
+    ///
+    /// Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn search(&self, params: CatalogSearchRequest) -> Result<CatalogSearchResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::CATALOG_SEARCH, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
 /// `commands.*` RPCs.
 #[derive(Clone, Copy)]
 pub struct ClientRpcCommands<'a> {
@@ -756,6 +829,38 @@ impl<'a> ClientRpcLlmInference<'a> {
     }
 }
 
+/// `managedSettings.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcManagedSettings<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcManagedSettings<'a> {
+    /// Discovers device-managed settings from production MDM and managed-file sources, validates them against the runtime-owned managed-settings schema, and returns the canonical JSON without requiring a session.
+    ///
+    /// Wire method: `managedSettings.read`.
+    ///
+    /// # Returns
+    ///
+    /// Validated device-managed settings discovered before a session exists.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn read(&self) -> Result<ManagedSettingsReadResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::MANAGEDSETTINGS_READ, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
 /// `mcp.*` RPCs.
 #[derive(Clone, Copy)]
 pub struct ClientRpcMcp<'a> {
@@ -797,6 +902,37 @@ impl<'a> ClientRpcMcp<'a> {
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+
+    /// Requests a side-effect-free MCP install plan from a catalog candidate handle or a caller-supplied card. This host-implemented server method is available through SDK/TUI hosts; standalone and C-ABI runtimes whose host does not implement server-method dispatch return JSON-RPC MethodNotFound. A runtime with planning available returns a normalised plan and opaque single-use plan handle; a runtime without it returns the typed planning-unavailable result. A completed plan reports resource identity, provenance, eligible transport choices, the user-scope target, required typed values and secret placeholders, the policy result, the configuration changes installing would make, and whether a reload would be needed. Planning never writes configuration, stores a secret, or reloads MCP servers, so abandoning a plan needs no call and leaves nothing behind.
+    ///
+    /// Wire method: `mcp.planInstall`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.
+    ///
+    /// # Returns
+    ///
+    /// Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn plan_install(
+        &self,
+        params: McpPlanInstallRequest,
+    ) -> Result<McpPlanInstallResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_PLANINSTALL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
 }
 
 /// `mcp.config.*` RPCs.
@@ -1008,7 +1144,7 @@ impl<'a> ClientRpcModels<'a> {
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional GitHub token used to list models for a specific user instead of the global auth context.
+    /// * `params` - Optional opaque account selection or compatibility GitHub token used to list models.
     ///
     /// # Returns
     ///
@@ -1062,6 +1198,13 @@ pub struct ClientRpcPlugins<'a> {
 }
 
 impl<'a> ClientRpcPlugins<'a> {
+    /// `plugins.builtin.*` sub-namespace.
+    pub fn builtin(&self) -> ClientRpcPluginsBuiltin<'a> {
+        ClientRpcPluginsBuiltin {
+            client: self.client,
+        }
+    }
+
     /// `plugins.marketplaces.*` sub-namespace.
     pub fn marketplaces(&self) -> ClientRpcPluginsMarketplaces<'a> {
         ClientRpcPluginsMarketplaces {
@@ -1249,6 +1392,38 @@ impl<'a> ClientRpcPlugins<'a> {
     }
 }
 
+/// `plugins.builtin.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcPluginsBuiltin<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcPluginsBuiltin<'a> {
+    /// Replaces this server's trusted built-in plugin directories while no sessions are active.
+    ///
+    /// Wire method: `plugins.builtin.set`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Trusted built-in plugin directories to use for this runtime process.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn set(&self, params: PluginsBuiltinSetRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_BUILTIN_SET, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+}
+
 /// `plugins.marketplaces.*` RPCs.
 #[derive(Clone, Copy)]
 pub struct ClientRpcPluginsMarketplaces<'a> {
@@ -2648,6 +2823,36 @@ impl<'a> ClientRpcSkillsConfig<'a> {
             .await?;
         Ok(())
     }
+
+    /// Atomically adds or removes one skill from the disabled list.
+    ///
+    /// Wire method: `skills.config.setSkillDisabled`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Adds or removes a single skill from the global disabled list, leaving every other entry untouched.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn set_skill_disabled(
+        &self,
+        params: SkillsConfigSetSkillDisabledRequest,
+    ) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SKILLS_CONFIG_SETSKILLDISABLED,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(())
+    }
 }
 
 /// `tools.*` RPCs.
@@ -3527,6 +3732,13 @@ impl<'a> SessionRpcCanvas<'a> {
         }
     }
 
+    /// `session.canvas.provider.*` sub-namespace.
+    pub fn provider(&self) -> SessionRpcCanvasProvider<'a> {
+        SessionRpcCanvasProvider {
+            session: self.session,
+        }
+    }
+
     /// Lists canvases declared for the session.
     ///
     /// Wire method: `session.canvas.list`.
@@ -3675,6 +3887,78 @@ impl<'a> SessionRpcCanvasAction<'a> {
     }
 }
 
+/// `session.canvas.provider.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct SessionRpcCanvasProvider<'a> {
+    pub(crate) session: &'a Session,
+}
+
+impl<'a> SessionRpcCanvasProvider<'a> {
+    /// Registers an internal canvas provider connection and its contributions.
+    ///
+    /// Wire method: `session.canvas.provider.register`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Internal canvas provider registration parameters.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub(crate) async fn register(
+        &self,
+        params: CanvasProviderRegisterRequest,
+    ) -> Result<(), Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_CANVAS_PROVIDER_REGISTER,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(())
+    }
+
+    /// Unregisters an internal canvas provider connection.
+    ///
+    /// Wire method: `session.canvas.provider.unregister`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Internal canvas provider unregistration parameters.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub(crate) async fn unregister(
+        &self,
+        params: CanvasProviderUnregisterRequest,
+    ) -> Result<(), Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_CANVAS_PROVIDER_UNREGISTER,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(())
+    }
+}
+
 /// `session.commands.*` RPCs.
 #[derive(Clone, Copy)]
 pub struct SessionRpcCommands<'a> {
@@ -3773,6 +4057,42 @@ impl<'a> SessionRpcCommands<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
+    /// Finalizes persistence associated with a client-applied slash-command effect.
+    ///
+    /// Wire method: `session.commands.finalizeInvocationEffect`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.
+    ///
+    /// # Returns
+    ///
+    /// Whether finalizing the invocation effect succeeded, and the failure reason when it did not.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub(crate) async fn finalize_invocation_effect(
+        &self,
+        params: CommandsFinalizeInvocationEffectRequest,
+    ) -> Result<CommandsFinalizeInvocationEffectResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_COMMANDS_FINALIZEINVOCATIONEFFECT,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Reports completion of a pending client-handled slash command.
     ///
     /// Wire method: `session.commands.handlePendingCommand`.
@@ -4449,9 +4769,13 @@ impl<'a> SessionRpcFactory<'a> {
     ///
     /// Wire method: `session.factory.listRuns`.
     ///
+    /// # Parameters
+    ///
+    /// * `params` - Parameters for paging factory runs.
+    ///
     /// # Returns
     ///
-    /// Factory runs in durable creation order.
+    /// A page of factory runs in durable creation order.
     ///
     /// <div class="warning">
     ///
@@ -4460,8 +4784,12 @@ impl<'a> SessionRpcFactory<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list_runs(&self) -> Result<FactoryListRunsResult, Error> {
-        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+    pub async fn list_runs(
+        &self,
+        params: FactoryListRunsRequest,
+    ) -> Result<FactoryListRunsResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
         let _value = self
             .session
             .client()
@@ -4707,18 +5035,229 @@ pub struct SessionRpcFleet<'a> {
     pub(crate) session: &'a Session,
 }
 
-impl<'a> SessionRpcFleet<'a> {
-    /// Starts fleet mode by submitting the fleet orchestration prompt to the session.
+impl<'a> SessionRpcFleet<'a> {
+    /// Starts fleet mode by submitting the fleet orchestration prompt to the session.
+    ///
+    /// Wire method: `session.fleet.start`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Optional user prompt to combine with the fleet orchestration instructions.
+    ///
+    /// # Returns
+    ///
+    /// Indicates whether fleet mode was successfully activated.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn start(&self, params: FleetStartRequest) -> Result<FleetStartResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_FLEET_START, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `session.gitHubAuth.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct SessionRpcGitHubAuth<'a> {
+    pub(crate) session: &'a Session,
+}
+
+impl<'a> SessionRpcGitHubAuth<'a> {
+    /// Gets authentication status and account metadata for the session.
+    ///
+    /// Wire method: `session.gitHubAuth.getStatus`.
+    ///
+    /// # Returns
+    ///
+    /// Authentication status and account metadata for the session.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn get_status(&self) -> Result<SessionAuthStatus, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_GITHUBAUTH_GETSTATUS, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Updates the session's auth credentials used for outbound model and API requests.
+    ///
+    /// Wire method: `session.gitHubAuth.setCredentials`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - New auth credentials to install on the session. Omit to leave credentials unchanged.
+    ///
+    /// # Returns
+    ///
+    /// Indicates whether the credential update succeeded.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn set_credentials(
+        &self,
+        params: SessionSetCredentialsParams,
+    ) -> Result<SessionSetCredentialsResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_GITHUBAUTH_SETCREDENTIALS,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Gets the current authentication information for internal session hosts.
+    ///
+    /// Wire method: `session.gitHubAuth.getCurrentAuthInfo`.
+    ///
+    /// # Returns
+    ///
+    /// Current authentication information, or null when no authentication is active.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub(crate) async fn get_current_auth_info(&self) -> Result<SessionAuthInfoResult, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_GITHUBAUTH_GETCURRENTAUTHINFO,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Gets all authentication accounts available to the internal session host.
+    ///
+    /// Wire method: `session.gitHubAuth.getAllAuthAvailable`.
+    ///
+    /// # Returns
+    ///
+    /// Authentication accounts available to the internal session host.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub(crate) async fn get_all_auth_available(
+        &self,
+    ) -> Result<SessionGitHubAuthGetAllAuthAvailableResult, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_GITHUBAUTH_GETALLAUTHAVAILABLE,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Refreshes Copilot account metadata for the current authentication.
+    ///
+    /// Wire method: `session.gitHubAuth.refreshCopilotUser`.
+    ///
+    /// # Returns
+    ///
+    /// Current authentication information, or null when no authentication is active.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub(crate) async fn refresh_copilot_user(&self) -> Result<SessionAuthInfoResult, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_GITHUBAUTH_REFRESHCOPILOTUSER,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Logs in a GitHub user through the internal session host.
+    ///
+    /// Wire method: `session.gitHubAuth.login`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Internal GitHub login parameters.
+    ///
+    /// # Returns
+    ///
+    /// Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub(crate) async fn login(&self, params: SessionAuthLoginRequest) -> Result<AuthInfo, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_GITHUBAUTH_LOGIN, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Switches the session to another available authentication.
     ///
-    /// Wire method: `session.fleet.start`.
+    /// Wire method: `session.gitHubAuth.switchToAuth`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional user prompt to combine with the fleet orchestration instructions.
-    ///
-    /// # Returns
-    ///
-    /// Indicates whether fleet mode was successfully activated.
+    /// * `params` - Parameters for switching the session's active authentication.
     ///
     /// <div class="warning">
     ///
@@ -4727,32 +5266,30 @@ impl<'a> SessionRpcFleet<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn start(&self, params: FleetStartRequest) -> Result<FleetStartResult, Error> {
+    pub(crate) async fn switch_to_auth(
+        &self,
+        params: SessionAuthSwitchRequest,
+    ) -> Result<(), Error> {
         let mut wire_params = serde_json::to_value(params)?;
         wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
         let _value = self
             .session
             .client()
-            .call(rpc_methods::SESSION_FLEET_START, Some(wire_params))
+            .call(
+                rpc_methods::SESSION_GITHUBAUTH_SWITCHTOAUTH,
+                Some(wire_params),
+            )
             .await?;
-        Ok(serde_json::from_value(_value)?)
+        Ok(())
     }
-}
-
-/// `session.gitHubAuth.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct SessionRpcGitHubAuth<'a> {
-    pub(crate) session: &'a Session,
-}
 
-impl<'a> SessionRpcGitHubAuth<'a> {
-    /// Gets authentication status and account metadata for the session.
+    /// Logs out the session's current GitHub authentication.
     ///
-    /// Wire method: `session.gitHubAuth.getStatus`.
+    /// Wire method: `session.gitHubAuth.logout`.
     ///
     /// # Returns
     ///
-    /// Authentication status and account metadata for the session.
+    /// Whether the current authentication was logged out.
     ///
     /// <div class="warning">
     ///
@@ -4761,27 +5298,27 @@ impl<'a> SessionRpcGitHubAuth<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_status(&self) -> Result<SessionAuthStatus, Error> {
+    pub(crate) async fn logout(&self) -> Result<SessionGitHubAuthLogoutResult, Error> {
         let wire_params = serde_json::json!({ "sessionId": self.session.id() });
         let _value = self
             .session
             .client()
-            .call(rpc_methods::SESSION_GITHUBAUTH_GETSTATUS, Some(wire_params))
+            .call(rpc_methods::SESSION_GITHUBAUTH_LOGOUT, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Updates the session's auth credentials used for outbound model and API requests.
+    /// Logs out a specific GitHub authentication.
     ///
-    /// Wire method: `session.gitHubAuth.setCredentials`.
+    /// Wire method: `session.gitHubAuth.logoutUser`.
     ///
     /// # Parameters
     ///
-    /// * `params` - New auth credentials to install on the session. Omit to leave credentials unchanged.
+    /// * `params` - Parameters identifying a GitHub authentication to log out.
     ///
     /// # Returns
     ///
-    /// Indicates whether the credential update succeeded.
+    /// Whether the requested authentication was logged out.
     ///
     /// <div class="warning">
     ///
@@ -4790,17 +5327,45 @@ impl<'a> SessionRpcGitHubAuth<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set_credentials(
+    pub(crate) async fn logout_user(
         &self,
-        params: SessionSetCredentialsParams,
-    ) -> Result<SessionSetCredentialsResult, Error> {
+        params: SessionAuthLogoutUserRequest,
+    ) -> Result<SessionGitHubAuthLogoutUserResult, Error> {
         let mut wire_params = serde_json::to_value(params)?;
         wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
         let _value = self
             .session
             .client()
             .call(
-                rpc_methods::SESSION_GITHUBAUTH_SETCREDENTIALS,
+                rpc_methods::SESSION_GITHUBAUTH_LOGOUTUSER,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Gets validation errors from the most recent authentication attempt.
+    ///
+    /// Wire method: `session.gitHubAuth.lastAuthErrors`.
+    ///
+    /// # Returns
+    ///
+    /// Validation errors from the most recent authentication attempt.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub(crate) async fn last_auth_errors(&self) -> Result<AuthValidationErrors, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_GITHUBAUTH_LASTAUTHERRORS,
                 Some(wire_params),
             )
             .await?;
@@ -5430,6 +5995,36 @@ impl<'a> SessionRpcMcp<'a> {
         Ok(())
     }
 
+    /// Releases any turns waiting on an in-flight MCP load without cancelling the load, letting the agent proceed while MCP servers finish connecting in the background. No-op when no MCP load is in flight or waiting turns were already released.
+    ///
+    /// Wire method: `session.mcp.moveLoadingToBackground`.
+    ///
+    /// # Returns
+    ///
+    /// Result of moving in-flight MCP loading to the background.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn move_loading_to_background(
+        &self,
+    ) -> Result<MoveMcpLoadingToBackgroundResult, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_MCP_MOVELOADINGTOBACKGROUND,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Reloads MCP server connections for the session with an explicit host-provided configuration.
     ///
     /// Wire method: `session.mcp.reloadWithConfig`.
@@ -5596,7 +6191,7 @@ impl<'a> SessionRpcMcp<'a> {
     ///
     /// # Parameters
     ///
-    /// * `params` - Opaque auth info used to configure GitHub MCP.
+    /// * `params` - Credential-free authentication identity used to configure GitHub MCP.
     ///
     /// # Returns
     ///
@@ -6151,6 +6746,36 @@ impl<'a> SessionRpcMcpOauth<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
+    /// Passively probes a configured remote MCP server to classify whether OAuth is required or a cached/override token is accepted. Does not start OAuth, emit pending OAuth requests, or mutate MCP connection state.
+    ///
+    /// Wire method: `session.mcp.oauth.probe`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Remote MCP server name for a passive OAuth status probe.
+    ///
+    /// # Returns
+    ///
+    /// Passive MCP OAuth probe result. `authenticated` means the server accepted the probe request while an OAuth-origin access token was attached; it does not prove the server required or independently validated that token. The probe does not make a second unauthenticated request. Failed is an expected probe-domain outcome; JSON-RPC errors are reserved for API-call failures.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn probe(&self, params: McpOauthProbeRequest) -> Result<McpOauthProbeResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_MCP_OAUTH_PROBE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Responds to a pending MCP OAuth authorization request by its request id.
     ///
     /// Wire method: `session.mcp.oauth.respond`.
@@ -6626,6 +7251,10 @@ impl<'a> SessionRpcMode<'a> {
     ///
     /// * `params` - Agent interaction mode to apply to the session.
     ///
+    /// # Returns
+    ///
+    /// Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.
+    ///
     /// <div class="warning">
     ///
     /// **Experimental.** This API is part of an experimental wire-protocol surface
@@ -6633,7 +7262,7 @@ impl<'a> SessionRpcMode<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set(&self, params: ModeSetRequest) -> Result<(), Error> {
+    pub async fn set(&self, params: ModeSetRequest) -> Result<ModeSetResult, Error> {
         let mut wire_params = serde_json::to_value(params)?;
         wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
         let _value = self
@@ -6641,7 +7270,7 @@ impl<'a> SessionRpcMode<'a> {
             .client()
             .call(rpc_methods::SESSION_MODE_SET, Some(wire_params))
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
 }
 
@@ -6710,6 +7339,42 @@ impl<'a> SessionRpcModel<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
+    /// Resolves and applies organization-managed and repository model overlays.
+    ///
+    /// Wire method: `session.model.applyStartupOverlay`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Managed, repository, and CLI model overrides to overlay onto the session at startup.
+    ///
+    /// # Returns
+    ///
+    /// The model identifier active on the session after the switch.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub(crate) async fn apply_startup_overlay(
+        &self,
+        params: ModelApplyStartupOverlayRequest,
+    ) -> Result<ModelSwitchToResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_MODEL_APPLYSTARTUPOVERLAY,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Updates the session's reasoning effort without changing the selected model.
     ///
     /// Wire method: `session.model.setReasoningEffort`.
@@ -7106,17 +7771,17 @@ impl<'a> SessionRpcPermissions<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Sets the allow-all permission mode for the session. Used by attach-mode clients (e.g. LocalRpcSession's `/allow-all` forwarder) to flip the target session's permission state. The `on` mode swaps in unrestricted path and URL managers and emits `session.permissions_changed` on transition; the `auto` mode keeps normal prompt paths active while attaching LLM safety recommendations. The result returns the authoritative post-mutation state so callers can update their local mirrors without racing the `session.permissions_changed` notification on the same wire.
+    /// Sets the permission mode for the session. `manual` follows the normal approval flow, `assisted` attaches LLM safety recommendations, and `allow-all` automatically approves permission requests. The result returns the authoritative post-mutation mode so callers can update local state without racing the `session.permissions_changed` notification.
     ///
-    /// Wire method: `session.permissions.setAllowAll`.
+    /// Wire method: `session.permissions.setMode`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Allow-all mode to apply for the session.
+    /// * `params` - Permission mode to apply for the session.
     ///
     /// # Returns
     ///
-    /// Indicates whether the operation succeeded and reports the post-mutation state.
+    /// Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode.
     ///
     /// <div class="warning">
     ///
@@ -7125,30 +7790,27 @@ impl<'a> SessionRpcPermissions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set_allow_all(
+    pub async fn set_mode(
         &self,
-        params: PermissionsSetAllowAllRequest,
-    ) -> Result<AllowAllPermissionSetResult, Error> {
+        params: PermissionsSetModeRequest,
+    ) -> Result<PermissionsSetModeResult, Error> {
         let mut wire_params = serde_json::to_value(params)?;
         wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
         let _value = self
             .session
             .client()
-            .call(
-                rpc_methods::SESSION_PERMISSIONS_SETALLOWALL,
-                Some(wire_params),
-            )
+            .call(rpc_methods::SESSION_PERMISSIONS_SETMODE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns the current allow-all permission mode for the session.
+    /// Returns the current permission mode for the session.
     ///
-    /// Wire method: `session.permissions.getAllowAll`.
+    /// Wire method: `session.permissions.getMode`.
     ///
     /// # Returns
     ///
-    /// Current allow-all permission mode.
+    /// Current permission mode.
     ///
     /// <div class="warning">
     ///
@@ -7157,15 +7819,12 @@ impl<'a> SessionRpcPermissions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_allow_all(&self) -> Result<AllowAllPermissionState, Error> {
+    pub async fn get_mode(&self) -> Result<PermissionsGetModeResult, Error> {
         let wire_params = serde_json::json!({ "sessionId": self.session.id() });
         let _value = self
             .session
             .client()
-            .call(
-                rpc_methods::SESSION_PERMISSIONS_GETALLOWALL,
-                Some(wire_params),
-            )
+            .call(rpc_methods::SESSION_PERMISSIONS_GETMODE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
@@ -7546,7 +8205,7 @@ impl<'a> SessionRpcPermissionsPaths<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Adds a directory to the session's allow-list.
+    /// Adds a directory to the session's allow-list and activates conventional skill and agent definitions under it.
     ///
     /// Wire method: `session.permissions.paths.add`.
     ///
@@ -9741,6 +10400,108 @@ pub struct SessionRpcTools<'a> {
 }
 
 impl<'a> SessionRpcTools<'a> {
+    /// Executes one tool from the session's currently offered tool set through the native invocation pipeline.
+    ///
+    /// Wire method: `session.tools.execute`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A tool name and arguments to execute through the session's native invocation pipeline.
+    ///
+    /// # Returns
+    ///
+    /// Canonical result returned by a session tool.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn execute(&self, params: ToolsExecuteRequest) -> Result<ToolResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_TOOLS_EXECUTE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Returns the Rust-owned built-in tool descriptors used to construct the session's offered tool set.
+    ///
+    /// Wire method: `session.tools.getBuiltinDescriptors`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Options controlling how Rust-owned built-in tool descriptors are materialized.
+    ///
+    /// # Returns
+    ///
+    /// Rust-owned built-in tool descriptors for the session.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn get_builtin_descriptors(
+        &self,
+        params: ToolsGetBuiltinDescriptorsRequest,
+    ) -> Result<ToolsGetBuiltinDescriptorsResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_TOOLS_GETBUILTINDESCRIPTORS,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Projects a completed task_complete tool call into its label-safe session event payload.
+    ///
+    /// Wire method: `session.tools.taskCompleteEventData`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Task-completion tool arguments and final result used to build a label-safe session event payload.
+    ///
+    /// # Returns
+    ///
+    /// Task completion notification with summary from the agent
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn task_complete_event_data(
+        &self,
+        params: ToolsTaskCompleteEventDataRequest,
+    ) -> Result<TaskCompleteData, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_TOOLS_TASKCOMPLETEEVENTDATA,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Provides the result for a pending external tool call.
     ///
     /// Wire method: `session.tools.handlePendingToolCall`.
@@ -9833,6 +10594,36 @@ impl<'a> SessionRpcTools<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
+    /// Atomically replaces the complete externally implemented tool list supplied by the calling connection. Built-in, MCP/plugin, extension-discovered, subagent, and tools supplied by other connections remain unchanged.
+    ///
+    /// Wire method: `session.tools.set`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.
+    ///
+    /// # Returns
+    ///
+    /// Empty result after replacing the calling connection's externally implemented tools.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn set(&self, params: ToolsSetRequest) -> Result<ToolsSetResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_TOOLS_SET, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Updates the current session's live subagent settings after user settings change. The persisted user settings remain the source of truth for future sessions.
     ///
     /// Wire method: `session.tools.updateSubagentSettings`.
@@ -9887,7 +10678,7 @@ impl<'a> SessionRpcUi<'a> {
     ///
     /// # Returns
     ///
-    /// Transient answer generated from current conversation context.
+    /// Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs.
     ///
     /// <div class="warning">
     ///
diff --git a/rust/src/generated/session_events.rs b/rust/src/generated/session_events.rs
index ef3c395b10..a5b123d3b5 100644
--- a/rust/src/generated/session_events.rs
+++ b/rust/src/generated/session_events.rs
@@ -41,6 +41,13 @@ pub enum SessionEventType {
     SessionModeChanged,
     #[serde(rename = "session.session_limits_changed")]
     SessionSessionLimitsChanged,
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
     #[serde(rename = "session.permissions_changed")]
     SessionPermissionsChanged,
     #[serde(rename = "session.plan_changed")]
@@ -79,6 +86,8 @@ pub enum SessionEventType {
     AssistantTurnStart,
     #[serde(rename = "assistant.turn_retry")]
     AssistantTurnRetry,
+    #[serde(rename = "agent.interrupted")]
+    AgentInterrupted,
     #[serde(rename = "assistant.intent")]
     AssistantIntent,
     #[serde(rename = "assistant.server_tool_progress")]
@@ -103,8 +112,12 @@ pub enum SessionEventType {
     AssistantIdle,
     #[serde(rename = "assistant.usage")]
     AssistantUsage,
+    #[serde(rename = "prompt_cache_break")]
+    PromptCacheBreak,
     #[serde(rename = "model.call_failure")]
     ModelCallFailure,
+    #[serde(rename = "model.call_finished")]
+    ModelCallFinished,
     #[serde(rename = "model.call_start")]
     ModelCallStart,
     #[serde(rename = "abort")]
@@ -123,6 +136,8 @@ pub enum SessionEventType {
     ToolSearchActivated,
     #[serde(rename = "skill.invoked")]
     SkillInvoked,
+    #[serde(rename = "sandbox.decision")]
+    SandboxDecision,
     #[serde(rename = "subagent.started")]
     SubagentStarted,
     #[serde(rename = "subagent.completed")]
@@ -178,6 +193,15 @@ pub enum SessionEventType {
     McpHeadersRefreshCompleted,
     #[serde(rename = "session.custom_notification")]
     SessionCustomNotification,
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(rename = "ui.ephemeral_query")]
+    UiEphemeralQuery,
     #[serde(rename = "external_tool.requested")]
     ExternalToolRequested,
     #[serde(rename = "external_tool.completed")]
@@ -244,6 +268,24 @@ pub enum SessionEventType {
     /// </div>
     #[serde(rename = "factory.run_updated")]
     FactoryRunUpdated,
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(rename = "factory.run_started")]
+    FactoryRunStarted,
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(rename = "factory.run_settled")]
+    FactoryRunSettled,
     #[serde(rename = "session.skills_loaded")]
     SessionSkillsLoaded,
     #[serde(rename = "session.custom_agents_updated")]
@@ -360,6 +402,13 @@ pub enum SessionEventData {
     SessionModeChanged(SessionModeChangedData),
     #[serde(rename = "session.session_limits_changed")]
     SessionSessionLimitsChanged(SessionSessionLimitsChangedData),
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
     #[serde(rename = "session.permissions_changed")]
     SessionPermissionsChanged(SessionPermissionsChangedData),
     #[serde(rename = "session.plan_changed")]
@@ -398,6 +447,8 @@ pub enum SessionEventData {
     AssistantTurnStart(AssistantTurnStartData),
     #[serde(rename = "assistant.turn_retry")]
     AssistantTurnRetry(AssistantTurnRetryData),
+    #[serde(rename = "agent.interrupted")]
+    AgentInterrupted(AgentInterruptedData),
     #[serde(rename = "assistant.intent")]
     AssistantIntent(AssistantIntentData),
     #[serde(rename = "assistant.server_tool_progress")]
@@ -422,8 +473,12 @@ pub enum SessionEventData {
     AssistantIdle(AssistantIdleData),
     #[serde(rename = "assistant.usage")]
     AssistantUsage(AssistantUsageData),
+    #[serde(rename = "prompt_cache_break")]
+    PromptCacheBreak(PromptCacheBreakData),
     #[serde(rename = "model.call_failure")]
     ModelCallFailure(ModelCallFailureData),
+    #[serde(rename = "model.call_finished")]
+    ModelCallFinished(ModelCallFinishedData),
     #[serde(rename = "model.call_start")]
     ModelCallStart(ModelCallStartData),
     #[serde(rename = "abort")]
@@ -442,6 +497,8 @@ pub enum SessionEventData {
     ToolSearchActivated(ToolSearchActivatedData),
     #[serde(rename = "skill.invoked")]
     SkillInvoked(SkillInvokedData),
+    #[serde(rename = "sandbox.decision")]
+    SandboxDecision(SandboxDecisionData),
     #[serde(rename = "subagent.started")]
     SubagentStarted(SubagentStartedData),
     #[serde(rename = "subagent.completed")]
@@ -490,6 +547,15 @@ pub enum SessionEventData {
     McpHeadersRefreshCompleted(McpHeadersRefreshCompletedData),
     #[serde(rename = "session.custom_notification")]
     SessionCustomNotification(SessionCustomNotificationData),
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(rename = "ui.ephemeral_query")]
+    UiEphemeralQuery(UiEphemeralQueryData),
     #[serde(rename = "external_tool.requested")]
     ExternalToolRequested(ExternalToolRequestedData),
     #[serde(rename = "external_tool.completed")]
@@ -556,6 +622,24 @@ pub enum SessionEventData {
     /// </div>
     #[serde(rename = "factory.run_updated")]
     FactoryRunUpdated(FactoryRunUpdatedData),
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(rename = "factory.run_started")]
+    FactoryRunStarted(FactoryRunStartedData),
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(rename = "factory.run_settled")]
+    FactoryRunSettled(FactoryRunSettledData),
     #[serde(rename = "session.skills_loaded")]
     SessionSkillsLoaded(SessionSkillsLoadedData),
     #[serde(rename = "session.custom_agents_updated")]
@@ -859,6 +943,9 @@ pub struct SessionIdleData {
     /// True when the preceding agentic loop was cancelled via abort signal
     #[serde(skip_serializing_if = "Option::is_none")]
     pub aborted: Option<bool>,
+    /// The session mode the agent was operating in when it went idle, when the mode is known. Lets turn-scoped consumers distinguish an autopilot continuation boundary (where the agent keeps working after this idle) from a genuine turn completion.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mode: Option<SessionMode>,
 }
 
 /// Session event "session.title_changed". Session title change payload containing the new display title
@@ -994,6 +1081,9 @@ pub struct SessionModelChangeData {
     /// Reasoning summary mode after the model change, if applicable
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reasoning_summary: Option<ReasoningSummary>,
+    /// Origin of the effective model change, when known.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<ModelChangeSource>,
     /// Output verbosity level after the model change, if applicable
     #[serde(skip_serializing_if = "Option::is_none")]
     pub verbosity: Option<Verbosity>,
@@ -1017,11 +1107,18 @@ pub struct SessionSessionLimitsChangedData {
     pub session_limits: Option<SessionLimitsConfig>,
 }
 
-/// Session event "session.permissions_changed". Permissions change details carrying the aggregate allow-all transition.
+/// Session event "session.permissions_changed". Permission-mode transition details.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SessionPermissionsChangedData {
-    /// Allow-all mode after the change
+    /// Explicit LLM judge model override used by assisted mode; omitted when the provider default applies
     ///
     /// <div class="warning">
     ///
@@ -1030,10 +1127,8 @@ pub struct SessionPermissionsChangedData {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub allow_all_permission_mode: Option<PermissionAllowAllMode>,
-    /// Aggregate allow-all flag after the change
-    pub allow_all_permissions: bool,
-    /// Allow-all mode before the change
+    pub assisted_approval_model: Option<String>,
+    /// Permission mode after the change
     ///
     /// <div class="warning">
     ///
@@ -1041,10 +1136,16 @@ pub struct SessionPermissionsChangedData {
     /// and may change or be removed in future SDK or CLI releases.
     ///
     /// </div>
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub previous_allow_all_permission_mode: Option<PermissionAllowAllMode>,
-    /// Aggregate allow-all flag before the change
-    pub previous_allow_all_permissions: bool,
+    pub mode: PermissionMode,
+    /// Permission mode before the change
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    pub previous_mode: PermissionMode,
 }
 
 /// Session event "session.plan_changed". Plan file operation details indicating what changed
@@ -1140,18 +1241,6 @@ pub struct SessionSnapshotRewindData {
     pub up_to_event_id: String,
 }
 
-/// Aggregate code change metrics for the session
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ShutdownCodeChanges {
-    /// List of file paths that were modified during the session
-    pub files_modified: Vec<String>,
-    /// Total number of lines added during the session
-    pub lines_added: i64,
-    /// Total number of lines removed during the session
-    pub lines_removed: i64,
-}
-
 /// Request count and cost metrics
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -1226,6 +1315,36 @@ pub struct ShutdownModelMetric {
     pub usage: ShutdownModelMetricUsage,
 }
 
+/// Usage attributed to one agent instance at session shutdown.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShutdownAgentMetric {
+    /// Human-readable label for this subagent invocation, copied from the originating `subagent.started` event. For task-tool subagents this is the invocation's task description rather than the agent's configured display name, so group by `agentName` for stable per-agent labels.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_display_name: Option<String>,
+    /// Configured agent name, when this is a subagent
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_name: Option<String>,
+    /// Per-model usage for this agent, keyed by model identifier
+    pub model_metrics: HashMap<String, ShutdownModelMetric>,
+    /// Time spent in model API calls by this agent, in milliseconds
+    pub total_api_duration_ms: i64,
+    /// Accumulated nano-AI units cost for this agent
+    pub total_nano_aiu: f64,
+}
+
+/// Aggregate code change metrics for the session
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShutdownCodeChanges {
+    /// List of file paths that were modified during the session
+    pub files_modified: Vec<String>,
+    /// Total number of lines added during the session
+    pub lines_added: i64,
+    /// Total number of lines removed during the session
+    pub lines_removed: i64,
+}
+
 /// A session-wide shutdown token-type entry storing the accumulated token count.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -1238,6 +1357,9 @@ pub struct ShutdownTokenDetail {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SessionShutdownData {
+    /// Per-agent usage breakdown, keyed by agent instance identifier. The main conversation uses the stable key `main`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_metrics: Option<HashMap<String, ShutdownAgentMetric>>,
     /// Aggregate code change metrics for the session
     pub code_changes: ShutdownCodeChanges,
     /// Non-system message token count at shutdown
@@ -1309,6 +1431,10 @@ pub struct SessionUsageCheckpointData {
     #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) model_cache_state: Option<Vec<UsageCheckpointModelCacheState>>,
+    /// Internal per-conversation prompt-cache-break detector baselines restored on resume
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) prompt_cache_break_state: Option<Vec<serde_json::Value>>,
     /// Session-wide accumulated nano-AI units cost at checkpoint time
     pub total_nano_aiu: f64,
     /// Total number of premium API requests used at checkpoint time
@@ -1588,6 +1714,9 @@ pub struct UserMessageData {
     /// Transformed version of the message sent to the model, with XML wrapping, timestamps, and other augmentations for prompt caching
     #[serde(skip_serializing_if = "Option::is_none")]
     pub transformed_content: Option<String>,
+    /// The agent-loop turn ID that consumed this message; absent when no agent-loop turn consumed it
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub turn_id: Option<String>,
 }
 
 /// Session event "pending_messages.modified". Empty payload; the event signals that the pending message queue has changed
@@ -1623,6 +1752,48 @@ pub struct AssistantTurnRetryData {
     pub turn_id: String,
 }
 
+/// Session event "agent.interrupted". Metadata for work the user interrupted while the agent was running
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AgentInterruptedData {
+    /// What the agent was doing when the user interrupted it
+    pub activity: AgentInterruptedActivity,
+    /// For an interrupted model call: the provider endpoint the request targeted
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub api_endpoint: Option<String>,
+    /// For an interrupted model call: whether the user interrupted before any token arrived or while the response was streaming
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cancel_phase: Option<AgentInterruptedCancelPhase>,
+    /// How long the interrupted work had been running, in milliseconds
+    pub elapsed_ms: f64,
+    /// For an interrupted background-agent batch: how many background sub-agents the stop swept. Counts accepted cancellations, so an agent cancelled as a cascade of its interrupted parent is covered by that parent rather than counted again.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub interrupted_agent_count: Option<i64>,
+    /// For an interrupted model call: the model the request targeted
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// For a mid-stream interrupt: the observed time to first observable output, in milliseconds. Deliberately distinct from the `ttftMs` reported on a successful model call, which measures time to first stream event.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub output_ttft_ms: Option<f64>,
+    /// For an interrupted model call: the reasoning effort the request asked for
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<String>,
+    /// Subset of `toolNames` whose tool metadata marks the tool name as safe to record unhashed in telemetry.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub safe_tool_names: Option<Vec<String>>,
+    /// Tool call identifiers that were still running
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_call_ids: Option<Vec<String>>,
+    /// Names of the tools that were still running. More than one when the model requested a parallel fan-out.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_names: Option<Vec<String>>,
+    /// For an interrupted model call: the transport the request used
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transport: Option<ModelCallFailureTransport>,
+    /// Zero-based agentic-loop iteration the interrupt landed in
+    pub turn: i64,
+}
+
 /// Session event "assistant.intent". Agent intent description for current activity or plan
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -1651,6 +1822,7 @@ pub struct AssistantReasoningData {
     pub content: String,
     /// Unique identifier for this reasoning block
     pub reasoning_id: String,
+    /// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rte: Option<bool>,
 }
@@ -1775,6 +1947,24 @@ pub struct Citations {
     pub spans: Vec<CitationSpan>,
 }
 
+/// Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AssistantMessageReasoningBlocks {
+    /// Provider-native reasoning content blocks (e.g. Anthropic `thinking` / `redacted_thinking`) preserved verbatim, in order. A single response can carry several, each signed over the content preceding it, so dropping or reordering any of them invalidates the rest.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub blocks: Option<Vec<serde_json::Value>>,
+    /// Model provider that produced these reasoning blocks.
+    pub provider: String,
+}
+
 /// Neutral provider-tagged server-side tool-use payload (tool search, advisor) for verbatim round-tripping
 ///
 /// <div class="warning">
@@ -1786,13 +1976,18 @@ pub struct Citations {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct AssistantMessageServerTools {
+    /// Advisor model identifier associated with the server-tool payload.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub advisor_model: Option<String>,
+    /// Provider function-call namespaces keyed by function-call identifier.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub function_call_namespaces: Option<HashMap<String, String>>,
+    /// Provider-native server-tool call and output items preserved verbatim for replay.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub items: Option<Vec<serde_json::Value>>,
+    /// Model provider that produced this server-tool payload.
     pub provider: String,
+    /// Raw provider content blocks retained for verbatim round-tripping.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub raw_content_blocks: Option<Vec<serde_json::Value>>,
 }
@@ -1875,6 +2070,9 @@ pub struct AssistantMessageData {
     /// Generation phase for phased-output models (e.g., thinking vs. response phases)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub phase: Option<String>,
+    /// Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping. `reasoningText` and `reasoningOpaque` are a lossy derived view of these blocks, retained for display.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_blocks: Option<AssistantMessageReasoningBlocks>,
     /// Opaque/encrypted extended thinking data from Anthropic models. Session-bound and stripped on resume.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reasoning_opaque: Option<String>,
@@ -1887,6 +2085,7 @@ pub struct AssistantMessageData {
     /// GitHub request tracing ID (x-github-request-id header) for correlating with server-side logs
     #[serde(skip_serializing_if = "Option::is_none")]
     pub request_id: Option<RequestId>,
+    /// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rte: Option<bool>,
     /// Neutral provider-tagged server-side tool-use payload (tool search, advisor) for verbatim round-tripping
@@ -2022,6 +2221,9 @@ pub(crate) struct AssistantUsageQuotaSnapshot {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct AssistantUsageData {
+    /// Number of accepted speculative prediction tokens
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub accepted_prediction_tokens: Option<i64>,
     /// Completion ID from the model provider (e.g., chatcmpl-abc123)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub api_call_id: Option<String>,
@@ -2032,12 +2234,20 @@ pub struct AssistantUsageData {
     #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) available_tool_count: Option<i64>,
+    /// Whether the provider reported prompt-cache usage details for this call
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) cache_details_reported: Option<bool>,
     /// Updated prompt-cache expiration for this model call. Present only when the call establishes or refreshes known cache state.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cache_expires_at: Option<String>,
     /// Number of tokens read from prompt cache
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cache_read_tokens: Option<i64>,
+    /// Effective prompt-cache lifetime in seconds for this call
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) cache_ttl_seconds: Option<i64>,
     /// Number of tokens written to prompt cache
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cache_write_tokens: Option<i64>,
@@ -2063,6 +2273,10 @@ pub struct AssistantUsageData {
     /// Finish reason reported by the model for this API call (e.g. "stop", "length", "tool_calls", "content_filter"). Normalized to OpenAI vocabulary; for Anthropic models a "refusal" stop reason maps to "content_filter".
     #[serde(skip_serializing_if = "Option::is_none")]
     pub finish_reason: Option<String>,
+    /// How the prompt-cache frontier was determined for this call
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) frontier_source: Option<String>,
     /// What initiated this API call (e.g., "sub-agent", "mcp-sampling"); absent for user-initiated calls
     #[serde(skip_serializing_if = "Option::is_none")]
     pub initiator: Option<String>,
@@ -2075,6 +2289,18 @@ pub struct AssistantUsageData {
     /// Average inter-token latency in milliseconds. Only available for streaming requests
     #[serde(skip_serializing_if = "Option::is_none")]
     pub inter_token_latency_ms: Option<f64>,
+    /// Whether Auto mode was selected for this model call
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_auto: Option<bool>,
+    /// Whether this model call used a bring-your-own-key provider
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_byok: Option<bool>,
+    /// Requested maximum output tokens used for this model call
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_output_tokens: Option<i64>,
+    /// Effective maximum prompt-token limit used for this model call
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_prompt_tokens: Option<i64>,
     /// Model identifier used for this API call
     pub model: String,
     /// Number of tool calls returned by the model
@@ -2084,6 +2310,9 @@ pub struct AssistantUsageData {
     /// Number of output tokens produced
     #[serde(skip_serializing_if = "Option::is_none")]
     pub output_tokens: Option<i64>,
+    /// Time to first observable model output in milliseconds. Includes text, reasoning, and tool-call output; only available for streaming requests that produce observable output.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub output_ttft_ms: Option<f64>,
     /// Parent tool call ID when this usage originates from a sub-agent
     #[doc(hidden)]
     #[deprecated]
@@ -2099,9 +2328,16 @@ pub struct AssistantUsageData {
     /// Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max")
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reasoning_effort: Option<String>,
+    /// Reasoning summary mode used for this model call, if applicable
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_summary: Option<ReasoningSummary>,
     /// Number of output tokens used for reasoning (e.g., chain-of-thought)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reasoning_tokens: Option<i64>,
+    /// Number of rejected speculative prediction tokens
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub rejected_prediction_tokens: Option<i64>,
+    /// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rte: Option<bool>,
     /// Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
@@ -2118,6 +2354,95 @@ pub struct AssistantUsageData {
     #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) tool_token_count: Option<i64>,
+    /// Transport used for this model call (http or websocket)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transport: Option<AssistantUsageTransport>,
+}
+
+/// Session event "prompt_cache_break". A detected loss of a previously cached prompt prefix
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PromptCacheBreakData {
+    /// Request state whose cached prefix fell short
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) after_request: Option<serde_json::Value>,
+    /// Name of the sub-agent whose conversation broke, stamped by the parent bridge
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) agent_name: Option<String>,
+    /// Request state that established the prior cache frontier
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) before_request: Option<serde_json::Value>,
+    /// Names of the cache-configuration fields that changed
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) cache_config_changed_fields: Option<Vec<String>>,
+    /// All reasons that contributed to the cache break, ordered by precedence
+    pub contributing_reasons: Vec<String>,
+    /// Prior cached prompt frontier in tokens
+    pub frontier_tokens: i64,
+    /// Model that held the prior cache frontier, when the call changed models
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) model_from: Option<String>,
+    /// Model this call targeted, when the call changed models
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) model_to: Option<String>,
+    /// The highest-precedence reason for the cache break
+    pub primary_reason: String,
+    /// Fraction of the prior cache frontier that survived
+    pub retention_ratio: f64,
+    /// Index of the first conversation message whose content changed
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) rewrite_message_index: Option<i64>,
+    /// Shape of the history rewrite, for example whether the history grew or shrank
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) rewrite_shape: Option<String>,
+    /// Subsystems that announced a history rewrite before this call, for example compaction or truncation
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) rewrite_source: Option<Vec<String>>,
+    /// Cached prefix tokens lost since the prior call
+    pub shortfall_tokens: i64,
+    /// Number of cached prefix tokens that survived
+    pub survived_tokens: i64,
+    /// Names of the system-prompt segments whose content changed
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) system_segments_changed: Option<Vec<String>>,
+    /// Telemetry-safe names of tools added since the prior call
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) tools_added: Option<Vec<String>>,
+    /// Raw names of tools added since the prior call, restricted because a tool name can be user-authored
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) tools_added_raw: Option<Vec<String>>,
+    /// Telemetry-safe names of tools whose definition changed since the prior call
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) tools_redefined: Option<Vec<String>>,
+    /// Raw names of tools redefined since the prior call, restricted because a tool name can be user-authored
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) tools_redefined_raw: Option<Vec<String>>,
+    /// Telemetry-safe names of tools removed since the prior call
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) tools_removed: Option<Vec<String>>,
+    /// Raw names of tools removed since the prior call, restricted because a tool name can be user-authored
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) tools_removed_raw: Option<Vec<String>>,
+    /// Whether the tool list kept its members but changed their order
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) tools_reordered: Option<bool>,
 }
 
 /// Content-free structural summary of the failing request for diagnosing malformed 4xx calls
@@ -2172,6 +2497,9 @@ pub struct ModelCallFailureData {
     /// What initiated this API call (e.g., "sub-agent", "mcp-sampling"); absent for user-initiated calls
     #[serde(skip_serializing_if = "Option::is_none")]
     pub initiator: Option<String>,
+    /// Authoritative interaction classification for the failed call, matching `assistant.usage.interactionType` (for example `conversation-agent`, `conversation-subagent`, or `conversation-sampling`). Absent when the producer cannot classify the interaction.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub interaction_type: Option<String>,
     /// Whether the session selected Auto mode for the failed call
     #[serde(skip_serializing_if = "Option::is_none")]
     pub is_auto: Option<bool>,
@@ -2200,6 +2528,7 @@ pub struct ModelCallFailureData {
     /// Content-free structural summary of the failing request. Contains only counts and shape flags (no prompt content), so it is safe for unrestricted telemetry. Populated only for client-error (4xx) failures.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub request_fingerprint: Option<ModelCallFailureRequestFingerprint>,
+    /// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rte: Option<bool>,
     /// Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
@@ -2215,6 +2544,26 @@ pub struct ModelCallFailureData {
     pub transport: Option<ModelCallFailureTransport>,
 }
 
+/// Session event "model.call_finished". Final lifecycle outcome for one logical model dispatch. A logical dispatch may include internal reconnect or fallback work, so event count is not provider HTTP-request count.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelCallFinishedData {
+    /// Whether an accepted successful response requested the exact name and command semantics of a built-in file edit tool, including an external tool explicitly replacing that built-in name. Absent when the logical dispatch did not produce an accepted response.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub contains_built_in_file_edit_request: Option<bool>,
+    /// Monotonic elapsed time spent in the logical model dispatch, including any internal transport reconnect or fallback and excluding orchestrator retry backoff, tool execution, confirmations, and post-response processing
+    pub dispatch_duration_ms: f64,
+    /// Version of the built-in file-edit semantic classifier used for this event
+    pub edit_classifier_version: i64,
+    /// Identifier of the user interaction that owns the model dispatch, matching assistant.turn_start.interactionId when available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub interaction_id: Option<String>,
+    /// Final outcome after post-response acceptance processing
+    pub outcome: ModelCallFinishedOutcome,
+    /// Agent-loop iteration within the interaction that initiated the model dispatch
+    pub turn_id: String,
+}
+
 /// Session event "model.call_start". Model API dispatch metadata for internal telemetry
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -2330,6 +2679,7 @@ pub struct ToolExecutionStartData {
     #[deprecated]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub parent_tool_call_id: Option<String>,
+    /// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rte: Option<bool>,
     /// Shell-tool path hints derived from the command at start time for shell tools (bash/powershell/local_shell). Produced by the same shell-aware extractor as PermissionRequestShell.possiblePaths, so it is present even when the command is auto-approved and no permission request fires. Absent for non-shell tools.
@@ -2378,7 +2728,25 @@ pub struct ToolExecutionCompleteError {
     pub message: String,
 }
 
-/// A source supplied by a tool that should be made available to the model as citable content.
+/// Binary result returned by a tool for the model
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PersistedBinaryImage {
+    /// Base64-encoded binary data
+    pub data: String,
+    /// Human-readable description of the binary data
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Optional metadata from the producing tool.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub metadata: Option<HashMap<String, serde_json::Value>>,
+    /// MIME type of the binary data
+    pub mime_type: String,
+    /// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+    pub r#type: PersistedBinaryImageType,
+}
+
+/// A binary result whose data was omitted from persistence due to the inline size limit
 ///
 /// <div class="warning">
 ///
@@ -2388,31 +2756,85 @@ pub struct ToolExecutionCompleteError {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CitableSource {
-    /// The source text made available to the model as citable content.
-    pub content: String,
-    /// Stable identifier for this source within the tool result. Used for deduplication and may be used by future provider integrations to correlate response citations back to the originating source.
-    pub id: String,
-    /// File path relative to the agent's workspace root, when the source is a file.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// Human-readable title of the source.
+pub struct OmittedBinaryResult {
+    /// Decoded byte length of the omitted binary data
+    pub byte_length: i64,
+    /// Human-readable description of the binary data
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// URL of the source, when it is a web resource.
+    pub description: Option<String>,
+    /// Optional metadata from the producing tool.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub url: Option<String>,
+    pub metadata: Option<HashMap<String, serde_json::Value>>,
+    /// MIME type of the omitted binary data
+    pub mime_type: String,
+    /// Why the binary data is absent: it exceeded the inline size limit, or its asset was unavailable
+    pub omitted_reason: OmittedBinaryOmittedReason,
+    /// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+    pub r#type: OmittedBinaryType,
 }
 
-/// Plain text content block
+/// A reference to binary data persisted once on a session.binary_asset event and shared by id
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ToolExecutionCompleteContentText {
-    /// The text content
-    pub text: String,
-    /// Content block type discriminator
-    pub r#type: ToolExecutionCompleteContentTextType,
-}
+pub struct BinaryAssetReference {
+    /// Content-addressed id of the session.binary_asset event that holds this binary's bytes (e.g. "sha256:...").
+    pub asset_id: String,
+    /// Decoded byte length of the referenced binary data
+    pub byte_length: i64,
+    /// Human-readable description of the binary data
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Optional metadata from the producing tool.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub metadata: Option<HashMap<String, serde_json::Value>>,
+    /// MIME type of the referenced binary data
+    pub mime_type: String,
+    /// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+    pub r#type: BinaryAssetReferenceType,
+}
+
+/// A source supplied by a tool that should be made available to the model as citable content.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CitableSource {
+    /// The source text made available to the model as citable content.
+    pub content: String,
+    /// Stable identifier for this source within the tool result. Used for deduplication and may be used by future provider integrations to correlate response citations back to the originating source.
+    pub id: String,
+    /// File path relative to the agent's workspace root, when the source is a file.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<String>,
+    /// Human-readable title of the source.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    /// URL of the source, when it is a web resource.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub url: Option<String>,
+}
+
+/// Plain text content block
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ToolExecutionCompleteContentText {
+    /// The text content
+    pub text: String,
+    /// Content block type discriminator
+    pub r#type: ToolExecutionCompleteContentTextType,
+}
 
 /// Deprecated for shell command exit metadata. Use ToolExecutionCompleteContentShellExit instead.
 #[doc(hidden)]
@@ -2561,12 +2983,16 @@ pub struct ToolExecutionCompleteContentResource {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ToolExecutionCompleteUIResourceMetaUICsp {
+    /// Domains the UI resource may use as document base URIs.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub base_uri_domains: Option<Vec<String>>,
+    /// Domains the UI resource may connect to.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub connect_domains: Option<Vec<String>>,
+    /// Domains the UI resource may embed as nested frames.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub frame_domains: Option<Vec<String>>,
+    /// Domains from which the UI resource may load scripts, styles, images, and other resources.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub resource_domains: Option<Vec<String>>,
 }
@@ -2616,11 +3042,13 @@ pub struct ToolExecutionCompleteUIResourceMetaUI {
     /// CSP domain allowlists for an MCP Apps UI resource, including connect, resource, frame, and base URI domains.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub csp: Option<ToolExecutionCompleteUIResourceMetaUICsp>,
+    /// Optional dedicated origin for the rendered MCP Apps UI resource.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub domain: Option<String>,
     /// Browser permission metadata for an MCP Apps UI resource, including camera, microphone, geolocation, and clipboard-write.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub permissions: Option<ToolExecutionCompleteUIResourceMetaUIPermissions>,
+    /// Whether the host should render a border around the MCP Apps UI resource.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub prefers_border: Option<bool>,
 }
@@ -2666,7 +3094,7 @@ pub struct ToolExecutionCompleteResult {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub binary_results_for_llm: Option<Vec<serde_json::Value>>,
+    pub binary_results_for_llm: Option<Vec<PersistedBinaryResult>>,
     /// Provider-neutral source material this tool makes available to the model as citable content. Persisted so it survives session resume. Experimental.
     ///
     /// <div class="warning">
@@ -2772,6 +3200,7 @@ pub struct ToolExecutionCompleteData {
     /// Tool execution result on success
     #[serde(skip_serializing_if = "Option::is_none")]
     pub result: Option<ToolExecutionCompleteResult>,
+    /// Per-request treatment/eligibility signal returned by the Copilot API in the `X-GitHub-Copilot-Request-TE` response header for the associated model call; `false` when the header was absent or unparseable.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rte: Option<bool>,
     /// Whether this tool execution ran inside a sandbox container
@@ -2835,6 +3264,11 @@ pub struct SkillInvokedData {
     pub trigger: Option<SkillInvokedTrigger>,
 }
 
+/// Session event "sandbox.decision". Payload of `sandbox.decision`, a bounded governance record of what the process sandbox was configured to do and whether it took effect. Discriminated by `kind`.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SandboxDecisionData {}
+
 /// Session event "subagent.started". Sub-agent startup details including parent tool call and agent information
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -2845,6 +3279,9 @@ pub struct SubagentStartedData {
     pub agent_display_name: String,
     /// Internal name of the sub-agent
     pub agent_name: String,
+    /// Root id of the factory run that spawned this sub-agent, when it was spawned by one.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub factory_run_id: Option<String>,
     /// Model the sub-agent will run with, when known at start.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub model: Option<String>,
@@ -2860,9 +3297,27 @@ pub struct SubagentCompletedData {
     pub agent_display_name: String,
     /// Internal name of the sub-agent
     pub agent_name: String,
+    /// Whether the sub-agent was torn down by cancellation - its own abort, or an ancestor being killed - instead of finishing its work. Cancellation is not a failure, so the run still reports completion; this distinguishes a torn-down sub-agent from one that ran to the end.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cancelled: Option<bool>,
+    /// Whether the first model actually dispatched matched the user's configured preference
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub configured_model_matches_actual: Option<bool>,
+    /// Concrete model the user configured for this sub-agent via `/subagents`, when present
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub configured_model_preference: Option<String>,
     /// Wall-clock duration of the sub-agent execution in milliseconds
     #[serde(skip_serializing_if = "Option::is_none")]
     pub duration_ms: Option<i64>,
+    /// Whether the explicit task-call model matched the user's configured preference
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub explicit_model_matches_preference: Option<bool>,
+    /// Explicit model supplied by the parent agent on the task call, when present
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub explicit_model_override: Option<String>,
+    /// First model for which the sub-agent started an inference request, when one was dispatched
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub first_dispatched_model: Option<String>,
     /// Model used by the sub-agent
     #[serde(skip_serializing_if = "Option::is_none")]
     pub model: Option<String>,
@@ -2884,11 +3339,26 @@ pub struct SubagentFailedData {
     pub agent_display_name: String,
     /// Internal name of the sub-agent
     pub agent_name: String,
+    /// Whether the first model actually dispatched matched the user's configured preference
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub configured_model_matches_actual: Option<bool>,
+    /// Concrete model the user configured for this sub-agent via `/subagents`, when present
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub configured_model_preference: Option<String>,
     /// Wall-clock duration of the sub-agent execution in milliseconds
     #[serde(skip_serializing_if = "Option::is_none")]
     pub duration_ms: Option<i64>,
     /// Error message describing why the sub-agent failed
     pub error: String,
+    /// Whether the explicit task-call model matched the user's configured preference
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub explicit_model_matches_preference: Option<bool>,
+    /// Explicit model supplied by the parent agent on the task call, when present
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub explicit_model_override: Option<String>,
+    /// First model for which the sub-agent started an inference request, when one was dispatched
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub first_dispatched_model: Option<String>,
     /// Model selected for the sub-agent, when known
     #[serde(skip_serializing_if = "Option::is_none")]
     pub model: Option<String>,
@@ -3173,6 +3643,16 @@ pub struct PermissionRequestMcp {
     /// When true, managed policy requires an explicit user decision and automatic approval must be bypassed.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub managed_approval_required: Option<bool>,
+    /// Advisory runtime permission recommendation. The SDK host remains responsible for deciding the request and may reject it.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permission_recommendation: Option<PermissionRecommendation>,
     /// Whether this MCP tool is read-only (no side effects)
     pub read_only: bool,
     /// Name of the MCP server providing the tool
@@ -3213,6 +3693,30 @@ pub struct PermissionRequestUrl {
     pub url: String,
 }
 
+/// Assisted-approval judge information attached to a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PermissionAssistedApproval {
+    /// Classified cause of an `error` recommendation. Absent for every other recommendation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub failure_reason: Option<AssistedApprovalJudgeFailureReason>,
+    /// Model id that produced the recommendation, when the judge was consulted and reported one. Absent for `excluded` (the judge was not consulted) and for failures that occurred before a model was selected.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Human-readable reason for the judge's recommendation, when available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// The assisted-approval safety judge's outcome for this request.
+    pub recommendation: AssistedApprovalRecommendation,
+}
+
 /// Memory operation permission request
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -3220,6 +3724,16 @@ pub struct PermissionRequestMemory {
     /// Whether this is a store or vote memory operation
     #[serde(skip_serializing_if = "Option::is_none")]
     pub action: Option<PermissionRequestMemoryAction>,
+    /// Assisted-approval judge information for this request; present only in assisted mode.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Source references for the stored fact (store only)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub citations: Option<String>,
@@ -3236,6 +3750,12 @@ pub struct PermissionRequestMemory {
     /// Reason for the vote (vote only)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reason: Option<String>,
+    /// Repository name with owner associated with the stored memory (store only)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_nwo: Option<String>,
+    /// Scope of the stored memory (store only)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub scope: Option<PermissionRequestMemoryScope>,
     /// Topic or subject of the memory (store only)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub subject: Option<String>,
@@ -3256,6 +3776,9 @@ pub struct PermissionRequestCustomTool {
     /// When true, managed policy requires an explicit user decision and automatic approval must be bypassed.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub managed_approval_required: Option<bool>,
+    /// Whether the tool declared that permission may be skipped unless a deny rule matches
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skip_permission: Option<bool>,
     /// Tool call ID that triggered this permission request
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tool_call_id: Option<String>,
@@ -3325,12 +3848,16 @@ pub struct PermissionRequestFactory {
     pub approval_key: String,
     /// Whether this factory is eligible for persistent approval
     pub can_persist_approval: bool,
+    /// Factory-declared AI-credit limit before any run/resume caller override is applied.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub declared_max_ai_credits: Option<f64>,
+    /// Factory-declared concurrent-subagent limit before any run/resume caller override is applied.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub declared_max_concurrent_subagents: Option<i64>,
+    /// Factory-declared total-subagent limit before any run/resume caller override is applied.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub declared_max_total_subagents: Option<i64>,
+    /// Factory-declared active-time limit in seconds before any run/resume caller override is applied.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub declared_timeout_seconds: Option<f64>,
     /// Factory description
@@ -3381,35 +3908,29 @@ pub struct PermissionRequestExtensionPermissionAccess {
     pub tool_call_id: Option<String>,
 }
 
-/// Auto-approval judge information attached to a permission request. Present (non-null) only when the session's allow-all mode is "auto"; its absence means auto mode was off and the judge did not evaluate the request. The `recommendation` conveys the judge's disposition for this request.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// Extension sensitive environment variable access request
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PermissionAutoApproval {
-    /// Classified cause of an `error` recommendation. Absent for every other recommendation.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub failure_reason: Option<AutoApprovalJudgeFailureReason>,
-    /// Model id that produced the recommendation, when the judge was consulted and reported one. Absent for `excluded` (the judge was not consulted) and for failures that occurred before a model was selected.
+pub struct PermissionRequestExtensionEnvAccess {
+    /// Names of the sensitive environment variables the extension is requesting. Values never appear here.
+    pub environment_variables: Vec<String>,
+    /// Name of the extension requesting environment variable access
+    pub extension_name: String,
+    /// Permission kind discriminator
+    pub kind: PermissionRequestExtensionEnvAccessKind,
+    /// When true, managed policy requires an explicit user decision and automatic approval must be bypassed.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Human-readable reason for the judge's recommendation, when available.
+    pub managed_approval_required: Option<bool>,
+    /// Tool call ID that triggered this permission request
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-    /// The auto-approval safety judge's outcome for this request.
-    pub recommendation: AutoApprovalRecommendation,
+    pub tool_call_id: Option<String>,
 }
 
 /// Shell command permission prompt
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PermissionPromptRequestCommands {
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3418,7 +3939,7 @@ pub struct PermissionPromptRequestCommands {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Whether the UI can offer session-wide approval for this command pattern
     pub can_offer_session_approval: bool,
     /// Command identifiers covered by this approval prompt
@@ -3444,7 +3965,7 @@ pub struct PermissionPromptRequestCommands {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PermissionPromptRequestWrite {
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3453,7 +3974,7 @@ pub struct PermissionPromptRequestWrite {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Whether the UI can offer session-wide approval for file write operations
     pub can_offer_session_approval: bool,
     /// Unified diff showing the proposed changes
@@ -3479,7 +4000,7 @@ pub struct PermissionPromptRequestWrite {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PermissionPromptRequestRead {
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3488,7 +4009,7 @@ pub struct PermissionPromptRequestRead {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Human-readable description of why the file is being read
     pub intention: String,
     /// Prompt kind discriminator
@@ -3510,7 +4031,7 @@ pub struct PermissionPromptRequestMcp {
     /// Arguments to pass to the MCP tool
     #[serde(skip_serializing_if = "Option::is_none")]
     pub args: Option<serde_json::Value>,
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3519,9 +4040,22 @@ pub struct PermissionPromptRequestMcp {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
+    /// Whether the host may offer a server-wide "approve all tools from this server" blanket. Absent is treated as true; the runtime sends false when managed policy disables bypass-permissions mode, which forbids the server-wide escalation while still allowing per-tool approval.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub can_offer_server_wide_approval: Option<bool>,
     /// Prompt kind discriminator
     pub kind: PermissionPromptRequestMcpKind,
+    /// Advisory runtime permission recommendation. The host remains responsible for deciding the request and may reject it.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permission_recommendation: Option<PermissionRecommendation>,
     /// Name of the MCP server providing the tool
     pub server_name: String,
     /// Tool call ID that triggered this permission request
@@ -3537,7 +4071,7 @@ pub struct PermissionPromptRequestMcp {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PermissionPromptRequestUrl {
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3546,7 +4080,7 @@ pub struct PermissionPromptRequestUrl {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Human-readable description of why the URL is being accessed
     pub intention: String,
     /// Prompt kind discriminator
@@ -3577,7 +4111,7 @@ pub struct PermissionPromptRequestMemory {
     /// Whether this is a store or vote memory operation
     #[serde(skip_serializing_if = "Option::is_none")]
     pub action: Option<PermissionRequestMemoryAction>,
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3586,7 +4120,7 @@ pub struct PermissionPromptRequestMemory {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Source references for the stored fact (store only)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub citations: Option<String>,
@@ -3615,7 +4149,7 @@ pub struct PermissionPromptRequestCustomTool {
     /// Arguments to pass to the custom tool
     #[serde(skip_serializing_if = "Option::is_none")]
     pub args: Option<serde_json::Value>,
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3624,7 +4158,7 @@ pub struct PermissionPromptRequestCustomTool {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Prompt kind discriminator
     pub kind: PermissionPromptRequestCustomToolKind,
     /// Tool call ID that triggered this permission request
@@ -3642,7 +4176,7 @@ pub struct PermissionPromptRequestCustomTool {
 pub struct PermissionPromptRequestPath {
     /// Underlying permission kind that needs path approval
     pub access_kind: PermissionPromptRequestPathAccessKind,
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3651,7 +4185,7 @@ pub struct PermissionPromptRequestPath {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Prompt kind discriminator
     pub kind: PermissionPromptRequestPathKind,
     /// File paths that require explicit approval
@@ -3665,7 +4199,7 @@ pub struct PermissionPromptRequestPath {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PermissionPromptRequestHook {
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3674,7 +4208,7 @@ pub struct PermissionPromptRequestHook {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Optional message from the hook explaining why confirmation is needed
     #[serde(skip_serializing_if = "Option::is_none")]
     pub hook_message: Option<String>,
@@ -3694,7 +4228,7 @@ pub struct PermissionPromptRequestHook {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PermissionPromptRequestExtensionManagement {
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3703,7 +4237,7 @@ pub struct PermissionPromptRequestExtensionManagement {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Name of the extension being managed
     #[serde(skip_serializing_if = "Option::is_none")]
     pub extension_name: Option<String>,
@@ -3722,7 +4256,7 @@ pub struct PermissionPromptRequestExtensionManagement {
 pub struct PermissionPromptRequestFactory {
     /// Canonical key used for scoped factory approvals
     pub approval_key: String,
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3731,15 +4265,19 @@ pub struct PermissionPromptRequestFactory {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Whether this factory is eligible for persistent approval
     pub can_persist_approval: bool,
+    /// Factory-declared AI-credit limit before any run/resume caller override is applied.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub declared_max_ai_credits: Option<f64>,
+    /// Factory-declared concurrent-subagent limit before any run/resume caller override is applied.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub declared_max_concurrent_subagents: Option<i64>,
+    /// Factory-declared total-subagent limit before any run/resume caller override is applied.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub declared_max_total_subagents: Option<i64>,
+    /// Factory-declared active-time limit in seconds before any run/resume caller override is applied.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub declared_timeout_seconds: Option<f64>,
     /// Factory description
@@ -3776,7 +4314,7 @@ pub struct PermissionPromptRequestFactory {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PermissionPromptRequestExtensionPermissionAccess {
-    /// Auto-approval judge information for this request; present only when auto mode is enabled.
+    /// Assisted-approval judge information for this request; present only in assisted mode.
     ///
     /// <div class="warning">
     ///
@@ -3785,7 +4323,7 @@ pub struct PermissionPromptRequestExtensionPermissionAccess {
     ///
     /// </div>
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auto_approval: Option<PermissionAutoApproval>,
+    pub assisted_approval: Option<PermissionAssistedApproval>,
     /// Capabilities the extension is requesting
     pub capabilities: Vec<String>,
     /// Name of the extension requesting permission access
@@ -3797,6 +4335,31 @@ pub struct PermissionPromptRequestExtensionPermissionAccess {
     pub tool_call_id: Option<String>,
 }
 
+/// Extension sensitive environment variable access prompt
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PermissionPromptRequestExtensionEnvAccess {
+    /// Assisted-approval judge information for this request; present only in assisted mode.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This type is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases.
+    ///
+    /// </div>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub assisted_approval: Option<PermissionAssistedApproval>,
+    /// Names of the sensitive environment variables the extension is requesting. Values never appear here.
+    pub environment_variables: Vec<String>,
+    /// Name of the extension requesting environment variable access
+    pub extension_name: String,
+    /// Prompt kind discriminator
+    pub kind: PermissionPromptRequestExtensionEnvAccessKind,
+    /// Tool call ID that triggered this permission request
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_call_id: Option<String>,
+}
+
 /// Session event "permission.requested". Permission request notification requiring client approval with request details
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -3822,6 +4385,9 @@ pub struct PermissionRequestedData {
 pub struct PermissionApproved {
     /// The permission request was approved
     pub kind: PermissionApprovedKind,
+    /// Whether a managed approval policy already handled this request
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed_approval_handled: Option<bool>,
 }
 
 /// Session-scoped tool-approval rule for specific shell command identifiers.
@@ -3912,6 +4478,18 @@ pub struct UserToolSessionApprovalExtensionPermissionAccess {
     pub kind: UserToolSessionApprovalExtensionPermissionAccessKind,
 }
 
+/// Session-scoped tool-approval rule for an extension's access to sensitive environment variables, keyed by extension name and the exact set of variable names.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UserToolSessionApprovalExtensionEnvAccess {
+    /// Names of the sensitive environment variables this approval covers. Values are never persisted.
+    pub environment_variables: Vec<String>,
+    /// Extension name
+    pub extension_name: String,
+    /// Extension environment access approval kind
+    pub kind: UserToolSessionApprovalExtensionEnvAccessKind,
+}
+
 /// Permission response variant that approves a request and remembers the provided approval for the rest of the session.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -3920,6 +4498,9 @@ pub struct PermissionApprovedForSession {
     pub approval: UserToolSessionApproval,
     /// Approved and remembered for the rest of the session
     pub kind: PermissionApprovedForSessionKind,
+    /// Whether a managed approval policy already handled this request
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed_approval_handled: Option<bool>,
 }
 
 /// Permission response variant that approves a request and persists the provided approval to a project location key.
@@ -3932,6 +4513,9 @@ pub struct PermissionApprovedForLocation {
     pub kind: PermissionApprovedForLocationKind,
     /// The location key (git root or cwd) to persist the approval to
     pub location_key: String,
+    /// Whether a managed approval policy already handled this request
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed_approval_handled: Option<bool>,
 }
 
 /// Permission response variant indicating the request was cancelled before use, with an optional reason.
@@ -4264,6 +4848,32 @@ pub struct SessionCustomNotificationData {
     pub version: Option<i64>,
 }
 
+/// Session event "ui.ephemeral_query". Ordered output and terminal state for a transient query that does not modify conversation history.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UiEphemeralQueryData {
+    /// Full response text, present for the `completed` phase.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub answer: Option<String>,
+    /// Ordered text delta, present for the `chunk` phase.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub chunk: Option<String>,
+    /// Model or transport failure message, present for the `failed` phase.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Current query lifecycle phase.
+    pub phase: UIEphemeralQueryPhase,
+    /// Runtime-minted query identifier.
+    pub request_id: RequestId,
+}
+
 /// Session event "external_tool.requested". External tool invocation request for client-side tool execution
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -4271,6 +4881,9 @@ pub struct ExternalToolRequestedData {
     /// Arguments to pass to the external tool
     #[serde(skip_serializing_if = "Option::is_none")]
     pub arguments: Option<serde_json::Value>,
+    /// Stable provider identity captured with an extension-owned tool definition; hosts use it to route the request to the same provider that was offered to the model
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_id: Option<String>,
     /// Unique identifier for this request; used to respond via session.respondToExternalTool()
     pub request_id: RequestId,
     /// Session ID that this external tool request belongs to
@@ -4447,7 +5060,7 @@ pub struct SessionAutoModeResolvedData {
     pub sticky_override: Option<bool>,
 }
 
-/// Session event "session.managed_settings_resolved". Enterprise managed-settings resolution: the effective managed settings the session applied and where they came from, so SDK clients can show users what is enterprise-managed and by which authority. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted; for a session-independent pull, use the SDK `getManagedSettings()` API, which returns the identical payload. Managed settings have a single authoritative source, so the highest-authority present layer (server > device) wins wholesale; `bypassPermissionsDisabled` is deny-wins across layers. Marked experimental while the managed-settings surface stabilizes.
+/// Session event "session.managed_settings_resolved". Enterprise managed-settings resolution: the effective managed settings the session applied and which channels contributed, so SDK clients can show users what is enterprise-managed. Fires whenever managed policy is (re)applied — at session start, on resume, and on account switch. This is an ephemeral live snapshot (delivered to subscribers but not persisted to the session event log), because at session start it resolves before `session.start` is emitted. Device values take precedence over server values per ordinary key, while permissions compose restrictively across device, server, and SDK-client layers. The account-scoped `getManagedSettings()` API does not include session-local client injection. Marked experimental while the managed-settings surface stabilizes.
 ///
 /// <div class="warning">
 ///
@@ -4460,21 +5073,27 @@ pub struct SessionAutoModeResolvedData {
 pub struct SessionManagedSettingsResolvedData {
     /// Whether enterprise policy disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers, and forced on when `failClosed` is true.
     pub bypass_permissions_disabled: bool,
-    /// Whether the device (MDM/plist/registry/file) managed-settings layer was present
+    /// Whether a session-local permissions layer injected by the SDK host was present
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_managed: Option<bool>,
+    /// Whether an actual device MDM/plist/registry/file managed-settings layer was present
     pub device_managed: bool,
     /// Whether managed policy could not be determined (e.g. a failed server fetch) and the session fell back to the fail-closed restriction. When true, restrictions such as disabling bypass-permissions are enforced even though `settings` may be absent.
     pub fail_closed: bool,
     /// The setting keys under enterprise management in the effective managed settings (e.g. `model`, `enabledPlugins`, `permissions`). Empty when no managed settings are in force.
     pub managed_keys: Vec<String>,
-    /// Whether server and device each supplied a permission allowlist, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.
+    /// Whether at least two managed sources supplied permission allowlists, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub permissions_allow_intersected: Option<bool>,
+    /// Whether the effective sandbox policy forces the sandbox on *only* because managed policy could not be determined, rather than because the policy requires it. Lets clients tell a user whose `--no-sandbox` was overridden that the sandbox stayed on as a fail-closed fallback, instead of attributing it to an administrator who set no such policy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_enabled_by_undetermined_policy: Option<bool>,
     /// Whether the server (account/org) managed-settings layer was present
     pub server_managed: bool,
     /// The effective (resolved) managed settings values, so clients can render exactly what is enforced. Absent when no managed policy is in force.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub settings: Option<serde_json::Value>,
-    /// Which channel supplied the effective managed settings (the winning layer), or `none` when no policy is in force
+    /// Channel summary: `server`, `device`, or `client` when exactly one channel contributed; `mixed` when multiple channels contributed; otherwise `none`. Consult the per-channel booleans for exact provenance.
     pub source: ManagedSettingsResolvedSource,
 }
 
@@ -4551,6 +5170,9 @@ pub struct CapabilitiesChangedData {
 pub struct ExitPlanModeRequestedData {
     /// Available actions the user can take
     pub actions: Vec<ExitPlanModeAction>,
+    /// Model the session had selected when the plan was authored, when one is known
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
     /// Full content of the plan file
     pub plan_content: String,
     /// Recommended action to preselect for the user
@@ -4607,7 +5229,53 @@ pub struct SessionBackgroundTasksChangedData {}
 pub struct FactoryRunUpdatedData {
     /// Monotonic revision now available for the run.
     pub revision: i64,
+    /// Factory run identifier.
+    pub run_id: String,
+}
+
+/// Session event "factory.run_started". Ephemeral signal that a factory run attempt began executing.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FactoryRunStartedData {
+    /// Attempt number this start committed; a resumed run increments it.
+    pub attempt: i64,
+    /// Name of the factory this run executes. Low cardinality by construction.
+    pub factory_name: String,
+    /// Identifier of the factory run that started.
+    pub run_id: String,
+}
+
+/// Session event "factory.run_settled". Ephemeral signal that a factory run reached a terminal status.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FactoryRunSettledData {
+    /// AI credits this run consumed, in nano-AIU.
+    pub consumed_nano_aiu: i64,
+    /// Subagents this run consumed against its limits.
+    pub consumed_subagents: i64,
+    /// Active milliseconds accumulated across every attempt of this run.
+    pub elapsed_ms: i64,
+    /// Typed failure class recorded on the run, when it failed with one (e.g. `factory_limit_reached`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub failure_type: Option<String>,
+    /// Identifier of the factory run that settled.
     pub run_id: String,
+    /// Terminal status the run committed.
+    pub status: FactoryRunSettledStatus,
 }
 
 /// A single resolved skill in `session.skills_loaded`, including source, invocability, enabled state, path, and argument hint.
@@ -4617,6 +5285,9 @@ pub struct SkillsLoadedSkill {
     /// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
     #[serde(skip_serializing_if = "Option::is_none")]
     pub argument_hint: Option<String>,
+    /// Canonical slash command name used to invoke the skill, without the leading '/'
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub command_name: Option<String>,
     /// Description of what the skill does
     pub description: String,
     /// Whether the skill is currently enabled
@@ -5084,6 +5755,24 @@ pub enum Verbosity {
     Unknown,
 }
 
+/// The session mode the agent is operating in
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SessionMode {
+    /// The agent is responding interactively to the user.
+    #[serde(rename = "interactive")]
+    Interactive,
+    /// The agent is preparing a plan before making changes.
+    #[serde(rename = "plan")]
+    Plan,
+    /// The agent is working autonomously toward task completion.
+    #[serde(rename = "autopilot")]
+    Autopilot,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Who created the schedule: `user` (an explicit user action such as `/every` or `/after`) or `model` (the agent via the `manage_schedule` tool). Gates whether a scheduled skill that opted out of model invocation may fire: only user-created schedules may.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ScheduleOrigin {
@@ -5138,25 +5827,49 @@ pub enum AutopilotObjectiveChangedStatus {
     Unknown,
 }
 
-/// The session mode the agent is operating in
+/// Origin of an effective session model change.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum SessionMode {
-    /// The agent is responding interactively to the user.
-    #[serde(rename = "interactive")]
-    Interactive,
-    /// The agent is preparing a plan before making changes.
-    #[serde(rename = "plan")]
-    Plan,
-    /// The agent is working autonomously toward task completion.
-    #[serde(rename = "autopilot")]
-    Autopilot,
+pub enum ModelChangeSource {
+    /// The user selected a model directly with `/model <id>`.
+    #[serde(rename = "model_command")]
+    ModelCommand,
+    /// The user selected the model with `/settings`.
+    #[serde(rename = "settings_command")]
+    SettingsCommand,
+    /// The user selected the model with the `/config` alias.
+    #[serde(rename = "config_command")]
+    ConfigCommand,
+    /// The user selected the model in the model picker, including the picker opened by bare `/model`.
+    #[serde(rename = "model_picker")]
+    ModelPicker,
+    /// Organization-managed settings selected the model.
+    #[serde(rename = "managed_settings")]
+    ManagedSettings,
+    /// Repository settings selected the model.
+    #[serde(rename = "repo_settings")]
+    RepoSettings,
+    /// Startup model resolution selected the model.
+    #[serde(rename = "startup")]
+    Startup,
+    /// Selecting an agent selected its configured model.
+    #[serde(rename = "agent")]
+    Agent,
+    /// Entering, leaving, or reconfiguring plan mode selected the model.
+    #[serde(rename = "plan_mode")]
+    PlanMode,
+    /// The runtime selected the model automatically, such as rate-limit recovery or refusal fallback.
+    #[serde(rename = "automatic")]
+    Automatic,
+    /// An SDK or RPC caller selected the model.
+    #[serde(rename = "sdk")]
+    Sdk,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// Allow-all mode for the session.
+/// Permission mode for the session.
 ///
 /// <div class="warning">
 ///
@@ -5165,16 +5878,16 @@ pub enum SessionMode {
 ///
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum PermissionAllowAllMode {
+pub enum PermissionMode {
     /// Permission requests follow the normal approval flow.
-    #[serde(rename = "off")]
-    Off,
+    #[serde(rename = "manual")]
+    Manual,
+    /// Permission requests include an LLM safety recommendation; clients may automatically approve requests judged acceptable.
+    #[serde(rename = "assisted")]
+    Assisted,
     /// Tool, path, and URL permission requests are automatically approved.
-    #[serde(rename = "on")]
-    On,
-    /// Permission requests follow the normal approval flow with an LLM advisory recommendation attached; clients may choose to auto-approve requests the judge evaluated as acceptable.
-    #[serde(rename = "auto")]
-    Auto,
+    #[serde(rename = "allow-all")]
+    AllowAll,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
@@ -5325,35 +6038,86 @@ pub enum UserMessageDelivery {
     Unknown,
 }
 
-/// Tool call type: "function" for standard tool calls, "custom" for grammar-based tool calls. Defaults to "function" when absent.
+/// What the agent was doing when the user interrupted it.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AssistantMessageToolRequestType {
-    /// Standard function-style tool call.
-    #[serde(rename = "function")]
-    Function,
-    /// Custom grammar-based tool call.
-    #[serde(rename = "custom")]
-    Custom,
+pub enum AgentInterruptedActivity {
+    /// A request to the model was open.
+    #[serde(rename = "model_call")]
+    ModelCall,
+    /// The turn was sleeping between retry attempts.
+    #[serde(rename = "retry_backoff")]
+    RetryBackoff,
+    /// One or more tools were executing.
+    #[serde(rename = "tool_call")]
+    ToolCall,
+    /// Background sub-agents were running while the main loop was idle.
+    #[serde(rename = "background_agent")]
+    BackgroundAgent,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
     Unknown,
 }
 
-/// The system that produced a citation.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
+/// Where the interruption landed relative to the first streamed token.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum CitationProvider {
-    /// Citation produced by an Anthropic (Claude) model response.
-    #[serde(rename = "anthropic")]
-    Anthropic,
-    /// Citation produced by an OpenAI model response.
+pub enum AgentInterruptedCancelPhase {
+    /// No output had been produced when the request was cancelled.
+    #[serde(rename = "pre_first_token")]
+    PreFirstToken,
+    /// The response was already streaming when the request was cancelled.
+    #[serde(rename = "mid_stream")]
+    MidStream,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Transport used for a failed model call
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ModelCallFailureTransport {
+    /// HTTP transport, including SSE streams.
+    #[serde(rename = "http")]
+    Http,
+    /// WebSocket transport.
+    #[serde(rename = "websocket")]
+    Websocket,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Tool call type: "function" for standard tool calls, "custom" for grammar-based tool calls. Defaults to "function" when absent.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AssistantMessageToolRequestType {
+    /// Standard function-style tool call.
+    #[serde(rename = "function")]
+    Function,
+    /// Custom grammar-based tool call.
+    #[serde(rename = "custom")]
+    Custom,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// The system that produced a citation.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CitationProvider {
+    /// Citation produced by an Anthropic (Claude) model response.
+    #[serde(rename = "anthropic")]
+    Anthropic,
+    /// Citation produced by an OpenAI model response.
     #[serde(rename = "openai")]
     Openai,
     /// Citation synthesized client-side by the runtime from tool output.
@@ -5386,6 +6150,21 @@ pub enum AssistantUsageApiEndpoint {
     Unknown,
 }
 
+/// Transport used for a successful model call
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AssistantUsageTransport {
+    /// HTTP transport, including SSE streams.
+    #[serde(rename = "http")]
+    Http,
+    /// WebSocket transport.
+    #[serde(rename = "websocket")]
+    Websocket,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// For HTTP 400 failures only: whether the response carried a structured CAPI error envelope (structured_error, a deterministic validation failure) or no error body (bodyless, the transient gateway/proxy signature). Absent for non-400 failures.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ModelCallFailureBadRequestKind {
@@ -5434,15 +6213,21 @@ pub enum ModelCallFailureSource {
     Unknown,
 }
 
-/// Transport used for a failed model call
+/// Final outcome of one logical model dispatch after response acceptance processing
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ModelCallFailureTransport {
-    /// HTTP transport, including SSE streams.
-    #[serde(rename = "http")]
-    Http,
-    /// WebSocket transport.
-    #[serde(rename = "websocket")]
-    Websocket,
+pub enum ModelCallFinishedOutcome {
+    /// The provider response was accepted for continued agent processing.
+    #[serde(rename = "success")]
+    Success,
+    /// The dispatch ended with a provider or transport error.
+    #[serde(rename = "error")]
+    Error,
+    /// The dispatch was cancelled before an accepted response was produced.
+    #[serde(rename = "cancelled")]
+    Cancelled,
+    /// The provider response was rejected during post-response acceptance processing.
+    #[serde(rename = "rejected")]
+    Rejected,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
@@ -5485,6 +6270,82 @@ pub enum ToolExecutionStartToolDescriptionMetaUIVisibility {
     Unknown,
 }
 
+/// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PersistedBinaryImageType {
+    /// Binary image data.
+    #[serde(rename = "image")]
+    Image,
+    /// Other binary resource data.
+    #[serde(rename = "resource")]
+    Resource,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Why the binary data is absent: it exceeded the inline size limit, or its asset was unavailable
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum OmittedBinaryOmittedReason {
+    /// Bytes exceeded the session's inline size limit.
+    #[serde(rename = "too_large")]
+    TooLarge,
+    /// The referenced binary asset could not be found (e.g. a truncated log).
+    #[serde(rename = "asset_unavailable")]
+    AssetUnavailable,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum OmittedBinaryType {
+    /// Binary image data.
+    #[serde(rename = "image")]
+    Image,
+    /// Other binary resource data.
+    #[serde(rename = "resource")]
+    Resource,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Binary result type discriminator. Use "image" for images and "resource" for other binary data.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum BinaryAssetReferenceType {
+    /// Binary image data.
+    #[serde(rename = "image")]
+    Image,
+    /// Other binary resource data.
+    #[serde(rename = "resource")]
+    Resource,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// A model-facing binary result as persisted: full inline data, a size-omitted marker, or a deduplicated asset reference
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum PersistedBinaryResult {
+    PersistedBinaryImage(PersistedBinaryImage),
+    OmittedBinaryResult(OmittedBinaryResult),
+    BinaryAssetReference(BinaryAssetReference),
+}
+
 /// Content block type discriminator
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ToolExecutionCompleteContentTextType {
@@ -5672,6 +6533,25 @@ pub enum PermissionRequestMcpKind {
     Mcp,
 }
 
+/// Advisory recommendation the runtime attaches to a permission request whose origin it can vouch for by construction. Unlike the auto-approval judge this does not depend on auto mode and does not evaluate what the tool call does; its absence simply means the runtime has no opinion and the request follows the host's normal approval flow.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionRecommendation {
+    /// The runtime vouches for the request's origin and recommends approving it without prompting. The host still owns the decision and may deny it; deny rules, managed policy, and the auto-approval safety judge all outrank this recommendation.
+    #[serde(rename = "approve")]
+    Approve,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Permission kind discriminator
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum PermissionRequestUrlKind {
@@ -5695,6 +6575,65 @@ pub enum PermissionRequestMemoryAction {
     Unknown,
 }
 
+/// Why the assisted-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AssistedApprovalJudgeFailureReason {
+    /// The judge model call exceeded its deadline.
+    #[serde(rename = "timeout")]
+    Timeout,
+    /// The judge model call was cancelled before it returned.
+    #[serde(rename = "abort")]
+    Abort,
+    /// The judge model call completed but returned no content.
+    #[serde(rename = "empty_response")]
+    EmptyResponse,
+    /// The judge model call failed (for example a transport, authentication, or rate-limit error).
+    #[serde(rename = "model_error")]
+    ModelError,
+    /// The judge model replied, but the reply carried no ALLOW/DENY verdict.
+    #[serde(rename = "parse_error")]
+    ParseError,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Outcome of the assisted-approval safety judge for a permission request. Present only in assisted mode; its absence means the judge did not evaluate the request.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AssistedApprovalRecommendation {
+    /// The judge evaluated the request and recommends automatically approving it.
+    #[serde(rename = "approve")]
+    Approve,
+    /// The judge evaluated the request and does not recommend automatically approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision.
+    #[serde(rename = "requireApproval")]
+    RequireApproval,
+    /// Assisted mode is enabled, but this request category is never automatically approvable (for example, sandbox-bypass requests), so the judge was not consulted.
+    #[serde(rename = "excluded")]
+    Excluded,
+    /// The judge was consulted but did not return a usable recommendation, so the request requires explicit approval.
+    #[serde(rename = "error")]
+    Error,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Vote direction (vote only)
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum PermissionRequestMemoryDirection {
@@ -5718,6 +6657,21 @@ pub enum PermissionRequestMemoryKind {
     Memory,
 }
 
+/// Scope of a stored memory.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionRequestMemoryScope {
+    /// Store the memory for the current repository.
+    #[serde(rename = "repository")]
+    Repository,
+    /// Store the memory for the current user.
+    #[serde(rename = "user")]
+    User,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Permission kind discriminator
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum PermissionRequestCustomToolKind {
@@ -5773,6 +6727,14 @@ pub enum PermissionRequestExtensionPermissionAccessKind {
     ExtensionPermissionAccess,
 }
 
+/// Permission kind discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionRequestExtensionEnvAccessKind {
+    #[serde(rename = "extension-env-access")]
+    #[default]
+    ExtensionEnvAccess,
+}
+
 /// Details of the permission being requested
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
@@ -5788,65 +6750,7 @@ pub enum PermissionRequest {
     ExtensionManagement(PermissionRequestExtensionManagement),
     Factory(PermissionRequestFactory),
     ExtensionPermissionAccess(PermissionRequestExtensionPermissionAccess),
-}
-
-/// Why the auto-approval judge produced no usable recommendation. Present only alongside an `error` recommendation, where the human-readable reason is a fixed string and therefore cannot distinguish these cases. Intended to make a judge failure reportable by a consumer that has no access to the host's logs.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AutoApprovalJudgeFailureReason {
-    /// The judge model call exceeded its deadline.
-    #[serde(rename = "timeout")]
-    Timeout,
-    /// The judge model call was cancelled before it returned.
-    #[serde(rename = "abort")]
-    Abort,
-    /// The judge model call completed but returned no content.
-    #[serde(rename = "empty_response")]
-    EmptyResponse,
-    /// The judge model call failed (for example a transport, authentication, or rate-limit error).
-    #[serde(rename = "model_error")]
-    ModelError,
-    /// The judge model replied, but the reply carried no ALLOW/DENY verdict.
-    #[serde(rename = "parse_error")]
-    ParseError,
-    /// Unknown variant for forward compatibility.
-    #[default]
-    #[serde(other)]
-    Unknown,
-}
-
-/// Outcome of the auto-approval safety judge for a permission request. Present only when auto mode is enabled; its absence means the judge did not evaluate the request (auto mode was off).
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AutoApprovalRecommendation {
-    /// The judge evaluated the request and recommends automatically approving it.
-    #[serde(rename = "approve")]
-    Approve,
-    /// The judge evaluated the request and does not recommend auto-approving it; explicit approval is required. Whether that means prompting, denying, or something else is the consumer's decision.
-    #[serde(rename = "requireApproval")]
-    RequireApproval,
-    /// Auto mode is enabled, but this request category is never auto-approvable (for example, sandbox-bypass requests), so the judge was not consulted.
-    #[serde(rename = "excluded")]
-    Excluded,
-    /// The judge was consulted but did not return a usable recommendation, so the request requires explicit approval.
-    #[serde(rename = "error")]
-    Error,
-    /// Unknown variant for forward compatibility.
-    #[default]
-    #[serde(other)]
-    Unknown,
+    ExtensionEnvAccess(PermissionRequestExtensionEnvAccess),
 }
 
 /// Prompt kind discriminator
@@ -5963,6 +6867,14 @@ pub enum PermissionPromptRequestExtensionPermissionAccessKind {
     ExtensionPermissionAccess,
 }
 
+/// Prompt kind discriminator
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PermissionPromptRequestExtensionEnvAccessKind {
+    #[serde(rename = "extension-env-access")]
+    #[default]
+    ExtensionEnvAccess,
+}
+
 /// Derived user-facing permission prompt details for UI consumers
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
@@ -5979,6 +6891,7 @@ pub enum PermissionPromptRequest {
     ExtensionManagement(PermissionPromptRequestExtensionManagement),
     Factory(PermissionPromptRequestFactory),
     ExtensionPermissionAccess(PermissionPromptRequestExtensionPermissionAccess),
+    ExtensionEnvAccess(PermissionPromptRequestExtensionEnvAccess),
 }
 
 /// The permission request was approved
@@ -6061,6 +6974,14 @@ pub enum UserToolSessionApprovalExtensionPermissionAccessKind {
     ExtensionPermissionAccess,
 }
 
+/// Extension environment access approval kind
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum UserToolSessionApprovalExtensionEnvAccessKind {
+    #[serde(rename = "extension-env-access")]
+    #[default]
+    ExtensionEnvAccess,
+}
+
 /// The approval to add as a session-scoped rule
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
@@ -6074,6 +6995,7 @@ pub enum UserToolSessionApproval {
     ExtensionManagement(UserToolSessionApprovalExtensionManagement),
     Factory(UserToolSessionApprovalFactory),
     ExtensionPermissionAccess(UserToolSessionApprovalExtensionPermissionAccess),
+    ExtensionEnvAccess(UserToolSessionApprovalExtensionEnvAccess),
 }
 
 /// Approved and remembered for the rest of the session
@@ -6278,6 +7200,37 @@ pub enum McpHeadersRefreshCompletedOutcome {
     Unknown,
 }
 
+/// Lifecycle phase for a Rust-owned ephemeral query stream.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum UIEphemeralQueryPhase {
+    /// The ephemeral query stream has begun.
+    #[serde(rename = "started")]
+    Started,
+    /// A partial result chunk was produced by the stream.
+    #[serde(rename = "chunk")]
+    Chunk,
+    /// The ephemeral query stream finished successfully.
+    #[serde(rename = "completed")]
+    Completed,
+    /// The ephemeral query stream ended with an error.
+    #[serde(rename = "failed")]
+    Failed,
+    /// The ephemeral query stream was cancelled before completing.
+    #[serde(rename = "aborted")]
+    Aborted,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// The user's auto-mode-switch choice
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum AutoModeSwitchResponse {
@@ -6335,16 +7288,22 @@ pub enum AutoModeResolvedReasoningBucket {
     Unknown,
 }
 
-/// Which channel supplied the effective enterprise managed settings (highest-authority present layer wins wholesale)
+/// Summary of which managed-settings channels contributed to the effective session policy. Use the per-channel booleans for exact provenance.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ManagedSettingsResolvedSource {
-    /// Account/org policy self-fetched from the GitHub managed-settings endpoint (higher authority).
+    /// Only the server/account channel contributed.
     #[serde(rename = "server")]
     Server,
-    /// Device-level MDM policy discovered from plist/registry/file (lower authority).
+    /// Only the device MDM/plist/registry/file channel contributed.
     #[serde(rename = "device")]
     Device,
-    /// No managed policy is in force (no layer contributed).
+    /// Only session-local SDK-host injection contributed.
+    #[serde(rename = "client")]
+    Client,
+    /// More than one channel contributed. Ordinary keys resolve device over server per key, while permissions compose restrictively across all present layers.
+    #[serde(rename = "mixed")]
+    Mixed,
+    /// No managed policy is in force (no channel contributed).
     #[serde(rename = "none")]
     None,
     /// Unknown variant for forward compatibility.
@@ -6368,21 +7327,24 @@ pub enum ManagedSettingsEnforcedAction {
 /// For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ManagedSettingsEnforcedEscalation {
-    /// Full allow-all ("/allow-all on") permissions — auto-approving tools, paths, and URLs.
+    /// Full allow-all permissions — automatically approving tools, paths, and URLs.
     #[serde(rename = "allow_all")]
     AllowAll,
-    /// Auto-approval of all tool permission requests.
+    /// Automatic approval of all tool permission requests.
     #[serde(rename = "approve_all")]
     ApproveAll,
-    /// Advisory auto-approval ("/allow-all auto") mode — keeps normal prompt paths and adds LLM-advised approval, distinct from full allow-all.
-    #[serde(rename = "auto_approval")]
-    AutoApproval,
+    /// Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all.
+    #[serde(rename = "assisted_approval")]
+    AssistedApproval,
     /// Unrestricted filesystem access outside the session's allowed directories.
     #[serde(rename = "unrestricted_paths")]
     UnrestrictedPaths,
     /// Unrestricted URL fetch access.
     #[serde(rename = "unrestricted_urls")]
     UnrestrictedUrls,
+    /// A server-wide MCP "Always Allow" (or `--allow-tool <server>`) blanket that would auto-approve every tool from an MCP server. Capped to per-tool approval; each tool still prompts.
+    #[serde(rename = "server_wide_mcp_approval")]
+    ServerWideMcpApproval,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
@@ -6410,6 +7372,27 @@ pub enum ExitPlanModeAction {
     Unknown,
 }
 
+/// Terminal status a factory run committed. A settled run is never `pending` or `running`, so those two members of the run-status domain are deliberately absent.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum FactoryRunSettledStatus {
+    /// The factory body resolved and its result was committed.
+    #[serde(rename = "completed")]
+    Completed,
+    /// The run was stopped by a limit, an approval refusal or another policy decision.
+    #[serde(rename = "halted")]
+    Halted,
+    /// The run was cancelled by its caller or by session disposal.
+    #[serde(rename = "cancelled")]
+    Cancelled,
+    /// The run failed, with `failureType` carrying the class when it has one.
+    #[serde(rename = "error")]
+    Error,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Source location type (e.g., project, personal-copilot, plugin, builtin)
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum SkillSource {
diff --git a/rust/src/github_token.rs b/rust/src/github_token.rs
new file mode 100644
index 0000000000..c5eaa63adf
--- /dev/null
+++ b/rust/src/github_token.rs
@@ -0,0 +1,378 @@
+//! Session-scoped GitHub token provider callbacks.
+
+use std::collections::HashMap;
+use std::future::Future;
+use std::sync::{Arc, OnceLock, Weak};
+
+use async_trait::async_trait;
+use parking_lot::Mutex;
+use serde_json::Value;
+
+use crate::generated::api_types::{
+    GitHubTokenAcquireReason, GitHubTokenAcquireRequest, GitHubTokenAcquireResult,
+    GitHubTokenAcquireResultCancelled, GitHubTokenAcquireResultToken,
+};
+use crate::{Client, ClientInner, JsonRpcError, JsonRpcRequest, JsonRpcResponse, error_codes};
+
+/// Why the runtime is requesting a GitHub token.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum GitHubTokenRequestReason {
+    /// The session needs its initial token.
+    Initial,
+    /// The session needs a refreshed token.
+    Refresh,
+}
+
+/// Context supplied when the runtime needs a GitHub token for a session.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct GitHubTokenProviderArgs {
+    /// Effective GitHub host for which a token is required.
+    pub host: String,
+    /// Session receiving the token, when the runtime has assigned its ID.
+    pub session_id: Option<crate::SessionId>,
+    /// Whether this is the initial token acquisition or a refresh.
+    pub reason: GitHubTokenRequestReason,
+}
+
+/// A GitHub access token returned by a session token provider.
+///
+/// `expires_in_seconds` is the positive remaining lifetime when the callback
+/// completes. Production GitHub tokens typically last eight hours.
+pub struct GitHubToken {
+    access_token: String,
+    expires_in_seconds: i64,
+    token_type: Option<String>,
+}
+
+impl GitHubToken {
+    /// Construct a token response with its remaining lifetime in seconds.
+    pub fn new(access_token: impl Into<String>, expires_in_seconds: i64) -> Self {
+        Self {
+            access_token: access_token.into(),
+            expires_in_seconds,
+            token_type: None,
+        }
+    }
+
+    /// Override the OAuth token type. The runtime defaults to `bearer` when unset.
+    pub fn with_token_type(mut self, token_type: impl Into<String>) -> Self {
+        self.token_type = Some(token_type.into());
+        self
+    }
+
+    fn into_wire(self) -> GitHubTokenAcquireResultToken {
+        GitHubTokenAcquireResultToken {
+            access_token: self.access_token,
+            expires_in: self.expires_in_seconds,
+            kind: Default::default(),
+            token_type: self.token_type,
+        }
+    }
+}
+
+impl std::fmt::Debug for GitHubToken {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("GitHubToken")
+            .field("access_token", &"<redacted>")
+            .field("expires_in_seconds", &self.expires_in_seconds)
+            .field("token_type", &self.token_type)
+            .finish()
+    }
+}
+
+/// Result of acquiring a session-scoped GitHub token.
+pub enum GitHubTokenProviderResult {
+    /// A token was acquired.
+    Token(GitHubToken),
+    /// The host cancelled acquisition.
+    Cancelled,
+}
+
+impl std::fmt::Debug for GitHubTokenProviderResult {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Token(token) => f.debug_tuple("Token").field(token).finish(),
+            Self::Cancelled => f.write_str("Cancelled"),
+        }
+    }
+}
+
+/// Async callback used to acquire GitHub tokens for one session.
+#[async_trait]
+pub trait GitHubTokenProvider: Send + Sync {
+    /// Acquire a token or explicitly cancel the request.
+    ///
+    /// Initial cancellation, errors, and invalid token responses reject session
+    /// creation or resume instead of falling back to ambient authentication.
+    async fn get_token(
+        &self,
+        args: GitHubTokenProviderArgs,
+    ) -> Result<GitHubTokenProviderResult, crate::Error>;
+}
+
+#[async_trait]
+impl<F, Fut> GitHubTokenProvider for F
+where
+    F: Fn(GitHubTokenProviderArgs) -> Fut + Send + Sync,
+    Fut: Future<Output = Result<GitHubTokenProviderResult, crate::Error>> + Send,
+{
+    async fn get_token(
+        &self,
+        args: GitHubTokenProviderArgs,
+    ) -> Result<GitHubTokenProviderResult, crate::Error> {
+        (self)(args).await
+    }
+}
+
+#[derive(Default)]
+struct RegistryState {
+    providers: HashMap<String, Arc<dyn GitHubTokenProvider>>,
+    session_owners: HashMap<crate::SessionId, String>,
+}
+
+pub(crate) struct GitHubTokenRegistry {
+    state: Mutex<RegistryState>,
+    client: OnceLock<Weak<ClientInner>>,
+}
+
+impl GitHubTokenRegistry {
+    pub(crate) fn new() -> Self {
+        Self {
+            state: Mutex::new(RegistryState::default()),
+            client: OnceLock::new(),
+        }
+    }
+
+    pub(crate) fn set_client(&self, client: Weak<ClientInner>) {
+        let _ = self.client.set(client);
+    }
+
+    pub(crate) fn register(&self, provider: Arc<dyn GitHubTokenProvider>) -> String {
+        let registration_id = uuid::Uuid::new_v4().to_string();
+        self.state
+            .lock()
+            .providers
+            .insert(registration_id.clone(), provider);
+        registration_id
+    }
+
+    pub(crate) fn claim(&self, registration_id: &str, session_id: crate::SessionId) {
+        let mut state = self.state.lock();
+        if let Some(previous) = state
+            .session_owners
+            .insert(session_id, registration_id.to_string())
+            && previous != registration_id
+        {
+            state.providers.remove(&previous);
+        }
+    }
+
+    pub(crate) fn unregister(&self, registration_id: &str) {
+        let mut state = self.state.lock();
+        state.providers.remove(registration_id);
+        state
+            .session_owners
+            .retain(|_, owned| owned != registration_id);
+    }
+
+    pub(crate) fn retire_session(&self, session_id: &crate::SessionId) {
+        let mut state = self.state.lock();
+        if let Some(registration_id) = state.session_owners.remove(session_id) {
+            state.providers.remove(&registration_id);
+        }
+    }
+
+    pub(crate) fn clear(&self) {
+        let mut state = self.state.lock();
+        state.providers.clear();
+        state.session_owners.clear();
+    }
+
+    pub(crate) async fn dispatch(&self, request: JsonRpcRequest) {
+        let Some(inner) = self.client.get().and_then(Weak::upgrade) else {
+            return;
+        };
+        let client = Client::from_inner(inner);
+        let params = request
+            .params
+            .clone()
+            .unwrap_or(Value::Object(serde_json::Map::new()));
+        let params: GitHubTokenAcquireRequest = match serde_json::from_value(params) {
+            Ok(params) => params,
+            Err(error) => {
+                send_error(
+                    &client,
+                    request.id,
+                    error_codes::INVALID_PARAMS,
+                    &format!("invalid params: {error}"),
+                )
+                .await;
+                return;
+            }
+        };
+        let provider = self
+            .state
+            .lock()
+            .providers
+            .get(&params.registration_id)
+            .cloned();
+        let Some(provider) = provider else {
+            send_error(
+                &client,
+                request.id,
+                error_codes::INTERNAL_ERROR,
+                "unknown GitHub token provider registration",
+            )
+            .await;
+            return;
+        };
+
+        let reason = match params.reason {
+            GitHubTokenAcquireReason::Initial => GitHubTokenRequestReason::Initial,
+            GitHubTokenAcquireReason::Refresh => GitHubTokenRequestReason::Refresh,
+            GitHubTokenAcquireReason::Unknown => {
+                send_error(
+                    &client,
+                    request.id,
+                    error_codes::INVALID_PARAMS,
+                    "unknown GitHub token acquisition reason",
+                )
+                .await;
+                return;
+            }
+        };
+
+        match provider
+            .get_token(GitHubTokenProviderArgs {
+                host: params.host,
+                session_id: params.session_id,
+                reason,
+            })
+            .await
+        {
+            Ok(GitHubTokenProviderResult::Token(token)) => {
+                respond(
+                    &client,
+                    request.id,
+                    GitHubTokenAcquireResult::Token(token.into_wire()),
+                )
+                .await;
+            }
+            Ok(GitHubTokenProviderResult::Cancelled) => {
+                respond(
+                    &client,
+                    request.id,
+                    GitHubTokenAcquireResult::Cancelled(GitHubTokenAcquireResultCancelled {
+                        kind: Default::default(),
+                    }),
+                )
+                .await;
+            }
+            Err(error) => {
+                send_error(
+                    &client,
+                    request.id,
+                    error_codes::INTERNAL_ERROR,
+                    &format!("GitHub token provider failed: {error}"),
+                )
+                .await;
+            }
+        }
+    }
+}
+
+pub(crate) struct GitHubTokenRegistration {
+    registry: Arc<GitHubTokenRegistry>,
+    id: String,
+}
+
+impl GitHubTokenRegistration {
+    pub(crate) fn new(registry: Arc<GitHubTokenRegistry>, id: String) -> Self {
+        Self { registry, id }
+    }
+
+    pub(crate) fn id(&self) -> &str {
+        &self.id
+    }
+
+    pub(crate) fn claim(&self, session_id: crate::SessionId) {
+        self.registry.claim(&self.id, session_id);
+    }
+}
+
+impl Drop for GitHubTokenRegistration {
+    fn drop(&mut self) {
+        self.registry.unregister(&self.id);
+    }
+}
+
+async fn respond(client: &Client, request_id: u64, result: GitHubTokenAcquireResult) {
+    match serde_json::to_value(result) {
+        Ok(result) => {
+            let _ = client
+                .send_response(&JsonRpcResponse {
+                    jsonrpc: "2.0".to_string(),
+                    id: request_id,
+                    result: Some(result),
+                    error: None,
+                })
+                .await;
+        }
+        Err(_) => {
+            send_error(
+                client,
+                request_id,
+                error_codes::INTERNAL_ERROR,
+                "serialization failure",
+            )
+            .await;
+        }
+    }
+}
+
+async fn send_error(client: &Client, request_id: u64, code: i32, message: &str) {
+    let _ = client
+        .send_response(&JsonRpcResponse {
+            jsonrpc: "2.0".to_string(),
+            id: request_id,
+            result: None,
+            error: Some(JsonRpcError {
+                code,
+                message: message.to_string(),
+                data: None,
+            }),
+        })
+        .await;
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn token_debug_is_redacted() {
+        let token = GitHubToken::new("do-not-print", 28_800);
+        assert!(!format!("{token:?}").contains("do-not-print"));
+    }
+
+    #[test]
+    fn retiring_session_removes_its_provider() {
+        let registry = GitHubTokenRegistry::new();
+        let provider = Arc::new(|_args: GitHubTokenProviderArgs| async {
+            Ok(GitHubTokenProviderResult::Cancelled)
+        });
+        let registration_id = registry.register(provider);
+        let session_id = crate::SessionId::from("session-1");
+        registry.claim(&registration_id, session_id.clone());
+
+        registry.retire_session(&session_id);
+
+        assert!(
+            !registry
+                .state
+                .lock()
+                .providers
+                .contains_key(&registration_id)
+        );
+    }
+}
diff --git a/rust/src/handler.rs b/rust/src/handler.rs
index 77edf919c9..e036b75a10 100644
--- a/rust/src/handler.rs
+++ b/rust/src/handler.rs
@@ -22,7 +22,7 @@ use crate::generated::api_types::{
     McpOauthPendingRequestResponse, McpOauthPendingRequestResponseCancelled,
     McpOauthPendingRequestResponseCancelledKind, McpOauthPendingRequestResponseToken,
     McpOauthPendingRequestResponseTokenKind, PermissionDecision, PermissionDecisionApproveOnce,
-    PermissionDecisionReject, PermissionDecisionUserNotAvailable,
+    PermissionDecisionContext, PermissionDecisionReject, PermissionDecisionUserNotAvailable,
 };
 use crate::session_events::{
     McpOauthRequestReason, McpOauthRequiredStaticClientConfig, McpOauthWWWAuthenticateParams,
@@ -35,13 +35,30 @@ use crate::types::{
 /// Decision returned by a [`PermissionHandler`].
 ///
 /// Either a concrete wire-level [`PermissionDecision`] (approve, reject,
-/// approve-for-session, approve-permanently, user-not-available, …) or
-/// [`PermissionResult::NoResult`], which tells the SDK to suppress its
-/// response so another connected client can answer instead.
+/// approve-for-session, approve-permanently, user-not-available, …) with
+/// optional telemetry context, or [`PermissionResult::NoResult`], which tells
+/// the SDK to suppress its response so another connected client can answer
+/// instead.
+///
+/// ```
+/// use github_copilot_sdk::handler::PermissionResult;
+///
+/// fn is_decision(result: PermissionResult) -> bool {
+///     match result {
+///         PermissionResult::Decision { .. } => true,
+///         PermissionResult::NoResult => false,
+///     }
+/// }
+/// ```
 #[derive(Debug, Clone)]
 pub enum PermissionResult {
     /// Send a permission decision on the wire.
-    Decision(PermissionDecision),
+    Decision {
+        /// The decision to send.
+        decision: PermissionDecision,
+        /// Optional context describing how and where the decision was reached.
+        context: Option<PermissionDecisionContext>,
+    },
     /// Decline to respond to this request, allowing another connected
     /// client to answer instead. The SDK suppresses the response.
     NoResult,
@@ -50,24 +67,31 @@ pub enum PermissionResult {
 impl PermissionResult {
     /// Approve this single request.
     pub fn approve_once() -> Self {
-        Self::Decision(PermissionDecision::ApproveOnce(
-            PermissionDecisionApproveOnce::default(),
-        ))
+        Self::Decision {
+            decision: PermissionDecision::ApproveOnce(PermissionDecisionApproveOnce::default()),
+            context: None,
+        }
     }
 
     /// Reject the request, optionally forwarding feedback to the LLM.
     pub fn reject(feedback: impl Into<Option<String>>) -> Self {
-        Self::Decision(PermissionDecision::Reject(PermissionDecisionReject {
-            feedback: feedback.into(),
-            ..Default::default()
-        }))
+        Self::Decision {
+            decision: PermissionDecision::Reject(PermissionDecisionReject {
+                feedback: feedback.into(),
+                ..Default::default()
+            }),
+            context: None,
+        }
     }
 
     /// Deny because no user is available to confirm.
     pub fn user_not_available() -> Self {
-        Self::Decision(PermissionDecision::UserNotAvailable(
-            PermissionDecisionUserNotAvailable::default(),
-        ))
+        Self::Decision {
+            decision: PermissionDecision::UserNotAvailable(
+                PermissionDecisionUserNotAvailable::default(),
+            ),
+            context: None,
+        }
     }
 
     /// Decline to respond, allowing another connected client to answer
@@ -75,11 +99,43 @@ impl PermissionResult {
     pub fn no_result() -> Self {
         Self::NoResult
     }
+
+    /// Attach provenance describing how and where this decision was made,
+    /// so the runtime can attribute auto-approval telemetry.
+    ///
+    /// It is a no-op on [`PermissionResult::NoResult`].
+    ///
+    /// ```rust,no_run
+    /// # use github_copilot_sdk::handler::PermissionResult;
+    /// # use github_copilot_sdk::{
+    /// #     PermissionDecisionContext, PermissionDecisionOutcome, PermissionDecisionSource,
+    /// #     PermissionDecisionSurface,
+    /// # };
+    ///
+    /// let result = PermissionResult::approve_once().with_context(PermissionDecisionContext {
+    ///     outcome: PermissionDecisionOutcome::AutoApproved,
+    ///     response_capability: None,
+    ///     source: PermissionDecisionSource::HostPolicy,
+    ///     surface: PermissionDecisionSurface::Sdk,
+    /// });
+    /// ```
+    pub fn with_context(self, context: PermissionDecisionContext) -> Self {
+        match self {
+            Self::Decision { decision, .. } => Self::Decision {
+                decision,
+                context: Some(context),
+            },
+            Self::NoResult => Self::NoResult,
+        }
+    }
 }
 
 impl From<PermissionDecision> for PermissionResult {
     fn from(value: PermissionDecision) -> Self {
-        Self::Decision(value)
+        Self::Decision {
+            decision: value,
+            context: None,
+        }
     }
 }
 
@@ -338,7 +394,10 @@ mod tests {
             .await;
         assert!(matches!(
             result,
-            PermissionResult::Decision(PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
     }
 
@@ -356,7 +415,10 @@ mod tests {
             .await;
         assert!(matches!(
             result,
-            PermissionResult::Decision(PermissionDecision::UserNotAvailable(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::UserNotAvailable(_),
+                ..
+            }
         ));
     }
 
@@ -386,7 +448,10 @@ mod tests {
             .await;
         assert!(matches!(
             result,
-            PermissionResult::Decision(PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::Reject(_),
+                ..
+            }
         ));
     }
 
diff --git a/rust/src/jsonrpc.rs b/rust/src/jsonrpc.rs
index fbdc96505b..25a405080b 100644
--- a/rust/src/jsonrpc.rs
+++ b/rust/src/jsonrpc.rs
@@ -169,6 +169,68 @@ impl JsonRpcResponse {
 
 const CONTENT_LENGTH_HEADER: &str = "Content-Length: ";
 
+/// Rewrites unpaired UTF-16 surrogate escapes to `\uFFFD`.
+///
+/// Returns `None` when the body contains no unpaired surrogate, so valid
+/// frames do not incur a repair allocation.
+fn repair_lone_surrogates(body: &[u8]) -> Option<Vec<u8>> {
+    fn hex_escape_at(body: &[u8], index: usize) -> Option<u16> {
+        let digits = body.get(index + 2..index + 6)?;
+        let text = std::str::from_utf8(digits).ok()?;
+        u16::from_str_radix(text, 16).ok()
+    }
+
+    let mut repaired = None;
+    let mut in_string = false;
+    let mut index = 0;
+
+    while index < body.len() {
+        let byte = body[index];
+
+        if !in_string {
+            in_string = byte == b'"';
+            index += 1;
+            continue;
+        }
+
+        match byte {
+            b'"' => {
+                in_string = false;
+                index += 1;
+            }
+            // Consume non-Unicode escapes whole so an escaped backslash cannot
+            // be mistaken for the start of a surrogate escape.
+            b'\\' if body.get(index + 1) != Some(&b'u') => index += 2,
+            b'\\' => {
+                let Some(unit) = hex_escape_at(body, index) else {
+                    index += 2;
+                    continue;
+                };
+
+                let is_pair = (0xD800..0xDC00).contains(&unit)
+                    && body.get(index + 6) == Some(&b'\\')
+                    && body.get(index + 7) == Some(&b'u')
+                    && hex_escape_at(body, index + 6)
+                        .is_some_and(|low| (0xDC00..0xE000).contains(&low));
+
+                if is_pair {
+                    index += 12;
+                    continue;
+                }
+
+                if (0xD800..0xE000).contains(&unit) {
+                    let output = repaired.get_or_insert_with(|| body.to_vec());
+                    output[index..index + 6].copy_from_slice(br"\ufffd");
+                }
+                index += 6;
+            }
+            _ => index += 1,
+        }
+    }
+
+    repaired
+}
+
 /// One framed JSON-RPC message handed to the writer actor.
 ///
 /// `frame` is the fully serialized bytes (header + body); the caller pays
@@ -428,8 +490,26 @@ impl JsonRpcClient {
         let mut body = vec![0u8; length];
         reader.read_exact(&mut body).await?;
 
-        let message: JsonRpcMessage = serde_json::from_slice(&body)?;
-        Ok(Some(message))
+        match serde_json::from_slice::<JsonRpcMessage>(&body) {
+            Ok(message) => Ok(Some(message)),
+            Err(error) => {
+                // Dropping an undecodable frame could leave its pending
+                // request waiting forever because this layer has no timeout.
+                match repair_lone_surrogates(&body)
+                    .and_then(|repaired| serde_json::from_slice::<JsonRpcMessage>(&repaired).ok())
+                {
+                    Some(message) => {
+                        warn!(
+                            error = %error,
+                            length,
+                            "recovered JSON-RPC frame containing unpaired UTF-16 surrogates"
+                        );
+                        Ok(Some(message))
+                    }
+                    None => Err(error.into()),
+                }
+            }
+        }
     }
 
     /// Send a JSON-RPC request and wait for the matching response.
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index cafa3c5968..4a9f73ca4c 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -22,6 +22,8 @@ pub mod copilot_request_handler;
 /// `#[doc(hidden)]` — re-exports the generated telemetry payload types.
 #[doc(hidden)]
 pub mod github_telemetry;
+/// Session-scoped GitHub token provider callbacks.
+pub mod github_token;
 /// Event handler traits for session lifecycle.
 pub mod handler;
 /// Lifecycle hook callbacks (pre/post tool use, prompt submission, session start/end).
@@ -78,6 +80,10 @@ use std::sync::{Arc, OnceLock};
 use std::time::{Duration, Instant};
 
 use async_trait::async_trait;
+pub use github_token::{
+    GitHubToken, GitHubTokenProvider, GitHubTokenProviderArgs, GitHubTokenProviderResult,
+    GitHubTokenRequestReason,
+};
 /// Re-export of [`indexmap::IndexMap`], used for order-preserving maps in the
 /// public API (e.g. [`Tool::parameters`](types::Tool::parameters) and
 /// `SessionConfig::mcp_servers`) so serialized key order stays deterministic.
@@ -254,6 +260,11 @@ pub struct ClientOptions {
     pub env_remove: Vec<OsString>,
     /// Extra flags for child-process transports.
     pub extra_args: Vec<String>,
+    /// Absolute paths to trusted plugin directories bundled by the host.
+    ///
+    /// When non-empty, [`Client::start`] replaces the runtime's complete
+    /// trusted built-in plugin directory set before sessions can be created.
+    pub builtin_plugin_directories: Vec<PathBuf>,
     /// Transport mode used to communicate with the CLI server.
     pub transport: Transport,
     /// GitHub token for authentication. When set, the SDK passes the token
@@ -368,6 +379,10 @@ impl std::fmt::Debug for ClientOptions {
             .field("env", &self.env)
             .field("env_remove", &self.env_remove)
             .field("extra_args", &self.extra_args)
+            .field(
+                "builtin_plugin_directories",
+                &self.builtin_plugin_directories,
+            )
             .field("transport", &self.transport)
             .field(
                 "github_token",
@@ -632,6 +647,7 @@ impl Default for ClientOptions {
             env: Vec::new(),
             env_remove: Vec::new(),
             extra_args: Vec::new(),
+            builtin_plugin_directories: Vec::new(),
             transport: Transport::default(),
             github_token: None,
             use_logged_in_user: None,
@@ -724,6 +740,19 @@ impl ClientOptions {
         self
     }
 
+    /// Set trusted plugin directories bundled by the host.
+    ///
+    /// Every path must be absolute; invalid paths are rejected by
+    /// [`Client::start`].
+    pub fn with_builtin_plugin_directories<I, P>(mut self, paths: I) -> Self
+    where
+        I: IntoIterator<Item = P>,
+        P: Into<PathBuf>,
+    {
+        self.builtin_plugin_directories = paths.into_iter().map(Into::into).collect();
+        self
+    }
+
     /// Transport mode used to communicate with the CLI server. See [`Transport`].
     pub fn with_transport(mut self, transport: Transport) -> Self {
         self.transport = transport;
@@ -997,6 +1026,7 @@ struct ClientInner {
     request_rx: parking_lot::Mutex<Option<mpsc::UnboundedReceiver<JsonRpcRequest>>>,
     notification_tx: broadcast::Sender<JsonRpcNotification>,
     router: router::SessionRouter,
+    github_token_registry: Arc<github_token::GitHubTokenRegistry>,
     negotiated_protocol_version: OnceLock<u32>,
     state: parking_lot::Mutex<ConnectionState>,
     lifecycle_tx: broadcast::Sender<SessionLifecycleEvent>,
@@ -1071,6 +1101,30 @@ impl Client {
         if let Some(cfg) = &options.session_fs {
             validate_session_fs_config(cfg)?;
         }
+        let builtin_plugin_directories = options
+            .builtin_plugin_directories
+            .iter()
+            .map(|path| {
+                if !path.is_absolute() {
+                    return Err(Error::with_message(
+                        ErrorKind::InvalidConfig,
+                        format!(
+                            "builtin_plugin_directories must contain only absolute paths: {}",
+                            path.display()
+                        ),
+                    ));
+                }
+                path.to_str().map(str::to_owned).ok_or_else(|| {
+                    Error::with_message(
+                        ErrorKind::InvalidConfig,
+                        format!(
+                            "builtin_plugin_directories must contain valid UTF-8 paths: {}",
+                            path.display()
+                        ),
+                    )
+                })
+            })
+            .collect::<Result<Vec<_>>>()?;
         // Auth options only make sense when the SDK spawns the CLI; with an
         // external server, the server manages its own auth.
         if matches!(options.transport, Transport::External { .. }) {
@@ -1333,6 +1387,14 @@ impl Client {
             elapsed_ms = start_time.elapsed().as_millis(),
             "Client::start protocol verification complete"
         );
+        if !builtin_plugin_directories.is_empty() {
+            client
+                .call(
+                    "plugins.builtin.set",
+                    Some(serde_json::json!({ "paths": builtin_plugin_directories })),
+                )
+                .await?;
+        }
         if let Some(cfg) = session_fs_config {
             let session_fs_start = Instant::now();
             let capabilities = cfg.capabilities.as_ref().map(|c| {
@@ -1368,6 +1430,7 @@ impl Client {
                 &client.inner.request_rx,
                 Some(dispatcher.clone()),
                 client.inner.on_github_telemetry.clone(),
+                client.inner.github_token_registry.clone(),
             );
             client.rpc().llm_inference().set_provider().await?;
             let llm_inference_elapsed = llm_inference_start.elapsed();
@@ -1548,6 +1611,7 @@ impl Client {
         let pid = child.as_ref().and_then(|c| c.id());
         info!(pid = ?pid, "copilot CLI client ready");
 
+        let github_token_registry = Arc::new(github_token::GitHubTokenRegistry::new());
         let client = Self {
             inner: Arc::new(ClientInner {
                 child: parking_lot::Mutex::new(child),
@@ -1558,6 +1622,7 @@ impl Client {
                 request_rx: parking_lot::Mutex::new(Some(request_rx)),
                 notification_tx: notification_broadcast_tx,
                 router: router::SessionRouter::new(),
+                github_token_registry: github_token_registry.clone(),
                 negotiated_protocol_version: OnceLock::new(),
                 state: parking_lot::Mutex::new(ConnectionState::Connected),
                 lifecycle_tx: broadcast::channel(256).0,
@@ -1573,6 +1638,7 @@ impl Client {
                 startup_timings: OnceLock::new(),
             }),
         };
+        github_token_registry.set_client(Arc::downgrade(&client.inner));
         client.spawn_lifecycle_dispatcher();
         debug!(
             elapsed_ms = setup_start.elapsed().as_millis(),
@@ -1586,8 +1652,8 @@ impl Client {
     /// notifications via [`ClientInner::lifecycle_tx`] to subscribers
     /// returned by [`Self::subscribe_lifecycle`].
     fn spawn_lifecycle_dispatcher(&self) {
-        let inner = Arc::clone(&self.inner);
-        let mut notif_rx = inner.notification_tx.subscribe();
+        let mut notif_rx = self.inner.notification_tx.subscribe();
+        let lifecycle_tx = self.inner.lifecycle_tx.clone();
         tokio::spawn(async move {
             loop {
                 match notif_rx.recv().await {
@@ -1611,7 +1677,7 @@ impl Client {
                             };
                         // `send` only errors when there are no subscribers — that's
                         // the normal case before any consumer calls subscribe_lifecycle.
-                        let _ = inner.lifecycle_tx.send(event);
+                        let _ = lifecycle_tx.send(event);
                     }
                     Err(tokio::sync::broadcast::error::RecvError::Lagged(n)) => {
                         warn!(missed = n, "lifecycle dispatcher lagged");
@@ -1624,6 +1690,7 @@ impl Client {
 
     fn build_command(program: &Path, options: &ClientOptions, working_directory: &Path) -> Command {
         let mut command = Command::new(program);
+        command.kill_on_drop(true);
         for arg in &options.prefix_args {
             command.arg(arg);
         }
@@ -1990,6 +2057,7 @@ impl Client {
             &self.inner.request_rx,
             self.inner.llm_inference.get().cloned(),
             self.inner.on_github_telemetry.clone(),
+            self.inner.github_token_registry.clone(),
         );
         self.inner.router.register(session_id)
     }
@@ -1999,6 +2067,25 @@ impl Client {
         self.inner.router.unregister(session_id);
     }
 
+    pub(crate) fn register_github_token_provider(
+        &self,
+        provider: Arc<dyn GitHubTokenProvider>,
+    ) -> github_token::GitHubTokenRegistration {
+        self.inner.router.ensure_started(
+            &self.inner.notification_tx,
+            &self.inner.request_rx,
+            self.inner.llm_inference.get().cloned(),
+            self.inner.on_github_telemetry.clone(),
+            self.inner.github_token_registry.clone(),
+        );
+        let id = self.inner.github_token_registry.register(provider);
+        github_token::GitHubTokenRegistration::new(self.inner.github_token_registry.clone(), id)
+    }
+
+    pub(crate) fn retire_github_token_provider(&self, session_id: &SessionId) {
+        self.inner.github_token_registry.retire_session(session_id);
+    }
+
     /// Returns the protocol version negotiated with the CLI server, if any.
     ///
     /// Set during [`start`](Self::start). Returns `None` if the server didn't
@@ -2107,6 +2194,7 @@ impl Client {
                 .on_github_telemetry
                 .is_some()
                 .then_some(true),
+            ..Default::default()
         };
         let value = self
             .call(
@@ -2193,6 +2281,7 @@ impl Client {
             Some(serde_json::json!({ "sessionId": session_id })),
         )
         .await?;
+        self.retire_github_token_provider(session_id);
         Ok(())
     }
 
@@ -2206,6 +2295,7 @@ impl Client {
             &self.inner.request_rx,
             self.inner.llm_inference.get().cloned(),
             self.inner.on_github_telemetry.clone(),
+            self.inner.github_token_registry.clone(),
         );
     }
 
@@ -2229,6 +2319,7 @@ impl Client {
             }
             self.inner.router.unregister(&session_id);
         }
+        self.inner.github_token_registry.clear();
 
         match self.list_sessions(None).await {
             Ok(sessions) => {
@@ -2398,6 +2489,7 @@ impl Client {
             }
             self.inner.router.unregister(&session_id);
         }
+        self.inner.github_token_registry.clear();
 
         let should_shutdown_runtime = self.inner.child.lock().is_some();
         #[cfg(feature = "bundled-in-process")]
@@ -2524,6 +2616,7 @@ impl Client {
         // Drop all session channels so any awaiters see a closed channel
         // instead of waiting for responses that will never arrive.
         self.inner.router.clear();
+        self.inner.github_token_registry.clear();
         *self.inner.state.lock() = ConnectionState::Disconnected;
         *self.inner.models_cache.lock() = Arc::new(tokio::sync::OnceCell::new());
     }
@@ -3215,6 +3308,105 @@ mod tests {
         client.force_stop();
     }
 
+    #[cfg(any(unix, windows))]
+    #[tokio::test]
+    async fn dropping_last_client_kills_spawned_cli() {
+        let temp = tempfile::tempdir().unwrap();
+        let ready = temp.path().join("ready");
+        let survived = temp.path().join("survived");
+        let child = test_child_command(temp.path(), &ready, &survived)
+            .spawn()
+            .unwrap();
+        let (client_write, _server_read) = tokio::io::duplex(64);
+        let (_server_write, client_read) = tokio::io::duplex(64);
+        let client = Client::from_transport(
+            client_read,
+            client_write,
+            Some(child),
+            temp.path().to_path_buf(),
+            None,
+            false,
+            false,
+            None,
+            None,
+            None,
+            ClientMode::default(),
+        )
+        .unwrap();
+
+        wait_for_test_child(&ready).await;
+        drop(client);
+
+        assert_test_child_killed(&survived).await;
+    }
+
+    #[cfg(any(unix, windows))]
+    #[tokio::test]
+    async fn spawned_child_is_killed_when_dropped() {
+        let temp = tempfile::tempdir().unwrap();
+        let ready = temp.path().join("ready");
+        let survived = temp.path().join("survived");
+        let child = test_child_command(temp.path(), &ready, &survived)
+            .spawn()
+            .unwrap();
+
+        wait_for_test_child(&ready).await;
+        drop(child);
+
+        assert_test_child_killed(&survived).await;
+    }
+
+    #[cfg(any(unix, windows))]
+    fn test_child_command(temp: &Path, ready: &Path, survived: &Path) -> Command {
+        #[cfg(unix)]
+        let mut command = {
+            let mut command =
+                Client::build_command(Path::new("sh"), &ClientOptions::default(), temp);
+            command.args([
+                "-c",
+                "printf ready > \"$READY\"; sleep 1; printf survived > \"$SURVIVED\"",
+            ]);
+            command
+        };
+        #[cfg(windows)]
+        let mut command = {
+            let mut command =
+                Client::build_command(Path::new("powershell.exe"), &ClientOptions::default(), temp);
+            command.args([
+                "-NoLogo",
+                "-NoProfile",
+                "-NonInteractive",
+                "-Command",
+                "Set-Content -LiteralPath $env:READY ready; Start-Sleep -Seconds 1; Set-Content -LiteralPath $env:SURVIVED survived",
+            ]);
+            command
+        };
+        command.env("READY", ready).env("SURVIVED", survived);
+        command
+    }
+
+    #[cfg(any(unix, windows))]
+    async fn wait_for_test_child(ready: &Path) {
+        let deadline = tokio::time::Instant::now() + Duration::from_secs(30);
+        while !ready.exists() {
+            assert!(
+                tokio::time::Instant::now() < deadline,
+                "child did not report readiness"
+            );
+            tokio::time::sleep(Duration::from_millis(10)).await;
+        }
+    }
+
+    #[cfg(any(unix, windows))]
+    async fn assert_test_child_killed(survived: &Path) {
+        tokio::time::sleep(Duration::from_millis(1500)).await;
+
+        assert!(
+            !survived.exists(),
+            "child survived after its owner was dropped"
+        );
+    }
+
     fn client_with_list_models_handler(handler: Arc<dyn ListModelsHandler>) -> Client {
         Client {
             inner: Arc::new(ClientInner {
@@ -3232,6 +3424,7 @@ mod tests {
                 request_rx: parking_lot::Mutex::new(None),
                 notification_tx: broadcast::channel(16).0,
                 router: router::SessionRouter::new(),
+                github_token_registry: Arc::new(github_token::GitHubTokenRegistry::new()),
                 negotiated_protocol_version: OnceLock::new(),
                 state: parking_lot::Mutex::new(ConnectionState::Connected),
                 lifecycle_tx: broadcast::channel(16).0,
diff --git a/rust/src/permission.rs b/rust/src/permission.rs
index e353ce3153..57c0785708 100644
--- a/rust/src/permission.rs
+++ b/rust/src/permission.rs
@@ -97,8 +97,7 @@ pub(crate) fn resolve_handler(
 ) -> Option<Arc<dyn PermissionHandler>> {
     match (handler, policy) {
         (_, Some(policy)) => Some(Arc::new(PolicyHandler { policy })),
-        (Some(h), None) => Some(h),
-        (None, None) => None,
+        (handler, None) => handler,
     }
 }
 
@@ -152,7 +151,10 @@ mod tests {
         assert!(matches!(
             h.handle(SessionId::from("s"), RequestId::new("1"), data())
                 .await,
-            PermissionResult::Decision(crate::types::PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: crate::types::PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
     }
 
@@ -164,7 +166,10 @@ mod tests {
         assert!(matches!(
             h.handle(SessionId::from("s"), RequestId::new("1"), request)
                 .await,
-            PermissionResult::Decision(crate::types::PermissionDecision::UserNotAvailable(_))
+            PermissionResult::Decision {
+                decision: crate::types::PermissionDecision::UserNotAvailable(_),
+                ..
+            }
         ));
     }
 
@@ -174,7 +179,10 @@ mod tests {
         assert!(matches!(
             h.handle(SessionId::from("s"), RequestId::new("1"), data())
                 .await,
-            PermissionResult::Decision(crate::types::PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: crate::types::PermissionDecision::Reject(_),
+                ..
+            }
         ));
     }
 
@@ -184,7 +192,10 @@ mod tests {
         assert!(matches!(
             h.handle(SessionId::from("s"), RequestId::new("1"), data())
                 .await,
-            PermissionResult::Decision(crate::types::PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: crate::types::PermissionDecision::Reject(_),
+                ..
+            }
         ));
     }
 
@@ -208,7 +219,10 @@ mod tests {
         assert!(matches!(
             h.handle(SessionId::from("s"), RequestId::new("1"), request)
                 .await,
-            PermissionResult::Decision(crate::types::PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: crate::types::PermissionDecision::Reject(_),
+                ..
+            }
         ));
     }
 
@@ -233,7 +247,10 @@ mod tests {
             resolved
                 .handle(SessionId::from("s"), RequestId::new("1"), data())
                 .await,
-            PermissionResult::Decision(crate::types::PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: crate::types::PermissionDecision::Reject(_),
+                ..
+            }
         ));
     }
 
@@ -256,7 +273,10 @@ mod tests {
             resolved
                 .handle(SessionId::from("s"), RequestId::new("1"), data())
                 .await,
-            PermissionResult::Decision(crate::types::PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: crate::types::PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
     }
 
diff --git a/rust/src/router.rs b/rust/src/router.rs
index adc1923824..1dec9d16f3 100644
--- a/rust/src/router.rs
+++ b/rust/src/router.rs
@@ -87,6 +87,7 @@ impl SessionRouter {
         request_rx: &Mutex<Option<mpsc::UnboundedReceiver<JsonRpcRequest>>>,
         llm_inference: Option<Arc<crate::copilot_request_handler::CopilotRequestDispatcher>>,
         github_telemetry: Option<crate::github_telemetry::GitHubTelemetryCallback>,
+        github_token_registry: Arc<crate::github_token::GitHubTokenRegistry>,
     ) {
         let mut started = self.started.lock();
         if *started {
@@ -181,6 +182,10 @@ impl SessionRouter {
             let sessions = self.sessions.clone();
             tokio::spawn(async move {
                 while let Some(request) = rx.recv().await {
+                    if request.method == "gitHubToken.getToken" {
+                        github_token_registry.dispatch(request).await;
+                        continue;
+                    }
                     // Client-global `llmInference.*` requests carry no routable
                     // session and are handled by the inference dispatcher.
                     if request.method.starts_with("llmInference.") {
diff --git a/rust/src/session.rs b/rust/src/session.rs
index d505541a50..b9d2173055 100644
--- a/rust/src/session.rs
+++ b/rust/src/session.rs
@@ -12,12 +12,12 @@ use tracing::{Instrument, warn};
 
 use crate::canvas::CanvasHandler;
 use crate::generated::api_types::{
-    LogRequest, ModelSwitchToRequest, OpenCanvasInstance, RegisterEventInterestParams,
-    ToolsGetCurrentMetadataResult, rpc_methods,
+    LogRequest, ModelSwitchToRequest, OpenCanvasInstance, PermissionDecisionRequest,
+    RegisterEventInterestParams, ToolsGetCurrentMetadataResult, rpc_methods,
 };
 use crate::generated::session_events::{
     CommandExecuteData, ElicitationRequestedData, ExternalToolRequestedData, McpOauthRequiredData,
-    SessionCanvasClosedData, SessionErrorData, SessionEventType,
+    SessionCanvasClosedData, SessionErrorData, SessionEventType, SessionIdleData, SessionMode,
 };
 use crate::handler::{
     AutoModeSwitchHandler, AutoModeSwitchResponse, ElicitationHandler, ExitPlanModeHandler,
@@ -66,6 +66,13 @@ pub(crate) struct SessionHandlers {
     pub tools: Arc<HashMap<String, Arc<dyn crate::tool::ToolHandler>>>,
 }
 
+fn has_managed_settings(
+    enable_managed_settings: Option<bool>,
+    managed_settings: Option<&crate::types::ManagedSettings>,
+) -> bool {
+    enable_managed_settings == Some(true) || managed_settings.is_some()
+}
+
 /// Shared state between a [`Session`] and its event loop, used by [`Session::send_and_wait`].
 struct IdleWaiter {
     tx: oneshot::Sender<Result<Option<SessionEvent>, Error>>,
@@ -183,6 +190,8 @@ pub struct Session {
     open_canvases: Arc<parking_lot::RwLock<Vec<OpenCanvasInstance>>>,
     /// Broadcast channel for runtime event subscribers — see [`Session::subscribe`].
     event_tx: tokio::sync::broadcast::Sender<SessionEvent>,
+    github_token_registration:
+        ParkingLotMutex<Option<crate::github_token::GitHubTokenRegistration>>,
 }
 
 impl Session {
@@ -533,13 +542,20 @@ impl Session {
     pub async fn set_model(&self, model: &str, opts: Option<SetModelOptions>) -> Result<(), Error> {
         let opts = opts.unwrap_or_default();
         let request = ModelSwitchToRequest {
+            compaction_decision: None,
+            context_tier: opts.context_tier,
+            defer_if_model_change_queued: None,
+            model_capabilities: opts.model_capabilities,
+            model_change_scope: None,
             model_id: model.to_string(),
+            picker_persistence: None,
             reasoning_effort: opts.reasoning_effort,
             reasoning_summary: opts.reasoning_summary,
+            repo_scope: None,
+            require_available: None,
+            run_compaction_preflight: None,
+            source: None,
             verbosity: None,
-            context_tier: opts.context_tier,
-            model_capabilities: opts.model_capabilities,
-            defer_if_model_change_queued: None,
         };
         self.rpc().model().switch_to(request).await?;
         Ok(())
@@ -570,6 +586,7 @@ impl Session {
             .await?;
         self.stop_event_loop().await;
         self.client.unregister_session(&self.id);
+        self.github_token_registration.lock().take();
         Ok(())
     }
 
@@ -647,6 +664,7 @@ impl Drop for Session {
         // it here because Drop is sync.
         self.shutdown.cancel();
         self.client.unregister_session(&self.id);
+        self.github_token_registration.lock().take();
     }
 }
 
@@ -889,6 +907,7 @@ impl Client {
         let opt_custom_agents_local_only = config.custom_agents_local_only;
         let opt_coauthor_enabled = config.coauthor_enabled;
         let opt_manage_schedule_enabled = config.manage_schedule_enabled;
+        let opt_included_builtin_skills = config.included_builtin_skills.take();
         let (mut wire, mut runtime) = config.into_wire(local_session_id.clone())?;
         wire.enable_github_telemetry_forwarding =
             self.inner.on_github_telemetry.is_some().then_some(true);
@@ -899,7 +918,10 @@ impl Client {
         );
         let handlers = SessionHandlers {
             permission: permission_handler,
-            managed_settings_enabled: wire.enable_managed_settings == Some(true),
+            managed_settings_enabled: has_managed_settings(
+                wire.enable_managed_settings,
+                wire.managed_settings.as_ref(),
+            ),
             elicitation: runtime.elicitation_handler.take(),
             mcp_auth: runtime.mcp_auth_handler.take(),
             user_input: runtime.user_input_handler.take(),
@@ -916,6 +938,13 @@ impl Client {
         let canvas_handler = runtime.canvas_handler.take();
         let session_fs_provider = runtime.session_fs_provider.take();
         let bearer_token_providers = std::mem::take(&mut runtime.bearer_token_providers);
+        let github_token_registration = runtime
+            .github_token_provider
+            .take()
+            .map(|provider| self.register_github_token_provider(provider));
+        wire.github_token_provider_registration_id = github_token_registration
+            .as_ref()
+            .map(|registration| registration.id().to_string());
         let has_mcp_auth_handler = handlers.mcp_auth.is_some();
         if self.inner.session_fs_configured && session_fs_provider.is_none() {
             return Err(ErrorKind::Session(SessionErrorKind::SessionFsProviderRequired).into());
@@ -1073,6 +1102,7 @@ impl Client {
             capabilities,
             open_canvases,
             event_tx,
+            github_token_registration: ParkingLotMutex::new(github_token_registration),
         };
         apply_mode_post_create_patch(
             &session,
@@ -1081,8 +1111,14 @@ impl Client {
             opt_custom_agents_local_only,
             opt_coauthor_enabled,
             opt_manage_schedule_enabled,
+            opt_included_builtin_skills,
         )
         .await?;
+        if let Some(registration) = session.github_token_registration.lock().as_ref() {
+            registration.claim(session.id.clone());
+        } else {
+            self.retire_github_token_provider(&session.id);
+        }
         Ok(session)
     }
 
@@ -1159,6 +1195,7 @@ impl Client {
         let opt_custom_agents_local_only = config.custom_agents_local_only;
         let opt_coauthor_enabled = config.coauthor_enabled;
         let opt_manage_schedule_enabled = config.manage_schedule_enabled;
+        let opt_included_builtin_skills = config.included_builtin_skills.take();
         let (mut wire, mut runtime) = config.into_wire()?;
         wire.enable_github_telemetry_forwarding =
             self.inner.on_github_telemetry.is_some().then_some(true);
@@ -1169,7 +1206,10 @@ impl Client {
         );
         let handlers = SessionHandlers {
             permission: permission_handler,
-            managed_settings_enabled: wire.enable_managed_settings == Some(true),
+            managed_settings_enabled: has_managed_settings(
+                wire.enable_managed_settings,
+                wire.managed_settings.as_ref(),
+            ),
             elicitation: runtime.elicitation_handler.take(),
             mcp_auth: runtime.mcp_auth_handler.take(),
             user_input: runtime.user_input_handler.take(),
@@ -1186,6 +1226,13 @@ impl Client {
         let canvas_handler = runtime.canvas_handler.take();
         let session_fs_provider = runtime.session_fs_provider.take();
         let bearer_token_providers = std::mem::take(&mut runtime.bearer_token_providers);
+        let github_token_registration = runtime
+            .github_token_provider
+            .take()
+            .map(|provider| self.register_github_token_provider(provider));
+        wire.github_token_provider_registration_id = github_token_registration
+            .as_ref()
+            .map(|registration| registration.id().to_string());
         let has_mcp_auth_handler = handlers.mcp_auth.is_some();
         if self.inner.session_fs_configured && session_fs_provider.is_none() {
             return Err(ErrorKind::Session(SessionErrorKind::SessionFsProviderRequired).into());
@@ -1330,6 +1377,7 @@ impl Client {
             capabilities,
             open_canvases,
             event_tx,
+            github_token_registration: ParkingLotMutex::new(github_token_registration),
         };
         apply_mode_post_create_patch(
             &session,
@@ -1338,8 +1386,14 @@ impl Client {
             opt_custom_agents_local_only,
             opt_coauthor_enabled,
             opt_manage_schedule_enabled,
+            opt_included_builtin_skills,
         )
         .await?;
+        if let Some(registration) = session.github_token_registration.lock().as_ref() {
+            registration.claim(session.id.clone());
+        } else {
+            self.retire_github_token_provider(&session.id);
+        }
         Ok(session)
     }
 }
@@ -1353,7 +1407,42 @@ async fn apply_mode_post_create_patch(
     opt_custom_agents_local_only: Option<bool>,
     opt_coauthor_enabled: Option<bool>,
     opt_manage_schedule_enabled: Option<bool>,
+    opt_included_builtin_skills: Option<Vec<String>>,
 ) -> Result<(), Error> {
+    let Some(patch) = build_mode_post_create_patch(
+        mode,
+        opt_skip_custom_instructions,
+        opt_custom_agents_local_only,
+        opt_coauthor_enabled,
+        opt_manage_schedule_enabled,
+        opt_included_builtin_skills,
+    ) else {
+        return Ok(());
+    };
+    if let Err(error) = session.rpc().options().update(patch).await {
+        let _ = session.disconnect().await;
+        return Err(error);
+    }
+    Ok(())
+}
+
+/// Builds the `session.options.update` patch applied immediately after a session
+/// is created or resumed, or returns `None` when no patch should be sent.
+///
+/// Under [`ClientMode::Empty`](crate::ClientMode::Empty) the overridable feature
+/// flags fall back to safe defaults (caller values win), while
+/// `installed_plugins` is unconditionally empty. `included_builtin_skills`
+/// defaults to an empty list, but callers can explicitly allow selected
+/// runtime-bundled skills. Under other modes only explicitly-set fields are
+/// forwarded.
+fn build_mode_post_create_patch(
+    mode: crate::ClientMode,
+    opt_skip_custom_instructions: Option<bool>,
+    opt_custom_agents_local_only: Option<bool>,
+    opt_coauthor_enabled: Option<bool>,
+    opt_manage_schedule_enabled: Option<bool>,
+    opt_included_builtin_skills: Option<Vec<String>>,
+) -> Option<crate::generated::api_types::SessionUpdateOptionsParams> {
     use crate::generated::api_types::SessionUpdateOptionsParams;
     let mut patch = SessionUpdateOptionsParams::default();
     let should_send = if mode == crate::ClientMode::Empty {
@@ -1362,6 +1451,7 @@ async fn apply_mode_post_create_patch(
         patch.coauthor_enabled = Some(opt_coauthor_enabled.unwrap_or(false));
         patch.manage_schedule_enabled = Some(opt_manage_schedule_enabled.unwrap_or(false));
         patch.installed_plugins = Some(Vec::new());
+        patch.included_builtin_skills = Some(opt_included_builtin_skills.unwrap_or_default());
         true
     } else {
         let mut any = false;
@@ -1381,16 +1471,16 @@ async fn apply_mode_post_create_patch(
             patch.manage_schedule_enabled = Some(v);
             any = true;
         }
+        if let Some(v) = opt_included_builtin_skills {
+            patch.included_builtin_skills = Some(v);
+            any = true;
+        }
         any
     };
     if !should_send {
-        return Ok(());
-    }
-    if let Err(error) = session.rpc().options().update(patch).await {
-        let _ = session.disconnect().await;
-        return Err(error);
+        return None;
     }
-    Ok(())
+    Some(patch)
 }
 
 fn build_command_handler_map(commands: Option<&[CommandDefinition]>) -> Arc<CommandHandlerMap> {
@@ -1560,17 +1650,31 @@ fn permission_request_data(
     }
 }
 
-/// Map a [`PermissionResult`] to the `result` payload sent back to the
-/// server via `session.permissions.handlePendingPermissionRequest`.
+/// Build the full `session.permissions.handlePendingPermissionRequest`
+/// params for a permission result.
+///
+/// `decisionContext` is a sibling of `result` and is only present when the
+/// handler attributed the decision — omitting it preserves legacy behavior.
 ///
 /// Returns `None` when the SDK must not send a response.
-fn notification_permission_payload(result: &PermissionResult) -> Option<Value> {
-    match result {
-        PermissionResult::NoResult => None,
-        PermissionResult::Decision(decision) => Some(
-            serde_json::to_value(decision).expect("serializing permission decision should succeed"),
-        ),
-    }
+fn permission_response_params(
+    session_id: &SessionId,
+    request_id: &RequestId,
+    result: &PermissionResult,
+) -> Option<Value> {
+    let (decision, decision_context) = match result {
+        PermissionResult::Decision { decision, context } => (decision, context.clone()),
+        PermissionResult::NoResult => return None,
+    };
+    let mut params = serde_json::to_value(PermissionDecisionRequest {
+        decision_context,
+        request_id: request_id.clone(),
+        result: decision.clone(),
+    })
+    .expect("serializing permission response should succeed");
+    params["sessionId"] =
+        serde_json::to_value(session_id).expect("serializing session ID should succeed");
+    Some(params)
 }
 
 async fn register_mcp_auth_interest(client: &Client, session_id: &SessionId) -> Result<(), Error> {
@@ -1597,6 +1701,12 @@ fn tool_failure_result(message: impl Into<String>) -> ToolResult {
     })
 }
 
+fn is_autopilot_continuation_idle(event: &SessionEvent) -> bool {
+    event
+        .typed_data::<SessionIdleData>()
+        .is_some_and(|data| data.mode == Some(SessionMode::Autopilot))
+}
+
 /// Process a notification from the CLI's broadcast channel.
 #[allow(clippy::too_many_arguments)]
 async fn handle_notification(
@@ -1641,6 +1751,7 @@ async fn handle_notification(
                         }
                         waiter.last_assistant_message = Some(event.clone());
                     }
+                    SessionEventType::SessionIdle if is_autopilot_continuation_idle(&event) => {}
                     SessionEventType::SessionIdle | SessionEventType::SessionError => {
                         if let Some(waiter) = guard.take() {
                             if event_type == SessionEventType::SessionIdle {
@@ -1766,7 +1877,8 @@ async fn handle_notification(
                         request_id = %request_id,
                         "PermissionHandler::handle dispatch"
                     );
-                    let Some(result_value) = notification_permission_payload(&result) else {
+                    let Some(params) = permission_response_params(&sid, &request_id, &result)
+                    else {
                         // Handler returned Deferred / NoResult — it will
                         // call handlePendingPermissionRequest itself (or
                         // leave the request unanswered).
@@ -1775,12 +1887,8 @@ async fn handle_notification(
                     let rpc_start = Instant::now();
                     let _ = client
                         .call(
-                            "session.permissions.handlePendingPermissionRequest",
-                            Some(serde_json::json!({
-                                "sessionId": sid,
-                                "requestId": request_id,
-                                "result": result_value,
-                            })),
+                            rpc_methods::SESSION_PERMISSIONS_HANDLEPENDINGPERMISSIONREQUEST,
+                            Some(params),
                         )
                         .await;
                     tracing::debug!(
@@ -2550,31 +2658,232 @@ fn inject_transform_sections_resume(
 mod tests {
     use serde_json::json;
 
-    use super::{notification_permission_payload, permission_request_data};
+    use super::{
+        build_mode_post_create_patch, has_managed_settings, is_autopilot_continuation_idle,
+        permission_request_data, permission_response_params,
+    };
     use crate::handler::PermissionResult;
+    use crate::types::{
+        PermissionDecisionContext, PermissionDecisionOutcome, PermissionDecisionSource,
+        PermissionDecisionSurface, RequestId, SessionEvent, SessionId,
+    };
 
     #[test]
-    fn notification_payload_suppresses_no_result() {
-        assert!(notification_permission_payload(&PermissionResult::NoResult).is_none());
+    fn identifies_only_autopilot_continuation_idles() {
+        let mut event = SessionEvent {
+            id: "event-1".to_string(),
+            timestamp: "2026-01-01T00:00:00Z".to_string(),
+            parent_id: None,
+            ephemeral: None,
+            agent_id: None,
+            debug_cli_received_at_ms: None,
+            debug_ws_forwarded_at_ms: None,
+            event_type: "session.idle".to_string(),
+            data: json!({ "mode": "autopilot" }),
+        };
+
+        assert!(is_autopilot_continuation_idle(&event));
+
+        event.data = json!({ "mode": "interactive" });
+        assert!(!is_autopilot_continuation_idle(&event));
+
+        event.data = json!({});
+        assert!(!is_autopilot_continuation_idle(&event));
     }
 
     #[test]
-    fn notification_payload_serializes_decisions() {
+    fn empty_mode_post_patch_sets_empty_included_builtin_skills() {
+        let patch =
+            build_mode_post_create_patch(crate::ClientMode::Empty, None, None, None, None, None)
+                .expect("empty mode always sends a patch");
         assert_eq!(
-            notification_permission_payload(&PermissionResult::approve_once()),
-            Some(json!({ "kind": "approve-once" }))
+            patch.included_builtin_skills,
+            Some(Vec::new()),
+            "empty mode must fail closed with an empty includedBuiltinSkills list"
         );
+        assert_eq!(patch.installed_plugins.as_ref().map(|p| p.len()), Some(0));
+        // Serializes as an explicit empty array (not omitted).
+        let value = serde_json::to_value(&patch).expect("serialize patch");
+        assert_eq!(value["includedBuiltinSkills"], serde_json::json!([]));
+    }
+
+    #[test]
+    fn empty_mode_post_patch_preserves_explicit_builtin_skill_allowlist() {
+        let patch = build_mode_post_create_patch(
+            crate::ClientMode::Empty,
+            Some(false),
+            Some(false),
+            Some(true),
+            Some(true),
+            Some(vec!["code-review".to_string()]),
+        )
+        .expect("empty mode always sends a patch");
         assert_eq!(
-            notification_permission_payload(&PermissionResult::reject(None)),
-            Some(json!({ "kind": "reject" }))
+            patch.included_builtin_skills,
+            Some(vec!["code-review".to_string()])
+        );
+    }
+
+    #[test]
+    fn copilot_cli_mode_does_not_inject_included_builtin_skills() {
+        // No fields set -> no patch at all.
+        assert!(
+            build_mode_post_create_patch(
+                crate::ClientMode::CopilotCli,
+                None,
+                None,
+                None,
+                None,
+                None
+            )
+            .is_none()
         );
+        // A field set -> patch sent, but skills field stays absent.
+        let patch = build_mode_post_create_patch(
+            crate::ClientMode::CopilotCli,
+            Some(true),
+            None,
+            None,
+            None,
+            None,
+        )
+        .expect("a set field triggers a patch");
+        assert_eq!(patch.included_builtin_skills, None);
+        assert!(patch.installed_plugins.is_none());
+        let value = serde_json::to_value(&patch).expect("serialize patch");
+        assert!(value.get("includedBuiltinSkills").is_none());
+
+        let patch = build_mode_post_create_patch(
+            crate::ClientMode::CopilotCli,
+            None,
+            None,
+            None,
+            None,
+            Some(vec!["code-review".to_string()]),
+        )
+        .expect("an explicit allowlist triggers a patch");
         assert_eq!(
-            notification_permission_payload(&PermissionResult::reject(Some("bad".to_string()))),
-            Some(json!({ "kind": "reject", "feedback": "bad" }))
+            patch.included_builtin_skills,
+            Some(vec!["code-review".to_string()])
         );
+    }
+
+    #[test]
+    fn direct_injection_enables_managed_safeguards() {
+        let settings = crate::types::ManagedSettings::default();
+        assert!(has_managed_settings(None, Some(&settings)));
+        assert!(!has_managed_settings(None, None));
+    }
+
+    fn attribution_context() -> PermissionDecisionContext {
+        PermissionDecisionContext {
+            outcome: PermissionDecisionOutcome::AutoApproved,
+            response_capability: None,
+            source: PermissionDecisionSource::AssistedApproval,
+            surface: PermissionDecisionSurface::CopilotApp,
+        }
+    }
+
+    #[test]
+    fn response_params_omit_decision_context_without_attribution() {
+        for (result, expected) in [
+            (
+                PermissionResult::approve_once(),
+                json!({ "kind": "approve-once" }),
+            ),
+            (PermissionResult::reject(None), json!({ "kind": "reject" })),
+            (
+                PermissionResult::reject(Some("bad".to_string())),
+                json!({ "kind": "reject", "feedback": "bad" }),
+            ),
+            (
+                PermissionResult::user_not_available(),
+                json!({ "kind": "user-not-available" }),
+            ),
+        ] {
+            let params = permission_response_params(
+                &SessionId::from("session-1"),
+                &RequestId::from("permission-1"),
+                &result,
+            )
+            .unwrap();
+            assert_eq!(
+                params,
+                json!({
+                    "sessionId": "session-1",
+                    "requestId": "permission-1",
+                    "result": expected,
+                })
+            );
+        }
+    }
+
+    #[test]
+    fn response_params_forward_decision_context_alongside_result() {
+        let params = permission_response_params(
+            &SessionId::from("session-1"),
+            &RequestId::from("permission-1"),
+            &PermissionResult::approve_once().with_context(attribution_context()),
+        )
+        .unwrap();
         assert_eq!(
-            notification_permission_payload(&PermissionResult::user_not_available()),
-            Some(json!({ "kind": "user-not-available" }))
+            params,
+            json!({
+                "sessionId": "session-1",
+                "requestId": "permission-1",
+                "result": { "kind": "approve-once" },
+                "decisionContext": {
+                    "outcome": "auto_approved",
+                    "source": "assisted_approval",
+                    "surface": "copilot_app",
+                },
+            })
+        );
+        // The context is a sibling of `result`, never nested inside it.
+        assert!(params["result"].get("decisionContext").is_none());
+    }
+
+    #[test]
+    fn response_params_suppressed_for_no_result() {
+        assert!(
+            permission_response_params(
+                &SessionId::from("session-1"),
+                &RequestId::from("permission-1"),
+                &PermissionResult::NoResult,
+            )
+            .is_none()
+        );
+    }
+
+    #[test]
+    fn with_context_is_a_no_op_on_no_result() {
+        let result = PermissionResult::no_result().with_context(attribution_context());
+        assert!(matches!(result, PermissionResult::NoResult));
+    }
+
+    #[test]
+    fn with_context_replaces_rather_than_nests() {
+        let result = PermissionResult::approve_once()
+            .with_context(attribution_context())
+            .with_context(PermissionDecisionContext {
+                outcome: PermissionDecisionOutcome::PromptedUser,
+                response_capability: None,
+                source: PermissionDecisionSource::HumanResponse,
+                surface: PermissionDecisionSurface::Sdk,
+            });
+        let params = permission_response_params(
+            &SessionId::from("session-1"),
+            &RequestId::from("permission-1"),
+            &result,
+        )
+        .unwrap();
+        assert_eq!(
+            params["decisionContext"],
+            json!({
+                "outcome": "prompted_user",
+                "source": "human_response",
+                "surface": "sdk",
+            })
         );
     }
 
diff --git a/rust/src/types.rs b/rust/src/types.rs
index 57497cb701..6e451eb452 100644
--- a/rust/src/types.rs
+++ b/rust/src/types.rs
@@ -24,6 +24,7 @@ use crate::generated::api_types::{CurrentToolMetadata, OpenCanvasInstance};
 use crate::generated::session_events::ReasoningSummary;
 /// Context window tier for models that support tiered context windows.
 pub use crate::generated::session_events::{ContextTier, SessionLimitsConfig};
+use crate::github_token::GitHubTokenProvider;
 use crate::handler::{
     AutoModeSwitchHandler, ElicitationHandler, ExitPlanModeHandler, McpAuthHandler,
     PermissionHandler, UserInputHandler,
@@ -346,6 +347,12 @@ pub struct Tool {
     /// access control.
     #[serde(default, skip_serializing_if = "is_false")]
     pub skip_permission: bool,
+    /// When `true`, a successful call to this tool ends the agent turn: the
+    /// runtime's tool phase halts instead of feeding the result back to the
+    /// model for another round. A failed call leaves the loop running so the
+    /// model can read the error and retry.
+    #[serde(default, skip_serializing_if = "is_false")]
+    pub is_terminal: bool,
     /// Controls whether the tool may be deferred (loaded lazily via tool
     /// search) rather than always pre-loaded. When [`DeferMode::Auto`], the
     /// tool can be deferred and surfaced through tool search. When
@@ -470,6 +477,18 @@ impl Tool {
         self
     }
 
+    /// Sets whether a successful call to this tool ends the agent turn.
+    ///
+    /// When `true`, the runtime's tool phase halts after a successful call
+    /// instead of feeding the result back to the model for another round. A
+    /// failed call leaves the loop running so the model can read the error and
+    /// retry.
+    #[must_use]
+    pub fn with_is_terminal(mut self, is_terminal: bool) -> Self {
+        self.is_terminal = is_terminal;
+        self
+    }
+
     /// Set the deferral mode controlling whether the tool may be loaded
     /// lazily via tool search ([`DeferMode::Auto`]) or always pre-loaded
     /// ([`DeferMode::Never`]).
@@ -512,6 +531,7 @@ impl std::fmt::Debug for Tool {
             .field("parameters", &self.parameters)
             .field("overrides_built_in_tool", &self.overrides_built_in_tool)
             .field("skip_permission", &self.skip_permission)
+            .field("is_terminal", &self.is_terminal)
             .field("defer", &self.defer)
             .field("metadata", &self.metadata)
             .field(
@@ -595,12 +615,9 @@ impl std::fmt::Debug for CommandDefinition {
 impl Serialize for CommandDefinition {
     fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         use serde::ser::SerializeStruct;
-        let len = if self.description.is_some() { 2 } else { 1 };
-        let mut state = serializer.serialize_struct("CommandDefinition", len)?;
+        let mut state = serializer.serialize_struct("CommandDefinition", 2)?;
         state.serialize_field("name", &self.name)?;
-        if let Some(description) = &self.description {
-            state.serialize_field("description", description)?;
-        }
+        state.serialize_field("description", self.description.as_deref().unwrap_or(""))?;
         state.end()
     }
 }
@@ -1744,6 +1761,96 @@ pub struct CopilotExpAssignmentResponse {
     pub assignment_context: String,
 }
 
+/// Well-known managed bypass-permissions policies.
+pub struct DisableBypassPermissionsModes;
+
+impl DisableBypassPermissionsModes {
+    /// Permit automatic bypass but block full allow-all.
+    pub const ALLOW_AUTO_ONLY: &'static str = "allow-auto-only";
+    /// Turn off bypass-permissions mode entirely.
+    pub const DISABLE: &'static str = "disable";
+}
+
+/// Permission rules injected as a managed-settings layer at session bootstrap.
+///
+/// All fields are optional; an omitted field imposes no constraint from this
+/// layer. This layer composes restrictively with any server- or device-level
+/// managed settings: [`deny`](Self::deny) and [`ask`](Self::ask) rules are
+/// unioned across layers, every present [`allow`](Self::allow) list must admit a
+/// tool for it to be allowed, and bypass-mode restrictions compose to the most
+/// restrictive setting.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[non_exhaustive]
+pub struct ManagedSettingsPermissions {
+    /// Restricts bypass-permissions mode for the session. See
+    /// [`DisableBypassPermissionsModes`] for well-known values. Unknown values
+    /// are forwarded so newer runtime policies fail closed.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub disable_bypass_permissions_mode: Option<String>,
+    /// Tool-permission patterns that are always denied.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub deny: Option<Vec<String>>,
+    /// Tool-permission patterns that require an explicit ask.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub ask: Option<Vec<String>>,
+    /// Tool-permission patterns that are allowed without prompting.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub allow: Option<Vec<String>>,
+}
+
+impl ManagedSettingsPermissions {
+    /// Sets the bypass-permissions policy for this managed layer.
+    pub fn with_disable_bypass_permissions_mode(mut self, value: impl Into<String>) -> Self {
+        self.disable_bypass_permissions_mode = Some(value.into());
+        self
+    }
+
+    /// Sets the rules that are always denied.
+    pub fn with_deny(mut self, rules: Vec<String>) -> Self {
+        self.deny = Some(rules);
+        self
+    }
+
+    /// Sets the rules that require explicit approval.
+    pub fn with_ask(mut self, rules: Vec<String>) -> Self {
+        self.ask = Some(rules);
+        self
+    }
+
+    /// Sets the rules that are allowed without prompting.
+    pub fn with_allow(mut self, rules: Vec<String>) -> Self {
+        self.allow = Some(rules);
+        self
+    }
+}
+
+/// Managed-settings layer injected at session startup. Currently carries only a
+/// [`permissions`](Self::permissions) object.
+///
+/// This layer is startup-only and is not persisted with the session. It must be
+/// re-supplied on resume to remain in effect; omitting it on resume clears the
+/// previously injected layer. It can be combined with
+/// [`SessionConfig::enable_managed_settings`]. Older runtimes may ignore this
+/// additive field, so hosts must not rely on injected policy until they ship a
+/// compatible runtime.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[non_exhaustive]
+pub struct ManagedSettings {
+    /// Permission rules for this managed-settings layer.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub permissions: Option<ManagedSettingsPermissions>,
+}
+
+impl ManagedSettings {
+    /// Sets the permissions-only managed policy.
+    pub fn with_permissions(mut self, permissions: ManagedSettingsPermissions) -> Self {
+        self.permissions = Some(permissions);
+        self
+    }
+}
+
 /// Configuration for creating a new session via the `session.create` RPC.
 ///
 /// All fields are optional — the CLI applies sensible defaults.
@@ -1849,6 +1956,10 @@ pub struct SessionConfig {
     /// selected or invoked unless a custom agent with the same name is
     /// configured.
     pub excluded_builtin_agents: Option<Vec<String>>,
+    /// Built-in skill names to include in the session. In
+    /// [`ClientMode::Empty`](crate::ClientMode::Empty), `None` excludes all
+    /// runtime-bundled skills; `Some` opts the named built-ins back in.
+    pub included_builtin_skills: Option<Vec<String>>,
     /// MCP server configurations passed through to the CLI.
     pub mcp_servers: Option<IndexMap<String, McpServerConfig>>,
     /// Controls how MCP OAuth tokens are stored for this session.
@@ -1928,6 +2039,10 @@ pub struct SessionConfig {
     /// Skill names to disable. Skills in this set will not be available
     /// even if found in skill directories.
     pub disabled_skills: Option<Vec<String>>,
+    /// Exact MCP server names to disable for this session. Disabled servers are
+    /// not started or authenticated on create or cold resume; a resident resume
+    /// cannot stop servers that are already running.
+    pub disabled_mcp_servers: Option<Vec<String>>,
     /// Enable session hooks. When `true`, the CLI sends `hooks.invoke`
     /// RPC requests at key lifecycle points (pre/post tool use, prompt
     /// submission, session start/end, errors).
@@ -1977,6 +2092,9 @@ pub struct SessionConfig {
     pub enable_session_telemetry: Option<bool>,
     /// **Experimental.** Enables native model citations for supported providers.
     pub enable_citations: Option<bool>,
+    /// Opts in to capturing file changes from the first turn for session rewind
+    /// and cumulative session diff.
+    pub enable_file_change_tracking: Option<bool>,
     /// **Experimental.** Limits applied to this session's current accounting window.
     pub session_limits: Option<SessionLimitsConfig>,
     /// Per-property overrides for model capabilities, deep-merged over
@@ -2000,6 +2118,12 @@ pub struct SessionConfig {
     /// the GitHub identity used for content exclusion, model routing, and
     /// quota checks for *this session*.
     pub github_token: Option<String>,
+    /// Provider used to acquire rotating GitHub tokens for this session.
+    ///
+    /// Mutually exclusive with [`github_token`](Self::github_token). The callback
+    /// receives the effective host, optional assigned session ID, and acquisition
+    /// reason; its opaque registration ID is never exposed.
+    pub github_token_provider: Option<Arc<dyn GitHubTokenProvider>>,
     /// Per-session remote behavior control:
     /// - `Off` — local only, no remote export (default)
     /// - `Export` — export session events to GitHub without
@@ -2027,11 +2151,21 @@ pub struct SessionConfig {
     pub exp_assignments: Option<CopilotExpAssignmentResponse>,
     /// Opt-in: when `Some(true)`, the runtime self-fetches enterprise managed
     /// settings (bypass-permissions policy) at session bootstrap using the
-    /// session's [`github_token`](Self::github_token). Requires `github_token`
-    /// to be set; if omitted, the runtime is expected to reject session creation
-    /// (fail-closed). When `None`, behaves exactly as before. Set via
+    /// session's static [`github_token`](Self::github_token) or
+    /// [`github_token_provider`](Self::github_token_provider). Requires one of
+    /// those credentials; if both are omitted, the runtime is expected to reject
+    /// session creation (fail-closed). When `None`, behaves exactly as before. Set via
     /// [`with_enable_managed_settings`](Self::with_enable_managed_settings).
     pub enable_managed_settings: Option<bool>,
+    /// Optional managed-settings layer injected at session bootstrap. Currently
+    /// carries a [`permissions`](ManagedSettingsPermissions) object that composes
+    /// restrictively with any server- or device-level managed settings. This
+    /// layer is startup-only and is not persisted: it must be re-supplied on
+    /// resume to remain in effect. Can be combined with
+    /// [`enable_managed_settings`](Self::enable_managed_settings). Serialized on
+    /// the wire as `managedSettings`. Set via
+    /// [`with_managed_settings`](Self::with_managed_settings).
+    pub managed_settings: Option<ManagedSettings>,
     /// Custom session filesystem provider for this session. Required when
     /// the [`Client`](crate::Client) was started with
     /// [`ClientOptions::session_fs`](crate::ClientOptions::session_fs) set.
@@ -2118,6 +2252,7 @@ impl std::fmt::Debug for SessionConfig {
             .field("available_tools", &self.available_tools)
             .field("excluded_tools", &self.excluded_tools)
             .field("excluded_builtin_agents", &self.excluded_builtin_agents)
+            .field("included_builtin_skills", &self.included_builtin_skills)
             .field("mcp_servers", &self.mcp_servers)
             .field("mcp_oauth_token_storage", &self.mcp_oauth_token_storage)
             .field("embedding_cache_storage", &self.embedding_cache_storage)
@@ -2148,6 +2283,7 @@ impl std::fmt::Debug for SessionConfig {
             .field("large_output", &self.large_output)
             .field("tool_search", &self.tool_search)
             .field("disabled_skills", &self.disabled_skills)
+            .field("disabled_mcp_servers", &self.disabled_mcp_servers)
             .field("hooks", &self.hooks)
             .field("custom_agents", &self.custom_agents)
             .field("default_agent", &self.default_agent)
@@ -2157,6 +2293,10 @@ impl std::fmt::Debug for SessionConfig {
             .field("capi", &self.capi)
             .field("enable_session_telemetry", &self.enable_session_telemetry)
             .field("enable_citations", &self.enable_citations)
+            .field(
+                "enable_file_change_tracking",
+                &self.enable_file_change_tracking,
+            )
             .field("session_limits", &self.session_limits)
             .field("model_capabilities", &self.model_capabilities)
             .field("memory", &self.memory)
@@ -2167,6 +2307,10 @@ impl std::fmt::Debug for SessionConfig {
                 "github_token",
                 &self.github_token.as_ref().map(|_| "<redacted>"),
             )
+            .field(
+                "github_token_provider",
+                &self.github_token_provider.as_ref().map(|_| "<set>"),
+            )
             .field("remote_session", &self.remote_session)
             .field("cloud", &self.cloud)
             .field(
@@ -2177,6 +2321,7 @@ impl std::fmt::Debug for SessionConfig {
             .field("exp_assignments", &self.exp_assignments)
             .field("enable_managed_settings", &self.enable_managed_settings)
             .field("enable_experimental_mode", &self.enable_experimental_mode)
+            .field("managed_settings", &self.managed_settings)
             .field(
                 "session_fs_provider",
                 &self.session_fs_provider.as_ref().map(|_| "<set>"),
@@ -2244,6 +2389,7 @@ impl Default for SessionConfig {
             available_tools: None,
             excluded_tools: None,
             excluded_builtin_agents: None,
+            included_builtin_skills: None,
             mcp_servers: None,
             mcp_oauth_token_storage: None,
             enable_config_discovery: None,
@@ -2263,6 +2409,7 @@ impl Default for SessionConfig {
             large_output: None,
             tool_search: None,
             disabled_skills: None,
+            disabled_mcp_servers: None,
             hooks: None,
             custom_agents: None,
             default_agent: None,
@@ -2274,6 +2421,7 @@ impl Default for SessionConfig {
             models: None,
             enable_session_telemetry: None,
             enable_citations: None,
+            enable_file_change_tracking: None,
             session_limits: None,
             model_capabilities: None,
             memory: None,
@@ -2281,12 +2429,14 @@ impl Default for SessionConfig {
             working_directory: None,
             additional_directories: None,
             github_token: None,
+            github_token_provider: None,
             remote_session: None,
             cloud: None,
             include_sub_agent_streaming_events: None,
             commands: None,
             exp_assignments: None,
             enable_managed_settings: None,
+            managed_settings: None,
             session_fs_provider: None,
             permission_handler: None,
             elicitation_handler: None,
@@ -2325,6 +2475,7 @@ pub(crate) struct SessionConfigRuntime {
     pub canvas_handler: Option<Arc<dyn CanvasHandler>>,
     pub session_fs_provider: Option<Arc<dyn SessionFsProvider>>,
     pub bearer_token_providers: HashMap<String, Arc<dyn BearerTokenProvider>>,
+    pub github_token_provider: Option<Arc<dyn GitHubTokenProvider>>,
     pub commands: Option<Vec<CommandDefinition>>,
 }
 
@@ -2344,6 +2495,12 @@ impl SessionConfig {
         mut self,
         session_id: Option<SessionId>,
     ) -> Result<(crate::wire::SessionCreateWire, SessionConfigRuntime), crate::Error> {
+        if self.github_token.is_some() && self.github_token_provider.is_some() {
+            return Err(crate::Error::with_message(
+                crate::ErrorKind::InvalidConfig,
+                "github_token and github_token_provider are mutually exclusive",
+            ));
+        }
         let permission_active =
             self.permission_handler.is_some() || self.permission_policy.is_some();
         let request_user_input = self.user_input_handler.is_some();
@@ -2370,7 +2527,7 @@ impl SessionConfig {
             cmds.iter()
                 .map(|c| crate::wire::CommandWireDefinition {
                     name: c.name.clone(),
-                    description: c.description.clone(),
+                    description: c.description.clone().unwrap_or_default(),
                 })
                 .collect()
         });
@@ -2425,6 +2582,7 @@ impl SessionConfig {
             large_output: self.large_output,
             tool_search: self.tool_search,
             disabled_skills: self.disabled_skills,
+            disabled_mcp_servers: self.disabled_mcp_servers,
             custom_agents: self.custom_agents,
             custom_agents_local_only: self.custom_agents_local_only,
             default_agent: self.default_agent,
@@ -2436,6 +2594,7 @@ impl SessionConfig {
             models: self.models,
             enable_session_telemetry: self.enable_session_telemetry,
             enable_citations: self.enable_citations,
+            enable_file_change_tracking: self.enable_file_change_tracking,
             session_limits: self.session_limits,
             model_capabilities: self.model_capabilities,
             memory: self.memory,
@@ -2443,6 +2602,7 @@ impl SessionConfig {
             working_directory: self.working_directory,
             additional_directories: self.additional_directories,
             github_token: self.github_token,
+            github_token_provider_registration_id: None,
             remote_session: self.remote_session,
             cloud: self.cloud,
             include_sub_agent_streaming_events: self.include_sub_agent_streaming_events,
@@ -2451,6 +2611,7 @@ impl SessionConfig {
             exp_assignments: self.exp_assignments,
             enable_managed_settings: self.enable_managed_settings,
             is_experimental_mode: self.enable_experimental_mode,
+            managed_settings: self.managed_settings,
         };
 
         let runtime = SessionConfigRuntime {
@@ -2467,6 +2628,7 @@ impl SessionConfig {
             canvas_handler,
             session_fs_provider: self.session_fs_provider,
             bearer_token_providers,
+            github_token_provider: self.github_token_provider,
             commands: self.commands,
         };
 
@@ -2817,6 +2979,16 @@ impl SessionConfig {
         self
     }
 
+    /// Set the runtime-bundled skill allowlist.
+    pub fn with_included_builtin_skills<I, S>(mut self, names: I) -> Self
+    where
+        I: IntoIterator<Item = S>,
+        S: Into<String>,
+    {
+        self.included_builtin_skills = Some(names.into_iter().map(Into::into).collect());
+        self
+    }
+
     /// Set additional directories to search for custom instruction files.
     /// Forwarded to the CLI on session create; not the same as
     /// [`with_skill_directories`](Self::with_skill_directories).
@@ -2862,6 +3034,16 @@ impl SessionConfig {
         self
     }
 
+    /// Set exact MCP server names to disable for this session.
+    pub fn with_disabled_mcp_servers<I, S>(mut self, names: I) -> Self
+    where
+        I: IntoIterator<Item = S>,
+        S: Into<String>,
+    {
+        self.disabled_mcp_servers = Some(names.into_iter().map(Into::into).collect());
+        self
+    }
+
     /// Set the custom agents (sub-agents) configured for this session.
     pub fn with_custom_agents<I: IntoIterator<Item = CustomAgentConfig>>(
         mut self,
@@ -2937,6 +3119,13 @@ impl SessionConfig {
         self
     }
 
+    /// Opt in to capturing file changes from the first turn for session rewind
+    /// and cumulative session diff.
+    pub fn with_enable_file_change_tracking(mut self, enable: bool) -> Self {
+        self.enable_file_change_tracking = Some(enable);
+        self
+    }
+
     /// **Experimental.** Set limits for this session's current accounting window.
     pub fn with_session_limits(mut self, limits: SessionLimitsConfig) -> Self {
         self.session_limits = Some(limits);
@@ -2990,6 +3179,16 @@ impl SessionConfig {
         self
     }
 
+    /// Install a rotating GitHub token provider for this session.
+    ///
+    /// The provider must return a positive remaining lifetime in seconds when
+    /// its callback completes. Production GitHub tokens typically last eight
+    /// hours. This option is mutually exclusive with [`with_github_token`](Self::with_github_token).
+    pub fn with_github_token_provider(mut self, provider: Arc<dyn GitHubTokenProvider>) -> Self {
+        self.github_token_provider = Some(provider);
+        self
+    }
+
     /// Forward sub-agent streaming events to this connection. Defaults
     /// to true on the CLI when unset.
     pub fn with_include_sub_agent_streaming_events(mut self, include: bool) -> Self {
@@ -3057,13 +3256,23 @@ impl SessionConfig {
 
     /// Opt the runtime into self-fetching enterprise managed settings
     /// (bypass-permissions policy) at session bootstrap using the session's
-    /// [`github_token`](Self::github_token). Requires `github_token` to be set;
-    /// if omitted, the runtime is expected to reject session creation
-    /// (fail-closed).
+    /// static [`github_token`](Self::github_token) or
+    /// [`github_token_provider`](Self::github_token_provider). Requires one of
+    /// those credentials; if both are omitted, the runtime is expected to reject
+    /// session creation (fail-closed).
     pub fn with_enable_managed_settings(mut self, enabled: bool) -> Self {
         self.enable_managed_settings = Some(enabled);
         self
     }
+
+    /// Inject a managed-settings layer (currently permission rules) at session
+    /// bootstrap. This layer is startup-only and is not persisted, so it must be
+    /// re-supplied on resume to remain in effect. Can be combined with
+    /// [`with_enable_managed_settings`](Self::with_enable_managed_settings).
+    pub fn with_managed_settings(mut self, managed_settings: ManagedSettings) -> Self {
+        self.managed_settings = Some(managed_settings);
+        self
+    }
 }
 ///
 /// See [`SessionConfig`] for the construction patterns (chained `with_*`
@@ -3127,6 +3336,10 @@ pub struct ResumeSessionConfig {
     /// selected or invoked unless a custom agent with the same name is
     /// configured.
     pub excluded_builtin_agents: Option<Vec<String>>,
+    /// Built-in skill names to include in the resumed session. In
+    /// [`ClientMode::Empty`](crate::ClientMode::Empty), `None` excludes all
+    /// runtime-bundled skills; `Some` opts the named built-ins back in.
+    pub included_builtin_skills: Option<Vec<String>>,
     /// Re-supply MCP servers so they remain available after app restart.
     pub mcp_servers: Option<IndexMap<String, McpServerConfig>>,
     /// Controls how MCP OAuth tokens are stored for this session.
@@ -3176,6 +3389,9 @@ pub struct ResumeSessionConfig {
     pub tool_search: Option<ToolSearchConfig>,
     /// Skill names to disable on resume.
     pub disabled_skills: Option<Vec<String>>,
+    /// Exact MCP server names to disable on resume. This prevents startup and
+    /// authentication during a cold resume, but cannot stop resident servers.
+    pub disabled_mcp_servers: Option<Vec<String>>,
     /// Enable session hooks on resume.
     pub hooks: Option<bool>,
     /// Custom agents to re-supply on resume.
@@ -3216,6 +3432,10 @@ pub struct ResumeSessionConfig {
     pub enable_session_telemetry: Option<bool>,
     /// **Experimental.** Enables native model citations for supported providers.
     pub enable_citations: Option<bool>,
+    /// Opts in to capturing file changes for session rewind and cumulative
+    /// session diff when the resumed session has a valid baseline. Earlier
+    /// untracked changes cannot be reconstructed.
+    pub enable_file_change_tracking: Option<bool>,
     /// **Experimental.** Limits applied to this session's current accounting window.
     pub session_limits: Option<SessionLimitsConfig>,
     /// Per-property model capability overrides on resume.
@@ -3232,6 +3452,9 @@ pub struct ResumeSessionConfig {
     /// Per-session GitHub token on resume. See
     /// [`SessionConfig::github_token`].
     pub github_token: Option<String>,
+    /// Rotating GitHub token provider on resume. See
+    /// [`SessionConfig::github_token_provider`].
+    pub github_token_provider: Option<Arc<dyn GitHubTokenProvider>>,
     /// Per-session remote behavior control on resume. See
     /// [`SessionConfig::remote_session`].
     pub remote_session: Option<crate::generated::api_types::RemoteSessionMode>,
@@ -3253,6 +3476,12 @@ pub struct ResumeSessionConfig {
     /// process restart. Set via
     /// [`with_enable_managed_settings`](Self::with_enable_managed_settings).
     pub enable_managed_settings: Option<bool>,
+    /// Optional managed-settings layer injected on resume. See
+    /// [`SessionConfig::managed_settings`]. This layer is not persisted, so it
+    /// must be re-supplied on resume to remain in effect; omitting it clears the
+    /// previously injected layer. Serialized on the wire as `managedSettings`.
+    /// Set via [`with_managed_settings`](Self::with_managed_settings).
+    pub managed_settings: Option<ManagedSettings>,
     /// Custom session filesystem provider. Required on resume when the
     /// [`Client`](crate::Client) was started with
     /// [`ClientOptions::session_fs`](crate::ClientOptions::session_fs).
@@ -3333,6 +3562,7 @@ impl std::fmt::Debug for ResumeSessionConfig {
             .field("available_tools", &self.available_tools)
             .field("excluded_tools", &self.excluded_tools)
             .field("excluded_builtin_agents", &self.excluded_builtin_agents)
+            .field("included_builtin_skills", &self.included_builtin_skills)
             .field("mcp_servers", &self.mcp_servers)
             .field("mcp_oauth_token_storage", &self.mcp_oauth_token_storage)
             .field("embedding_cache_storage", &self.embedding_cache_storage)
@@ -3363,6 +3593,7 @@ impl std::fmt::Debug for ResumeSessionConfig {
             .field("large_output", &self.large_output)
             .field("tool_search", &self.tool_search)
             .field("disabled_skills", &self.disabled_skills)
+            .field("disabled_mcp_servers", &self.disabled_mcp_servers)
             .field("hooks", &self.hooks)
             .field("custom_agents", &self.custom_agents)
             .field("default_agent", &self.default_agent)
@@ -3372,6 +3603,10 @@ impl std::fmt::Debug for ResumeSessionConfig {
             .field("capi", &self.capi)
             .field("enable_session_telemetry", &self.enable_session_telemetry)
             .field("enable_citations", &self.enable_citations)
+            .field(
+                "enable_file_change_tracking",
+                &self.enable_file_change_tracking,
+            )
             .field("session_limits", &self.session_limits)
             .field("model_capabilities", &self.model_capabilities)
             .field("memory", &self.memory)
@@ -3382,6 +3617,10 @@ impl std::fmt::Debug for ResumeSessionConfig {
                 "github_token",
                 &self.github_token.as_ref().map(|_| "<redacted>"),
             )
+            .field(
+                "github_token_provider",
+                &self.github_token_provider.as_ref().map(|_| "<set>"),
+            )
             .field("remote_session", &self.remote_session)
             .field(
                 "include_sub_agent_streaming_events",
@@ -3391,6 +3630,7 @@ impl std::fmt::Debug for ResumeSessionConfig {
             .field("exp_assignments", &self.exp_assignments)
             .field("enable_managed_settings", &self.enable_managed_settings)
             .field("enable_experimental_mode", &self.enable_experimental_mode)
+            .field("managed_settings", &self.managed_settings)
             .field(
                 "session_fs_provider",
                 &self.session_fs_provider.as_ref().map(|_| "<set>"),
@@ -3440,6 +3680,12 @@ impl ResumeSessionConfig {
     pub(crate) fn into_wire(
         mut self,
     ) -> Result<(crate::wire::SessionResumeWire, SessionConfigRuntime), crate::Error> {
+        if self.github_token.is_some() && self.github_token_provider.is_some() {
+            return Err(crate::Error::with_message(
+                crate::ErrorKind::InvalidConfig,
+                "github_token and github_token_provider are mutually exclusive",
+            ));
+        }
         let permission_active =
             self.permission_handler.is_some() || self.permission_policy.is_some();
         let request_user_input = self.user_input_handler.is_some();
@@ -3466,7 +3712,7 @@ impl ResumeSessionConfig {
             cmds.iter()
                 .map(|c| crate::wire::CommandWireDefinition {
                     name: c.name.clone(),
-                    description: c.description.clone(),
+                    description: c.description.clone().unwrap_or_default(),
                 })
                 .collect()
         });
@@ -3522,6 +3768,7 @@ impl ResumeSessionConfig {
             large_output: self.large_output,
             tool_search: self.tool_search,
             disabled_skills: self.disabled_skills,
+            disabled_mcp_servers: self.disabled_mcp_servers,
             custom_agents: self.custom_agents,
             custom_agents_local_only: self.custom_agents_local_only,
             default_agent: self.default_agent,
@@ -3533,6 +3780,7 @@ impl ResumeSessionConfig {
             models: self.models,
             enable_session_telemetry: self.enable_session_telemetry,
             enable_citations: self.enable_citations,
+            enable_file_change_tracking: self.enable_file_change_tracking,
             session_limits: self.session_limits,
             model_capabilities: self.model_capabilities,
             memory: self.memory,
@@ -3540,6 +3788,7 @@ impl ResumeSessionConfig {
             working_directory: self.working_directory,
             additional_directories: self.additional_directories,
             github_token: self.github_token,
+            github_token_provider_registration_id: None,
             remote_session: self.remote_session,
             include_sub_agent_streaming_events: self.include_sub_agent_streaming_events,
             enable_github_telemetry_forwarding: None,
@@ -3547,6 +3796,7 @@ impl ResumeSessionConfig {
             exp_assignments: self.exp_assignments,
             enable_managed_settings: self.enable_managed_settings,
             is_experimental_mode: self.enable_experimental_mode,
+            managed_settings: self.managed_settings,
             suppress_resume_event: self.suppress_resume_event,
             continue_pending_work: self.continue_pending_work,
         };
@@ -3565,6 +3815,7 @@ impl ResumeSessionConfig {
             canvas_handler,
             session_fs_provider: self.session_fs_provider,
             bearer_token_providers,
+            github_token_provider: self.github_token_provider,
             commands: self.commands,
         };
 
@@ -3597,6 +3848,7 @@ impl ResumeSessionConfig {
             available_tools: None,
             excluded_tools: None,
             excluded_builtin_agents: None,
+            included_builtin_skills: None,
             mcp_servers: None,
             mcp_oauth_token_storage: None,
             enable_config_discovery: None,
@@ -3616,6 +3868,7 @@ impl ResumeSessionConfig {
             large_output: None,
             tool_search: None,
             disabled_skills: None,
+            disabled_mcp_servers: None,
             hooks: None,
             custom_agents: None,
             default_agent: None,
@@ -3627,6 +3880,7 @@ impl ResumeSessionConfig {
             models: None,
             enable_session_telemetry: None,
             enable_citations: None,
+            enable_file_change_tracking: None,
             session_limits: None,
             model_capabilities: None,
             memory: None,
@@ -3634,11 +3888,13 @@ impl ResumeSessionConfig {
             working_directory: None,
             additional_directories: None,
             github_token: None,
+            github_token_provider: None,
             remote_session: None,
             include_sub_agent_streaming_events: None,
             commands: None,
             exp_assignments: None,
             enable_managed_settings: None,
+            managed_settings: None,
             session_fs_provider: None,
             suppress_resume_event: None,
             continue_pending_work: None,
@@ -3987,6 +4243,16 @@ impl ResumeSessionConfig {
         self
     }
 
+    /// Set the runtime-bundled skill allowlist on resume.
+    pub fn with_included_builtin_skills<I, S>(mut self, names: I) -> Self
+    where
+        I: IntoIterator<Item = S>,
+        S: Into<String>,
+    {
+        self.included_builtin_skills = Some(names.into_iter().map(Into::into).collect());
+        self
+    }
+
     /// Set additional directories to search for custom instruction files
     /// on resume. Forwarded to the CLI; not the same as
     /// [`with_skill_directories`](Self::with_skill_directories).
@@ -4032,6 +4298,16 @@ impl ResumeSessionConfig {
         self
     }
 
+    /// Set exact MCP server names to disable for this session.
+    pub fn with_disabled_mcp_servers<I, S>(mut self, names: I) -> Self
+    where
+        I: IntoIterator<Item = S>,
+        S: Into<String>,
+    {
+        self.disabled_mcp_servers = Some(names.into_iter().map(Into::into).collect());
+        self
+    }
+
     /// Re-supply custom agents on resume.
     pub fn with_custom_agents<I: IntoIterator<Item = CustomAgentConfig>>(
         mut self,
@@ -4105,6 +4381,13 @@ impl ResumeSessionConfig {
         self
     }
 
+    /// Opt in to capturing file changes for session rewind and cumulative
+    /// session diff when the resumed session has a valid baseline.
+    pub fn with_enable_file_change_tracking(mut self, enable: bool) -> Self {
+        self.enable_file_change_tracking = Some(enable);
+        self
+    }
+
     /// **Experimental.** Set limits for this session's current accounting window.
     pub fn with_session_limits(mut self, limits: SessionLimitsConfig) -> Self {
         self.session_limits = Some(limits);
@@ -4156,6 +4439,16 @@ impl ResumeSessionConfig {
         self
     }
 
+    /// Install a rotating GitHub token provider for the resumed session.
+    ///
+    /// The provider must return a positive remaining lifetime in seconds when
+    /// its callback completes. Production GitHub tokens typically last eight
+    /// hours. Mutually exclusive with [`with_github_token`](Self::with_github_token).
+    pub fn with_github_token_provider(mut self, provider: Arc<dyn GitHubTokenProvider>) -> Self {
+        self.github_token_provider = Some(provider);
+        self
+    }
+
     /// Forward sub-agent streaming events to this connection on resume.
     pub fn with_include_sub_agent_streaming_events(mut self, include: bool) -> Self {
         self.include_sub_agent_streaming_events = Some(include);
@@ -4233,6 +4526,14 @@ impl ResumeSessionConfig {
         self.enable_managed_settings = Some(enabled);
         self
     }
+
+    /// Inject a managed-settings layer (currently permission rules) on resume.
+    /// See [`SessionConfig::with_managed_settings`]. Must be re-supplied on
+    /// resume; omitting it clears the previously injected layer.
+    pub fn with_managed_settings(mut self, managed_settings: ManagedSettings) -> Self {
+        self.managed_settings = Some(managed_settings);
+        self
+    }
 }
 
 /// Controls how the system message is constructed.
@@ -5557,7 +5858,9 @@ pub use crate::generated::api_types::{
     Model, ModelBilling, ModelBillingTokenPrices, ModelBillingTokenPricesLongContext,
     ModelCapabilities, ModelCapabilitiesLimits, ModelCapabilitiesLimitsVision,
     ModelCapabilitiesSupports, ModelList, ModelPolicy, PermissionDecision,
-    PermissionDecisionApproveOnce, PermissionDecisionReject, PermissionDecisionUserNotAvailable,
+    PermissionDecisionApproveOnce, PermissionDecisionContext, PermissionDecisionOutcome,
+    PermissionDecisionReject, PermissionDecisionSource, PermissionDecisionSurface,
+    PermissionDecisionUserNotAvailable, PermissionResponseCapability,
 };
 
 /// Permission categories the CLI may request approval for.
@@ -5667,13 +5970,21 @@ mod tests {
         CopilotExpAssignmentResponse, CustomAgentConfig, DeliveryMode, ExpConfigEntry,
         ExpFlagValue, ExtensionInfo, GitHubMcpToolConfig, GitHubReferenceType,
         InfiniteSessionConfig, LargeToolOutputConfig, McpServerConfig, McpStdioServerConfig,
-        MemoryConfiguration, NamedProviderConfig, ProviderConfig, ProviderModelConfig,
-        ReasoningSummary, ResumeSessionConfig, SessionConfig, SessionEvent, SessionId,
-        SystemMessageConfig, Tool, ToolBinaryResult, ToolResult, ToolResultExpanded,
+        MemoryConfiguration, NamedProviderConfig, PermissionResponseCapability, ProviderConfig,
+        ProviderModelConfig, ReasoningSummary, ResumeSessionConfig, SessionConfig, SessionEvent,
+        SessionId, SystemMessageConfig, Tool, ToolBinaryResult, ToolResult, ToolResultExpanded,
         ToolResultResponse, ensure_attachment_display_names,
     };
     use crate::generated::session_events::TypedSessionEvent;
 
+    #[test]
+    fn permission_response_capability_is_publicly_exported() {
+        assert_eq!(
+            serde_json::to_value(PermissionResponseCapability::Interactive).unwrap(),
+            json!("interactive")
+        );
+    }
+
     #[test]
     fn tool_builder_composes() {
         let tool = Tool::new("greet")
@@ -6342,6 +6653,10 @@ mod tests {
 
         let cfg = SessionConfig {
             plugin_directories: Some(vec![PathBuf::from("/tmp/plugins")]),
+            disabled_mcp_servers: Some(vec![
+                "local-files".to_string(),
+                "remote-github".to_string(),
+            ]),
             large_output: Some(
                 LargeToolOutputConfig::new()
                     .with_enabled(true)
@@ -6356,6 +6671,10 @@ mod tests {
             .expect("no duplicate handlers");
         let wire_json = serde_json::to_value(&wire).unwrap();
         assert_eq!(wire_json["pluginDirectories"][0], "/tmp/plugins");
+        assert_eq!(
+            wire_json["disabledMcpServers"],
+            serde_json::json!(["local-files", "remote-github"])
+        );
         assert_eq!(wire_json["largeOutput"]["enabled"], true);
         assert_eq!(wire_json["largeOutput"]["maxSizeBytes"], 1024);
         assert_eq!(wire_json["largeOutput"]["outputDir"], "/tmp/large-output");
@@ -6365,6 +6684,7 @@ mod tests {
             .expect("default has no duplicate handlers");
         let empty_json = serde_json::to_value(&empty_wire).unwrap();
         assert!(empty_json.get("pluginDirectories").is_none());
+        assert!(empty_json.get("disabledMcpServers").is_none());
         assert!(empty_json.get("largeOutput").is_none());
     }
 
@@ -6414,6 +6734,7 @@ mod tests {
 
         let mut cfg = ResumeSessionConfig::new(SessionId::from("sess-1"));
         cfg.plugin_directories = Some(vec![PathBuf::from("/tmp/plugins-r")]);
+        cfg.disabled_mcp_servers = Some(vec!["local-files-r".to_string()]);
         cfg.large_output = Some(
             LargeToolOutputConfig::new()
                 .with_enabled(false)
@@ -6424,6 +6745,10 @@ mod tests {
         let (wire, _) = cfg.into_wire().expect("no duplicate handlers");
         let wire_json = serde_json::to_value(&wire).unwrap();
         assert_eq!(wire_json["pluginDirectories"][0], "/tmp/plugins-r");
+        assert_eq!(
+            wire_json["disabledMcpServers"],
+            serde_json::json!(["local-files-r"])
+        );
         assert_eq!(wire_json["largeOutput"]["enabled"], false);
         assert_eq!(wire_json["largeOutput"]["maxSizeBytes"], 2048);
         assert_eq!(wire_json["largeOutput"]["outputDir"], "/tmp/large-output-r");
@@ -6433,9 +6758,38 @@ mod tests {
             .expect("default resume has no duplicate handlers");
         let empty_json = serde_json::to_value(&empty_wire).unwrap();
         assert!(empty_json.get("pluginDirectories").is_none());
+        assert!(empty_json.get("disabledMcpServers").is_none());
         assert!(empty_json.get("largeOutput").is_none());
     }
 
+    #[test]
+    fn session_config_clones_disabled_mcp_servers() {
+        let create = SessionConfig::default().with_disabled_mcp_servers(["local-files"]);
+        let mut create_clone = create.clone();
+        create_clone
+            .disabled_mcp_servers
+            .as_mut()
+            .expect("configured disabled MCP servers")
+            .push("remote-github".to_string());
+        assert_eq!(
+            create.disabled_mcp_servers.as_deref(),
+            Some(&["local-files".to_string()][..])
+        );
+
+        let resume = ResumeSessionConfig::new(SessionId::from("sess-1"))
+            .with_disabled_mcp_servers(["local-files"]);
+        let mut resume_clone = resume.clone();
+        resume_clone
+            .disabled_mcp_servers
+            .as_mut()
+            .expect("configured disabled MCP servers")
+            .push("remote-github".to_string());
+        assert_eq!(
+            resume.disabled_mcp_servers.as_deref(),
+            Some(&["local-files".to_string()][..])
+        );
+    }
+
     #[test]
     fn session_config_builder_composes() {
         use indexmap::IndexMap;
@@ -6457,6 +6811,7 @@ mod tests {
             .with_enable_on_demand_instruction_discovery(true)
             .with_skill_directories([PathBuf::from("/tmp/skills")])
             .with_disabled_skills(["broken-skill"])
+            .with_disabled_mcp_servers(["local-files"])
             .with_agent("researcher")
             .with_config_directory(PathBuf::from("/tmp/config"))
             .with_working_directory(PathBuf::from("/tmp/work"))
@@ -6495,6 +6850,10 @@ mod tests {
             cfg.disabled_skills.as_deref(),
             Some(&["broken-skill".to_string()][..])
         );
+        assert_eq!(
+            cfg.disabled_mcp_servers.as_deref(),
+            Some(&["local-files".to_string()][..])
+        );
         assert_eq!(cfg.agent.as_deref(), Some("researcher"));
         assert_eq!(cfg.config_directory, Some(PathBuf::from("/tmp/config")));
         assert_eq!(cfg.working_directory, Some(PathBuf::from("/tmp/work")));
@@ -6533,6 +6892,7 @@ mod tests {
             .with_enable_on_demand_instruction_discovery(false)
             .with_skill_directories([PathBuf::from("/tmp/skills")])
             .with_disabled_skills(["broken-skill"])
+            .with_disabled_mcp_servers(["local-files"])
             .with_agent("researcher")
             .with_config_directory(PathBuf::from("/tmp/config"))
             .with_working_directory(PathBuf::from("/tmp/work"))
@@ -6571,6 +6931,10 @@ mod tests {
             cfg.disabled_skills.as_deref(),
             Some(&["broken-skill".to_string()][..])
         );
+        assert_eq!(
+            cfg.disabled_mcp_servers.as_deref(),
+            Some(&["local-files".to_string()][..])
+        );
         assert_eq!(cfg.agent.as_deref(), Some("researcher"));
         assert_eq!(cfg.config_directory, Some(PathBuf::from("/tmp/config")));
         assert_eq!(cfg.working_directory, Some(PathBuf::from("/tmp/work")));
@@ -7336,7 +7700,10 @@ mod permission_builder_tests {
         let h = resolve_create(cfg).expect("policy + handler yields handler");
         assert!(matches!(
             dispatch(&h).await,
-            PermissionResult::Decision(PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
     }
 
@@ -7346,7 +7713,10 @@ mod permission_builder_tests {
         let h = resolve_create(cfg).expect("policy alone yields handler");
         assert!(matches!(
             dispatch(&h).await,
-            PermissionResult::Decision(PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
     }
 
@@ -7364,11 +7734,17 @@ mod permission_builder_tests {
         let hb = resolve_create(b).unwrap();
         assert!(matches!(
             dispatch(&ha).await,
-            PermissionResult::Decision(PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
         assert!(matches!(
             dispatch(&hb).await,
-            PermissionResult::Decision(PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
     }
 
@@ -7384,11 +7760,17 @@ mod permission_builder_tests {
         let hb = resolve_create(b).unwrap();
         assert!(matches!(
             dispatch(&ha).await,
-            PermissionResult::Decision(PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::Reject(_),
+                ..
+            }
         ));
         assert!(matches!(
             dispatch(&hb).await,
-            PermissionResult::Decision(PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::Reject(_),
+                ..
+            }
         ));
     }
 
@@ -7400,7 +7782,10 @@ mod permission_builder_tests {
         let h = resolve_create(cfg).unwrap();
         assert!(matches!(
             dispatch(&h).await,
-            PermissionResult::Decision(PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::Reject(_),
+                ..
+            }
         ));
     }
 
@@ -7419,11 +7804,17 @@ mod permission_builder_tests {
         let hb = resolve_create(b).unwrap();
         assert!(matches!(
             dispatch(&ha).await,
-            PermissionResult::Decision(PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::Reject(_),
+                ..
+            }
         ));
         assert!(matches!(
             dispatch(&hb).await,
-            PermissionResult::Decision(PermissionDecision::Reject(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::Reject(_),
+                ..
+            }
         ));
     }
 
@@ -7435,7 +7826,10 @@ mod permission_builder_tests {
         let h = resolve_resume(cfg).unwrap();
         assert!(matches!(
             dispatch(&h).await,
-            PermissionResult::Decision(PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
     }
 
@@ -7451,11 +7845,17 @@ mod permission_builder_tests {
         let hb = resolve_resume(b).unwrap();
         assert!(matches!(
             dispatch(&ha).await,
-            PermissionResult::Decision(PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
         assert!(matches!(
             dispatch(&hb).await,
-            PermissionResult::Decision(PermissionDecision::ApproveOnce(_))
+            PermissionResult::Decision {
+                decision: PermissionDecision::ApproveOnce(_),
+                ..
+            }
         ));
     }
 
@@ -7516,3 +7916,50 @@ mod permission_builder_tests {
         assert!(json.get("isExperimentalMode").is_none());
     }
 }
+
+#[cfg(test)]
+mod is_terminal_tests {
+    use super::Tool;
+
+    #[test]
+    fn is_terminal_serializes_as_camel_case_when_set() {
+        let tool = Tool {
+            name: "clear_context".to_owned(),
+            is_terminal: true,
+            ..Default::default()
+        };
+        let value = serde_json::to_value(&tool).expect("tool serializes");
+        assert_eq!(
+            value.get("isTerminal"),
+            Some(&serde_json::Value::Bool(true))
+        );
+    }
+
+    #[test]
+    fn is_terminal_is_omitted_when_false() {
+        let tool = Tool {
+            name: "plain".to_owned(),
+            ..Default::default()
+        };
+        let value = serde_json::to_value(&tool).expect("tool serializes");
+        assert!(value.get("isTerminal").is_none());
+    }
+
+    /// `Tool` has a hand-written `Debug` impl, so a new field is only reported
+    /// if it is added there by hand. Guard against that drift.
+    #[test]
+    fn is_terminal_appears_in_debug_output() {
+        let terminal = Tool {
+            name: "clear_context".to_owned(),
+            is_terminal: true,
+            ..Default::default()
+        };
+        assert!(format!("{terminal:?}").contains("is_terminal: true"));
+
+        let plain = Tool {
+            name: "plain".to_owned(),
+            ..Default::default()
+        };
+        assert!(format!("{plain:?}").contains("is_terminal: false"));
+    }
+}
diff --git a/rust/src/wire.rs b/rust/src/wire.rs
index 261350e972..f7de33839c 100644
--- a/rust/src/wire.rs
+++ b/rust/src/wire.rs
@@ -38,8 +38,9 @@ use crate::types::{
 #[serde(rename_all = "camelCase")]
 pub(crate) struct CommandWireDefinition {
     pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
+    /// Always sent. The runtime requires a string, so a command declared
+    /// without a description is serialized as `""` rather than omitted.
+    pub description: String,
 }
 
 /// The exact JSON shape sent on the `session.create` JSON-RPC request.
@@ -130,6 +131,8 @@ pub(crate) struct SessionCreateWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub disabled_skills: Option<Vec<String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_mcp_servers: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub custom_agents: Option<Vec<CustomAgentConfig>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub custom_agents_local_only: Option<bool>,
@@ -152,6 +155,8 @@ pub(crate) struct SessionCreateWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_citations: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_file_change_tracking: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub session_limits: Option<SessionLimitsConfig>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub model_capabilities: Option<ModelCapabilitiesOverride>,
@@ -165,6 +170,11 @@ pub(crate) struct SessionCreateWire {
     pub additional_directories: Option<Vec<PathBuf>>,
     #[serde(rename = "gitHubToken", skip_serializing_if = "Option::is_none")]
     pub github_token: Option<String>,
+    #[serde(
+        rename = "gitHubTokenProviderRegistrationId",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub github_token_provider_registration_id: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub remote_session: Option<RemoteSessionMode>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -184,6 +194,8 @@ pub(crate) struct SessionCreateWire {
     pub enable_managed_settings: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub is_experimental_mode: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed_settings: Option<crate::types::ManagedSettings>,
 }
 
 /// The exact JSON shape sent on the `session.resume` JSON-RPC request.
@@ -274,6 +286,8 @@ pub(crate) struct SessionResumeWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub disabled_skills: Option<Vec<String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub disabled_mcp_servers: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub custom_agents: Option<Vec<CustomAgentConfig>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub custom_agents_local_only: Option<bool>,
@@ -296,6 +310,8 @@ pub(crate) struct SessionResumeWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_citations: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_file_change_tracking: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub session_limits: Option<SessionLimitsConfig>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub model_capabilities: Option<ModelCapabilitiesOverride>,
@@ -309,6 +325,11 @@ pub(crate) struct SessionResumeWire {
     pub additional_directories: Option<Vec<PathBuf>>,
     #[serde(rename = "gitHubToken", skip_serializing_if = "Option::is_none")]
     pub github_token: Option<String>,
+    #[serde(
+        rename = "gitHubTokenProviderRegistrationId",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub github_token_provider_registration_id: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub remote_session: Option<RemoteSessionMode>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -331,4 +352,6 @@ pub(crate) struct SessionResumeWire {
     pub enable_managed_settings: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub is_experimental_mode: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed_settings: Option<crate::types::ManagedSettings>,
 }
diff --git a/rust/tests/builtin_plugin_directories_test.rs b/rust/tests/builtin_plugin_directories_test.rs
new file mode 100644
index 0000000000..f1310f9b04
--- /dev/null
+++ b/rust/tests/builtin_plugin_directories_test.rs
@@ -0,0 +1,135 @@
+#![allow(clippy::unwrap_used)]
+
+use std::path::PathBuf;
+
+use github_copilot_sdk::{CliProgram, Client, ClientOptions, ErrorKind, Transport};
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
+use tokio::net::TcpListener;
+
+async fn read_framed(reader: &mut (impl AsyncRead + Unpin)) -> serde_json::Value {
+    let mut header = String::new();
+    loop {
+        let mut byte = [0u8; 1];
+        reader.read_exact(&mut byte).await.unwrap();
+        header.push(byte[0] as char);
+        if header.ends_with("\r\n\r\n") {
+            break;
+        }
+    }
+    let length = header
+        .trim()
+        .strip_prefix("Content-Length: ")
+        .unwrap()
+        .parse()
+        .unwrap();
+    let mut body = vec![0; length];
+    reader.read_exact(&mut body).await.unwrap();
+    serde_json::from_slice(&body).unwrap()
+}
+
+async fn write_result(
+    writer: &mut (impl AsyncWrite + Unpin),
+    request: &serde_json::Value,
+    result: serde_json::Value,
+) {
+    let body = serde_json::to_vec(&serde_json::json!({
+        "jsonrpc": "2.0",
+        "id": request["id"],
+        "result": result,
+    }))
+    .unwrap();
+    writer
+        .write_all(format!("Content-Length: {}\r\n\r\n", body.len()).as_bytes())
+        .await
+        .unwrap();
+    writer.write_all(&body).await.unwrap();
+    writer.flush().await.unwrap();
+}
+
+async fn run_start(paths: Option<Vec<PathBuf>>) -> Vec<serde_json::Value> {
+    let listener = TcpListener::bind(("127.0.0.1", 0)).await.unwrap();
+    let address = listener.local_addr().unwrap();
+    let expect_builtin = paths.as_ref().is_some_and(|paths| !paths.is_empty());
+
+    let server = tokio::spawn(async move {
+        let (stream, _) = listener.accept().await.unwrap();
+        let (mut reader, mut writer) = tokio::io::split(stream);
+        let mut requests = Vec::new();
+
+        let connect = read_framed(&mut reader).await;
+        write_result(
+            &mut writer,
+            &connect,
+            serde_json::json!({ "ok": true, "protocolVersion": 3, "version": "test" }),
+        )
+        .await;
+        requests.push(connect);
+
+        if expect_builtin {
+            let builtin = read_framed(&mut reader).await;
+            write_result(&mut writer, &builtin, serde_json::json!({})).await;
+            requests.push(builtin);
+        }
+        requests
+    });
+
+    let mut options = ClientOptions::new()
+        .with_program(CliProgram::Path(std::env::current_exe().unwrap()))
+        .with_transport(Transport::External {
+            host: address.ip().to_string(),
+            port: address.port(),
+            connection_token: None,
+        });
+    if let Some(paths) = paths {
+        options = options.with_builtin_plugin_directories(paths);
+    }
+    let client = Client::start(options).await.unwrap();
+    let requests = server.await.unwrap();
+    client.force_stop();
+    requests
+}
+
+#[tokio::test]
+async fn default_and_empty_do_not_call_rpc() {
+    for paths in [None, Some(Vec::new())] {
+        let requests = run_start(paths).await;
+        assert_eq!(requests.len(), 1);
+        assert_eq!(requests[0]["method"], "connect");
+    }
+}
+
+#[tokio::test]
+async fn configured_directories_call_rpc_once_before_start_completes() {
+    let cwd = std::env::current_dir().unwrap();
+    let paths = vec![cwd.join("plugins/core"), cwd.join("plugins/github")];
+
+    let requests = run_start(Some(paths.clone())).await;
+
+    assert_eq!(requests.len(), 2);
+    assert_eq!(requests[0]["method"], "connect");
+    assert_eq!(requests[1]["method"], "plugins.builtin.set");
+    assert_eq!(
+        requests[1]["params"],
+        serde_json::json!({
+            "paths": paths
+                .iter()
+                .map(|path| path.to_str().unwrap())
+                .collect::<Vec<_>>()
+        })
+    );
+}
+
+#[tokio::test]
+async fn relative_directory_is_rejected() {
+    let options = ClientOptions::new()
+        .with_program(CliProgram::Path(std::env::current_exe().unwrap()))
+        .with_builtin_plugin_directories(["plugins/core"]);
+
+    let error = match Client::start(options).await {
+        Ok(_) => panic!("relative path unexpectedly accepted"),
+        Err(error) => error,
+    };
+
+    assert_eq!(error.kind(), &ErrorKind::InvalidConfig);
+    assert!(error.to_string().contains("absolute paths"));
+}
diff --git a/rust/tests/e2e.rs b/rust/tests/e2e.rs
index 3a698abd18..03723dfb1b 100644
--- a/rust/tests/e2e.rs
+++ b/rust/tests/e2e.rs
@@ -66,6 +66,8 @@ mod permissions;
 mod pre_mcp_tool_call_hook;
 #[path = "e2e/provider_endpoint.rs"]
 mod provider_endpoint;
+#[path = "e2e/rewind.rs"]
+mod rewind;
 #[path = "e2e/rpc_additional_edge_cases.rs"]
 mod rpc_additional_edge_cases;
 #[path = "e2e/rpc_agent.rs"]
diff --git a/rust/tests/e2e/client.rs b/rust/tests/e2e/client.rs
index 0ac4c9d457..880c1a28c4 100644
--- a/rust/tests/e2e/client.rs
+++ b/rust/tests/e2e/client.rs
@@ -79,6 +79,11 @@ async fn should_get_status() {
 
 #[tokio::test]
 async fn should_get_authenticated_status() {
+    // TODO(cli-1.0.81-2): CLI 1.0.81-2 stopped honoring client-level GitHub tokens over the
+    // in-process (FFI) host, which resolves auth from the ambient environment instead.
+    if super::support::skip_inprocess("client-level GitHub tokens are not supported in-process") {
+        return;
+    }
     with_e2e_context("client", "should_get_authenticated_status", |ctx| {
         Box::pin(async move {
             ctx.set_default_copilot_user();
@@ -99,6 +104,11 @@ async fn should_get_authenticated_status() {
 
 #[tokio::test]
 async fn should_list_models_when_authenticated() {
+    // TODO(cli-1.0.81-2): CLI 1.0.81-2 stopped honoring client-level GitHub tokens over the
+    // in-process (FFI) host, which resolves auth from the ambient environment instead.
+    if super::support::skip_inprocess("client-level GitHub tokens are not supported in-process") {
+        return;
+    }
     with_e2e_context("client", "should_list_models_when_authenticated", |ctx| {
         Box::pin(async move {
             ctx.set_default_copilot_user();
diff --git a/rust/tests/e2e/commands.rs b/rust/tests/e2e/commands.rs
index d110d3b352..2e15c24a0f 100644
--- a/rust/tests/e2e/commands.rs
+++ b/rust/tests/e2e/commands.rs
@@ -105,6 +105,7 @@ async fn session_commands_invoke_known_builtin_returns_expected_result() {
                     .invoke(CommandsInvokeRequest {
                         name: "context".to_string(),
                         input: None,
+                        ..Default::default()
                     })
                     .await
                     .expect("invoke context");
@@ -119,6 +120,7 @@ async fn session_commands_invoke_known_builtin_returns_expected_result() {
                         assert!(!prompt.prompt.trim().is_empty());
                     }
                     SlashCommandInvocationResult::Completed(_) => {}
+                    unexpected => panic!("unexpected command result: {unexpected:?}"),
                 }
 
                 session.disconnect().await.expect("disconnect session");
diff --git a/rust/tests/e2e/github_telemetry.rs b/rust/tests/e2e/github_telemetry.rs
index 2047ee34ff..02af0e2ae8 100644
--- a/rust/tests/e2e/github_telemetry.rs
+++ b/rust/tests/e2e/github_telemetry.rs
@@ -9,6 +9,11 @@ use super::support::{DEFAULT_TEST_TOKEN, with_e2e_context_no_snapshot};
 
 #[tokio::test]
 async fn should_forward_github_telemetry_on_session_create() {
+    // TODO(cli-1.0.81-2): CLI 1.0.81-2 does not forward GitHub telemetry notifications over
+    // the in-process (FFI) host, mirroring the existing telemetry-configuration limitation.
+    if super::support::skip_inprocess("GitHub telemetry forwarding is not honored in-process") {
+        return;
+    }
     with_e2e_context_no_snapshot(|ctx| {
         Box::pin(async move {
             ctx.set_default_copilot_user();
diff --git a/rust/tests/e2e/mode_handlers.rs b/rust/tests/e2e/mode_handlers.rs
index 7ab6fe5bfa..b796096d06 100644
--- a/rust/tests/e2e/mode_handlers.rs
+++ b/rust/tests/e2e/mode_handlers.rs
@@ -118,6 +118,7 @@ async fn should_invoke_exit_plan_mode_handler_when_model_uses_tool() {
                     .mode()
                     .set(ModeSetRequest {
                         mode: SessionMode::Plan,
+                        ..Default::default()
                     })
                     .await
                     .expect("set plan mode");
diff --git a/rust/tests/e2e/permissions.rs b/rust/tests/e2e/permissions.rs
index 8f594841fd..65b37928db 100644
--- a/rust/tests/e2e/permissions.rs
+++ b/rust/tests/e2e/permissions.rs
@@ -50,9 +50,10 @@ async fn should_handle_permission_handler_errors_gracefully() {
 
     assert!(matches!(
         result,
-        PermissionResult::Decision(
-            github_copilot_sdk::types::PermissionDecision::UserNotAvailable(_)
-        )
+        PermissionResult::Decision {
+            decision: github_copilot_sdk::types::PermissionDecision::UserNotAvailable(_),
+            ..
+        }
     ));
 }
 
diff --git a/rust/tests/e2e/provider_endpoint.rs b/rust/tests/e2e/provider_endpoint.rs
index 3953aad669..6aeff7b1a7 100644
--- a/rust/tests/e2e/provider_endpoint.rs
+++ b/rust/tests/e2e/provider_endpoint.rs
@@ -91,6 +91,11 @@ async fn byok_provider_endpoint_returns_configured_endpoint() {
 #[tokio::test]
 #[allow(deprecated)]
 async fn capi_provider_endpoint_returns_resolved_credentials() {
+    // TODO(cli-1.0.81-2): CLI 1.0.81-2 stopped honoring client-level GitHub tokens over the
+    // in-process (FFI) host, which resolves auth from the ambient environment instead.
+    if super::support::skip_inprocess("client-level GitHub tokens are not supported in-process") {
+        return;
+    }
     with_e2e_context(
         "provider-endpoint",
         "capi_provider_endpoint_returns_resolved_credentials",
diff --git a/rust/tests/e2e/rewind.rs b/rust/tests/e2e/rewind.rs
new file mode 100644
index 0000000000..990c45091d
--- /dev/null
+++ b/rust/tests/e2e/rewind.rs
@@ -0,0 +1,131 @@
+use std::path::Path;
+use std::time::Duration;
+
+use github_copilot_sdk::rpc::{
+    HistoryListRewindPointsResult, HistoryPreviewRewindRequest, HistoryRewindMode,
+    HistoryRewindOutcome, HistoryRewindRequest,
+};
+
+use super::support::assistant_message_content;
+
+const FILE_NAME: &str = "rewind-sdk.txt";
+const FILE_CONTENT: &str = "SDK rewind content";
+
+#[tokio::test]
+async fn should_restore_tracked_file_and_conversation() {
+    super::support::with_shared_e2e_context(
+        &E2E,
+        "rewind",
+        "should_restore_tracked_file_and_conversation",
+        |ctx| {
+            Box::pin(async move {
+                ctx.set_default_copilot_user();
+                let file_path = ctx.work_dir().join(FILE_NAME);
+                let client = ctx.start_client().await;
+                let session = client
+                    .create_session(
+                        ctx.approve_all_session_config()
+                            .with_model("claude-sonnet-4.5")
+                            .with_enable_file_change_tracking(true),
+                    )
+                    .await
+                    .expect("create session");
+
+                let response = session
+                    .send_and_wait(format!(
+                        "Use the create tool to create {FILE_NAME} containing exactly \
+                         {FILE_CONTENT}. After the tool succeeds, reply with exactly \
+                         SDK_REWIND_DONE."
+                    ))
+                    .await
+                    .expect("send rewind setup prompt")
+                    .expect("assistant message");
+                assert_eq!(assistant_message_content(&response), "SDK_REWIND_DONE");
+                assert_eq!(
+                    std::fs::read_to_string(&file_path).expect("read tracked file"),
+                    FILE_CONTENT
+                );
+
+                let rewind_points = wait_for_rewind_points(&session).await;
+                assert!(rewind_points.file_change_tracking_enabled);
+                assert_eq!(rewind_points.points.len(), 1);
+                let rewind_point = &rewind_points.points[0];
+                assert!(rewind_point.can_restore_files);
+                assert_eq!(rewind_point.file_count, 1);
+
+                let preview = session
+                    .rpc()
+                    .history()
+                    .preview_rewind(HistoryPreviewRewindRequest {
+                        event_id: rewind_point.event_id.clone(),
+                    })
+                    .await
+                    .expect("preview rewind");
+                assert!(preview.available);
+                assert_eq!(preview.files.len(), 1);
+                assert_same_path(&file_path, Path::new(&preview.files[0].path));
+
+                let rewind = session
+                    .rpc()
+                    .history()
+                    .rewind(HistoryRewindRequest {
+                        event_id: rewind_point.event_id.clone(),
+                        mode: HistoryRewindMode::ConversationAndFiles,
+                    })
+                    .await
+                    .expect("rewind conversation and files");
+                assert_eq!(rewind.outcome, HistoryRewindOutcome::Success);
+                assert!(rewind.events_removed.is_some_and(|count| count > 0));
+                assert_eq!(rewind.restored_files.len(), 1);
+                assert_same_path(&file_path, Path::new(&rewind.restored_files[0]));
+                assert!(!file_path.exists());
+
+                let events = session.get_events().await.expect("get events after rewind");
+                assert!(events.iter().all(|event| event.id != rewind_point.event_id));
+
+                session.disconnect().await.expect("disconnect session");
+                client.stop().await.expect("stop client");
+            })
+        },
+    )
+    .await;
+}
+
+async fn wait_for_rewind_points(
+    session: &github_copilot_sdk::session::Session,
+) -> HistoryListRewindPointsResult {
+    let deadline = tokio::time::Instant::now() + Duration::from_secs(10);
+    loop {
+        let result = session
+            .rpc()
+            .history()
+            .list_rewind_points()
+            .await
+            .expect("list rewind points");
+        if result.unavailable_reason.is_none() {
+            return result;
+        }
+        assert!(
+            tokio::time::Instant::now() < deadline,
+            "timed out waiting for rewind points"
+        );
+        tokio::time::sleep(Duration::from_millis(100)).await;
+    }
+}
+
+fn assert_same_path(expected: &Path, actual: &Path) {
+    let expected = expected.to_string_lossy();
+    let actual = actual.to_string_lossy();
+    if cfg!(windows) {
+        let expected = expected.replace('\\', "/");
+        let actual = actual.replace('\\', "/");
+        assert!(
+            expected.eq_ignore_ascii_case(&actual),
+            "expected path {expected:?}, got {actual:?}"
+        );
+    } else {
+        assert_eq!(expected, actual);
+    }
+}
+
+static E2E: super::support::SharedE2eGroup = super::support::SharedE2eGroup::standard("rewind", 1);
diff --git a/rust/tests/e2e/rpc_additional_edge_cases.rs b/rust/tests/e2e/rpc_additional_edge_cases.rs
index d7537f3141..56b9198ab7 100644
--- a/rust/tests/e2e/rpc_additional_edge_cases.rs
+++ b/rust/tests/e2e/rpc_additional_edge_cases.rs
@@ -277,6 +277,7 @@ async fn mode_set_to_same_value_multiple_times_stays_stable() {
                         .mode()
                         .set(ModeSetRequest {
                             mode: SessionMode::Plan,
+                            ..Default::default()
                         })
                         .await
                         .expect("set mode");
diff --git a/rust/tests/e2e/rpc_event_side_effects.rs b/rust/tests/e2e/rpc_event_side_effects.rs
index e8d7b29b23..06adc3f65c 100644
--- a/rust/tests/e2e/rpc_event_side_effects.rs
+++ b/rust/tests/e2e/rpc_event_side_effects.rs
@@ -40,6 +40,7 @@ async fn should_emit_mode_changed_event_when_mode_set() {
                     .mode()
                     .set(ModeSetRequest {
                         mode: SessionMode::Plan,
+                        ..Default::default()
                     })
                     .await
                     .expect("set mode");
diff --git a/rust/tests/e2e/rpc_mcp_and_skills.rs b/rust/tests/e2e/rpc_mcp_and_skills.rs
index d5a295e073..8cf3efd998 100644
--- a/rust/tests/e2e/rpc_mcp_and_skills.rs
+++ b/rust/tests/e2e/rpc_mcp_and_skills.rs
@@ -9,9 +9,9 @@ use github_copilot_sdk::rpc::{
     McpAppsSetHostContextRequest, McpCancelSamplingExecutionParams, McpDisableRequest,
     McpEnableRequest, McpExecuteSamplingParams, McpExecuteSamplingRequest, McpOauthLoginRequest,
     McpResourcesReadRequest, McpSamplingExecutionAction, McpSetEnvValueModeDetails,
-    McpSetEnvValueModeParams, PermissionsAllowAllMode, PermissionsSetAllowAllRequest,
-    SkillsDisableRequest, SkillsEnableRequest,
+    McpSetEnvValueModeParams, PermissionsSetModeRequest, SkillsDisableRequest, SkillsEnableRequest,
 };
+use github_copilot_sdk::session_events::PermissionMode;
 use github_copilot_sdk::{IndexMap, McpServerConfig, McpStdioServerConfig};
 
 #[tokio::test]
@@ -361,10 +361,9 @@ async fn should_list_extensions() {
                 session
                     .rpc()
                     .permissions()
-                    .set_allow_all(PermissionsSetAllowAllRequest {
-                        enabled: None,
-                        mode: Some(PermissionsAllowAllMode::On),
-                        model: None,
+                    .set_mode(PermissionsSetModeRequest {
+                        assisted_approval_model: None,
+                        mode: PermissionMode::AllowAll,
                         source: None,
                     })
                     .await
@@ -715,10 +714,9 @@ async fn should_report_error_when_extensions_are_not_available() {
                 session
                     .rpc()
                     .permissions()
-                    .set_allow_all(PermissionsSetAllowAllRequest {
-                        enabled: None,
-                        mode: Some(PermissionsAllowAllMode::On),
-                        model: None,
+                    .set_mode(PermissionsSetModeRequest {
+                        assisted_approval_model: None,
+                        mode: PermissionMode::AllowAll,
                         source: None,
                     })
                     .await
diff --git a/rust/tests/e2e/rpc_mcp_lifecycle.rs b/rust/tests/e2e/rpc_mcp_lifecycle.rs
index 9e135f1e97..8e5b74c05b 100644
--- a/rust/tests/e2e/rpc_mcp_lifecycle.rs
+++ b/rust/tests/e2e/rpc_mcp_lifecycle.rs
@@ -138,6 +138,10 @@ async fn should_stop_running_mcp_server() {
     .await;
 }
 
+// TODO(cli-1.0.81-2): CLI 1.0.81-2 no longer installs an MCP config from the inline start
+// payload, so `session.mcp.startServer` reports "has no installed config to start".
+// Re-enable once the runtime fix ships.
+#[ignore = "blocked on CLI 1.0.81-2 MCP installed-config regression"]
 #[tokio::test]
 async fn should_start_and_restart_mcp_server() {
     super::support::with_shared_e2e_context(
@@ -205,6 +209,7 @@ async fn should_start_and_restart_mcp_server() {
 // internal methods generically; it never exercised a supported wire API.
 
 #[tokio::test]
+#[ignore = "blocked on CLI 1.0.81-6 missing session.mcp.reloadWithConfig handler"]
 async fn should_reload_mcp_servers_with_config() {
     super::support::with_shared_e2e_context(
         &E2E,
@@ -248,6 +253,7 @@ async fn should_reload_mcp_servers_with_config() {
 }
 
 #[tokio::test]
+#[ignore = "blocked on CLI 1.0.81-6 missing session.mcp.configureGitHub handler"]
 async fn should_configure_github_mcp_server() {
     super::support::with_shared_e2e_context(
         &E2E,
diff --git a/rust/tests/e2e/rpc_server.rs b/rust/tests/e2e/rpc_server.rs
index caa846ba04..8df662ea8e 100644
--- a/rust/tests/e2e/rpc_server.rs
+++ b/rust/tests/e2e/rpc_server.rs
@@ -48,6 +48,11 @@ async fn should_call_rpc_ping_with_typed_params_and_result() {
 
 #[tokio::test]
 async fn should_call_rpc_models_list_with_typed_result() {
+    // TODO(cli-1.0.81-2): CLI 1.0.81-2 stopped honoring client-level GitHub tokens over the
+    // in-process (FFI) host, which resolves auth from the ambient environment instead.
+    if super::support::skip_inprocess("client-level GitHub tokens are not supported in-process") {
+        return;
+    }
     with_e2e_context(
         "rpc_server",
         "should_call_rpc_models_list_with_typed_result",
@@ -77,6 +82,11 @@ async fn should_call_rpc_models_list_with_typed_result() {
 
 #[tokio::test]
 async fn should_call_rpc_account_get_quota_when_authenticated() {
+    // TODO(cli-1.0.81-2): CLI 1.0.81-2 stopped honoring client-level GitHub tokens over the
+    // in-process (FFI) host, which resolves auth from the ambient environment instead.
+    if super::support::skip_inprocess("client-level GitHub tokens are not supported in-process") {
+        return;
+    }
     with_e2e_context(
         "rpc_server",
         "should_call_rpc_account_get_quota_when_authenticated",
diff --git a/rust/tests/e2e/rpc_server_misc.rs b/rust/tests/e2e/rpc_server_misc.rs
index 47ae4ecbd2..e53cce2e59 100644
--- a/rust/tests/e2e/rpc_server_misc.rs
+++ b/rust/tests/e2e/rpc_server_misc.rs
@@ -1,6 +1,6 @@
 use github_copilot_sdk::Client;
 use github_copilot_sdk::rpc::{
-    AccountLoginRequest, AccountLogoutRequest, AgentRegistrySpawnRequest,
+    AccountLoginRequest, AccountLogoutRequest, AgentRegistrySpawnRequest, AuthInfo,
     SendAttachmentsToMessageParams, SessionsOpenStatus, UserSettingsSetRequest,
 };
 use serde_json::{Map, Value, json};
@@ -150,7 +150,7 @@ async fn should_login_list_getcurrentauth_and_logout_account() {
                     .account()
                     .login(AccountLoginRequest {
                         host: "https://github.com".to_string(),
-                        login: "rust-account-user".to_string(),
+                        login: Some("rust-account-user".to_string()),
                         token: "rust-account-token".to_string(),
                     })
                     .await
@@ -164,8 +164,11 @@ async fn should_login_list_getcurrentauth_and_logout_account() {
                     .await
                     .expect("get current auth after login");
                 let auth_info = current.auth_info.expect("auth info after login");
-                assert_eq!(auth_info["login"], json!("rust-account-user"));
-                assert_eq!(auth_info["host"], json!("https://github.com"));
+                let AuthInfo::User(user_auth_info) = &auth_info else {
+                    panic!("expected user auth info, got {auth_info:?}");
+                };
+                assert_eq!(user_auth_info.login, "rust-account-user");
+                assert_eq!(user_auth_info.host, "https://github.com");
 
                 let users = client
                     .rpc()
@@ -173,10 +176,12 @@ async fn should_login_list_getcurrentauth_and_logout_account() {
                     .get_all_users()
                     .await
                     .expect("get all users");
-                if let Some(user) = users
-                    .iter()
-                    .find(|user| user.auth_info["login"] == json!("rust-account-user"))
-                {
+                if let Some(user) = users.iter().find(|user| {
+                    matches!(
+                        &user.auth_info,
+                        AuthInfo::User(auth_info) if auth_info.login == "rust-account-user"
+                    )
+                }) {
                     user.token
                         .as_deref()
                         .filter(|token| *token == "rust-account-token")
@@ -188,7 +193,10 @@ async fn should_login_list_getcurrentauth_and_logout_account() {
                 let logout = client
                     .rpc()
                     .account()
-                    .logout(AccountLogoutRequest { auth_info })
+                    .logout(AccountLogoutRequest {
+                        auth_info: Some(auth_info),
+                        ..Default::default()
+                    })
                     .await
                     .expect("account logout");
                 assert!(!logout.has_more_users);
diff --git a/rust/tests/e2e/rpc_session_state.rs b/rust/tests/e2e/rpc_session_state.rs
index c705d231c1..aa67312473 100644
--- a/rust/tests/e2e/rpc_session_state.rs
+++ b/rust/tests/e2e/rpc_session_state.rs
@@ -7,15 +7,15 @@ use github_copilot_sdk::rpc::{
     ModelSetReasoningEffortRequest, ModelSwitchToRequest, NameSetAutoRequest, NameSetRequest,
     PermissionsResetSessionApprovalsRequest, PermissionsSetApproveAllRequest, PlanUpdateRequest,
     SessionSetCredentialsParams, SessionUpdateOptionsParams, SessionWorkingDirectoryContext,
-    SessionWorkingDirectoryContextHostType, SessionsForkRequest, ShutdownRequest,
-    TelemetrySetFeatureOverridesRequest, WorkspacesCreateFileRequest, WorkspacesReadFileRequest,
+    SessionWorkingDirectoryContextHostType, SessionsForkRequest, SettableAuthInfo, ShutdownRequest,
+    TelemetrySetFeatureOverridesRequest, UserAuthInfo, WorkspacesCreateFileRequest,
+    WorkspacesReadFileRequest,
 };
 use github_copilot_sdk::session_events::{
     SessionContextChangedData, SessionEventType, SessionMode, SessionShutdownData,
     SessionTitleChangedData, SessionWorkspaceFileChangedData, ShutdownType,
     WorkspaceFileChangedOperation,
 };
-use serde_json::json;
 
 use super::support::{assistant_message_content, wait_for_condition, wait_for_event};
 
@@ -129,6 +129,7 @@ async fn should_get_and_set_session_mode() {
                     .mode()
                     .set(ModeSetRequest {
                         mode: SessionMode::Plan,
+                        ..Default::default()
                     })
                     .await
                     .expect("set plan mode");
@@ -207,7 +208,10 @@ async fn should_set_and_get_each_session_mode_value() {
                     session
                         .rpc()
                         .mode()
-                        .set(ModeSetRequest { mode: mode.clone() })
+                        .set(ModeSetRequest {
+                            mode: mode.clone(),
+                            ..Default::default()
+                        })
                         .await
                         .expect("set mode");
                     assert_eq!(session.rpc().mode().get().await.expect("get mode"), mode);
@@ -757,18 +761,18 @@ async fn should_update_options_and_initialize_session_services() {
                     .await
                     .expect("create session");
 
+                let mut update_options = SessionUpdateOptionsParams::default();
+                update_options.ask_user_disabled = Some(true);
+                update_options.available_tools = Some(vec!["view".to_string()]);
+                update_options.client_name = Some("rust-rpc-e2e".to_string());
+                update_options.enable_streaming = Some(true);
+                update_options.model = Some(MODEL_ID.to_string());
+                update_options.working_directory = Some(ctx.work_dir().display().to_string());
+
                 let options = session
                     .rpc()
                     .options()
-                    .update(SessionUpdateOptionsParams {
-                        ask_user_disabled: Some(true),
-                        available_tools: Some(vec!["view".to_string()]),
-                        client_name: Some("rust-rpc-e2e".to_string()),
-                        enable_streaming: Some(true),
-                        model: Some(MODEL_ID.to_string()),
-                        working_directory: Some(ctx.work_dir().display().to_string()),
-                        ..SessionUpdateOptionsParams::default()
-                    })
+                    .update(update_options)
                     .await
                     .expect("update options");
                 assert!(options.success);
@@ -888,10 +892,10 @@ async fn should_set_auth_credentials() {
                     .rpc()
                     .git_hub_auth()
                     .set_credentials(SessionSetCredentialsParams {
-                        credentials: Some(json!({
-                            "type": "user",
-                            "host": "github.com",
-                            "login": "rpc-session-user"
+                        credentials: Some(SettableAuthInfo::User(UserAuthInfo {
+                            host: "github.com".to_string(),
+                            login: "rpc-session-user".to_string(),
+                            ..Default::default()
                         })),
                     })
                     .await
diff --git a/rust/tests/e2e/rpc_session_state_extras.rs b/rust/tests/e2e/rpc_session_state_extras.rs
index f43359f0b1..81901d06ae 100644
--- a/rust/tests/e2e/rpc_session_state_extras.rs
+++ b/rust/tests/e2e/rpc_session_state_extras.rs
@@ -3,11 +3,12 @@ use std::collections::HashMap;
 use github_copilot_sdk::Client;
 use github_copilot_sdk::rpc::{
     CompletionsRequestRequest, MetadataContextHeaviestMessagesRequest, ModelSwitchToRequest,
-    NamedProviderConfig, PermissionsSetAllowAllRequest, ProviderAddRequest, ProviderConfigType,
+    NamedProviderConfig, PermissionsSetModeRequest, ProviderAddRequest, ProviderConfigType,
     ProviderConfigWireApi, ProviderModelConfig, SessionVisibilityStatus, SubagentSettingsEntry,
     SubagentSettingsEntryContextTier, UpdateSubagentSettingsRequest,
     UpdateSubagentSettingsRequestSubagents, VisibilitySetRequest,
 };
+use github_copilot_sdk::session_events::PermissionMode;
 
 use super::support::{assistant_message_content, with_e2e_context};
 
@@ -103,55 +104,55 @@ async fn should_get_and_set_allowall_permissions() {
                 let initial = session
                     .rpc()
                     .permissions()
-                    .get_allow_all()
+                    .get_mode()
                     .await
-                    .expect("get initial allow-all");
-                assert!(!initial.enabled);
+                    .expect("get initial permission mode");
+                assert_eq!(initial.mode, PermissionMode::Manual);
 
                 let enable = session
                     .rpc()
                     .permissions()
-                    .set_allow_all(PermissionsSetAllowAllRequest {
-                        enabled: Some(true),
-                        mode: None,
-                        model: None,
+                    .set_mode(PermissionsSetModeRequest {
+                        assisted_approval_model: None,
+                        mode: PermissionMode::AllowAll,
                         source: None,
                     })
                     .await
-                    .expect("enable allow-all");
+                    .expect("set allow-all mode");
                 assert!(enable.success);
-                assert!(enable.enabled);
-                assert!(
+                assert_eq!(enable.mode, PermissionMode::AllowAll);
+                assert_eq!(
                     session
                         .rpc()
                         .permissions()
-                        .get_allow_all()
+                        .get_mode()
                         .await
-                        .expect("get enabled allow-all")
-                        .enabled
+                        .expect("get allow-all mode")
+                        .mode,
+                    PermissionMode::AllowAll
                 );
 
                 let disable = session
                     .rpc()
                     .permissions()
-                    .set_allow_all(PermissionsSetAllowAllRequest {
-                        enabled: Some(false),
-                        mode: None,
-                        model: None,
+                    .set_mode(PermissionsSetModeRequest {
+                        assisted_approval_model: None,
+                        mode: PermissionMode::Manual,
                         source: None,
                     })
                     .await
-                    .expect("disable allow-all");
+                    .expect("set manual mode");
                 assert!(disable.success);
-                assert!(!disable.enabled);
-                assert!(
-                    !session
+                assert_eq!(disable.mode, PermissionMode::Manual);
+                assert_eq!(
+                    session
                         .rpc()
                         .permissions()
-                        .get_allow_all()
+                        .get_mode()
                         .await
-                        .expect("get disabled allow-all")
-                        .enabled
+                        .expect("get manual mode")
+                        .mode,
+                    PermissionMode::Manual
                 );
 
                 session.disconnect().await.expect("disconnect session");
@@ -304,7 +305,7 @@ async fn should_add_byok_provider_and_model_at_runtime() {
                             id: "small".to_string(),
                             max_context_window_tokens: None,
                             max_output_tokens: None,
-                            max_prompt_tokens: Some(4096.0),
+                            max_prompt_tokens: Some(4096),
                             model_id: None,
                             name: Some("Rust Added Model".to_string()),
                             provider: "rust-e2e-provider".to_string(),
@@ -320,13 +321,8 @@ async fn should_add_byok_provider_and_model_at_runtime() {
                     .rpc()
                     .model()
                     .switch_to(ModelSwitchToRequest {
-                        context_tier: None,
-                        defer_if_model_change_queued: None,
-                        model_capabilities: None,
                         model_id: selection_id.to_string(),
-                        reasoning_effort: None,
-                        reasoning_summary: None,
-                        verbosity: None,
+                        ..Default::default()
                     })
                     .await
                     .expect("switch to added model");
diff --git a/rust/tests/e2e/rpc_tasks_and_handlers.rs b/rust/tests/e2e/rpc_tasks_and_handlers.rs
index b3010ab78a..540238ddd0 100644
--- a/rust/tests/e2e/rpc_tasks_and_handlers.rs
+++ b/rust/tests/e2e/rpc_tasks_and_handlers.rs
@@ -273,6 +273,7 @@ async fn should_return_expected_results_for_missing_pending_handler_requestids()
                         result: UIElicitationResponse {
                             action: UIElicitationResponseAction::Cancel,
                             content: Default::default(),
+                            meta: None,
                         },
                     })
                     .await
@@ -404,6 +405,7 @@ async fn should_return_expected_results_for_missing_pending_handler_requestids()
                         .rpc()
                         .permissions()
                         .handle_pending_permission_request(PermissionDecisionRequest {
+                            decision_context: None,
                             request_id: request_id.into(),
                             result,
                         })
diff --git a/rust/tests/e2e/rpc_ui_ephemeral_query.rs b/rust/tests/e2e/rpc_ui_ephemeral_query.rs
index 2fa421cc6d..5bb09882b0 100644
--- a/rust/tests/e2e/rpc_ui_ephemeral_query.rs
+++ b/rust/tests/e2e/rpc_ui_ephemeral_query.rs
@@ -1,5 +1,9 @@
 use github_copilot_sdk::rpc::UIEphemeralQueryRequest;
 
+// TODO(cli-1.0.81-2): CLI 1.0.81-5 still fails session.ui.ephemeralQuery against the
+// recorded snapshot on macOS ("Failed to get response from the AI model"). Re-enable
+// once the runtime fix ships.
+#[ignore = "blocked on CLI 1.0.81-5 session.ui.ephemeralQuery regression on macOS"]
 #[tokio::test]
 async fn should_answer_ephemeral_query() {
     super::support::with_shared_e2e_context(
diff --git a/rust/tests/e2e/session_fs_sqlite.rs b/rust/tests/e2e/session_fs_sqlite.rs
index 8ba712bb45..919563c691 100644
--- a/rust/tests/e2e/session_fs_sqlite.rs
+++ b/rust/tests/e2e/session_fs_sqlite.rs
@@ -407,6 +407,9 @@ fn sqlite_session_config(
         .with_session_fs_provider(provider)
 }
 
+// TODO(cli-1.0.81-2): CLI 1.0.81-2 hangs servicing the nested SQL tool request, so this test
+// times out. Re-enable once the runtime reentrancy fix ships.
+#[ignore = "blocked on CLI 1.0.81-2 nested tool-request servicing regression"]
 #[tokio::test]
 async fn should_route_sql_queries_through_the_sessionfs_sqlite_handler() {
     super::support::with_shared_e2e_context(
@@ -478,6 +481,9 @@ async fn should_route_sql_queries_through_the_sessionfs_sqlite_handler() {
     .await;
 }
 
+// TODO(cli-1.0.81-2): CLI 1.0.81-2 hangs servicing the nested SQL tool request, so this test
+// times out. Re-enable once the runtime reentrancy fix ships.
+#[ignore = "blocked on CLI 1.0.81-2 nested tool-request servicing regression"]
 #[tokio::test]
 async fn should_allow_subagents_to_use_sql_tool_via_inherited_sessionfs() {
     super::support::with_shared_e2e_context(
diff --git a/rust/tests/e2e/support.rs b/rust/tests/e2e/support.rs
index d65b049f9b..76f9a21c8f 100644
--- a/rust/tests/e2e/support.rs
+++ b/rust/tests/e2e/support.rs
@@ -1385,8 +1385,17 @@ impl CapiProxy {
             "/stop"
         };
         let result = self.post_json(path, "");
-        if let Some(mut child) = self.child.take() {
-            wait_for_child_exit(&mut child)?;
+        if let Some(mut child) = self.child.take()
+            && let Err(error) = wait_for_child_exit(&mut child)
+        {
+            if result.is_err() {
+                return Err(error);
+            }
+            // The proxy acknowledges /stop before its asynchronous server shutdown.
+            // npm/tsx can occasionally leave its wrapper alive after the proxy has
+            // accepted the request; wait_for_child_exit has reaped it, so do not turn
+            // an otherwise successful test into a teardown failure.
+            eprintln!("force-killed E2E proxy after successful stop request: {error}");
         }
         result
     }
diff --git a/rust/tests/jsonrpc_test.rs b/rust/tests/jsonrpc_test.rs
index 7f7d432130..1735067c3e 100644
--- a/rust/tests/jsonrpc_test.rs
+++ b/rust/tests/jsonrpc_test.rs
@@ -2,7 +2,7 @@
 #![allow(clippy::unwrap_used)]
 
 use github_copilot_sdk::test_support::{JsonRpcClient, JsonRpcNotification, JsonRpcRequest};
-use tokio::io::{AsyncWrite, AsyncWriteExt, duplex};
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, duplex};
 use tokio::sync::{broadcast, mpsc};
 
 /// Write a Content-Length framed JSON-RPC message to a writer.
@@ -13,6 +13,28 @@ async fn write_framed(writer: &mut (impl AsyncWrite + Unpin), body: &[u8]) {
     writer.flush().await.unwrap();
 }
 
+async fn read_framed(reader: &mut (impl AsyncRead + Unpin)) -> Vec<u8> {
+    let mut header = String::new();
+    loop {
+        let mut byte = [0u8; 1];
+        reader.read_exact(&mut byte).await.unwrap();
+        header.push(byte[0] as char);
+        if header.ends_with("\r\n\r\n") {
+            break;
+        }
+    }
+
+    let length = header
+        .trim()
+        .strip_prefix("Content-Length: ")
+        .unwrap()
+        .parse()
+        .unwrap();
+    let mut body = vec![0u8; length];
+    reader.read_exact(&mut body).await.unwrap();
+    body
+}
+
 #[tokio::test]
 async fn request_response_round_trip() {
     // duplex: client_write → server_read, server_write → client_read
@@ -410,3 +432,116 @@ async fn send_request_cancellation_does_not_leak_pending() {
     assert_eq!(response.result.unwrap()["ok"], true);
     server_task.await.unwrap();
 }
+
+#[test]
+fn lone_surrogate_yields_unexpected_end_of_hex_escape() {
+    let error = serde_json::from_slice::<serde_json::Value>(br#""\ud83d""#).unwrap_err();
+
+    assert_eq!(
+        error.to_string(),
+        "unexpected end of hex escape at line 1 column 8"
+    );
+}
+
+#[tokio::test]
+async fn lone_surrogate_frame_is_recovered_without_closing_connection() {
+    let (client_write, mut server_read) = duplex(4096);
+    let (mut server_write, client_read) = duplex(4096);
+    let (notification_tx, _) = broadcast::channel(16);
+    let (request_tx, _) = mpsc::unbounded_channel();
+    let client = JsonRpcClient::new(client_write, client_read, notification_tx, request_tx);
+
+    let server_task = tokio::spawn(async move {
+        let request: JsonRpcRequest =
+            serde_json::from_slice(&read_framed(&mut server_read).await).unwrap();
+        let response = format!(
+            r#"{{"jsonrpc":"2.0","id":{},"result":{{"name":"invalid \ud83d value"}}}}"#,
+            request.id
+        );
+        write_framed(&mut server_write, response.as_bytes()).await;
+
+        let request: JsonRpcRequest =
+            serde_json::from_slice(&read_framed(&mut server_read).await).unwrap();
+        let response = serde_json::json!({
+            "jsonrpc": "2.0",
+            "id": request.id,
+            "result": {"name": "still connected"}
+        });
+        write_framed(&mut server_write, &serde_json::to_vec(&response).unwrap()).await;
+    });
+
+    let response = client.send_request("models.list", None).await.unwrap();
+    assert_eq!(
+        response.result.unwrap()["name"],
+        serde_json::json!("invalid \u{FFFD} value")
+    );
+
+    let response = client.send_request("account.getQuota", None).await.unwrap();
+    assert_eq!(
+        response.result.unwrap()["name"],
+        serde_json::json!("still connected")
+    );
+    server_task.await.unwrap();
+}
+
+#[tokio::test]
+async fn unrepairable_frame_remains_fatal() {
+    let (client_write, mut server_read) = duplex(4096);
+    let (mut server_write, client_read) = duplex(4096);
+    let (notification_tx, _) = broadcast::channel(16);
+    let (request_tx, _) = mpsc::unbounded_channel();
+    let client = JsonRpcClient::new(client_write, client_read, notification_tx, request_tx);
+
+    let server_task = tokio::spawn(async move {
+        let request: JsonRpcRequest =
+            serde_json::from_slice(&read_framed(&mut server_read).await).unwrap();
+        let response = format!(
+            r#"{{"jsonrpc":"2.0","id":{},"result":{{"surrogate":"\ud83d","escape":"\q"}}}}"#,
+            request.id
+        );
+        write_framed(&mut server_write, response.as_bytes()).await;
+    });
+
+    let error = tokio::time::timeout(
+        std::time::Duration::from_secs(2),
+        client.send_request("models.list", None),
+    )
+    .await
+    .expect("unrepairable frame did not terminate the pending request")
+    .unwrap_err();
+
+    assert_eq!(error.to_string(), "request cancelled");
+    assert!(error.is_transport_failure());
+    server_task.await.unwrap();
+}
+
+#[tokio::test]
+async fn valid_pairs_and_escaped_backslashes_are_untouched() {
+    let (client_write, mut server_read) = duplex(4096);
+    let (mut server_write, client_read) = duplex(4096);
+    let (notification_tx, _) = broadcast::channel(16);
+    let (request_tx, _) = mpsc::unbounded_channel();
+    let client = JsonRpcClient::new(client_write, client_read, notification_tx, request_tx);
+
+    let server_task = tokio::spawn(async move {
+        let request: JsonRpcRequest =
+            serde_json::from_slice(&read_framed(&mut server_read).await).unwrap();
+        let response = format!(
+            r#"{{"jsonrpc":"2.0","id":{},"result":{{"emoji":"\ud83d\ude00","path":"C:\\ud83d","invalid":"\ud83d"}}}}"#,
+            request.id
+        );
+        write_framed(&mut server_write, response.as_bytes()).await;
+    });
+
+    let result = client
+        .send_request("models.list", None)
+        .await
+        .unwrap()
+        .result
+        .unwrap();
+
+    assert_eq!(result["emoji"], serde_json::json!("😀"));
+    assert_eq!(result["path"], serde_json::json!(r"C:\ud83d"));
+    assert_eq!(result["invalid"], serde_json::json!("\u{FFFD}"));
+    server_task.await.unwrap();
+}
diff --git a/rust/tests/protocol_version_test.rs b/rust/tests/protocol_version_test.rs
index 9d613d8d76..0d1268c59e 100644
--- a/rust/tests/protocol_version_test.rs
+++ b/rust/tests/protocol_version_test.rs
@@ -127,6 +127,7 @@ async fn connect_handshake_supplies_protocol_version() {
     assert_eq!(req["method"], "connect");
     // Token is None for the from_streams entry point (no transport spawn).
     assert!(req["params"].get("token").is_none());
+    assert!(req["params"].get("clientInfo").is_none());
     let response = serde_json::json!({
         "jsonrpc": "2.0",
         "id": req["id"],
diff --git a/rust/tests/session_test.rs b/rust/tests/session_test.rs
index 41cae3e950..a51d61910d 100644
--- a/rust/tests/session_test.rs
+++ b/rust/tests/session_test.rs
@@ -7,23 +7,29 @@ use std::time::Duration;
 
 use async_trait::async_trait;
 use github_copilot_sdk::canvas::{CanvasDeclaration, CanvasHandler, CanvasResult};
+use github_copilot_sdk::github_token::{
+    GitHubToken, GitHubTokenProviderArgs, GitHubTokenProviderResult, GitHubTokenRequestReason,
+};
 use github_copilot_sdk::handler::{
     ApproveAllHandler, AutoModeSwitchHandler, AutoModeSwitchResponse, ElicitationHandler,
     ExitPlanModeHandler, ExitPlanModeResult, McpAuthHandler, McpAuthRequest, McpAuthResult,
-    UserInputHandler, UserInputResponse,
+    PermissionHandler, PermissionResult, UserInputHandler, UserInputResponse,
 };
 use github_copilot_sdk::rpc::{
     CanvasProviderInvokeActionRequest, CanvasProviderOpenRequest, CanvasProviderOpenResult,
     OpenCanvasInstance,
 };
 use github_copilot_sdk::session_events::{
-    McpOauthRequiredData, ReasoningSummary, SessionLimitsConfig,
+    ManagedSettingsResolvedSource, McpOauthRequiredData, ReasoningSummary, SessionLimitsConfig,
+    SessionManagedSettingsResolvedData,
 };
 use github_copilot_sdk::types::{
     CanvasProviderIdentity, CloudSessionOptions, CloudSessionRepository, CommandContext,
-    CommandDefinition, CommandHandler, DeliveryMode, ElicitationRequest, ElicitationResult,
-    ExitPlanModeData, ExtensionInfo, MessageOptions, RequestId, SessionConfig, SessionId,
-    SetModelOptions, Tool, ToolInvocation, ToolResult,
+    CommandDefinition, CommandHandler, DeliveryMode, DisableBypassPermissionsModes,
+    ElicitationRequest, ElicitationResult, ExitPlanModeData, ExtensionInfo, ManagedSettings,
+    ManagedSettingsPermissions, MessageOptions, PermissionDecisionContext,
+    PermissionDecisionOutcome, PermissionDecisionSource, PermissionDecisionSurface, RequestId,
+    SessionConfig, SessionId, SetModelOptions, Tool, ToolInvocation, ToolResult,
 };
 use github_copilot_sdk::{Client, ContextTier, ErrorKind, ProtocolErrorKind, tool};
 use serde_json::Value;
@@ -36,6 +42,25 @@ struct TestCanvasHandler;
 
 struct CancelMcpAuthHandler;
 
+struct ContextualApproveHandler;
+
+#[async_trait]
+impl PermissionHandler for ContextualApproveHandler {
+    async fn handle(
+        &self,
+        _session_id: SessionId,
+        _request_id: RequestId,
+        _data: github_copilot_sdk::PermissionRequestData,
+    ) -> PermissionResult {
+        PermissionResult::approve_once().with_context(PermissionDecisionContext {
+            outcome: PermissionDecisionOutcome::PromptedUser,
+            response_capability: None,
+            source: PermissionDecisionSource::HumanResponse,
+            surface: PermissionDecisionSurface::CopilotApp,
+        })
+    }
+}
+
 #[async_trait]
 impl McpAuthHandler for CancelMcpAuthHandler {
     async fn handle(
@@ -233,6 +258,228 @@ where
     (session, server)
 }
 
+#[tokio::test]
+async fn github_token_provider_uses_global_registration_and_maps_results() {
+    let (client, server_read, server_write) = make_client();
+    let mut server = FakeServer {
+        read: server_read,
+        write: server_write,
+        session_id: "github-token-session".to_string(),
+    };
+    let (args_tx, mut args_rx) = tokio::sync::mpsc::unbounded_channel();
+    let provider = Arc::new(move |args: GitHubTokenProviderArgs| {
+        let args_tx = args_tx.clone();
+        async move {
+            args_tx.send(args.clone()).unwrap();
+            match args.host.as_str() {
+                "github.com" => Ok(GitHubTokenProviderResult::Token(GitHubToken::new(
+                    "secret-token",
+                    8 * 60 * 60,
+                ))),
+                "cancel.example" => Ok(GitHubTokenProviderResult::Cancelled),
+                _ => Err(github_copilot_sdk::Error::with_message(
+                    ErrorKind::GitHubTokenProvider,
+                    "credential service unavailable",
+                )),
+            }
+        }
+    });
+    let create_handle = tokio::spawn({
+        let client = client.clone();
+        async move {
+            client
+                .create_session(
+                    SessionConfig::default()
+                        .with_session_id("github-token-session")
+                        .with_github_token_provider(provider),
+                )
+                .await
+                .unwrap()
+        }
+    });
+
+    let create_request = server.read_request().await;
+    assert_eq!(create_request["method"], "session.create");
+    assert!(create_request["params"].get("gitHubToken").is_none());
+    let registration_id = create_request["params"]["gitHubTokenProviderRegistrationId"]
+        .as_str()
+        .unwrap()
+        .to_string();
+
+    server
+        .send_request(
+            900,
+            "gitHubToken.getToken",
+            serde_json::json!({
+                "registrationId": registration_id,
+                "host": "github.com",
+                "sessionId": "github-token-session",
+                "reason": "initial"
+            }),
+        )
+        .await;
+    let token_response = server.read_response().await;
+    assert_eq!(token_response["result"]["kind"], "token");
+    assert_eq!(token_response["result"]["accessToken"], "secret-token");
+    assert_eq!(token_response["result"]["expiresIn"], 8 * 60 * 60);
+    let args = args_rx.recv().await.unwrap();
+    assert_eq!(args.host, "github.com");
+    assert_eq!(
+        args.session_id.as_ref().map(SessionId::as_str),
+        Some("github-token-session")
+    );
+    assert_eq!(args.reason, GitHubTokenRequestReason::Initial);
+
+    server
+        .send_request(
+            901,
+            "gitHubToken.getToken",
+            serde_json::json!({
+                "registrationId": registration_id,
+                "host": "cancel.example",
+                "reason": "refresh"
+            }),
+        )
+        .await;
+    let cancelled = server.read_response().await;
+    assert_eq!(cancelled["result"]["kind"], "cancelled");
+
+    server
+        .send_request(
+            902,
+            "gitHubToken.getToken",
+            serde_json::json!({
+                "registrationId": registration_id,
+                "host": "error.example",
+                "reason": "refresh"
+            }),
+        )
+        .await;
+    let provider_error = server.read_response().await;
+    assert_eq!(provider_error["error"]["code"], -32603);
+    assert!(
+        provider_error["error"]["message"]
+            .as_str()
+            .unwrap()
+            .contains("credential service unavailable")
+    );
+
+    server
+        .respond(
+            &create_request,
+            serde_json::json!({"sessionId": "github-token-session"}),
+        )
+        .await;
+    let session = timeout(TIMEOUT, create_handle).await.unwrap().unwrap();
+
+    let delete_handle = tokio::spawn({
+        let client = client.clone();
+        async move {
+            client
+                .delete_session(&SessionId::new("github-token-session"))
+                .await
+        }
+    });
+    let delete_request = server.read_request().await;
+    assert_eq!(delete_request["method"], "session.delete");
+    server.respond(&delete_request, serde_json::json!({})).await;
+    timeout(TIMEOUT, delete_handle)
+        .await
+        .unwrap()
+        .unwrap()
+        .unwrap();
+
+    server
+        .send_request(
+            903,
+            "gitHubToken.getToken",
+            serde_json::json!({
+                "registrationId": registration_id,
+                "host": "github.com",
+                "reason": "refresh"
+            }),
+        )
+        .await;
+    let unknown = server.read_response().await;
+    assert_eq!(unknown["error"]["code"], -32603);
+    assert!(
+        unknown["error"]["message"]
+            .as_str()
+            .unwrap()
+            .contains("unknown GitHub token provider registration")
+    );
+    drop(session);
+}
+
+#[tokio::test]
+async fn github_token_provider_is_mutually_exclusive_and_rolls_back_failed_create() {
+    let provider = Arc::new(|_args: GitHubTokenProviderArgs| async {
+        Ok(GitHubTokenProviderResult::Cancelled)
+    });
+    let (client, server_read, server_write) = make_client();
+    let result = client
+        .create_session(
+            SessionConfig::default()
+                .with_github_token("static")
+                .with_github_token_provider(provider.clone()),
+        )
+        .await;
+    let Err(error) = result else {
+        panic!("mutually exclusive GitHub credentials must be rejected");
+    };
+    assert!(matches!(error.kind(), ErrorKind::InvalidConfig));
+
+    let mut server = FakeServer {
+        read: server_read,
+        write: server_write,
+        session_id: "failed-create".to_string(),
+    };
+    let create_handle = tokio::spawn({
+        let client = client.clone();
+        async move {
+            client
+                .create_session(
+                    SessionConfig::default()
+                        .with_session_id("failed-create")
+                        .with_github_token_provider(provider),
+                )
+                .await
+        }
+    });
+    let create_request = server.read_request().await;
+    let registration_id = create_request["params"]["gitHubTokenProviderRegistrationId"]
+        .as_str()
+        .unwrap()
+        .to_string();
+    let response = serde_json::json!({
+        "jsonrpc": "2.0",
+        "id": create_request["id"],
+        "error": {"code": -32603, "message": "create failed"}
+    });
+    write_framed(&mut server.write, &serde_json::to_vec(&response).unwrap()).await;
+    assert!(
+        timeout(TIMEOUT, create_handle)
+            .await
+            .unwrap()
+            .unwrap()
+            .is_err()
+    );
+
+    server
+        .send_request(
+            904,
+            "gitHubToken.getToken",
+            serde_json::json!({
+                "registrationId": registration_id,
+                "host": "github.com",
+                "reason": "initial"
+            }),
+        )
+        .await;
+    let unknown = server.read_response().await;
+    assert_eq!(unknown["error"]["code"], -32603);
+}
+
 fn rand_id() -> u64 {
     static COUNTER: AtomicUsize = AtomicUsize::new(0);
     COUNTER.fetch_add(1, Ordering::Relaxed) as u64
@@ -639,6 +886,7 @@ async fn create_session_sends_new_session_options() {
                     SessionConfig::default()
                         .with_excluded_builtin_agents(["explore"])
                         .with_enable_citations(true)
+                        .with_enable_file_change_tracking(true)
                         .with_session_limits(SessionLimitsConfig {
                             max_ai_credits: Some(30.0),
                         }),
@@ -655,6 +903,7 @@ async fn create_session_sends_new_session_options() {
         serde_json::json!(["explore"])
     );
     assert_eq!(request["params"]["enableCitations"], true);
+    assert_eq!(request["params"]["enableFileChangeTracking"], true);
     assert_eq!(request["params"]["sessionLimits"]["maxAiCredits"], 30.0);
 
     let id = request["id"].as_u64().unwrap();
@@ -683,6 +932,7 @@ async fn resume_session_sends_new_session_options() {
                     ResumeSessionConfig::new(SessionId::from("session-options"))
                         .with_excluded_builtin_agents(["task"])
                         .with_enable_citations(false)
+                        .with_enable_file_change_tracking(false)
                         .with_session_limits(SessionLimitsConfig {
                             max_ai_credits: Some(15.0),
                         }),
@@ -700,6 +950,7 @@ async fn resume_session_sends_new_session_options() {
         serde_json::json!(["task"])
     );
     assert_eq!(request["params"]["enableCitations"], false);
+    assert_eq!(request["params"]["enableFileChangeTracking"], false);
     assert_eq!(request["params"]["sessionLimits"]["maxAiCredits"], 15.0);
 
     server_respond_create(&mut server_write, &request, "session-options").await;
@@ -763,6 +1014,159 @@ async fn create_session_sends_canvas_wire_fields() {
     timeout(TIMEOUT, create_handle).await.unwrap().unwrap();
 }
 
+#[test]
+fn managed_bypass_permissions_modes_use_wire_values() {
+    let disabled = ManagedSettingsPermissions::default()
+        .with_disable_bypass_permissions_mode(DisableBypassPermissionsModes::DISABLE);
+    assert_eq!(
+        serde_json::to_value(disabled).unwrap()["disableBypassPermissionsMode"],
+        "disable"
+    );
+
+    let known = ManagedSettingsPermissions::default()
+        .with_disable_bypass_permissions_mode(DisableBypassPermissionsModes::ALLOW_AUTO_ONLY);
+    assert_eq!(
+        serde_json::to_value(known).unwrap()["disableBypassPermissionsMode"],
+        "allow-auto-only"
+    );
+
+    let future = ManagedSettingsPermissions::default()
+        .with_disable_bypass_permissions_mode("future-fail-closed-mode");
+    assert_eq!(
+        serde_json::to_value(future).unwrap()["disableBypassPermissionsMode"],
+        "future-fail-closed-mode"
+    );
+}
+
+#[tokio::test]
+async fn create_and_resume_send_managed_settings_permissions() {
+    use github_copilot_sdk::types::ResumeSessionConfig;
+
+    let (client, mut server_read, mut server_write) = make_client();
+
+    let managed = ManagedSettings::default().with_permissions(
+        ManagedSettingsPermissions::default()
+            .with_disable_bypass_permissions_mode(DisableBypassPermissionsModes::ALLOW_AUTO_ONLY)
+            .with_deny(vec!["shell(rm*)".to_string()])
+            .with_ask(vec!["write".to_string()])
+            .with_allow(vec![]),
+    );
+
+    let create_handle = tokio::spawn({
+        let client = client.clone();
+        let managed = managed.clone();
+        async move {
+            client
+                .create_session(
+                    SessionConfig::default()
+                        .with_enable_managed_settings(true)
+                        .with_managed_settings(managed),
+                )
+                .await
+                .unwrap()
+        }
+    });
+
+    let request = read_framed(&mut server_read).await;
+    assert_eq!(request["method"], "session.create");
+    assert_eq!(request["params"]["enableManagedSettings"], true);
+    let perms = &request["params"]["managedSettings"]["permissions"];
+    assert_eq!(perms["disableBypassPermissionsMode"], "allow-auto-only");
+    assert_eq!(perms["deny"][0], "shell(rm*)");
+    assert_eq!(perms["ask"][0], "write");
+    assert_eq!(perms["allow"], serde_json::json!([]));
+
+    let id = request["id"].as_u64().unwrap();
+    let session_id = requested_session_id(&request).to_string();
+    let response = serde_json::json!({
+        "jsonrpc": "2.0",
+        "id": id,
+        "result": { "sessionId": session_id.clone() },
+    });
+    write_framed(&mut server_write, &serde_json::to_vec(&response).unwrap()).await;
+    timeout(TIMEOUT, create_handle).await.unwrap().unwrap();
+
+    let resume_handle = tokio::spawn({
+        let client = client.clone();
+        let session_id = session_id.clone();
+        async move {
+            client
+                .resume_session(
+                    ResumeSessionConfig::new(SessionId::from(session_id))
+                        .with_managed_settings(managed),
+                )
+                .await
+                .unwrap()
+        }
+    });
+
+    let request = read_framed(&mut server_read).await;
+    assert_eq!(request["method"], "session.resume");
+    assert_eq!(
+        request["params"]["managedSettings"]["permissions"]["deny"][0],
+        "shell(rm*)"
+    );
+
+    let id = request["id"].as_u64().unwrap();
+    let response = serde_json::json!({
+        "jsonrpc": "2.0",
+        "id": id,
+        "result": { "sessionId": session_id },
+    });
+    write_framed(&mut server_write, &serde_json::to_vec(&response).unwrap()).await;
+
+    let reload = read_framed(&mut server_read).await;
+    assert_eq!(reload["method"], "session.skills.reload");
+    let id = reload["id"].as_u64().unwrap();
+    let response = serde_json::json!({ "jsonrpc": "2.0", "id": id, "result": {} });
+    write_framed(&mut server_write, &serde_json::to_vec(&response).unwrap()).await;
+
+    timeout(TIMEOUT, resume_handle).await.unwrap().unwrap();
+}
+
+#[test]
+fn managed_settings_resolved_event_preserves_client_provenance() {
+    let sources = [
+        (ManagedSettingsResolvedSource::Server, "server"),
+        (ManagedSettingsResolvedSource::Device, "device"),
+        (ManagedSettingsResolvedSource::Client, "client"),
+        (ManagedSettingsResolvedSource::Mixed, "mixed"),
+        (ManagedSettingsResolvedSource::None, "none"),
+    ];
+    for (source, wire_value) in sources {
+        assert_eq!(
+            serde_json::to_value(source).unwrap(),
+            serde_json::json!(wire_value)
+        );
+    }
+
+    let with_client = SessionManagedSettingsResolvedData {
+        bypass_permissions_disabled: true,
+        client_managed: Some(true),
+        managed_keys: vec!["permissions".to_string()],
+        source: ManagedSettingsResolvedSource::Client,
+        ..Default::default()
+    };
+    let serialized = serde_json::to_value(&with_client).unwrap();
+    assert_eq!(serialized["source"], "client");
+    assert_eq!(serialized["clientManaged"], true);
+
+    let round_tripped: SessionManagedSettingsResolvedData =
+        serde_json::from_value(serialized).unwrap();
+    assert_eq!(round_tripped.source, ManagedSettingsResolvedSource::Client);
+    assert_eq!(round_tripped.client_managed, Some(true));
+
+    let without_client = SessionManagedSettingsResolvedData {
+        bypass_permissions_disabled: true,
+        managed_keys: vec!["permissions".to_string()],
+        source: ManagedSettingsResolvedSource::Mixed,
+        ..Default::default()
+    };
+    let serialized = serde_json::to_value(&without_client).unwrap();
+    assert_eq!(serialized["source"], "mixed");
+    assert!(serialized.get("clientManaged").is_none());
+}
+
 fn make_client_with_telemetry(
     callback: github_copilot_sdk::github_telemetry::GitHubTelemetryCallback,
 ) -> (Client, tokio::io::DuplexStream, tokio::io::DuplexStream) {
@@ -2360,6 +2764,45 @@ async fn approve_all_handler_approves_permission() {
     assert_eq!(request["params"]["result"]["kind"], "approve-once");
 }
 
+#[tokio::test]
+async fn permission_result_forwards_context_beside_result() {
+    let (_session, mut server) = create_session_pair_with_config(|cfg| {
+        cfg.with_permission_handler(Arc::new(ContextualApproveHandler))
+    })
+    .await;
+
+    server
+        .send_event(
+            "permission.requested",
+            serde_json::json!({
+                "requestId": "perm-attributed",
+                "sessionId": server.session_id,
+                "permissionRequest": { "kind": "shell" },
+            }),
+        )
+        .await;
+
+    let request = timeout(TIMEOUT, server.read_request()).await.unwrap();
+    assert_eq!(
+        request["method"],
+        "session.permissions.handlePendingPermissionRequest"
+    );
+    assert_eq!(
+        request["params"],
+        serde_json::json!({
+            "sessionId": server.session_id,
+            "requestId": "perm-attributed",
+            "result": { "kind": "approve-once" },
+            "decisionContext": {
+                "outcome": "prompted_user",
+                "source": "human_response",
+                "surface": "copilot_app",
+            },
+        })
+    );
+    assert!(request["params"]["result"].get("decisionContext").is_none());
+}
+
 #[tokio::test]
 async fn session_event_notification_reaches_handler() {
     let (session, mut server) = create_session_pair().await;
@@ -4172,13 +4615,10 @@ async fn create_serializes_commands_strips_handler() {
 
     let rollback = &wire[1];
     assert_eq!(rollback["name"], "rollback");
-    assert!(
-        rollback.get("description").is_none(),
-        "description should be omitted when None, got: {rollback}"
-    );
+    assert_eq!(rollback["description"], "");
     assert!(rollback.get("handler").is_none());
     let rollback_keys: Vec<&String> = rollback.as_object().unwrap().keys().collect();
-    assert_eq!(rollback_keys.len(), 1, "got keys: {rollback_keys:?}");
+    assert_eq!(rollback_keys.len(), 2, "got keys: {rollback_keys:?}");
 }
 
 #[tokio::test]
diff --git a/scripts/codegen/csharp.ts b/scripts/codegen/csharp.ts
index 2d68e68e27..00afec6000 100644
--- a/scripts/codegen/csharp.ts
+++ b/scripts/codegen/csharp.ts
@@ -40,6 +40,7 @@ import {
     isSchemaExperimental,
     isSchemaInternal,
     isOpaqueJson,
+    isOpaqueInProcess,
     isObjectSchema,
     isVoidSchema,
     getNullableInner,
@@ -355,6 +356,41 @@ function failUnmappable(context: string, schema: JSONSchema7): never {
     );
 }
 
+function omitUnrepresentableInternalProperties(value: unknown): void {
+    if (!value || typeof value !== "object") return;
+    if (Array.isArray(value)) {
+        value.forEach(omitUnrepresentableInternalProperties);
+        return;
+    }
+
+    const node = value as Record<string, unknown>;
+    const properties = node.properties;
+    if (properties && typeof properties === "object" && !Array.isArray(properties)) {
+        for (const [name, property] of Object.entries(properties)) {
+            if (!property || typeof property !== "object" || Array.isArray(property)) continue;
+            const schema = property as JSONSchema7;
+            const hasType =
+                schema.type !== undefined ||
+                schema.$ref !== undefined ||
+                schema.anyOf !== undefined ||
+                schema.oneOf !== undefined ||
+                schema.allOf !== undefined ||
+                schema.enum !== undefined ||
+                schema.const !== undefined ||
+                isOpaqueJson(schema);
+            if (isSchemaInternal(schema) && (!hasType || isOpaqueInProcess(schema))) {
+                delete (properties as Record<string, unknown>)[name];
+            } else {
+                omitUnrepresentableInternalProperties(property);
+            }
+        }
+    }
+
+    for (const [name, child] of Object.entries(node)) {
+        if (name !== "properties") omitUnrepresentableInternalProperties(child);
+    }
+}
+
 function requiresArgumentNullCheck(typeName: string, isRequired: boolean): boolean {
     return isRequired && !typeName.endsWith("?") && !isNonNullableCSharpValueType(typeName);
 }
@@ -1351,9 +1387,6 @@ function resolveSessionPropertyType(
 
 function generateDataClass(variant: EventVariant, knownTypes: Map<string, string>, nestedClasses: Map<string, string>, enumOutput: string[]): string {
     const dataVisibility = isSchemaInternal(variant.dataSchema) ? "internal" : "public";
-    if (!variant.dataSchema?.properties) return `${dataVisibility} sealed partial class ${variant.dataClassName} { }`;
-
-    const required = new Set(variant.dataSchema.required || []);
     const lines: string[] = [];
     if (variant.dataDescription) {
         lines.push(...xmlDocComment(variant.dataDescription, ""));
@@ -1366,6 +1399,12 @@ function generateDataClass(variant: EventVariant, knownTypes: Map<string, string
     if (isSchemaDeprecated(variant.dataSchema)) {
         pushObsoleteAttributes(lines);
     }
+    if (!variant.dataSchema?.properties) {
+        lines.push(`${dataVisibility} sealed partial class ${variant.dataClassName} { }`);
+        return lines.join("\n");
+    }
+
+    const required = new Set(variant.dataSchema.required || []);
     lines.push(`${dataVisibility} sealed partial class ${variant.dataClassName}`, `{`);
 
     for (const [propName, propSchema] of Object.entries(variant.dataSchema.properties).sort(([a], [b]) => a.localeCompare(b))) {
@@ -2568,6 +2607,8 @@ function generateRpcCode(
     externalJsonSerializableRefs: Map<string, Set<string>> = new Map(),
     externalValueTypes: Set<string> = new Set()
 ): string {
+    schema = cloneSchemaForCodegen(schema);
+    omitUnrepresentableInternalProperties(schema);
     emittedRpcClassSchemas.clear();
     emittedRpcEnumResultTypes.clear();
     experimentalRpcTypes.clear();
@@ -2682,14 +2723,23 @@ export async function generateRpc(schemaPath?: string, sessionEventsSchema?: JSO
     const resolvedPath = schemaPath ?? (await getApiSchemaPath());
     handWrittenCSharpTypeNames = await collectHandWrittenCSharpTypeNames();
     let schema = fixNullableRequiredRefsInApiSchema(cloneSchemaForCodegen((await loadSchemaJson(resolvedPath)) as ApiSchema));
+    let sessionEventsCode: string | undefined;
     if (sessionEventsSchema) {
+        sessionEventsCode = generateSessionEventsCode(sessionEventsSchema);
         const sharedDefinitions = findSharedSchemaDefinitions(
             schema as unknown as Record<string, unknown>,
             sessionEventsSchema as unknown as Record<string, unknown>
         );
         const reachableDefinitions = collectReachableDefinitionNames(sessionEventsSchema as unknown as Record<string, unknown>);
         for (const name of [...sharedDefinitions]) {
-            if (!reachableDefinitions.has(name)) {
+            const typeName = typeToClassName(name);
+            const declarationPattern = new RegExp(
+                `\\bpublic\\s+(?:(?:sealed|abstract|partial|readonly)\\s+)*(?:class|struct|enum)\\s+${typeName}\\b`
+            );
+            if (
+                !reachableDefinitions.has(name) ||
+                (!declarationPattern.test(sessionEventsCode) && !handWrittenCSharpTypeNames.has(typeName))
+            ) {
                 sharedDefinitions.delete(name);
             }
         }
@@ -2697,8 +2747,7 @@ export async function generateRpc(schemaPath?: string, sessionEventsSchema?: JSO
     }
     const externalJsonSerializableRefs = new Map<string, Set<string>>();
     const externalValueTypes = new Set<string>();
-    if (sessionEventsSchema) {
-        const sessionEventsCode = generateSessionEventsCode(sessionEventsSchema);
+    if (sessionEventsSchema && sessionEventsCode) {
         const externalRefs = collectExternalSchemaRefNames(schema);
         const sessionEventRefs = externalRefs.get("session-events.schema.json");
         if (sessionEventRefs && sessionEventRefs.size > 0) {
diff --git a/scripts/codegen/go.ts b/scripts/codegen/go.ts
index d6eda7f99a..acdea09727 100644
--- a/scripts/codegen/go.ts
+++ b/scripts/codegen/go.ts
@@ -560,6 +560,7 @@ interface GoCodegenCtx {
     discriminatedUnionRawVariantSuffix?: string;
     skipDefinitionTypeNames?: Set<string>;
     encodingBlocks?: Set<string>;
+    unionVariantMarshalers?: Set<string>;
     packageName?: string;
 }
 
@@ -1339,8 +1340,11 @@ function pushGoJSONSchemaMatchLines(
     }
 }
 
-function goVariantMatchFuncName(variantTypeName: string): string {
-    return goUnexportedFunctionName("matches", variantTypeName);
+function goVariantMatchFuncName(unionTypeName: string, variantTypeName: string): string {
+    const scopedVariantName = variantTypeName.startsWith(unionTypeName)
+        ? variantTypeName
+        : `${unionTypeName}${variantTypeName}`;
+    return goUnexportedFunctionName("matches", scopedVariantName);
 }
 
 // Minimal checks used to distinguish variants that share the same discriminator.
@@ -1712,13 +1716,14 @@ function pushGoJSONTargetedMatchSpecLines(
 }
 
 function goVariantMatchFunctionLines(
+    unionTypeName: string,
     variant: GoDiscriminatedUnionVariant,
     groupVariants: GoDiscriminatedUnionVariant[],
     discriminatorProp: string,
     ctx: GoCodegenCtx
 ): string[] {
     const lines: string[] = [];
-    lines.push(`func ${goVariantMatchFuncName(variant.typeName)}(data []byte) bool {`);
+    lines.push(`func ${goVariantMatchFuncName(unionTypeName, variant.typeName)}(data []byte) bool {`);
     const spec = goVariantTargetedMatchSpec(variant, groupVariants, discriminatorProp, ctx);
     if (spec.positiveTerms.length === 0 && spec.negativeExistsPaths.length === 0) {
         pushGoJSONSchemaMatchLines(lines, variant.schema, "data", ctx, "\t", "raw");
@@ -1830,7 +1835,7 @@ function emitGoFlatDiscriminatedUnion(
     for (const variant of unionVariants) {
         const groupVariants = ambiguousGroupsByVariantTypeName.get(variant.typeName);
         if (groupVariants) {
-            pushGoEncodingBlock(goVariantMatchFunctionLines(variant, groupVariants, discriminatorProp, ctx), ctx);
+            pushGoEncodingBlock(goVariantMatchFunctionLines(typeName, variant, groupVariants, discriminatorProp, ctx), ctx);
         }
     }
 
@@ -1868,7 +1873,7 @@ function emitGoFlatDiscriminatedUnion(
             unmarshalLines.push(`\t\treturn &d, nil`);
         } else {
             for (const mappedVariant of mappedVariants) {
-                unmarshalLines.push(`\t\tif ${goVariantMatchFuncName(mappedVariant.typeName)}(data) {`);
+                unmarshalLines.push(`\t\tif ${goVariantMatchFuncName(typeName, mappedVariant.typeName)}(data) {`);
                 unmarshalLines.push(`\t\t\tvar d ${mappedVariant.typeName}`);
                 unmarshalLines.push(`\t\t\tif err := json.Unmarshal(data, &d); err != nil {`);
                 unmarshalLines.push(`\t\t\t\treturn nil, err`);
@@ -1971,18 +1976,22 @@ function emitGoFlatDiscriminatedUnion(
             lines.push(`\treturn ${discGoType}(r.Discriminator)`);
         }
         lines.push(`}`);
-        pushGoEncodingBlock([
-            `func (r ${variantTypeName}) MarshalJSON() ([]byte, error) {`,
-            `\ttype alias ${variantTypeName}`,
-            `\treturn json.Marshal(struct {`,
-            `\t\t${discGoName} ${discGoType} \`json:"${discriminatorProp}"\``,
-            `\t\talias`,
-            `\t}{`,
-            `\t\t${discGoName}: r.${discriminatorMethodName}(),`,
-            `\t\talias: alias(r),`,
-            `\t})`,
-            `}`,
-        ], ctx);
+        ctx.unionVariantMarshalers ??= new Set<string>();
+        if (!ctx.unionVariantMarshalers.has(variantTypeName)) {
+            ctx.unionVariantMarshalers.add(variantTypeName);
+            pushGoEncodingBlock([
+                `func (r ${variantTypeName}) MarshalJSON() ([]byte, error) {`,
+                `\ttype alias ${variantTypeName}`,
+                `\treturn json.Marshal(struct {`,
+                `\t\t${discGoName} ${discGoType} \`json:"${discriminatorProp}"\``,
+                `\t\talias`,
+                `\t}{`,
+                `\t\t${discGoName}: r.${discriminatorMethodName}(),`,
+                `\t\talias: alias(r),`,
+                `\t})`,
+                `}`,
+            ], ctx);
+        }
     }
 
     ctx.structs.push(lines.join("\n"));
@@ -2017,7 +2026,7 @@ function emitGoRequiredFieldDiscriminatedUnion(
     lines.push(``);
 
     for (const variant of unionVariants) {
-        pushGoEncodingBlock(goVariantMatchFunctionLines(variant, unionVariants, "", ctx), ctx);
+        pushGoEncodingBlock(goVariantMatchFunctionLines(typeName, variant, unionVariants, "", ctx), ctx);
     }
 
     const unmarshalLines: string[] = [];
@@ -2026,7 +2035,7 @@ function emitGoRequiredFieldDiscriminatedUnion(
     unmarshalLines.push(`\t\treturn nil, nil`);
     unmarshalLines.push(`\t}`);
     for (const variant of unionVariants) {
-        unmarshalLines.push(`\tif ${goVariantMatchFuncName(variant.typeName)}(data) {`);
+        unmarshalLines.push(`\tif ${goVariantMatchFuncName(typeName, variant.typeName)}(data) {`);
         unmarshalLines.push(`\t\tvar d ${variant.typeName}`);
         unmarshalLines.push(`\t\tif err := json.Unmarshal(data, &d); err != nil {`);
         unmarshalLines.push(`\t\t\treturn nil, err`);
@@ -2890,10 +2899,13 @@ function emitGoUnionWrapperStruct(typeName: string, schema: JSONSchema7, ctx: Go
             discriminatorValues: [],
         }));
         for (const variant of matchVariants) {
-            pushGoEncodingBlock(goVariantMatchFunctionLines(variant, matchVariants, "", ctx), ctx);
+            pushGoEncodingBlock(goVariantMatchFunctionLines(typeName, variant, matchVariants, "", ctx), ctx);
         }
         for (const [index, variant] of matchVariants.entries()) {
-            matchFunctionsByField.set(objectVariantSchemas[index].field.name, goVariantMatchFuncName(variant.typeName));
+            matchFunctionsByField.set(
+                objectVariantSchemas[index].field.name,
+                goVariantMatchFuncName(typeName, variant.typeName)
+            );
         }
     }
     encodingLines.push(`func (r ${typeName}) MarshalJSON() ([]byte, error) {`);
@@ -3645,19 +3657,14 @@ function resolveSharedAnyOfVariant(
 async function collectHandWrittenGoPublicNames(): Promise<Set<string>> {
     const goDir = path.join(REPO_ROOT, "go");
     const names = new Set<string>();
-    let entries: string[];
-    try {
-        entries = await fs.readdir(goDir);
-    } catch {
-        return names;
-    }
+    // Read the directory entries with their types so the file check and the read
+    // are not separate operations on the same path.
+    const entries = await fs.readdir(goDir, { withFileTypes: true }).catch(() => []);
     for (const entry of entries) {
-        if (!entry.endsWith(".go")) continue;
-        if (entry.startsWith("z")) continue;
-        const filePath = path.join(goDir, entry);
-        const stat = await fs.stat(filePath);
-        if (!stat.isFile()) continue;
-        const content = await fs.readFile(filePath, "utf-8");
+        if (!entry.isFile()) continue;
+        if (!entry.name.endsWith(".go")) continue;
+        if (entry.name.startsWith("z")) continue;
+        const content = await fs.readFile(path.join(goDir, entry.name), "utf-8");
         for (const name of collectGoTopLevelNames(content, "type")) names.add(name);
         for (const name of collectGoTopLevelNames(content, "const")) names.add(name);
     }
diff --git a/scripts/codegen/package-lock.json b/scripts/codegen/package-lock.json
index 5ed410e943..3d631c1b11 100644
--- a/scripts/codegen/package-lock.json
+++ b/scripts/codegen/package-lock.json
@@ -697,9 +697,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/js-yaml": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz",
-      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz",
+      "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==",
       "funding": [
         {
           "type": "github",
diff --git a/scripts/codegen/python.ts b/scripts/codegen/python.ts
index 978021a984..bdb4d095b7 100644
--- a/scripts/codegen/python.ts
+++ b/scripts/codegen/python.ts
@@ -201,6 +201,17 @@ function collectPythonExternalEnumNames(
     return enumNames;
 }
 
+function preservePythonSessionEventConstructorOrder(schema: JSONSchema7): void {
+    for (const definitions of [schema.definitions, schema.$defs]) {
+        if (!definitions) continue;
+        const customTool = definitions.PermissionRequestCustomTool;
+        if (!customTool || typeof customTool !== "object") continue;
+        const skipPermission = (customTool as JSONSchema7).properties?.skipPermission;
+        if (!skipPermission || typeof skipPermission !== "object") continue;
+        (skipPermission as Record<string, unknown>)["x-copilot-sdk-append-last"] = true;
+    }
+}
+
 function preservePythonRpcStringDateFields(definitions: Record<string, JSONSchema7>): void {
     const quotaSnapshot = definitions.AccountQuotaSnapshot;
     const resetDate = quotaSnapshot?.properties?.resetDate as JSONSchema7 | undefined;
@@ -2574,6 +2585,13 @@ function emitPyFlatDiscriminatedUnion(
     ctx.classes.push(lines.join("\n"));
 }
 
+const PYTHON_INTEGER_DECODER = [
+    `def from_int(x: Any) -> int:`,
+    `    assert isinstance(x, (int, float)) and not isinstance(x, bool)`,
+    `    assert not isinstance(x, float) or x.is_integer()`,
+    `    return int(x)`,
+].join("\n");
+
 export function generatePythonSessionEventsCode(schema: JSONSchema7): string {
     const variants = extractPyEventVariants(schema);
     const ctx: PyCodegenCtx = {
@@ -2642,9 +2660,7 @@ export function generatePythonSessionEventsCode(schema: JSONSchema7): string {
     out.push(`    return x`);
     out.push(``);
     out.push(``);
-    out.push(`def from_int(x: Any) -> int:`);
-    out.push(`    assert isinstance(x, int) and not isinstance(x, bool)`);
-    out.push(`    return x`);
+    out.push(PYTHON_INTEGER_DECODER);
     out.push(``);
     out.push(``);
     out.push(`def to_int(x: Any) -> int:`);
@@ -2944,6 +2960,7 @@ async function generateSessionEvents(schemaPath?: string): Promise<void> {
     const schema = addManagedApprovalRequiredToPermissionRequests(
         (await loadSchemaJson(resolvedPath)) as JSONSchema7
     );
+    preservePythonSessionEventConstructorOrder(schema);
     const processed = propagateInternalVisibility(postProcessSchema(schema));
     let code = generatePythonSessionEventsCode(processed);
     const { typeNames } = collectInternalSymbols(processed);
@@ -3347,6 +3364,14 @@ def _patch_model_capabilities(data: dict) -> dict:
 
     // Patch models.list to normalize capabilities before deserialization
     let finalCode = lines.join("\n");
+    finalCode = finalCode.replace(
+        [
+            `def from_int(x: Any) -> int:`,
+            `    assert isinstance(x, int) and not isinstance(x, bool)`,
+            `    return x`,
+        ].join("\n"),
+        PYTHON_INTEGER_DECODER
+    );
     finalCode = finalCode.replace(
         `ModelList.from_dict(await self._client.request("models.list"`,
         `ModelList.from_dict(_patch_model_capabilities(await self._client.request("models.list"`,
diff --git a/scripts/codegen/rust.ts b/scripts/codegen/rust.ts
index 4090318f05..0feec5e98a 100644
--- a/scripts/codegen/rust.ts
+++ b/scripts/codegen/rust.ts
@@ -300,6 +300,7 @@ function tryEmitRustUnion(
 	const enumName =
 		(typeof schema.title === "string" && schema.title) ||
 		parentTypeName + toPascalCase(jsonPropName);
+	const isAllowedUnionType = ctx.allowedUnionTypeNames.has(enumName);
 
 	const resolvedVariants: RustUnionVariant[] = [];
 	for (let i = 0; i < nonNull.length; i++) {
@@ -318,7 +319,20 @@ function tryEmitRustUnion(
 			resolveObjectSchema(variant, ctx.definitions) ??
 			resolveSchema(variant, ctx.definitions) ??
 			variant;
-		if (!isObjectSchema(resolved)) return null;
+		if (!isObjectSchema(resolved)) {
+			if (!isAllowedUnionType) return null;
+			resolvedVariants.push({
+				schema: resolved as JSONSchema7,
+				typeName: resolveRustType(
+					resolved as JSONSchema7,
+					enumName,
+					`variant${i + 1}`,
+					true,
+					ctx,
+				),
+			});
+			continue;
+		}
 		const discriminatorValue = Object.values(resolved.properties ?? {}).find(
 			(prop) => typeof prop === "object" && (prop as JSONSchema7).const !== undefined,
 		) as JSONSchema7 | undefined;
@@ -335,7 +349,6 @@ function tryEmitRustUnion(
 	}
 
 	const discriminator = findRustDiscriminator(resolvedVariants);
-	const isAllowedUnionType = ctx.allowedUnionTypeNames.has(enumName);
 	if (discriminator) {
 		if (
 			ctx.unionDiscriminatorProperties &&
@@ -344,7 +357,7 @@ function tryEmitRustUnion(
 		) {
 			return null;
 		}
-	} else if (!ctx.allowUntaggedUnions || !isAllowedUnionType) {
+	} else if (!ctx.allowUntaggedUnions && !isAllowedUnionType) {
 		return null;
 	}
 
@@ -1447,7 +1460,10 @@ function generateApiTypesCode(
 	const defCollections = collectDefinitionCollections(
 		apiSchema as Record<string, unknown>,
 	);
-	const ctx = makeCtx(defCollections, { nonDefaultableTypes });
+	const ctx = makeCtx(defCollections, {
+		nonDefaultableTypes,
+		allowedUnionTypeNames: ["AuthInfo", "McpOauthProbeResult", "SettableAuthInfo", "ToolResult"],
+	});
 
 	// Collect all RPC methods before emitting shared definitions so method stability
 	// can propagate to referenced data types.
diff --git a/scripts/codegen/typescript.ts b/scripts/codegen/typescript.ts
index 30cefd3e90..4984816d8d 100644
--- a/scripts/codegen/typescript.ts
+++ b/scripts/codegen/typescript.ts
@@ -40,7 +40,9 @@ import {
     isSchemaInternal,
     appendPropertyMarkerTagsToDescriptions,
     getEnumValueDescriptions,
-    stripOpaqueJsonMarker,
+    isBareSchemaNode,
+    isOpaqueInProcess,
+    isOpaqueJson,
     loadSchemaJson,
     fixBrandCasing,
     type ApiSchema,
@@ -52,6 +54,35 @@ const TS_EXPERIMENTAL_JSDOC = "/** @experimental */";
 const EXTERNAL_SCHEMA_TS_IMPORT: Record<string, string> = {
     "session-events.schema.json": "./session-events.js",
 };
+type OpaqueTypeAlias = "JsonValue" | "OpaqueInProcessValue";
+
+function opaqueTypeAliasBlock(aliases: ReadonlySet<OpaqueTypeAlias>): string {
+    const declarations: string[] = [];
+    if (aliases.has("JsonValue")) {
+        declarations.push(
+            `/** A value that can be represented losslessly on the SDK JSON wire. */
+export type JsonValue = null | boolean | number | string | JsonValue[] | { [key: string]: JsonValue };`
+        );
+    }
+    if (aliases.has("OpaqueInProcessValue")) {
+        declarations.push(
+            `/**
+ * A value that lives only in this process and never crosses the JSON-RPC
+ * boundary, such as a callback or a host object handle.
+ * @internal
+ */
+export type OpaqueInProcessValue = unknown;`
+        );
+    }
+    return declarations.join("\n\n");
+}
+
+function restoreOpaqueTypeAliasFormatting(code: string): string {
+    return code.replace(
+        "export type JsonValue = null | boolean | number | string | JsonValue[] | {[key: string]: JsonValue};",
+        "export type JsonValue = null | boolean | number | string | JsonValue[] | { [key: string]: JsonValue };"
+    );
+}
 
 function tsExperimentalJSDoc(indent = ""): string {
     return `${indent}${TS_EXPERIMENTAL_JSDOC}`;
@@ -327,7 +358,10 @@ function collectRpcMethods(node: Record<string, unknown>): RpcMethod[] {
     return results;
 }
 
-export function normalizeSchemaForTypeScript(schema: JSONSchema7): JSONSchema7 {
+export function normalizeSchemaForTypeScript(
+    schema: JSONSchema7,
+    opaqueTypeAliases?: Set<OpaqueTypeAlias>
+): JSONSchema7 {
     const root = structuredClone(schema) as JSONSchema7 & {
         definitions?: Record<string, unknown>;
         $defs?: Record<string, unknown>;
@@ -349,24 +383,52 @@ export function normalizeSchemaForTypeScript(schema: JSONSchema7): JSONSchema7 {
     root.definitions = definitions;
     delete root.$defs;
 
-    const rewrite = (value: unknown): unknown => {
+    const internalDefinitionNames = new Set(
+        Object.entries(definitions)
+            .filter(([, definition]) => typeof definition === "object" && definition !== null && isSchemaInternal(definition as JSONSchema7))
+            .map(([name]) => name)
+    );
+    const isInternalUnionVariant = (value: unknown): boolean => {
+        if (!value || typeof value !== "object") return false;
+        const variant = value as JSONSchema7;
+        if (isSchemaInternal(variant)) return true;
+        const match = variant.$ref?.match(/^#\/(?:definitions|\$defs)\/([^/]+)$/);
+        return match ? internalDefinitionNames.has(match[1]) : false;
+    };
+
+    const rewrite = (value: unknown, withinInternalDefinition = false): unknown => {
         if (Array.isArray(value)) {
-            return value.map(rewrite);
+            return value.map((item) => rewrite(item, withinInternalDefinition));
         }
         if (!value || typeof value !== "object") {
             return value;
         }
 
+        const source = value as Record<string, unknown>;
+        const isInternal = withinInternalDefinition || isSchemaInternal(source as JSONSchema7);
         const rewritten = Object.fromEntries(
-            Object.entries(value as Record<string, unknown>).map(([key, child]) => [key, rewrite(child)])
+            Object.entries(source).map(([key, child]) => {
+                const publicChild =
+                    !isInternal &&
+                    (key === "anyOf" || key === "oneOf") &&
+                    Array.isArray(child)
+                        ? child.filter((variant) => !isInternalUnionVariant(variant))
+                        : child;
+                return [key, rewrite(publicChild, isInternal)];
+            })
         ) as Record<string, unknown>;
 
-        // The TypeScript codegen doesn't distinguish opaque JSON from any
-        // other unconstrained value, so drop the marker before feeding the
-        // schema to json-schema-to-typescript. C# codegen reads the marker
-        // from its own (un-normalized) view of the schema and emits
-        // `JsonElement` instead.
-        stripOpaqueJsonMarker(rewritten);
+        if (isBareSchemaNode(rewritten as JSONSchema7)) {
+            if (isOpaqueJson(rewritten as JSONSchema7)) {
+                rewritten.tsType = "JsonValue";
+                opaqueTypeAliases?.add("JsonValue");
+            } else if (isOpaqueInProcess(rewritten as JSONSchema7)) {
+                rewritten.tsType = "OpaqueInProcessValue";
+                opaqueTypeAliases?.add("OpaqueInProcessValue");
+            }
+        }
+        delete rewritten["x-opaque-json"];
+        delete rewritten["x-opaque-in-process"];
 
         const enumValueDescriptions = getEnumValueDescriptions(rewritten as JSONSchema7);
         if (enumValueDescriptions && Array.isArray(rewritten.enum) && rewritten.enum.every((entry) => typeof entry === "string")) {
@@ -493,15 +555,23 @@ async function generateSessionEvents(schemaPath?: string): Promise<void> {
     );
     appendPropertyMarkerTagsToDescriptions(schemaForCompile);
 
-    const ts = await compile(normalizeSchemaForTypeScript(schemaForCompile), "SessionEvent", {
-        bannerComment: `/**
+    const opaqueTypeAliases = new Set<OpaqueTypeAlias>();
+    const ts = restoreOpaqueTypeAliasFormatting(
+        await compile(normalizeSchemaForTypeScript(schemaForCompile, opaqueTypeAliases), "SessionEvent", {
+            bannerComment: [
+                `/**
  * AUTO-GENERATED FILE - DO NOT EDIT
  * Generated from: session-events.schema.json
  */`,
-        style: { semi: true, singleQuote: false, trailingComma: "all" },
-        additionalProperties: false,
-        strictIndexSignatures: true,
-    });
+                opaqueTypeAliasBlock(opaqueTypeAliases),
+            ]
+                .filter(Boolean)
+                .join("\n\n"),
+            style: { semi: true, singleQuote: false, trailingComma: "all" },
+            additionalProperties: false,
+            strictIndexSignatures: true,
+        })
+    );
 
     let annotatedTs = annotateTypeScriptTypes(ts, experimentalDefinitionNames(definitionCollections), TS_EXPERIMENTAL_JSDOC);
     // Add @internal JSDoc annotations for session-event types marked
@@ -659,6 +729,7 @@ import type { MessageConnection } from "vscode-jsonrpc/node.js";
     if (externalSchemaRefs.size > 0) {
         lines.push("");
     }
+    const aliasInsertIndex = lines.length;
 
     const allMethods = [...collectRpcMethods(schema.server || {}), ...collectRpcMethods(schema.session || {})];
     const clientSessionMethods = collectRpcMethods(schema.clientSession || {});
@@ -761,12 +832,17 @@ import type { MessageConnection } from "vscode-jsonrpc/node.js";
     const schemaForCompile = combinedSchema;
     appendPropertyMarkerTagsToDescriptions(schemaForCompile);
 
-    const compiled = await compile(normalizeSchemaForTypeScript(schemaForCompile), "_RpcSchemaRoot", {
+    const opaqueTypeAliases = new Set<OpaqueTypeAlias>();
+    const compiled = await compile(normalizeSchemaForTypeScript(schemaForCompile, opaqueTypeAliases), "_RpcSchemaRoot", {
         bannerComment: "",
         additionalProperties: false,
         strictIndexSignatures: true,
         unreachableDefinitions: true,
     });
+    const aliases = opaqueTypeAliasBlock(opaqueTypeAliases);
+    if (aliases) {
+        lines.splice(aliasInsertIndex, 0, aliases, "");
+    }
 
     // Strip the placeholder root type and keep only the definition-generated types
     const strippedTs = compiled
diff --git a/scripts/codegen/utils.ts b/scripts/codegen/utils.ts
index 42e78b9a07..590213d72b 100644
--- a/scripts/codegen/utils.ts
+++ b/scripts/codegen/utils.ts
@@ -199,6 +199,27 @@ export function postProcessSchema(schema: JSONSchema7): JSONSchema7 {
 
     const processed = { ...schema } as JSONSchema7WithDefs;
 
+    if (processed.title === "ProviderModelConfig" && processed.properties) {
+        const tokenFields = new Set([
+            "maxPromptTokens",
+            "maxContextWindowTokens",
+            "maxOutputTokens",
+        ]);
+        processed.properties = Object.fromEntries(
+            Object.entries(processed.properties).map(([key, value]) => {
+                if (
+                    tokenFields.has(key) &&
+                    typeof value === "object" &&
+                    value !== null &&
+                    (value as JSONSchema7).type === "number"
+                ) {
+                    return [key, { ...(value as JSONSchema7), type: "integer" }];
+                }
+                return [key, value];
+            })
+        );
+    }
+
     if ("const" in processed && typeof processed.const === "boolean") {
         processed.enum = [processed.const];
         delete processed.const;
@@ -456,6 +477,7 @@ export function cloneSchemaForCodegen<T>(value: T): T {
 const PERMISSION_REQUEST_DEFINITION_NAMES = [
     "PermissionRequestCustomTool",
     "PermissionRequestExtensionManagement",
+    "PermissionRequestExtensionEnvAccess",
     "PermissionRequestExtensionPermissionAccess",
     "PermissionRequestFactory",
     "PermissionRequestHook",
@@ -943,6 +965,34 @@ export function isOpaqueJson(schema: JSONSchema7 | null | undefined): boolean {
     return typeof schema === "object" && schema !== null && (schema as Record<string, unknown>)["x-opaque-json"] === true;
 }
 
+/** Returns true when a JSON Schema node is marked `x-opaque-in-process: true`. */
+export function isOpaqueInProcess(schema: JSONSchema7 | null | undefined): boolean {
+    return typeof schema === "object" && schema !== null && (schema as Record<string, unknown>)["x-opaque-in-process"] === true;
+}
+
+/**
+ * Returns true when a schema node has no structural constraints that describe a
+ * more precise TypeScript type than an opaque marker.
+ */
+export function isBareSchemaNode(schema: JSONSchema7 | null | undefined): boolean {
+    if (typeof schema !== "object" || schema === null) return false;
+    const node = schema as Record<string, unknown>;
+    return ![
+        "type",
+        "anyOf",
+        "oneOf",
+        "allOf",
+        "$ref",
+        "properties",
+        "items",
+        "enum",
+        "const",
+        "additionalProperties",
+        "not",
+        "patternProperties",
+    ].some((key) => key in node);
+}
+
 /**
  * Removes the `x-opaque-json` marker from a schema node in place. Useful for
  * codegens (e.g. TypeScript) that don't distinguish opaque JSON from any other
diff --git a/scripts/docs-validation/validate.ts b/scripts/docs-validation/validate.ts
index b609ef8593..6ce615eab2 100644
--- a/scripts/docs-validation/validate.ts
+++ b/scripts/docs-validation/validate.ts
@@ -385,13 +385,16 @@ async function validateJava(): Promise<ValidationResult[]> {
     fs.copyFileSync(path.join(javaDir, file), path.join(srcDir, file));
   }
 
-  // Read the SDK version from java/pom.xml
-  const sdkPomPath = path.join(ROOT_DIR, "java", "pom.xml");
+  // Read the inherited SDK version from java/sdk/pom.xml
+  const sdkPomPath = path.join(ROOT_DIR, "java", "sdk", "pom.xml");
   const sdkPomContent = fs.readFileSync(sdkPomPath, "utf-8");
   const versionMatch = sdkPomContent.match(
-    /<artifactId>copilot-sdk-java<\/artifactId>\s*<version>([^<]+)<\/version>/,
+    /<parent>[\s\S]*?<version>([^<]+)<\/version>[\s\S]*?<\/parent>/,
   );
-  const sdkVersion = versionMatch ? versionMatch[1] : "1.0.0-SNAPSHOT";
+  if (!versionMatch) {
+    throw new Error(`Could not read the Java SDK version from ${sdkPomPath}`);
+  }
+  const sdkVersion = versionMatch[1];
 
   // Create pom.xml that references the local SDK
   const pomXml = `<?xml version="1.0" encoding="UTF-8"?>
diff --git a/test/harness/.npmrc b/test/harness/.npmrc
new file mode 100644
index 0000000000..100721e01a
--- /dev/null
+++ b/test/harness/.npmrc
@@ -0,0 +1 @@
+omit-lockfile-registry-resolved=true
diff --git a/test/harness/anthropicMessagesAdapter.ts b/test/harness/anthropicMessagesAdapter.ts
index acc74a2bf9..36e98c3b36 100644
--- a/test/harness/anthropicMessagesAdapter.ts
+++ b/test/harness/anthropicMessagesAdapter.ts
@@ -4,6 +4,7 @@
 
 import type { ChatCompletion } from "openai/resources/chat/completions";
 import {
+  canonicalUserMessageSeparator,
   CanonicalMessage,
   CanonicalToolCall,
   formatSseEvent,
@@ -178,7 +179,7 @@ function convertAnthropicUserMessage(
       content: onlyText
         ? contentParts
             .map((part) => (part.type === "text" ? part.text : ""))
-            .join("\n")
+            .join(canonicalUserMessageSeparator)
         : [...contentParts],
     });
     contentParts.length = 0;
diff --git a/test/harness/modelProtocolAdapterShared.ts b/test/harness/modelProtocolAdapterShared.ts
index 1f879da5d0..dcfee3876e 100644
--- a/test/harness/modelProtocolAdapterShared.ts
+++ b/test/harness/modelProtocolAdapterShared.ts
@@ -4,6 +4,8 @@
 
 export type JsonObject = Record<string, unknown>;
 
+export const canonicalUserMessageSeparator = "\n\n\n";
+
 export type CanonicalToolCall = {
   id: string;
   type: "function";
diff --git a/test/harness/modelProtocolAdapters.test.ts b/test/harness/modelProtocolAdapters.test.ts
index ddb6fe40bf..c0ed084150 100644
--- a/test/harness/modelProtocolAdapters.test.ts
+++ b/test/harness/modelProtocolAdapters.test.ts
@@ -128,6 +128,52 @@ async function postJson(
 }
 
 describe("Anthropic Messages adapter", () => {
+  test("canonicalizes adjacent plain-text content blocks", () => {
+    const result = JSON.parse(
+      anthropicMessagesRequestToChatCompletion(
+        JSON.stringify({
+          model: "test-model",
+          messages: [
+            {
+              role: "user",
+              content: [
+                { type: "text", text: "First prompt" },
+                { type: "text", text: "Recovery prompt" },
+              ],
+            },
+          ],
+        }),
+      ),
+    ) as {
+      messages: Array<{ role: string; content: unknown }>;
+    };
+
+    expect(result.messages).toEqual([
+      {
+        role: "user",
+        content: "First prompt\n\n\nRecovery prompt",
+      },
+    ]);
+  });
+
+  test.each([
+    ["string content", "Hello"],
+    ["one text block", [{ type: "text", text: "Hello" }]],
+  ])("preserves a single plain-text user block from %s", (_, content) => {
+    const result = JSON.parse(
+      anthropicMessagesRequestToChatCompletion(
+        JSON.stringify({
+          model: "test-model",
+          messages: [{ role: "user", content }],
+        }),
+      ),
+    ) as {
+      messages: Array<{ role: string; content: unknown }>;
+    };
+
+    expect(result.messages).toEqual([{ role: "user", content: "Hello" }]);
+  });
+
   test("normalizes messages, binary content, and tools", () => {
     const result = JSON.parse(
       anthropicMessagesRequestToChatCompletion(
@@ -589,6 +635,36 @@ describe("protocol-aware replay", () => {
     });
   });
 
+  test("canonicalizes Anthropic content blocks before coalescing user messages", async () => {
+    await writeSnapshot([
+      { role: "system", content: "${system}" },
+      { role: "user", content: "First prompt" },
+      { role: "user", content: "Recovery prompt" },
+      { role: "user", content: "Final prompt" },
+      { role: "assistant", content: "Recovered" },
+    ]);
+    const request = requestFor("anthropic-messages", "Final prompt");
+    request.messages = [
+      {
+        role: "user",
+        content: [
+          { type: "text", text: "First prompt" },
+          { type: "text", text: "Recovery prompt" },
+        ],
+      },
+      ...(request.messages as unknown[]),
+    ];
+
+    await withProxy("anthropic-messages", async (proxyUrl) => {
+      const response = await postJson(
+        proxyUrl,
+        endpoints["anthropic-messages"],
+        request,
+      );
+      expect(response.status).toBe(200);
+    });
+  });
+
   test.each(backends)(
     "replays compaction responses through %s",
     async (backend) => {
diff --git a/test/harness/package-lock.json b/test/harness/package-lock.json
index 4702dbba63..5566e2e34c 100644
--- a/test/harness/package-lock.json
+++ b/test/harness/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "@github/copilot": "^1.0.78",
+        "@github/copilot": "^1.0.81-11",
         "@modelcontextprotocol/sdk": "^1.26.0",
         "@types/node": "^25.3.3",
         "@types/node-forge": "^1.3.14",
@@ -26,7 +26,6 @@
     },
     "node_modules/@emnapi/core": {
       "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
       "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
       "dev": true,
       "license": "MIT",
@@ -38,7 +37,6 @@
     },
     "node_modules/@emnapi/runtime": {
       "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
       "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
       "dev": true,
       "license": "MIT",
@@ -49,7 +47,6 @@
     },
     "node_modules/@emnapi/wasi-threads": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
       "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==",
       "dev": true,
       "license": "MIT",
@@ -60,7 +57,6 @@
     },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
       "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
       "cpu": [
         "ppc64"
@@ -77,7 +73,6 @@
     },
     "node_modules/@esbuild/android-arm": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
       "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
       "cpu": [
         "arm"
@@ -94,7 +89,6 @@
     },
     "node_modules/@esbuild/android-arm64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
       "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
       "cpu": [
         "arm64"
@@ -111,7 +105,6 @@
     },
     "node_modules/@esbuild/android-x64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
       "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
       "cpu": [
         "x64"
@@ -128,7 +121,6 @@
     },
     "node_modules/@esbuild/darwin-arm64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
       "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
       "cpu": [
         "arm64"
@@ -145,7 +137,6 @@
     },
     "node_modules/@esbuild/darwin-x64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
       "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
       "cpu": [
         "x64"
@@ -162,7 +153,6 @@
     },
     "node_modules/@esbuild/freebsd-arm64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
       "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
       "cpu": [
         "arm64"
@@ -179,7 +169,6 @@
     },
     "node_modules/@esbuild/freebsd-x64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
       "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
       "cpu": [
         "x64"
@@ -196,7 +185,6 @@
     },
     "node_modules/@esbuild/linux-arm": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
       "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
       "cpu": [
         "arm"
@@ -213,7 +201,6 @@
     },
     "node_modules/@esbuild/linux-arm64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
       "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
       "cpu": [
         "arm64"
@@ -230,7 +217,6 @@
     },
     "node_modules/@esbuild/linux-ia32": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
       "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
       "cpu": [
         "ia32"
@@ -247,7 +233,6 @@
     },
     "node_modules/@esbuild/linux-loong64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
       "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
       "cpu": [
         "loong64"
@@ -264,7 +249,6 @@
     },
     "node_modules/@esbuild/linux-mips64el": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
       "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
       "cpu": [
         "mips64el"
@@ -281,7 +265,6 @@
     },
     "node_modules/@esbuild/linux-ppc64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
       "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
       "cpu": [
         "ppc64"
@@ -298,7 +281,6 @@
     },
     "node_modules/@esbuild/linux-riscv64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
       "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
       "cpu": [
         "riscv64"
@@ -315,7 +297,6 @@
     },
     "node_modules/@esbuild/linux-s390x": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
       "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
       "cpu": [
         "s390x"
@@ -332,7 +313,6 @@
     },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
       "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
       "cpu": [
         "x64"
@@ -349,7 +329,6 @@
     },
     "node_modules/@esbuild/netbsd-arm64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
       "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
       "cpu": [
         "arm64"
@@ -366,7 +345,6 @@
     },
     "node_modules/@esbuild/netbsd-x64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
       "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
       "cpu": [
         "x64"
@@ -383,7 +361,6 @@
     },
     "node_modules/@esbuild/openbsd-arm64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
       "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
       "cpu": [
         "arm64"
@@ -400,7 +377,6 @@
     },
     "node_modules/@esbuild/openbsd-x64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
       "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
       "cpu": [
         "x64"
@@ -417,7 +393,6 @@
     },
     "node_modules/@esbuild/openharmony-arm64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
       "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
       "cpu": [
         "arm64"
@@ -434,7 +409,6 @@
     },
     "node_modules/@esbuild/sunos-x64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
       "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
       "cpu": [
         "x64"
@@ -451,7 +425,6 @@
     },
     "node_modules/@esbuild/win32-arm64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
       "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
       "cpu": [
         "arm64"
@@ -468,7 +441,6 @@
     },
     "node_modules/@esbuild/win32-ia32": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
       "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
       "cpu": [
         "ia32"
@@ -485,7 +457,6 @@
     },
     "node_modules/@esbuild/win32-x64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
       "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
       "cpu": [
         "x64"
@@ -501,9 +472,8 @@
       }
     },
     "node_modules/@github/copilot": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.78.tgz",
-      "integrity": "sha512-jn+8HLZC3R7d6K1/1g9L1iWNKzBVS3JdVcx40r3aWyS5r+MLV1OPNp0fo5OfRMCDIm3NmEaaoqypi9sQkCXuiQ==",
+      "version": "1.0.81-11",
+      "integrity": "sha512-F7hZ6G6fhWH4uq862mbs2JE3nL0KIVBOc94/EFOdEjux3oHUQst9a06gKibEJS6VRULaYTXzatA1EAgNC9dzFA==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
@@ -513,20 +483,19 @@
         "copilot": "npm-loader.js"
       },
       "optionalDependencies": {
-        "@github/copilot-darwin-arm64": "1.0.78",
-        "@github/copilot-darwin-x64": "1.0.78",
-        "@github/copilot-linux-arm64": "1.0.78",
-        "@github/copilot-linux-x64": "1.0.78",
-        "@github/copilot-linuxmusl-arm64": "1.0.78",
-        "@github/copilot-linuxmusl-x64": "1.0.78",
-        "@github/copilot-win32-arm64": "1.0.78",
-        "@github/copilot-win32-x64": "1.0.78"
+        "@github/copilot-darwin-arm64": "1.0.81-11",
+        "@github/copilot-darwin-x64": "1.0.81-11",
+        "@github/copilot-linux-arm64": "1.0.81-11",
+        "@github/copilot-linux-x64": "1.0.81-11",
+        "@github/copilot-linuxmusl-arm64": "1.0.81-11",
+        "@github/copilot-linuxmusl-x64": "1.0.81-11",
+        "@github/copilot-win32-arm64": "1.0.81-11",
+        "@github/copilot-win32-x64": "1.0.81-11"
       }
     },
     "node_modules/@github/copilot-darwin-arm64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.78.tgz",
-      "integrity": "sha512-P11+VyWg8ad0WlywGtO2d7AxqTLJv4hkUicFg6Ycth5lfk00aCu/74YOOZSPO6C2bBBJhAza7oAdmauM6KEojw==",
+      "version": "1.0.81-11",
+      "integrity": "sha512-3eLs71CLnJH9RNnESnv4esipZPeGXMlBxQeKXwZY+crwcW2RAR8YuovQyfoZ/5by1PLPbYrOjXNfQL6kXSisrA==",
       "cpu": [
         "arm64"
       ],
@@ -541,9 +510,8 @@
       }
     },
     "node_modules/@github/copilot-darwin-x64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.78.tgz",
-      "integrity": "sha512-stimP3WDFs2GU8nJzTJbtRpZViV4bsf80yg7QrFq+G4RISQ3Nihg/3/H0U6UQF1+txMJ/Ohmb5RFYxSw1Hj2sw==",
+      "version": "1.0.81-11",
+      "integrity": "sha512-GdFLiUC8UL9k6K+woG8AyL3zBafd0Br1TIPDV5iiZsyBtTe4g67FjL7DGCYDt6AN9G43jWdK0M0InoNDVq1K1A==",
       "cpu": [
         "x64"
       ],
@@ -558,9 +526,8 @@
       }
     },
     "node_modules/@github/copilot-linux-arm64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.78.tgz",
-      "integrity": "sha512-K31PRKGTm252V1Lof7ypjg283R2QSm3BgoCvZfX2taos4wqC3SaTozSQKwW3dgrAx7A3G3SGEoilVCNqfigdZA==",
+      "version": "1.0.81-11",
+      "integrity": "sha512-C4hcAow5CdaVJITbdtGqFgxWpW7TqwyCPNn8OtcbvdWeiKcfOBDrgkvbsezG98/5Ovs3HWxZRT4oZqCEmGF9Ww==",
       "cpu": [
         "arm64"
       ],
@@ -575,9 +542,8 @@
       }
     },
     "node_modules/@github/copilot-linux-x64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.78.tgz",
-      "integrity": "sha512-QK3oMtAn9dIv+1u1kx0xNpZNtZxdI+uZVIyLl7myp+Oh2Uj8BLagVv6a7uP0cDphO3TgfIdlvpepCe5MIcx0fw==",
+      "version": "1.0.81-11",
+      "integrity": "sha512-izu0PwWx+wL4zxacO6cd6r0zMMMQ3pTz+2euWcAd7HCJ/CIR6+YYfjU3TI3TPBZ9zDLZGoxHKYYPfJ1ZbSTzEg==",
       "cpu": [
         "x64"
       ],
@@ -592,9 +558,8 @@
       }
     },
     "node_modules/@github/copilot-linuxmusl-arm64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.78.tgz",
-      "integrity": "sha512-F/0cTMsz6ug4yiXn3RKaCAMsLR261U5Njb6G9Y/HeAI7ES/tKEo2t5SHuvgXaIH4mYiZsRvfDKdX7c0WgBX/Jg==",
+      "version": "1.0.81-11",
+      "integrity": "sha512-uWGUjaxOSMu6dKFWcTvXGUUp76vC3OV7nlSupecRkQ7gA3OxdrrB8rXE5/leC606Hk6oe9Wl7wKCH9EwuZ6afg==",
       "cpu": [
         "arm64"
       ],
@@ -609,9 +574,8 @@
       }
     },
     "node_modules/@github/copilot-linuxmusl-x64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.78.tgz",
-      "integrity": "sha512-YMaJaeBGbArGAFYel+yFaFW/0rFgh0Oqki2f2mUtlonTX/xHr8EB4+mTnMJkHYMFy4gOTC3OtSEEe1NaW/cBXQ==",
+      "version": "1.0.81-11",
+      "integrity": "sha512-BpWKd/iu1tTyuPR2zuPFs1pVOlley4yt/TXkn6/gVwt52VI0rUxEO+n77RVjDcyMxWaUApbad2VNRPIH77guCA==",
       "cpu": [
         "x64"
       ],
@@ -626,9 +590,8 @@
       }
     },
     "node_modules/@github/copilot-win32-arm64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.78.tgz",
-      "integrity": "sha512-ktDkFXaaecEKD3hpM6ydM9lKOdoCfsQsXCmzLzE7DCmSpbbMCdfPfWfZ7MOclmKmpZ5/MNfr4U2l8CUqGerzYA==",
+      "version": "1.0.81-11",
+      "integrity": "sha512-GOK3cACgD96m065uJxbgcXL7MQ1qm+wq1qtvGBpprY0r9wTYJG/rVCtayjYB6B57rnaBwPll3+PQ2J1qgfO57A==",
       "cpu": [
         "arm64"
       ],
@@ -643,9 +606,8 @@
       }
     },
     "node_modules/@github/copilot-win32-x64": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.78.tgz",
-      "integrity": "sha512-Gd8l2T4eqYEWlOEPd0SZznQ+YYgYrwOkE0QXodMkhCBbPdgu/uTzb7mnISWwnVAgqs7pONdF1GOpHkTo+ay8CQ==",
+      "version": "1.0.81-11",
+      "integrity": "sha512-u4K6UU2iGQJqQwsdHNilJBwiaC48PfMsWVFnTSlJD5lCYp9zCk1odrvrcmB3ARYinE/IcXLUosiHaM/ChR/pdA==",
       "cpu": [
         "x64"
       ],
@@ -661,7 +623,6 @@
     },
     "node_modules/@hono/node-server": {
       "version": "1.19.14",
-      "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz",
       "integrity": "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==",
       "dev": true,
       "license": "MIT",
@@ -674,14 +635,12 @@
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
       "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@modelcontextprotocol/sdk": {
       "version": "1.26.0",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.26.0.tgz",
       "integrity": "sha512-Y5RmPncpiDtTXDbLKswIJzTqu2hyBKxTNsgKqKclDbhIgg1wgtf1fRuvxgTnRfcnxtvvgbIEcqUOzZrJ6iSReg==",
       "dev": true,
       "license": "MIT",
@@ -722,7 +681,6 @@
     },
     "node_modules/@napi-rs/wasm-runtime": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
       "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==",
       "dev": true,
       "license": "MIT",
@@ -741,7 +699,6 @@
     },
     "node_modules/@oxc-project/types": {
       "version": "0.133.0",
-      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.133.0.tgz",
       "integrity": "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==",
       "dev": true,
       "license": "MIT",
@@ -751,7 +708,6 @@
     },
     "node_modules/@rolldown/binding-android-arm64": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.3.tgz",
       "integrity": "sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw==",
       "cpu": [
         "arm64"
@@ -768,7 +724,6 @@
     },
     "node_modules/@rolldown/binding-darwin-arm64": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.3.tgz",
       "integrity": "sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA==",
       "cpu": [
         "arm64"
@@ -785,7 +740,6 @@
     },
     "node_modules/@rolldown/binding-darwin-x64": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.3.tgz",
       "integrity": "sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg==",
       "cpu": [
         "x64"
@@ -802,7 +756,6 @@
     },
     "node_modules/@rolldown/binding-freebsd-x64": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.3.tgz",
       "integrity": "sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g==",
       "cpu": [
         "x64"
@@ -819,7 +772,6 @@
     },
     "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.3.tgz",
       "integrity": "sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw==",
       "cpu": [
         "arm"
@@ -836,7 +788,6 @@
     },
     "node_modules/@rolldown/binding-linux-arm64-gnu": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.3.tgz",
       "integrity": "sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw==",
       "cpu": [
         "arm64"
@@ -853,7 +804,6 @@
     },
     "node_modules/@rolldown/binding-linux-arm64-musl": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.3.tgz",
       "integrity": "sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==",
       "cpu": [
         "arm64"
@@ -870,7 +820,6 @@
     },
     "node_modules/@rolldown/binding-linux-ppc64-gnu": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.3.tgz",
       "integrity": "sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==",
       "cpu": [
         "ppc64"
@@ -887,7 +836,6 @@
     },
     "node_modules/@rolldown/binding-linux-s390x-gnu": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.3.tgz",
       "integrity": "sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==",
       "cpu": [
         "s390x"
@@ -904,7 +852,6 @@
     },
     "node_modules/@rolldown/binding-linux-x64-gnu": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.3.tgz",
       "integrity": "sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==",
       "cpu": [
         "x64"
@@ -921,7 +868,6 @@
     },
     "node_modules/@rolldown/binding-linux-x64-musl": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.3.tgz",
       "integrity": "sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==",
       "cpu": [
         "x64"
@@ -938,7 +884,6 @@
     },
     "node_modules/@rolldown/binding-openharmony-arm64": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.3.tgz",
       "integrity": "sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==",
       "cpu": [
         "arm64"
@@ -955,7 +900,6 @@
     },
     "node_modules/@rolldown/binding-wasm32-wasi": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.3.tgz",
       "integrity": "sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg==",
       "cpu": [
         "wasm32"
@@ -974,7 +918,6 @@
     },
     "node_modules/@rolldown/binding-win32-arm64-msvc": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.3.tgz",
       "integrity": "sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g==",
       "cpu": [
         "arm64"
@@ -991,7 +934,6 @@
     },
     "node_modules/@rolldown/binding-win32-x64-msvc": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.3.tgz",
       "integrity": "sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA==",
       "cpu": [
         "x64"
@@ -1008,21 +950,18 @@
     },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
       "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@standard-schema/spec": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
       "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@tybys/wasm-util": {
       "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
       "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
       "dev": true,
       "license": "MIT",
@@ -1033,7 +972,6 @@
     },
     "node_modules/@types/chai": {
       "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
       "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
       "dev": true,
       "license": "MIT",
@@ -1044,21 +982,18 @@
     },
     "node_modules/@types/deep-eql": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
       "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/estree": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
       "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "25.3.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz",
       "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==",
       "dev": true,
       "license": "MIT",
@@ -1068,7 +1003,6 @@
     },
     "node_modules/@types/node-forge": {
       "version": "1.3.14",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.14.tgz",
       "integrity": "sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==",
       "dev": true,
       "license": "MIT",
@@ -1078,7 +1012,6 @@
     },
     "node_modules/@vitest/expect": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.8.tgz",
       "integrity": "sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ==",
       "dev": true,
       "license": "MIT",
@@ -1096,7 +1029,6 @@
     },
     "node_modules/@vitest/mocker": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.8.tgz",
       "integrity": "sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw==",
       "dev": true,
       "license": "MIT",
@@ -1123,7 +1055,6 @@
     },
     "node_modules/@vitest/pretty-format": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.8.tgz",
       "integrity": "sha512-9GasEBxpZ1VYIpqHf/0+YGg121uSNwCKOJqIrTwWP/TB7DmFCiaBpNl3aPZzoLWfWkuqhbH8vJIVobZkvdo2cA==",
       "dev": true,
       "license": "MIT",
@@ -1136,7 +1067,6 @@
     },
     "node_modules/@vitest/runner": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.8.tgz",
       "integrity": "sha512-EmVxeBAfMJvycdjd6Hm+RbFBbA9fKvo0Kx37hNpBYoYeavH3RNsBXWDooR1mgD52dCrxIIuP7UotpfiwOikvcg==",
       "dev": true,
       "license": "MIT",
@@ -1150,7 +1080,6 @@
     },
     "node_modules/@vitest/snapshot": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.8.tgz",
       "integrity": "sha512-acfZboRmAIf05DEKcBQy33VXojFJjtUdLyo7oOmV9kebb2xdU01UknNiPuPZoJZQyO7DF0gZdTGTpeAzET9QPQ==",
       "dev": true,
       "license": "MIT",
@@ -1166,7 +1095,6 @@
     },
     "node_modules/@vitest/spy": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.8.tgz",
       "integrity": "sha512-6EevtBp6OZOPF7bmz36HrGMeP3txgVSrgebWxHOafDXGkhIzfXK14f8KF6MuFfgXXUeHxmpD3BQxkV00/3s5mA==",
       "dev": true,
       "license": "MIT",
@@ -1176,7 +1104,6 @@
     },
     "node_modules/@vitest/utils": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.8.tgz",
       "integrity": "sha512-uOJamYALNhfJ6iolExyQM40yIQwDqYnkKtQ5VCiSe17E33H0aQ/u+1GlRuz4LZBk6Mm3sg90G9hEbmEt37C1Zg==",
       "dev": true,
       "license": "MIT",
@@ -1191,7 +1118,6 @@
     },
     "node_modules/accepts": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
       "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
       "dev": true,
       "license": "MIT",
@@ -1205,7 +1131,6 @@
     },
     "node_modules/ajv": {
       "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
       "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "dev": true,
       "license": "MIT",
@@ -1222,7 +1147,6 @@
     },
     "node_modules/ajv-formats": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
       "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "dev": true,
       "license": "MIT",
@@ -1240,7 +1164,6 @@
     },
     "node_modules/assertion-error": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
       "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true,
       "license": "MIT",
@@ -1250,7 +1173,6 @@
     },
     "node_modules/body-parser": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz",
       "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==",
       "dev": true,
       "license": "MIT",
@@ -1275,7 +1197,6 @@
     },
     "node_modules/bytes": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
       "license": "MIT",
@@ -1285,7 +1206,6 @@
     },
     "node_modules/call-bind-apply-helpers": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
       "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
       "license": "MIT",
@@ -1299,7 +1219,6 @@
     },
     "node_modules/call-bound": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
       "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
       "dev": true,
       "license": "MIT",
@@ -1316,7 +1235,6 @@
     },
     "node_modules/chai": {
       "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
       "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
       "dev": true,
       "license": "MIT",
@@ -1326,7 +1244,6 @@
     },
     "node_modules/content-disposition": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz",
       "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==",
       "dev": true,
       "license": "MIT",
@@ -1340,7 +1257,6 @@
     },
     "node_modules/content-type": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
       "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
       "license": "MIT",
@@ -1350,14 +1266,12 @@
     },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/cookie": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
       "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "dev": true,
       "license": "MIT",
@@ -1367,7 +1281,6 @@
     },
     "node_modules/cookie-signature": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
       "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
       "dev": true,
       "license": "MIT",
@@ -1377,7 +1290,6 @@
     },
     "node_modules/cors": {
       "version": "2.8.6",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz",
       "integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==",
       "dev": true,
       "license": "MIT",
@@ -1395,7 +1307,6 @@
     },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
       "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "license": "MIT",
@@ -1410,7 +1321,6 @@
     },
     "node_modules/debug": {
       "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
       "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
       "license": "MIT",
@@ -1428,7 +1338,6 @@
     },
     "node_modules/depd": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
       "license": "MIT",
@@ -1438,7 +1347,6 @@
     },
     "node_modules/detect-libc": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
       "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
@@ -1448,7 +1356,6 @@
     },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
       "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
       "dev": true,
       "license": "MIT",
@@ -1463,14 +1370,12 @@
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/encodeurl": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
       "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
       "license": "MIT",
@@ -1480,7 +1385,6 @@
     },
     "node_modules/es-define-property": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
       "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
       "license": "MIT",
@@ -1490,7 +1394,6 @@
     },
     "node_modules/es-errors": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
       "license": "MIT",
@@ -1500,14 +1403,12 @@
     },
     "node_modules/es-module-lexer": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz",
       "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/es-object-atoms": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
       "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dev": true,
       "license": "MIT",
@@ -1520,7 +1421,6 @@
     },
     "node_modules/esbuild": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
       "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
       "dev": true,
       "hasInstallScript": true,
@@ -1562,14 +1462,12 @@
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/estree-walker": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
       "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
       "dev": true,
       "license": "MIT",
@@ -1579,7 +1477,6 @@
     },
     "node_modules/etag": {
       "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
       "license": "MIT",
@@ -1589,7 +1486,6 @@
     },
     "node_modules/eventsource": {
       "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz",
       "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==",
       "dev": true,
       "license": "MIT",
@@ -1602,7 +1498,6 @@
     },
     "node_modules/eventsource-parser": {
       "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz",
       "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==",
       "dev": true,
       "license": "MIT",
@@ -1612,7 +1507,6 @@
     },
     "node_modules/expect-type": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
       "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
       "dev": true,
       "license": "Apache-2.0",
@@ -1622,7 +1516,6 @@
     },
     "node_modules/express": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
       "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
       "dev": true,
       "license": "MIT",
@@ -1666,7 +1559,6 @@
     },
     "node_modules/express-rate-limit": {
       "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.5.2.tgz",
       "integrity": "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==",
       "dev": true,
       "license": "MIT",
@@ -1685,14 +1577,12 @@
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-uri": {
       "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.5.tgz",
       "integrity": "sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==",
       "dev": true,
       "funding": [
@@ -1709,7 +1599,6 @@
     },
     "node_modules/fdir": {
       "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
       "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
       "license": "MIT",
@@ -1727,7 +1616,6 @@
     },
     "node_modules/finalhandler": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz",
       "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==",
       "dev": true,
       "license": "MIT",
@@ -1749,7 +1637,6 @@
     },
     "node_modules/forwarded": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
       "license": "MIT",
@@ -1759,7 +1646,6 @@
     },
     "node_modules/fresh": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
       "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
       "dev": true,
       "license": "MIT",
@@ -1769,7 +1655,6 @@
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
@@ -1784,7 +1669,6 @@
     },
     "node_modules/function-bind": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
       "license": "MIT",
@@ -1794,7 +1678,6 @@
     },
     "node_modules/get-intrinsic": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
       "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
       "license": "MIT",
@@ -1819,7 +1702,6 @@
     },
     "node_modules/get-proto": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
       "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
       "dev": true,
       "license": "MIT",
@@ -1833,7 +1715,6 @@
     },
     "node_modules/gopd": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
       "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
       "license": "MIT",
@@ -1846,7 +1727,6 @@
     },
     "node_modules/has-symbols": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
       "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
       "license": "MIT",
@@ -1859,7 +1739,6 @@
     },
     "node_modules/hasown": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
       "license": "MIT",
@@ -1871,9 +1750,8 @@
       }
     },
     "node_modules/hono": {
-      "version": "4.12.32",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.32.tgz",
-      "integrity": "sha512-XcuyW9qE2kJn07PkecMOBd5Vq/hMy7mmGw+idz1yblbg9N17ijJODrvPkn7/dwL3Kulj8LcRJ69DLOWf91dRUg==",
+      "version": "4.13.1",
+      "integrity": "sha512-kdJoFVv2xmayw6cY09H7AbMJMt8Jn5jdlEdXsP7AGBdF2DIptVlKlOLKXP41yPip4/a3yQPv9gVcJYI8YY04dw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1882,7 +1760,6 @@
     },
     "node_modules/http-errors": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
       "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
       "dev": true,
       "license": "MIT",
@@ -1903,7 +1780,6 @@
     },
     "node_modules/iconv-lite": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
       "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
       "dev": true,
       "license": "MIT",
@@ -1920,14 +1796,12 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/ip-address": {
       "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.4.0.tgz",
       "integrity": "sha512-oSK96Grm3aP6OrS263xVxbNDGVL7rzBtYdpGqlDG8iQdoenDoTs/nkki+DflYbAEE8Xl6o5YxhxlrKvI3nqKXQ==",
       "dev": true,
       "license": "MIT",
@@ -1937,7 +1811,6 @@
     },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true,
       "license": "MIT",
@@ -1947,21 +1820,18 @@
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/jose": {
       "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-6.1.3.tgz",
       "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==",
       "dev": true,
       "license": "MIT",
@@ -1971,21 +1841,18 @@
     },
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/json-schema-typed": {
       "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz",
       "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==",
       "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/lightningcss": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
       "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
       "dev": true,
       "license": "MPL-2.0",
@@ -2015,7 +1882,6 @@
     },
     "node_modules/lightningcss-android-arm64": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
       "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
       "cpu": [
         "arm64"
@@ -2036,7 +1902,6 @@
     },
     "node_modules/lightningcss-darwin-arm64": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
       "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
       "cpu": [
         "arm64"
@@ -2057,7 +1922,6 @@
     },
     "node_modules/lightningcss-darwin-x64": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
       "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
       "cpu": [
         "x64"
@@ -2078,7 +1942,6 @@
     },
     "node_modules/lightningcss-freebsd-x64": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
       "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
       "cpu": [
         "x64"
@@ -2099,7 +1962,6 @@
     },
     "node_modules/lightningcss-linux-arm-gnueabihf": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
       "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
       "cpu": [
         "arm"
@@ -2120,7 +1982,6 @@
     },
     "node_modules/lightningcss-linux-arm64-gnu": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
       "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
       "cpu": [
         "arm64"
@@ -2141,7 +2002,6 @@
     },
     "node_modules/lightningcss-linux-arm64-musl": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
       "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
       "cpu": [
         "arm64"
@@ -2162,7 +2022,6 @@
     },
     "node_modules/lightningcss-linux-x64-gnu": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
       "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
       "cpu": [
         "x64"
@@ -2183,7 +2042,6 @@
     },
     "node_modules/lightningcss-linux-x64-musl": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
       "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
       "cpu": [
         "x64"
@@ -2204,7 +2062,6 @@
     },
     "node_modules/lightningcss-win32-arm64-msvc": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
       "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
       "cpu": [
         "arm64"
@@ -2225,7 +2082,6 @@
     },
     "node_modules/lightningcss-win32-x64-msvc": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
       "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
       "cpu": [
         "x64"
@@ -2246,7 +2102,6 @@
     },
     "node_modules/magic-string": {
       "version": "0.30.21",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
       "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "dev": true,
       "license": "MIT",
@@ -2256,7 +2111,6 @@
     },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
       "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
       "dev": true,
       "license": "MIT",
@@ -2266,7 +2120,6 @@
     },
     "node_modules/media-typer": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
       "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
       "dev": true,
       "license": "MIT",
@@ -2276,7 +2129,6 @@
     },
     "node_modules/merge-descriptors": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
       "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
       "dev": true,
       "license": "MIT",
@@ -2289,7 +2141,6 @@
     },
     "node_modules/mime-db": {
       "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
       "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
       "dev": true,
       "license": "MIT",
@@ -2299,7 +2150,6 @@
     },
     "node_modules/mime-types": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
       "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
       "dev": true,
       "license": "MIT",
@@ -2316,14 +2166,12 @@
     },
     "node_modules/ms": {
       "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/nanoid": {
       "version": "3.3.17",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.17.tgz",
       "integrity": "sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==",
       "dev": true,
       "funding": [
@@ -2342,7 +2190,6 @@
     },
     "node_modules/negotiator": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
       "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
       "dev": true,
       "license": "MIT",
@@ -2352,7 +2199,6 @@
     },
     "node_modules/node-forge": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz",
       "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==",
       "dev": true,
       "license": "(BSD-3-Clause OR GPL-2.0)",
@@ -2362,7 +2208,6 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
       "license": "MIT",
@@ -2372,7 +2217,6 @@
     },
     "node_modules/object-inspect": {
       "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
       "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
       "license": "MIT",
@@ -2385,7 +2229,6 @@
     },
     "node_modules/obug": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz",
       "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==",
       "dev": true,
       "funding": [
@@ -2396,7 +2239,6 @@
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
       "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
       "license": "MIT",
@@ -2409,7 +2251,6 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "license": "ISC",
@@ -2419,7 +2260,6 @@
     },
     "node_modules/openai": {
       "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/openai/-/openai-6.17.0.tgz",
       "integrity": "sha512-NHRpPEUPzAvFOAFs9+9pC6+HCw/iWsYsKCMPXH5Kw7BpMxqd8g/A07/1o7Gx2TWtCnzevVRyKMRFqyiHyAlqcA==",
       "dev": true,
       "license": "Apache-2.0",
@@ -2441,7 +2281,6 @@
     },
     "node_modules/parseurl": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true,
       "license": "MIT",
@@ -2451,7 +2290,6 @@
     },
     "node_modules/path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
       "license": "MIT",
@@ -2461,7 +2299,6 @@
     },
     "node_modules/path-to-regexp": {
       "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz",
       "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==",
       "dev": true,
       "license": "MIT",
@@ -2472,21 +2309,18 @@
     },
     "node_modules/pathe": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
       "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/picocolors": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
       "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
@@ -2499,7 +2333,6 @@
     },
     "node_modules/pkce-challenge": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.1.tgz",
       "integrity": "sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==",
       "dev": true,
       "license": "MIT",
@@ -2509,7 +2342,6 @@
     },
     "node_modules/postcss": {
       "version": "8.5.25",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.25.tgz",
       "integrity": "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==",
       "dev": true,
       "funding": [
@@ -2538,7 +2370,6 @@
     },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
       "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
       "license": "MIT",
@@ -2552,7 +2383,6 @@
     },
     "node_modules/qs": {
       "version": "6.15.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz",
       "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==",
       "dev": true,
       "license": "BSD-3-Clause",
@@ -2568,7 +2398,6 @@
     },
     "node_modules/range-parser": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true,
       "license": "MIT",
@@ -2578,7 +2407,6 @@
     },
     "node_modules/raw-body": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz",
       "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==",
       "dev": true,
       "license": "MIT",
@@ -2594,7 +2422,6 @@
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
       "license": "MIT",
@@ -2604,7 +2431,6 @@
     },
     "node_modules/rolldown": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.3.tgz",
       "integrity": "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==",
       "dev": true,
       "license": "MIT",
@@ -2638,7 +2464,6 @@
     },
     "node_modules/router": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
       "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
       "dev": true,
       "license": "MIT",
@@ -2655,14 +2480,12 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/send": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz",
       "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==",
       "dev": true,
       "license": "MIT",
@@ -2689,7 +2512,6 @@
     },
     "node_modules/serve-static": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz",
       "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==",
       "dev": true,
       "license": "MIT",
@@ -2709,14 +2531,12 @@
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
       "license": "MIT",
@@ -2729,7 +2549,6 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
       "license": "MIT",
@@ -2739,7 +2558,6 @@
     },
     "node_modules/side-channel": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
       "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dev": true,
       "license": "MIT",
@@ -2759,7 +2577,6 @@
     },
     "node_modules/side-channel-list": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
       "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
       "dev": true,
       "license": "MIT",
@@ -2776,7 +2593,6 @@
     },
     "node_modules/side-channel-map": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
       "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
       "dev": true,
       "license": "MIT",
@@ -2795,7 +2611,6 @@
     },
     "node_modules/side-channel-weakmap": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
       "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
       "dev": true,
       "license": "MIT",
@@ -2815,14 +2630,12 @@
     },
     "node_modules/siginfo": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
       "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/source-map-js": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "license": "BSD-3-Clause",
@@ -2832,14 +2645,12 @@
     },
     "node_modules/stackback": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
       "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/statuses": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
       "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
       "dev": true,
       "license": "MIT",
@@ -2849,21 +2660,18 @@
     },
     "node_modules/std-env": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz",
       "integrity": "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/tinybench": {
       "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
       "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/tinyexec": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz",
       "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==",
       "dev": true,
       "license": "MIT",
@@ -2873,7 +2681,6 @@
     },
     "node_modules/tinyglobby": {
       "version": "0.2.17",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
       "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
       "dev": true,
       "license": "MIT",
@@ -2890,7 +2697,6 @@
     },
     "node_modules/tinyrainbow": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
       "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
       "dev": true,
       "license": "MIT",
@@ -2900,7 +2706,6 @@
     },
     "node_modules/toidentifier": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
       "license": "MIT",
@@ -2910,7 +2715,6 @@
     },
     "node_modules/tslib": {
       "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
       "license": "0BSD",
@@ -2918,7 +2722,6 @@
     },
     "node_modules/tsx": {
       "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.22.4.tgz",
       "integrity": "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==",
       "dev": true,
       "license": "MIT",
@@ -2937,7 +2740,6 @@
     },
     "node_modules/type-is": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
       "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
       "dev": true,
       "license": "MIT",
@@ -2952,7 +2754,6 @@
     },
     "node_modules/typescript": {
       "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
@@ -2966,14 +2767,12 @@
     },
     "node_modules/undici-types": {
       "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
       "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
       "license": "MIT",
@@ -2983,7 +2782,6 @@
     },
     "node_modules/vary": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true,
       "license": "MIT",
@@ -2993,7 +2791,6 @@
     },
     "node_modules/vite": {
       "version": "8.0.16",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.16.tgz",
       "integrity": "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==",
       "dev": true,
       "license": "MIT",
@@ -3071,7 +2868,6 @@
     },
     "node_modules/vitest": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.8.tgz",
       "integrity": "sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig==",
       "dev": true,
       "license": "MIT",
@@ -3161,7 +2957,6 @@
     },
     "node_modules/which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "license": "ISC",
@@ -3177,7 +2972,6 @@
     },
     "node_modules/why-is-node-running": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
       "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
       "dev": true,
       "license": "MIT",
@@ -3194,14 +2988,12 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
       "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz",
       "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==",
       "dev": true,
       "license": "ISC",
@@ -3217,7 +3009,6 @@
     },
     "node_modules/zod": {
       "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
       "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "dev": true,
       "license": "MIT",
@@ -3227,7 +3018,6 @@
     },
     "node_modules/zod-to-json-schema": {
       "version": "3.25.1",
-      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.1.tgz",
       "integrity": "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==",
       "dev": true,
       "license": "ISC",
diff --git a/test/harness/package.json b/test/harness/package.json
index f1556534d0..e8868750a0 100644
--- a/test/harness/package.json
+++ b/test/harness/package.json
@@ -14,7 +14,7 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "devDependencies": {
-    "@github/copilot": "^1.0.78",
+    "@github/copilot": "^1.0.81-11",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "@types/node": "^25.3.3",
     "@types/node-forge": "^1.3.14",
diff --git a/test/harness/replayingCapiProxy.test.ts b/test/harness/replayingCapiProxy.test.ts
index c5747a3067..245b035c5c 100644
--- a/test/harness/replayingCapiProxy.test.ts
+++ b/test/harness/replayingCapiProxy.test.ts
@@ -546,9 +546,65 @@ Always include PINEAPPLE_COCONUT_42.
     expect(toolMessage?.content).toBe("Tool 'report_intent' does not exist.");
   });
 
-  test("removes runtime advisories from background agent start results", async () => {
+  test("normalizes interrupted tool execution results", async () => {
+    const requestBody = JSON.stringify({
+      messages: [
+        { role: "user", content: "Run a slow analysis" },
+        {
+          role: "assistant",
+          tool_calls: [
+            {
+              id: "tc1",
+              type: "function",
+              function: {
+                name: "slow_analysis",
+                arguments: '{"value":"test_abort"}',
+              },
+            },
+            {
+              id: "tc2",
+              type: "function",
+              function: {
+                name: "powershell",
+                arguments: '{"command":"sleep 100"}',
+              },
+            },
+          ],
+        },
+        {
+          role: "tool",
+          tool_call_id: "tc1",
+          content:
+            'Failed to execute `slow_analysis` tool with arguments: {"value":"test_abort"} due to error: Error: Session aborted',
+        },
+        {
+          role: "tool",
+          tool_call_id: "tc2",
+          content: "<shell context is being reconfigured; retry the command>",
+        },
+      ],
+    });
+    const responseBody = JSON.stringify({
+      choices: [{ message: { role: "assistant", content: "Done" } }],
+    });
+
+    const outputPath = await createProxy([
+      { url: "/chat/completions", requestBody, responseBody },
+    ]);
+
+    const result = await readYamlOutput(outputPath);
+    const toolMessages = result.conversations[0].messages.filter(
+      (m) => m.role === "tool",
+    );
+    expect(toolMessages.map((message) => message.content)).toEqual([
+      "The execution of this tool, or a previous tool was interrupted.",
+      "The execution of this tool, or a previous tool was interrupted.",
+    ]);
+  });
+
+  test("normalizes background agent IDs and removes runtime advisories", async () => {
     const stableResult =
-      "Agent started in background with agent_id: read-file. You'll be notified when it completes. Tell the user you're waiting and end your response, or continue unrelated work until notified.";
+      "Agent started in background with agent_id: background-agent. You'll be notified when it completes. Tell the user you're waiting and end your response, or continue unrelated work until notified.";
     const requestBody = JSON.stringify({
       messages: [
         { role: "user", content: "Help me" },
@@ -565,7 +621,8 @@ Always include PINEAPPLE_COCONUT_42.
         {
           role: "tool",
           tool_call_id: "tc1",
-          content: `${stableResult} The agent supports multi-turn conversations.`,
+          content:
+            "Agent started in background with agent_id: 3e0c7565-6091-58cb-85bb-6cb14db23ef7. You'll be notified when it completes. Tell the user you're waiting and end your response, or continue unrelated work until notified. The agent supports multi-turn conversations.",
         },
       ],
     });
@@ -902,6 +959,119 @@ Always include PINEAPPLE_COCONUT_42.
       }
     });
 
+    test("matches semantically equivalent interrupted shell results", async () => {
+      const originalShellConfig =
+        process.platform === "win32"
+          ? ShellConfig.powerShell
+          : ShellConfig.bash;
+      const cachePath = path.join(tempDir, "cache.yaml");
+      const cacheContent = yaml.stringify({
+        models: ["test-model"],
+        conversations: [
+          {
+            messages: [
+              { role: "system", content: "${system}" },
+              { role: "user", content: "Run command" },
+              {
+                role: "assistant",
+                tool_calls: [
+                  {
+                    id: "toolcall_0",
+                    type: "function",
+                    function: {
+                      name: "${shell}",
+                      arguments: '{"command":"sleep 100"}',
+                    },
+                  },
+                ],
+              },
+              {
+                role: "tool",
+                tool_call_id: "toolcall_0",
+                content:
+                  "The execution of this tool, or a previous tool was interrupted.",
+              },
+              { role: "assistant", content: "Ready for another request." },
+            ],
+          },
+        ],
+      } satisfies NormalizedData);
+      await writeFile(cachePath, cacheContent);
+
+      const proxy = new ReplayingCapiProxy(
+        "http://localhost:9999",
+        cachePath,
+        workDir,
+      );
+      const proxyUrl = await proxy.start();
+
+      try {
+        const messages = [
+          { role: "system", content: "System prompt" },
+          { role: "user", content: "Run command" },
+          {
+            role: "assistant",
+            tool_calls: [
+              {
+                id: "runtime-call-id",
+                type: "function",
+                function: {
+                  name: originalShellConfig.shellToolName,
+                  arguments: '{"command":"sleep 100"}',
+                },
+              },
+            ],
+          },
+        ];
+        const interruptedResponse = await makeRequest(
+          proxyUrl,
+          "/chat/completions",
+          {
+            body: {
+              model: "test-model",
+              messages: [
+                ...messages,
+                {
+                  role: "tool",
+                  tool_call_id: "runtime-call-id",
+                  content:
+                    "<shell context is being reconfigured; retry the command>",
+                },
+              ],
+            },
+          },
+        );
+
+        expect(interruptedResponse.status).toBe(200);
+        expect(
+          (JSON.parse(interruptedResponse.body) as ChatCompletion).choices[0]
+            .message.content,
+        ).toBe("Ready for another request.");
+
+        const meaningfulErrorResponse = await makeRequest(
+          proxyUrl,
+          "/chat/completions",
+          {
+            body: {
+              model: "test-model",
+              messages: [
+                ...messages,
+                {
+                  role: "tool",
+                  tool_call_id: "runtime-call-id",
+                  content:
+                    "The command failed because the executable was missing.",
+                },
+              ],
+            },
+          },
+        );
+        expect(meaningfulErrorResponse.status).toBe(500);
+      } finally {
+        await proxy.stop();
+      }
+    });
+
     test("matches available-tools results after the built-in tool set changes", async () => {
       const cachePath = path.join(tempDir, "cache.yaml");
       // Legacy snapshot recorded before write_agent was a built-in tool: the
@@ -1161,6 +1331,112 @@ Always include PINEAPPLE_COCONUT_42.
       }
     });
 
+    test("replays background agent calls with the runtime-generated ID", async () => {
+      const cachePath = path.join(tempDir, "cache.yaml");
+      const startResult =
+        "Agent started in background with agent_id: read-file. You'll be notified when it completes. Tell the user you're waiting and end your response, or continue unrelated work until notified.";
+      const notification =
+        '<system_notification>\nAgent "read-file" (explore) has completed successfully. Use read_agent with agent_id "read-file" to retrieve the full results.\n</system_notification>';
+      const cacheContent = yaml.stringify({
+        models: ["test-model"],
+        conversations: [
+          {
+            messages: [
+              { role: "system", content: "${system}" },
+              { role: "user", content: "Read the file" },
+              {
+                role: "assistant",
+                tool_calls: [
+                  {
+                    id: "toolcall_0",
+                    type: "function",
+                    function: {
+                      name: "task",
+                      arguments:
+                        '{"agent_type":"explore","name":"read-file","prompt":"Read it","mode":"background"}',
+                    },
+                  },
+                ],
+              },
+              {
+                role: "tool",
+                tool_call_id: "toolcall_0",
+                content: startResult,
+              },
+              { role: "assistant", content: "Waiting." },
+              { role: "user", content: notification },
+              {
+                role: "assistant",
+                tool_calls: [
+                  {
+                    id: "toolcall_1",
+                    type: "function",
+                    function: {
+                      name: "read_agent",
+                      arguments: '{"agent_id":"read-file","wait":true}',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      } satisfies NormalizedData);
+      await writeFile(cachePath, cacheContent);
+
+      const proxy = new ReplayingCapiProxy(
+        "http://localhost:9999",
+        cachePath,
+        workDir,
+      );
+      const proxyUrl = await proxy.start();
+      const runtimeAgentId = "3e0c7565-6091-58cb-85bb-6cb14db23ef7";
+
+      try {
+        const response = await makeRequest(proxyUrl, "/chat/completions", {
+          body: {
+            model: "test-model",
+            messages: [
+              { role: "system", content: "Be helpful" },
+              { role: "user", content: "Read the file" },
+              {
+                role: "assistant",
+                tool_calls: [
+                  {
+                    id: "runtime-call-id",
+                    type: "function",
+                    function: {
+                      name: "task",
+                      arguments:
+                        '{"agent_type":"explore","name":"read-file","prompt":"Read it","mode":"background"}',
+                    },
+                  },
+                ],
+              },
+              {
+                role: "tool",
+                tool_call_id: "runtime-call-id",
+                content: startResult.replace("read-file", runtimeAgentId),
+              },
+              { role: "assistant", content: "Waiting." },
+              { role: "user", content: notification },
+            ],
+          },
+        });
+
+        expect(response.status).toBe(200);
+        const parsed = JSON.parse(response.body) as ChatCompletion;
+        const toolCall = parsed.choices[0].message
+          .tool_calls![0] as ChatCompletionMessageFunctionToolCall;
+        expect(JSON.parse(toolCall.function.arguments)).toEqual({
+          agent_id: runtimeAgentId,
+          wait: true,
+        });
+      } finally {
+        await proxy.stop();
+      }
+    });
+
     test("matches parallel tool results regardless of arrival order", async () => {
       const cachePath = path.join(tempDir, "cache.yaml");
       const cacheContent = yaml.stringify({
diff --git a/test/harness/replayingCapiProxy.ts b/test/harness/replayingCapiProxy.ts
index 47ebda9f7b..f30a9fbd77 100644
--- a/test/harness/replayingCapiProxy.ts
+++ b/test/harness/replayingCapiProxy.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
-import { appendFileSync, existsSync } from "fs";
+import { appendFileSync } from "fs";
 import { mkdir, readFile, writeFile } from "fs/promises";
 import type {
   ChatCompletion,
@@ -26,6 +26,7 @@ import {
   chatCompletionResponseToAnthropicMessage,
   chatCompletionResponseToAnthropicSseChunks,
 } from "./anthropicMessagesAdapter";
+import { canonicalUserMessageSeparator } from "./modelProtocolAdapterShared";
 import {
   chatCompletionResponseToResponsesApiMessage,
   chatCompletionResponseToResponsesApiSseChunks,
@@ -125,6 +126,7 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
   private startPromise: Promise<string> | null = null;
   private defaultToolResultNormalizers: ToolResultNormalizer[] = [
     { toolName: "*", normalizer: normalizeLargeOutputFilepaths },
+    { toolName: "*", normalizer: normalizeInterruptedToolResult },
     { toolName: "${shell}", normalizer: normalizeShellExitMarkers },
     { toolName: "*", normalizer: normalizeGhAuthMessages },
     { toolName: "*", normalizer: normalizeAvailableToolNames },
@@ -205,17 +207,30 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
   }
 
   private async loadStoredData(): Promise<void> {
-    if (this.state && existsSync(this.state.filePath)) {
-      const content = await readFile(this.state.filePath, "utf-8");
-      this.state.storedData = yaml.parse(content) as NormalizedData;
-      normalizeToolResultOrder(this.state.storedData.conversations);
-      normalizeStoredUserMessages(this.state.storedData.conversations);
-      normalizeStoredToolMessages(this.state.storedData.conversations);
-      normalizeStoredMessagesForBackend(
-        this.state.storedData.conversations,
-        this.state.backend,
-      );
+    if (!this.state) {
+      return;
+    }
+    // Read directly and treat a missing file as "nothing stored" rather than
+    // checking for existence first, which would be a check-then-use race.
+    const content = await readFile(this.state.filePath, "utf-8").catch(
+      (error: NodeJS.ErrnoException) => {
+        if (error.code === "ENOENT") {
+          return undefined;
+        }
+        throw error;
+      },
+    );
+    if (content === undefined) {
+      return;
     }
+    this.state.storedData = yaml.parse(content) as NormalizedData;
+    normalizeToolResultOrder(this.state.storedData.conversations);
+    normalizeStoredUserMessages(this.state.storedData.conversations);
+    normalizeStoredToolMessages(this.state.storedData.conversations);
+    normalizeStoredMessagesForBackend(
+      this.state.storedData.conversations,
+      this.state.backend,
+    );
   }
 
   async stop(skipWritingCache?: boolean): Promise<void> {
@@ -416,6 +431,51 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
           return;
         }
 
+        // Keep GitHub MCP tests hermetic while still capturing the request at
+        // the CAPI proxy. The tests only need a successful transport handshake;
+        // no fake tools are exposed.
+        if (options.requestOptions.path === "/mcp") {
+          if (options.requestOptions.method !== "POST") {
+            options.onResponseStart(200, commonResponseHeaders);
+            options.onResponseEnd();
+            return;
+          }
+
+          const request = JSON.parse(options.body ?? "{}") as {
+            id?: string | number;
+            method?: string;
+            params?: { protocolVersion?: string };
+          };
+          if (request.id === undefined) {
+            options.onResponseStart(202, commonResponseHeaders);
+            options.onResponseEnd();
+            return;
+          }
+
+          const result =
+            request.method === "initialize"
+              ? {
+                  protocolVersion:
+                    request.params?.protocolVersion ?? "2025-03-26",
+                  capabilities: { tools: {} },
+                  serverInfo: { name: "e2e-github-mcp", version: "1.0.0" },
+                }
+              : request.method === "tools/list"
+                ? { tools: [] }
+                : {};
+          options.onResponseStart(200, {
+            "content-type": "application/json",
+            ...commonResponseHeaders,
+          });
+          options.onData(
+            Buffer.from(
+              JSON.stringify({ jsonrpc: "2.0", id: request.id, result }),
+            ),
+          );
+          options.onResponseEnd();
+          return;
+        }
+
         // Handle memory endpoints - return stub responses in tests
         // Matches: /agents/*/memory/*/enabled, /agents/*/memory/*/recent, etc.
         if (options.requestOptions.path?.match(/\/agents\/.*\/memory\//)) {
@@ -789,6 +849,7 @@ async function findSavedChatCompletionResponse(
   if (!requestModel) {
     throw new Error("Unable to determine model from request");
   }
+  const backgroundAgentIds = extractBackgroundAgentIds(requestBody);
 
   // Now find a matching cached conversation (i.e., one for which this request is a prefix)
   for (const conversation of storedData.conversations) {
@@ -802,6 +863,7 @@ async function findSavedChatCompletionResponse(
         conversation.messages,
         replyIndex,
         workDir,
+        backgroundAgentIds,
       );
     }
   }
@@ -938,7 +1000,7 @@ function coalesceAdjacentUserMessages(requestBody: string): string {
       typeof previous.content === "string" &&
       typeof message.content === "string"
     ) {
-      previous.content = `${previous.content.trimEnd()}\n\n\n${message.content.trimStart()}`;
+      previous.content = `${previous.content.trimEnd()}${canonicalUserMessageSeparator}${message.content.trimStart()}`;
     } else {
       messages.push(message);
     }
@@ -948,7 +1010,7 @@ function coalesceAdjacentUserMessages(requestBody: string): string {
     if (message.role === "user" && typeof message.content === "string") {
       message.content = normalizeUserMessage(message.content).replace(
         /\n{5,}/g,
-        "\n\n\n",
+        canonicalUserMessageSeparator,
       );
     }
   }
@@ -1023,8 +1085,11 @@ function normalizeToolCalls(
   // still match cached responses even if these details change.
   for (const conv of conversations) {
     const idMap = new Map<string, string>();
+    const backgroundAgentNamesByToolCallId = new Map<string, string>();
+    const backgroundAgentNamesByRuntimeId = new Map<string, string>();
     const precedingMessages: NormalizedMessage[] = [];
     let counter = 0;
+    let unnamedBackgroundAgentCounter = 0;
     for (const msg of conv.messages) {
       for (const tc of msg.tool_calls ?? []) {
         // Normalize ID in tool calls
@@ -1037,6 +1102,29 @@ function normalizeToolCalls(
         if (normalizedToolName) {
           tc.function!.name = normalizedToolName;
         }
+
+        if (tc.function?.name === "task") {
+          const configuredName = getBackgroundAgentName(
+            tc.function.arguments,
+          );
+          const fallbackName =
+            unnamedBackgroundAgentCounter === 0
+              ? "background-agent"
+              : `background-agent-${unnamedBackgroundAgentCounter}`;
+          backgroundAgentNamesByToolCallId.set(
+            tc.id,
+            configuredName ?? fallbackName,
+          );
+          unnamedBackgroundAgentCounter++;
+        } else if (
+          tc.function?.name === "read_agent" ||
+          tc.function?.name === "write_agent"
+        ) {
+          tc.function.arguments = normalizeBackgroundAgentArguments(
+            tc.function.arguments,
+            backgroundAgentNamesByRuntimeId,
+          );
+        }
       }
 
       if (msg.role === "tool" && msg.tool_call_id) {
@@ -1049,6 +1137,19 @@ function normalizeToolCalls(
             .flatMap((m) => m.tool_calls ?? [])
             .find((tc) => tc.id === msg.tool_call_id);
           if (precedingToolCall) {
+            if (precedingToolCall.function?.name === "task") {
+              const runtimeId = getBackgroundAgentId(msg.content);
+              const stableName = backgroundAgentNamesByToolCallId.get(
+                msg.tool_call_id,
+              );
+              if (runtimeId && stableName) {
+                backgroundAgentNamesByRuntimeId.set(runtimeId, stableName);
+                msg.content = normalizeBackgroundAgentStartMessageWithId(
+                  msg.content,
+                  stableName,
+                );
+              }
+            }
             for (const normalizer of resultNormalizers) {
               if (
                 precedingToolCall.function?.name === normalizer.toolName ||
@@ -1057,6 +1158,10 @@ function normalizeToolCalls(
                 msg.content = normalizer.normalizer(msg.content);
               }
             }
+            msg.content = replaceBackgroundAgentIds(
+              msg.content,
+              backgroundAgentNamesByRuntimeId,
+            );
           }
         }
       }
@@ -1303,7 +1408,8 @@ function coalesceMessages(
       continue;
     }
 
-    const separator = message.role === "user" ? "\n\n\n" : "";
+    const separator =
+      message.role === "user" ? canonicalUserMessageSeparator : "";
     const previousContent = previous.content ?? "";
     const currentContent = message.content ?? "";
     const content = `${previousContent}${previousContent && currentContent ? separator : ""}${currentContent}`;
@@ -1324,6 +1430,7 @@ function normalizeStoredToolMessages(conversations: NormalizedConversation[]) {
   for (const conversation of conversations) {
     for (const message of conversation.messages) {
       if (message.role === "tool" && typeof message.content === "string") {
+        message.content = normalizeInterruptedToolResult(message.content);
         message.content = normalizeAvailableToolNames(message.content);
         message.content = normalizeBackgroundAgentStartMessage(message.content);
         message.content = normalizeReadAgentResult(message.content);
@@ -1447,13 +1554,192 @@ function normalizeAvailableToolNames(result: string): string {
   );
 }
 
+function normalizeInterruptedToolResult(result: string): string {
+  return result.replace(
+    /^(?:Failed to execute `[^`]+` tool(?: with arguments: [\s\S]*?)? due to error: (?:Error: )?Session aborted|<shell context is being reconfigured; retry the command>)$/,
+    "The execution of this tool, or a previous tool was interrupted.",
+  );
+}
+
 function normalizeBackgroundAgentStartMessage(result: string): string {
+  return normalizeBackgroundAgentStartMessageWithId(result);
+}
+
+function normalizeBackgroundAgentStartMessageWithId(
+  result: string,
+  stableId?: string,
+): string {
   return result.replace(
-    /^(Agent started in background with agent_id: .*?\. You'll be notified when it completes\. Tell the user you're waiting and end your response, or continue unrelated work until notified\.).*$/s,
-    "$1",
+    /^Agent started in background with agent_id: (.*?)(\. You'll be notified when it completes\. Tell the user you're waiting and end your response, or continue unrelated work until notified\.).*$/s,
+    (_match, runtimeId: string, suffix: string) =>
+      `Agent started in background with agent_id: ${stableId ?? runtimeId}${suffix}`,
   );
 }
 
+function getBackgroundAgentName(argumentsJson: string): string | undefined {
+  try {
+    const args = JSON.parse(argumentsJson) as unknown;
+    if (
+      args &&
+      typeof args === "object" &&
+      "name" in args &&
+      typeof args.name === "string"
+    ) {
+      return args.name;
+    }
+  } catch {
+    // Invalid tool arguments are left for the runtime to report.
+  }
+  return undefined;
+}
+
+function getBackgroundAgentId(content: string): string | undefined {
+  const match = content.match(
+    /^Agent started in background with agent_id: (.*?)\. You'll be notified when it completes\./s,
+  );
+  if (match?.[1]) {
+    return match[1];
+  }
+
+  try {
+    const parsed = JSON.parse(content) as unknown;
+    if (
+      parsed &&
+      typeof parsed === "object" &&
+      "textResultForLlm" in parsed &&
+      typeof parsed.textResultForLlm === "string"
+    ) {
+      return getBackgroundAgentId(parsed.textResultForLlm);
+    }
+  } catch {
+    // Plain-text tool results are expected.
+  }
+  return undefined;
+}
+
+function replaceBackgroundAgentIds(
+  content: string,
+  backgroundAgentNamesByRuntimeId: Map<string, string>,
+): string {
+  let normalized = content;
+  for (const [runtimeId, stableName] of backgroundAgentNamesByRuntimeId) {
+    normalized = normalized.split(runtimeId).join(stableName);
+  }
+  return normalized;
+}
+
+function rewriteBackgroundAgentArguments(
+  argumentsJson: string,
+  replacements: Map<string, string>,
+): string {
+  try {
+    const args = JSON.parse(argumentsJson) as unknown;
+    if (!args || typeof args !== "object") {
+      return argumentsJson;
+    }
+
+    if (
+      "agent_id" in args &&
+      typeof args.agent_id === "string" &&
+      replacements.has(args.agent_id)
+    ) {
+      args.agent_id = replacements.get(args.agent_id);
+    }
+    if ("agent_ids" in args && Array.isArray(args.agent_ids)) {
+      args.agent_ids = args.agent_ids.map((agentId: unknown) =>
+        typeof agentId === "string"
+          ? (replacements.get(agentId) ?? agentId)
+          : agentId,
+      );
+    }
+    return JSON.stringify(args);
+  } catch {
+    return argumentsJson;
+  }
+}
+
+function normalizeBackgroundAgentArguments(
+  argumentsJson: string,
+  backgroundAgentNamesByRuntimeId: Map<string, string>,
+): string {
+  return rewriteBackgroundAgentArguments(
+    argumentsJson,
+    backgroundAgentNamesByRuntimeId,
+  );
+}
+
+function extractBackgroundAgentIds(
+  requestBody: string | undefined,
+): Map<string, string> {
+  const result = new Map<string, string>();
+  if (!requestBody) {
+    return result;
+  }
+
+  try {
+    const request = JSON.parse(requestBody) as {
+      messages?: Array<{
+        role?: string;
+        tool_call_id?: string;
+        content?: unknown;
+        tool_calls?: Array<{
+          id?: string;
+          function?: { name?: string; arguments?: string };
+        }>;
+      }>;
+    };
+    const backgroundAgentNamesByToolCallId = new Map<string, string>();
+    let unnamedBackgroundAgentCounter = 0;
+    for (const message of request.messages ?? []) {
+      for (const toolCall of message.tool_calls ?? []) {
+        if (
+          toolCall.id &&
+          toolCall.function?.name === "task" &&
+          toolCall.function.arguments
+        ) {
+          const configuredName = getBackgroundAgentName(
+            toolCall.function.arguments,
+          );
+          const fallbackName =
+            unnamedBackgroundAgentCounter === 0
+              ? "background-agent"
+              : `background-agent-${unnamedBackgroundAgentCounter}`;
+          backgroundAgentNamesByToolCallId.set(
+            toolCall.id,
+            configuredName ?? fallbackName,
+          );
+          unnamedBackgroundAgentCounter++;
+        }
+      }
+
+      if (
+        message.role === "tool" &&
+        message.tool_call_id &&
+        typeof message.content === "string"
+      ) {
+        const stableName = backgroundAgentNamesByToolCallId.get(
+          message.tool_call_id,
+        );
+        const runtimeId = getBackgroundAgentId(message.content);
+        if (stableName && runtimeId) {
+          result.set(stableName, runtimeId);
+        }
+      }
+    }
+  } catch {
+    // Request parsing failures are handled by the normal replay matcher.
+  }
+
+  return result;
+}
+
+function expandBackgroundAgentArguments(
+  argumentsJson: string,
+  backgroundAgentIds: Map<string, string>,
+): string {
+  return rewriteBackgroundAgentArguments(argumentsJson, backgroundAgentIds);
+}
+
 // Transforms a single OpenAI-style inbound response message into normalized form
 function transformOpenAIResponseChoice(
   choices: ChatCompletion.Choice[],
@@ -1605,6 +1891,7 @@ function createOpenAIResponse(
   messages: NormalizedMessage[],
   responseStartIndex: number,
   workDir: string,
+  backgroundAgentIds: Map<string, string>,
 ): ChatCompletion {
   // Here we recreate the strange CAPI/productcode behavior of using multiple choices to represent
   // multiple assistant messages in a row. This is the inverse of the logic in transformOpenAIResponseChoice().
@@ -1621,7 +1908,10 @@ function createOpenAIResponse(
       type: "function" as const,
       function: {
         name: expandToolName(tc.function?.name ?? ""),
-        arguments: expandWorkDir(tc.function?.arguments, workDir, true) ?? "{}",
+        arguments: expandBackgroundAgentArguments(
+          expandWorkDir(tc.function?.arguments, workDir, true) ?? "{}",
+          backgroundAgentIds,
+        ),
       },
     }));
 
@@ -1735,11 +2025,18 @@ function createGetModelsResponse(modelIds: string[]) {
 }
 
 async function writeFileIfDifferent(filePath: string, contents: string) {
-  if (existsSync(filePath)) {
-    const existingContents = await readFile(filePath, "utf-8");
-    if (existingContents === contents) {
-      return;
-    }
+  // Read directly instead of checking for existence first, which would be a
+  // check-then-use race on the same path.
+  const existingContents = await readFile(filePath, "utf-8").catch(
+    (error: NodeJS.ErrnoException) => {
+      if (error.code === "ENOENT") {
+        return undefined;
+      }
+      throw error;
+    },
+  );
+  if (existingContents === contents) {
+    return;
   }
 
   await writeFile(filePath, contents, "utf-8");
diff --git a/test/harness/test-mcp-server.mjs b/test/harness/test-mcp-server.mjs
index b2b32606dc..a3a84b42b3 100644
--- a/test/harness/test-mcp-server.mjs
+++ b/test/harness/test-mcp-server.mjs
@@ -13,9 +13,17 @@
 
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { appendFile } from "node:fs/promises";
 import { z } from "zod";
 
-const server = new McpServer({ name: "env-echo", version: "1.0.0" });
+function getArgument(name) {
+    const index = process.argv.indexOf(name);
+    return index === -1 ? undefined : process.argv[index + 1];
+}
+
+const startupMarkerPath = getArgument("--startup-marker");
+const serverName = getArgument("--server-name") ?? "env-echo";
+const server = new McpServer({ name: serverName, version: "1.0.0" });
 
 server.tool(
     "get_env",
@@ -27,5 +35,7 @@ server.tool(
 );
 
 const transport = new StdioServerTransport();
+if (startupMarkerPath) {
+    await appendFile(startupMarkerPath, `${serverName}\n`);
+}
 await server.connect(transport);
-
diff --git a/test/snapshots/permissions/should_honor_a_decision_annotated_with_decisioncontext.yaml b/test/snapshots/permissions/should_honor_a_decision_annotated_with_decisioncontext.yaml
new file mode 100644
index 0000000000..ef6f60dbed
--- /dev/null
+++ b/test/snapshots/permissions/should_honor_a_decision_annotated_with_decisioncontext.yaml
@@ -0,0 +1,24 @@
+models:
+  - claude-sonnet-4.5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Edit protected.txt and replace 'protected' with 'hacked'.
+      - role: assistant
+        content: I'll view the file first, then make the edit.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: report_intent
+              arguments: '{"intent":"Editing protected.txt file"}'
+      - role: assistant
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: view
+              arguments: '{"path":"${workdir}/protected.txt"}'
diff --git a/test/snapshots/rewind/should_restore_tracked_file_and_conversation.yaml b/test/snapshots/rewind/should_restore_tracked_file_and_conversation.yaml
new file mode 100644
index 0000000000..2ef3733e00
--- /dev/null
+++ b/test/snapshots/rewind/should_restore_tracked_file_and_conversation.yaml
@@ -0,0 +1,21 @@
+models:
+  - claude-sonnet-4.5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Use the create tool to create rewind-sdk.txt containing exactly SDK rewind content. After the tool succeeds,
+          reply with exactly SDK_REWIND_DONE.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: create
+              arguments: '{"path":"${workdir}/rewind-sdk.txt","file_text":"SDK rewind content"}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: Created file ${workdir}/rewind-sdk.txt with 18 characters
+      - role: assistant
+        content: SDK_REWIND_DONE
diff --git a/test/snapshots/subagent_hooks/should_invoke_pretooluse_and_posttooluse_hooks_for_sub_agent_tool_calls.yaml b/test/snapshots/subagent_hooks/should_invoke_pretooluse_and_posttooluse_hooks_for_sub_agent_tool_calls.yaml
index 2a73f1ef84..c905726ee3 100644
--- a/test/snapshots/subagent_hooks/should_invoke_pretooluse_and_posttooluse_hooks_for_sub_agent_tool_calls.yaml
+++ b/test/snapshots/subagent_hooks/should_invoke_pretooluse_and_posttooluse_hooks_for_sub_agent_tool_calls.yaml
@@ -25,38 +25,6 @@ conversations:
               arguments: '{"agent_type":"explore","name":"read-file","description":"Reading subagent-test.txt","prompt":"Read the file
                 \"subagent-test.txt\" in the current directory (${workdir}) and report its complete contents. Use the
                 view tool to read the file and provide the full content in your response.","mode":"background"}'
-  - messages:
-      - role: system
-        content: ${system}
-      - role: user
-        content: Use the task tool to spawn an explore agent that reads the file subagent-test.txt in the current directory and
-          reports its contents. You must use the task tool.
-      - role: assistant
-        content: I'll spawn an explore agent to read the file and report its contents.
-        tool_calls:
-          - id: toolcall_0
-            type: function
-            function:
-              name: report_intent
-              arguments: '{"intent":"Spawning explore agent"}'
-          - id: toolcall_1
-            type: function
-            function:
-              name: task
-              arguments: '{"agent_type":"explore","name":"read-file","description":"Reading subagent-test.txt","prompt":"Read the file
-                \"subagent-test.txt\" in the current directory (${workdir}) and report its complete contents. Use the
-                view tool to read the file and provide the full content in your response.","mode":"background"}'
-      - role: tool
-        tool_call_id: toolcall_0
-        content: Tool 'report_intent' does not exist. Available tools that can be called are ${shell}, ${read_shell},
-          ${stop_shell}, ${list_shell}, view, create, edit, web_fetch, skill, sql, read_agent, list_agents, grep, glob,
-          task.
-      - role: tool
-        tool_call_id: toolcall_1
-        content: "Agent started in background with agent_id: read-file. You'll be notified when it completes. Tell the user
-          you're waiting and end your response, or continue unrelated work until notified."
-      - role: assistant
-        content: I've launched an explore agent to read subagent-test.txt. Waiting for it to complete...
   - messages:
       - role: system
         content: ${system}
diff --git a/test/snapshots/tools/clears_context_from_a_terminal_tool_and_starts_the_seeded_turn.yaml b/test/snapshots/tools/clears_context_from_a_terminal_tool_and_starts_the_seeded_turn.yaml
new file mode 100644
index 0000000000..36d5adce4a
--- /dev/null
+++ b/test/snapshots/tools/clears_context_from_a_terminal_tool_and_starts_the_seeded_turn.yaml
@@ -0,0 +1,22 @@
+models:
+  - claude-sonnet-4.5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Call clear_context with prompt "Reply with exactly FRESH_CONTEXT." now.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: clear_context
+              arguments: '{"prompt":"Reply with exactly FRESH_CONTEXT."}'
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Reply with exactly FRESH_CONTEXT.
+      - role: assistant
+        content: FRESH_CONTEXT